Merge branch 'NOAA-EMC:develop' into feature/ldebug

parm/config/gefs/config.base.emc.dyn

@@ -19,7 +19,7 @@ export PARTITION_BATCH="@PARTITION_BATCH@"
 export PARTITION_SERVICE="@PARTITION_SERVICE@"
 
 # Project to use in mass store:
-HPSS_PROJECT="@HPSS_PROJECT@"
+export HPSS_PROJECT="@HPSS_PROJECT@"
 
 # Directories relative to installation areas:
 export HOMEgfs=@HOMEgfs@
@@ -82,8 +82,8 @@ export VERBOSE="YES"
 export KEEPDATA="NO"
 export CHGRP_RSTPROD="@CHGRP_RSTPROD@"
 export CHGRP_CMD="@CHGRP_CMD@"
-export NCDUMP="$NETCDF/bin/ncdump"
-export NCLEN="$HOMEgfs/ush/getncdimlen"
+export NCDUMP="${NETCDF}/bin/ncdump"
+export NCLEN="${HOMEgfs}/ush/getncdimlen"
 
 # Machine environment, jobs, and other utility scripts
 export BASE_ENV="${HOMEgfs}/env"
@@ -149,7 +149,7 @@ export OPS_RES="C768" # Do not change
 
 # Resolution specific parameters
 export LEVS=128
-export CASE="@CASECTL@"
+export CASE="@CASECTL@"  # CASE is required in GEFS to determine ocean/ice/wave resolutions
 export CASE_ENS="@CASEENS@"
 # TODO: This should not depend on $CASE or $CASE_ENS
 # These are the currently available grid-combinations
@@ -174,7 +174,7 @@ case "${CASE}" in
         export OCNRES=025
         export waveGRD='mx025'
         ;;
-    *) 
+    *)
         export OCNRES=025
         export waveGRD='glo_025'
         ;;
@@ -218,7 +218,6 @@ case "${APP}" in
         export cplwav2atm=".true."
         export confignamevarfornems="${confignamevarfornems}_outerwave"
     fi
-
     ;;
   *)
     echo "Unrecognized APP: ${1}"

parm/config/gefs/config.efcs

@@ -5,22 +5,15 @@
 
 echo "BEGIN: config.efcs"
 
-# TODO: Possibly need OCNRES_ENKF, ICERES_ENKF, WAVRES_ENKF too
-if [[ ${DO_OCN} == "YES" ]]; then
-  case "${CASE_ENS}" in
-    "C48") export OCNRES=500;;
-    "C96") export OCNRES=100;;
-    "C192") export OCNRES=050;;
-    "C384") export OCNRES=025;;
-    "C768") export OCNRES=025;;
-    *) export OCNRES=025;;
-  esac
-fi
-[[ ${DO_ICE} == "YES" ]] && export ICERES=${OCNRES}
-[[ ${DO_WAVE} == "YES" ]] && export waveGRD=${waveGRD_ENKF:-${waveGRD}}  # TODO: will we run waves with a different resolution in the ensemble?
+# Turn off components in ensemble via _ENKF, or use setting from deterministic
+export DO_AERO=${DO_AERO_ENKF:-${DO_AERO:-"NO"}}
+export DO_OCN=${DO_OCN_ENKF:-${DO_OCN:-"NO"}}
+export DO_ICE=${DO_ICE_ENKF:-${DO_ICE:-"NO"}}
+export DO_WAVE=${DO_WAVE_ENKF:-${DO_WAVE:-"NO"}}
 
 # Source model specific information that is resolution dependent
 string="--fv3 ${CASE_ENS}"
+# Ocean/Ice/Waves ensemble configurations are identical to deterministic member
 [[ ${DO_OCN} == "YES" ]] && string="${string} --mom6 ${OCNRES}"
 [[ ${DO_ICE} == "YES" ]] && string="${string} --cice6 ${ICERES}"
 [[ ${DO_WAVE} == "YES" ]] && string="${string} --ww3 ${waveGRD// /;}"

