Add CMIP3 institutes names used at NCI (#2152)

.zenodo.json

@@ -182,6 +182,11 @@
  "affiliation": "DLR, Germany",
  "name": "Bauer, Julian"
  },
+ {
+ "affiliation": "ACCESS-NRI, Australia",
+ "name": "Beucher, Romain",
+ "orcid": "0000-0003-3891-5444"
+ },
  {
  "affiliation": "Forschungszentrum Juelich, Germany",
  "name": "Benke, Joerg"

CITATION.cff

@@ -191,6 +191,11 @@ authors:
  family-names: Bauer
  given-names: Julian
  -
+ affiliation: "ACCESS-NRI, Australia"
+ family-names: Beucher
+ given-names: Romain
+ orcid: "https://orcid.org/0000-0003-3891-5444"
+
  affiliation: "Forschungszentrum Juelich (FZJ), Germany"
  family-names: Benke
  given-names: Joerg

esmvalcore/config/extra_facets/cmip3-institutes.yml

@@ -14,23 +14,23 @@
 'cccma_cgcm3_1':
  '*':
  '*':
- institute: ['CCCMA']
+ institute: ['CCCMA', 'CCCma']
 'cccma_cgcm3_1_t63':
  '*':
  '*':
- institute: ['CCCMA']
+ institute: ['CCCMA', 'CCCma']
 'CCSM3':
  '*':
  '*':
  institute: ['NCAR']
 'CGCM3-1-T47':
  '*':
  '*':
- institute: ['CCCMA']
+ institute: ['CCCMA', 'CCCma']
 'CGCM3-1-T63':
  '*':
  '*':
- institute: ['CCCMA']
+ institute: ['CCCMA', 'CCCma']
 'CM2':
  '*':
  '*':
@@ -42,39 +42,39 @@
 'CM3':
  '*':
  '*':
- institute: ['CNRM', 'INM']
+ institute: ['CNRM', 'INM', 'CNRM_CERFACS']
 'CM4':
  '*':
  '*':
  institute: ['IPSL']
 'cnrm_cm3':
  '*':
  '*':
- institute: ['CNRM']
+ institute: ['CNRM', 'CNRM_CERFACS']
 'csiro_mk3_0':
  '*':
  '*':
- institute: ['CSIRO']
+ institute: ['CSIRO', 'CSIRO-QCCCE']
 'csiro_mk3_5':
  '*':
  '*':
- institute: ['CSIRO']
+ institute: ['CSIRO', 'CSIRO-QCCCE']
 'ECHAM4':
  '*':
  '*':
  institute: ['INGV']
 'ECHAM5':
  '*':
  '*':
- institute: ['MPIM']
+ institute: ['MPIM', 'MPI-M']
 'ECHO-G':
  '*':
  '*':
  institute: ['MIUB-KMA']
 'FGOALS-G1-0':
  '*':
  '*':
- institute: ['LASG']
+ institute: ['LASG', 'LASG-IAP']
 'gfdl_cm2_0':
  '*':
  '*':
@@ -86,27 +86,27 @@
 'GISS-AOM':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'GISS-EH':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'GISS-ER':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'giss_aom':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'giss_model_e_h':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'giss_model_e_r':
  '*':
  '*':
- institute: ['NASA']
+ institute: ['NASA', 'NASA-GISS']
 'HADCM3':
  '*':
  '*':
@@ -118,7 +118,7 @@
 'iap_fgoals1_0_g':
  '*':
  '*':
- institute: ['LASG']
+ institute: ['LASG', 'LASG-IAP']
 'ingv_echam4':
  '*':
  '*':
@@ -154,15 +154,15 @@
 'MK3':
  '*':
  '*':
- institute: ['CSIRO']
+ institute: ['CSIRO', 'CSIRO-QCCCE']
 'MK3-5':
  '*':
  '*':
- institute: ['CSIRO']
+ institute: ['CSIRO', 'CSIRO-QCCCE']
 'mpi_echam5':
  '*':
  '*':
- institute: ['MPIM']
+ institute: ['MPIM', 'MPI-M']
 'mri_cgcm2_3_2a':
  '*':
  '*':

tests/unit/config/test_config.py

@@ -100,7 +100,7 @@ def test_get_extra_facets_cmip3():
  })
  extra_facets = get_extra_facets(dataset, extra_facets_dir=tuple())
 
- assert extra_facets == {'institute': ['CNRM', 'INM']}
+ assert extra_facets == {'institute': ['CNRM', 'INM', 'CNRM_CERFACS']}
 
 
 def test_get_extra_facets_cmip5():