Remove references to CDUMP; refs NOAA-EMC/global-workflow#1299

DavidHuber-NOAA · Jul 5, 2024 · 19fcacf · 19fcacf
1 parent 5ae609e
commit 19fcacf
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 23 deletions.
diff --git a/parm/templates/stage.yaml b/parm/templates/stage.yaml
@@ -6,7 +6,7 @@ staticb_dir: !ENV ${STATICB_DIR}
 COMOUT: !ENV ${COMOUT}
 DATA: !ENV ${DATA}
 background_time: '{{background_time}}'
-dump: !ENV ${CDUMP}
+dump: !ENV ${RUN}
 fv3jedi_stage_files: !ENV ${FV3JEDI_STAGE_YAML}
 fv3jedi_stage: !ENV ${FV3JEDI_STAGE_YAML}
 stage_dir: !ENV ${DATA}

diff --git a/scripts/exgdas_global_marine_analysis_post.py b/scripts/exgdas_global_marine_analysis_post.py
@@ -47,7 +47,7 @@ def list_all_files(dir_in, dir_out, wc='*', fh_list=[]):
 cdate = os.getenv('CDATE')
 pdy = os.getenv('PDY')
 staticsoca_dir = os.getenv('SOCA_INPUT_FIX_DIR')
-RUN = os.getenv('CDUMP')
+RUN = os.getenv('RUN')
 cyc = str(os.getenv('cyc')).zfill(2)
 bcyc = str((int(cyc) - 3) % 24).zfill(2)
 gcyc = str((int(cyc) - 6) % 24).zfill(2)  # previous cycle

diff --git a/test/aero/global-workflow/jjob_var_final.sh b/test/aero/global-workflow/jjob_var_final.sh
@@ -15,7 +15,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/aero/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/aero/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/aero/bkg
 export pid=${pid:-$$}

diff --git a/test/aero/global-workflow/jjob_var_init.sh b/test/aero/global-workflow/jjob_var_init.sh
@@ -15,7 +15,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/aero/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/aero/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/aero/bkg
 export pid=${pid:-$$}
@@ -57,7 +56,7 @@ GDUMP="gdas"
 
 # Set file prefixes
 gprefix=$GDUMP.t${gcyc}z
-oprefix=$CDUMP.t${cyc}z
+oprefix=$RUN.t${cyc}z
 
 # Generate COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS

diff --git a/test/aero/global-workflow/jjob_var_run.sh b/test/aero/global-workflow/jjob_var_run.sh
@@ -18,7 +18,6 @@ export gcyc=12
 export GDATE=${gPDY}${gcyc}
 export ROTDIR=$bindir/test/aero/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/aero/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/aero/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_ens_final.sh b/test/atm/global-workflow/jjob_ens_final.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=enkfgdas
