Merge branch 'NOAA-EMC:develop' into aws-gefs-2

NOAA-EMC · Aug 23, 2024 · b84c486 · b84c486
2 parents 26ccc47 + ea22a73
commit b84c486
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 1 deletion.
diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
@@ -193,6 +193,7 @@ case ${imp_physics} in
         export dt_inner=$((DELTIM/2))
         export sedi_semi=.true.
         if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
+        if [[ dt_inner -gt 300 ]]; then export  dt_inner=300 ; fi
         export decfl=10
 
         export hord_mt_nh_nonmono=5

diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst
@@ -209,6 +209,7 @@ case ${imp_physics} in
         export dt_inner=$((DELTIM/2))
         export sedi_semi=.true.
         if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
+        if [[ dt_inner -gt 300 ]]; then export  dt_inner=300; fi
         export decfl=10
 
         export hord_mt_nh_nonmono=5

diff --git a/parm/ufs/fv3/diag_table b/parm/ufs/fv3/diag_table
@@ -77,6 +77,7 @@
 #"gfs_dyn",     "pfhy",        "preshy",       "fv3_history",    "all",  .false.,  "none",  2
 #"gfs_dyn",     "pfnh",        "presnh",       "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "w",           "dzdt",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "omga",         "omga",         "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "ps",          "pressfc",      "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
 "gfs_phys",    "refl_10cm",   "refl_10cm",    "fv3_history",    "all",  .false.,  "none",  2

diff --git a/parm/ufs/fv3/diag_table_da b/parm/ufs/fv3/diag_table_da
@@ -30,6 +30,7 @@
 #"gfs_dyn",     "pfhy",        "preshy",       "fv3_history",    "all",  .false.,  "none",  2
 #"gfs_dyn",     "pfnh",        "presnh",       "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "w",           "dzdt",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "omga",        "omga",         "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "ps",          "pressfc",      "fv3_history",    "all",  .false.,  "none",  2
 "gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
 

diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
@@ -304,6 +304,7 @@ FV3_predet(){
     phys_hydrostatic=".false."     # enable heating in hydrostatic balance in non-hydrostatic simulation
     use_hydro_pressure=".false."   # use hydrostatic pressure for physics
     make_nh=".true."               # running in non-hydrostatic mode
+    pass_full_omega_to_physics_in_non_hydrostatic_mode=".true."
   else  # hydrostatic options
     hydrostatic=".true."
     phys_hydrostatic=".false."     # ignored when hydrostatic = T

diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
@@ -134,6 +134,7 @@ cat > input.nml <<EOF
   hydrostatic = ${hydrostatic}
   phys_hydrostatic = ${phys_hydrostatic}
   use_hydro_pressure = ${use_hydro_pressure}
+  pass_full_omega_to_physics_in_non_hydrostatic_mode = ${pass_full_omega_to_physics_in_non_hydrostatic_mode:-".false."}
   beta = 0.
   a_imp = 1.
   p_fac = 0.1

diff --git a/ush/parsing_namelists_FV3_nest.sh b/ush/parsing_namelists_FV3_nest.sh
@@ -160,6 +160,7 @@ cat > "${nml_file}" <<EOF
   hydrostatic = ${hydrostatic}
   phys_hydrostatic = ${phys_hydrostatic}
   use_hydro_pressure = ${use_hydro_pressure}
+  pass_full_omega_to_physics_in_non_hydrostatic_mode = ${pass_full_omega_to_physics_in_non_hydrostatic_mode:-".false."}
   beta = 0.
   a_imp = 1.
   p_fac = 0.1