Updates for failing tests (#303)

* 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

* Problem was branch runs, not hybrids

Author: mnlevy1981

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

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 == "branch": .true.
           else: .false.
     new_lscale:
         values: .true.

param_templates/json/input_nml.json

@@ -72,7 +72,7 @@
    "nam_stochy": {
       "stochini": {
          "values": {
-            "$CONTINUE_RUN == True": ".true.",
+            "$CONTINUE_RUN == True or $RUN_TYPE == \"branch\"": ".true.",
             "else": ".false."
          }
       },