-export CDUMP=enkfgdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_ens_inc.sh b/test/atm/global-workflow/jjob_ens_inc.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=enkfgdas
-export CDUMP=enkfgdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=enkfgdas
-export CDUMP=enkfgdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_ens_run.sh b/test/atm/global-workflow/jjob_ens_run.sh
@@ -19,7 +19,6 @@ export gcyc=12
 export GDATE=${gPDY}${gcyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=enkfgdas
-export CDUMP=enkfgdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_var_final.sh b/test/atm/global-workflow/jjob_var_final.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_var_inc.sh b/test/atm/global-workflow/jjob_var_inc.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh
@@ -16,7 +16,6 @@ export cyc=18
 export CDATE=${PDY}${cyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}
@@ -58,7 +57,7 @@ GDUMP="gdas"
 
 # Set file prefixes
 gprefix=$GDUMP.t${gcyc}z
-oprefix=$CDUMP.t${cyc}z
+oprefix=$RUN.t${cyc}z
 
 # Generate COM variables from templates
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS

diff --git a/test/atm/global-workflow/jjob_var_run.sh b/test/atm/global-workflow/jjob_var_run.sh
@@ -19,7 +19,6 @@ export gcyc=12
 export GDATE=${gPDY}${gcyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS/$PSLOT
 export RUN=gdas
-export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIRS/$PSLOT
 export COMIN_GES=${bindir}/test/atm/bkg
 export pid=${pid:-$$}

diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test
@@ -11,7 +11,6 @@ gw environement:
     HOMEgfs: @HOMEgfs@
     COMPONENT: ocean
     RUN: gdas
-    CDUMP: gdas
     COMROOT: dummy_COMROOT
     jobid: dummy_jobid
 

diff --git a/ush/run_satbias_conv.py b/ush/run_satbias_conv.py
@@ -40,7 +40,7 @@ def run_satbias_conv(config):
     ufo_bc_root = config['ufo_bc_root']
     work_root = config['work_root']
     converter_exe = config['satbias2ioda']
-    cdump = config.get('dump', 'gdas')
+    RUN = config.get('RUN', 'gdas')
     # loop through all cycles
     nowTime = startTime
     while nowTime <= endTime:
@@ -49,11 +49,11 @@ def run_satbias_conv(config):
         cyc = nowTime.strftime("%H")
         logging.info(f'Processing sat bias files for cycle: {cdate}')
         # create working directory
-        workdir = os.path.join(work_root, f'{cdump}.{pdy}', cyc, 'atmos')
+        workdir = os.path.join(work_root, f'{RUN}.{pdy}', cyc, 'atmos')
         os.makedirs(workdir, exist_ok=True)
         # link the GSI files to the working directory
-        cycle_in_dir = os.path.join(gsi_bc_root, f'{cdump}.{pdy}', cyc, 'atmos')
-        prefix = f"{cdump}.t{cyc}z"
+        cycle_in_dir = os.path.join(gsi_bc_root, f'{RUN}.{pdy}', cyc, 'atmos')
+        prefix = f"{RUN}.t{cyc}z"
         abias_path = os.path.join(cycle_in_dir, prefix + '.abias')
         abias_pc_path = os.path.join(cycle_in_dir, prefix + '.abias_pc')
         orig_paths = [converter_exe, abias_path, abias_pc_path]
@@ -108,7 +108,7 @@ def run_satbias_conv(config):
         p = subprocess.Popen(runcmd, shell=True, cwd=workdir)
         p.communicate()
         # copy output files to output directory
-        outdir = os.path.join(ufo_bc_root, f'{cdump}.{pdy}', cyc, 'atmos')
+        outdir = os.path.join(ufo_bc_root, f'{RUN}.{pdy}', cyc, 'atmos')
         os.makedirs(outdir, exist_ok=True)
         ncfiles = glob.glob(os.path.join(workdir, '*.nc4'))
         txtfiles = glob.glob(os.path.join(workdir, '*.txt'))

diff --git a/ush/ufsda/misc_utils.py b/ush/ufsda/misc_utils.py
@@ -111,7 +111,7 @@ def get_env_config(component='atm'):
         'atm_window_length': f"PT{assim_freq}H",
         'ATM_WINDOW_LENGTH': f"PT{assim_freq}H",
         'OBS_DIR': os.environ['COMOUT'],
-        'OBS_PREFIX': f"{os.environ['CDUMP']}.t{os.environ['cyc']}z.",
+        'OBS_PREFIX': f"{os.environ['RUN']}.t{os.environ['cyc']}z.",
         'target_dir': os.environ['COMOUT'],
         'OBS_DATE': cdate,
         'BIAS_IN_DIR': os.environ['COMOUT'],

diff --git a/ush/ufsda/ufs_yaml.py b/ush/ufsda/ufs_yaml.py
@@ -114,7 +114,7 @@ def get_exp_vars():
     exp_dict['npx_ges'] = npx
     exp_dict['npy_ges'] = npx
     exp_dict['npz'] = str(int(os.environ['LEVS'])-1)
-    exp_dict['experiment'] = os.getenv('PSLOT', 'oper') + '_' + os.getenv('CDUMP', 'gdas')
+    exp_dict['experiment'] = os.getenv('PSLOT', 'oper') + '_' + os.getenv('RUN', 'gdas')
     exp_dict['experiment_dir'] = 'Data/obs'
     return exp_dict