Refactor marine ensemble recentering script and move to GW from GDASApp

.gitignore

@@ -143,7 +143,6 @@ sorc/ocnicepost.fd
 #------------------------------
 # jobs symlinks
 # scripts symlinks
-scripts/exgdas_global_marine_analysis_ecen.py
 scripts/exglobal_prep_ocean_obs.py
 # ush symlinks
 ush/bufr2ioda_insitu_profile_argo.py

dev/jobs/ocnanalecen.sh → dev/jobs/marineanlecen.sh

@@ -10,7 +10,7 @@ if [[ ${status} -ne 0 ]]; then
     exit "${status}"
 fi
 
-export job="ocnanalecen"
+export job="marineanlecen"
 export jobid="${job}.$$"
 
 ###############################################################
@@ -20,6 +20,6 @@ export PYTHONPATH
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN
+"${HOMEgfs}"/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN
 status=$?
 exit "${status}"

dev/parm/config/gcafs/config.resources

@@ -28,7 +28,7 @@ if (( $# != 1 )); then
     echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
     echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak npoess"
-    echo "marineanlinit prepoceanobs marinebmat marineanlvar ocnanalecen marineanalletkf marineanlchkpt marineanlfinal ocnanalvrfy"
+    echo "marineanlinit prepoceanobs marinebmat marineanlvar marineanlecen marineanalletkf marineanlchkpt marineanlfinal ocnanalvrfy"
     exit 1
 
 fi
@@ -590,7 +590,7 @@ case ${step} in
     tasks_per_node=$(( max_tasks_per_node / 2 ))
     ;;
 
-  "ocnanalecen")
+  "marineanlecen")
     ntasks=16
     case ${OCNRES} in
       "025")

dev/parm/config/gfs/config.marineanl.j2

@@ -5,7 +5,6 @@
 
 echo "BEGIN: config.marineanl"
 
-export JEDI_CONFIG_YAML_BMAT="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
 export JEDI_CONFIG_YAML_ANALYSIS="${PARMgfs}/gdas/soca_analysis_jedi_config.yaml.j2"
 export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"
 

dev/parm/config/gfs/config.marineanlecen

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+########## config.marineanlecen ##########
+# Ocn Analysis specific
+
+echo "BEGIN: config.marineanlecen"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" marineanlecen
+
+export JEDI_CONFIG_YAML_ECEN="${PARMgfs}/gdas/soca/soca_ecen_jedi_config.yaml.j2"
+export MARINE_ECEN_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ecen_stage.yaml.j2"
+export MARINE_ECEN_FINALIZE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ecen_finalize.yaml.j2"
+
+echo "END: config.marineanlecen"

dev/parm/config/gfs/config.marinebmat

@@ -8,4 +8,7 @@ echo "BEGIN: config.marinebmat"
 # Get task specific resources
 . "${EXPDIR}/config.resources" marinebmat
 
+export JEDI_CONFIG_YAML_BMAT="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
+export MARINE_BMAT_FINALIZE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_bmat_finalize.yaml.j2"
+
 echo "END: config.marinebmat"

dev/parm/config/gfs/config.marinebmatinit

@@ -8,4 +8,6 @@ echo "BEGIN: config.marinebmatinit"
 # Get task specific resources
 source "${EXPDIR}/config.resources" marinebmatinit
 
+export JEDI_CONFIG_YAML_BMAT="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
+
 echo "END: config.marinebmatinit"

dev/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 "marineanlinit prepoceanobs marinebmatinit marinebmat marineanlvar ocnanalecen marineanalletkf marineanlchkpt marineanlfinal ocnanalvrfy"
+    echo "marineanlinit prepoceanobs marinebmatinit marinebmat marineanlvar marineanlecen marineanalletkf marineanlchkpt marineanlfinal ocnanalvrfy"
     exit 1
 
 fi
@@ -568,7 +568,7 @@ case ${step} in
     tasks_per_node=$(( max_tasks_per_node / 2 ))
     ;;
 
-  "ocnanalecen")
+  "marineanlecen")
     ntasks=16
     walltime="00:10:00"
     case ${OCNRES} in

dev/parm/config/gfs/config.resources.GAEAC6

@@ -76,7 +76,7 @@ case ${step} in
     esac
     ;;
 
-  "ocnanalecen")
+  "marineanlecen")
     case ${OCNRES} in
       "025")
         ntasks=288

dev/workflow/applications/gfs_cycled.py

@@ -119,7 +119,7 @@ def _get_app_configs(self, run):
             if options['do_letkf_ocn']:
                 configs += ['marineanlletkf']
             if options['do_hybvar']:
-                configs += ['ocnanalecen']
+                configs += ['marineanlecen']
             configs += ['marineanlchkpt', 'marineanlfinal']
 
         if options['do_ocean'] or options['do_ice']:
@@ -255,12 +255,7 @@ def get_task_names(self):
                     task_names[run] += ['anal', 'analcalc']
 
                 if options['do_jediocnvar']:
