From 305689006374b410cda5450bc549045eba24f6ec Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Nov 2018 00:26:35 -0700 Subject: [PATCH 1/3] Update cime version, and remove duplicate fsurdat file for f05 1850 that was getting picked instead of the correct one fixes #576 --- Externals.cfg | 2 +- bld/namelist_files/namelist_defaults_clm4_5.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 422deda98f..6d27d2b800 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 = cime_cesm2_1_rel_04 +tag = cime_cesm2_1_rel_05 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 eb4b247809..21809bcf9c 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -755,8 +755,6 @@ lnd/clm2/surfdata_map/surfdata_1x1_mexicocityMEX_16pfts_Irrig_CMIP6_simyr2000_c1 lnd/clm2/surfdata_map/surfdata_1x1_urbanc_alpha_16pfts_Irrig_CMIP6_simyr2000_c171214.nc - -lnd/clm2/surfdata_map/surfdata_0.47x0.63_16pfts_Irrig_CMIP6_simyr1850_c180508.nc lnd/clm2/surfdata_map/surfdata_360x720cru_16pfts_Irrig_CMIP6_simyr1850_c170824.nc From 697cc6d4fcdefa7f7d418464dd04c5fef13e4810 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Nov 2018 15:15:08 -0700 Subject: [PATCH 2/3] Initial update of change files --- doc/ChangeSum | 1 + doc/release-clm5.0.ChangeLog | 94 ++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/doc/ChangeSum b/doc/ChangeSum index 8360e89693..a5d728d1ba 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ +release-clm5.0.14 erik 11/28/2018 Update cime and fix surface dataset for f05 1850 non-crop case release-clm5.0.13 erik 11/14/2018 Update externals with new CO2/presearo/rtm/mosart, add science_support, change testing release-clm5.0.12 erik 11/03/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset release-clm5.0.11 erik 10/30/2018 Bring fix for transient Bgc/Sp to release branch (from ctsm1.0.dev013) diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index 72b1403dd0..417c153540 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,4 +1,98 @@ =============================================================== +Tag name: release-clm5.0.14 +Originator(s): erik (Erik Kluzek) +Date: Wed Nov 28 15:12:36 MST 2018 +One-line Summary: Update cime and fix surface dataset for f05 1850 non-crop case + +Purpose of this version: +------------------------ + + + +CTSM Master Tag This Corresponds To: + +Summary of changes: +------------------- + +Issues fixed (include CTSM Issue #): +CIME Issues fixed (include issue #): + +Science changes since: release-clm5.0.13 + +Software changes since: release-clm5.0.13 + +Changes to User Interface since: release-clm5.0.13 + +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 - OK + hobart --- OK + + 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 (prealpha): + + cheyenne_intel - PASS + cheyenne_gnu --- PASS + hobart_nag ----- PASS + + regular tests (prebeta): + + cheyenne_intel - PASS + cheyenne_gnu --- PASS + hobart_nag ----- PASS + +Summary of Answer changes: +------------------------- + +Baseline version for comparison: release-clm5.0.13 + +Changes answers relative to baseline: No (bit-for-bit) + +Detailed list of changes: +------------------------ + +Externals being used: + + cism: release-cesm2.0.04 + rtm: release-cesm2.0.02 + mosart: release-cesm2.0.03 + cime: cime_cesm2_1_rel_05 + FATES: fates_s1.8.1_a3.0.0 + PTCLM: PTCLM2_180611 + +CTSM Tag versions pulled over from master development branch: none + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + +=============================================================== +=============================================================== Tag name: release-clm5.0.13 Originator(s): erik (Erik Kluzek) Date: Wed Nov 14 11:28:00 MST 2018 From ad963273cbf8b80c7a0ad2db748148bb4d175906 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 29 Nov 2018 11:46:59 -0700 Subject: [PATCH 3/3] Update change files --- doc/ChangeSum | 2 +- doc/release-clm5.0.ChangeLog | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/ChangeSum b/doc/ChangeSum index a5d728d1ba..34b3b0b71f 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ -release-clm5.0.14 erik 11/28/2018 Update cime and fix surface dataset for f05 1850 non-crop case +release-clm5.0.14 erik 11/29/2018 Update cime and fix surface dataset for f05 1850 non-crop case release-clm5.0.13 erik 11/14/2018 Update externals with new CO2/presearo/rtm/mosart, add science_support, change testing release-clm5.0.12 erik 11/03/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset release-clm5.0.11 erik 10/30/2018 Bring fix for transient Bgc/Sp to release branch (from ctsm1.0.dev013) diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index 417c153540..fa91db9ae2 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,12 +1,14 @@ =============================================================== Tag name: release-clm5.0.14 Originator(s): erik (Erik Kluzek) -Date: Wed Nov 28 15:12:36 MST 2018 +Date: Thu Nov 29 11:46:41 MST 2018 One-line Summary: Update cime and fix surface dataset for f05 1850 non-crop case Purpose of this version: ------------------------ +Update cime to next version being used in cesm2.1.0 release. And fix the XML for f05 +surface dataset for 1850 and non-crop. Test that all six f05 cases work (1850/2000/Hist,crop/non-crop). CTSM Master Tag This Corresponds To: @@ -14,14 +16,16 @@ CTSM Master Tag This Corresponds To: Summary of changes: ------------------- -Issues fixed (include CTSM Issue #): -CIME Issues fixed (include issue #): +Issues fixed (include CTSM Issue #): #576 Science changes since: release-clm5.0.13 + None Software changes since: release-clm5.0.13 + Fix XML for f05 1850 non-crop fsurdat file Changes to User Interface since: release-clm5.0.13 + cpl auxilary history files names change Testing: -------- @@ -35,12 +39,10 @@ Testing: unit-tests (components/clm/src): cheyenne - PASS - hobart --- PASS tools-tests (components/clm/test/tools): cheyenne - OK - hobart --- OK PTCLM testing (components/clm/tools/shared/PTCLM/test): @@ -55,6 +57,14 @@ Testing: hobart_pgi -------- OK hobart_intel ------ OK + Also following PASS: + SMS.f05_f05_mg17.I1850Clm50BgcCrop.cheyenne_intel.clm-default + SMS.f05_f05_mg17.I1850Clm50Sp.cheyenne_intel.clm-default + SMS.f05_f05_mg17.I2000Clm50BgcCrop.cheyenne_intel.clm-default + SMS.f05_f05_mg17.I2000Clm50Sp.cheyenne_intel.clm-default + SMS.f05_f05_mg17.IHistClm50BgcCrop.cheyenne_intel.clm-default + SMS.f05_f05_mg17.IHistClm50Sp.cheyenne_intel.clm-default + regular tests (prealpha): cheyenne_intel - PASS @@ -88,8 +98,9 @@ Externals being used: CTSM Tag versions pulled over from master development branch: none -Pull Requests that document the changes (include PR ids): +Pull Requests that document the changes (include PR ids): #579 (https://github.com/ESCOMP/ctsm/pull) + #579 -- Fix bug in XML for surface dataset for f05 1850 non-crop =============================================================== ===============================================================