diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json index 0eb0f36..79cd9d8 100644 --- a/Tables/input4MIPs_A3hr.json +++ b/Tables/input4MIPs_A3hr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_A3hr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json index 8e034fd..8813338 100644 --- a/Tables/input4MIPs_A3hrPt.json +++ b/Tables/input4MIPs_A3hrPt.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_A3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json index c15ce73..0f55f79 100644 --- a/Tables/input4MIPs_Afx.json +++ b/Tables/input4MIPs_Afx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"alevel", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ayr.json b/Tables/input4MIPs_Ayr.json index 78af5a2..6aa435f 100644 --- a/Tables/input4MIPs_Ayr.json +++ b/Tables/input4MIPs_Ayr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"alevel alevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos atmosChem", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Ayr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_CV.json b/Tables/input4MIPs_CV.json index 19dac3a..bd840ca 100644 --- a/Tables/input4MIPs_CV.json +++ b/Tables/input4MIPs_CV.json @@ -20,9 +20,9 @@ "1hr":"sampled hourly", "1hrCM":"monthly-mean diurnal cycle resolving each day into 1-hour means", "1hrPt":"sampled hourly, at specified time point within an hour", - "3hr":"sampled every 3 hours", + "3hr":"3 hourly mean samples", "3hrPt":"sampled 3 hourly, at specified time point within the time period", - "6hr":"sampled every 6 hours", + "6hr":"6 hourly mean samples", "6hrPt":"sampled 6 hourly, at specified time point within the time period", "day":"daily mean samples", "dec":"decadal mean samples", @@ -111,7 +111,8 @@ "CMIP2", "CMIP3", "CMIP5", - "CMIP6" + "CMIP6", + "CMIP6Plus" ], "nominal_resolution":[ "0.5 km", @@ -248,6 +249,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -276,6 +278,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -304,6 +307,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -332,6 +336,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -360,6 +365,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -388,6 +394,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -416,6 +423,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -444,6 +452,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -472,6 +481,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -500,6 +510,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -528,6 +539,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -556,6 +568,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -584,6 +597,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -612,6 +626,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -640,6 +655,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -662,6 +678,7 @@ "title":"ISMIP6 (CMIP6) - MIROC5-rcp85-1-0 derived data prepared for input4MIPs" }, "MRI-JRA55-do-1-3":{ + "mip_era":"CMIP6", "source":"MRI JRA55-do 1.3: Atmospheric state generated for OMIP based on the JRA-55 reanalysis" }, "MRI-JRA55-do-1-3-2":{ @@ -671,6 +688,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -713,6 +731,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -755,6 +774,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -797,6 +817,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -825,6 +846,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -847,6 +869,7 @@ "title":"ISMIP6 (CMIP6) - NorESM1-M-rcp85-1-0 derived data prepared for input4MIPs" }, "PCMDI-AMIP-1-1-3":{ + "mip_era":"CMIP6", "source":"PCMDI-AMIP 1.1.3: Merged SST based on UK MetOffice HadISST and NCEP OI2" }, "PCMDI-AMIP-1-1-4":{ @@ -858,6 +881,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -890,6 +914,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -922,6 +947,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -946,7 +972,8 @@ "title":"PCMDI-AMIP 1.1.6 dataset prepared for input4MIPs" }, "PCMDI-AMIP-1-2-0":{ - "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)", + "calendar":"gregorian", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-06)", "contact":"PCMDI (pcmdi-cmip@llnl.gov)", "dataset_category":"SSTsAndSeaIce", "further_info_url":"https://pcmdi.llnl.gov/mips/amip", @@ -954,13 +981,14 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6Plus", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", "region":[ "global_ocean" ], - "release_year":"2020", + "release_year":"2021", "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2", "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6", "source_id":"PCMDI-AMIP-1-2-0", @@ -984,6 +1012,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json index 1ed5856..3f681c8 100644 --- a/Tables/input4MIPs_LIday.json +++ b/Tables/input4MIPs_LIday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json index fa0cb90..ee77f5d 100644 --- a/Tables/input4MIPs_LIfx.json +++ b/Tables/input4MIPs_LIfx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIfx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyr.json b/Tables/input4MIPs_LIyr.json index 759b87a..bbfbe9b 100644 --- a/Tables/input4MIPs_LIyr.json +++ b/Tables/input4MIPs_LIyr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce land", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrAnt.json b/Tables/input4MIPs_LIyrAnt.json index a395ee4..13a588c 100644 --- a/Tables/input4MIPs_LIyrAnt.json +++ b/Tables/input4MIPs_LIyrAnt.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"365.00", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIyrAnt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json index 6d7b41b..231474e 100644 --- a/Tables/input4MIPs_LIyrC.json +++ b/Tables/input4MIPs_LIyrC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrGre.json b/Tables/input4MIPs_LIyrGre.json index e569876..3580ae3 100644 --- a/Tables/input4MIPs_LIyrGre.json +++ b/Tables/input4MIPs_LIyrGre.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"365.00", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_LIyrGre" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json index 0eb3deb..e539f37 100644 --- a/Tables/input4MIPs_Lday.json +++ b/Tables/input4MIPs_Lday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Lday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lyr.json b/Tables/input4MIPs_Lyr.json index 85b4f21..e4cc3ae 100644 --- a/Tables/input4MIPs_Lyr.json +++ b/Tables/input4MIPs_Lyr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Lyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json index 4b54bc9..c521742 100644 --- a/Tables/input4MIPs_Oday.json +++ b/Tables/input4MIPs_Oday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Oday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json index 81aacdc..ed2ea8c 100644 --- a/Tables/input4MIPs_Ofx.json +++ b/Tables/input4MIPs_Ofx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Ofx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json index 5f3e2e7..885fa58 100644 --- a/Tables/input4MIPs_Omon.json +++ b/Tables/input4MIPs_Omon.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Omon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json index bf9151b..3195371 100644 --- a/Tables/input4MIPs_OmonC.json +++ b/Tables/input4MIPs_OmonC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_OmonC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oyr.json b/Tables/input4MIPs_Oyr.json index c6afe7c..dc6ef6b 100644 --- a/Tables/input4MIPs_Oyr.json +++ b/Tables/input4MIPs_Oyr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_Oyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json index b1e1973..8883360 100644 --- a/Tables/input4MIPs_OyrC.json +++ b/Tables/input4MIPs_OyrC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_OyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json index 84fc7e4..49f448e 100644 --- a/Tables/input4MIPs_SI3hrPt.json +++ b/Tables/input4MIPs_SI3hrPt.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_SI3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json index 0e53ece..4d35a84 100644 --- a/Tables/input4MIPs_SIday.json +++ b/Tables/input4MIPs_SIday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"1.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_SIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json index c987c03..68da338 100644 --- a/Tables/input4MIPs_SImon.json +++ b/Tables/input4MIPs_SImon.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", "generic_levels":"", "int_missing_value":"-999", - "mip_era":"CMIP6", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_SImon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json index a9ad7f8..b0cb7cd 100644 --- a/Tables/input4MIPs_grids.json +++ b/Tables/input4MIPs_grids.json @@ -2,10 +2,11 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "cmor_version":"3.5", - "data_specs_version":"01.00.32", + "data_specs_version":"01.00.33", + "mip_era":"CMIP6Plus", "missing_value":"1e20", "product":"input4MIPs", - "table_date":"14 September 2020", + "table_date":"02 September 2021", "table_id":"Table input4MIPs_grids" }, "axis_entry":{ diff --git a/input4MIPs_frequency.json b/input4MIPs_frequency.json index 03c959f..b9857c9 100644 --- a/input4MIPs_frequency.json +++ b/input4MIPs_frequency.json @@ -3,9 +3,9 @@ "1hr":"sampled hourly", "1hrCM":"monthly-mean diurnal cycle resolving each day into 1-hour means", "1hrPt":"sampled hourly, at specified time point within an hour", - "3hr":"sampled every 3 hours", + "3hr":"3 hourly mean samples", "3hrPt":"sampled 3 hourly, at specified time point within the time period", - "6hr":"sampled every 6 hours", + "6hr":"6 hourly mean samples", "6hrPt":"sampled 6 hourly, at specified time point within the time period", "day":"daily mean samples", "dec":"decadal mean samples", diff --git a/input4MIPs_mip_era.json b/input4MIPs_mip_era.json index 4442cc1..93191cc 100644 --- a/input4MIPs_mip_era.json +++ b/input4MIPs_mip_era.json @@ -4,6 +4,7 @@ "CMIP2", "CMIP3", "CMIP5", - "CMIP6" + "CMIP6", + "CMIP6Plus" ] } \ No newline at end of file diff --git a/input4MIPs_source_id.json b/input4MIPs_source_id.json index 3bd7df6..2fd5a79 100644 --- a/input4MIPs_source_id.json +++ b/input4MIPs_source_id.json @@ -7,6 +7,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -35,6 +36,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -63,6 +65,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -91,6 +94,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -119,6 +123,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -147,6 +152,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -175,6 +181,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -203,6 +210,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -231,6 +239,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -259,6 +268,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -287,6 +297,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -315,6 +326,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -343,6 +355,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -371,6 +384,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -399,6 +413,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -421,6 +436,7 @@ "title":"ISMIP6 (CMIP6) - MIROC5-rcp85-1-0 derived data prepared for input4MIPs" }, "MRI-JRA55-do-1-3":{ + "mip_era":"CMIP6", "source":"MRI JRA55-do 1.3: Atmospheric state generated for OMIP based on the JRA-55 reanalysis" }, "MRI-JRA55-do-1-3-2":{ @@ -430,6 +446,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -472,6 +489,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -514,6 +532,7 @@ "further_info_url":"http://climate.mri-jma.go.jp/~htsujino/jra55do.html", "institution":"Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan", "institution_id":"MRI", + "mip_era":"CMIP6", "product":"reanalysis", "references":"Tsujino et al., 2018: JRA-55 based surface dataset for driving ocean-sea-ice models (JRA55-do), Ocean Modelling, 130(1), pp 79-139. https://doi.org/10.1016/j.ocemod.2018.07.002", "region":[ @@ -556,6 +575,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -584,6 +604,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", @@ -606,6 +627,7 @@ "title":"ISMIP6 (CMIP6) - NorESM1-M-rcp85-1-0 derived data prepared for input4MIPs" }, "PCMDI-AMIP-1-1-3":{ + "mip_era":"CMIP6", "source":"PCMDI-AMIP 1.1.3: Merged SST based on UK MetOffice HadISST and NCEP OI2" }, "PCMDI-AMIP-1-1-4":{ @@ -617,6 +639,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -649,6 +672,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -681,6 +705,7 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", @@ -705,7 +730,8 @@ "title":"PCMDI-AMIP 1.1.6 dataset prepared for input4MIPs" }, "PCMDI-AMIP-1-2-0":{ - "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)", + "calendar":"gregorian", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-06)", "contact":"PCMDI (pcmdi-cmip@llnl.gov)", "dataset_category":"SSTsAndSeaIce", "further_info_url":"https://pcmdi.llnl.gov/mips/amip", @@ -713,13 +739,14 @@ "grid_label":"gn", "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", "institution_id":"PCMDI", + "mip_era":"CMIP6Plus", "nominal_resolution":"1x1 degree", "product":"observations", "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", "region":[ "global_ocean" ], - "release_year":"2020", + "release_year":"2021", "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2", "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6", "source_id":"PCMDI-AMIP-1-2-0", @@ -743,6 +770,7 @@ "further_info_url":"http://www.climate-cryosphere.org/wiki/index.php?title=ISMIP6_wiki_page", "institution":"NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA", "institution_id":"NASA-GSFC", + "mip_era":"CMIP6", "nominal_resolution":"10 km", "product":"derived", "references":"Experimental protocol for sealevel projections from ISMIP6 standalone ice sheet models, Nowicki, S. et al, 2020, https://doi.org/10.5194/tc-2019-322", diff --git a/src/writeJson.py b/src/writeJson.py index 32dfb4d..88cfa6a 100755 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -85,15 +85,24 @@ PJD 24 Jul 2020 - Add new tables for ISMIP6 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/107 PJD 24 Jul 2020 - Updated call to readJsonCreateDict(tableSource, rawGit) - added argument PJD 8 Sep 2020 - Register source_id MRI-JRA55-do-1-5-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/109 +PJD 26 Aug 2021 - Update to reflect PCMDI-AMIP-1-2-0 mip_era = CMIP6Plus +PJD 26 Aug 2021 - Update home path +PJD 27 Aug 2021 - Updated for Py3 +PJD 27 Aug 2021 - Updated upstreams 1.00.32 ->.33 +PJD 27 Aug 2021 - Added mip_era = 'CMIP6' to all existing source_id entries +PJD 27 Aug 2021 - Comment out updated for all previous demo versions of MRI-JMA-JRA55-do-1-3 -> 1-5-0 +PJD 27 Aug 2021 - Update table "mip_era":"CMIP6" -> "CMIP6 CMIP6Plus" +PJD 27 Aug 2021 - Add "CMIP6Plus" to mip_era; Update tables with mip_era":"CMIP6Plus" - TODO: Deal with lab cert issue https://raw.githubusercontent.com -> http://rawgit.com (see requests library) + - TODO: Generate versioning info @author: durack1 """ #%% Import statements -import copy, gc, json, os, shutil, subprocess, sys, time #, pdb -sys.path.append('/export/durack1/git/durolib/durolib/') -sys.path.append('/Volumes/durack1ml/sync/git/durolib/durolib/') +import copy, gc, json, os, sys, time #, shutil, subprocess, pdb +sys.path.append('/home/durack1/git/durolib/durolib/') +sys.path.append('/Users/durack1/sync/git/durolib/durolib/') from durolib import readJsonCreateDict #%% Determine path @@ -101,7 +110,7 @@ homePath = os.path.join('/','/'.join(os.path.realpath(sys.argv[0]).split('/')[0:-2])) #homePath = '/export/durack1/git/input4MIPs-cmor-tables/' ; # Linux #homePath = '/sync/git/input4MIPs-cmor-tables/src' ; # OS-X -print 'homePath:',homePath +print('homePath:', homePath) os.chdir(homePath) #%% List target tables @@ -219,12 +228,15 @@ ['SIday','PCMDI/cmip6-cmor-tables/master/Tables/CMIP6_SIday.json'], ['SImon','PCMDI/cmip6-cmor-tables/master/Tables/CMIP6_SImon.json'], ] -headerFree = ['coordinate', 'frequency', 'formula_terms', 'grid_label', +notTable = ['coordinate', 'frequency', 'formula_terms', 'grid_label', 'nominal_resolution', 'realm', 'region', 'source_id', 'target_mip'] +headerFree = ['coordinate', 'frequency', 'formula_terms', 'grid_label', + 'nominal_resolution', 'realm', 'region'] rawGit = 'https://raw.githubusercontent.com/' #%% Loop through tables and create in-memory objects # Loop through tableSource and create output tables + tmp = readJsonCreateDict(tableSource, rawGit) for count,table in enumerate(tmp.keys()): print('table:',table) @@ -236,19 +248,20 @@ vars()[table] = tmp[table].get(table) else: vars()[table] = tmp[table] -del(tmp,count,table) ; gc.collect() +del(tmp, count, table) ; gc.collect() # Cleanup by extracting only variable lists -for count2,table in enumerate(tableSource): +for count2, table in enumerate(tableSource): tableName = table[0] - print('tableName:',tableName) - #print eval(tableName) - if tableName in headerFree: + print('tableName:', tableName) + if tableName in notTable: continue else: - eval(tableName)['Header']['table_date'] = time.strftime('%d %B %Y') + eval(tableName)['Header']['mip_era'] = 'CMIP6Plus' #'CMIP6 CMIP6Plus' eval(tableName)['Header']['product'] = 'input4MIPs' - eval(tableName)['Header']['table_id'] = ''.join(['Table input4MIPs_',tableName]) + eval(tableName)['Header']['table_date'] = time.strftime('%d %B %Y') + eval(tableName)['Header']['table_id'] = ''.join(['Table input4MIPs_', + tableName]) #%% Cleanup imported tables # Fixed fields @@ -763,7 +776,8 @@ 'CMIP2', 'CMIP3', 'CMIP5', - 'CMIP6' + 'CMIP6', + 'CMIP6Plus' ] ; #%% Product @@ -814,45 +828,28 @@ source_id = source_id.get('source_id') # Fix issues -key = 'MRI-JRA55-do-1-5-0' -source_id[key] = {} -source_id[key]['comment'] = 'Based on JRA-55 reanalysis (1958-01 to 2020-07)' -source_id[key]['contact'] = 'Hiroyuki Tsujino (htsujino@mri-jma.go.jp)' -source_id[key]['dataset_category'] = 'atmosphericState' -source_id[key]['further_info_url'] = 'http://climate.mri-jma.go.jp/~htsujino/jra55do.html' -source_id[key]['institution_id'] = 'MRI' -source_id[key]['institution'] = 'Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan' -source_id[key]['product'] = 'reanalysis' -source_id[key]['references'] = ' '.join(['Tsujino et al., 2018: JRA-55 based surface dataset for', - 'driving ocean-sea-ice models (JRA55-do), Ocean Modelling,', - '130(1), pp 79-139.', - 'https://doi.org/10.1016/j.ocemod.2018.07.002']) -source_id[key]['region'] = ['global_ocean'] -source_id[key]['release_year'] = '2020' -source_id[key]['source_description'] = 'Atmospheric state and terrestrial runoff datasets produced by MRI for the OMIP experiment of CMIP6' -source_id[key]['source'] = 'MRI JRA55-do 1.5.0: Atmospheric state generated for OMIP based on the JRA-55 reanalysis' -source_id[key]['source_id'] = key -source_id[key]['source_type'] = 'satellite_blended' -source_id[key]['source_variables'] = ['areacello', 'friver', 'huss', 'licalvf', - 'prra', 'prsn', 'psl', 'rlds', 'sftof', - 'siconc', 'siconca', 'sos', 'tas', 'tos', - 'ts', 'uas', 'uos', 'vas', 'vos'] -source_id[key]['source_version'] = '1.5.0' -source_id[key]['target_mip'] = 'OMIP' -source_id[key]['title'] = 'MRI JRA55-do 1.5.0 dataset prepared for input4MIPs' -''' +# Add mip_era to all existing entries +for count, key in enumerate(source_id.keys()): + print(count, key) + source_id[key]['mip_era'] = 'CMIP6' + +# Update PCMDI-AMIP-1-2-0 key = 'PCMDI-AMIP-1-2-0' +source_id.pop(key, None) # Cleanup and start again source_id[key] = {} -source_id[key]['comment'] = 'Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)' +source_id[key]['calendar'] = 'gregorian' +source_id[key]['comment'] = 'Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-06)' source_id[key]['contact'] = 'PCMDI (pcmdi-cmip@llnl.gov)' source_id[key]['dataset_category'] = 'SSTsAndSeaIce' source_id[key]['grid'] = '1x1 degree longitude x latitude' source_id[key]['grid_label'] = 'gn' +#source_id[key]['frequency'] = 'mon' # See https://github.com/PCMDI/cmor/issues/628#issuecomment-912101615 source_id[key]['further_info_url'] = 'https://pcmdi.llnl.gov/mips/amip' source_id[key]['institution_id'] = 'PCMDI' source_id[key]['institution'] = 'Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA' source_id[key]['nominal_resolution'] = '1x1 degree' +source_id[key]['mip_era'] = 'CMIP6Plus' source_id[key]['product'] = 'observations' source_id[key]['references'] = ''.join(['Taylor, K.E., D. Williamson and F. Zwiers, ', '2000: The sea surface temperature and sea ice ', @@ -862,7 +859,7 @@ 'Lawrence Livermore National Laboratory, 25 pp. ', 'Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf']) source_id[key]['region'] = ['global_ocean'] -source_id[key]['release_year'] = '2020' +source_id[key]['release_year'] = '2021' source_id[key]['source_description'] = 'Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6' source_id[key]['source'] = 'PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2' source_id[key]['source_id'] = key @@ -873,6 +870,51 @@ source_id[key]['target_mip'] = 'CMIP' source_id[key]['title'] = 'PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs' +'''Think about adding +"#source": "PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2", <- already there +"#contact ": "PCMDI (pcmdi-cmip@llnl.gov)", <- already there +"#further_info_url": "https://pcmdi.llnl.gov/mips/amip", <- already there + +"#dataset_category": "SSTsAndSeaIce", <- already there +"#calendar": "gregorian", <- already there +"#frequency": "mon", <- already there +"#grid_label": "gn", <- already there +"#nominal_resolution": "1x1 degree", <- already there +"#region": "global_ocean", <- already there +''' + + + +''' +key = 'MRI-JRA55-do-1-5-0' +source_id[key] = {} +source_id[key]['comment'] = 'Based on JRA-55 reanalysis (1958-01 to 2020-07)' +source_id[key]['contact'] = 'Hiroyuki Tsujino (htsujino@mri-jma.go.jp)' +source_id[key]['dataset_category'] = 'atmosphericState' +source_id[key]['further_info_url'] = 'http://climate.mri-jma.go.jp/~htsujino/jra55do.html' +source_id[key]['institution_id'] = 'MRI' +source_id[key]['institution'] = 'Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan' +source_id[key]['product'] = 'reanalysis' +source_id[key]['references'] = ' '.join(['Tsujino et al., 2018: JRA-55 based surface dataset for', + 'driving ocean-sea-ice models (JRA55-do), Ocean Modelling,', + '130(1), pp 79-139.', + 'https://doi.org/10.1016/j.ocemod.2018.07.002']) +source_id[key]['region'] = ['global_ocean'] +source_id[key]['release_year'] = '2020' +source_id[key]['source_description'] = 'Atmospheric state and terrestrial runoff datasets produced by MRI for the OMIP experiment of CMIP6' +source_id[key]['source'] = 'MRI JRA55-do 1.5.0: Atmospheric state generated for OMIP based on the JRA-55 reanalysis' +source_id[key]['source_id'] = key +source_id[key]['source_type'] = 'satellite_blended' +source_id[key]['source_variables'] = ['areacello', 'friver', 'huss', 'licalvf', + 'prra', 'prsn', 'psl', 'rlds', 'sftof', + 'siconc', 'siconca', 'sos', 'tas', 'tos', + 'ts', 'uas', 'uos', 'vas', 'vos'] +source_id[key]['source_version'] = '1.5.0' +source_id[key]['target_mip'] = 'OMIP' +source_id[key]['title'] = 'MRI JRA55-do 1.5.0 dataset prepared for input4MIPs' +''' + +''' # Loop over ISMIP6 source_id entries sIds = [ 'ACCESS1-3-rcp85-1-0', @@ -959,14 +1001,14 @@ CV['CV']['source_id'] = source_id #%% Write variables to files -print 'Start Tables write:',os.getcwd() +print('Start Tables write:', os.getcwd()) for jsonName in masterTargets: #print jsonName # Clean experiment formats if jsonName in ['coordinate','grids']: #,'Amon','Lmon','Omon','SImon']: dictToClean = eval(jsonName) - for key, value1 in dictToClean.iteritems(): - for value2 in value1.iteritems(): + for key, value1 in dictToClean.items(): + for value2 in value1.items(): string = dictToClean[key][value2[0]] if not isinstance(string, list) and not isinstance(string, dict): string = string.strip() ; # Remove trailing whitespace @@ -1003,7 +1045,7 @@ else: jsonDict = eval(jsonName) fH = open(outFile,'w') - json.dump(jsonDict,fH,ensure_ascii=True,sort_keys=True,indent=4,separators=(',',':'),encoding="utf-8") + json.dump(jsonDict,fH,ensure_ascii=True,sort_keys=True,indent=4,separators=(',',':')) #,encoding="utf-8") fH.close() del(jsonName,outFile) ; gc.collect() @@ -1011,118 +1053,121 @@ # Validate - only necessary if files are not written by json module #%% Generate MRI-JMA-JRA55-do-1-3 demo directory -demoPath = os.path.join('/','/'.join(os.path.realpath(__file__).split('/')[0:-2]),'demo') -demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-3') -outPath = os.path.join(demoPath,'Tables') -# First purge existing -if os.path.exists(outPath): - shutil.rmtree(outPath) ; # Purge all existing - os.makedirs(outPath) -else: - os.makedirs(outPath) -os.chdir(demoPath) - -# Now fill Tables subdir with required files -cvTables = ['A3hr', 'A3hrPt', 'CV', 'Oday', 'OmonC', 'OyrC', 'SI3hrPt', - 'LIday', 'LIyrC', 'SIday', 'coordinate', 'formula_terms'] -for count,tableId in enumerate(cvTables): - fileName = ''.join(['input4MIPs_',tableId,'.json']) - sourcePath = os.path.join('..','..','Tables',fileName) - shutil.copy(sourcePath,'Tables') +# demoPath = os.path.join('/','/'.join(os.path.realpath(__file__).split('/')[0:-1]),'demo') +# #print('demoPath:', demoPath) +# demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-3') +# outPath = os.path.join(demoPath,'Tables') +# #print('outPath:', outPath) +# # First purge existing +# if os.path.exists(outPath): +# shutil.rmtree(outPath) ; # Purge all existing +# os.makedirs(outPath) +# else: +# os.makedirs(outPath) +# os.chdir(demoPath) + +# # Now fill Tables subdir with required files +# cvTables = ['A3hr', 'A3hrPt', 'CV', 'Oday', 'OmonC', 'OyrC', 'SI3hrPt', +# 'LIday', 'LIyrC', 'SIday', 'coordinate', 'formula_terms'] +# for count,tableId in enumerate(cvTables): +# fileName = ''.join(['input4MIPs_',tableId,'.json']) +# sourcePath = os.path.join('..','..','Tables',fileName) +# #print('pwd', os.getcwd()) +# #print('sourcePath', sourcePath) +# shutil.copy(sourcePath,'Tables') #%% Generate zip archive -env7za = os.environ.copy() -env7za['PATH'] = env7za['PATH'] + ':/export/durack1/bin/downloads/p7zip16.02/180204_build/p7zip_16.02/bin' -# Cleanup rogue files -#os.chdir(demoPath) -if os.path.exists('.DS_Store'): - os.remove('.DS_Store') -if os.path.exists('demo.zip'): - os.remove('demo.zip') -if os.path.exists('MRI-JMA-JRA55-do-1-3/demo.zip'): - os.remove('MRI-JMA-JRA55-do-1-3/demo.zip') -if os.path.exists('../MRI-JMA-JRA55-do-1-3/demo.zip'): - os.remove('../MRI-JMA-JRA55-do-1-3/demo.zip') -# Jump up one directory -os.chdir(demoPath.replace('/MRI-JMA-JRA55-do-1-3','')) -print os.getcwd() -# Zip demo dir -p = subprocess.Popen(['7za','a','demo.zip','MRI-JMA-JRA55-do-1-3','tzip','-xr!demo/MRI-JMA-JRA55-do-1-3', - '-xr!MRI-JMA-JRA55-do-1-3/testFiles','-xr!MRI-JMA-JRA55-do-1-3/input4MIPs'], - stdout=subprocess.PIPE,stderr=subprocess.PIPE,cwd=os.getcwd(),env=env7za) -stdout = p.stdout.read() ; # Use persistent variables for tests below -stderr = p.stderr.read() -# Move to demo dir -shutil.move('demo.zip', 'MRI-JMA-JRA55-do-1-3/demo.zip') +# env7za = os.environ.copy() +# env7za['PATH'] = env7za['PATH'] + ':/home/durack1/bin/downloads/p7zip16.02/180204_build/p7zip_16.02/bin' +# # Cleanup rogue files +# #os.chdir(demoPath) +# if os.path.exists('.DS_Store'): +# os.remove('.DS_Store') +# if os.path.exists('demo.zip'): +# os.remove('demo.zip') +# if os.path.exists('MRI-JMA-JRA55-do-1-3/demo.zip'): +# os.remove('MRI-JMA-JRA55-do-1-3/demo.zip') +# if os.path.exists('../MRI-JMA-JRA55-do-1-3/demo.zip'): +# os.remove('../MRI-JMA-JRA55-do-1-3/demo.zip') +# # Jump up one directory +# os.chdir(demoPath.replace('/MRI-JMA-JRA55-do-1-3','')) +# # Zip demo dir +# p = subprocess.Popen(['7za','a','demo.zip','MRI-JMA-JRA55-do-1-3','tzip','-xr!demo/MRI-JMA-JRA55-do-1-3', +# '-xr!MRI-JMA-JRA55-do-1-3/testFiles','-xr!MRI-JMA-JRA55-do-1-3/input4MIPs'], +# stdout=subprocess.PIPE,stderr=subprocess.PIPE,cwd=os.getcwd(),env=env7za) +# stdout = p.stdout.read() ; # Use persistent variables for tests below +# stderr = p.stderr.read() +# # Move to demo dir +# shutil.move('demo.zip', 'MRI-JMA-JRA55-do-1-3/demo.zip') #%% Generate MRI-JMA-JRA55-do-1-3-2 demo directory #demoPath = os.path.join('/','/'.join(os.path.realpath(__file__).split('/')[0:-2]),'demo') -demoPath = os.path.join(homePath,'demo') -os.chdir(demoPath) -#print 'MRI-JMA-JRA55-do-1-3-2 demo:',os.getcwd() -demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-3-2') -outPath = os.path.join(demoPath,'Tables') -# First purge existing -if os.path.exists(outPath): - shutil.rmtree(outPath) ; # Purge all existing - os.makedirs(outPath) -else: - os.makedirs(outPath) -os.chdir(outPath) - -# Now fill Tables subdir with required files -cvTables = ['Afx', 'Lday', 'OyrC', 'coordinate', 'formula_terms'] -#print 'MRI-JMA-JRA55-do-1-3-2 demo:',os.getcwd() -for count,tableId in enumerate(cvTables): - fileName = ''.join(['input4MIPs_',tableId,'.json']) - sourcePath = os.path.join('..','..','..','..','Tables',fileName) - shutil.copy(sourcePath,'.') +# demoPath = os.path.join(homePath,'demo') +# os.chdir(demoPath) +# #print 'MRI-JMA-JRA55-do-1-3-2 demo:',os.getcwd() +# demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-3-2') +# outPath = os.path.join(demoPath,'Tables') +# # First purge existing +# if os.path.exists(outPath): +# shutil.rmtree(outPath) ; # Purge all existing +# os.makedirs(outPath) +# else: +# os.makedirs(outPath) +# os.chdir(outPath) + +# # Now fill Tables subdir with required files +# cvTables = ['Afx', 'Lday', 'OyrC', 'coordinate', 'formula_terms'] +# #print('MRI-JMA-JRA55-do-1-3-2 demo:',os.getcwd()) +# for count,tableId in enumerate(cvTables): +# fileName = ''.join(['input4MIPs_',tableId,'.json']) +# sourcePath = os.path.join('..','..','..','Tables',fileName) +# shutil.copy(sourcePath,'.') #%% Generate MRI-JMA-JRA55-do-1-4-0 demo directory -demoPath = os.path.join(homePath,'demo') -os.chdir(demoPath) -#print 'MRI-JMA-JRA55-do-1-4-0 demo:',os.getcwd() -demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-4-0') -outPath = os.path.join(demoPath,'Tables') -# First purge existing -if os.path.exists(outPath): - shutil.rmtree(outPath) ; # Purge all existing - os.makedirs(outPath) -else: - os.makedirs(outPath) -os.chdir(outPath) - -# Now fill Tables subdir with required files -cvTables = ['Afx', 'A3hr', 'A3hrPt', 'CV', 'Lday', 'LIday', 'LIyrC', 'Oday', - 'OmonC', 'OyrC', 'SI3hrPt', 'SIday', 'coordinate', 'formula_terms'] -#print 'MRI-JMA-JRA55-do-1-4-0 demo:',os.getcwd() -for count,tableId in enumerate(cvTables): - fileName = ''.join(['input4MIPs_',tableId,'.json']) - sourcePath = os.path.join('..','..','..','Tables',fileName) - shutil.copy(sourcePath,'.') +# demoPath = os.path.join(homePath,'demo') +# os.chdir(demoPath) +# #print 'MRI-JMA-JRA55-do-1-4-0 demo:',os.getcwd() +# demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-4-0') +# outPath = os.path.join(demoPath,'Tables') +# # First purge existing +# if os.path.exists(outPath): +# shutil.rmtree(outPath) ; # Purge all existing +# os.makedirs(outPath) +# else: +# os.makedirs(outPath) +# os.chdir(outPath) + +# # Now fill Tables subdir with required files +# cvTables = ['Afx', 'A3hr', 'A3hrPt', 'CV', 'Lday', 'LIday', 'LIyrC', 'Oday', +# 'OmonC', 'OyrC', 'SI3hrPt', 'SIday', 'coordinate', 'formula_terms'] +# #print 'MRI-JMA-JRA55-do-1-4-0 demo:',os.getcwd() +# for count,tableId in enumerate(cvTables): +# fileName = ''.join(['input4MIPs_',tableId,'.json']) +# sourcePath = os.path.join('..','..','..','Tables',fileName) +# shutil.copy(sourcePath,'.') #%% Generate MRI-JMA-JRA55-do-1-5-0 demo directory -demoPath = os.path.join(homePath,'demo') -os.chdir(demoPath) -#print 'MRI-JMA-JRA55-do-1-5-0 demo:',os.getcwd() -demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-5-0') -outPath = os.path.join(demoPath,'Tables') -# First purge existing -if os.path.exists(outPath): - shutil.rmtree(outPath) ; # Purge all existing - os.makedirs(outPath) -else: - os.makedirs(outPath) -os.chdir(outPath) - -# Now fill Tables subdir with required files -cvTables = ['Afx', 'A3hr', 'A3hrPt', 'CV', 'Lday', 'LIday', 'LIyrC', 'Oday', - 'OmonC', 'OyrC', 'SI3hrPt', 'SIday', 'coordinate', 'formula_terms'] -#print 'MRI-JMA-JRA55-do-1-5-0 demo:',os.getcwd() -for count,tableId in enumerate(cvTables): - fileName = ''.join(['input4MIPs_',tableId,'.json']) - sourcePath = os.path.join('..','..','..','Tables',fileName) - shutil.copy(sourcePath,'.') +# demoPath = os.path.join(homePath,'demo') +# os.chdir(demoPath) +# #print 'MRI-JMA-JRA55-do-1-5-0 demo:',os.getcwd() +# demoPath = os.path.join(demoPath,'MRI-JMA-JRA55-do-1-5-0') +# outPath = os.path.join(demoPath,'Tables') +# # First purge existing +# if os.path.exists(outPath): +# shutil.rmtree(outPath) ; # Purge all existing +# os.makedirs(outPath) +# else: +# os.makedirs(outPath) +# os.chdir(outPath) + +# # Now fill Tables subdir with required files +# cvTables = ['Afx', 'A3hr', 'A3hrPt', 'CV', 'Lday', 'LIday', 'LIyrC', 'Oday', +# 'OmonC', 'OyrC', 'SI3hrPt', 'SIday', 'coordinate', 'formula_terms'] +# #print 'MRI-JMA-JRA55-do-1-5-0 demo:',os.getcwd() +# for count,tableId in enumerate(cvTables): +# fileName = ''.join(['input4MIPs_',tableId,'.json']) +# sourcePath = os.path.join('..','..','..','Tables',fileName) +# shutil.copy(sourcePath,'.') #%% Incorporate JSON versioning info - see https://docs.google.com/document/d/1pU9IiJvPJwRvIgVaSDdJ4O0Jeorv_2ekEtted34K9cA/edit#heading=h.w4kchhc266o3 @@ -1131,7 +1176,7 @@ input4MIPs = {} input4MIPs['data'] = {} # Generate institutions -keys = institution_id.keys(); keys.sort() +keys = institution_id.keys(); sorted(keys) #for inst in keys: # input4MIPs['data'][inst] = {} # Drop in version identifiers @@ -1229,5 +1274,5 @@ jsonDict['input4MIPs_version'] = input4MIPs # Write to file fH = open(outFile,'w') -json.dump(jsonDict,fH,ensure_ascii=True,sort_keys=True,indent=4,separators=(',',':'),encoding="utf-8") +json.dump(jsonDict,fH,ensure_ascii=True,sort_keys=True,indent=4,separators=(',',':'))#,encoding="utf-8") fH.close()