-                    task_names[run] += ['prepoceanobs', 'marineanlinit', 'marinebmatinit', 'marinebmat', 'marineanlvar']
-                    if options['do_letkf_ocn']:
-                        task_names[run] += ['marineanlletkf']
-                    if options['do_hybvar']:
-                        task_names[run] += ['ocnanalecen']
-                    task_names[run] += ['marineanlchkpt', 'marineanlfinal']
+                    task_names[run] += ['prepoceanobs', 'marineanlinit', 'marinebmatinit', 'marinebmat', 'marineanlvar', 'marineanlchkpt', 'marineanlfinal']
 
                 task_names[run] += ['sfcanl']
 
@@ -398,6 +393,12 @@ def get_task_names(self):
                     task_names[run].append('echgres') if 'gdas' in run else 0
                     task_names[run] += ['ediag']
 
+                if options['do_jediocnvar']:
+                    if options['do_letkf_ocn']:
+                        task_names[run] += ['marineanlletkf']
+                    if options['do_hybvar']:
+                        task_names[run] += ['marineanlecen']
+
                 task_names[run].append('esnowanl') if options['do_jedisnowda'] else 0
                 task_names[run].append('efcs') if 'gdas' in run else 0
                 task_names[run].append('epos') if 'gdas' in run else 0

dev/workflow/build_opts.yaml

@@ -36,7 +36,7 @@ build:
   gfs_model:
     command: "./build_ufs.sh -e gfs_model.x"
     cores: 12
-    walltime: "00:30:00"
+    walltime: "00:40:00"
 
   gfs_ww3prepost:
     command: "./build_ww3prepost.sh"
@@ -46,7 +46,7 @@ build:
   gefs_model:
     command: "./build_ufs.sh -w -e gefs_model.x"
     cores: 12
-    walltime: "00:30:00"
+    walltime: "00:40:00"
 
   gefs_ww3_prepost:
     command: "./build_ww3prepost.sh -w"
@@ -56,12 +56,12 @@ build:
   sfs_model:
     command: "./build_ufs.sh -y -e sfs_model.x"
     cores: 12
-    walltime: "00:30:00"
+    walltime: "00:40:00"
 
   gcafs_model:
     command: "./build_ufs.sh -a ATMAERO -e gcafs_model.x"
     cores: 12
-    walltime: "00:30:00"
+    walltime: "00:40:00"
 
   upp:
     command: "./build_upp.sh"

dev/workflow/rocoto/gfs_tasks.py

@@ -707,9 +707,9 @@ def prepoceanobs(self):
     def marineanlletkf(self):
 
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}_prepoceanobs'}
+        dep_dict = {'type': 'task', 'name': f"{self.run.replace('enkf','')}_prepoceanobs"}
         deps.append(rocoto.add_dependency(dep_dict))
-        dep_dict = {'type': 'task', 'name': f'{self.run}_marinebmat'}
+        dep_dict = {'type': 'task', 'name': f"{self.run.replace('enkf','')}_marinebmat"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
@@ -836,22 +836,22 @@ def marineanlvar(self):
 
         return task
 
-    def ocnanalecen(self):
+    def marineanlecen(self):
 
         # can run in parallel with marinebmat
         deps = []
-        dep_dict = {'type': 'task', 'name': f'{self.run}_marinebmatinit'}
+        dep_dict = {'type': 'task', 'name': f"{self.run.replace('enkf','')}_marinebmatinit"}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps)
 
-        resources = self.get_resource('ocnanalecen')
-        task_name = f'{self.run}_ocnanalecen'
+        resources = self.get_resource('marineanlecen')
+        task_name = f'{self.run}_marineanlecen'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'dependency': dependencies,
                      'envars': self.envars,
                      'cycledef': self.run.replace('enkf', ''),
-                     'command': f'{self.HOMEgfs}/dev/jobs/ocnanalecen.sh',
+                     'command': f'{self.HOMEgfs}/dev/jobs/marineanlecen.sh',
                      'job_name': f'{self.pslot}_{task_name}_@H',
                      'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log',
                      'maxtries': '&MAXTRIES;'
@@ -867,7 +867,7 @@ def marineanlchkpt(self):
         dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlvar'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.options['do_hybvar_ocn']:
-            dep_dict = {'type': 'task', 'name': f'{self.run}_ocnanalecen'}
+            dep_dict = {'type': 'task', 'name': f'enkf{self.run}_marineanlecen'}
             deps.append(rocoto.add_dependency(dep_dict))
         if self.options['do_mergensst']:
             data = f'&ROTDIR;/{self.run}.@Y@m@d/@H/atmos/{self.run}.t@Hz.sfcanl.nc'
@@ -2809,7 +2809,7 @@ def efcs(self):
         dep_dict = {'type': 'task', 'name': f'{self.run}_esfc'}
         deps.append(rocoto.add_dependency(dep_dict))
         if self.options['do_hybvar_ocn']:
