From 90b534af01502b20e7bbd3ceb8250746b4eadfd5 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 5 Aug 2024 17:56:19 -0600 Subject: [PATCH 01/10] Change Izumi nag RxCropCalsAdaptGGCMI to debug. Previously: SMS_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI Now: SMS_D_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI --- 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 951e0d8d5b..ce2b6de435 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3578,7 +3578,7 @@ - + From 7387303e8f5c1f40a60604dbf170dea12a877039 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 5 Aug 2024 17:59:53 -0600 Subject: [PATCH 02/10] Change 25-month crop_calendars tests to use cropMonthOutput. --- 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 ce2b6de435..d6ea6b08da 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3569,7 +3569,7 @@ - + @@ -3578,7 +3578,7 @@ - + From d3de08bfff1ec10ba088442d39f0da59ee106378 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 5 Aug 2024 18:01:36 -0600 Subject: [PATCH 03/10] Change 25-month crop_calendars tests to be 733 days instead. --- 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 d6ea6b08da..3ab3f86436 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3569,7 +3569,7 @@ - + @@ -3578,7 +3578,7 @@ - + From f40bdbb139656885a37d6199f9d4c37eda45069a Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 5 Aug 2024 18:04:01 -0600 Subject: [PATCH 04/10] Add temporary test suite fix_nag_bld_2659. --- cime_config/testdefs/testlist_clm.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 3ab3f86436..ea02ac9375 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3572,6 +3572,7 @@ + @@ -3583,6 +3584,7 @@ + From e686d19a6123d39203105a0505157c50b7772cad Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Aug 2024 11:43:29 -0600 Subject: [PATCH 05/10] Remove include_user_mods from RxCropCals* and midDecStart testmods. --- cime_config/testdefs/testlist_clm.xml | 8 +++++--- .../clm/RxCropCalsAdaptGGCMI/include_user_mods | 1 - .../testmods_dirs/clm/RxCropCalsNoAdapt/include_user_mods | 1 - .../testmods_dirs/clm/midDecStart/include_user_mods | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/RxCropCalsAdaptGGCMI/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/RxCropCalsNoAdapt/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/midDecStart/include_user_mods diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index ea02ac9375..1e687522e4 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3587,24 +3587,26 @@ - + - + + - + + diff --git a/cime_config/testdefs/testmods_dirs/clm/RxCropCalsAdaptGGCMI/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/RxCropCalsAdaptGGCMI/include_user_mods deleted file mode 100644 index 23ea3745e6..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/RxCropCalsAdaptGGCMI/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../crop diff --git a/cime_config/testdefs/testmods_dirs/clm/RxCropCalsNoAdapt/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/RxCropCalsNoAdapt/include_user_mods deleted file mode 100644 index 23ea3745e6..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/RxCropCalsNoAdapt/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../crop diff --git a/cime_config/testdefs/testmods_dirs/clm/midDecStart/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/midDecStart/include_user_mods deleted file mode 100644 index fe0e18cf88..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/midDecStart/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../default From be82840310150f694824ce7c2504c6049362497e Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Aug 2024 15:17:47 -0600 Subject: [PATCH 06/10] cropMonthOutput h2 file is now finally monthly. Specifying hist_nhtfrq(3) seems to override later specification of h2 in "hist_nhtfrq = 0,-240,0" --- cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm index aea8e39e6c..8ad588381e 100644 --- a/cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm @@ -14,7 +14,7 @@ hist_fincl2 += 'DYN_COL_SOIL_ADJUSTMENTS_C' ! That's needed for the mxsowings and mxharvests axes to make sense. ! However, for testing purposes, it makes sense to save more frequently. hist_fincl3 = 'SDATES', 'SDATES_PERHARV', 'SYEARS_PERHARV', 'HDATES', 'GRAINC_TO_FOOD_PERHARV', 'GRAINC_TO_FOOD_ANN', 'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN', 'GRAINC_TO_SEED_PERHARV', 'GRAINC_TO_SEED_ANN', 'GRAINN_TO_SEED_PERHARV', 'GRAINN_TO_SEED_ANN', 'HDATES', 'GDDHARV_PERHARV', 'GDDACCUM_PERHARV', 'HUI_PERHARV', 'SOWING_REASON_PERHARV', 'HARVEST_REASON_PERHARV', 'SWINDOW_STARTS', 'SWINDOW_ENDS', 'GDD20_BASELINE', 'GDD20_SEASON_START', 'GDD20_SEASON_END' -hist_nhtfrq(3) = -24 -hist_mfilt(3) = 1 +hist_nhtfrq = -24,-8,-24 +hist_mfilt = 1,1,1 hist_type1d_pertape(3) = 'PFTS' -hist_dov2xy(3) = .false. +hist_dov2xy = .true.,.false.,.false. From 00cb8a1a0766711bcaf0ea51323b65a8bdd71ec0 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Aug 2024 17:15:55 -0600 Subject: [PATCH 07/10] Reduce Izumi cropMonthOutput-RxCropCalsAdaptGGCMI test to 65 days. --- cime_config/testdefs/testlist_clm.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 1e687522e4..3e47ca2d95 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3582,12 +3582,20 @@ + + + + + + + + - + From 31f4c03f5cf14e7eb7559e2b9ac5f238abe1ae36 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Aug 2024 17:50:03 -0600 Subject: [PATCH 08/10] Remove fix_nag_bld_2659 test suite. --- cime_config/testdefs/testlist_clm.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 3e47ca2d95..3f6fe51ea0 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3572,7 +3572,6 @@ - @@ -3592,7 +3591,6 @@ - @@ -3603,7 +3601,6 @@ - @@ -3614,7 +3611,6 @@ - From a63a4786f9d26ccdc02fea3d8561c1a5fab19db0 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Aug 2024 17:51:45 -0600 Subject: [PATCH 09/10] Remove expected fail that's now fixed. SMS_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI --- cime_config/testdefs/ExpectedTestFails.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index d5e3e4e378..d1e0a1a8b8 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -163,13 +163,6 @@ - - - FAIL - #2659 - - - From 02885d4457a2f49e1742e6a46bc6276794ff085d Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 14 Aug 2024 12:31:40 -0600 Subject: [PATCH 10/10] Update ChangeLog and ChangeSum. --- doc/ChangeLog | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 72 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index af975c9975..5850069532 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,75 @@ =============================================================== +Tag name: ctsm5.2.022 +Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) +Date: Wed Aug 14 12:24:27 MDT 2024 +One-line Summary: Rework crop_calendars suite and cropMonthOutput + +Purpose and description of changes +---------------------------------- + +- Changes cropMonthOutput testmod so that h2 files are actually monthly instead of daily +- Changes a nag test to use debug mode (fixing a build error) and run for shorter (fixing cputime exceedance) +- Reworks RxCropCals* testmods to not include crop testmod + +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 +---------- +[Remove any lines that don't apply. Remove entire section if nothing applies.] + +List of CTSM issues fixed (include CTSM Issue # and description): +- Fixes ESCOMP/CTSM#2659: Test build failure: SMS_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI (https://github.com/ESCOMP/CTSM/issues/2659) + + +Notes of particular relevance for developers: +--------------------------------------------- +NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide + +Changes to tests or testing: +- Changes answers to all cropMonthOutput tests due to changed h2 file frequency. Also affects frequency of one other test. + + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + + +Answer changes +-------------- + +Changes answers relative to baseline: + - Only in testmods, not production runs + + +Other details +------------- + +Pull Requests that document the changes (include PR ids): +- ESCOMP/CTSM#2676: Rework crop_calendars suite and cropMonthOutput (https://github.com/ESCOMP/CTSM/pull/2676) + +=============================================================== +=============================================================== Tag name: ctsm5.2.021 Originator(s): rgknox (Ryan Knox,LAWRENCE BERKELEY NATIONAL LABORATORY,510-495-2153) Date: Tue 13 Aug 2024 03:22:34 PM MDT diff --git a/doc/ChangeSum b/doc/ChangeSum index 852ec9e838..61bf4985de 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.2.022 samrabin 08/14/2024 Rework crop_calendars suite and cropMonthOutput ctsm5.2.021 rgknox 08/13/2024 Adding on-the-fly parameter settings for prescribed N and P in FATES ctsm5.2.020 slevis 08/12/2024 MEGAN updates (MEGAN-CLM6) ctsm5.2.019 erik 08/11/2024 Add in an additional dust emission method Leung_2023, by default off