From d3e68143a2ca5e52568965a666cd6c53be7d0434 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 20 Jun 2024 17:30:14 -0600 Subject: [PATCH 01/10] Temporary .gitmodules points to the branches of the modules that changed --- .gitmodules | 20 ++++++++++---------- ccs_config | 2 +- components/cism | 2 +- components/cmeps | 2 +- components/mosart | 2 +- components/rtm | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 699ad22969..e1df4e650c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,22 +7,22 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release [submodule "cism"] path = components/cism -url = https://github.com/ESCOMP/CISM-wrapper -fxtag = cismwrap_2_2_001 +url = https://github.com/mvertens/CISM-wrapper +fxtag = 34339777afa7b810fd4822fce1039826668b33e4 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper [submodule "rtm"] path = components/rtm -url = https://github.com/ESCOMP/RTM -fxtag = rtm1_0_79 +url = https://github.com/swensosc/RTM +fxtag = 420c5979d8abf05184992fdfba5ac41c41c91c2e fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart -url = https://github.com/ESCOMP/MOSART -fxtag = mosart1_0_49 +url = https://github.com/mvertens/MOSART +fxtag = 01f40dcf589d4e6c5932c76128e3d42faea91e9f fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/MOSART @@ -35,8 +35,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config -url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm0.0.106 +url = https://github.com/mvertens/ccs_config_cesm.git +fxtag = dbb02c0ccd1492fe278885f8a07a71fa80064319 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -49,8 +49,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps -url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps0.14.63 +url = https://github.com/mvertens/CMEPS.git +fxtag = 4dca7c602e54189b74b1d0195c433d1b83475553 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/ccs_config b/ccs_config index 2ff978f92a..dbb02c0ccd 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 2ff978f92a5ac9a6ab243e5c14d06a7e2d2f5799 +Subproject commit dbb02c0ccd1492fe278885f8a07a71fa80064319 diff --git a/components/cism b/components/cism index c05dd5c4fc..34339777af 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit c05dd5c4fc85327e76523aaea9cfe1e388748928 +Subproject commit 34339777afa7b810fd4822fce1039826668b33e4 diff --git a/components/cmeps b/components/cmeps index 6384ff4e4a..4dca7c602e 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 6384ff4e4a6bc82a678f9419a43ffbd5d53ac209 +Subproject commit 4dca7c602e54189b74b1d0195c433d1b83475553 diff --git a/components/mosart b/components/mosart index 8c682b1b7f..01f40dcf58 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit 8c682b1b7f15d146816de302e0d359da3e957056 +Subproject commit 01f40dcf589d4e6c5932c76128e3d42faea91e9f diff --git a/components/rtm b/components/rtm index 88503adbc2..420c5979d8 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit 88503adbc275fb2ccbb6b598e460deaeb140e515 +Subproject commit 420c5979d8abf05184992fdfba5ac41c41c91c2e From 540d87fcc791c68ecac02eb786ca58a2e6874b9c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 21 Jun 2024 16:34:58 -0600 Subject: [PATCH 02/10] Update .gitmodules with latest mosart commit --- .gitmodules | 2 +- components/mosart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e1df4e650c..3d3cb88e80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,7 +22,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart url = https://github.com/mvertens/MOSART -fxtag = 01f40dcf589d4e6c5932c76128e3d42faea91e9f +fxtag = ca0acc0336365456bec653c4c233abb57d9bc62d fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/MOSART diff --git a/components/mosart b/components/mosart index 01f40dcf58..ca0acc0336 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit 01f40dcf589d4e6c5932c76128e3d42faea91e9f +Subproject commit ca0acc0336365456bec653c4c233abb57d9bc62d From 596dc135a49918c225ce726122874ed55611ad87 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 21 Jun 2024 17:52:16 -0600 Subject: [PATCH 03/10] Update .gitmodules with new mosart and rtm tags --- .gitmodules | 8 ++++---- components/mosart | 2 +- components/rtm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3d3cb88e80..6d4298befc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,15 +14,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper [submodule "rtm"] path = components/rtm -url = https://github.com/swensosc/RTM -fxtag = 420c5979d8abf05184992fdfba5ac41c41c91c2e +url = https://github.com/ESCOMP/RTM +fxtag = rtm1_0_80 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart -url = https://github.com/mvertens/MOSART -fxtag = ca0acc0336365456bec653c4c233abb57d9bc62d +url = https://github.com/ESCOMP/MOSART +fxtag = mosart1.1.02 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/MOSART diff --git a/components/mosart b/components/mosart index ca0acc0336..e2ffe00004 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit ca0acc0336365456bec653c4c233abb57d9bc62d +Subproject commit e2ffe00004cc416cfc8bcfae2a949474075c1d1f diff --git a/components/rtm b/components/rtm index 420c5979d8..b3dfcfbba5 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit 420c5979d8abf05184992fdfba5ac41c41c91c2e +Subproject commit b3dfcfbba58c151ac5a6ab513b3515ef3deff798 From 6dd55eeef55c093e53f500867d516df1beb16f39 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 1 Jul 2024 11:31:06 -0600 Subject: [PATCH 04/10] Update .gitmodules with new cismwrapper, cmeps, and ccs_config tags --- .gitmodules | 12 ++++++------ ccs_config | 2 +- components/cism | 2 +- components/cmeps | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6d4298befc..eb2a0980f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,8 +7,8 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release [submodule "cism"] path = components/cism -url = https://github.com/mvertens/CISM-wrapper -fxtag = 34339777afa7b810fd4822fce1039826668b33e4 +url = https://github.com/ESCOMP/CISM-wrapper +fxtag = cismwrap_2_2_001 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper @@ -35,8 +35,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config -url = https://github.com/mvertens/ccs_config_cesm.git -fxtag = dbb02c0ccd1492fe278885f8a07a71fa80064319 +url = https://github.com/ESMCI/ccs_config_cesm.git +fxtag = ccs_config_cesm0.0.110 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -49,8 +49,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps -url = https://github.com/mvertens/CMEPS.git -fxtag = 4dca7c602e54189b74b1d0195c433d1b83475553 +url = https://github.com/ESCOMP/CMEPS.git +fxtag = cmeps0.14.67 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/ccs_config b/ccs_config index dbb02c0ccd..c30a283155 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit dbb02c0ccd1492fe278885f8a07a71fa80064319 +Subproject commit c30a2831556f269675971b11c5c156ea92599878 diff --git a/components/cism b/components/cism index 34339777af..c05dd5c4fc 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit 34339777afa7b810fd4822fce1039826668b33e4 +Subproject commit c05dd5c4fc85327e76523aaea9cfe1e388748928 diff --git a/components/cmeps b/components/cmeps index 4dca7c602e..90f815ba9e 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 4dca7c602e54189b74b1d0195c433d1b83475553 +Subproject commit 90f815ba9e7493d71043b5d8e627a3f20bd5dc78 From fb9529577c1e1f294cce17c0a0285f78b98554ce Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 1 Jul 2024 12:59:23 -0600 Subject: [PATCH 05/10] Update cismwrapper tag to the correct new one --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index eb2a0980f4..615de28b6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release [submodule "cism"] path = components/cism url = https://github.com/ESCOMP/CISM-wrapper -fxtag = cismwrap_2_2_001 +fxtag = cismwrap_2_2_002 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper From de1b44ca4c9ef7c9116b41f1969a7998bcf21a84 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 1 Jul 2024 13:01:37 -0600 Subject: [PATCH 06/10] Ran ./bin/git-fleximod update, so now update the cism module itself --- components/cism | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cism b/components/cism index c05dd5c4fc..c84cc9f5b3 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit c05dd5c4fc85327e76523aaea9cfe1e388748928 +Subproject commit c84cc9f5b3103766a35d0a7ddd5e9dbd7deae762 From e1b2bdabb4b2c74a27bbf12d4cca677452396de7 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 2 Jul 2024 17:03:19 -0600 Subject: [PATCH 07/10] Correct the tags that I used for ccs_config and cmeps --- .gitmodules | 4 ++-- ccs_config | 2 +- components/cmeps | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 615de28b6f..897824e9cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm0.0.110 +fxtag = ccs_config_cesm1.0.0 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -50,7 +50,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps0.14.67 +fxtag = cmeps0.14.77 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/ccs_config b/ccs_config index c30a283155..69a958581e 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit c30a2831556f269675971b11c5c156ea92599878 +Subproject commit 69a958581ecd2d32ee9cb1c38bcd3847b8b920bf diff --git a/components/cmeps b/components/cmeps index 90f815ba9e..47fb4e633a 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 90f815ba9e7493d71043b5d8e627a3f20bd5dc78 +Subproject commit 47fb4e633a76ec6d60969b1af751f90790387246 From 63b3c3fdfa8e9d5aec763bd872a81a69b2832d8e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 19 Jul 2024 17:19:36 -0600 Subject: [PATCH 08/10] Namelist corrections after an izumi test failed ERS_D.f19_g17.I1850Clm50BgcCrop.izumi_nag.clm-ciso_monthly_matrixcn_spinup failed during the build because a namelist variable needed renaming --- .../user_nl_mosart | 2 +- .../testmods_dirs/clm/rtmColdSSP/user_nl_rtm | 8 +++---- lilac/bld_templates/mosart_in | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart b/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart index 9e109fc131..82243d7d3d 100644 --- a/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart +++ b/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart @@ -1 +1 @@ -frivinp_rtm = '/dev/null' +frivinp = '/dev/null' diff --git a/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm b/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm index d1a0254a0b..e78d13a51c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm +++ b/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm @@ -1,4 +1,4 @@ -finidat_rtm = " " -rtmhist_mfilt = 1 -rtmhist_ndens = 2 -rtmhist_nhtfrq = 0 +finidat = " " +mfilt = 1 +ndens = 2 +nhtfrq = 0 diff --git a/lilac/bld_templates/mosart_in b/lilac/bld_templates/mosart_in index 091ec69285..0bc2242dda 100644 --- a/lilac/bld_templates/mosart_in +++ b/lilac/bld_templates/mosart_in @@ -4,18 +4,18 @@ delt_mosart = 1800 do_rtm = .true. do_rtmflood = .false. - finidat_rtm = " " - frivinp_rtm = "/glade/campaign/cesm/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc" + finidat = " " + frivinp = "/glade/campaign/cesm/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc" ice_runoff = .true. qgwl_runoff_option = "threshold" - rtmhist_fexcl1 = "" - rtmhist_fexcl2 = "" - rtmhist_fexcl3 = "" - rtmhist_fincl1 = "" - rtmhist_fincl2 = "" - rtmhist_fincl3 = "" - rtmhist_mfilt = 1 - rtmhist_ndens = 1 - rtmhist_nhtfrq = 0 + fexcl1 = "" + fexcl2 = "" + fexcl3 = "" + fincl1 = "" + fincl2 = "" + fincl3 = "" + mfilt = 1 + ndens = 1 + nhtfrq = 0 smat_option = "Xonly" / From a32a9eb121af3fcb7de1af94b5812f51eac49666 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 19 Jul 2024 18:42:31 -0600 Subject: [PATCH 09/10] Draft ChangeLog/ChangeSum (comments welcome) --- doc/ChangeLog | 130 +++++++++++++++++++++++++++++++++++++++++++++++++- doc/ChangeSum | 3 +- 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 35ad747636..785b26db9e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,131 @@ =============================================================== +Tag name: ctsm5.2.015 +Originator(s): multiple (Samuel Levis,UCAR/TSS,303-665-1310, @mvertens, @jedwards4b, @billsacks, @Katetc) +Date: Fri 19 Jul 2024 06:02:22 PM MDT +One-line Summary: Update submodule tags to pass runoff from cism to rof + +Purpose and description of changes +---------------------------------- + + - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM + - Update RTM with fix needed for Paleo LGM work + + +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_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Fixes #2590 Update CMEPS/MOSART/CISM/RTM tags + Fixes https://github.com/ESCOMP/RTM/issues/50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 + +Notes of particular relevance for users +--------------------------------------- + +Caveats for users (e.g., need to interpolate initial conditions): + Issue https://github.com/ESCOMP/RTM/issues/50 + Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 is now fixed with + https://github.com/ESCOMP/RTM/pull/51 + +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + Differences in namelist 'mosart_inparm': + missing variable: 'do_rtmflood' + missing variable: 'finidat_rtm' + missing variable: 'frivinp_rtm' + missing variable: 'rtmhist_fexcl1' + missing variable: 'rtmhist_fexcl2' + missing variable: 'rtmhist_fexcl3' + missing variable: 'rtmhist_fincl1' + missing variable: 'rtmhist_fincl2' + missing variable: 'rtmhist_fincl3' + missing variable: 'rtmhist_mfilt' + missing variable: 'rtmhist_ndens' + missing variable: 'rtmhist_nhtfrq' + found extra variable: 'budget_frq' + found extra variable: 'fexcl1' + found extra variable: 'fexcl2' + found extra variable: 'fexcl3' + found extra variable: 'fincl1' + found extra variable: 'fincl2' + found extra variable: 'fincl3' + found extra variable: 'finidat' + found extra variable: 'frivinp' + found extra variable: 'mfilt' + found extra variable: 'mosart_euler_calc' + found extra variable: 'mosart_tracers' + found extra variable: 'ndens' + found extra variable: 'nhtfrq' + found extra variable: 'use_halo_option' + +Changes to documentation: + Not that I am aware of + + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - PASS + + python testing (if python code has changed; see instructions in python/README.md; document testing done): + + derecho - PASS + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + + ctsm_sci + derecho ---- OK (while in tag ctsm5.2.007; I did not repeat with the latest; see checklist in #2590) + + +Answer changes +-------------- + +Changes answers relative to baseline: Yes + + Summarize any changes to answers, i.e., + - what code configurations: mosart and rtm + - what platforms/compilers: all + - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix + + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + See .gitmodules: cism, rtm, mosart, ccs_config, cmeps + +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/2605 + https://github.com/ESCOMP/RTM/pull/51 + https://github.com/ESCOMP/MOSART/pull/94 + https://github.com/ESCOMP/CISM-wrapper/pull/100 + https://github.com/ESCOMP/CMEPS/pull/463 + https://github.com/ESMCI/ccs_config_cesm/pull/174 + +=============================================================== +=============================================================== Tag name: ctsm5.2.014 Originator(s): chrislxj (Xingjie Lu, Northern Arizona U., xingjie.lu@nau.edu) Date: Fri 19 Jul 2024 11:04:17 AM MDT @@ -51,7 +178,8 @@ Notes of particular relevance for users --------------------------------------- Caveats for users (e.g., need to interpolate initial conditions): - use_matrixcn and use_soil_matrixcn ARE recommended for accelerating bgc + use_matrixcn and use_soil_matrixcn ARE NOT available for clm4_5 + and ARE recommended for accelerating bgc spin-ups (keep reading for more info) and NOT recommended for - transient simulations (e.g. IHist) - simulations that use threading (e.g. see tests with P64x2) diff --git a/doc/ChangeSum b/doc/ChangeSum index 21237cbac8..5c7123b5e0 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,7 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.014 chrislxj 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false. + ctsm5.2.015 multiple 07/19/2024 Update submodule tags to pass runoff from cism to rof + ctsm5.2.014 multiple 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false. ctsm5.2.013 glemieux 07/18/2024 FATES Land Use V2 ctsm5.2.012 sacks 07/16/2024 Relax tolerance for truncating small snocan values in CanopyFluxes ctsm5.2.011 slevis 07/12/2024 Merge b4b-dev From a4a9ede604eb36e1b1f6541fb1e40b712176ffa5 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 22 Jul 2024 16:04:00 -0600 Subject: [PATCH 10/10] Update ChangeLog/ChangeSum --- doc/ChangeLog | 4 +++- doc/ChangeSum | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 785b26db9e..506b3d5ad0 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.2.015 Originator(s): multiple (Samuel Levis,UCAR/TSS,303-665-1310, @mvertens, @jedwards4b, @billsacks, @Katetc) -Date: Fri 19 Jul 2024 06:02:22 PM MDT +Date: Mon 22 Jul 2024 12:46:17 PM MDT One-line Summary: Update submodule tags to pass runoff from cism to rof Purpose and description of changes @@ -110,6 +110,8 @@ Changes answers relative to baseline: Yes - what platforms/compilers: all - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix + We are ignoring strange diffs from baseline in two tests in variable + FATES_TRANSITION_MATRIX_LULU as explained in issue #2656. Other details ------------- diff --git a/doc/ChangeSum b/doc/ChangeSum index 5c7123b5e0..9c6524b33d 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.015 multiple 07/19/2024 Update submodule tags to pass runoff from cism to rof + ctsm5.2.015 multiple 07/22/2024 Update submodule tags to pass runoff from cism to rof ctsm5.2.014 multiple 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false. ctsm5.2.013 glemieux 07/18/2024 FATES Land Use V2 ctsm5.2.012 sacks 07/16/2024 Relax tolerance for truncating small snocan values in CanopyFluxes