the great deawkwarding

NOAA-EMC · Sep 20, 2024 · c66994e · c66994e
1 parent 36fa89c
commit c66994e
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -155,10 +155,10 @@ elif [[ "${step}" = "ocnanalecen" ]]; then
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
     export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
-elif [[ "${step}" = "marineanalletkf" ]]; then
+elif [[ "${step}" = "marineanlletkf" ]]; then
 
-    export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export NTHREADS_MARINEANLLETKF=${NTHREADSmax}
+    export APRUN_MARINEANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANLLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -148,10 +148,10 @@ elif [[ "${step}" = "ocnanalecen" ]]; then
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
     export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
-elif [[ "${step}" = "marineanalletkf" ]]; then
+elif [[ "${step}" = "marineanlletkf" ]]; then
 
-    export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export NTHREADS_MARINEANLLETKF=${NTHREADSmax}
+    export APRUN_MARINEANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANLLETKF}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -126,10 +126,10 @@ elif [[ "${step}" = "ocnanalecen" ]]; then
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
     export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 
-elif [[ "${step}" = "marineanalletkf" ]]; then
+elif [[ "${step}" = "marineanlletkf" ]]; then
 
-    export NTHREADS_MARINEANALLETKF=${NTHREADSmax}
-    export APRUN_MARINEANALLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANALLETKF}"
+    export NTHREADS_MARINEANLLETKF=${NTHREADSmax}
+    export APRUN_MARINEANLLETKF="${APRUN_default} --cpus-per-task=${NTHREADS_MARINEANLLETKF}"
 
 elif [[ "${step}" = "atmanlfv3inc" ]]; then
 

diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF b/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
@@ -1,6 +1,6 @@
 #!/bin/bash
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanalletkf" -c "base ocnanal marineanalletkf"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlletkf" -c "base ocnanal marineanlletkf"
 
 ##############################################
 # Set variables used in the script

diff --git a/jobs/rocoto/marineanalletkf.sh → jobs/rocoto/marineanlletkf.sh b/jobs/rocoto/marineanalletkf.sh → jobs/rocoto/marineanlletkf.sh
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="marineanalletkf"
+export job="marineanlletkf"
 export jobid="${job}.$$"
 
 ###############################################################

diff --git a/parm/config/gfs/config.marineanalletkf → parm/config/gfs/config.marineanlletkf b/parm/config/gfs/config.marineanalletkf → parm/config/gfs/config.marineanlletkf
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-########## config.marineanalletkf ##########
+########## config.marineanlletkf ##########
 # Ocn Analysis specific
 
-echo "BEGIN: config.marineanalletkf"
+echo "BEGIN: config.marineanlletkf"
 
 # Get task specific resources
-. "${EXPDIR}/config.resources" marineanalletkf
+. "${EXPDIR}/config.resources" marineanlletkf
 
 export MARINE_LETKF_EXEC="${JEDI_BIN}/gdas.x"
 export MARINE_LETKF_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf.yaml.j2"
@@ -16,4 +16,4 @@ export MARINE_LETKF_SAVE_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf_save.yaml.j
 export GRIDGEN_EXEC="${JEDI_BIN}/gdas_soca_gridgen.x"
 export GRIDGEN_YAML="${PARMgfs}/gdas/soca/gridgen/gridgen.yaml"
 
-echo "END: config.marineanalletkf"
+echo "END: config.marineanlletkf"
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -26,7 +26,7 @@ if (( $# != 1 )); then
     echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
     echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak npoess"
-    echo "ocnanalprep prepoceanobs marinebmat ocnanalrun ocnanalecen marineanalletkf ocnanalchkpt ocnanalpost ocnanalvrfy"
+    echo "ocnanalprep prepoceanobs marinebmat ocnanalrun ocnanalecen marineanlletkf ocnanalchkpt ocnanalpost ocnanalvrfy"
     exit 1
 
 fi
@@ -600,7 +600,7 @@ case ${step} in
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 
-  "marineanalletkf")
+  "marineanlletkf")
     ntasks=16
     case ${OCNRES} in
       "025")

