From 0860c03cc1a00b27559da75a017a24c76d058176 Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Thu, 3 Oct 2024 10:05:59 +1000 Subject: [PATCH] Fix metadata files, clean up (#210) --- config/cmip5.yaml | 4 +- config/cmip6.yaml | 4 +- config/experiments/cmip5-al33/metadata.yaml | 52 ---------------- config/experiments/cmip5-rr3/metadata.yaml | 60 ------------------ config/experiments/cmip6-fs38/metadata.yaml | 54 ---------------- config/experiments/cmip6-oi10/metadata.yaml | 61 ------------------- .../metadata_sources/cmip5-al33/metadata.yaml | 22 +++++++ .../metadata_sources/cmip5-rr3/metadata.yaml | 25 ++++++++ .../metadata_sources/cmip6-fs38/metadata.yaml | 34 +++++++++++ .../metadata_sources/cmip6-oi10/metadata.yaml | 26 ++++++++ 10 files changed, 111 insertions(+), 231 deletions(-) delete mode 100644 config/experiments/cmip5-al33/metadata.yaml delete mode 100644 config/experiments/cmip5-rr3/metadata.yaml delete mode 100644 config/experiments/cmip6-fs38/metadata.yaml delete mode 100644 config/experiments/cmip6-oi10/metadata.yaml create mode 100644 config/metadata_sources/cmip5-al33/metadata.yaml create mode 100644 config/metadata_sources/cmip5-rr3/metadata.yaml create mode 100644 config/metadata_sources/cmip6-fs38/metadata.yaml create mode 100644 config/metadata_sources/cmip6-oi10/metadata.yaml diff --git a/config/cmip5.yaml b/config/cmip5.yaml index 86c02b89..9cea3c15 100644 --- a/config/cmip5.yaml +++ b/config/cmip5.yaml @@ -4,10 +4,10 @@ translator: Cmip5Translator sources: - - metadata_yaml: /g/data/xp65/admin/intake/metadata/cmip5_al33/metadata.yaml + - metadata_yaml: /g/data/xp65/admin/access-nri-intake-catalog/config/metadata_sources/cmip5-al33/metadata.yaml path: - /g/data/al33/catalog/v2/esm/catalog.json - - metadata_yaml: /g/data/xp65/admin/intake/metadata/cmip5_rr3/metadata.yaml + - metadata_yaml: /g/data/xp65/admin/access-nri-intake-catalog/config/metadata_sources/cmip5-rr3/metadata.yaml path: - /g/data/rr3/catalog/v2/esm/catalog.json diff --git a/config/cmip6.yaml b/config/cmip6.yaml index d50b0215..acd39e1e 100644 --- a/config/cmip6.yaml +++ b/config/cmip6.yaml @@ -4,10 +4,10 @@ translator: Cmip6Translator sources: - - metadata_yaml: /g/data/xp65/admin/intake/metadata/cmip6_fs38/metadata.yaml + - metadata_yaml: /g/data/xp65/admin/access-nri-intake-catalog/config/metadata_sources/cmip6-fs38/metadata.yaml path: - /g/data/fs38/catalog/v2/esm/catalog.json - - metadata_yaml: /g/data/xp65/admin/intake/metadata/cmip6_oi10/metadata.yaml + - metadata_yaml: /g/data/xp65/admin/access-nri-intake-catalog/config/metadata_sources/cmip6-oi10/metadata.yaml path: - /g/data/oi10/catalog/v2/esm/catalog.json diff --git a/config/experiments/cmip5-al33/metadata.yaml b/config/experiments/cmip5-al33/metadata.yaml deleted file mode 100644 index 15b4ccbe..00000000 --- a/config/experiments/cmip5-al33/metadata.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# Metadata recovered 2024-09-25 -# {'contact': 'NCI', -# 'created': None, -# 'description': 'Replicated CMIP5-era datasets catalogued by NCI', -# 'email': 'help@nci.org.au', -# 'experiment_uuid': '658c95cc-c299-450c-82a1-b2b2308f7c6e', -# 'keywords': ['cmip'], -# 'license': None, -# 'long_description': 'All CMIP5-era replicated data contained under the project al33. All file versions present are in the listing. Maintained By: NCI Contact: help@nci.org.au References: https://pcmdi.llnl.gov/mips/cmip5/', -# 'model': ['CMIP5'], -# 'name': 'cmip5_al33', -# 'nominal_resolution': [None], -# 'notes': 'null', -# 'parent_experiment': None, -# 'reference': None, -# 'related_experiments': [None], -# 'url': 'https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f9489_5106_5649_5038', -# 'version': None, -# 'catalog_dir': ''} - -name: cmip5_al33 -experiment_uuid: 658c95cc-c299-450c-82a1-b2b2308f7c6e -description: Replicated CMIP5-era datasets catalogued by NCI -long_description: >- - All CMIP5-era replicated data contained under the project al33. - All file versions present are in the listing. - Maintained By: NCI - Contact: help@nci.org.au - References: https://pcmdi.llnl.gov/mips/cmip5/ -model: -- CMIP5 -realm: -- atmos -- ocean -- aerosol -- ocnBgchem -- land -- seaIce -- landIce -- landonly -version: -contact: NCI -email: help@nci.org.au -created: -reference: -license: -url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f9489_5106_5649_5038 -parent_experiment: -related_experiments: -- -notes: -- cmip \ No newline at end of file diff --git a/config/experiments/cmip5-rr3/metadata.yaml b/config/experiments/cmip5-rr3/metadata.yaml deleted file mode 100644 index e9bac5d8..00000000 --- a/config/experiments/cmip5-rr3/metadata.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# Metadata recovered 2024-09-25 -# {'contact': 'NCI', -# 'created': None, -# 'description': 'Australian CMIP5-era datasets catalogued by NCI', -# 'email': 'help@nci.org.au', -# 'experiment_uuid': '473d0c44-ab66-458c-b32e-1e1774175853', -# 'keywords': ['cmip'], -# 'license': None, -# 'long_description': 'All CMIP5-era Australian published data contained under the project rr3. All file versions present are in the listing. Maintained By: NCI Contact: help@nci.org.au References: https://pcmdi.llnl.gov/mips/cmip5/', -# 'model': ['CMIP5'], -# 'name': 'cmip5_rr3', -# 'nominal_resolution': [None], -# 'notes': 'null', -# 'parent_experiment': None, -# 'reference': None, -# 'related_experiments': [None], -# 'url': 'https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f7448_2157_9857_1076', -# 'version': None, -# 'catalog_dir': ''} -# -name: cmip5_rr3 -experiment_uuid: 473d0c44-ab66-458c-b32e-1e1774175853 -description: Australian CMIP5-era datasets catalogued by NCI -long_description: >- - All CMIP5-era Australian published data contained under the project rr3. - All file versions present are in the listing. - Maintained By: NCI - Contact: help@nci.org.au - References: https://pcmdi.llnl.gov/mips/cmip5/ -realm: -- atmos -- ocean -- seaIce -- landIce -- land -- aerosol -model: -- CMIP5 -frequency: -- 1hr -- mon -- day -- 6hr -- sem -- 3hr -- fx -nominal_resolution: -- -version: -contact: NCI -email: help@nci.org.au -created: -reference: -license: -url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f7448_2157_9857_1076 -related_experiments: -- -notes: -keywords: -- cmip \ No newline at end of file diff --git a/config/experiments/cmip6-fs38/metadata.yaml b/config/experiments/cmip6-fs38/metadata.yaml deleted file mode 100644 index 0770af90..00000000 --- a/config/experiments/cmip6-fs38/metadata.yaml +++ /dev/null @@ -1,54 +0,0 @@ -name: cmip6_fs38 -experiment_uuid: dfdeb421-5c56-4d58-a0b2-04b717e5cff7 -description: Australian CMIP6-era datasets catalogued by NCI -long_description: >- - All CMIP6-era Australian published data contained under the project fs38. - All file versions present are in the listing. - Maintained By: NCI - Contact: help@nci.org.au - References: https://pcmdi.llnl.gov/CMIP6/ -model: -- CMIP6 -realm: -- ocnBgchem -- land -- ocean -- atmos -- landIce -- seaIce -- aerosol -nominal_resolution: -- -version: -contact: NCI -email: help@nci.org.au -created: -reference: -license: -url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f3154_9976_7262_7595 -parent_experiment: -related_experiments: -- -notes: -keywords: -- cmip - -# Metadata recovered 2024-09-25 -# {'contact': 'NCI', -# 'created': None, -# 'description': 'Australian CMIP6-era datasets catalogued by NCI', -# 'email': 'help@nci.org.au', -# 'experiment_uuid': 'dfdeb421-5c56-4d58-a0b2-04b717e5cff7', -# 'keywords': ['cmip'], -# 'license': None, -# 'long_description': 'All CMIP6-era Australian published data contained under the project fs38. All file versions present are in the listing. Maintained By: NCI Contact: help@nci.org.au References: https://pcmdi.llnl.gov/CMIP6/', -# 'model': ['CMIP6'], -# 'name': 'cmip6_fs38', -# 'nominal_resolution': [None], -# 'notes': 'null', -# 'parent_experiment': None, -# 'reference': None, -# 'related_experiments': [None], -# 'url': 'https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f3154_9976_7262_7595', -# 'version': None, -# 'catalog_dir': ''} \ No newline at end of file diff --git a/config/experiments/cmip6-oi10/metadata.yaml b/config/experiments/cmip6-oi10/metadata.yaml deleted file mode 100644 index 6d1050d0..00000000 --- a/config/experiments/cmip6-oi10/metadata.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: cmip6_oi10 -experiment_uuid: b05038ca-8c78-4ca6-a914-ae33dd9abffe -description: Replicated CMIP6-era datasets catalogued by NCI -long_description: >- - All CMIP6-era replicated data contained under the project oi10. - All file versions present are in the listing. - Maintained By: NCI - Contact: help@nci.org.au - References: https://pcmdi.llnl.gov/CMIP6/ -model: -- CMIP6 -realm: -- atmos -- ocean -- land -- seaIce -- aerosol -- landIce -- ocnBgchem -- seaIce ocean -- atmos land -- ocnBgChem -- landIce land -- seaice -- ocean seaIce -- atmos atmosChem -nominal_resolution: -- -version: -contact: NCI -email: help@nci.org.au -created: -reference: -license: -url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f5194_5909_8003_9216 -parent_experiment: -related_experiments: -- -notes: -keywords: -- cmip - -# Metadata recovered 2024-09-25 -# {'contact': 'NCI', -# 'created': None, -# 'description': 'Replicated CMIP6-era datasets catalogued by NCI', -# 'email': 'help@nci.org.au', -# 'experiment_uuid': 'b05038ca-8c78-4ca6-a914-ae33dd9abffe', -# 'keywords': ['cmip'], -# 'license': None, -# 'long_description': 'All CMIP6-era replicated data contained under the project oi10. All file versions present are in the listing. Maintained By: NCI Contact: help@nci.org.au References: https://pcmdi.llnl.gov/CMIP6/', -# 'model': ['CMIP6'], -# 'name': 'cmip6_oi10', -# 'nominal_resolution': [None], -# 'notes': 'null', -# 'parent_experiment': None, -# 'reference': None, -# 'related_experiments': [None], -# 'url': 'https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f5194_5909_8003_9216', -# 'version': None, -# 'catalog_dir': ''} \ No newline at end of file diff --git a/config/metadata_sources/cmip5-al33/metadata.yaml b/config/metadata_sources/cmip5-al33/metadata.yaml new file mode 100644 index 00000000..86e05fe7 --- /dev/null +++ b/config/metadata_sources/cmip5-al33/metadata.yaml @@ -0,0 +1,22 @@ +name: cmip5_al33 +experiment_uuid: 658c95cc-c299-450c-82a1-b2b2308f7c6e +description: Replicated CMIP5-era datasets catalogued by NCI +long_description: >- + All CMIP5-era replicated data contained under the project al33. + All file versions present are in the listing. + Maintained By: NCI + Contact: help@nci.org.au + References: https://pcmdi.llnl.gov/mips/cmip5/ +model: +- CMIP5 +version: +contact: NCI +email: help@nci.org.au +created: +reference: +license: +url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f9489_5106_5649_5038 +parent_experiment: +related_experiments: +- +notes: diff --git a/config/metadata_sources/cmip5-rr3/metadata.yaml b/config/metadata_sources/cmip5-rr3/metadata.yaml new file mode 100644 index 00000000..94992d98 --- /dev/null +++ b/config/metadata_sources/cmip5-rr3/metadata.yaml @@ -0,0 +1,25 @@ +name: cmip5_rr3 +experiment_uuid: 473d0c44-ab66-458c-b32e-1e1774175853 +description: Australian CMIP5-era datasets catalogued by NCI +long_description: >- + All CMIP5-era Australian published data contained under the project rr3. + All file versions present are in the listing. + Maintained By: NCI + Contact: help@nci.org.au + References: https://pcmdi.llnl.gov/mips/cmip5/ +model: +- CMIP5 +nominal_resolution: +- +version: +contact: NCI +email: help@nci.org.au +created: +reference: +license: +url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f7448_2157_9857_1076 +related_experiments: +- +notes: +keywords: +- cmip diff --git a/config/metadata_sources/cmip6-fs38/metadata.yaml b/config/metadata_sources/cmip6-fs38/metadata.yaml new file mode 100644 index 00000000..50791793 --- /dev/null +++ b/config/metadata_sources/cmip6-fs38/metadata.yaml @@ -0,0 +1,34 @@ +name: cmip6_fs38 +experiment_uuid: dfdeb421-5c56-4d58-a0b2-04b717e5cff7 +description: Australian CMIP6-era datasets catalogued by NCI +long_description: >- + All CMIP6-era Australian published data contained under the project fs38. + All file versions present are in the listing. + Maintained By: NCI + Contact: help@nci.org.au + References: https://pcmdi.llnl.gov/CMIP6/ +model: +- CMIP6 +realm: +- ocnBgchem +- land +- ocean +- atmos +- landIce +- seaIce +- aerosol +nominal_resolution: +- +version: +contact: NCI +email: help@nci.org.au +created: +reference: +license: +url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f3154_9976_7262_7595 +parent_experiment: +related_experiments: +- +notes: +keywords: +- cmip diff --git a/config/metadata_sources/cmip6-oi10/metadata.yaml b/config/metadata_sources/cmip6-oi10/metadata.yaml new file mode 100644 index 00000000..923540cd --- /dev/null +++ b/config/metadata_sources/cmip6-oi10/metadata.yaml @@ -0,0 +1,26 @@ +name: cmip6_oi10 +experiment_uuid: b05038ca-8c78-4ca6-a914-ae33dd9abffe +description: Replicated CMIP6-era datasets catalogued by NCI +long_description: >- + All CMIP6-era replicated data contained under the project oi10. + All file versions present are in the listing. + Maintained By: NCI + Contact: help@nci.org.au + References: https://pcmdi.llnl.gov/CMIP6/ +model: +- CMIP6 +nominal_resolution: +- +version: +contact: NCI +email: help@nci.org.au +created: +reference: +license: +url: https://geonetwork.nci.org.au/geonetwork/srv/eng/catalog.search#/metadata/f5194_5909_8003_9216 +parent_experiment: +related_experiments: +- +notes: +keywords: +- cmip