-            dep_dict = {'type': 'task', 'name': f'{self.run.replace("enkf", "")}_ocnanalecen'}
+            dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlecen'}
             deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
         dep_dict = {'type': 'task', 'name': f'{self.run}_stage_ic'}
@@ -2993,7 +2993,7 @@ def earc_tars(self):
             dep_dict = {'type': 'metatask', 'name': f'{self.run}_ecmn'}
             deps.append(rocoto.add_dependency(dep_dict))
             if self._base.get('DOHYBVAR_OCN', True):
-                dep_dict = {'type': 'task', 'name': f'gfs_ocnanalecen'}
+                dep_dict = {'type': 'task', 'name': f'enkfgfs_marineanlecen'}
                 deps.append(rocoto.add_dependency(dep_dict))
                 dep_dict = {'type': 'task', 'name': f'gfs_marineanlfinal'}
                 deps.append(rocoto.add_dependency(dep_dict))

dev/workflow/rocoto/tasks.py

@@ -19,7 +19,7 @@ class Tasks:
                    'prepatmiodaobs', 'atmanlinit', 'atmanlvar', 'atmanlfv3inc', 'atmanlfinal',
                    'prep_emissions', 'prepoceanobs',
                    'marineanlinit', 'marineanlletkf', 'marinebmatinit', 'marinebmat', 'marineanlvar',
-                   'ocnanalecen', 'marineanlchkpt', 'marineanlfinal', 'ocnanalvrfy',
+                   'marineanlecen', 'marineanlchkpt', 'marineanlfinal', 'ocnanalvrfy',
                    'eobs', 'epos', 'esfc', 'eupd',
                    'earc_vrfy', 'earc_tars', 'ecen', 'echgres', 'ediag', 'efcs',
                    'atmensanlinit', 'atmensanlobs', 'atmensanlsol', 'atmensanlletkf', 'atmensanlfv3inc', 'atmensanlfinal', 'atmos_ensstat',

env/GAEAC5.env

@@ -135,9 +135,9 @@ case ${step} in
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
     export APRUN_MARINEANLVAR="${APRUN_default}"
  ;;
- "ocnanalecen")
+ "marineanlecen")
 
-    export APRUN_OCNANALECEN="${APRUN_default}"
+    export APRUN_MARINEANLECEN="${APRUN_default}"
  ;;
  "marineanlchkpt")
 

env/GAEAC6.env

@@ -135,9 +135,9 @@ case ${step} in
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
     export APRUN_MARINEANLVAR="${APRUN_default}"
  ;;
- "ocnanalecen")
+ "marineanlecen")
 
-    export APRUN_OCNANALECEN="${APRUN_default}"
+    export APRUN_MARINEANLECEN="${APRUN_default}"
  ;;
  "marineanlchkpt")
 

env/HERA.env

@@ -154,10 +154,9 @@ elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUN_MARINEANLOBSSTATS="${launcher} -n 1"
 
-elif [[ "${step}" = "ocnanalecen" ]]; then
+elif [[ "${step}" = "marineanlecen" ]]; then
 
-    export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_MARINEANLECEN=${APRUN_default}
 
 elif [[ "${step}" = "marineanlletkf" ]]; then
 

env/HERCULES.env

@@ -141,9 +141,9 @@ case ${step} in
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
     export APRUN_MARINEANLVAR="${APRUN_default}"
  ;;
- "ocnanalecen")
+ "marineanlecen")
 
-   export APRUN_OCNANALECEN="${APRUN_default}"
+   export APRUN_MARINEANLECEN="${APRUN_default}"
  ;;
  "marineanlchkpt")
 

env/ORION.env

@@ -150,10 +150,9 @@ elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUN_MARINEANLOBSSTATS="${launcher} -n 1"
 
-elif [[ "${step}" = "ocnanalecen" ]]; then
+elif [[ "${step}" = "marineanlecen" ]]; then
 
-    export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_MARINEANLECEN=${APRUN_default}
 
 elif [[ "${step}" = "marineanlletkf" ]]; then
 

env/WCOSS2.env

@@ -126,10 +126,10 @@ elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUN_MARINEANLOBSSTATS="${launcher} -n 1"
 
-elif [[ "${step}" = "ocnanalecen" ]]; then
+elif [[ "${step}" = "marineanlecen" ]]; then
 
-    export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN_default}"
+    export NTHREADS_MARINEANLECEN=${NTHREADSmax}
+    export APRUN_MARINEANLECEN="${APRUN_default}"
 
 elif [[ "${step}" = "marineanlletkf" ]]; then
 

jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT

@@ -1,8 +1,8 @@
 #!/bin/bash
 export WIPE_DATA="NO"
-export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATAjob="${DATAROOT}/marineanalysis.${PDY:-}${cyc}"
 export DATAens="${DATAjob}/ensdata"
-export DATA="${DATAjob}/marinevariational"
+export DATA="${DATAjob}/marineanlvar"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlchkpt" -c "base marineanl marineanlchkpt"