PR to get the snow da test working (#4)

* working save * changes to get snow test going * update gdas hash
aerorahul · Jan 25, 2024 · a09889b · a09889b
1 parent 4fec1ba
commit a09889b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/jobs/JGLOBAL_LAND_ANALYSIS b/jobs/JGLOBAL_LAND_ANALYSIS
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
+export DATA=${DATA:-${DATAROOT}/${RUN}landanl_${cyc}}
 source "${HOMEgfs}/ush/jjob_header.sh" -e "landanl" -c "base landanl"
 
 ##############################################

diff --git a/jobs/JGLOBAL_PREP_LAND_OBS b/jobs/JGLOBAL_PREP_LAND_OBS
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
+export DATA=${DATA:-${DATAROOT}/${RUN}landanl_${cyc}}
 source "${HOMEgfs}/ush/jjob_header.sh" -e "preplandobs" -c "base preplandobs"
 
 ##############################################

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/ush/python/pygfs/task/land_analysis.py b/ush/python/pygfs/task/land_analysis.py
@@ -26,7 +26,7 @@ class LandAnalysis(Analysis):
     Class for global land analysis tasks
     """
 
-    NMEM_LANDENS = 2  # The size of the land ensemble is fixed at 2.  Does this need to be a variable?
+    NMEM_LANDENS = 2
 
     @logit(logger, name="LandAnalysis")
     def __init__(self, config):
@@ -74,7 +74,7 @@ def prepare_GTS(self) -> None:
         # create a temporary dict of all keys needed in this method
         localconf = AttrDict()
         keys = ['HOMEgfs', 'DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
-                'OPREFIX', 'CASE', 'ntiles']
+                'OPREFIX', 'CASE', 'OCNRES', 'ntiles']
         for key in keys:
             localconf[key] = self.task_config[key]
 
@@ -198,7 +198,7 @@ def prepare_IMS(self) -> None:
             raise WorkflowException(f"An error occured during execution of {exe}")
 
         # Ensure the snow depth IMS file is produced by the above executable
-        input_file = f"IMSscf.{to_YMD(localconf.current_cycle)}.{localconf.CASE}.mx{localconf.OCNRES}_oro_data.nc"
+        input_file = f"IMSscf.{to_YMD(localconf.current_cycle)}.{localconf.CASE}_oro_data.nc"
         if not os.path.isfile(f"{os.path.join(localconf.DATA, input_file)}"):
             logger.exception(f"{self.task_config.CALCFIMSEXE} failed to produce {input_file}")
             raise FileNotFoundError(f"{os.path.join(localconf.DATA, input_file)}")
@@ -249,7 +249,7 @@ def initialize(self) -> None:
         # create a temporary dict of all keys needed in this method
         localconf = AttrDict()
         keys = ['DATA', 'current_cycle', 'COM_OBS', 'COM_ATMOS_RESTART_PREV',
-                'OPREFIX', 'CASE', 'ntiles']
+                'OPREFIX', 'CASE', 'OCNRES', 'ntiles']
         for key in keys:
             localconf[key] = self.task_config[key]
 
@@ -301,7 +301,7 @@ def execute(self) -> None:
         localconf = AttrDict()
         keys = ['HOMEgfs', 'DATA', 'current_cycle',
                 'COM_ATMOS_RESTART_PREV', 'COM_LAND_ANALYSIS', 'APREFIX',
-                'SNOWDEPTHVAR', 'BESTDDEV', 'CASE', 'ntiles',
+                'SNOWDEPTHVAR', 'BESTDDEV', 'CASE', 'OCNRES', 'ntiles',
                 'APRUN_LANDANL', 'JEDIEXE', 'jedi_yaml',
                 'APPLY_INCR_NML_TMPL', 'APPLY_INCR_EXE', 'APRUN_APPLY_INCR']
         for key in keys:
@@ -530,6 +530,7 @@ def add_increments(config: Dict) -> None:
              DATA
              current_cycle
              CASE
+             OCNRES
              ntiles
              APPLY_INCR_NML_TMPL
              APPLY_INCR_EXE
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_bathythermal_profiles.json
+1 −1		parm/ioda/bufr2ioda/bufr2ioda_subpfl_argo_profiles.json
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_subpfl_glider_profiles.json
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_tesac_mammals_profiles.json
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_tesac_profiles.json
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_trackob_surface.json
+12 −0		parm/ioda/bufr2ioda/bufr2ioda_xbtctd_profiles.json
+1 −1		parm/land/letkfoi/apply_incr_nml.j2
+1 −1		parm/land/letkfoi/letkfoi.yaml
+4 −4		parm/land/prep/prep_ims.yaml
+0 −0		parm/soca/berror/old/soca_bump2d.yaml
+0 −0		parm/soca/berror/old/soca_bump_split.yaml
+22 −12		parm/soca/berror/saber_blocks.yaml
+37 −0		parm/soca/berror/soca_parameters_diffusion_hz.yaml
+30 −0		parm/soca/berror/soca_parameters_diffusion_vt.yaml
+1 −25		parm/soca/berror/soca_setcorscales.yaml
+41 −0		parm/soca/obsprep/obsprep_config.yaml
+0 −41		parm/soca/obsproc/obsproc_config.yaml
+2 −2		prototypes/configs/cp0.sh
+2 −2		prototypes/gen_prototype.sh
+24 −0		scripts/exgdas_global_marine_analysis_bmat.sh
+4 −5		scripts/exgdas_global_marine_analysis_post.py
+52 −27		scripts/exgdas_global_marine_analysis_prep.py
+122 −159		scripts/exgdas_global_marine_analysis_vrfy.py
+29 −27		scripts/exglobal_prep_ocean_obs.py
+1 −1		sorc/gsibec
+5 −5		test/soca/gw/CMakeLists.txt
+2 −2		test/soca/gw/run_jjobs.yaml.test
+1 −1		test/soca/gw/setup_obsprep.sh
+1 −1		ush/eva/marine_eva_post.py
+3 −0		ush/eva/marine_gdas_plots.yaml
+106 −4		ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py
+272 −0		ush/ioda/bufr2ioda/bufr2ioda_altkob_surface.py
+267 −0		ush/ioda/bufr2ioda/bufr2ioda_bathythermal_profiles.py
+25 −31		ush/ioda/bufr2ioda/bufr2ioda_subpfl_argo_profiles.py
+318 −0		ush/ioda/bufr2ioda/bufr2ioda_subpfl_glider_profiles.py
+312 −0		ush/ioda/bufr2ioda/bufr2ioda_tesac_mammals_profiles.py
+312 −0		ush/ioda/bufr2ioda/bufr2ioda_tesac_profiles.py
+274 −0		ush/ioda/bufr2ioda/bufr2ioda_trackob_surface.py
+293 −0		ush/ioda/bufr2ioda/bufr2ioda_xbtctd_profiles.py
+3 −3		ush/soca/prep_marine_obs.py