From ff2d015c2079327211c95149b7c7b5f34b7051dd Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Tue, 11 Nov 2025 16:33:00 -0700 Subject: [PATCH 1/2] Updates for failing tests 1. with DO_SKEB=True by default, we need to turn it off in the no_stoch_physics test 2. In order for ERI tests to pass, need stochini=True for hybrid runs --- .../testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom | 3 +++ param_templates/input_nml.yaml | 2 +- param_templates/json/input_nml.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom diff --git a/cime_config/testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom new file mode 100644 index 00000000..320c93aa --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/mom/no_stoch_physics/user_nl_mom @@ -0,0 +1,3 @@ +DO_SKEB=False +SKEB_USE_GM=False +SKEB_USE_FRICT=False \ No newline at end of file diff --git a/param_templates/input_nml.yaml b/param_templates/input_nml.yaml index d5a950bf..1954ecb7 100644 --- a/param_templates/input_nml.yaml +++ b/param_templates/input_nml.yaml @@ -60,7 +60,7 @@ mpp_io_nml: nam_stochy: stochini: values: - $CONTINUE_RUN == True: .true. + $CONTINUE_RUN == True or $RUN_TYPE == "hybrid": .true. else: .false. new_lscale: values: .true. diff --git a/param_templates/json/input_nml.json b/param_templates/json/input_nml.json index fe795a5e..472936ee 100644 --- a/param_templates/json/input_nml.json +++ b/param_templates/json/input_nml.json @@ -72,7 +72,7 @@ "nam_stochy": { "stochini": { "values": { - "$CONTINUE_RUN == True": ".true.", + "$CONTINUE_RUN == True or $RUN_TYPE == \"hybrid\"": ".true.", "else": ".false." } }, From 4af61c1a48cfcb86f93ff997e4bc258d7c89bc2c Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Tue, 11 Nov 2025 20:03:36 -0700 Subject: [PATCH 2/2] Problem was branch runs, not hybrids --- param_templates/input_nml.yaml | 2 +- param_templates/json/input_nml.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/param_templates/input_nml.yaml b/param_templates/input_nml.yaml index 1954ecb7..36442a2c 100644 --- a/param_templates/input_nml.yaml +++ b/param_templates/input_nml.yaml @@ -60,7 +60,7 @@ mpp_io_nml: nam_stochy: stochini: values: - $CONTINUE_RUN == True or $RUN_TYPE == "hybrid": .true. + $CONTINUE_RUN == True or $RUN_TYPE == "branch": .true. else: .false. new_lscale: values: .true. diff --git a/param_templates/json/input_nml.json b/param_templates/json/input_nml.json index 472936ee..08157cdc 100644 --- a/param_templates/json/input_nml.json +++ b/param_templates/json/input_nml.json @@ -72,7 +72,7 @@ "nam_stochy": { "stochini": { "values": { - "$CONTINUE_RUN == True or $RUN_TYPE == \"hybrid\"": ".true.", + "$CONTINUE_RUN == True or $RUN_TYPE == \"branch\"": ".true.", "else": ".false." } },