diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base index c16ad4b31c..f8bf9bb5f2 100644 --- a/parm/config/gefs/config.base +++ b/parm/config/gefs/config.base @@ -333,8 +333,8 @@ export DO_METP="NO" # Run METPLUS jobs - set METPLUS settings in config. export DO_FIT2OBS="NO" # Run fit to observations package # Archiving options -export DO_ARCHTAR="@DO_ARCHTAR@" # Tar and archive the COM directories -export ARCHTAR_TO="@ARCHTAR_TO@" # Valid options are hpss, globus_hpss, and local +export DO_ARCHCOM="@DO_ARCHCOM@" # Tar and archive the COM directories +export ARCHCOM_TO="@ARCHCOM_TO@" # Valid options are hpss, globus_hpss, and local # Globus UUID for this machine export CLIENT_GLOBUS_UUID='@CLIENT_GLOBUS_UUID@' diff --git a/parm/config/gfs/config.arch_tars b/parm/config/gfs/config.arch_tars index 89e2fd678f..7044c8d9ff 100644 --- a/parm/config/gfs/config.arch_tars +++ b/parm/config/gfs/config.arch_tars @@ -21,9 +21,9 @@ export ARCH_GAUSSIAN_FHMAX=${FHMAX_GFS:-} export ARCH_GAUSSIAN_FHINC=${FHOUT_GFS:-} # If we are running globus archiving, create tarballs in a temporary location -if [[ "${ARCHTAR_TO}" == "globus_hpss" ]]; then +if [[ "${ARCHCOM_TO}" == "globus_hpss" ]]; then export ATARDIR="${DATAROOT}/archive_rotdir/${RUN}" - export ARCHTAR_TO="local" + export ARCHCOM_TO="local" fi echo "END: config.arch_tars" diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base index b0c730b387..77233774f9 100644 --- a/parm/config/gfs/config.base +++ b/parm/config/gfs/config.base @@ -480,8 +480,8 @@ export DO_FETCH_HPSS="NO" # Copy from HPSS (on HPSS-accessible machines) onto export DO_FETCH_LOCAL="NO" # Copy from local disk onto COM # Archiving options -export DO_ARCHTAR="@DO_ARCHTAR@" # Tar and archive the COM directories -export ARCHTAR_TO="@ARCHTAR_TO@" # Valid options are hpss, globus_hpss, and local +export DO_ARCHCOM="@DO_ARCHCOM@" # Tar and archive the COM directories +export ARCHCOM_TO="@ARCHCOM_TO@" # Valid options are hpss, globus_hpss, and local # Globus UUID for this machine export CLIENT_GLOBUS_UUID='@CLIENT_GLOBUS_UUID@' diff --git a/parm/config/gfs/config.earc_tars b/parm/config/gfs/config.earc_tars index d6f26c7bd7..6fad97a8e9 100644 --- a/parm/config/gfs/config.earc_tars +++ b/parm/config/gfs/config.earc_tars @@ -33,7 +33,7 @@ export RMOLDSTD_ENKF=144 export RMOLDEND_ENKF=24 # If we are running globus archiving, create tarballs in a temporary location -if [[ "${ARCHTAR_TO}" == "globus_hpss" ]]; then +if [[ "${ARCHCOM_TO}" == "globus_hpss" ]]; then export ENSGRP="${ENSGRP:-0}" export ATARDIR="${DATAROOT}/archive_rotdir/${pslot}/${RUN}/${ENSGRP}" export LOCALARCH="YES" diff --git a/parm/config/sfs/config.base b/parm/config/sfs/config.base index 8c083578b4..1453699392 100644 --- a/parm/config/sfs/config.base +++ b/parm/config/sfs/config.base @@ -339,9 +339,9 @@ if [[ ${HPSSARCH} = "YES" ]] && [[ ${LOCALARCH} = "YES" ]]; then echo "Both HPSS and local archiving selected. Please choose one or the other." exit 3 elif [[ ${HPSSARCH} = "YES" ]] || [[ ${LOCALARCH} = "YES" ]]; then - export DO_ARCHTAR="YES" + export DO_ARCHCOM="YES" else - export DO_ARCHTAR="NO" + export DO_ARCHCOM="NO" fi export ARCH_CYC=00 # Archive data at this cycle for warm start and/or forecast-only capabilities export ARCH_WARMICFREQ=4 # Archive frequency in days for warm start capability diff --git a/scripts/exgdas_enkf_earc_tars.py b/scripts/exgdas_enkf_earc_tars.py index a63f98a005..fc1030ab39 100755 --- a/scripts/exgdas_enkf_earc_tars.py +++ b/scripts/exgdas_enkf_earc_tars.py @@ -19,7 +19,7 @@ def main(): # Pull out all the configuration keys needed to run the rest of archive steps keys = ['ATARDIR', 'current_cycle', 'IAUFHRS', 'RUN', 'PDY', - 'PSLOT', 'DO_ARCHTAR', 'ARCHTAR_TO', 'ROTDIR', 'PARMgfs', + 'PSLOT', 'DO_ARCHCOM', 'ARCHCOM_TO', 'ROTDIR', 'PARMgfs', 'ARCDIR', 'SDATE', 'MODE', 'ENSGRP', 'NMEM_EARCGRP', 'NMEM_ENS', 'DO_CALC_INCREMENT_ENKF_GFS', 'DO_JEDIATMENS', 'lobsdiag_forenkf', 'FHMIN_ENKF', 'FHMAX_ENKF_GFS', diff --git a/scripts/exglobal_archive_tars.py b/scripts/exglobal_archive_tars.py index c79cb1eb70..26fc7d6eef 100755 --- a/scripts/exglobal_archive_tars.py +++ b/scripts/exglobal_archive_tars.py @@ -28,14 +28,14 @@ def main(): keys = ['ATARDIR', 'current_cycle', 'FHMIN', 'FHMAX', 'FHOUT', 'RUN', 'PDY', 'DO_VERFRAD', 'DO_VMINMON', 'DO_VERFOZN', 'DO_ICE', 'DO_PREP_OBS_AERO', 'PARMgfs', 'DO_OCN', 'DO_WAVE', 'WRITE_DOPOST', 'PSLOT', 'DO_MOS', - 'DO_JEDISNOWDA', 'DO_ARCHTAR', 'ARCHTAR_TO', 'REALTIME', 'ROTDIR', 'ARCH_WARMICFREQ', + 'DO_JEDISNOWDA', 'DO_ARCHCOM', 'ARCHCOM_TO', 'REALTIME', 'ROTDIR', 'ARCH_WARMICFREQ', 'ARCH_FCSTICFREQ', 'ARCH_CYC', 'assim_freq', 'ARCDIR', 'SDATE', 'FHMIN_GFS', 'FHMAX_GFS', 'FHOUT_GFS', 'ARCH_GAUSSIAN', 'MODE', 'FHOUT_OCN', 'FHOUT_ICE', 'FHOUT_OCN_GFS', 'FHOUT_ICE_GFS', 'DO_BUFRSND', 'DOHYBVAR', 'ARCH_GAUSSIAN_FHMAX', 'ARCH_GAUSSIAN_FHINC', 'ARCH_GAUSSIAN_FHINC', 'DOIAU', 'OCNRES', 'ICERES', 'NUM_SND_COLLECTIVES', 'FHOUT_WAV', 'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS', - 'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHTAR', + 'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHCOM', 'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN', 'NMEM_ENS', 'DO_JEDIATMVAR', 'FHMAX_FITS', 'waveGRD', 'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS', diff --git a/ush/python/pygfs/task/archive.py b/ush/python/pygfs/task/archive.py index 5888a32a0d..31ee91bd0e 100644 --- a/ush/python/pygfs/task/archive.py +++ b/ush/python/pygfs/task/archive.py @@ -129,7 +129,7 @@ def configure_tars(self, arch_dict: Dict[str, Any]) -> (List[Dict[str, Any]]): # Collect datasets that need to be archived # Each dataset represents one tarball - if arch_dict.ARCHTAR_TO == "hpss": + if arch_dict.ARCHCOM_TO == "hpss": self.tar_cmd = "htar" self.hsi = Hsi() self.htar = Htar() @@ -137,14 +137,14 @@ def configure_tars(self, arch_dict: Dict[str, Any]) -> (List[Dict[str, Any]]): self.rm_cmd = self.hsi.rm self.chgrp_cmd = self.hsi.chgrp self.chmod_cmd = self.hsi.chmod - elif arch_dict.ARCHTAR_TO == "local": + elif arch_dict.ARCHCOM_TO == "local": self.tar_cmd = "tar" self.cvf = Archive._create_tarball self.chgrp_cmd = chgrp self.chmod_cmd = os.chmod self.rm_cmd = rm_p else: - raise ValueError("FATAL ERROR: Invalid achiving method selected: {arch_dict.ARCHTAR_TO}") + raise ValueError("FATAL ERROR: Invalid achiving method selected: {arch_dict.ARCHCOM_TO}") # Determine if we are archiving the EXPDIR this cycle (always skip for ensembles) if "enkf" not in arch_dict.RUN and arch_dict.ARCH_EXPDIR: diff --git a/workflow/applications/applications.py b/workflow/applications/applications.py index 4d79e40caa..e2963f49f5 100644 --- a/workflow/applications/applications.py +++ b/workflow/applications/applications.py @@ -93,7 +93,7 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]: run_options[run]['do_goes'] = run_base.get('DO_GOES', False) run_options[run]['do_mos'] = run_base.get('DO_MOS', False) run_options[run]['do_extractvars'] = run_base.get('DO_EXTRACTVARS', False) - run_options[run]['do_archtar'] = run_base.get('DO_ARCHTAR', False) + run_options[run]['do_archcom'] = run_base.get('DO_ARCHCOM', False) run_options[run]['do_atm'] = run_base.get('DO_ATM', True) run_options[run]['do_wave'] = run_base.get('DO_WAVE', False) @@ -103,7 +103,7 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]: run_options[run]['do_aero_anl'] = run_base.get('DO_AERO_ANL', False) run_options[run]['do_aero_fcst'] = run_base.get('DO_AERO_FCST', False) - if run_options[run]['do_archtar'] and run_base.get('ARCHTAR_TO', "") == "globus_hpss": + if run_options[run]['do_archcom'] and run_base.get('ARCHCOM_TO', "") == "globus_hpss": run_options[run]['do_globusarch'] = True else: run_options[run]['do_globusarch'] = False diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py index 71417e60fa..46ca1ff955 100644 --- a/workflow/applications/gefs.py +++ b/workflow/applications/gefs.py @@ -47,7 +47,7 @@ def _get_app_configs(self, run): if options['do_extractvars']: configs += ['extractvars'] - if options['do_archtar']: + if options['do_archcom']: configs += ['arch_tars'] if options['do_globusarch']: configs += ['globus'] @@ -101,7 +101,7 @@ def get_task_names(self): tasks += ['extractvars'] tasks += ['cleanup'] - if options['do_archtar']: + if options['do_archcom']: tasks += ['arch_tars'] if options['do_globusarch']: tasks += ['globus'] diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py index bfe290915f..4159f66743 100644 --- a/workflow/applications/gfs_cycled.py +++ b/workflow/applications/gfs_cycled.py @@ -75,7 +75,7 @@ def _get_app_configs(self, run): configs += ['stage_ic', 'sfcanl', 'analcalc', 'fcst', 'upp', 'atmos_products', 'arch_vrfy', 'cleanup'] - if options['do_archtar']: + if options['do_archcom']: configs += ['arch_tars'] if options['do_hybvar']: @@ -87,7 +87,7 @@ def _get_app_configs(self, run): configs += ['ecen', 'esfc', 'efcs', 'echgres', 'epos', 'earc_vrfy'] - if options['do_archtar']: + if options['do_archcom']: configs += ['earc_tars'] if options['do_fit2obs']: @@ -307,7 +307,7 @@ def get_task_names(self): # Last items task_names[run] += ['arch_vrfy'] - if options['do_archtar']: + if options['do_archcom']: task_names[run] += ['arch_tars'] if options['do_globusarch']: task_names[run] += ['globus_arch'] @@ -337,7 +337,7 @@ def get_task_names(self): task_names[run].append('epos') if 'gdas' in run else 0 task_names[run] += ['stage_ic', 'ecen', 'esfc'] - if options['do_archtar']: + if options['do_archcom']: task_names[run] += ['earc_tars'] # TODO Uncomment when globus ensemble archiving is ready diff --git a/workflow/applications/gfs_forecast_only.py b/workflow/applications/gfs_forecast_only.py index 4bf813bd1d..172d3db0f5 100644 --- a/workflow/applications/gfs_forecast_only.py +++ b/workflow/applications/gfs_forecast_only.py @@ -86,7 +86,7 @@ def _get_app_configs(self, run): 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - if options['do_archtar']: + if options['do_archcom']: configs += ['arch_tars'] if options['do_globusarch']: configs += ['globus'] @@ -179,7 +179,7 @@ def get_task_names(self): 'mos_stn_prdgen', 'mos_grd_prdgen', 'mos_ext_stn_prdgen', 'mos_ext_grd_prdgen', 'mos_wx_prdgen', 'mos_wx_ext_prdgen'] - if options['do_archtar']: + if options['do_archcom']: tasks += ['arch_tars'] if options['do_globusarch']: tasks += ['globus_arch'] diff --git a/workflow/applications/sfs.py b/workflow/applications/sfs.py index 4730298f46..80a7c86eb3 100644 --- a/workflow/applications/sfs.py +++ b/workflow/applications/sfs.py @@ -47,7 +47,7 @@ def _get_app_configs(self, run): if options['do_extractvars']: configs += ['extractvars'] - if options['do_archtar']: + if options['do_archcom']: configs += ['arch_tars'] configs += ['arch_vrfy', 'cleanup'] diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml index 57473c8a30..62f7890be4 100644 --- a/workflow/hosts/awspw.yaml +++ b/workflow/hosts/awspw.yaml @@ -19,8 +19,8 @@ CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below. BASE_DATA: '/bucket/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '' # TODO: This will not yet work from AWS. MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml index e2c38d4b4d..74236bfba2 100644 --- a/workflow/hosts/azurepw.yaml +++ b/workflow/hosts/azurepw.yaml @@ -19,8 +19,8 @@ CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below. BASE_DATA: '/bucket/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '' # TODO: This will not yet work from AZURE. MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/container.yaml b/workflow/hosts/container.yaml index b4e652ce06..b691240089 100644 --- a/workflow/hosts/container.yaml +++ b/workflow/hosts/container.yaml @@ -17,8 +17,8 @@ CLUSTERS: '' CHGRP_RSTPROD: 'YES' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '${NOSCRUB}/archive_rotdir/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/gaeac5.yaml b/workflow/hosts/gaeac5.yaml index 69574ba47c..369a99fde3 100644 --- a/workflow/hosts/gaeac5.yaml +++ b/workflow/hosts/gaeac5.yaml @@ -19,8 +19,8 @@ CLUSTERS: 'c5' CHGRP_RSTPROD: 'NO' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '${NOSCRUB}/archive_rotdir/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/gaeac6.yaml b/workflow/hosts/gaeac6.yaml index abfd96b5c5..de709aff6d 100644 --- a/workflow/hosts/gaeac6.yaml +++ b/workflow/hosts/gaeac6.yaml @@ -19,8 +19,8 @@ CLUSTERS: 'c6' CHGRP_RSTPROD: 'NO' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '${NOSCRUB}/archive_rotdir/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/googlepw.yaml b/workflow/hosts/googlepw.yaml index 0ba8ff60bd..498ea24651 100644 --- a/workflow/hosts/googlepw.yaml +++ b/workflow/hosts/googlepw.yaml @@ -19,8 +19,8 @@ CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported. HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below. BASE_DATA: '/bucket/global-workflow-shared-data' BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR' -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '' # TODO: This will not yet work from GOOGLE. MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml index 5dfd1d55f8..76704c3d88 100644 --- a/workflow/hosts/hera.yaml +++ b/workflow/hosts/hera.yaml @@ -19,8 +19,8 @@ CHGRP_RSTPROD: 'YES' CLUSTERS: '' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'YES' -ARCHTAR_TO: 'hpss' +DO_ARCHCOM: 'YES' +ARCHCOM_TO: 'hpss' ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml index 63730955af..e4e632aeba 100644 --- a/workflow/hosts/hercules.yaml +++ b/workflow/hosts/hercules.yaml @@ -19,8 +19,8 @@ CHGRP_RSTPROD: 'YES' CLUSTERS: '' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'globus_hpss' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'globus_hpss' # TODO let the workflow setup scripts determine the username (HPSS differs from MSU usernames) ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml index e6497944ef..3a6ac50296 100644 --- a/workflow/hosts/jet.yaml +++ b/workflow/hosts/jet.yaml @@ -19,8 +19,8 @@ CHGRP_RSTPROD: 'YES' CLUSTERS: '' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'YES' -ARCHTAR_TO: 'hpss' +DO_ARCHCOM: 'YES' +ARCHCOM_TO: 'hpss' ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml index 9b5dbf0c53..c9b8eaf6f6 100644 --- a/workflow/hosts/orion.yaml +++ b/workflow/hosts/orion.yaml @@ -19,8 +19,8 @@ CHGRP_RSTPROD: 'YES' CLUSTERS: '' CHGRP_CMD: 'chgrp rstprod' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'globus_hpss' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'globus_hpss' # TODO let the workflow setup scripts determine the username (HPSS differs from MSU usernames) ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml index ecf29f887d..2642ef10b0 100644 --- a/workflow/hosts/s4.yaml +++ b/workflow/hosts/s4.yaml @@ -19,8 +19,8 @@ CHGRP_RSTPROD: 'NO' CLUSTERS: '' CHGRP_CMD: 'ls' HPSS_PROJECT: emc-global -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'local' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'local' ATARDIR: '${NOSCRUB}/archive_rotdir/${PSLOT}' MAKE_NSSTBUFR: 'YES' MAKE_ACFTBUFR: 'YES' diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml index a77a262314..e856da19c6 100644 --- a/workflow/hosts/wcoss2.yaml +++ b/workflow/hosts/wcoss2.yaml @@ -18,8 +18,8 @@ RESERVATION: '' CHGRP_RSTPROD: 'YES' CLUSTERS: '' CHGRP_CMD: 'chgrp rstprod' -DO_ARCHTAR: 'NO' -ARCHTAR_TO: 'hpss' +DO_ARCHCOM: 'NO' +ARCHCOM_TO: 'hpss' HPSS_PROJECT: emc-global ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py index d2a21b1e71..9343c5d6cd 100644 --- a/workflow/rocoto/gefs_tasks.py +++ b/workflow/rocoto/gefs_tasks.py @@ -654,7 +654,7 @@ def globus(self): def cleanup(self): deps = [] - if self.options['do_archtar']: + if self.options['do_archcom']: if self.options['do_globusarch']: dep_dict = {'type': 'task', 'name': f'{self.run}_globus_arch'} else: diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index 61769e26c7..5d9754fd62 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -2511,7 +2511,7 @@ def cleanup(self): if 'enkf' in self.run: dep_dict = {'type': 'task', 'name': f'{self.run}_earc_vrfy'} deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_archtar']: + if self.options['do_archcom']: if self.options['do_globusarch']: dep_dict = {'type': 'metatask', 'name': f'{self.run}_ens_globus_arch'} else: @@ -2607,7 +2607,7 @@ def cleanup(self): dep_dict = {'type': 'task', 'name': f'{self.run}_arch_vrfy'} deps.append(rocoto.add_dependency(dep_dict)) - if self.options['do_archtar']: + if self.options['do_archcom']: if self.options['do_globusarch']: dep_dict = {'type': 'task', 'name': f'{self.run}_globus_arch'} else: diff --git a/workflow/rocoto/sfs_tasks.py b/workflow/rocoto/sfs_tasks.py index 4713246bdd..a14bc534f8 100644 --- a/workflow/rocoto/sfs_tasks.py +++ b/workflow/rocoto/sfs_tasks.py @@ -634,7 +634,7 @@ def cleanup(self): # TODO: Add these deps when the archive tasks are created # dep_dict = {'type': 'task', 'name': f'{self.run}_arch_vrfy'} # deps.append(rocoto.add_dependency(dep_dict)) - # if self.options['do_archtar']: + # if self.options['do_archcom']: # dep_dict = {'type': 'task', 'name': f'{self.run}_arch_tars'} # deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep=deps, dep_condition='and') diff --git a/workflow/rocoto/workflow_xml.py b/workflow/rocoto/workflow_xml.py index cd384bc252..2ddf34b30c 100644 --- a/workflow/rocoto/workflow_xml.py +++ b/workflow/rocoto/workflow_xml.py @@ -125,7 +125,7 @@ def _assemble_xml(self) -> str: def write(self, xml_file: str = None, crontab_file: str = None): self._write_xml(xml_file=xml_file) self._write_crontab(crontab_file=crontab_file) - if self._base["DO_ARCHTAR"] and self._base["ARCHTAR_TO"] == "globus_hpss": + if self._base["DO_ARCHCOM"] and self._base["ARCHCOM_TO"] == "globus_hpss": self._write_server_crontab() def _write_xml(self, xml_file: str = None) -> None: