diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index b0ef1265007..5519b6a3bb4 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -117,8 +117,11 @@ export ATARDIR="@ATARDIR@" # Commonly defined parameters in JJOBS export envir=${envir:-"prod"} -export NET="gfs" -export RUN=${RUN:-${CDUMP:-"gfs"}} +export NET="gfs" # NET is defined in the job-card (ecf) +export RUN=${RUN:-${CDUMP:-"gfs"}} # RUN is defined in the job-card (ecf); CDUMP is used at EMC as a RUN proxy +# TODO: determine where is RUN actually used in the workflow other than here +# TODO: is it possible to replace all instances of ${CDUMP} to ${RUN} to be +# consistent w/ EE2? export COMIN_OBS=${DMPDIR}/${CDUMP}.${PDY}/$cyc/atmos export COMIN_GES_OBS=${DMPDIR}/${CDUMP}.${PDY}/$cyc/atmos export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos @@ -345,7 +348,7 @@ if [ $DOHYBVAR = "YES" ]; then fi fi -# if 3DVAR and IAU +# if 3DVAR and IAU if [[ ${DOHYBVAR} == "NO" && ${DOIAU} == "YES" ]]; then export IAUFHRS="6" export IAU_FHROT="3" diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py index b79cffe4bef..c31397dd264 100644 --- a/workflow/rocoto/workflow_tasks.py +++ b/workflow/rocoto/workflow_tasks.py @@ -39,7 +39,9 @@ def __init__(self, app_config: AppConfig, cdump: str) -> None: envar_dict = {'RUN_ENVIR': self._base.get('RUN_ENVIR', 'emc'), 'HOMEgfs': self._base.get('HOMEgfs'), 'EXPDIR': self._base.get('EXPDIR'), + 'NET': 'gfs', 'CDUMP': self.cdump, + 'RUN': self.cdump, 'CDATE': '@Y@m@d@H', 'PDY': '@Y@m@d', 'cyc': '@H',