Update gdas.cd

ci/Jenkinsfile

@@ -5,7 +5,7 @@ def cases = ''
 def GH = 'none'
 // Location of the custom workspaces for each machine in the CI system.  They are persitent for each iteration of the PR.
 def NodeName = [hera: 'Hera-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaea: 'Gaea']
-def custom_workspace = [hera: '/scratch1/NCEPDEV/global/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/stmp/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI']
+def custom_workspace = [hera: '/scratch1/NCEPDEV/global/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/global/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI']
 def repo_url = '[email protected]:NOAA-EMC/global-workflow.git'
 def STATUS = 'Passed'
 

ci/cases/pr/C96C48_hybatmaerosnowDA.yaml

@@ -18,6 +18,7 @@ arguments:
   yaml: {{ HOMEgfs }}/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
 
 skip_ci_on_hosts:
+  - wcoss2
   - orion
   - gaea
   - hercules

ush/python/pygfs/task/marine_analysis.py

@@ -210,6 +210,7 @@ def _prep_variational_yaml(self: Task) -> None:
         envconfig_jcb['cyc'] = os.getenv('cyc')
         envconfig_jcb['SOCA_NINNER'] = self.task_config.SOCA_NINNER
         envconfig_jcb['obs_list'] = ['adt_rads_all']
+        envconfig_jcb['MOM6_LEVS'] = mdau.get_mom6_levels(str(self.task_config.OCNRES))
 
         # Write obs_list_short
         save_as_yaml(parse_obs_list_file(self.task_config.MARINE_OBS_LIST_YAML), 'obs_list_short.yaml')

ush/python/pygfs/utils/marine_da_utils.py

@@ -166,3 +166,36 @@ def clean_empty_obsspaces(config, target, app='var'):
 
     # save cleaned yaml
     save_as_yaml(config, target)
+
+
+@logit(logger)
+def get_mom6_levels(ocnres: str) -> int:
+    """
+    Temporary function that returns the number of vertical levels in MOM6 given the horizontal resolution.
+    This is requiered by the diffusion saber block that now makes use of oops::util::FieldSetHelpers::writeFieldSet
+    and requires the number of levels in the configuration. I have been told this will be changed in the future.
+
+    Parameters
+    -----------
+    ocnres: str
+        Input resolution for ocean in str format. e.g. '500', '100', '050', '025'
+
+   Returns
+   -------
+   nlev: int
+       number of levels in the ocean model given an input resolution
+    """
+
+    # Currently implemented resolutions
+    ocnres_to_nlev = {
+        '500': 25,
+        '100': 75,
+        '050': 75,
+        '025': 75
+    }
+    try:
+        nlev = ocnres_to_nlev.get(ocnres)
+    except KeyError:
+        raise KeyError("FATAL ERROR: Invalid ocnres value. Aborting.")
+
+    return nlev

versions/fix.ver

@@ -8,7 +8,7 @@ export cice_ver=20240416
 export cpl_ver=20230526
 export datm_ver=20220805
 export gdas_crtm_ver=20220805
-export gdas_fv3jedi_ver=20220805
+export gdas_fv3jedi_ver=20241022
 export gdas_soca_ver=20240802
 export gdas_gsibec_ver=20240416
 export gdas_obs_ver=20240213