Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revise institution_id UCI; Process tweak #99

Merged
merged 1 commit into from
Nov 20, 2019
Merged

Revise institution_id UCI; Process tweak #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions Tables/input4MIPs_CV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,26 @@
"grz":"regridded zonal mean data reported on the data provider's preferred latitude target grid"
},
"institution_id":{
"institution_id":{
"CCCma":"Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada",
"CNRM-Cerfacs":"CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France), CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31100, France)",
"IACETH":"Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland",
"IAMC":"Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership for complete membership). Mailing address: International Institute for Applied Systems Analysis (IIASA), Schlossplatz 1, A-2361 Laxenburg, Austria",
"ImperialCollege":"Imperial College London, South Kensington Campus, London SW7 2AZ, UK",
"MOHC":"Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK",
"MPI-B":"Max Planck Institute for Biogeochemistry, Jena 07745, Germany",
"MPI-M":"Max Planck Institute for Meteorology, Hamburg 20146, Germany",
"MRI":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan",
"NCAR":"National Center for Atmospheric Research, Boulder, CO 80307, USA",
"NCAS":"National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK",
"PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
"PNNL-JGCRI":"Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA",
"SOLARIS-HEPPA":"SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany",
"UCI":"University of California - Irvine, Irvine, CA 92697, USA",
"UColorado":"University of Colorado, Boulder, CO 80309, USA",
"UReading":"University of Reading, Reading RG6 6UA, UK",
"UoM":"Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia",
"UofMD":"University of Maryland (UofMD), College Park, MD 20742, USA",
"VUA":"Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands"
}
"CCCma":"Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada",
"CNRM-Cerfacs":"CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France), CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31100, France)",
"IACETH":"Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland",
"IAMC":"Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership for complete membership). Mailing address: International Institute for Applied Systems Analysis (IIASA), Schlossplatz 1, A-2361 Laxenburg, Austria",
"ImperialCollege":"Imperial College London, South Kensington Campus, London SW7 2AZ, UK",
"MOHC":"Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK",
"MPI-B":"Max Planck Institute for Biogeochemistry, Jena 07745, Germany",
"MPI-M":"Max Planck Institute for Meteorology, Hamburg 20146, Germany",
"MRI":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan",
"NCAR":"National Center for Atmospheric Research, Boulder, CO 80307, USA",
"NCAS":"National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK",
"PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
"PNNL-JGCRI":"Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA",
"SOLARIS-HEPPA":"SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany",
"UCI":"Department of Earth System Science, University of California Irvine, Irvine, CA 92697, USA",
"UColorado":"University of Colorado, Boulder, CO 80309, USA",
"UReading":"University of Reading, Reading RG6 6UA, UK",
"UoM":"Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia",
"UofMD":"University of Maryland (UofMD), College Park, MD 20742, USA",
"VUA":"Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands"
},
"license":"<Your_Data_Identifier> data produced by <Your_Centre_Name> is licensed under a Creative Commons Attribution-[NonCommercial-]ShareAlike 4.0 International License (https://creativecommons.org/licenses). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing input4MIPs output, including citation requirements and proper acknowledgment. Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file). The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law.",
"mip_era":[
Expand Down
42 changes: 20 additions & 22 deletions demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_CV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,26 @@
"grz":"regridded zonal mean data reported on the data provider's preferred latitude target grid"
},
"institution_id":{
"institution_id":{
"CCCma":"Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada",
"CNRM-Cerfacs":"CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France), CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31100, France)",
"IACETH":"Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland",
"IAMC":"Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership for complete membership). Mailing address: International Institute for Applied Systems Analysis (IIASA), Schlossplatz 1, A-2361 Laxenburg, Austria",
"ImperialCollege":"Imperial College London, South Kensington Campus, London SW7 2AZ, UK",
"MOHC":"Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK",
"MPI-B":"Max Planck Institute for Biogeochemistry, Jena 07745, Germany",
"MPI-M":"Max Planck Institute for Meteorology, Hamburg 20146, Germany",
"MRI":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan",
"NCAR":"National Center for Atmospheric Research, Boulder, CO 80307, USA",
"NCAS":"National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK",
"PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
"PNNL-JGCRI":"Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA",
"SOLARIS-HEPPA":"SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany",
"UCI":"University of California - Irvine, Irvine, CA 92697, USA",
"UColorado":"University of Colorado, Boulder, CO 80309, USA",
"UReading":"University of Reading, Reading RG6 6UA, UK",
"UoM":"Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia",
"UofMD":"University of Maryland (UofMD), College Park, MD 20742, USA",
"VUA":"Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands"
}
"CCCma":"Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada",
"CNRM-Cerfacs":"CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France), CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31100, France)",
"IACETH":"Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland",
"IAMC":"Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership for complete membership). Mailing address: International Institute for Applied Systems Analysis (IIASA), Schlossplatz 1, A-2361 Laxenburg, Austria",
"ImperialCollege":"Imperial College London, South Kensington Campus, London SW7 2AZ, UK",
"MOHC":"Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK",
"MPI-B":"Max Planck Institute for Biogeochemistry, Jena 07745, Germany",
"MPI-M":"Max Planck Institute for Meteorology, Hamburg 20146, Germany",
"MRI":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan",
"NCAR":"National Center for Atmospheric Research, Boulder, CO 80307, USA",
"NCAS":"National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK",
"PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
"PNNL-JGCRI":"Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA",
"SOLARIS-HEPPA":"SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany",
"UCI":"Department of Earth System Science, University of California Irvine, Irvine, CA 92697, USA",
"UColorado":"University of Colorado, Boulder, CO 80309, USA",
"UReading":"University of Reading, Reading RG6 6UA, UK",
"UoM":"Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia",
"UofMD":"University of Maryland (UofMD), College Park, MD 20742, USA",
"VUA":"Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands"
},
"license":"<Your_Data_Identifier> data produced by <Your_Centre_Name> is licensed under a Creative Commons Attribution-[NonCommercial-]ShareAlike 4.0 International License (https://creativecommons.org/licenses). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing input4MIPs output, including citation requirements and proper acknowledgment. Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file). The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law.",
"mip_era":[
Expand Down
2 changes: 1 addition & 1 deletion input4MIPs_institution_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
"PNNL-JGCRI":"Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA",
"SOLARIS-HEPPA":"SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany",
"UCI":"University of California - Irvine, Irvine, CA 92697, USA",
"UCI":"Department of Earth System Science, University of California Irvine, Irvine, CA 92697, USA",
"UColorado":"University of Colorado, Boulder, CO 80309, USA",
"UReading":"University of Reading, Reading RG6 6UA, UK",
"UoM":"Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia",
Expand Down
44 changes: 22 additions & 22 deletions src/writeJson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
PJD 20 Nov 2019 - Update registration of PCMDI-AMIP-1-2-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/87
PJD 20 Nov 2019 - Update institution_id to maintain cross-CV formatting https://github.com/PCMDI/input4MIPs-cmor-tables/issues/93
PJD 20 Nov 2019 - Register source_id PCMDI-AMIP-1-1-6 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/94
PJD 20 Nov 2019 - Revise institution_id UCI https://github.com/PCMDI/input4MIPs-cmor-tables/issues/95
- TODO: Deal with lab cert issue https://raw.githubusercontent.com -> http://rawgit.com (see requests library)

@author: durack1
Expand Down Expand Up @@ -499,30 +500,29 @@

# Fix issues
institution_id = {}
institution_id['institution_id'] = {}
institution_id['institution_id']['CCCma'] = 'Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada'
institution_id['institution_id']['CNRM-Cerfacs'] = ('CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France),'
institution_id['CCCma'] = 'Canadian Centre for Climate Modelling and Analysis, Victoria, BC V8P 5C2, Canada'
institution_id['CNRM-Cerfacs'] = ('CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France),'
' CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31100, France)')
institution_id['institution_id']['IACETH'] = 'Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland'
institution_id['institution_id']['IAMC'] = ''.join(['Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership ',
institution_id['IACETH'] = 'Institute for Atmosphere and Climate, ETH Zurich, Zurich 8092, Switzerland'
institution_id['IAMC'] = ''.join(['Integrated Assessment Modeling Consortium (see www.globalchange.umd.edu/iamc/membership ',
'for complete membership). Mailing address: International Institute for Applied Systems Analysis ',
'(IIASA), Schlossplatz 1, A-2361 Laxenburg, Austria'])
institution_id['institution_id']['ImperialCollege'] = 'Imperial College London, South Kensington Campus, London SW7 2AZ, UK'
institution_id['institution_id']['MOHC'] = 'Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK'
institution_id['institution_id']['MPI-B'] = 'Max Planck Institute for Biogeochemistry, Jena 07745, Germany'
institution_id['institution_id']['MPI-M'] = 'Max Planck Institute for Meteorology, Hamburg 20146, Germany'
institution_id['institution_id']['MRI'] = 'Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan'
institution_id['institution_id']['NCAR'] = 'National Center for Atmospheric Research, Boulder, CO 80307, USA'
institution_id['institution_id']['NCAS'] = 'National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK'
institution_id['institution_id']['PCMDI'] = 'Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA'
institution_id['institution_id']['PNNL-JGCRI'] = 'Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA'
institution_id['institution_id']['SOLARIS-HEPPA'] = 'SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany'
institution_id['institution_id']['UCI'] = 'University of California - Irvine, Irvine, CA 92697, USA'
institution_id['institution_id']['UColorado'] = 'University of Colorado, Boulder, CO 80309, USA'
institution_id['institution_id']['UReading'] = 'University of Reading, Reading RG6 6UA, UK'
institution_id['institution_id']['UoM'] = 'Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia'
institution_id['institution_id']['UofMD'] = 'University of Maryland (UofMD), College Park, MD 20742, USA'
institution_id['institution_id']['VUA'] = 'Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands'
institution_id['ImperialCollege'] = 'Imperial College London, South Kensington Campus, London SW7 2AZ, UK'
institution_id['MOHC'] = 'Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK'
institution_id['MPI-B'] = 'Max Planck Institute for Biogeochemistry, Jena 07745, Germany'
institution_id['MPI-M'] = 'Max Planck Institute for Meteorology, Hamburg 20146, Germany'
institution_id['MRI'] = 'Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan'
institution_id['NCAR'] = 'National Center for Atmospheric Research, Boulder, CO 80307, USA'
institution_id['NCAS'] = 'National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK'
institution_id['PCMDI'] = 'Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA'
institution_id['PNNL-JGCRI'] = 'Pacific Northwest National Laboratory - Joint Global Change Research Institute, College Park, MD 20740, USA'
institution_id['SOLARIS-HEPPA'] = 'SOLARIS-HEPPA, GEOMAR Helmholtz Centre for Ocean Research, Kiel 24105, Germany'
institution_id['UCI'] = 'Department of Earth System Science, University of California Irvine, Irvine, CA 92697, USA'
institution_id['UColorado'] = 'University of Colorado, Boulder, CO 80309, USA'
institution_id['UReading'] = 'University of Reading, Reading RG6 6UA, UK'
institution_id['UoM'] = 'Australian-German Climate & Energy College, The University of Melbourne (UoM), Parkville, Victoria 3010, Australia'
institution_id['UofMD'] = 'University of Maryland (UofMD), College Park, MD 20742, USA'
institution_id['VUA'] = 'Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands'
#==============================================================================
# Example new experiment_id entry
#institution_id['institution_id']['NOAA-NCEI'] = 'NOAA\'s National Centers for Environmental Information, Asheville, NC 28801, USA'
Expand Down Expand Up @@ -747,7 +747,7 @@
if not os.path.exists('Tables'):
os.mkdir('Tables')
# Create host dictionary
if jsonName not in ['coordinate','formula_terms','grids','CV','institution_id',
if jsonName not in ['coordinate','formula_terms','grids','CV',
'Afx','Ofx','Omon','SImon','A3hr','A3hrPt','Oday','OmonC',
'OyrC','SI3hrPt','LIday','LIyrC','SIday','LIfx','Lday']:
jsonDict = {}
Expand Down