Skip to content

Commit 7140e83

Browse files
Change archtar to archcom
1 parent c6db1e0 commit 7140e83

29 files changed

+55
-55
lines changed

parm/config/gefs/config.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ export DO_METP="NO" # Run METPLUS jobs - set METPLUS settings in config.
333333
export DO_FIT2OBS="NO" # Run fit to observations package
334334

335335
# Archiving options
336-
export DO_ARCHTAR="@DO_ARCHTAR@" # Tar and archive the COM directories
337-
export ARCHTAR_TO="@ARCHTAR_TO@" # Valid options are hpss, globus_hpss, and local
336+
export DO_ARCHCOM="@DO_ARCHCOM@" # Tar and archive the COM directories
337+
export ARCHCOM_TO="@ARCHCOM_TO@" # Valid options are hpss, globus_hpss, and local
338338

339339
# Globus UUID for this machine
340340
export CLIENT_GLOBUS_UUID='@CLIENT_GLOBUS_UUID@'

parm/config/gfs/config.arch_tars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export ARCH_GAUSSIAN_FHMAX=${FHMAX_GFS:-}
2121
export ARCH_GAUSSIAN_FHINC=${FHOUT_GFS:-}
2222

2323
# If we are running globus archiving, create tarballs in a temporary location
24-
if [[ "${ARCHTAR_TO}" == "globus_hpss" ]]; then
24+
if [[ "${ARCHCOM_TO}" == "globus_hpss" ]]; then
2525
export ATARDIR="${DATAROOT}/archive_rotdir/${RUN}"
26-
export ARCHTAR_TO="local"
26+
export ARCHCOM_TO="local"
2727
fi
2828

2929
echo "END: config.arch_tars"

parm/config/gfs/config.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ export DO_FETCH_HPSS="NO" # Copy from HPSS (on HPSS-accessible machines) onto
480480
export DO_FETCH_LOCAL="NO" # Copy from local disk onto COM
481481

482482
# Archiving options
483-
export DO_ARCHTAR="@DO_ARCHTAR@" # Tar and archive the COM directories
484-
export ARCHTAR_TO="@ARCHTAR_TO@" # Valid options are hpss, globus_hpss, and local
483+
export DO_ARCHCOM="@DO_ARCHCOM@" # Tar and archive the COM directories
484+
export ARCHCOM_TO="@ARCHCOM_TO@" # Valid options are hpss, globus_hpss, and local
485485

486486
# Globus UUID for this machine
487487
export CLIENT_GLOBUS_UUID='@CLIENT_GLOBUS_UUID@'

parm/config/gfs/config.earc_tars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export RMOLDSTD_ENKF=144
3333
export RMOLDEND_ENKF=24
3434

3535
# If we are running globus archiving, create tarballs in a temporary location
36-
if [[ "${ARCHTAR_TO}" == "globus_hpss" ]]; then
36+
if [[ "${ARCHCOM_TO}" == "globus_hpss" ]]; then
3737
export ENSGRP="${ENSGRP:-0}"
3838
export ATARDIR="${DATAROOT}/archive_rotdir/${pslot}/${RUN}/${ENSGRP}"
3939
export LOCALARCH="YES"

parm/config/sfs/config.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ if [[ ${HPSSARCH} = "YES" ]] && [[ ${LOCALARCH} = "YES" ]]; then
339339
echo "Both HPSS and local archiving selected. Please choose one or the other."
340340
exit 3
341341
elif [[ ${HPSSARCH} = "YES" ]] || [[ ${LOCALARCH} = "YES" ]]; then
342-
export DO_ARCHTAR="YES"
342+
export DO_ARCHCOM="YES"
343343
else
344-
export DO_ARCHTAR="NO"
344+
export DO_ARCHCOM="NO"
345345
fi
346346
export ARCH_CYC=00 # Archive data at this cycle for warm start and/or forecast-only capabilities
347347
export ARCH_WARMICFREQ=4 # Archive frequency in days for warm start capability

scripts/exgdas_enkf_earc_tars.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def main():
1919

