NOAA-EMC · WalterKolczynski-NOAA · Mar 2, 2023 · Dec 2, 2022 · Dec 2, 2022 · Dec 7, 2022
diff --git a/README.md b/README.md
@@ -51,5 +51,4 @@ build_all.sh [-a UFS_app][-c build_config][-h][-v]
 
 While in /sorc folder:
 
-$ sh link_workflow.sh emc $MACHINE
-...where $MACHINE is "dell", "cray", "hera", or "orion".
+$ sh link_workflow.sh 
diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -200,7 +200,7 @@ case "${APP}" in
         export DO_WAVE="YES"
         export WAVE_CDUMP="both"
         export cplwav2atm=".true."
-        export confignamevarfornems="${confignamevarfornems}_wave"
+        export confignamevarfornems="${confignamevarfornems}_wave_out"
     fi
 
     source $EXPDIR/config.defaults.s2sw

diff --git a/parm/config/config.defaults.s2sw b/parm/config/config.defaults.s2sw
@@ -30,13 +30,13 @@ MEDPETS=300
 
 # config.wave
 
-waveGRD='gwes_30m'
-waveinterpGRD=' '
-waveuoutpGRD='gwes_30m'
-MESH_WAV='mesh.gwes_30m.nc'
+waveGRD='mx025'
+waveinterpGRD='reg025'
+waveuoutpGRD='mx025'
+MESH_WAV='mesh.mx025.nc'
 
 waveesmfGRD=' '
-wavepostGRD='gwes_30m'
+wavepostGRD=' '
 waveGRDN="1"
 waveGRDG="10"
 USE_WAV_RMP="NO"

diff --git a/parm/config/config.fcst b/parm/config/config.fcst
@@ -161,6 +161,9 @@ export isatmedmf=1
 tbf=""
 if [[ "$satmedmf" = ".true." ]]; then tbf="_satmedmf" ; fi
 
+#Convection schemes
+export progsigma=".true."
+
 # Radiation options
 export IAER=1011    ; #spectral band mapping method for aerosol optical properties
 export iovr_lw=3    ; #de-correlation length cloud overlap method (Barker, 2008)
@@ -198,7 +201,12 @@ elif [[ "$imp_physics" -eq 6 ]]; then # WSM6
 
 elif [[ "$imp_physics" -eq 8 ]]; then # Thompson
     export ncld=2
-    export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_thompson_noaero_tke"
+
+    if [[ "$progsigma" = .true. ]]; then 
+      export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_thompson_noaero_tke_progsigma"
+    else    
+      export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_thompson_noaero_tke"
+    fi
     export nwat=6
 
     export cal_pre=".false."

diff --git a/parm/parm_fv3diag/field_table_thompson_noaero_tke_progsigma b/parm/parm_fv3diag/field_table_thompson_noaero_tke_progsigma
@@ -0,0 +1,70 @@
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=3.e-6" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ice water mixing ratio
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic rain water mixing ratio
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic snow water mixing ratio
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic Grau water mixing ratio
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water number concentration - not for non-aerosol runs
+# "TRACER", "atmos_mod", "water_nc"
+#           "longname",     "cloud  liquid water  number concentration"
+#           "units",        "/kg"
+#       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic cloud ice number concentration
+ "TRACER", "atmos_mod", "ice_nc"
+           "longname",     "cloud ice water number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic rain number concentration
+ "TRACER", "atmos_mod", "rain_nc"
+           "longname",     "rain number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# water- and ice-friendly aerosols (Thompson) - not for non-aerosol runs
+# "TRACER", "atmos_mod", "liq_aero"
+#           "longname",     "water-friendly aerosol number concentration"
+#           "units",        "/kg"
+#       "profile_type", "fixed", "surface_value=0.0" /
+# "TRACER", "atmos_mod", "ice_aero"
+#           "longname",     "ice-friendly aerosol number concentration"
+#           "units",        "/kg"
+#       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognotsitc sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
diff --git a/parm/wave/ww3_grid.inp.mx025 b/parm/wave/ww3_grid.inp.mx025
@@ -1,13 +1,16 @@
 $ --------------------------------------------------------------- $
  'GLO 1/4 deg tripole grid lat 85 '
 $
-  1.07  0.035  50  36  0.5
+$gfs:  1.07  0.035  50  36  0.5
+$gefs: 1.1 0.035  33 36 0.5
+  1.1 0.035  33 36 0.5
 $
 $ Set model flags
    F T T T T T
 $
 $if outerloop: 1800 200 600 30
- 300 150 150 30
+$if innerloop: 300 150 150 30
+ 1800 200 600 30
 $
 &OUTS USSP = 1, IUSSP = 3, STK_WN = 0.04, 0.110, 0.3305 /
 &SIN4 BETAMAX = 1.315,

diff --git a/parm/wave/ww3_grid.inp.reg025 b/parm/wave/ww3_grid.inp.reg025
@@ -1,10 +1,9 @@
 $ -------------------------------------------------------------------- $
 $ WAVEWATCH III Grid preprocessor input file                           $
 $ -------------------------------------------------------------------- $
-  'GFSv16-wave Global 1/4 extended grid  '
+  'Global regular 1/4 extended grid  '
 $
-$   1.10  0.035  36  24  0.5
-  1.07  0.035  50  36  0.5
+  1.10  0.035  33  36  0.5
 $
    F T T T T T
 $

@@ -4,7 +4,7 @@ set -eux
 cwd=$(pwd)
 
 # Default settings
-APP="S2SWA"
+APP="MS2SWA"
 CCPP_SUITES="FV3_GFS_v16,FV3_GFS_v16_no_nsst,FV3_GFS_v16_ugwpv1,FV3_GFS_v17_p8,FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8"
 
 export RT_COMPILER="intel"
