Merge remote-tracking branch 'origin/develop' into fix/metp_gfs_cyc

DavidHuber-NOAA · Jul 29, 2024 · 703a084 · 703a084
2 parents 2379a6c + f156a78
commit 703a084
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 5 deletions.
diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
@@ -108,8 +108,9 @@ if (( gwd_opt == 2 )); then
     export do_ugwp_v0_orog_only=".false."
     export do_ugwp_v0_nst_only=".false."
     export do_gsl_drag_ls_bl=".true."
-    export do_gsl_drag_ss=".true."
+    export do_gsl_drag_ss=".false."
     export do_gsl_drag_tofd=".true."
+    export do_gwd_opt_psl=".true."    
     export do_ugwp_v1_orog_only=".false."
     launch_level=$(echo "${LEVS}/2.35" |bc)
     export launch_level

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -453,6 +453,8 @@ export binary_diag=".false."
 
 # Verification options
 export DO_METP="@DO_METP@"   # Run METPLUS jobs - set METPLUS settings in config.metp
+# TODO Reenable METplus jobs when issue #2790 is resolved
+export DO_METP="NO"
 export DO_FIT2OBS="YES"      # Run fit to observations package
 export DO_VRFY_OCEANDA="@DO_VRFY_OCEANDA@"  # Run SOCA Ocean and Seaice DA verification tasks
 

diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst
@@ -120,8 +120,9 @@ if (( gwd_opt == 2 )); then
     export do_ugwp_v0_orog_only=".false."
     export do_ugwp_v0_nst_only=".false."
     export do_gsl_drag_ls_bl=".true."
-    export do_gsl_drag_ss=".true."
+    export do_gsl_drag_ss=".false."
     export do_gsl_drag_tofd=".true."
+    export do_gwd_opt_psl=".true."    
     export do_ugwp_v1_orog_only=".false."
     launch_level=$(echo "${LEVS}/2.35" |bc)
     export launch_level

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
@@ -102,7 +102,7 @@ case "${fv3_res}" in
         export knob_ugwp_tauamp=6.0e-3      # setting for UGWPv1 non-stationary GWD
         export k_split=1
         export n_split=4
-        export tau=10.0
+        export tau=8.0
         export rf_cutoff=100.0
         export fv_sg_adj=3600
         export WRITE_GROUP_GDAS=1

diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
@@ -255,6 +255,7 @@ FV3_out() {
   # Determine the dates for restart files to be copied to COM
   local restart_date restart_dates
   restart_dates=()
+
   # Copy restarts in the assimilation window for RUN=gdas|enkfgdas|enkfgfs
   if [[ "${RUN}" =~ "gdas" || "${RUN}" == "enkfgfs" ]]; then
     restart_date="${model_start_date_next_cycle}"

diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
@@ -284,6 +284,7 @@ EOF
   do_gsl_drag_ls_bl    = ${do_gsl_drag_ls_bl:-".true."}
   do_gsl_drag_ss       = ${do_gsl_drag_ss:-".true."}
   do_gsl_drag_tofd     = ${do_gsl_drag_tofd:-".true."}
+  do_gwd_opt_psl       = ${do_gwd_opt_psl:-".false."}
   do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."}
   min_lakeice  = ${min_lakeice:-"0.15"}
   min_seaice   = ${min_seaice:-"0.15"}
@@ -369,6 +370,7 @@ cat >> input.nml <<EOF
   betadcu      = ${betadcu:-"2.0"}
   ras          = ${ras:-".false."}
   cdmbgwd      = ${cdmbgwd:-"3.5,0.25"}
+  psl_gwd_dx_factor  = ${psl_gwd_dx_factor:-"6.0"}
   prslrd0      = ${prslrd0:-"0."}
   ivegsrc      = ${ivegsrc:-"1"}
   isot         = ${isot:-"1"}

diff --git a/ush/parsing_namelists_FV3_nest.sh b/ush/parsing_namelists_FV3_nest.sh
@@ -342,6 +342,7 @@ EOF
   do_gsl_drag_ls_bl    = ${do_gsl_drag_ls_bl:-".true."}
   do_gsl_drag_ss       = ${do_gsl_drag_ss:-".true."}
   do_gsl_drag_tofd     = ${do_gsl_drag_tofd:-".true."}
+  do_gwd_opt_psl       = ${do_gwd_opt_psl:-".false."}
   do_ugwp_v1_orog_only = ${do_ugwp_v1_orog_only:-".false."}
   min_lakeice  = ${min_lakeice:-"0.15"}
   min_seaice   = ${min_seaice:-"0.15"}
@@ -426,6 +427,7 @@ cat >> "${nml_file}" <<EOF
   betadcu      = ${betadcu:-"2.0"}
   ras          = ${ras:-".false."}
   cdmbgwd      = ${cdmbgwd:-"3.5,0.25"}
+  psl_gwd_dx_factor  = ${psl_gwd_dx_factor:-"6.0"}
   prslrd0      = ${prslrd0:-"0."}
   ivegsrc      = ${ivegsrc:-"1"}
   isot         = ${isot:-"1"}

diff --git a/versions/fix.ver b/versions/fix.ver
@@ -19,7 +19,7 @@ export mom6_ver=20240416
 export orog_ver=20231027
 export reg2grb2_ver=20220805
 export sfc_climo_ver=20220805
-export ugwd_ver=20231027
+export ugwd_ver=20240624
 export verif_ver=20220805
 export wave_ver=20240105
 export orog_nest_ver=global-nest.20240419