From 0824a1214022c832ecb3ecd5b79e2304c4b4b3be Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Tue, 9 Aug 2022 10:37:18 -0600 Subject: [PATCH 01/26] update SatPhen test defs files --- .../testmods_dirs/clm/FatesColdDefBasic/shell_commands | 2 ++ .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 2 +- .../clm/FatesColdDefReducedComplexSatPhen/user_nl_clm | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands new file mode 100644 index 0000000000..a6f7ecb4d0 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands @@ -0,0 +1,2 @@ +./xmlchange CLM_FORCE_COLDSTART="on" +./xmlchange BFBFLAG="TRUE" \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index a38be35f63..cc870c3d2a 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1,2 +1,2 @@ -../FatesColdDef +../FatesColdDefBasic ../../../../usermods_dirs/fates_sp diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm index 5ae85742ed..1aa2763035 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm @@ -1,2 +1,2 @@ -use_fates_sp = .true. -fates_spitfire_mode = 0 +hist_mfilt = 365 +hist_nhtfrq = -24 \ No newline at end of file From 8cde3feefcb1131d596694e3a14e1dffd0c045dd Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Thu, 11 Aug 2022 14:34:12 -0600 Subject: [PATCH 02/26] fixing some other SP issues --- .../testmods_dirs/clm/FatesColdDefBasic/shell_commands | 2 +- .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 1 - .../clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands | 3 +++ .../FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 1 - .../clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands | 2 ++ .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 2 +- .../clm/FatesColdDefReducedComplexSatPhen/user_nl_clm | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands index a6f7ecb4d0..586dff9dd5 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands @@ -1,2 +1,2 @@ ./xmlchange CLM_FORCE_COLDSTART="on" -./xmlchange BFBFLAG="TRUE" \ No newline at end of file +./xmlchange BFBFLAG="TRUE" diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index f754dacdab..b968e7648f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1,2 +1 @@ -../FatesColdDefDryDep ../FatesColdDefReducedComplexSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands new file mode 100644 index 0000000000..870cd99bf5 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands @@ -0,0 +1,3 @@ +./xmlchange CLM_BLDNML_OPTS='--drydep' --append +# The following would be required if you want to run with DryDep and FATES without Fates-SP mode +#./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index 5dd78011ec..b968e7648f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1,2 +1 @@ -../FatesColdDefMegan ../FatesColdDefReducedComplexSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands new file mode 100644 index 0000000000..749af3486f --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands @@ -0,0 +1,2 @@ +./xmlchange CLM_BLDNML_OPTS='--megan' --append +./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index cc870c3d2a..e15cf6f649 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1,2 +1,2 @@ ../FatesColdDefBasic -../../../../usermods_dirs/fates_sp + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm index 1aa2763035..d914f2be4d 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm @@ -1,2 +1,2 @@ hist_mfilt = 365 -hist_nhtfrq = -24 \ No newline at end of file +hist_nhtfrq = -24 From f7223e08c253bba9dad9a845347448a40d43bb86 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 12 Aug 2022 11:13:56 -0600 Subject: [PATCH 03/26] reverting some changes --- .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 2 +- .../clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands | 3 --- .../FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 2 +- .../clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands | 2 -- .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 3 +-- 5 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index b968e7648f..5da4a19a83 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1 +1 @@ -../FatesColdDefReducedComplexSatPhen +../FatesColdDefDryDep diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands deleted file mode 100644 index 870cd99bf5..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands +++ /dev/null @@ -1,3 +0,0 @@ -./xmlchange CLM_BLDNML_OPTS='--drydep' --append -# The following would be required if you want to run with DryDep and FATES without Fates-SP mode -#./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index b968e7648f..254ddd9b2d 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1 +1 @@ -../FatesColdDefReducedComplexSatPhen +../FatesColdDefMegan diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands deleted file mode 100644 index 749af3486f..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands +++ /dev/null @@ -1,2 +0,0 @@ -./xmlchange CLM_BLDNML_OPTS='--megan' --append -./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index e15cf6f649..1f2c03aebe 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1,2 +1 @@ -../FatesColdDefBasic - +../FatesColdDef From ee553ef09b25f5834f6becd182eedc8653a6d494 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 12 Aug 2022 11:20:33 -0600 Subject: [PATCH 04/26] update testdef for the one of the FATES SP smoke tests --- 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 bd2f431f07..581e799871 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2298,13 +2298,13 @@ --> - + - + From f2019f5e3cd656a8102ac8a6fa503138d9e82292 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Mon, 15 Aug 2022 14:22:22 -0600 Subject: [PATCH 05/26] put back call to fates_sp usermods --- .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 2 ++ .../clm/FatesColdDefReducedComplexSatPhen/user_nl_clm | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index 1f2c03aebe..303343e726 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1 +1,3 @@ ../FatesColdDef +../../../../usermods_dirs/fates_sp + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm deleted file mode 100644 index d914f2be4d..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm +++ /dev/null @@ -1,2 +0,0 @@ -hist_mfilt = 365 -hist_nhtfrq = -24 From 2275289c8353ed7179cbfc044de01aefbfb2363d Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Mon, 15 Aug 2022 14:22:56 -0600 Subject: [PATCH 06/26] add back fates_sp user mods call --- .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 1 + .../clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 1 + 2 files changed, 2 insertions(+) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index 5da4a19a83..1dedc9c91a 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1 +1,2 @@ ../FatesColdDefDryDep +../../../../usermods_dirs/fates_sp diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index 254ddd9b2d..3dc812ba0d 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1 +1,2 @@ ../FatesColdDefMegan +../../../../usermods_dirs/fates_sp From b6c239cf93ccb0407aee8398b44aa7b7ed483a24 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Tue, 16 Aug 2022 09:05:14 -0600 Subject: [PATCH 07/26] changed order of include mods --- .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 2 +- .../FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 3 ++- .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index 1dedc9c91a..c1089d7c1d 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1,2 +1,2 @@ -../FatesColdDefDryDep ../../../../usermods_dirs/fates_sp +../FatesColdDefDryDep diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index 3dc812ba0d..879292df14 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1,2 +1,3 @@ -../FatesColdDefMegan ../../../../usermods_dirs/fates_sp +../FatesColdDefMegan + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index 303343e726..c58ea8b03f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1,3 +1,4 @@ -../FatesColdDef ../../../../usermods_dirs/fates_sp +../FatesColdDef + From 695ee136d84f2b286538344b1d55ce9ff1053cad Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 24 Aug 2022 08:49:19 -0600 Subject: [PATCH 08/26] update for DAMP --- .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 3 +-- .../FatesColdDefDryDepReducedComplexSatPhen/shell_commands | 3 +++ .../clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm | 4 ++++ .../FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 4 +--- .../clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands | 2 ++ .../clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm | 4 ++++ .../clm/FatesColdDefReducedComplexSatPhen/include_user_mods | 3 +-- .../clm/FatesColdDefReducedComplexSatPhen/user_nl_clm | 4 ++++ 8 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index c1089d7c1d..2ae840b59f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1,2 +1 @@ -../../../../usermods_dirs/fates_sp -../FatesColdDefDryDep +../FatesColdDefBasic diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands new file mode 100644 index 0000000000..870cd99bf5 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands @@ -0,0 +1,3 @@ +./xmlchange CLM_BLDNML_OPTS='--drydep' --append +# The following would be required if you want to run with DryDep and FATES without Fates-SP mode +#./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm new file mode 100644 index 0000000000..3749fd1d61 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm @@ -0,0 +1,4 @@ + +hist_mfilt = 365 +hist_nhtfrq = -24 + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index 879292df14..2ae840b59f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1,3 +1 @@ -../../../../usermods_dirs/fates_sp -../FatesColdDefMegan - +../FatesColdDefBasic diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands new file mode 100644 index 0000000000..749af3486f --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands @@ -0,0 +1,2 @@ +./xmlchange CLM_BLDNML_OPTS='--megan' --append +./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm new file mode 100644 index 0000000000..3749fd1d61 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm @@ -0,0 +1,4 @@ + +hist_mfilt = 365 +hist_nhtfrq = -24 + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods index c58ea8b03f..e9cade6bdf 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods @@ -1,4 +1,3 @@ -../../../../usermods_dirs/fates_sp -../FatesColdDef +../FatesColdDefBasic diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm new file mode 100644 index 0000000000..3749fd1d61 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm @@ -0,0 +1,4 @@ + +hist_mfilt = 365 +hist_nhtfrq = -24 + From f6727f257d7f4562ab278df661feaa4fad6b7a2d Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 12 Sep 2022 15:55:26 -0700 Subject: [PATCH 09/26] add nocomp+fbg test and 12 month ERS fates tests --- cime_config/testdefs/testlist_clm.xml | 26 ++++++++++++++++++- .../include_user_mods | 1 + .../user_nl_clm | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index dedf27350e..5b4fdc0fca 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1851,6 +1851,22 @@ + + + + + + + + + + + + + + + + @@ -2252,7 +2268,7 @@ - + @@ -2261,6 +2277,14 @@ + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods new file mode 100644 index 0000000000..0f57156bed --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods @@ -0,0 +1 @@ +../FatesColdDefReducedComplexNoComp \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm new file mode 100644 index 0000000000..d3349780e0 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm @@ -0,0 +1 @@ +use_fates_fixed_biogeog=.true. \ No newline at end of file From f951f8c2f1ac4e26b37bba6271956609950bc2cc Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 13 Sep 2022 09:40:33 -0700 Subject: [PATCH 10/26] update 12 month to 13 month to catch potential start of year clm interactions --- 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 5b4fdc0fca..7295ac91d0 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1851,7 +1851,7 @@ - + @@ -1859,7 +1859,7 @@ - + From c0d8e08ad8c679e3a18acf9b4ebb868401063a94 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 15 Sep 2022 10:56:44 -0700 Subject: [PATCH 11/26] rename Fates tests to truncate length --- cime_config/testdefs/testlist_clm.xml | 104 +++++++++--------- .../include_user_mods | 0 .../shell_commands | 0 .../shell_commands | 0 .../user_nl_clm | 0 .../README | 0 .../clm/FatesColdCH4Off/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdDefCH4Off/include_user_mods | 1 - .../clm/FatesColdDefDryDep/include_user_mods | 1 - .../include_user_mods | 2 - .../clm/FatesColdDefHydro/include_user_mods | 1 - .../clm/FatesColdDefLandUse/include_user_mods | 1 - .../clm/FatesColdDefLogging/include_user_mods | 1 - .../clm/FatesColdDefMegan/include_user_mods | 1 - .../include_user_mods | 2 - .../clm/FatesColdDefNoFire/include_user_mods | 1 - .../clm/FatesColdDefPPhys/include_user_mods | 1 - .../clm/FatesColdDefPRT2/include_user_mods | 1 - .../include_user_mods | 1 - .../include_user_mods | 1 - .../include_user_mods | 1 - .../include_user_mods | 2 - .../clm/FatesColdDefST3/include_user_mods | 1 - .../FatesColdDefSizeAgeMort/include_user_mods | 1 - .../FatesColdDefTreeDamage/include_user_mods | 1 - .../clm/FatesColdDryDep/include_user_mods | 1 + .../shell_commands | 0 .../FatesColdDryDepSatPhen/include_user_mods | 2 + .../FatesColdFixedBiogeo/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdHydro/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdLandUse/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdLogging/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdMegan/include_user_mods | 1 + .../shell_commands | 0 .../FatesColdMeganSatPhen/include_user_mods | 2 + .../clm/FatesColdNoComp/include_user_mods | 1 + .../user_nl_clm | 0 .../include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdNoFire/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdPPhys/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdPRT2/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdST3/include_user_mods | 1 + .../user_nl_clm | 0 .../include_user_mods | 2 +- .../user_nl_clm | 0 .../README | 0 .../include_user_mods | 2 + .../FatesColdSizeAgeMort/include_user_mods | 1 + .../user_nl_clm | 0 .../clm/FatesColdTreeDamage/include_user_mods | 1 + .../user_nl_clm | 0 60 files changed, 74 insertions(+), 74 deletions(-) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDef => FatesCold}/include_user_mods (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDef => FatesCold}/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefAllVars => FatesColdAllVars}/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefAllVars => FatesColdAllVars}/user_nl_clm (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefCH4Off => FatesColdCH4Off}/README (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefCH4Off => FatesColdCH4Off}/user_nl_clm (100%) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefDryDep => FatesColdDryDep}/shell_commands (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexFixedBiogeo => FatesColdFixedBiogeo}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefHydro => FatesColdHydro}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefLandUse => FatesColdLandUse}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefLogging => FatesColdLogging}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefMegan => FatesColdMegan}/shell_commands (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexNoComp => FatesColdNoComp}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexNoCompFbg => FatesColdNoCompFixedBioGeo}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefNoFire => FatesColdNoFire}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefPPhys => FatesColdPPhys}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefPRT2 => FatesColdPRT2}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdST3/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefST3 => FatesColdST3}/user_nl_clm (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexSatPhen => FatesColdSatPhen}/include_user_mods (68%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexSatPhen => FatesColdSatPhen}/user_nl_clm (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefReducedComplexSatPhen_prescribed => FatesColdSatPhen_prescribed}/README (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefSizeAgeMort => FatesColdSizeAgeMort}/user_nl_clm (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/include_user_mods rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefTreeDamage => FatesColdTreeDamage}/user_nl_clm (100%) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 7295ac91d0..7a603ea4c7 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1288,7 +1288,7 @@ - + @@ -1805,7 +1805,7 @@ - + @@ -1814,7 +1814,7 @@ - + @@ -1823,7 +1823,7 @@ - + @@ -1832,16 +1832,16 @@ - + - + - + @@ -1851,7 +1851,7 @@ - + @@ -1859,7 +1859,7 @@ - + @@ -1867,7 +1867,7 @@ - + @@ -1876,7 +1876,7 @@ - + @@ -1885,7 +1885,7 @@ - + @@ -1894,7 +1894,7 @@ - + @@ -1903,7 +1903,7 @@ - + @@ -1912,7 +1912,7 @@ - + @@ -1921,7 +1921,7 @@ - + @@ -1929,7 +1929,7 @@ - + @@ -1940,7 +1940,7 @@ - + @@ -1948,7 +1948,7 @@ - + @@ -1957,7 +1957,7 @@ - + @@ -1967,7 +1967,7 @@ - + @@ -1977,7 +1977,7 @@ - + @@ -1987,7 +1987,7 @@ - + @@ -1996,7 +1996,7 @@ - + @@ -2086,7 +2086,7 @@ - + @@ -2095,7 +2095,7 @@ - + @@ -2104,7 +2104,7 @@ - + @@ -2114,7 +2114,7 @@ - + @@ -2124,7 +2124,7 @@ - + @@ -2135,7 +2135,7 @@ - + @@ -2145,7 +2145,7 @@ - + @@ -2166,7 +2166,7 @@ - + @@ -2177,7 +2177,7 @@ - + @@ -2188,7 +2188,7 @@ - + @@ -2199,7 +2199,7 @@ - + @@ -2210,7 +2210,7 @@ - + @@ -2230,7 +2230,7 @@ - + @@ -2240,7 +2240,7 @@ - + @@ -2250,7 +2250,7 @@ - + @@ -2259,7 +2259,7 @@ - + @@ -2268,7 +2268,7 @@ - + @@ -2277,7 +2277,7 @@ - + @@ -2285,7 +2285,7 @@ - + @@ -2294,7 +2294,7 @@ - + @@ -2303,7 +2303,7 @@ - + @@ -2313,7 +2313,7 @@ - + @@ -2332,7 +2332,7 @@ - + @@ -2342,7 +2342,7 @@ - + @@ -2352,7 +2352,7 @@ - + @@ -2361,7 +2361,7 @@ - + @@ -2381,7 +2381,7 @@ - + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesCold/include_user_mods similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDef/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/FatesCold/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesCold/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDef/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesCold/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/README similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/README rename to cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/README diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefCH4Off/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods deleted file mode 100644 index f754dacdab..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../FatesColdDefDryDep -../FatesColdDefReducedComplexSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods deleted file mode 100644 index 5dd78011ec..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../FatesColdDefMegan -../FatesColdDefReducedComplexSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods deleted file mode 100644 index 0f57156bed..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDefReducedComplexNoComp \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/include_user_mods deleted file mode 100644 index 7fe9b048d5..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../FatesColdDefReducedComplexSatPhen -../prescribed diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/include_user_mods deleted file mode 100644 index 1f2c03aebe..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/include_user_mods deleted file mode 100644 index e269feea6f..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../FatesColdDef \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDep/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdDryDep/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods new file mode 100644 index 0000000000..e6d79d4f42 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods @@ -0,0 +1,2 @@ +../FatesColdDryDep +../FatesColdSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexFixedBiogeo/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdFixedBiogeo/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefLandUse/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefLogging/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdLogging/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefMegan/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdMegan/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods new file mode 100644 index 0000000000..a5e045e6c4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods @@ -0,0 +1,2 @@ +../FatesColdMegan +../FatesColdSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoComp/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdNoComp/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods new file mode 100644 index 0000000000..c05af30988 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods @@ -0,0 +1 @@ +../FatesColdComplexNoComp \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexNoCompFbg/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefNoFire/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdNoFire/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefPPhys/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdPPhys/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefPRT2/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefST3/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods similarity index 68% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods index a38be35f63..01997d411c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods @@ -1,2 +1,2 @@ -../FatesColdDef +../FatesCold ../../../../usermods_dirs/fates_sp diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/README similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen_prescribed/README rename to cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/README diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/include_user_mods new file mode 100644 index 0000000000..d111d05911 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen_prescribed/include_user_mods @@ -0,0 +1,2 @@ +../FatesColdSatPhen +../prescribed diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdSizeAgeMort/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/include_user_mods new file mode 100644 index 0000000000..5417dbaa1c --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/include_user_mods @@ -0,0 +1 @@ +../FatesCold \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefTreeDamage/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdTreeDamage/user_nl_clm From d37cb522c220717d2a5cd0b000662e74cd432215 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 16 Sep 2022 13:51:39 -0700 Subject: [PATCH 12/26] remove duplicate satellite phenology test mods --- .../testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods | 2 -- .../testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods deleted file mode 100644 index e6d79d4f42..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../FatesColdDryDep -../FatesColdSatPhen diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods deleted file mode 100644 index a5e045e6c4..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../FatesColdMegan -../FatesColdSatPhen From 4d9023799cbb5145a229e6261ecad8601f772ee0 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 16 Sep 2022 13:53:43 -0700 Subject: [PATCH 13/26] rename FatesColdDefBasic everywhere --- cime_config/testdefs/testlist_clm.xml | 2 +- .../clm/{FatesColdDefBasic => FatesColdBasic}/shell_commands | 0 .../FatesColdDefDryDepReducedComplexSatPhen/include_user_mods | 2 +- .../FatesColdDefMeganReducedComplexSatPhen/include_user_mods | 2 +- .../testmods_dirs/clm/FatesColdSatPhen/include_user_mods | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefBasic => FatesColdBasic}/shell_commands (100%) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 1ea15b5471..f9426f8a2a 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2323,7 +2323,7 @@ --> - + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdBasic/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdBasic/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods index 2ae840b59f..f0a10ab452 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods @@ -1 +1 @@ -../FatesColdDefBasic +../FatesColdBasic diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods index 2ae840b59f..f0a10ab452 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods @@ -1 +1 @@ -../FatesColdDefBasic +../FatesColdBasic diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods index 2ae840b59f..f0a10ab452 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/include_user_mods @@ -1 +1 @@ -../FatesColdDefBasic +../FatesColdBasic From 6567378483df022a3d5f2cf87d4717647377efd1 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 16 Sep 2022 13:55:21 -0700 Subject: [PATCH 14/26] rename DryDep and Megan satellite phenology testmods --- .../include_user_mods | 0 .../shell_commands | 0 .../user_nl_clm | 0 .../include_user_mods | 0 .../shell_commands | 0 .../user_nl_clm | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefDryDepReducedComplexSatPhen => FatesColdDryDepSatPhen}/include_user_mods (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefDryDepReducedComplexSatPhen => FatesColdDryDepSatPhen}/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefDryDepReducedComplexSatPhen => FatesColdDryDepSatPhen}/user_nl_clm (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefMeganReducedComplexSatPhen => FatesColdMeganSatPhen}/include_user_mods (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefMeganReducedComplexSatPhen => FatesColdMeganSatPhen}/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/clm/{FatesColdDefMeganReducedComplexSatPhen => FatesColdMeganSatPhen}/user_nl_clm (100%) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm rename to cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm From 992f1135bfdeb935a836d4654bd42d78274de935 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 4 Oct 2022 12:17:05 -0700 Subject: [PATCH 15/26] fix included directory name to remove complex word --- .../clm/FatesColdNoCompFixedBioGeo/include_user_mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods index c05af30988..ea160c525f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompFixedBioGeo/include_user_mods @@ -1 +1 @@ -../FatesColdComplexNoComp \ No newline at end of file +../FatesColdNoComp \ No newline at end of file From e2593a1da3dcf7f303c62a7f957dbe1f3957d776 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 13 Oct 2022 09:52:33 -0600 Subject: [PATCH 16/26] update fates externals to include tveg restart fix --- Externals_CLM.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg index 2284518c58..2bc1db66f6 100644 --- a/Externals_CLM.cfg +++ b/Externals_CLM.cfg @@ -2,7 +2,7 @@ local_path = src/fates protocol = git repo_url = https://github.com/NGEET/fates -tag = sci.1.58.1_api.24.1.0 +tag = sci.1.59.7_api.24.1.0 required = True [externals_description] From 63d87940924876a7c4c7291442d357fc40b4eba8 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 13 Oct 2022 09:37:56 -0700 Subject: [PATCH 17/26] restore clm mimics fates name to use ColdDef suffix --- 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 f9426f8a2a..965bee24e7 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1996,7 +1996,7 @@ - + From f3b28ff35b425b1411228dd723d219f051e0ae06 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 13 Oct 2022 16:48:18 -0700 Subject: [PATCH 18/26] fix testmod name for nocomp + fixed biogeo --- 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 965bee24e7..25263d4ea4 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2277,7 +2277,7 @@ - + From e05e50ee05108e101a834d168a02e1de8bd9ea63 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 13 Oct 2022 16:54:04 -0700 Subject: [PATCH 19/26] update changelog with test status TBD --- doc/ChangeLog | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 143 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index b6c434f21c..61374f0942 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,146 @@ =============================================================== +Tag name: ctsm5.1.dev112 +Originator(s): adrifoster (Adrianna Foster), glemieux (Gregory Lemieux, LBL/NGEET) +Date: Thu 13 Oct 2022 17:19:14 MDT +One-line Summary: Rework fates test definitions and add new fates tests + +Purpose and description of changes +---------------------------------- + +This tag includes a number of updates to the fates test definitions and test list to gain more coverage: + +(1) Reorder and update the fates test definitions so that fates satellite phenology mode +can be configured for cases using a compset. + +(2) Add a long-term exact restart test to catch issues that may arise due to updates to +fates procedure calls during end of year simulation dates. + +(3) Add a no-competition + fixed biogeography, non-satellite phenology test definition to provide +additional mode combination configuration. + +(4) Update the fates externals tag to incorporate a fix a vegetation temperature exact restart +issue discovered while implementing (1) above. + +(5) Truncate all testmods starting the "Fates" to mitigate running over the limits on the length +of testnames, typically when specifying custom `test_id` using `run_sys_test`. + +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.] + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed or introduced +------------------------ + +CTSM issues fixed (include CTSM Issue #): + Fixes #1839 - Add more FATES tests that are longer than one year + Fixes #1817 - Make sure at least one test running FatesSp just uses the compset and not a test-mod directory + Fixes #1551 - Add FATES NoComp + FixedBiogeog regression test to the fates category of tests + +Externals issues fixed (include issue #): + FATES#908 - Bareground area_pft not being carried over during restarts + FATES#911 - 24-hr running mean vegetation temperature is not b4b on threaded exact restart SatPhen test + +Notes of particular relevance for developers: +--------------------------------------------- + +Changes to tests or testing: + FATES#897 is still unresolved, but is now covered by this updated test list. + +Testing summary: +---------------- +[... Remove before making master tag. + +Nearly all CTSM tags should undergo 'regular' (aux_clm) testing. +However, it occasionally makes sense to do more or less system testing; +here is guidance on different available levels of system testing: + a) no system testing (for use when the only changes are ones that + have absolutely no impact on system runs; this + includes documentation-only tags, tags that + just change the tools or some python code that + does not impact system runs, etc.) + b) minimal (for use in rare cases where only a small change with + known behavior is added ... eg. a minor bug fix. This + might be to just run the "short" test list, or to run + a single test. Whatever makes sense for the particular case.) + c) python only (for use where the only changes are in the python directory: + run the python testing listed below) + d) regular (regular tests on normal machines if CTSM source is modified) + e) release (regular tests plus the fates, ctsm_sci, mosart and rtm test lists + and normally all of the ancillary tests (build-namelist, python, ptclm, etc.) + would be run as well) + +In addition, various other tests of the tools, python and perl +infrastructure should be run when appropriate, as described below. + +...] + + + [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): + + cheyenne ---- OK + izumi ------- OK + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + cheyenne ---- OK + izumi ------- TBD + + any other testing (give details below): + +If the tag used for baseline comparisons was NOT the previous tag, note that here: + +Answer changes +-------------- + +Changes answers relative to baseline: + + [ If a tag changes answers relative to baseline comparison the + following should be filled in (otherwise remove this section). + And always remove these three lines and parts that don't apply. ] + + Summarize any changes to answers, i.e., + - what code configurations: + - what platforms/compilers: + - nature of change (roundoff; larger than roundoff/same climate; new climate): + + If bitwise differences were observed, how did you show they were no worse + than roundoff? + + If this tag changes climate describe the run(s) done to evaluate the new + climate (put details of the simulations in the experiment database) + - casename: + + URL for LMWG diagnostics output used to validate new climate: + + +Other details +------------- +[Remove any lines that don't apply. Remove entire section if nothing applies.] + +List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): + +Pull Requests that document the changes (include PR ids): + + https://github.com/ESCOMP/CTSM/pull/1827 + https://github.com/ESCOMP/CTSM/pull/1849 + + +=============================================================== +=============================================================== Tag name: ctsm5.1.dev111 Originator(s): jedwards (Jim Edwards), wwieder (Will Wieder), sacks (Bill Sacks) Date: Wed Oct 5 13:05:52 MDT 2022 diff --git a/doc/ChangeSum b/doc/ChangeSum index cdbc339758..5da2581767 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.1.dev112 multiple 10/13/2022 Rework fates test definitions and add new fates tests ctsm5.1.dev111 multiple 10/05/2022 Fixes for NEON cases ctsm5.1.dev110 slevis 09/26/2022 Introduction of modify_meshes tool for use in I-cases and F-cases ctsm5.1.dev109 slevis 09/26/2022 If not MIMICS, do not output certain MIMICS history fields From bb2ecf56fe17a4c47e2e7add27cd4ff3c8b56f18 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Oct 2022 14:30:10 -0700 Subject: [PATCH 20/26] add new exact restart tests to known failure list --- cime_config/testdefs/ExpectedTestFails.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index e4c504d009..9dbad62a43 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -52,5 +52,19 @@ #667 + + + + FAIL + FATES#897 + + + + + FAIL + FATES#897 + + + From 74be22b5f080cb8497d54f49eb8859e76e6ffe53 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Oct 2022 15:13:46 -0700 Subject: [PATCH 21/26] adding fates issue 701 to the expected fail list --- 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 9dbad62a43..878fef6dc1 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -67,4 +67,11 @@ + + + FAIL + FATES#701 + + + From 389826f3c8709a19fd1a44b71269591c9533cf70 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Oct 2022 15:16:51 -0700 Subject: [PATCH 22/26] update compset name to current fates lightning expected diff --- cime_config/testdefs/ExpectedTestFails.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 878fef6dc1..232b6e6a90 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -46,7 +46,7 @@ - + FAIL #667 From ec55adef76bddeeb3378e40173df4ca453d861b0 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Oct 2022 16:19:56 -0700 Subject: [PATCH 23/26] updating changelog and changesum --- doc/ChangeLog | 65 +++++++++++---------------------------------------- doc/ChangeSum | 2 +- 2 files changed, 15 insertions(+), 52 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 61374f0942..54272273fc 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.1.dev112 Originator(s): adrifoster (Adrianna Foster), glemieux (Gregory Lemieux, LBL/NGEET) -Date: Thu 13 Oct 2022 17:19:14 MDT +Date: Thu 14 Oct 2022 16:20:00 MDT One-line Summary: Rework fates test definitions and add new fates tests Purpose and description of changes @@ -13,7 +13,7 @@ This tag includes a number of updates to the fates test definitions and test lis can be configured for cases using a compset. (2) Add a long-term exact restart test to catch issues that may arise due to updates to -fates procedure calls during end of year simulation dates. +fates procedure calls during end of year simulation dates. (3) Add a no-competition + fixed biogeography, non-satellite phenology test definition to provide additional mode combination configuration. @@ -24,6 +24,8 @@ issue discovered while implementing (1) above. (5) Truncate all testmods starting the "Fates" to mitigate running over the limits on the length of testnames, typically when specifying custom `test_id` using `run_sys_test`. +(6) Updates the expected failures list. + Significant changes to scientifically-supported configurations -------------------------------------------------------------- @@ -58,35 +60,10 @@ Notes of particular relevance for developers: Changes to tests or testing: FATES#897 is still unresolved, but is now covered by this updated test list. + FATES#701 was reopened Testing summary: ---------------- -[... Remove before making master tag. - -Nearly all CTSM tags should undergo 'regular' (aux_clm) testing. -However, it occasionally makes sense to do more or less system testing; -here is guidance on different available levels of system testing: - a) no system testing (for use when the only changes are ones that - have absolutely no impact on system runs; this - includes documentation-only tags, tags that - just change the tools or some python code that - does not impact system runs, etc.) - b) minimal (for use in rare cases where only a small change with - known behavior is added ... eg. a minor bug fix. This - might be to just run the "short" test list, or to run - a single test. Whatever makes sense for the particular case.) - c) python only (for use where the only changes are in the python directory: - run the python testing listed below) - d) regular (regular tests on normal machines if CTSM source is modified) - e) release (regular tests plus the fates, ctsm_sci, mosart and rtm test lists - and normally all of the ancillary tests (build-namelist, python, ptclm, etc.) - would be run as well) - -In addition, various other tests of the tools, python and perl -infrastructure should be run when appropriate, as described below. - -...] - [PASS means all tests PASS; OK means tests PASS other than expected fails.] @@ -97,41 +74,27 @@ infrastructure should be run when appropriate, as described below. fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) cheyenne ---- OK - izumi ------- TBD + izumi ------- OK any other testing (give details below): If the tag used for baseline comparisons was NOT the previous tag, note that here: + FATES tests run against both fates-sci.1.58.1_api.24.1.0-ctsm5.1.dev111 to check the + fates update against the previous baseline is in line with expected DIFFs and + fates-sci.1.59.7_api.24.1.0-ctsm5.1.dev111. + Answer changes -------------- -Changes answers relative to baseline: - - [ If a tag changes answers relative to baseline comparison the - following should be filled in (otherwise remove this section). - And always remove these three lines and parts that don't apply. ] - - Summarize any changes to answers, i.e., - - what code configurations: - - what platforms/compilers: - - nature of change (roundoff; larger than roundoff/same climate; new climate): - - If bitwise differences were observed, how did you show they were no worse - than roundoff? - - If this tag changes climate describe the run(s) done to evaluate the new - climate (put details of the simulations in the experiment database) - - casename: - - URL for LMWG diagnostics output used to validate new climate: - +Changes answers relative to baseline: + Yes, for fates run modes only due non-b4b updates in multiple fates tags. These + include both software bug fixes and answer changing science updates. Other details ------------- -[Remove any lines that don't apply. Remove entire section if nothing applies.] -List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): +List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): fates Pull Requests that document the changes (include PR ids): diff --git a/doc/ChangeSum b/doc/ChangeSum index 5da2581767..16aceff1f8 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.1.dev112 multiple 10/13/2022 Rework fates test definitions and add new fates tests + ctsm5.1.dev112 multiple 10/14/2022 Rework fates test definitions and add new fates tests ctsm5.1.dev111 multiple 10/05/2022 Fixes for NEON cases ctsm5.1.dev110 slevis 09/26/2022 Introduction of modify_meshes tool for use in I-cases and F-cases ctsm5.1.dev109 slevis 09/26/2022 If not MIMICS, do not output certain MIMICS history fields From e27e7174b778a86615d6dbbefececd62d01cd4b0 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Oct 2022 16:30:35 -0700 Subject: [PATCH 24/26] fix minor grammatical error in changelog --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 54272273fc..96d5373cfb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -21,7 +21,7 @@ additional mode combination configuration. (4) Update the fates externals tag to incorporate a fix a vegetation temperature exact restart issue discovered while implementing (1) above. -(5) Truncate all testmods starting the "Fates" to mitigate running over the limits on the length +(5) Truncate all testmods starting with "Fates" to mitigate running over the limits on the length of testnames, typically when specifying custom `test_id` using `run_sys_test`. (6) Updates the expected failures list. From 84f768d40301b2919dbed6e8d9c8715614dfcdd2 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 15 Oct 2022 12:44:53 -0700 Subject: [PATCH 25/26] rename mimics fates test to be consistent with other test names --- cime_config/testdefs/testlist_clm.xml | 2 +- .../{mimicsFatesColdDef => mimicsFatesCold}/include_user_mods | 0 .../clm/{mimicsFatesColdDef => mimicsFatesCold}/shell_commands | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename cime_config/testdefs/testmods_dirs/clm/{mimicsFatesColdDef => mimicsFatesCold}/include_user_mods (100%) rename cime_config/testdefs/testmods_dirs/clm/{mimicsFatesColdDef => mimicsFatesCold}/shell_commands (100%) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 25263d4ea4..ffc56de0c3 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1996,7 +1996,7 @@ - + diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsFatesColdDef/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/include_user_mods similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/mimicsFatesColdDef/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsFatesColdDef/shell_commands b/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/mimicsFatesColdDef/shell_commands rename to cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/shell_commands From b098b6b867a60195270408eccc52c1aea1030c9b Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 15 Oct 2022 16:27:00 -0600 Subject: [PATCH 26/26] Update date on changelog, add note that I ran the build-namelist testing --- doc/ChangeLog | 6 +++++- doc/ChangeSum | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 96d5373cfb..304740b1b8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.1.dev112 Originator(s): adrifoster (Adrianna Foster), glemieux (Gregory Lemieux, LBL/NGEET) -Date: Thu 14 Oct 2022 16:20:00 MDT +Date: Sat Oct 15 16:26:28 MDT 2022 One-line Summary: Rework fates test definitions and add new fates tests Purpose and description of changes @@ -67,6 +67,10 @@ Testing summary: [PASS means all tests PASS; OK means tests PASS other than expected fails.] + build-namelist tests (if CLMBuildNamelist.pm has changed): + + cheyenne - PASS + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): cheyenne ---- OK diff --git a/doc/ChangeSum b/doc/ChangeSum index 16aceff1f8..9eab48d7e5 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.1.dev112 multiple 10/14/2022 Rework fates test definitions and add new fates tests + ctsm5.1.dev112 multiple 10/15/2022 Rework fates test definitions and add new fates tests ctsm5.1.dev111 multiple 10/05/2022 Fixes for NEON cases ctsm5.1.dev110 slevis 09/26/2022 Introduction of modify_meshes tool for use in I-cases and F-cases ctsm5.1.dev109 slevis 09/26/2022 If not MIMICS, do not output certain MIMICS history fields