diff --git a/ush/python/pygfs/task/marine_letkf.py b/ush/python/pygfs/task/marine_letkf.py
@@ -148,7 +148,7 @@ def run(self):
 
         logger.info("run")
 
-        exec_cmd_gridgen = Executable(self.task_config.APRUN_MARINEANALLETKF)
+        exec_cmd_gridgen = Executable(self.task_config.APRUN_MARINEANLLETKF)
         exec_cmd_gridgen.add_default_arg(self.task_config.GRIDGEN_EXEC)
         exec_cmd_gridgen.add_default_arg(self.task_config.GRIDGEN_YAML)
 
@@ -161,7 +161,7 @@ def run(self):
             raise WorkflowException(f"An error occured during execution of {exec_cmd_gridgen}")
         pass
 
-        exec_cmd_letkf = Executable(self.task_config.APRUN_MARINEANALLETKF)
+        exec_cmd_letkf = Executable(self.task_config.APRUN_MARINEANLLETKF)
         for letkf_exec_arg in self.task_config.letkf_exec_args:
             exec_cmd_letkf.add_default_arg(letkf_exec_arg)
 

diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
@@ -46,7 +46,7 @@ def _get_app_configs(self):
         if self.do_jediocnvar:
             configs += ['prepoceanobs', 'ocnanalprep', 'marinebmat', 'ocnanalrun']
             if self.do_hybvar:
-                configs += ['marineanalletkf', 'ocnanalecen']
+                configs += ['marineanlletkf', 'ocnanalecen']
             configs += ['ocnanalchkpt', 'ocnanalpost']
             if self.do_vrfy_oceanda:
                 configs += ['ocnanalvrfy']
@@ -148,7 +148,7 @@ def get_task_names(self):
         if self.do_jediocnvar:
             gdas_gfs_common_tasks_before_fcst += ['prepoceanobs', 'ocnanalprep', 'marinebmat', 'ocnanalrun']
             if self.do_hybvar:
-                gdas_gfs_common_tasks_before_fcst += ['marineanalletkf', 'ocnanalecen']
+                gdas_gfs_common_tasks_before_fcst += ['marineanlletkf', 'ocnanalecen']
             gdas_gfs_common_tasks_before_fcst += ['ocnanalchkpt', 'ocnanalpost']
             if self.do_vrfy_oceanda:
                 gdas_gfs_common_tasks_before_fcst += ['ocnanalvrfy']

diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
@@ -665,7 +665,7 @@ def prepoceanobs(self):
 
         return task
 
-    def marineanalletkf(self):
+    def marineanlletkf(self):
 
         ocean_hist_path = self._template_to_rocoto_cycstring(self._base["COM_OCEAN_HISTORY_TMPL"], {'RUN': 'gdas'})
 
@@ -675,14 +675,14 @@ def marineanalletkf(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        resources = self.get_resource('marineanalletkf')
-        task_name = f'{self.run}marineanalletkf'
+        resources = self.get_resource('marineanlletkf')
+        task_name = f'{self.run}marineanlletkf'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanalletkf.sh',
+                     'command': f'{self.HOMEgfs}/jobs/rocoto/marineanlletkf.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'

diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
@@ -15,7 +15,7 @@ class Tasks:
                    'prep', 'anal', 'sfcanl', 'analcalc', 'analdiag', 'arch', "cleanup",
                    'prepatmiodaobs', 'atmanlinit', 'atmanlvar', 'atmanlfv3inc', 'atmanlfinal',
                    'prepoceanobs',
-                   'ocnanalprep', 'marineanalletkf', 'marinebmat', 'ocnanalrun', 'ocnanalecen', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy',
+                   'ocnanalprep', 'marineanlletkf', 'marinebmat', 'ocnanalrun', 'ocnanalecen', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy',
                    'earc', 'ecen', 'echgres', 'ediag', 'efcs',
                    'eobs', 'eomg', 'epos', 'esfc', 'eupd',
                    'atmensanlinit', 'atmensanlobs', 'atmensanlsol', 'atmensanlletkf', 'atmensanlfv3inc', 'atmensanlfinal',