2020
# Pull out all the configuration keys needed to run the rest of archive steps
2121
keys = ['ATARDIR', 'current_cycle', 'IAUFHRS', 'RUN', 'PDY',
22-
'PSLOT', 'DO_ARCHTAR', 'ARCHTAR_TO', 'ROTDIR', 'PARMgfs',
22+
'PSLOT', 'DO_ARCHCOM', 'ARCHCOM_TO', 'ROTDIR', 'PARMgfs',
2323
'ARCDIR', 'SDATE', 'MODE', 'ENSGRP', 'NMEM_EARCGRP',
2424
'NMEM_ENS', 'DO_CALC_INCREMENT_ENKF_GFS', 'DO_JEDIATMENS',
2525
'lobsdiag_forenkf', 'FHMIN_ENKF', 'FHMAX_ENKF_GFS',

scripts/exglobal_archive_tars.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ def main():
2828
keys = ['ATARDIR', 'current_cycle', 'FHMIN', 'FHMAX', 'FHOUT', 'RUN', 'PDY',
2929
'DO_VERFRAD', 'DO_VMINMON', 'DO_VERFOZN', 'DO_ICE', 'DO_PREP_OBS_AERO',
3030
'PARMgfs', 'DO_OCN', 'DO_WAVE', 'WRITE_DOPOST', 'PSLOT', 'DO_MOS',
31-
'DO_JEDISNOWDA', 'DO_ARCHTAR', 'ARCHTAR_TO', 'REALTIME', 'ROTDIR', 'ARCH_WARMICFREQ',
31+
'DO_JEDISNOWDA', 'DO_ARCHCOM', 'ARCHCOM_TO', 'REALTIME', 'ROTDIR', 'ARCH_WARMICFREQ',
3232
'ARCH_FCSTICFREQ', 'ARCH_CYC', 'assim_freq', 'ARCDIR', 'SDATE',
3333
'FHMIN_GFS', 'FHMAX_GFS', 'FHOUT_GFS', 'ARCH_GAUSSIAN', 'MODE',
3434
'FHOUT_OCN', 'FHOUT_ICE', 'FHOUT_OCN_GFS', 'FHOUT_ICE_GFS', 'DO_BUFRSND', 'DOHYBVAR',
3535
'ARCH_GAUSSIAN_FHMAX', 'ARCH_GAUSSIAN_FHINC', 'ARCH_GAUSSIAN_FHINC',
3636
'DOIAU', 'OCNRES', 'ICERES', 'NUM_SND_COLLECTIVES', 'FHOUT_WAV',
3737
'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS',
38-
'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHTAR',
38+
'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHCOM',
3939
'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN',
4040
'NMEM_ENS', 'DO_JEDIATMVAR', 'FHMAX_FITS', 'waveGRD',
4141
'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS',

ush/python/pygfs/task/archive.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,22 @@ def configure_tars(self, arch_dict: Dict[str, Any]) -> (List[Dict[str, Any]]):
129129
# Collect datasets that need to be archived
130130
# Each dataset represents one tarball
131131

132-
if arch_dict.ARCHTAR_TO == "hpss":
132+
if arch_dict.ARCHCOM_TO == "hpss":
133133
self.tar_cmd = "htar"
134134
self.hsi = Hsi()
135135
self.htar = Htar()
136136
self.cvf = self.htar.cvf
137137
self.rm_cmd = self.hsi.rm
138138
self.chgrp_cmd = self.hsi.chgrp
139139
self.chmod_cmd = self.hsi.chmod
140-
elif arch_dict.ARCHTAR_TO == "local":
140+
elif arch_dict.ARCHCOM_TO == "local":
141141
self.tar_cmd = "tar"
142142
self.cvf = Archive._create_tarball
143143
self.chgrp_cmd = chgrp
144144
self.chmod_cmd = os.chmod
145145
self.rm_cmd = rm_p
146146
else:
147-
raise ValueError("FATAL ERROR: Invalid achiving method selected: {arch_dict.ARCHTAR_TO}")
147+
raise ValueError("FATAL ERROR: Invalid achiving method selected: {arch_dict.ARCHCOM_TO}")
148148

149149
# Determine if we are archiving the EXPDIR this cycle (always skip for ensembles)
150150
if "enkf" not in arch_dict.RUN and arch_dict.ARCH_EXPDIR:

workflow/applications/applications.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]:
9393
run_options[run]['do_goes'] = run_base.get('DO_GOES', False)
9494
run_options[run]['do_mos'] = run_base.get('DO_MOS', False)
9595
run_options[run]['do_extractvars'] = run_base.get('DO_EXTRACTVARS', False)
96-
run_options[run]['do_archtar'] = run_base.get('DO_ARCHTAR', False)
96+
run_options[run]['do_archcom'] = run_base.get('DO_ARCHCOM', False)
9797

9898
run_options[run]['do_atm'] = run_base.get('DO_ATM', True)
9999
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]:
103103
run_options[run]['do_aero_anl'] = run_base.get('DO_AERO_ANL', False)
104104
run_options[run]['do_aero_fcst'] = run_base.get('DO_AERO_FCST', False)
105105

106-
if run_options[run]['do_archtar'] and run_base.get('ARCHTAR_TO', "") == "globus_hpss":
106+
if run_options[run]['do_archcom'] and run_base.get('ARCHCOM_TO', "") == "globus_hpss":
107107
run_options[run]['do_globusarch'] = True
108108
else:
109109
run_options[run]['do_globusarch'] = False

workflow/applications/gefs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _get_app_configs(self, run):
4747
if options['do_extractvars']:
4848
configs += ['extractvars']
4949

50-
if options['do_archtar']:
50+
if options['do_archcom']:
5151
configs += ['arch_tars']
5252
if options['do_globusarch']:
5353
configs += ['globus']
@@ -101,7 +101,7 @@ def get_task_names(self):
101101
tasks += ['extractvars']
102102

103103
tasks += ['cleanup']
104-
if options['do_archtar']:
104+
if options['do_archcom']:
105105
tasks += ['arch_tars']
106106
if options['do_globusarch']:
107107
tasks += ['globus']

0 commit comments

Comments
 (0)