diff --git a/Externals.cfg b/Externals.cfg index a7c05ccdc6..ae434f268e 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 = cime5.6.14 +tag = branch_tags/cime5.6.15_a01 required = True [externals_description] diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index 3b3855e51e..e9e222db82 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -1085,56 +1085,33 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc - -lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc -lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc - -lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc + lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc - lnd/clm2/ndepdata/fndep_clm_SSP245_b.e21.BWSSP245cmip6.f09_g17.CMIP6-SSP2-4.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc - -lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc - -lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc +lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc + + +lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc +lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc +lnd/clm2/ndepdata/fndep_clm_SSP245_b.e21.BWSSP245cmip6.f09_g17.CMIP6-SSP2-4.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc +lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc cycle NDEP_month limit - -extend -NDEP_year -lnd/clm2/ndepdata/fndep_clm_hist_simyr1849-2006_1.9x2.5_c100428.nc - - -lnd/clm2/ndepdata/fndep_clm_rcp2.6_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp2.6_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp6.0_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp4.5_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp2.6_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp6.0_simyr1849-2106_1.9x2.5_c100810.nc -lnd/clm2/ndepdata/fndep_clm_rcp4.5_simyr1849-2106_1.9x2.5_c100428.nc -lnd/clm2/ndepdata/fndep_clm_rcp8.5_simyr1849-2106_1.9x2.5_c100428.nc +cycle +NDEP_month +limit bilinear @@ -2292,6 +2269,8 @@ lnd/clm2/surfdata_map/surfdata_conus_30_x8_hist_78pfts_CMIP6_simyr1850_c190128.n >lnd/clm2/mappingdata/maps/ne4np4/map_5x5min_ORNL-Soil_to_ne4np4_nomask_aave_da_c170706.nc lnd/clm2/mappingdata/maps/ne4np4/map_3x3min_MODIS_to_ne4np4_nomask_aave_da_c120906.nc +lnd/clm2/mappingdata/maps/ne4np4/map_3x3min_MODISv2_to_ne4np4_nomask_aave_da_c190514.nc lnd/clm2/mappingdata/maps/ne4np4/map_3x3min_MODIS-wCsp_to_ne4np4_nomask_aave_da_c160425.nc lnd/clm2/mappingdata/maps/ne16np4/map_0.5x0.5_MODIS_to_ne16np4_nomask_aave_da_c110922.nc lnd/clm2/mappingdata/maps/ne16np4/map_0.25x0.25_MODIS_to_ne16np4_nomask_aave_da_c170321.nc +lnd/clm2/mappingdata/maps/ne16np4/map_3x3min_MODISv2_to_ne16np4_nomask_aave_da_c190514.nc lnd/clm2/mappingdata/maps/ne16np4/map_0.5x0.5_AVHRR_to_ne16np4_nomask_aave_da_c110922.nc lnd/clm2/mappingdata/maps/ne120np4/map_5minx5min_irrig_to_ne120np4_aave_da_110817.nc lnd/clm2/mappingdata/maps/ne120np4/map_3x3min_MODIS_to_ne120np4_nomask_aave_da_c111111.nc +lnd/clm2/mappingdata/maps/ne120np4/map_3x3min_MODISv2_to_ne120np4_nomask_aave_da_c190514.nc lnd/clm2/mappingdata/maps/ne120np4/map_3x3min_MODIS-wCsp_to_ne120np4_nomask_aave_da_c160425.nc lnd/clm2/mappingdata/maps/ne240np4/map_5x5min_ORNL-Soil_to_ne240np4_nomask_aave_da_c170706.nc lnd/clm2/mappingdata/maps/ne240np4/map_3x3min_MODIS_to_ne240np4_nomask_aave_da_c111111.nc +lnd/clm2/mappingdata/maps/ne240np4/map_3x3min_MODISv2_to_ne240np4_nomask_aave_da_c190514.nc lnd/clm2/mappingdata/maps/ne240np4/map_3x3min_MODIS-wCsp_to_ne240np4_nomask_aave_da_c160425.nc atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc atm/waccm/lb/LBC_1750-2015_CMIP6_GlobAnnAvg_c180926.nc +atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP119_0p5degLat_c190514.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP126_0p5degLat_c180905.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP245_0p5degLat_c180905.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP370_0p5degLat_c180905.nc +atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP119_0p5degLat_c190514.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP460_0p5degLat_c180905.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP534os_0p5degLat_c180905.nc atm/waccm/lb/LBC_20140116-25001216_CMIP6_SSP585_0p5degLat_c180905.nc +atm/waccm/lb/LBC_2014-2500_CMIP6_SSP119_0p5degLat_GlobAnnAvg_c190514.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP126_0p5degLat_GlobAnnAvg_c190301.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP245_0p5degLat_GlobAnnAvg_c190301.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP370_0p5degLat_GlobAnnAvg_c190301.nc +atm/waccm/lb/LBC_2014-2500_CMIP6_SSP434_0p5degLat_GlobAnnAvg_c190514.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP460_0p5degLat_GlobAnnAvg_c190301.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP534os_0p5degLat_GlobAnnAvg_c190301.nc atm/waccm/lb/LBC_2014-2500_CMIP6_SSP585_0p5degLat_GlobAnnAvg_c190301.nc diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index be58b1991d..e07de30143 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 = 872; +my $ntests = 828; if ( defined($opts{'compare'}) ) { - $ntests += 540; + $ntests += 504; } plan( tests=>$ntests ); @@ -313,7 +313,7 @@ sub make_env_run { foreach my $options ( "-bgc bgc -use_case 1850-2100_SSP1-2.6_transient -namelist '&a start_ymd=20100101/'", "-bgc sp -use_case 1850-2100_SSP2-4.5_transient -namelist '&a start_ymd=18501223/'", - "-bgc bgc -use_case 1850-2100_SSP4-6.0_transient -namelist '&a start_ymd=20701029/'", + "-bgc bgc -use_case 1850-2100_SSP3-7.0_transient -namelist '&a start_ymd=20701029/'", "-bgc fates -use_case 2000_control -no-megan", "-bgc cn -use_case 1850-2100_SSP5-8.5_transient -namelist '&a start_ymd=19201023/'", "-bgc bgc -use_case 2000_control -namelist \"&a fire_method='nofire'/\" -crop", @@ -1238,8 +1238,8 @@ sub make_env_run { system( "../configure -s $mode" ); my @glc_res = ( "48x96", "0.9x1.25", "1.9x2.5" ); my @use_cases = ( "1850-2100_SSP1-2.6_transient", - "1850-2100_SSP3-4.5_transient", - "1850-2100_SSP4-6.0_transient", + "1850-2100_SSP2-4.5_transient", + "1850-2100_SSP3-7.0_transient", "1850-2100_SSP5-8.5_transient", "1850_control", "2000_control", @@ -1287,13 +1287,12 @@ sub make_env_run { } &cleanup(); } -# Transient ssp_rcp scenarios +# Transient ssp_rcp scenarios that work $mode = "-phys clm5_0"; system( "../configure -s $mode" ); my @tran_res = ( "0.9x1.25", "1.9x2.5", "10x15" ); foreach my $usecase ( "1850_control", "1850-2100_SSP5-8.5_transient", "1850-2100_SSP1-2.6_transient", "1850-2100_SSP3-7.0_transient", - "1850-2100_SSP4-3.4_transient", "1850-2100_SSP5-3.4_transient", "1850-2100_SSP2-4.5_transient", "1850-2100_SSP1-1.9_transient", - "1850-2100_SSP4-6.0_transient" ) { + "1850-2100_SSP2-4.5_transient" ) { foreach my $res ( @tran_res ) { $options = "-res $res -bgc bgc -crop -use_case $usecase -envxml_dir . "; &make_env_run(); @@ -1312,6 +1311,16 @@ sub make_env_run { &cleanup(); } } +# The SSP's that fail... +my $res = "0.9x1.25"; +foreach my $usecase ( "1850-2100_SSP4-3.4_transient", "1850-2100_SSP5-3.4_transient", "1850-2100_SSP1-1.9_transient", + "1850-2100_SSP4-6.0_transient" ) { + $options = "-res $res -bgc bgc -crop -use_case $usecase -envxml_dir . "; + &make_env_run(); + eval{ system( "$bldnml $options > $tempfile 2>&1 " ); }; + isnt( $?, 0, $usecase ); + system( "cat $tempfile" ); +} print "\n==================================================\n"; print "Test clm4.5/clm5.0 resolutions \n"; diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 2672fd133b..7025283ae4 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -169,10 +169,11 @@ constant,diagnostic,prognostic constant - diagnostic + diagnostic diagnostic prognostic diagnostic + diagnostic diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index a1191cbcb4..08e6c189b0 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -11,6 +11,11 @@ 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 diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 8c55610187..0fded562b8 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1566,7 +1566,25 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template index 5900998e46..27699a0582 100644 --- a/doc/.ChangeLog_template +++ b/doc/.ChangeLog_template @@ -123,6 +123,8 @@ Changes answers relative to baseline: URL for LMWG diagnostics output used to validate new climate: + Will new REFCASES need to be made for cesm and/or CAM?: No + (This will likely be true if the LII tests failed) Detailed list of changes ------------------------ diff --git a/doc/.release-ChangeLog_template b/doc/.release-ChangeLog_template index 7d3bad891f..404cbc5364 100644 --- a/doc/.release-ChangeLog_template +++ b/doc/.release-ChangeLog_template @@ -85,6 +85,9 @@ Changes answers relative to baseline: URL for LMWG diagnostics output for new climate: + Will new REFCASES need to be made for cesm and/or CAM?: No + (This will likely be true if the LII tests failed) + Detailed list of changes: ------------------------ diff --git a/doc/ChangeSum b/doc/ChangeSum index b6219ec405..a6583fb273 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ +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 release-clm5.0.20 erik 03/12/2019 Update all fsurdat files and bring in files for future scenarios, remove CMIP5 rcp options, bring in some bug fixes diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index 5b175a45db..2dd38bd856 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,4 +1,114 @@ =============================================================== +Tag name: release-clm5.0.23 +Originator(s): erik (Erik Kluzek) +Date: Wed May 15 15:31:15 MDT 2019 +One-line Summary: Update cime to bring in CO2 transient files for the CMIP6 SSP's as well as presaero for three of them + +Purpose of this version: +------------------------ + +With updated cime with transient CO2 for all CMIP6 SSP scenarios and prescribed aerosol files for three of +the CMIP6 SSP scenarios (SSP3-7.0, SSP2-4.5, SSP5-8.5). Previously all SSP scenaros would run, and use the +closest SSP nitrogen deposition file, now only the ones that are available work (Tier I). Also CLM4.5 used +the old CMIP5 ndep files, and now they use the CMIP6 ones available. + +Fix some small issues with some of the tools + +CTSM Master Tag This Corresponds To: ctsm1.0.dev025 (with many other changes) + +Summary of changes: +------------------- + +Issues fixed (include CTSM Issue #): #707 #708 #711 #712 + Fixes #707 -- Missing mapping files for hirespft + Fixes #708 -- time_bnds not set by tools/ncl_scripts/getco2_historical.ncl + Fixes #711 -- Model assumes the closest SSP scenario for ndep + Fixes #712 -- Missing CO2 files for SSP1-1.9 and SSP4-3.4 + +New issues found: #714 -- Fails with cheyenne_gnu for some longer single point tests + +Science changes since: release-clm5.0.22 + Forcing period is different for present day compsets (I2000, I2003, and I2010) + SSP scenarios now have CMIP6 transient CO2 and presaero (for SP3-7.0, SSP2-4.5, SSP5-8.5) + clm4.5 will use CMIP6 SSP ndep datasets rather than CMIP5 + +Software changes since: release-clm5.0.22 + None + +Changes to User Interface since: release-clm5.0.22 + Now SSP cases that don't have needed datasets will fail + +Testing: regular +-------- + + [PASS means all tests PASS and OK means tests PASS other than expected fails.] + + build-namelist tests: + + cheyenne - OK (36 tests are different as expected) + + unit-tests (components/clm/src): + + cheyenne - PASS + hobart --- PASS + + tools-tests (components/clm/test/tools): + + cheyenne - PASS + + PTCLM testing (components/clm/tools/shared/PTCLM/test): + + cheyenne - OK + + regular tests (aux_clm): + + cheyenne_intel ---- OK + cheyenne_gnu ------ OK + hobart_nag -------- OK + hobart_pgi -------- OK + hobart_intel ------ OK + + regular tests (fates): + + cheyenne_intel - OK + cheyenne_gnu --- OK + hobart_nag ----- OK + +Summary of Answer changes: +------------------------- + +Baseline version for comparison: release-clm5.0.22 + +Changes answers relative to baseline: Yes! + + Summarize any changes to answers, i.e., + - what code configurations: Present day compsets, SSP compsets, and Clm45 compsets + - what platforms/compilers: All + - nature of change: New datasets, new forcing period for present day + + Will new REFCASES need to be made for cesm and/or CAM?: No + (This will likely be true if the LII tests failed) + +Detailed list of changes: +------------------------ + +Externals being used: + + cism: release-cesm2.0.04 + rtm: release-cesm2.0.02 + mosart: release-cesm2.0.03 + cime: branch_tags/cime5.6.15_a01 (same as 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): #713 +(https://github.com/ESCOMP/ctsm/pull) + #713 -- Fix a few issues, and update cime to a version with CO2 SSP files as well as three presaero SSP files + +=============================================================== +=============================================================== Tag name: release-clm5.0.22 Originator(s): erik (Erik Kluzek) Date: Wed May 8 13:32:51 MDT 2019 diff --git a/tools/ncl_scripts/getco2_historical.ncl b/tools/ncl_scripts/getco2_historical.ncl index 8558f6dd01..1df0f82fbd 100644 --- a/tools/ncl_scripts/getco2_historical.ncl +++ b/tools/ncl_scripts/getco2_historical.ncl @@ -58,7 +58,7 @@ begin ntime = dimsizes( ncg->date ); sim_yr2 = ncg->date(ntime-1) / 10000; - sim_yr_rng = "_simyr_"+sim_yr0 + "-" + sim_yr2; + sim_yr_rng = "simyr_"+sim_yr0 + "-" + sim_yr2; cmip_vers = "_CMIP6_"; outco2filename = "fco2_datm_"+hgrid+ssp_rcp+"_"+sim_yr_rng+cmip_vers+"c"+sdate+".nc"; @@ -103,7 +103,7 @@ begin end if end if nco->$vars(i)$@units = units(i); - nco->$vars(i)$@lname = lname(i); + nco->$vars(i)$@long_name = lname(i); end do filevardef ( nco, "time", "float", (/ "time" /) ); filevardef ( nco, "time_bnds", "float", (/ "time", "bounds" /) ); @@ -170,6 +170,7 @@ begin ; nco->date = (/ ncg->date /); nco->time = (/ ncg->time /); + nco->time_bnds = (/ ncg->time_bnds /); nco->date@comment = "This variable is NOT used when read by datm, the time coordinate is used"; ; ; CO2