Update snow obs processing job (#3055)

This PR removes the `prepsnowobs` job, and add the IMS snow obs processing to the snow analysis job and it will only process the snow cover obs if the cycle is 00z. Resolves #2902 --------- Co-authored-by: Cory Martin <[email protected]> Co-authored-by: David Huber <[email protected]>
NOAA-EMC · Nov 9, 2024 · 1eb62f3 · 1eb62f3
1 parent 152bb45
commit 1eb62f3
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 180 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -52,10 +52,6 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="HERA"
     export launcher_PREP="srun --hint=nomultithread"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
-
-    export APRUN_CALCFIMS="${APRUN_default}"
-
 elif [[ "${step}" = "prep_emissions" ]]; then
 
     export APRUN="${APRUN_default}"
@@ -116,6 +112,8 @@ elif [[ "${step}" = "prepobsaero" ]]; then
 
 elif [[ "${step}" = "snowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 

diff --git a/env/HERCULES.env b/env/HERCULES.env
@@ -50,10 +50,6 @@ case ${step} in
     export sys_tp="HERCULES"
     export launcher_PREP="srun --hint=nomultithread"
  ;;
- "prepsnowobs")
-
-    export APRUN_CALCFIMS="${APRUN_default}"
- ;;
  "prep_emissions")
 
     export APRUN="${APRUN_default}"
@@ -115,6 +111,8 @@ case ${step} in
 ;;
  "snowanl")
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 

diff --git a/env/JET.env b/env/JET.env
@@ -40,10 +40,6 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="JET"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
-
-    export APRUN_CALCFIMS="${launcher} -n 1"
-
 elif [[ "${step}" = "prep_emissions" ]]; then
 
     export APRUN="${launcher} -n 1"
