From 3ec9215c09004385621f6523ca68c8eb2a55bd48 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 7 Oct 2024 15:51:49 -0600 Subject: [PATCH 1/5] Remove include_user_mods from matrixcnOn testmod. Should avoid unnecessary levels of history writing. Resolves ESCOMP/CTSM#2814. --- cime_config/testdefs/testlist_clm.xml | 2 +- .../testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 0eb3d5012d..7943b5c55e 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3332,7 +3332,7 @@ - + diff --git a/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods deleted file mode 100644 index fe0e18cf88..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../default From ae6b18844d186c10a369f62aa749b940d40714c0 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 7 Oct 2024 20:59:31 -0600 Subject: [PATCH 2/5] Change a test wallclock time to ensure it's what we want. --- 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 7943b5c55e..cdb00db524 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1333,7 +1333,7 @@ - + From 5f9d597bef097fdd746a626d2e8a8d2e1e400e52 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 14 Oct 2024 10:50:09 -0600 Subject: [PATCH 3/5] Add matrixcn test suite. --- cime_config/testdefs/testlist_clm.xml | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index cdb00db524..146a7abe6e 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -11,6 +11,7 @@ aux_cime_baselines: CESM cime baselines (subset of aux_clm tests) hillslope: Experimental test list used for the hillslope option of the model rxcropmaturity: Short tests to be run during development related to prescribed crop calendars + matrixcn: Tests exercising the matrix-CN capability --> @@ -25,6 +26,7 @@ + @@ -47,6 +49,7 @@ + @@ -276,6 +279,7 @@ + @@ -482,6 +486,7 @@ + @@ -517,6 +522,7 @@ + @@ -544,6 +550,7 @@ + @@ -802,6 +809,7 @@ + @@ -820,6 +828,7 @@ + @@ -837,6 +846,7 @@ + @@ -846,7 +856,9 @@ + + @@ -866,6 +878,7 @@ + @@ -875,6 +888,7 @@ + @@ -884,6 +898,7 @@ + @@ -893,6 +908,7 @@ + @@ -985,6 +1001,7 @@ + @@ -1003,6 +1020,7 @@ + @@ -1022,6 +1040,7 @@ + @@ -1040,6 +1059,7 @@ + @@ -1077,6 +1097,7 @@ + @@ -1094,6 +1115,7 @@ + @@ -1103,6 +1125,7 @@ + @@ -1147,6 +1170,7 @@ + @@ -1164,6 +1188,7 @@ + @@ -1237,6 +1262,7 @@ + @@ -1297,6 +1323,7 @@ + @@ -1314,6 +1341,7 @@ + @@ -1340,6 +1368,7 @@ + @@ -1376,6 +1405,7 @@ + @@ -1421,6 +1451,7 @@ + @@ -1431,6 +1462,7 @@ + @@ -1441,6 +1473,7 @@ + @@ -1553,6 +1586,7 @@ + @@ -1688,6 +1722,7 @@ + @@ -1725,6 +1760,7 @@ + @@ -1771,6 +1807,7 @@ + @@ -1827,6 +1864,7 @@ + @@ -1857,6 +1895,7 @@ + @@ -1875,6 +1914,7 @@ + @@ -1904,6 +1944,7 @@ + @@ -1941,6 +1982,7 @@ + @@ -1960,6 +2002,7 @@ + @@ -2000,6 +2043,7 @@ + @@ -2205,6 +2249,7 @@ + @@ -2273,7 +2318,9 @@ + + @@ -2354,6 +2401,7 @@ + @@ -2515,6 +2563,7 @@ + @@ -2562,6 +2611,7 @@ + @@ -3335,6 +3385,7 @@ + From b846e2b1926a94af73342650fe5dfd22d4db46b4 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Tue, 15 Oct 2024 09:38:19 -0600 Subject: [PATCH 4/5] Roll back change of one cnmatrix test length. --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 9e0235a6ab..4654f53c45 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1361,7 +1361,7 @@ - + @@ -1810,7 +1810,7 @@ - + From 82a0952fc6bcee3540dc5ca7e82d674fc52dca70 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Tue, 15 Oct 2024 17:46:01 -0600 Subject: [PATCH 5/5] Update ChangeLog and ChangeSum. --- doc/ChangeLog | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 73 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index bfaa2e71f7..3620cd8c15 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,76 @@ =============================================================== +Tag name: ctsm5.3.009 +Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) +Date: Tue Oct 15 17:35:40 MDT 2024 +One-line Summary: Reduce outputs from matrixcnOn tests + +Purpose and description of changes +---------------------------------- + +Reduces size and runtime of our tests of the CN Matrix capability. See "Notes of particular relevance for developers" for more details. + + +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.) + +[ ] clm6_0 + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + +List of CTSM issues fixed (include CTSM Issue # and description): +- Resolves ESCOMP/CTSM#2814: Remove include_user_mods from matrixcnOn testmod (https://github.com/ESCOMP/CTSM/pull/2815) + + +Notes of particular relevance for developers: +--------------------------------------------- + +Changes to tests or testing: +- Removing the include_user_mods file from the matrixcnOn test (and thus also matrixcnOn_ignore_warnings) means that the default outputs no longer overwrite outputs specified by earlier test mods. For example, in LCISO_Lm13.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly--clm-matrixcnOn_ignore_warnings, it should have been saving monthly (the ciso_monthly test mod) but was actually being saved at much higher frequency (because matrixcnOn_ignore_warnings was after ciso_monthly in the test name). That test goes from 30 to 3 GB after this change. +- Adds matrixcn test suite, which can be used during Matrix CN development. All tests in this suite are also still run in aux_clm. + + +Testing summary: +---------------- + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- DIFF + izumi ------- DIFF + + +Answer changes +-------------- + +Changes answers relative to baseline: + + Summarize any changes to answers, i.e., + - what code configurations: aux_clm tests only + - what platforms/compilers: all + - nature of change: larger than roundoff + + Changes are due to changed history field lists (and some other settings) due to the removal of include_user_mods from the matrixcnOn test mod. No answer changes occurred in any test other than those using matrixcnOn(_ignore_warnings); no answer changes will occur for any non-test run. + +Other details +------------- + +Pull Requests that document the changes (include PR ids): +- PR ESCOMP/CTSM#2815: Remove include_user_mods from matrixcnOn testmod (https://github.com/ESCOMP/CTSM/pull/2815) + +=============================================================== +=============================================================== Tag name: ctsm5.3.008 Originator(s): olyson (Keith Oleson,UCAR/TSS) Date: Mon 14 Oct 2024 04:03:26 PM MDT diff --git a/doc/ChangeSum b/doc/ChangeSum index 5698b8654f..af6e1675b4 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.009 samrabin 10/15/2024 Reduce outputs from matrixcnOn tests ctsm5.3.008 olyson 10/14/2024 PPE change to sa_leaf in CanopyFluxesMod.F90 ctsm5.3.007 slevis 10/14/2024 Clm60 finidat updates for ne30, f09, f19 grids ctsm5.3.006 samrabin 10/11/2024 Merge b4b-dev