From be690d4fa9bf214b933f5324a615feb2ace34c9e Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 20 May 2019 10:20:33 -0600 Subject: [PATCH 01/14] Update externals, the previous branch tag is identical to this tag --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index ae434f268e..c9b77c9691 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/ESMCI/cime -tag = branch_tags/cime5.6.15_a01 +tag = cime5.6.16 required = True [externals_description] From 5bfd72eecb7069ecb2c3d06337e71ae72ebaf3f3 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 20 May 2019 10:23:21 -0600 Subject: [PATCH 02/14] Change year end for ndep for SSP's to 2101, so can go to the end of 2100, fixes #717 --- bld/namelist_files/namelist_defaults_clm4_5.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index e9e222db82..a8fd450071 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -1056,11 +1056,11 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n 2015 -2100 +2101 2015 2015 -2100 +2101 2015 2010 From 3909af28dff36694692abe88c20498dc37e5b40f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 20 May 2019 10:24:54 -0600 Subject: [PATCH 03/14] Add a 2-degre WACCM test (for #716), and change some of the single point tests that were failing --- cime_config/testdefs/testlist_clm.xml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 0fded562b8..85c9e7b043 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -961,7 +961,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -981,10 +981,9 @@ - + - @@ -994,7 +993,6 @@ - @@ -1018,7 +1016,7 @@ - + @@ -1063,9 +1061,8 @@ - + - @@ -2045,6 +2042,16 @@ + + + + + + + + + From c427c337396cb4063ad963593fbe661ad69a073c Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 20 May 2019 10:25:32 -0600 Subject: [PATCH 04/14] Add a no-Carbon isotope WACCM deck needed for 2-degree cases --- .../cmip6_waccm_nociso_deck/README | 17 +++++++++++++++++ .../cmip6_waccm_nociso_deck/include_user_mods | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 cime_config/usermods_dirs/cmip6_waccm_nociso_deck/README create mode 100644 cime_config/usermods_dirs/cmip6_waccm_nociso_deck/include_user_mods diff --git a/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/README b/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/README new file mode 100644 index 0000000000..79cbbeefe8 --- /dev/null +++ b/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/README @@ -0,0 +1,17 @@ +WACCM DECK runs should be configured similarly to CAM DECK runs, but +without virtual elevation classes over Antarctica. At 2-degree we ++also decided to NOT turn on Carbon isotopes. + +(2018-10-22) In discussions between Bill Sacks and Bill Lipscomb: We +have decided NOT to turn on virtual Antarctica columns for any of the +WACCM simulations (DECK or ScenarioMIP): these weren't turned on in the +WACCM PI-Control or historical runs (either by accident or +intentionally: I'm not sure which, and can't find emails describing this +decision). Since this setting needs to be compatible with the REFCASE, +it's simpler if we keep it consistent for all WACCM runs, and there +seems to be only limited value in turning on virtual Antarctica columns +in the remaining WACCM runs (1% CO2, 4xCO2 and ScenarioMIP) when they +weren't on in the WACCM PI-Control or Historical runs. And Mike Mills +says that there won't be any more sharing of initial conditions between +CAM and WACCM CMIP6 runs, so it's fine if the two sets remain different +in this respect. diff --git a/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/include_user_mods b/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/include_user_mods new file mode 100644 index 0000000000..64c3f6f670 --- /dev/null +++ b/cime_config/usermods_dirs/cmip6_waccm_nociso_deck/include_user_mods @@ -0,0 +1,2 @@ +../_includes/cmip6_glaciers_cplhist +../output_crop From 440d5e0690b94d9ad4ba5eb127396609cc3cc7df Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 20 May 2019 11:41:05 -0600 Subject: [PATCH 05/14] Point to the nociso waccm deck for 2-degree --- cime_config/config_component.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 7025283ae4..4a5ababeeb 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -246,6 +246,7 @@ $COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_deck $COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_nociso_deck $COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_deck + $COMP_ROOT_DIR_LND/cime_config/usermods_dirs/cmip6_waccm_nociso_deck run_component_clm env_case.xml From 0115e0912bc0935611e2bf45a7273fe08cd22b1a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 21 May 2019 12:08:42 -0600 Subject: [PATCH 06/14] Add checks for negative special landunit types --- tools/mksurfdata_map/src/mksurfdat.F90 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/mksurfdata_map/src/mksurfdat.F90 b/tools/mksurfdata_map/src/mksurfdat.F90 index 173807dd9c..f0672a8840 100644 --- a/tools/mksurfdata_map/src/mksurfdat.F90 +++ b/tools/mksurfdata_map/src/mksurfdat.F90 @@ -1319,6 +1319,26 @@ subroutine normalizencheck_landuse(ldomain) do n = 1,ns_o ! Check preconditions + if ( pctlak(n) < 0.0_r8 )then + write(6,*) subname, ' ERROR: pctlak is negative!' + write(6,*) 'n, pctlak = ', n, pctlak(n) + call abort() + end if + if ( pctwet(n) < 0.0_r8 )then + write(6,*) subname, ' ERROR: pctwet is negative!' + write(6,*) 'n, pctwet = ', n, pctwet(n) + call abort() + end if + if ( pcturb(n) < 0.0_r8 )then + write(6,*) subname, ' ERROR: pcturb is negative!' + write(6,*) 'n, pcturb = ', n, pcturb(n) + call abort() + end if + if ( pctgla(n) < 0.0_r8 )then + write(6,*) subname, ' ERROR: pctgla is negative!' + write(6,*) 'n, pctgla = ', n, pctgla(n) + call abort() + end if suma = pctlak(n) + pctwet(n) + pcturb(n) + pctgla(n) if (suma > (100._r8 + tol_loose)) then From 4f4d4e38b3f520d937ae3b084b6ef1d4e1b10529 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 21 May 2019 13:17:19 -0600 Subject: [PATCH 07/14] Remove 8x16 and 32x64 from clm4.5/5.0 because of issue #726 where the surface datasets can't be created --- .../namelist_defaults_clm4_5.xml | 74 ------------------- .../namelist_definition_clm4_5.xml | 4 +- 2 files changed, 2 insertions(+), 76 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index a8fd450071..6ac3adc568 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -2009,80 +2009,6 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n lnd/clm2/mappingdata/maps/48x96/map_1km-merge-10min_HYDRO1K-merge-nomask_to_48x96_nomask_aave_da_c130405.nc -lnd/clm2/mappingdata/maps/32x64/map_0.5x0.5_MODIS_to_32x64_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/32x64/map_0.25x0.25_MODIS_to_32x64_nomask_aave_da_c170321.nc -lnd/clm2/mappingdata/maps/32x64/map_0.5x0.5_AVHRR_to_32x64_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/32x64/map_10x10min_nomask_to_32x64_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/32x64/map_5x5min_IGBP-GSDP_to_32x64_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/32x64/map_5x5min_nomask_to_32x64_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/32x64/map_5x5min_ISRIC-WISE_to_32x64_nomask_aave_da_c111115.nc -lnd/clm2/mappingdata/maps/32x64/map_5x5min_ORNL-Soil_to_32x64_nomask_aave_da_c170706.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_MODIS_to_32x64_nomask_aave_da_c111111.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_MODISv2_to_32x64_nomask_aave_da_c190505.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_MODIS-wCsp_to_32x64_nomask_aave_da_c160425.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_USGS_to_32x64_nomask_aave_da_c120926.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_LandScan2004_to_32x64_nomask_aave_da_c120518.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_GLOBE-Gardner_to_32x64_nomask_aave_da_c120923.nc -lnd/clm2/mappingdata/maps/32x64/map_3x3min_GLOBE-Gardner-mergeGIS_to_32x64_nomask_aave_da_c120923.nc -lnd/clm2/mappingdata/maps/32x64/map_0.9x1.25_GRDC_to_32x64_nomask_aave_da_c130308.nc -lnd/clm2/mappingdata/maps/32x64/map_360x720_cruncep_to_32x64_nomask_aave_da_c130326.nc -lnd/clm2/mappingdata/maps/32x64/map_1km-merge-10min_HYDRO1K-merge-nomask_to_32x64_nomask_aave_da_c130405.nc - -lnd/clm2/mappingdata/maps/8x16/map_0.5x0.5_MODIS_to_8x16_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/8x16/map_0.25x0.25_MODIS_to_8x16_nomask_aave_da_c170321.nc -lnd/clm2/mappingdata/maps/8x16/map_0.5x0.5_AVHRR_to_8x16_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/8x16/map_10x10min_nomask_to_8x16_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/8x16/map_5x5min_IGBP-GSDP_to_8x16_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/8x16/map_5x5min_nomask_to_8x16_nomask_aave_da_c110920.nc -lnd/clm2/mappingdata/maps/8x16/map_5x5min_ISRIC-WISE_to_8x16_nomask_aave_da_c111115.nc -lnd/clm2/mappingdata/maps/8x16/map_5x5min_ORNL-Soil_to_8x16_nomask_aave_da_c170706.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_MODIS_to_8x16_nomask_aave_da_c111111.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_MODISv2_to_8x16_nomask_aave_da_c190505.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_MODIS-wCsp_to_8x16_nomask_aave_da_c160425.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_USGS_to_8x16_nomask_aave_da_c120926.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_LandScan2004_to_8x16_nomask_aave_da_c120518.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_GLOBE-Gardner_to_8x16_nomask_aave_da_c120923.nc -lnd/clm2/mappingdata/maps/8x16/map_3x3min_GLOBE-Gardner-mergeGIS_to_8x16_nomask_aave_da_c120923.nc -lnd/clm2/mappingdata/maps/8x16/map_0.9x1.25_GRDC_to_8x16_nomask_aave_da_c130308.nc -lnd/clm2/mappingdata/maps/8x16/map_360x720_cruncep_to_8x16_nomask_aave_da_c130326.nc -lnd/clm2/mappingdata/maps/8x16/map_1km-merge-10min_HYDRO1K-merge-nomask_to_8x16_nomask_aave_da_c130411.nc - lnd/clm2/mappingdata/maps/4x5/map_0.5x0.5_MODIS_to_4x5_nomask_aave_da_c110822.nc +"conus_30_x8,512x1024,360x720cru,128x256,64x128,48x96,,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> Horizontal resolutions -Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools +Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min, 1km-merge-10min and 0.33x0.33 are only used for CLM tools Date: Tue, 21 May 2019 15:06:47 -0600 Subject: [PATCH 08/14] Add mapping files for 94x192 and add compsets with Qian for single point tests (for speed and less memory usage) --- .../namelist_defaults_clm4_5.xml | 47 +++++++++++++++++++ cime_config/config_compsets.xml | 19 ++++++++ 2 files changed, 66 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index 6ac3adc568..48b09faca7 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -2545,6 +2545,53 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n + + + +lnd/clm2/mappingdata/maps/94x192/map_3x3min_USGS_to_94x192_nomask_aave_da_c120926.nc +lnd/clm2/mappingdata/maps/94x192/map_0.5x0.5_nomask_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_5x5min_ORNL-Soil_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_94x192_nomask_to_0.5x0.5_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_5x5min_IGBP-GSDP_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_3x3min_MODIS-wCsp_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_1km-merge-10min_HYDRO1K-merge-nomask_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_0.5x0.5_MODIS_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_5x5min_nomask_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_0.5x0.5_USGS_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_0.9x1.25_GRDC_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_10x10min_nomask_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_10x10min_IGBPmergeICESatGIS_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_3x3min_LandScan2004_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_360x720cru_cruncep_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_3x3min_GLOBE-Gardner_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_0.25x0.25_MODIS_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_0.5x0.5_AVHRR_to_94x192_nomask_aave_da_c110823.nc +lnd/clm2/mappingdata/maps/94x192/map_5x5min_ISRIC-WISE_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_3x3min_GLOBE-Gardner-mergeGIS_to_94x192_nomask_aave_da_c190521.nc +lnd/clm2/mappingdata/maps/94x192/map_3x3min_MODISv2_to_94x192_nomask_aave_da_c190521.nc + + diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6f9f1b1c86..cff59f02fa 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -131,6 +131,15 @@ 2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + + I2000Clm50BgcCropQianGs + 2000_DATM%QIA_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + I2000Clm50BgcCruGs 2000_DATM%CRUv7_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV @@ -208,6 +217,16 @@ HIST_DATM%QIA_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV + + + + IHistClm50BgcCropQianGs + HIST_DATM%QIA_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + IHistClm50BgcCropGs From b9d2c55e5774d5ae2918dc884357be91ab611547 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 21 May 2019 15:12:59 -0600 Subject: [PATCH 09/14] Update expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 08e6c189b0..39ebe743ed 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -2,8 +2,8 @@ - FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly RUN - FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_intel.clm-monthly RUN + FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianGs.cheyenne_gnu.clm-monthly RUN + FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianGs.cheyenne_intel.clm-monthly RUN FAIL ERP_D_Ld5.f09_g17.I2000Clm50Vic.cheyenne_intel.clm-vrtlay RUN FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN @@ -11,11 +11,6 @@ FAIL ERS_D_Ld5.1x1_brazil.I2000Clm50FatesCruGs.cheyenne_intel.clm-FatesHydro COMPARE_base_rest FAIL ERS_D_Ld5.1x1_brazil.I2000Clm50FatesCruGs.hobart_nag.clm-FatesHydro RUN - PEND ERS_Lm40_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly RUN - PEND ERS_Lm54_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-cropMonthOutput RUN - PEND ERS_Ly3_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropGs.cheyenne_gnu.clm-cropMonthOutput RUN - PEND ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropGs.cheyenne_gnu.clm-cropMonthOutput RUN - PEND ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcDvCropQianGs.cheyenne_gnu.clm-cropMonthOutput RUN FAIL SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruGs.hobart_nag.clm-FatesHydro MEMLEAK From 027faafe52e24b7857e3958a09f4ea03f8f68adc Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 22 May 2019 00:57:32 -0600 Subject: [PATCH 10/14] Make sure pctwet can not be negative --- tools/mksurfdata_map/src/mksurfdat.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mksurfdata_map/src/mksurfdat.F90 b/tools/mksurfdata_map/src/mksurfdat.F90 index f0672a8840..85d8d72703 100644 --- a/tools/mksurfdata_map/src/mksurfdat.F90 +++ b/tools/mksurfdata_map/src/mksurfdat.F90 @@ -705,7 +705,7 @@ program mksurfdat pctwet(n) = 100._r8 - pctlak(n) pctgla(n) = 0._r8 else - pctwet(n) = 100._r8 - pctgla(n) - pctlak(n) + pctwet(n) = max(100._r8 - pctgla(n) - pctlak(n), 0.0_r8) end if pcturb(n) = 0._r8 call pctnatpft(n)%set_pct_l2g(0._r8) From c90c9af4b32e2c32a692a8afd0e3096b24d5bacb Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 22 May 2019 11:30:25 -0600 Subject: [PATCH 11/14] Remove the ne120 and conus_30_x8 surface datasets since the files are bad with negative pctwet (issue #673) --- .../namelist_defaults_clm4_5.xml | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index 48b09faca7..678bf29b57 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -727,16 +727,11 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_4x5_hist_16pfts_Irrig_CMIP6_sim lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_10x15_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc - -lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne120np4_hist_16pfts_Irrig_CMIP6_simyr2000_c190304.nc lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne30np4_hist_16pfts_Irrig_CMIP6_simyr2000_c190303.nc lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne16np4_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc - -lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_conus_30_x8_hist_16pfts_Irrig_CMIP6_simyr2000_c190128.nc - lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_5x5_amazon_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc @@ -760,16 +755,11 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_numaIA_hist_78pfts_CMIP6_si lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_smallvilleIA_hist_78pfts_CMIP6_simyr2000_c190214.nc - -lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne120np4_hist_78pfts_CMIP6_simyr2000_c190304.nc lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne30np4_hist_78pfts_CMIP6_simyr2000_c190303.nc lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne16np4_hist_78pfts_CMIP6_simyr2000_c190214.nc - -lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr2000_c190128.nc - lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_camdenNJ_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc @@ -797,14 +787,9 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_4x5_hist_16pfts_Irrig_CMIP6_sim lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_brazil_hist_16pfts_Irrig_CMIP6_simyr1850_c190214.nc - -lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne120np4_hist_16pfts_Irrig_CMIP6_simyr1850_c190304.nc lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850_c190303.nc - -lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_16pfts_Irrig_CMIP6_simyr1850_c190128.nc - lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_48x96_hist_78pfts_CMIP6_simyr1850_c190214.nc @@ -825,14 +810,9 @@ lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_numaIA_hist_78pfts_CMIP6_si lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1x1_brazil_hist_78pfts_CMIP6_simyr1850_c190214.nc - -lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_ne120np4_hist_78pfts_CMIP6_simyr1850_c190304.nc lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc - -lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.nc - lnd/clm2/surfdata_map/surfdata_0.9x1.25_hist_16pfts_nourb_CMIP6_simyrPtVg_c181114.nc @@ -853,14 +833,9 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n lnd/clm2/surfdata_map/landuse.timeseries_1x1_brazil_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc -lnd/clm2/surfdata_map/landuse.timeseries_ne120np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c1908304.nc lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc -lnd/clm2/surfdata_map/landuse.timeseries_conus_30_x8_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c181003.nc - lnd/clm2/surfdata_map/landuse.timeseries_1x1_numaIA_hist_78pfts_CMIP6_simyr1850-2015_c170917.nc -lnd/clm2/surfdata_map/landuse.timeseries_ne120np4_hist_78pfts_CMIP6_simyr1850-2015_c190304.nc lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_78pfts_CMIP6_simyr1850-2015_c179824.nc -lnd/clm2/surfdata_map/landuse.timeseries_conus_30_x8_hist_78pfts_CMIP6_simyr1850-2015_c181004.nc - Date: Wed, 22 May 2019 13:00:44 -0600 Subject: [PATCH 12/14] Update change files --- doc/.release-ChangeLog_template | 2 +- doc/ChangeSum | 1 + doc/release-clm5.0.ChangeLog | 98 +++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) diff --git a/doc/.release-ChangeLog_template b/doc/.release-ChangeLog_template index 404cbc5364..19c997d86d 100644 --- a/doc/.release-ChangeLog_template +++ b/doc/.release-ChangeLog_template @@ -71,7 +71,7 @@ Testing: Summary of Answer changes: ------------------------- -Baseline version for comparison: +If the tag used for baseline comparisons was NOT the previous tag, note that here: previous Changes answers relative to baseline: diff --git a/doc/ChangeSum b/doc/ChangeSum index a6583fb273..550011e40f 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ +release-clm5.0.24 erik 05/22/2019 Correct ndep end year for SSPs, 2-degree CMIP6WACCMDECK with C-isotopes off, fixes mksurfdata for high resolution release-clm5.0.23 erik 05/15/2019 Update cime to bring in CO2 transient files for the CMIP6 SSP's as well as presaero for three of them release-clm5.0.22 erik 05/08/2019 Fix carbon isotope bug that caused wrong answers for isotopes under transient land-use change release-clm5.0.21 erik 05/03/2019 New ndep files, update fates, fix some issues diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index 2dd38bd856..382ab59de3 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,4 +1,102 @@ =============================================================== +Tag name: release-clm5.0.24 +Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) +Date: Wed May 22 12:57:45 MDT 2019 +One-line Summary: Correct ndep end year for SSPs, 2-degree CMIP6WACCMDECK with C-isotopes off, fixes mksurfdata for high resolution + +Purpose of this version: +------------------------ + +Fix a couple small issues. Correct end year for ndep for SSP's so can run to the end of 2100. Some fixes to mksurfdata_map for high +resolution surface datasets. Have 2-degree WACCM-CMIP6DECK match a user-mod directory without carbon isotopes on. Remove the +ne120np4 and conus_30_x8 surface dataset files, as they can't be used (see #673). + +Remove 8x16, 32x64 resolutions as they are no longer needed and there are problems with them. Add in the mapping files needed for +94x192. Check that special landunit percent area's is not less than 0.0, and don't let PCT_WET be less than zero for areas with +ocean (see #673). + +Change some of the longer single point tests to use Qian forcing (as faster, less memory, less problems). Add compsets for this. +This change was also done on master. + +CTSM Master Tag This Corresponds To: ctsm1.0.dev025 (with many other changes) + +Summary of changes: +------------------- + +Issues fixed (include CTSM Issue #): #673, #714, #716, #717, #726 + + Fixes #726 -- Some resolutions fail in mksurfdata_map + Fixes #717 -- Change end year for ndep to 2101 for SSP's + Fixes #716 -- 2 degree CMIP6WACCMDECK needs Carbon isotopes off + Fixes #714 -- Fails on cheyenne for some longer single point simulations + Fixes #673 -- Ice shelf wetland fix in mksurfdata_map can lead to glacier+lake > 100% on surface datasets + +Science changes since: release-clm5.0.23 + Turn Carbon isotopes off for 2-degree CMIP6WACCMDECK + +Software changes since: release-clm5.0.23 + End year for ndep is now 2101, so will run to end of 2100 + Fixes to mksurfdata_map for high resolutions + +Changes to User Interface since: release-clm5.0.23 + Remove ne120np, conus_30_x8 surface datasets + Remove 8x16, and 32x64 resolutions + Add 94x192 mapping files, so can work in mksurfdata_map + +Testinw: +-------- + + [PASS means all tests PASS and OK means tests PASS other than expected fails.] + + build-namelist tests: + + cheyenne - PASS + + unit-tests (components/clm/src): + + cheyenne - PASS + hobart ---PASS + + tools-tests (components/clm/test/tools): + + cheyenne - PASS + + regular tests (aux_clm): + + cheyenne_intel ---- OK + cheyenne_gnu ------ OK + hobart_nag -------- OK + hobart_pgi -------- OK + hobart_intel ------ OK + +Summary of Answer changes: +------------------------- + +If the tag used for baseline comparisons was NOT the previous tag, note that here: previous + +Changes answers relative to baseline: No + +Detailed list of changes: +------------------------ + +Externals being used: (cime goes from branch to full tag) + + cism: release-cesm2.0.04 + rtm: release-cesm2.0.02 + mosart: release-cesm2.0.03 + cime: cim5.6.16 + FATES: fates_s1.21.0_a7.0.0_br_rev2 + PTCLM: PTCLM2_180611 + +CTSM Tag versions pulled over from master development branch: None + +Pull Requests that document the changes (include PR ids): #720 +(https://github.com/ESCOMP/ctsm/pull) + + #720 -- Fix a couple small issues, 2-degree no-ciso for WACCMDECK and ndep end year 2101 + +=============================================================== +=============================================================== Tag name: release-clm5.0.23 Originator(s): erik (Erik Kluzek) Date: Wed May 15 15:31:15 MDT 2019 From ccc12ef060113d9835df65d166b242664cee7b96 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 22 May 2019 13:32:11 -0600 Subject: [PATCH 13/14] Correct build-namelist unit tests for removal of ne120 and conus_30_x8 tests, fix list of resolutions, build-namelist tests now runs correctly --- bld/namelist_files/namelist_definition_clm4_5.xml | 2 +- bld/unit_testers/build-namelist_test.pl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bld/namelist_files/namelist_definition_clm4_5.xml b/bld/namelist_files/namelist_definition_clm4_5.xml index 1a54365be3..ca6361ab7c 100644 --- a/bld/namelist_files/namelist_definition_clm4_5.xml +++ b/bld/namelist_files/namelist_definition_clm4_5.xml @@ -1781,7 +1781,7 @@ CLM run type. +"conus_30_x8,512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> Horizontal resolutions Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min, 1km-merge-10min and 0.33x0.33 are only used for CLM tools diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index e07de30143..00a1c6234b 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -123,9 +123,9 @@ sub make_env_run { # # Figure out number of tests that will run # -my $ntests = 828; +my $ntests = 820; if ( defined($opts{'compare'}) ) { - $ntests += 504; + $ntests += 498; } plan( tests=>$ntests ); @@ -1087,6 +1087,10 @@ sub make_env_run { $res eq "360x720cru" || $res eq "512x1024" ) { next; + # Resolutions not supported on release branch + } elsif ( $res eq "ne120np4" || + $res eq "conus_30_x8" ) { + next; } &make_env_run(); From 9fe54291d527ea432e39d18235aa6b207a196000 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 22 May 2019 13:33:59 -0600 Subject: [PATCH 14/14] Changelog update --- doc/release-clm5.0.ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index 382ab59de3..4ae1eebd6c 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: release-clm5.0.24 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) -Date: Wed May 22 12:57:45 MDT 2019 +Date: Wed May 22 13:33:48 MDT 2019 One-line Summary: Correct ndep end year for SSPs, 2-degree CMIP6WACCMDECK with C-isotopes off, fixes mksurfdata for high resolution Purpose of this version: @@ -50,7 +50,7 @@ Testinw: build-namelist tests: - cheyenne - PASS + cheyenne - PASS (15 SSP tests are different as expected) unit-tests (components/clm/src): @@ -60,6 +60,7 @@ Testinw: tools-tests (components/clm/test/tools): cheyenne - PASS + hobart --- PASS regular tests (aux_clm):