From ea22a737ee9a815f1f294141abf85e0d1515868f Mon Sep 17 00:00:00 2001
From: XiaqiongZhou-NOAA <48254930+XiaqiongZhou-NOAA@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:57:07 -0400
Subject: [PATCH] Update omega calculation (#2751)

Add a parameter "pass_full_omega_to_physics_in_non_hydrostatic_mode" in
FV3 namelist. It was set to "true" to use a new method to diagnose
omega. This PR is based on the /ufs-community/ufs-weather-model#2327)

Corresponding parameter changed in GFSv17 related regression tests
ufs-community/ufs-weather-model#2373))
---
 parm/config/gefs/config.fcst      | 1 +
 parm/config/gfs/config.fcst       | 1 +
 parm/ufs/fv3/diag_table           | 1 +
 parm/ufs/fv3/diag_table_da        | 1 +
 sorc/ufs_model.fd                 | 2 +-
 ush/forecast_predet.sh            | 1 +
 ush/parsing_namelists_FV3.sh      | 1 +
 ush/parsing_namelists_FV3_nest.sh | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
index 407e48496e..efdedb24f4 100644
--- 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
index 2743ea0745..da336ff73b 100644
--- 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
index dad8b6fac6..f44bfd82a4 100644
--- 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
index 5e7149663a..339b6a42a5 100644
--- 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
index c12760125c..ee4f19a0a6 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit c12760125ce7c5a85e8ced92d7f37c9ad6a59afe
+Subproject commit ee4f19a0a630fc2245a313bfe20302b5a6b555aa
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index d1a332716a..6255b95175 100755
--- 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
index 60f44a721a..617ecff719 100755
--- 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
index 55fea07f57..0080641275 100755
--- 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