Merge branch 'NOAA-EMC:develop' into feature/arch-split

NOAA-EMC · Jan 24, 2025 · 44eecf0 · 44eecf0
2 parents bba8fb4 + 2dd94db
commit 44eecf0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/ush/python/pygfs/task/marine_analysis.py b/ush/python/pygfs/task/marine_analysis.py
@@ -281,18 +281,19 @@ def _prep_checkpoint(self: Task) -> None:
         soca2cice_param = AttrDict({
             "ocn_ana": f"./Data/ocn.3dvarfgat_pseudo.an.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
             "ice_ana": f"./Data/ice.3dvarfgat_pseudo.an.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
+            "ocn_inc": f"./Data/ocn.3dvarfgat_pseudo.incr.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
+            "ice_inc": f"./Data/ice.3dvarfgat_pseudo.incr.{self.task_config.MARINE_WINDOW_MIDDLE_ISO}.nc",
             "ice_rst": ice_rst_ana,
             "fcst_begin": fcst_begin
         })
         logger.debug(f"{soca2cice_param}")
 
         # render the SOCA to CICE YAML file for the Arctic and Antarctic
         logger.info("render the SOCA to CICE YAML file for the Arctic and Antarctic")
-        varchgyamls = ['soca_2cice_global.yaml']
-        for varchgyaml in varchgyamls:
-            soca2cice_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, f'{varchgyaml}.j2'),
-                                            data=soca2cice_param)
-            soca2cice_config.save(os.path.join(self.task_config.DATA, varchgyaml))
+        varchgyaml = 'soca_2cice_global.yaml'
+        soca2cice_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, f'{varchgyaml}.j2'),
+                                        data=soca2cice_param)
+        soca2cice_config.save(os.path.join(self.task_config.DATA, varchgyaml))
 
     @logit(logger)
     def variational(self: Task) -> None:
@@ -388,6 +389,10 @@ def list_all_files(dir_in, dir_out, wc='*', fh_list=[]):
             post_file_list.append([os.path.join(anl_dir, 'Data', f'{domain}.3dvarfgat_pseudo.an.{mdate}.nc'),
                                    os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.{domain}ana.nc')])
 
+        # Copy soca2cice ice increment
+        post_file_list.append([os.path.join(anl_dir, 'Data', f'ice.soca2cice.incr.{bdate}.nc'),
+                              os.path.join(com_ocean_analysis, f'{RUN}.t{cyc}z.ice.incr.postproc.nc')])
+
         # Copy of the ssh diagnostics
         if nmem_ens > 2:
             for string in ['ssh_steric_stddev', 'ssh_unbal_stddev', 'ssh_total_stddev', 'steric_explained_variance']:
+0 −1		.gitignore
+0 −4		.gitmodules
+0 −5		bundle/CMakeLists.txt
+1 −1		ci/run_ci.sh
+1 −1		parm/jcb-gdas
+1 −0		parm/soca/soca_fix_stage_025.yaml.j2
+1 −0		parm/soca/soca_fix_stage_100.yaml.j2
+1 −1		sorc/fv3-jedi
+0 −1		sorc/icepack
+1 −1		sorc/ioda
+1 −1		sorc/oops
+1 −1		sorc/saber
+1 −1		sorc/soca
+1 −1		sorc/ufo
+10 −1		utils/soca/fig_gallery/exgdas_global_marine_analysis_vrfy_manual.py