preliminary removal of CDATE and GDATE (#223)

NOAA-EMC · Feb 7, 2023 · b349d32 · b349d32
1 parent 9dbc973
commit b349d32
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 29 deletions.
diff --git a/parm/atm/obs/config/amsua_n19.yaml b/parm/atm/obs/config/amsua_n19.yaml
@@ -3,11 +3,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}amsua_n19.${CDATE}.nc4
+      obsfile: !ENV ${DATA}/obs/${OPREFIX}amsua_n19.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/diag_amsua_n19_${CDATE}.nc4
+      obsfile: !ENV ${DATA}/diags/diag_amsua_n19_${PDY}${cyc}.nc4
   io pool:
     max pool size: 1
   simulated variables: [brightness_temperature]
@@ -22,14 +22,14 @@ obs operator:
     EndianType: little_endian
     CoefficientPath: !ENV ${DATA}/crtm/
 obs bias:
-  input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias.${GDATE}.nc4
-  output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias.${CDATE}.nc4
+  input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias.${gPDY}${gcyc}.nc4
+  output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias.${PDY}${cyc}.nc4
   variational bc:
     predictors:
     - name: constant
     - name: lapse_rate
       order: 2
-      tlapse: &amsua_n19_tlapse !ENV ${DATA}/obs/${GPREFIX}amsua_n19.tlapse.${GDATE}.txt
+      tlapse: &amsua_n19_tlapse !ENV ${DATA}/obs/${GPREFIX}amsua_n19.tlapse.${gPDY}${gcyc}.txt
     - name: lapse_rate
       tlapse: *amsua_n19_tlapse
     - name: emissivity
@@ -46,11 +46,11 @@ obs bias:
     step size: 1.0e-4
     largest analysis variance: 10000.0
     prior:
-      input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias_cov.${GDATE}.nc4
+      input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias_cov.${gPDY}${gcyc}.nc4
       inflation:
         ratio: 1.1
         ratio for small dataset: 2.0
-    output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias_cov.${CDATE}.nc4
+    output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias_cov.${PDY}${cyc}.nc4
 obs filters:
 - filter: BlackList
   filter variables:

diff --git a/parm/atm/obs/config/lgetkf_amsua_n19.yaml b/parm/atm/obs/config/lgetkf_amsua_n19.yaml
@@ -6,11 +6,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ./obs/${OPREFIX}amsua_n19.${CDATE}.nc4
+      obsfile: !ENV ./obs/${OPREFIX}amsua_n19.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ./diags/diag_amsua_n19_${CDATE}.nc4
+      obsfile: !ENV ./diags/diag_amsua_n19_${PDY}${cyc}.nc4
   io pool:
     max pool size: 1
   simulated variables: [brightness_temperature]
@@ -27,14 +27,14 @@ obs operator:
 obs error:
   covariance model: diagonal
 obs bias:
-  input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias.${GDATE}.nc4
-  output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias.${CDATE}.nc4
+  input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias.${gPDY}${gcyc}.nc4
+  output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias.${PDY}${cyc}.nc4
   variational bc:
     predictors:
     - name: constant
     - name: lapse_rate
       order: 2
-      tlapse: &amsua_n19_tlapse !ENV ${DATA}/obs/${GPREFIX}amsua_n19.tlapse.${GDATE}.txt
+      tlapse: &amsua_n19_tlapse !ENV ${DATA}/obs/${GPREFIX}amsua_n19.tlapse.${gPDY}${gcyc}.txt
     - name: lapse_rate
       tlapse: *amsua_n19_tlapse
     - name: emissivity
@@ -51,11 +51,11 @@ obs bias:
     step size: 1.0e-4
     largest analysis variance: 10000.0
     prior:
-      input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias_cov.${GDATE}.nc4
+      input file: !ENV ${DATA}/obs/${GPREFIX}amsua_n19.satbias_cov.${gPDY}${gcyc}.nc4
       inflation:
         ratio: 1.1
         ratio for small dataset: 2.0
-    output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias_cov.${CDATE}.nc4
+    output file: !ENV ${DATA}/bc/${APREFIX}amsua_n19.satbias_cov.${PDY}${cyc}.nc4
 obs filters:
 - filter: Bounds Check
   filter variables:

diff --git a/parm/atm/obs/config/lgetkf_sondes.yaml b/parm/atm/obs/config/lgetkf_sondes.yaml
@@ -6,11 +6,11 @@ obs space:
   obsdatain:
     engine:
       type: H5File