@@ -27,7 +27,7 @@ done
 
 cd "${cwd}/ufs_model.fd"
 
-MAKE_OPT="-DAPP=${APP} -DCCPP_SUITES=${CCPP_SUITES}"
+MAKE_OPT="-DAPP=${APP} -D32BIT=ON -DCCPP_SUITES=${CCPP_SUITES}"
 [[ ${BUILD_TYPE:-"Release"} = "DEBUG" ]] && MAKE_OPT+=" -DDEBUG=ON"
 COMPILE_NR=0
 CLEAN_BEFORE=YES

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -156,7 +156,7 @@ mkdir -p "${logdir}"
 # The checkout version should always be a speciifc commit (hash or tag), not a branch
 errs=0
 checkout "gfs_utils.fd"    "https://github.com/NOAA-EMC/gfs-utils"              "0b8ff56"                    ; errs=$((errs + $?))
-checkout "ufs_model.fd"    "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?))
+checkout "ufs_model.fd"    "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-ce86979}" ; errs=$((errs + $?))
 checkout "ufs_utils.fd"    "https://github.com/ufs-community/UFS_UTILS.git"     "8b990c0"                    ; errs=$((errs + $?))
 checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git"   "c267780"                    ; errs=$((errs + $?))
 

diff --git a/ush/nems.configure.cpld_aero_wave_out.IN b/ush/nems.configure.cpld_aero_wave_out.IN
@@ -0,0 +1,141 @@
+#############################################
+####  NEMS Run-Time Configuration File  #####
+#############################################
+
+# ESMF #
+  logKindFlag:           @[esmf_logkind] 
+
+# EARTH #
+EARTH_component_list: MED ATM CHM OCN ICE WAV
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# MED #
+MED_model:                      @[med_model]
+MED_petlist_bounds:             @[med_petlist_bounds]
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_attributes::
+  Verbosity = 0
+  DumpFields = @[DumpFields]
+  ProfileMemory = false
+  OverwriteSlice = true
+::
+
+# CHM #
+CHM_model:                      @[chm_model]
+CHM_petlist_bounds:             @[chm_petlist_bounds]
+CHM_attributes::
+  Verbosity = 0
+::
+
+# OCN #
+OCN_model:                      @[ocn_model]
+OCN_petlist_bounds:             @[ocn_petlist_bounds]
+OCN_attributes::
+  Verbosity = 0
+  DumpFields = @[DumpFields]
+  ProfileMemory = false
+  OverwriteSlice = true
+  mesh_ocn = @[MESH_OCN_ICE]
+::
+
+# ICE #
+ICE_model:                      @[ice_model]
+ICE_petlist_bounds:             @[ice_petlist_bounds]
+ICE_attributes::
+  Verbosity = 0
+  DumpFields = @[DumpFields]
+  ProfileMemory = false
+  OverwriteSlice = true
+  mesh_ice = @[MESH_OCN_ICE]
+  stop_n = @[RESTART_N]
+  stop_option = nhours
+  stop_ymd = -999
+::
+
+# WAV #
+WAV_model:                      @[wav_model]
+WAV_petlist_bounds:             @[wav_petlist_bounds]
+WAV_attributes::
+  Verbosity = 0
+  OverwriteSlice = false
+  diro = "."
+  logfile = wav.log
+  mesh_wav = @[MESH_WAV]
+  multigrid = @[MULTIGRID]
+::
+
+# CMEPS warm run sequence
+runSeq::
+@@[coupling_interval_slow_sec]
+   MED med_phases_prep_wav_avg
+   MED med_phases_prep_ocn_avg
+   MED -> WAV :remapMethod=redist
+   MED -> OCN :remapMethod=redist
+   WAV
+   OCN
+   @@[coupling_interval_fast_sec]
+     MED med_phases_prep_atm
+     MED med_phases_prep_ice
+     MED -> ATM :remapMethod=redist
+     MED -> ICE :remapMethod=redist
+     ATM phase1
+     ATM -> CHM
+     CHM
+     CHM -> ATM
+     ATM phase2
+     ICE
+     ATM -> MED :remapMethod=redist
+     MED med_phases_post_atm
+     ICE -> MED :remapMethod=redist
+     MED med_phases_post_ice
+     MED med_phases_prep_ocn_accum
+     MED med_phases_prep_wav_accum
+   @
+   OCN -> MED :remapMethod=redist
+   WAV -> MED :remapMethod=redist
+   MED med_phases_post_ocn
+   MED med_phases_post_wav
+   MED med_phases_restart_write
+@
+::
+
+# CMEPS variables
+
+DRIVER_attributes::
+::
+MED_attributes::
+      ATM_model = @[atm_model]
+      ICE_model = @[ice_model]
+      OCN_model = @[ocn_model]
+      WAV_model = @[wav_model]
+      history_n = 0
+      history_option = nhours
+      history_ymd = -999
+      coupling_mode = @[CPLMODE]
+      history_tile_atm = @[ATMTILESIZE]
+::
+ALLCOMP_attributes::
+      ScalarFieldCount = 2
+      ScalarFieldIdxGridNX = 1
+      ScalarFieldIdxGridNY = 2
+      ScalarFieldName = cpl_scalars
+      start_type = @[RUNTYPE]
+      restart_dir = RESTART/
+      case_name = ufs.cpld
+      restart_n = @[RESTART_N]
+      restart_option = nhours
+      restart_ymd = -999
+      dbug_flag = @[cap_dbug_flag]
+      use_coldstart = @[use_coldstart]
+      use_mommesh = @[use_mommesh]
+      eps_imesh = @[eps_imesh]
+      stop_n = @[FHMAX]
+      stop_option = nhours
+      stop_ymd = -999
+::