diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index ba51cee3c9..2931c0a715 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -971,7 +971,7 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc2000 1850 -2000 +2015 1850 2100 @@ -1064,13 +1064,13 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc2000 1850 -2010 +2016 1850 -2010 +2016 1850 -2010 +2016 lnd/clm2/firedata/clmforc.Li_2017_HYDEv3.2_CMIP6_hdm_0.5x0.5_AVHRR_simyr1850-2016_c180202.nc @@ -1104,13 +1104,13 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc2000 1850 -2010 +2106 1850 -2010 +2106 1850 -2010 +2106 lnd/clm2/urbandata/CLM50_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc diff --git a/bld/namelist_files/use_cases/1850_control.xml b/bld/namelist_files/use_cases/1850_control.xml index 1bce46e1e0..421c14ed4f 100644 --- a/bld/namelist_files/use_cases/1850_control.xml +++ b/bld/namelist_files/use_cases/1850_control.xml @@ -33,7 +33,7 @@ 1850 lnd/clm2/ndepdata/fndep_clm_hist_simyr1850_0.9x1.25_CMIP6_c180617.nc +>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc cycle diff --git a/bld/namelist_files/use_cases/20thC_transient.xml b/bld/namelist_files/use_cases/20thC_transient.xml index 3ee0134b9b..b0ee3f3576 100644 --- a/bld/namelist_files/use_cases/20thC_transient.xml +++ b/bld/namelist_files/use_cases/20thC_transient.xml @@ -2,10 +2,10 @@ -Simulate transient land-use, and aerosol deposition changes from 1850 to 2005 -Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2005 -Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2005 -Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2005 +Simulate transient land-use, and aerosol deposition changes from 1850 to 2015 +Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015 +Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015 +Simulate transient land-use, aerosol deposition, and Nitrogen deposition changes from 1850 to 2015 1850 @@ -36,15 +36,15 @@ 1850 1850 -2010 +2016 1850 1850 -2010 +2016 1850 1850 -2005 +2106 1850 diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index ae07999599..da8d8e1080 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -11,6 +11,7 @@ FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN + FAIL ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.hobart_nag.clm-Fates COMPARE_base_rest FAIL ERP_Ld9.f45_f45_mg37.I2000Clm45Fates.hobart_nag.clm-FatesAllVars COMPARE_base_rest FAIL ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.cheyenne_intel.clm-FatesLogging COMPARE_base_rest FAIL ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.cheyenne_intel.clm-Fates COMPARE_base_rest diff --git a/doc/ChangeSum b/doc/ChangeSum index 3fbeec19fb..79e7b0b4fd 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ +release-clm5.0.05 erik 08/05/2018 Update 1850 ndep file, and last year for transient streams release-clm5.0.04 erik 07/18/2018 Fix some NFIX variables, update cime/cism for upgraded hobart new glade, new diagnostic fields, update cmip6 output ctsm1.0.dev004 erik 07/18/2018 Add some new diagnostic fields, fix a few issues, update cmip6 output ctsm1.0.dev003 erik 07/15/2018 Update cime/cism to work on upgraded hobart and with glade changes on cheyenne diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index fdeadb141a..60a395e4cb 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,4 +1,108 @@ =============================================================== +Tag name: release-clm5.0.05 +Originator(s): erik (Erik Kluzek) +Date: Sun Aug 5 23:31:45 MDT 2018 +One-line Summary: Update 1850 ndep file, and last year for transient streams + +Purpose of this version: +------------------------ + +Update to latest Nitrogen Deposition file from simulations with WACCM for 1850. +Also fix an issue with the last year for historical transient cases. + + +Summary of changes: +------------------- + +Issues fixed (include CTSM Issue #): $461 + #461 -- increase year last for streams + +Science changes since: release-clm5.0.04 + New ndep file, and updated last year for transient streams + +Software changes since: None + +Changes to User Interface since: None + +Testing: +-------- + + [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 + hobart --- PASS + + PTCLM testing (components/clm/tools/shared/PTCLM/test): + + cheyenne - OK + hobart --- 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 + hobart_pgi -------- OK + hobart_intel ------ OK + + regular tests (clm_short): + + cheyenne_intel ---- OK + cheyenne_gnu ------ OK + hobart_nag -------- OK + hobart_pgi -------- OK + hobart_intel ------ OK + +Summary of Answer changes: +------------------------- + +Baseline version for comparison: release-clm5.0.04 + +Changes answers relative to baseline: Yes + + Summarize any changes to answers, i.e., + - what code configurations: for 1850 Bgc cases and after 2005 for transient cases + - what platforms/compilers: All + - nature of change: similar climate + +Detailed list of changes: +------------------------ + +Externals being used: + + cism: release-cesm2.0.04 + rtm: release-cesm2.0.00 + mosart: release-cesm2.0.00 + cime: cime5.6.10 + FATES: fates_s1.8.1_a3.0.0 + PTCLM: PTCLM2_180611 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + + #471 -- update ndep and last year of streams + +=============================================================== +=============================================================== Tag name: release-clm5.0.04 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) Date: Wed Jul 18 04:04:57 MDT 2018