-      obsfile: !ENV ./obs/${OPREFIX}sondes.${CDATE}.nc4
+      obsfile: !ENV ./obs/${OPREFIX}sondes.${PDY}${cyc}.nc4
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ./diags/diag_sondes_lgetkf_${CDATE}.nc4
+      obsfile: !ENV ./diags/diag_sondes_lgetkf_${PDY}${cyc}.nc4
   io pool:
     max pool size: 1
   simulated variables: [eastward_wind, northward_wind, air_temperature]

diff --git a/parm/atm/obs/config/sondes.yaml b/parm/atm/obs/config/sondes.yaml
@@ -3,15 +3,15 @@ obs space:
   obsdatain:
     engine: 
       type: H5File
-      obsfile: !ENV ${DATA}/obs/${OPREFIX}sondes.${CDATE}.nc4
+      obsfile: !ENV ${DATA}/obs/${OPREFIX}sondes.${PDY}${cyc}.nc4
     obsgrouping:
       group variables: ["station_id"]
       sort variable: "air_pressure"
       sort order: "descending"
   obsdataout:
     engine:
       type: H5File
-      obsfile: !ENV ${DATA}/diags/diag_sondes_${CDATE}.nc4
+      obsfile: !ENV ${DATA}/diags/diag_sondes_${PDY}${cyc}.nc4
   io pool:
     max pool size: 1
   simulated variables: [surface_pressure, air_temperature, eastward_wind, northward_wind, specific_humidity]

diff --git a/test/atm/global-workflow/jjob_ens_run.sh b/test/atm/global-workflow/jjob_ens_run.sh
@@ -11,6 +11,9 @@ export EXPDIR=$bindir/test/atm/global-workflow/testrun/experiments/gdas_test
 export PDY=20210323
 export cyc=18
 export CDATE=${PDY}${cyc}