@@ -99,6 +95,8 @@ elif [[ "${step}" = "prepobsaero" ]]; then
 
 elif [[ "${step}" = "snowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default}"
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -47,10 +47,6 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="ORION"
     export launcher_PREP="srun --hint=nomultithread"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
-
-    export APRUN_CALCFIMS="${launcher} -n 1"
-
 elif [[ "${step}" = "prep_emissions" ]]; then
 
     export APRUN="${launcher} -n 1"
@@ -106,6 +102,8 @@ elif [[ "${step}" = "prepobsaero" ]]; then
 
 elif [[ "${step}" = "snowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_SNOWANL}"
 

diff --git a/env/S4.env b/env/S4.env
@@ -40,10 +40,6 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="S4"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
-
-    export APRUN_CALCFIMS="${APRUN_default}"
-
 elif [[ "${step}" = "prep_emissions" ]]; then
 
     export APRUN="${APRUN_default}"
@@ -99,6 +95,8 @@ elif [[ "${step}" = "prepobsaero" ]]; then
 
 elif [[ "${step}" = "snowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default}"
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -34,10 +34,6 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="wcoss2"
     export launcher_PREP="mpiexec"
 
-elif [[ "${step}" = "prepsnowobs" ]]; then
-
-    export APRUN_CALCFIMS="${APRUN_default}"
-
 elif [[ "${step}" = "prep_emissions" ]]; then
 
     export APRUN="${APRUN_default}"
@@ -92,6 +88,8 @@ elif [[ "${step}" = "prepobsaero" ]]; then
 
 elif [[ "${step}" = "snowanl" ]]; then
 
+    export APRUN_CALCFIMS="${launcher} -n 1"
+
     export NTHREADS_SNOWANL=${NTHREADSmax}
     export APRUN_SNOWANL="${APRUN_default}"
 

diff --git a/jobs/JGLOBAL_PREP_SNOW_OBS b/jobs/JGLOBAL_PREP_SNOW_OBS
diff --git a/jobs/rocoto/prepsnowobs.sh b/jobs/rocoto/prepsnowobs.sh
diff --git a/jobs/rocoto/snowanl.sh b/jobs/rocoto/snowanl.sh
@@ -11,6 +11,14 @@ status=$?
 export job="snowanl"
 export jobid="${job}.$$"
 
+###############################################################
+# setup python path for ioda utilities
+# shellcheck disable=SC2311
+pyiodaPATH="${HOMEgfs}/sorc/gdas.cd/build/lib/python$(detect_py_ver)/"
+gdasappPATH="${HOMEgfs}/sorc/gdas.cd/sorc/iodaconv/src:${pyiodaPATH}"
+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}:${gdasappPATH}"
+export PYTHONPATH
+
 ###############################################################
 # Execute the JJOB
 "${HOMEgfs}/jobs/JGLOBAL_SNOW_ANALYSIS"

diff --git a/parm/config/gfs/config.prepsnowobs b/parm/config/gfs/config.prepsnowobs
diff --git a/parm/config/gfs/config.resources b/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 prepatmiodaobs"
     echo "atmanlinit atmanlvar atmanlfv3inc atmanlfinal"
     echo "atmensanlinit atmensanlobs atmensanlsol atmensanlletkf atmensanlfv3inc atmensanlfinal"
     echo "snowanl esnowrecen"
@@ -152,13 +152,6 @@ case ${step} in
     memory="${mem_node_max}"
     ;;
 
-  "prepsnowobs")
-    walltime="00:05:00"
-    ntasks=1
-    threads_per_task=1
-    tasks_per_node=1
-    ;;
-
   "prepatmiodaobs")
     walltime="00:30:00"
     ntasks=1

diff --git a/parm/config/gfs/config.snowanl b/parm/config/gfs/config.snowanl
@@ -19,6 +19,12 @@ export JEDIYAML="${PARMgfs}/gdas/snow/letkfoi/letkfoi.yaml.j2"
 export SNOWDEPTHVAR="snodl"
 export BESTDDEV="30."  # Background Error Std. Dev. for LETKFOI
 
+# Process IMS snowcover into snow depth
+export IMS_OBS_LIST="${PARMgfs}/gdas/snow/prep/prep_ims.yaml.j2"
+export CALCFIMSEXE="${EXECgfs}/calcfIMS.exe"
+export FIMS_NML_TMPL="${PARMgfs}/gdas/snow/prep/fims.nml.j2"
+export IMS2IODACONV="${USHgfs}/imsfv3_scf2ioda.py"
+
 # Name of the executable that applies increment to bkg and its namelist template
 export APPLY_INCR_EXE="${EXECgfs}/apply_incr.exe"
 export APPLY_INCR_NML_TMPL="${PARMgfs}/gdas/snow/letkfoi/apply_incr_nml.j2"

diff --git a/scripts/exglobal_prep_snow_obs.py b/scripts/exglobal_prep_snow_obs.py
diff --git a/scripts/exglobal_snow_analysis.py b/scripts/exglobal_snow_analysis.py
@@ -19,6 +19,8 @@
 
     # Instantiate the snow analysis task
     anl = SnowAnalysis(config)
+    if anl.task_config.cyc == 0:
+        anl.prepare_IMS()
     anl.initialize()
     anl.execute()
     anl.finalize()
diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
@@ -113,7 +113,7 @@ def _get_app_configs(self):
                 configs += ['prepobsaero']
 
         if self.do_jedisnowda:
-            configs += ['prepsnowobs', 'snowanl']
+            configs += ['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 += ['snowanl']
 
         wave_prep_tasks = ['waveinit', 'waveprep']
         wave_bndpnt_tasks = ['wavepostbndpnt', 'wavepostbndpntbll']

diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
@@ -563,34 +563,10 @@ def aeroanlfinal(self):
 
         return task
 
-    def prepsnowobs(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'
-        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',
-                     'job_name': f'{self.pslot}_{task_name}_@H',
-                     'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
-                     'maxtries': '&MAXTRIES;'
-                     }
-
-        task = rocoto.create_task(task_dict)
-
-        return task
-
     def snowanl(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}_prepsnowobs'}
+        dep_dict = {'type': 'task', 'name': f'{self.run}_prep'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
@@ -613,8 +589,6 @@ def snowanl(self):
     def esnowrecen(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf","")}_prepsnowobs'}
-        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))
         dep_dict = {'type': 'metatask', 'name': f'{self.run}_epmn', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}

diff --git a/workflow/rocoto/tasks.py b/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',
+                   'snowanl', 'esnowrecen',
                    'fcst',
                    'atmanlupp', 'atmanlprod', 'atmupp', 'goesupp',
                    'atmos_prod', 'ocean_prod', 'ice_prod',