parm/config/gfs/config.efcs

@@ -5,31 +5,15 @@
 
 echo "BEGIN: config.efcs"
 
-# TODO: the _ENKF counterparts need to be defined in config.base; for now inherit from config.base
-# TODO: Using different values for ensemble doesn't work because
-#       config.fcst sets a bunch of derived values based on these
-#       that is not duplicated here. [#1692]
+# Turn off components in ensemble via _ENKF, or use setting from deterministic
 export DO_AERO=${DO_AERO_ENKF:-${DO_AERO:-"NO"}}
 export DO_OCN=${DO_OCN_ENKF:-${DO_OCN:-"NO"}}
 export DO_ICE=${DO_ICE_ENKF:-${DO_ICE:-"NO"}}
 export DO_WAVE=${DO_WAVE_ENKF:-${DO_WAVE:-"NO"}}
 
-# TODO: Possibly need OCNRES_ENKF, ICERES_ENKF, WAVRES_ENKF too
-if [[ ${DO_OCN} == "YES" ]]; then
-  case "${CASE_ENS}" in
-    "C48") export OCNRES=500;;
-    "C96") export OCNRES=500;;
-    "C192") export OCNRES=050;;
-    "C384") export OCNRES=025;;
-    "C768") export OCNRES=025;;
-    *) export OCNRES=025;;
-  esac
-fi
-[[ ${DO_ICE} == "YES" ]] && export ICERES=${OCNRES}
-[[ ${DO_WAVE} == "YES" ]] && export waveGRD=${waveGRD_ENKF:-${waveGRD}}  # TODO: will we run waves with a different resolution in the ensemble?
-
 # Source model specific information that is resolution dependent
 string="--fv3 ${CASE_ENS}"
+# Ocean/Ice/Waves ensemble configurations are identical to deterministic member
 [[ ${DO_OCN} == "YES" ]] && string="${string} --mom6 ${OCNRES}"
 [[ ${DO_ICE} == "YES" ]] && string="${string} --cice6 ${ICERES}"
 [[ ${DO_WAVE} == "YES" ]] && string="${string} --ww3 ${waveGRD// /;}"

ush/forecast_postdet.sh

@@ -962,7 +962,7 @@ CICE_postdet() {
       seconds=$(to_seconds "${vdate:8:2}0000")  # convert HHMMSS to seconds
       vdatestr="${vdate:0:4}-${vdate:4:2}-${vdate:6:2}-${seconds}"
       fhr3=$(printf %03i "${fhr}")
-      ${NLN} "${COM_ICE_HISTORY}/${RUN}.t${cyc}z.icef${fhr3}.nc" "${DATA}/CICE_OUTPUT/iceh_inst.-${vdatestr}.nc"
+      ${NLN} "${COM_ICE_HISTORY}/${RUN}.t${cyc}z.icef${fhr3}.nc" "${DATA}/CICE_OUTPUT/iceh_inst.${vdatestr}.nc"
       fhr=$((fhr + FHOUT))
     done
 

workflow/rocoto/gfs_tasks.py

@@ -887,7 +887,7 @@ def fit2obs(self):
 
     def metp(self):
         deps = []
-        dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'}
+        dep_dict = {'type': 'task', 'name': f'{self.cdump}arch'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
@@ -917,9 +917,6 @@ def arch(self):
         if self.cdump in ['gdas'] and self.app_config.do_fit2obs:
             dep_dict = {'type': 'task', 'name': f'{self.cdump}fit2obs'}
             deps.append(rocoto.add_dependency(dep_dict))
-        if self.app_config.do_metp and self.cdump in ['gfs']:
-            dep_dict = {'type': 'metatask', 'name': f'{self.cdump}metp'}
-            deps.append(rocoto.add_dependency(dep_dict))
         if self.app_config.do_wave:
             dep_dict = {'type': 'task', 'name': f'{self.cdump}wavepostsbs'}
             deps.append(rocoto.add_dependency(dep_dict))