debugging after merge

NOAA-EMC · Oct 3, 2024 · 926bbc3 · 926bbc3
1 parent b19d000
commit 926bbc3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF b/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
@@ -1,5 +1,12 @@
 #!/bin/bash
 source "${HOMEgfs}/ush/preamble.sh"
+
+export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
+export DATA="${DATAjob}/${jobid}"
+# Create the directory to hold ensemble perturbations
+export DATAens="${DATAjob}/ensdata"
+if [[ ! -d "${DATAens}" ]]; then mkdir -p "${DATAens}"; fi
+
 source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlletkf" -c "base marineanl marineanlletkf"
 
 ##############################################
@@ -11,6 +18,8 @@ GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
 
 gPDY=${GDATE:0:8}
 gcyc=${GDATE:8:2}
+export GDUMP="gdas"
+export GDUMP_ENS="enkf${GDUMP}"
 
 YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
   COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \

diff --git a/parm/config/gfs/config.marineanlletkf b/parm/config/gfs/config.marineanlletkf
@@ -8,12 +8,12 @@ echo "BEGIN: config.marineanlletkf"
 # Get task specific resources
 . "${EXPDIR}/config.resources" marineanlletkf
 
-export MARINE_LETKF_EXEC="${JEDI_BIN}/gdas.x"
+export MARINE_LETKF_EXEC="${EXECgfs}/gdas.x"
 export MARINE_LETKF_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf.yaml.j2"
 export MARINE_LETKF_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf_stage.yaml.j2"
 export MARINE_LETKF_SAVE_YAML_TMPL="${PARMgfs}/gdas/soca/letkf/letkf_save.yaml.j2"
 
-export GRIDGEN_EXEC="${JEDI_BIN}/gdas_soca_gridgen.x"
+export GRIDGEN_EXEC="${EXECgfs}/gdas_soca_gridgen.x"
 export GRIDGEN_YAML="${PARMgfs}/gdas/soca/gridgen/gridgen.yaml"
 
 echo "END: config.marineanlletkf"
diff --git a/ush/python/pygfs/task/marine_letkf.py b/ush/python/pygfs/task/marine_letkf.py
@@ -43,15 +43,18 @@ def __init__(self, config: Dict) -> None:
                             'soca',
                             'localensembleda',
                             _letkf_yaml_file]
+       # compute the relative path from self.task_config.DATA to self.task_config.DATAenspert
+        _enspert_relpath = os.path.relpath(self.task_config.DATAens, self.task_config.DATA)
 
         self.task_config.WINDOW_MIDDLE = self.task_config.current_cycle
         self.task_config.WINDOW_BEGIN = self.task_config.current_cycle - _half_assim_freq
         self.task_config.letkf_exec_args = _letkf_exec_args
         self.task_config.letkf_yaml_file = _letkf_yaml_file
         self.task_config.mom_input_nml_tmpl = os.path.join(self.task_config.DATA, 'mom_input.nml.tmpl')
         self.task_config.mom_input_nml = os.path.join(self.task_config.DATA, 'mom_input.nml')
-        self.task_config.obs_dir = os.path.join(self.task_config.DATA, 'obs')
-
+        self.task_config.obs_dir = os.path.join(self.task_config.DATA, 'obs') 
+        self.task_config.ENSPERT_RELPATH = _enspert_relpath
+
     @logit(logger)
     def initialize(self):
         """Method initialize for ocean and sea ice LETKF task
@@ -80,6 +83,8 @@ def initialize(self):
                 'COMOUT_ICE_LETKF',
                 'COMOUT_OCEAN_LETKF',
                 'DATA',
+                'ENSPERT_RELPATH',
+                'GDUMP_ENS',
                 'NMEM_ENS',
                 'PARMgfs',
                 'ROTDIR',
@@ -90,7 +95,7 @@ def initialize(self):
         stageconf.RUN = 'enkfgdas'
 
         # stage ensemble background files
-        soca_ens_bkg_stage_list = parse_j2yaml(self.task_config.SOCA_ENS_BKG_STAGE_YAML_TMPL, stageconf)
+        soca_ens_bkg_stage_list = parse_j2yaml(self.task_config.MARINE_ENSDA_STAGE_BKG_YAML_TMPL, stageconf)
         FileHandler(soca_ens_bkg_stage_list).sync()
 
         # stage letkf-specific files