Merge branch 'gsl_ufs_dev' of https://github.com/NOAA-GSL/global-work…

…flow into gsl_ufs_dev

INFO

@@ -1,3 +1,14 @@
+03-12-24
+========
+   12Jan24 global-workflow
+   UFS: 29Jan24, 625ac02
+   FV3: 29Jan24, bd38c56
+   UPP: 07Nov23, 78f369b
+   UFS_UTILS: 22Dev23, ce385ce
+
+   update pointers for ufs_model and ufs_utils
+   add GSL C3_MYNN xml suite
+   Change dt_inner=75 for any configuration running aerosol-aware Thompson (ltaerosol=.true.)
 
 02-13-24
 ========

parm/config/gfs/config.fcst

@@ -119,7 +119,7 @@ fi
 
 # PBL/turbulence schemes
 export hybedmf=".false."
-if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" ]] ; then
+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 shal_cnv=".false."
@@ -163,7 +163,7 @@ export iopt_trs="2"
 
 # Convection Options: 2-SASAS, 3-GF
 export progsigma=".true."
-if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" ]] ; then
+if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_c3_mynn" ]] ; then
     export imfdeepcnv=5
     export imfshalcnv=-1                 ## JKH - no shallow GF
 elif [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_c3" ]] ; then 
@@ -211,25 +211,27 @@ case ${imp_physics} in
         export ncld=2
         export nwat=6
 
-        if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" || 
-              "$CCPP_SUITE" == "FV3_GFS_v17_p8_thompson" ]] ; then
-          export ltaerosol=".true."
-          export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_aero_tke${tbp}"
-        else
-          export ltaerosol=".false."
-          export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
-        fi
-
         export cal_pre=".false."
         export random_clds=".false."
         export effr_in=".true."
         export lradar=".true."
         export ttendlim="-999"
-        export dt_inner=$((DELTIM/2))
         export sedi_semi=.true.
-        if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
         export decfl=10
 
+        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" || 
+              "${CCPP_SUITE}" == "FV3_GFS_v17_p8_thompson" ]] ; then
+          #JKH  keep dt_inner $DELTIM/2 (75) if running aerosol-aware Thompson
+          export dt_inner=$((DELTIM/2))
+          export ltaerosol=".true."
+          export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_aero_tke${tbp}"
+        else
+          export dt_inner=$((DELTIM/2))
+          if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
+          export ltaerosol=".false."
+          export FIELD_TABLE="${HOMEgfs}/parm/ufs/fv3/field_table_thompson_noaero_tke${tbp}"
+        fi
+
         export hord_mt_nh_nonmono=5
         export hord_xx_nh_nonmono=5
         export vtdm4_nh_nonmono=0.02

sorc/build_ufs.sh

@@ -5,7 +5,7 @@ cwd=$(pwd)
 
 # Default settings
 APP="S2SWA"
-CCPP_SUITES="FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v17_coupled_p8_ugwpv1,FV3_GFS_v17_p8_ugwpv1_c3,FV3_GFS_v17_p8_ugwpv1_mynn"  # TODO: does the g-w need to build with all these CCPP_SUITES?
+CCPP_SUITES="FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v17_coupled_p8_ugwpv1,FV3_GFS_v17_p8_ugwpv1_c3,FV3_GFS_v17_p8_ugwpv1_c3_mynn,FV3_GFS_v17_p8_ugwpv1_mynn"  # TODO: does the g-w need to build with all these CCPP_SUITES?
 
 while getopts ":da:j:v" option; do
   case "${option}" in