Merge remote-tracking branch 'gsldev/gsl_ufs_dev' into KYdev_merge_GS…

…Ldev_Sept26 Resolve pull request conflicts.
kayeekayee · Sep 27, 2024 · 419d490 · 419d490
2 parents 755c011 + cacfc55
commit 419d490
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/parm/config/gfs/config.fcst b/parm/config/gfs/config.fcst
@@ -137,7 +137,7 @@ export d2_bg_k2=0.04
 export dz_min=6
 export n_sponge=42
 
-# PBL/turbulance schemes
+# PBL/turbulence schemes
 export hybedmf=".false."
 if [[ "${CCPP_SUITE}" == "FV3_global_nest"* ]]; then
   export satmedmf=".false."
@@ -149,7 +149,7 @@ export isatmedmf=1
 if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_c3_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" ]] ; then
    export satmedmf=".false."
    export isatmedmf=0
-   export CPP
+   export shal_cnv=".false."
    export do_mynnedmf=".true."
    export do_mynnsfclay=".false."
    export icloud_bl=1

diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
@@ -360,6 +360,7 @@ EOF
   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."}
+  alpha_fd     = ${alpha_fd:-"12.0"}
   min_lakeice  = ${min_lakeice:-"0.15"}
   min_seaice   = ${min_seaice:-"0.15"}
   use_cice_alb = ${use_cice_alb:-".false."}