Update snow obs preprocessing job

env/HERA.env

@@ -52,7 +52,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="HERA"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
+elif [[ "${step}" = "prepsnowcover" ]]; then
 
     export APRUN_CALCFIMS="${APRUN_default}"
 

env/HERCULES.env

@@ -50,7 +50,7 @@ case ${step} in
     export sys_tp="HERCULES"
     export launcher_PREP="srun"
  ;;
- "prepsnowobs")
+ "prepsnowcover")
 
     export APRUN_CALCFIMS="${APRUN_default}"
  ;;

env/JET.env

@@ -40,7 +40,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="JET"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
+elif [[ "${step}" = "prepsnowcover" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 

env/ORION.env

@@ -47,7 +47,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="ORION"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
+elif [[ "${step}" = "prepsnowcover" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 

env/S4.env

@@ -40,7 +40,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="S4"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
+elif [[ "${step}" = "prepsnowcover" ]]; then
 
     export APRUN_CALCFIMS="${APRUN_default}"
 

env/WCOSS2.env

@@ -34,7 +34,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="wcoss2"
     export launcher_PREP="mpiexec"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
+elif [[ "${step}" = "prepsnowcover" ]]; then
 
     export APRUN_CALCFIMS="${APRUN_default}"
 

jobs/JGLOBAL_PREP_SNOW_OBS → jobs/JGLOBAL_PREP_SNOWCOVER

@@ -2,7 +2,7 @@
 
 source "${HOMEgfs}/ush/preamble.sh"
 export DATA=${DATA:-${DATAROOT}/${RUN}snowanl_${cyc}}
-source "${HOMEgfs}/ush/jjob_header.sh" -e "prepsnowobs" -c "base prepsnowobs"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "prepsnowcover" -c "base prepsnowcover"
 
 ##############################################
 # Set variables used in the script
@@ -25,7 +25,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
 
 ###############################################################
 # Run relevant script
-EXSCRIPT=${GDASSNOWPREPPY:-${SCRgfs}/exglobal_prep_snow_obs.py}
+EXSCRIPT=${GDASSNOWPREPPY:-${SCRgfs}/exglobal_prep_snowcover.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && (echo "FATAL ERROR: Error executing ${EXSCRIPT}, ABORT!"; exit "${status}")

jobs/rocoto/prepsnowobs.sh → jobs/rocoto/prepsnowcover.sh

@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="prepsnowobs"
+export job="prepsnowcover"
 export jobid="${job}.$$"
 
 ###############################################################
@@ -21,6 +21,6 @@ export PYTHONPATH
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}/jobs/JGLOBAL_PREP_SNOW_OBS"
+"${HOMEgfs}/jobs/JGLOBAL_PREP_SNOWCOVER"
 status=$?
 exit "${status}"

parm/config/gfs/config.prepsnowobs → parm/config/gfs/config.prepsnowcover

@@ -1,12 +1,12 @@
 #! /usr/bin/env bash
 
-########## config.prepsnowobs ##########
+########## config.prepsnowcover ##########
 # Snow Obs Prep specific
 
-echo "BEGIN: config.prepsnowobs"
+echo "BEGIN: config.prepsnowcover"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" prepsnowobs
+. "${EXPDIR}/config.resources" prepsnowcover
 
 export IMS_OBS_LIST="${PARMgfs}/gdas/snow/prep/prep_ims.yaml.j2"
 
@@ -15,4 +15,4 @@ export FIMS_NML_TMPL="${PARMgfs}/gdas/snow/prep/fims.nml.j2"
 
 export IMS2IODACONV="${USHgfs}/imsfv3_scf2ioda.py"
 
-echo "END: config.prepsnowobs"
+echo "END: config.prepsnowcover"

parm/config/gfs/config.resources

@@ -12,7 +12,7 @@ if (( $# != 1 )); then
     echo "Must specify an input task argument to set resource variables!"
     echo "argument can be any one of the following:"
     echo "stage_ic aerosol_init"
-    echo "prep prepsnowobs prepatmiodaobs"
+    echo "prep prepsnowcover prepatmiodaobs"
     echo "atmanlinit atmanlvar atmanlfv3inc atmanlfinal"
     echo "atmensanlinit atmensanlobs atmensanlsol atmensanlletkf atmensanlfv3inc atmensanlfinal"
     echo "snowanl esnowrecen"
@@ -151,7 +151,7 @@ case ${step} in
     memory="40GB"
     ;;
 
-  "prepsnowobs")
+  "prepsnowcover")
     walltime="00:05:00"
     ntasks=1
     threads_per_task=1

scripts/exglobal_prep_snow_obs.py → scripts/exglobal_prep_snowcover.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-# exglobal_prep_snow_obs.py
+# exglobal_prep_snowcover.py
 # This script creates a SnowAnalysis object
-# and runs the prepare_GTS and prepare_IMS method
-# which perform the pre-processing for GTS and IMS data
+# and runs the prepare_IMS method which perform
+# the pre-processing for IMS data
 import os
 
 from wxflow import Logger, cast_strdict_as_dtypedict
@@ -20,5 +20,4 @@
 
     # Instantiate the snow prepare task
     SnowAnl = SnowAnalysis(config)
-    if SnowAnl.task_config.cyc == 0:
-        SnowAnl.prepare_IMS()
+    SnowAnl.prepare_IMS()

workflow/applications/gfs_cycled.py

@@ -113,7 +113,7 @@ def _get_app_configs(self):
                 configs += ['prepobsaero']
 
         if self.do_jedisnowda:
-            configs += ['prepsnowobs', 'snowanl']
+            configs += ['prepsnowcover', 'snowanl']
             if self.do_hybvar:
                 configs += ['esnowrecen']
 
@@ -156,7 +156,7 @@ def get_task_names(self):
         gdas_gfs_common_tasks_before_fcst += ['sfcanl', 'analcalc']
 
         if self.do_jedisnowda:
-            gdas_gfs_common_tasks_before_fcst += ['prepsnowobs', 'snowanl']
+            gdas_gfs_common_tasks_before_fcst += ['prepsnowcover', 'snowanl']
 
         wave_prep_tasks = ['waveinit', 'waveprep']
         wave_bndpnt_tasks = ['wavepostbndpnt', 'wavepostbndpntbll']

workflow/rocoto/gfs_cycled_xml.py

@@ -24,6 +24,17 @@ def get_cycledefs(self):
         sdate_str = sdate.strftime("%Y%m%d%H%M")
         strings.append(f'\t<cycledef group="gdas">{sdate_str} {edate_str} {interval_str}</cycledef>')
 
+        if self._app_config.do_jedisnowda:
+            sdate_snocvr = self._base['SDATE']
+            edate_snocvr = self._base['EDATE']
+            interval_snocvr = to_timedelta(f"24:00:00H")
+            sdate_snocvr = sdate_snocvr + interval_snocvr
+            sdate_snocvr_str = sdate_snocvr.replace(hour=0, minute=0, second=0).strftime("%Y%m%d%H%M")
+            edate_snocvr_str = edate_snocvr.strftime("%Y%m%d%H%M")
+            interval_str = timedelta_to_HMS(interval_snocvr)
+            if sdate_snocvr <= edate_snocvr:
+                strings.append(f'\t<cycledef group="gdas_prep_snocvr">{sdate_snocvr_str} {edate_snocvr_str} {interval_str}</cycledef>')
+
         if self._app_config.gfs_cyc != 0:
             sdate_gfs = self._base['SDATE_GFS']
             edate_gfs = self._base['EDATE_GFS']

workflow/rocoto/gfs_tasks.py

@@ -564,21 +564,22 @@ def aeroanlfinal(self):
 
         return task
 
-    def prepsnowobs(self):
+    def prepsnowcover(self):
 
         deps = []
         dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        resources = self.get_resource('prepsnowobs')
-        task_name = f'{self.run}prepsnowobs'
+        cycledef = 'gdas_prep_snocvr'
+        resources = self.get_resource('prepsnowcover')
+        task_name = f'{self.run}prepsnowcover'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
-                     'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/prepsnowobs.sh',
+                     'cycledef': cycledef,
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/prepsnowcover.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -591,7 +592,10 @@ def prepsnowobs(self):
     def snowanl(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}prepsnowobs'}
+        if f'@H' == '00':
+            dep_dict = {'type': 'task', 'name': f'{self.run}prepsnowcover'}
+        else:
+            dep_dict = {'type': 'task', 'name': f'{self.run}prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -614,7 +618,7 @@ def snowanl(self):
     def esnowrecen(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}prepsnowobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}prepsnowcover'}
         deps.append(rocoto.add_dependency(dep_dict))
         dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}snowanl'}
         deps.append(rocoto.add_dependency(dep_dict))

workflow/rocoto/tasks.py

@@ -20,7 +20,7 @@ class Tasks:
                    'eobs', 'eomg', 'epos', 'esfc', 'eupd',
                    'atmensanlinit', 'atmensanlobs', 'atmensanlsol', 'atmensanlletkf', 'atmensanlfv3inc', 'atmensanlfinal',
                    'aeroanlinit', 'aeroanlvar', 'aeroanlfinal', 'aeroanlgenb',
-                   'prepsnowobs', 'snowanl', 'esnowrecen',
+                   'prepsnowcover', 'snowanl', 'esnowrecen',
                    'fcst',
                    'atmanlupp', 'atmanlprod', 'atmupp', 'goesupp',
                    'atmos_prod', 'ocean_prod', 'ice_prod',