Merge branch 'NOAA-EMC:develop' into feature/bufr2ioda

RussTreadon-NOAA · Feb 28, 2024 · ed7d147 · ed7d147
2 parents 08594f8 + 992306f
commit ed7d147
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py
@@ -162,12 +162,12 @@ def find_clim_ens(input_date):
     logger.info("---------------- Stage offline ensemble members")
     ens_member_list = []
     clim_ens_dir = find_clim_ens(pytz.utc.localize(window_begin, is_dst=None))
-    nmem_ens = len(glob.glob(os.path.abspath(os.path.join(clim_ens_dir, 'ocn.*.nc'))))
-    for domain in ['ocn', 'ice']:
+    nmem_ens = len(glob.glob(os.path.join(clim_ens_dir, 'ocean.*.nc')))
+    for domain in ['ocean', 'ice']:
         for mem in range(1, nmem_ens+1):
             fname = domain+"."+str(mem)+".nc"
-            fname_in = os.path.abspath(os.path.join(clim_ens_dir, fname))
-            fname_out = os.path.abspath(os.path.join(static_ens, fname))
+            fname_in = os.path.join(clim_ens_dir, fname)
+            fname_out = os.path.join(static_ens, fname)
             ens_member_list.append([fname_in, fname_out])
     FileHandler({'copy': ens_member_list}).sync()
 os.environ['ENS_SIZE'] = str(nmem_ens)

diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test
@@ -44,7 +44,7 @@ setup_expt config:
     DO_JEDISNOWDA: "NO"
     DO_MERGENSST: "NO"
     NMEM_ENS: "4"
-    DOHYBVAR: "YES"
+    DOHYBVAR: "NO"
   ocnanal:
     SOCA_INPUT_FIX_DIR: @HOMEgfs@/sorc/gdas.cd/build/gdas/soca_static
     CASE_ANL: C48