From de9bcc0895b693ed8282a280c4cf7ded8d1c51e6 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 4 Dec 2024 14:46:16 -0700 Subject: [PATCH 1/8] update(submodules): Bring in cdeps1.0.57 that has a change for cplhist cases to use the cam7 handling for nextsw_cday, also update share as needed for this to build --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 87676223a0..8ef8853a13 100644 --- a/.gitmodules +++ b/.gitmodules @@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.53 +fxtag = cdeps1.0.57 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git @@ -100,7 +100,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git [submodule "share"] path = share url = https://github.com/ESCOMP/CESM_share -fxtag = share1.1.2 +fxtag = share1.1.3 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share From c416479dba82445dbe9387bd72ebcb5b77df75cc Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 4 Dec 2024 14:47:49 -0700 Subject: [PATCH 2/8] Update direcotries for submodule update --- components/cdeps | 2 +- share | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cdeps b/components/cdeps index f6bc97483a..4165d0657d 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit f6bc97483a1bfb7352c6c5610a13ed898a86990b +Subproject commit 4165d0657d6f60e8dba650e9a1771a1344972b76 diff --git a/share b/share index f6f31fd61c..ce2ba18936 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit f6f31fd61cb8f80aee97311fcca64b3e26b0202c +Subproject commit ce2ba18936fb13b15e43432b76259d47b94029f3 From 7df2c84e71a1eb62ec6dd9f71bcc6ea02e89d9be Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 4 Dec 2024 14:49:20 -0700 Subject: [PATCH 3/8] Update cam7 tuning to use the radsw of -1 and nextsw_cday to be the cam7 mode --- .../testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm | 2 ++ .../testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm diff --git a/cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm new file mode 100644 index 0000000000..c35d3fd9d4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm @@ -0,0 +1,2 @@ +iradsw = -1 +nextsw_cday_calc = "cam7" diff --git a/cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm new file mode 100644 index 0000000000..c35d3fd9d4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm @@ -0,0 +1,2 @@ +iradsw = -1 +nextsw_cday_calc = "cam7" From 5347b4824ae0e42b8fd55b157e5d63d81f3eae6f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 17 Dec 2024 15:34:59 -0700 Subject: [PATCH 4/8] Update share to bring in needed updates for nuopc_shr_methods.F90 which get more some ER tests to work --- .gitmodules | 2 +- share | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8ef8853a13..2f99e10305 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,7 +100,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git [submodule "share"] path = share url = https://github.com/ESCOMP/CESM_share -fxtag = share1.1.3 +fxtag = share1.1.6 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share diff --git a/share b/share index ce2ba18936..a48ff8790a 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit ce2ba18936fb13b15e43432b76259d47b94029f3 +Subproject commit a48ff8790a21d3831873ed9f023a43c606a1ef03 From e55a1540d0260f715058b5425821a3d462449fa6 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 18 Dec 2024 12:23:43 -0700 Subject: [PATCH 5/8] Correct test --- cime_config/testdefs/testlist_clm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index bb9af4b06a..2e900bd3bc 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2487,7 +2487,7 @@ - + From d5991c073041ba7fcbc6fc3cdfeb12a4c04cf574 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 18 Dec 2024 13:05:11 -0700 Subject: [PATCH 6/8] Start changelog --- doc/ChangeLog | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 78 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 5c0c6ba058..86d33a4b26 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,81 @@ =============================================================== +Tag name: ctsm5.3.015 +Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) +Date: Wed 18 Dec 2024 12:46:57 PM MST +One-line Summary: Update cdeps with cam7 nextsw cday changes + +Purpose and description of changes +---------------------------------- + + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm6_0 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- +[Remove any lines that don't apply. Remove entire section if nothing applies.] + +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + +Notes of particular relevance for users +--------------------------------------- + +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + +Changes made to namelist defaults (e.g., changed parameter values): + +Notes of particular relevance for developers: +--------------------------------------------- + +Changes to tests or testing: + + +Testing summary: regular +---------------- + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + +If the tag used for baseline comparisons was NOT the previous tag, note that here: + + +Answer changes +-------------- + +Changes answers relative to baseline: Only for CPLHIST cases, otherwise bit-for-bit + + Summarize any changes to answers, i.e., + - what code configurations: Compsets with DATM^CPLHIST + - what platforms/compilers: All + - nature of change; larger than roundoff/same climate + +Other details +------------- + +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps share + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + +=============================================================== +=============================================================== Tag name: ctsm5.3.014 Originator(s): multiple (see contributors below) Date: Tue 03 Dec 2024 04:31:03 PM MST diff --git a/doc/ChangeSum b/doc/ChangeSum index 1ac751ea03..3d265c41a0 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes ctsm5.3.014 erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags ctsm5.3.013 erik 11/26/2024 Merge b4b-dev ctsm5.3.012 afoster 11/13/2024 update fates tag From de84a0d332b4dc89723400e5991dc3d4ce2d4f03 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 18 Dec 2024 14:09:33 -0700 Subject: [PATCH 7/8] Update expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index f718582b60..d0130537bb 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -138,6 +138,13 @@ + + + FAIL + #2913 + + + FAIL From 4f59c769a30db1b3dbb82542f69bd27bd9ab7904 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 18 Dec 2024 14:09:52 -0700 Subject: [PATCH 8/8] Finish Change log --- doc/ChangeLog | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 86d33a4b26..58d1794ea5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,13 +1,15 @@ =============================================================== Tag name: ctsm5.3.015 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) -Date: Wed 18 Dec 2024 12:46:57 PM MST +Date: Wed 18 Dec 2024 02:09:40 PM MST One-line Summary: Update cdeps with cam7 nextsw cday changes Purpose and description of changes ---------------------------------- - +Update CDEPS with changes for CAM7 nextsw_cday handling. This changes answers +for CPLHIST cases. We also changed the cam7LndTuningMode tests to turn this on +for DATM to more closely match what CAM7 does. Significant changes to scientifically-supported configurations -------------------------------------------------------------- @@ -28,22 +30,34 @@ Does this tag change answers significantly for any of the following physics conf Bugs fixed ---------- -[Remove any lines that don't apply. Remove entire section if nothing applies.] List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Fixes: #2897 Update CDEPS to bring in DATM change regarding nextsw_cday changing answers in CPLHIST cases Notes of particular relevance for users --------------------------------------- Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): - -Changes made to namelist defaults (e.g., changed parameter values): + New namelist parameter for DATM: nextsw_cday_calc + defaults to cam6, set to cam7 for CPLHIST and specific tests + Only applies if iradsw is NOT 0 or 1 + + Here is the documention on this in the namelist_definitial XML for DATM: ++ For CPLHIST cases, this should agree with the version of CAM (or other atmosphere ++ model) used to generate the CPLHIST forcings; the valid values for this variable are ++ based on this: 'cam6' is appropriate for cases generated with the driver ordering in ++ CAM6 and earlier, and 'cam7' is appropriate for cases generated with the driver ++ ordering in CAM7 and later. ++ ++ For 'cam6', the next radiation timestep is set to the present time plus 2 timesteps ++ when mod(tod+dtime,delta_radsw)==0. For 'cam7', the next radiation timestep is set ++ to the present time plus 1 timestep when mod(tod,delta_radsw)==0. Notes of particular relevance for developers: --------------------------------------------- Changes to tests or testing: - + cam7LndTuningMode testmods changed so that iradsw==-1 (hourly) , and nextsw_cday_calc='cam7' Testing summary: regular ---------------- @@ -70,9 +84,12 @@ Other details ------------- List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps share + cdeps to cdeps1.0.57 + share to share1.1.6 Pull Requests that document the changes (include PR ids): (https://github.com/ESCOMP/ctsm/pull) + #2900 -- Update cdeps with cam7 nextsw cday changes =============================================================== ===============================================================