+export gPDY=20210323
+export gcyc=12
+export GDATE=${gPDY}${gcyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS
 export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIR

diff --git a/test/atm/global-workflow/jjob_var_run.sh b/test/atm/global-workflow/jjob_var_run.sh
@@ -11,6 +11,9 @@ export EXPDIR=$bindir/test/atm/global-workflow/testrun/experiments/gdas_test
 export PDY=20210323
 export cyc=18
 export CDATE=${PDY}${cyc}
+export gPDY=20210323
+export gcyc=12
+export GDATE=${gPDY}${gcyc}
 export ROTDIR=$bindir/test/atm/global-workflow/testrun/ROTDIRS
 export CDUMP=gdas
 export DATAROOT=$bindir/test/atm/global-workflow/testrun/RUNDIR

diff --git a/test/atm/run_jedi_exe_3dhofx.sh b/test/atm/run_jedi_exe_3dhofx.sh
@@ -76,7 +76,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 # Check for job submission error
-error=$(grep -i "error" stdout.txt | wc -l)
+error=$(grep "sbatch: error" stdout.txt | wc -l)
 if [ $error -ne 0 ]; then
     rc=$error
     exit $rc

diff --git a/test/atm/run_jedi_exe_3dvar.sh b/test/atm/run_jedi_exe_3dvar.sh
@@ -85,7 +85,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 # Check for job submission error
-error=$(grep -i "error" stdout.txt | wc -l)
+error=$(grep "sbatch: error" stdout.txt | wc -l)
 if [ $error -ne 0 ]; then
     rc=$error
     exit $rc

diff --git a/test/atm/run_jedi_exe_letkf.sh b/test/atm/run_jedi_exe_letkf.sh
@@ -87,7 +87,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 # Check for job submission error
-error=$(grep -i "error" stdout.txt | wc -l)
+error=$(grep "sbatch: error" stdout.txt | wc -l)
 if [ $error -ne 0 ]; then
     rc=$error
     exit $rc

diff --git a/test/genYAML_prep.sh b/test/genYAML_prep.sh
@@ -14,6 +14,8 @@ config:
   OBS_LIST: ${srcdir}/parm/atm/obs/lists/gdas_prototype.yaml
   OPREFIX: gdas.t00z.
   CDATE: '2022033000'
+  PDY: '20220330'
+  cyc: '00'
   valid_time: '2022-03-30T00:00:00Z'
   atm_window_length: PT6H
   CASE: 'C48'

diff --git a/ush/run_jedi_exe.py b/ush/run_jedi_exe.py
@@ -68,9 +68,7 @@ def run_jedi_exe(yamlconfig):
     prev_cycle = valid_time - dt.timedelta(hours=int(h))
     window_begin = valid_time - dt.timedelta(hours=int(h)/2)
     cyc = valid_time.strftime("%H")
-    cdate = valid_time.strftime("%Y%m%d%H")
     gcyc = prev_cycle.strftime("%H")
-    gdate = prev_cycle.strftime("%Y%m%d%H")
     gPDY = prev_cycle.strftime("%Y%m%d")
     pdy = valid_time.strftime("%Y%m%d")
     os.environ['PDY'] = str(pdy)
@@ -103,13 +101,15 @@ def run_jedi_exe(yamlconfig):
         'BIAS_OUT_DIR': os.path.join(workdir, 'bc'),
         'CRTM_COEFF_DIR': os.path.join(workdir, 'crtm'),
         'BIAS_PREFIX': f"{executable_subconfig['dump']}.t{gcyc}z.",
-        'BIAS_DATE': f"{gdate}",
+        'BIAS_DATE': f"{gPDY}{gcyc}",
         'DIAG_DIR': os.path.join(workdir, 'diags'),
         'OBS_DIR': os.path.join(workdir, 'obs'),
         'OBS_PREFIX': f"{executable_subconfig['dump']}.t{cyc}z.",
-        'OBS_DATE': f"{cdate}",
-        'CDATE': f"{cdate}",
-        'GDATE': f"{gdate}",
+        'OBS_DATE': f"{pdy}{cyc}",
+        'PDY': f"{pdy}",
+        'cyc': f"{cyc}",
+        'gPDY': f"{gPDY}",
+        'gcyc': f"{gcyc}",
         'valid_time': f"{valid_time.strftime('%Y-%m-%dT%H:%M:%SZ')}",
         'window_begin': f"{window_begin.strftime('%Y-%m-%dT%H:%M:%SZ')}",
         'prev_valid_time': f"{prev_cycle.strftime('%Y-%m-%dT%H:%M:%SZ')}",

diff --git a/ush/ufsda/genYAML.py b/ush/ufsda/genYAML.py
@@ -61,7 +61,10 @@ def get_runtime_config(config_dict):
     # compute some runtime variables
     # this will probably need pulled out somewhere else eventually
     # a temporary hack to get UFO evaluation stuff and ATM VAR going again
-    valid_time = dt.datetime.strptime(config_dict['CDATE'], '%Y%m%d%H')
+    vpdy = dt.datetime.strptime(config_dict['PDY'], '%Y%m%d')
+    vcyc = dt.datetime.strptime(config_dict['cyc'], '%H')
+    vdate = int(config_dict.get('PDY'))*100 + int(config_dict.get('cyc'))
+    valid_time = dt.datetime.strptime(str(vdate), '%Y%m%d%H')
     assim_freq = int(config_dict.get('assim_freq', 6))
     window_begin = valid_time - dt.timedelta(hours=assim_freq/2)
     window_end = valid_time + dt.timedelta(hours=assim_freq/2)

diff --git a/ush/ufsda/misc_utils.py b/ush/ufsda/misc_utils.py
@@ -120,6 +120,9 @@ def get_env_config(component='atm'):
     valid_time = datetime_from_cdate(cdate)
     assim_freq = int(os.environ['assim_freq'])
     prev_cycle = valid_time - dt.timedelta(hours=assim_freq)
+    gPDY = f"{prev_cycle.strftime('%Y%m%d')}"
+    os.environ['gPDY'] = str(gPDY)
+    gdate = os.environ['gPDY']+os.environ['gcyc']
     window_begin = valid_time - dt.timedelta(hours=assim_freq/2)
 
     config = {
@@ -135,7 +138,7 @@ def get_env_config(component='atm'):
         'OBS_DATE': cdate,
         'BIAS_IN_DIR': os.environ['COMOUT'],
         'BIAS_PREFIX': f"{os.environ['GDUMP']}.t{os.environ['gcyc']}z.",
-        'BIAS_DATE': f"{os.environ['GDATE']}",
+        'BIAS_DATE': gdate,
         'experiment': os.getenv('PSLOT', 'test'),
     }
     config['BKG_YYYYmmddHHMMSS'] = valid_time.strftime('%Y%m%d.%H%M%S')