Add IAU to snow DA (and its test)

ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml

@@ -1,6 +1,5 @@
 defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
-  DOIAU: "NO"
   DO_JEDISNOWDA: "YES"
   ACCOUNT: {{ 'SLURM_ACCOUNT' | getenv }}

scripts/exglobal_atmos_sfcanl.sh

@@ -167,9 +167,14 @@ if [[ ${DOIAU} = "YES" ]]; then
     # update surface restarts at the beginning of the window, if IAU
     # For now assume/hold dtfanl.nc valid at beginning of window
     for n in $(seq 1 ${ntiles}); do
-        ${NCP} "${COM_ATMOS_RESTART_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
-                "${COM_ATMOS_RESTART}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
-        ${NLN} "${COM_ATMOS_RESTART_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
+        if [[ ${DO_JEDISNOWDA:-"NO"} = "YES" ]]; then
+            src_dir="${COM_SNOW_ANALYSIS}"
+        else
+            src_dir="${COM_ATMOS_RESTART_PREV}"
+        fi
+        ${NCP} "${src_dir}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
+               "${COM_ATMOS_RESTART}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
+        ${NLN} "${src_dir}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
         ${NLN} "${COM_ATMOS_RESTART}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"   "${DATA}/fnbgso.00${n}"
         ${NLN} "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc"                         "${DATA}/fngrid.00${n}"
         ${NLN} "${FIXgfs}/orog/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
@@ -185,14 +190,9 @@ fi
 
 # Update surface restarts at middle of window
 for n in $(seq 1 ${ntiles}); do
-    if [[ ${DO_JEDISNOWDA:-"NO"} = "YES" ]]; then
-        ${NCP} "${COM_SNOW_ANALYSIS}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" \
-               "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"
-    else
-        ${NCP} "${COM_ATMOS_RESTART_PREV}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" \
-               "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"
-    fi
-    ${NLN} "${COM_ATMOS_RESTART_PREV}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
+    ${NCP} "${src_dir}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" \
+           "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"
+    ${NLN} "${src_dir}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" "${DATA}/fnbgsi.00${n}"
     ${NLN} "${COM_ATMOS_RESTART}/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc"   "${DATA}/fnbgso.00${n}"
     ${NLN} "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc"                       "${DATA}/fngrid.00${n}"
     ${NLN} "${FIXgfs}/orog/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                   "${DATA}/fnorog.00${n}"

ush/python/pygfs/task/snow_analysis.py

@@ -299,7 +299,7 @@ def execute(self) -> None:
         keys = ['HOMEgfs', 'DATA', 'current_cycle',
                 'COM_ATMOS_RESTART_PREV', 'COM_SNOW_ANALYSIS', 'APREFIX',
                 'SNOWDEPTHVAR', 'BESTDDEV', 'CASE', 'OCNRES', 'ntiles',
-                'APRUN_SNOWANL', 'JEDIEXE', 'jedi_yaml',
+                'APRUN_SNOWANL', 'JEDIEXE', 'jedi_yaml', 'DOIAU', 'SNOW_WINDOW_BEGIN',
                 'APPLY_INCR_NML_TMPL', 'APPLY_INCR_EXE', 'APRUN_APPLY_INCR']
         for key in keys:
             localconf[key] = self.task_config[key]
@@ -357,13 +357,19 @@ def finalize(self) -> None:
         FileHandler(yaml_copy).sync()
 
         logger.info("Copy analysis to COM")
-        template = f'{to_fv3time(self.task_config.current_cycle)}.sfc_data.tile{{tilenum}}.nc'
+        bkgtimes = []
+        if self.task_config.DOIAU:
+            # need both beginning and middle of window
+            bkgtimes.append(self.task_config.SNOW_WINDOW_BEGIN)
+        bkgtimes.append(self.task_config.current_cycle)
         anllist = []
-        for itile in range(1, self.task_config.ntiles + 1):
-            filename = template.format(tilenum=itile)
-            src = os.path.join(self.task_config.DATA, 'anl', filename)
-            dest = os.path.join(self.task_config.COM_SNOW_ANALYSIS, filename)
-            anllist.append([src, dest])
+        for bkgtime in bkgtimes:
+            template = f'{to_fv3time(bkgtime)}.sfc_data.tile{{tilenum}}.nc'
+            for itile in range(1, self.task_config.ntiles + 1):
+                filename = template.format(tilenum=itile)
+                src = os.path.join(self.task_config.DATA, 'anl', filename)
+                dest = os.path.join(self.task_config.COM_SNOW_ANALYSIS, filename)
+                anllist.append([src, dest])
         FileHandler({'copy': anllist}).sync()
 
         logger.info('Copy increments to COM')
@@ -542,6 +548,8 @@ def add_increments(config: Dict) -> None:
              APPLY_INCR_NML_TMPL
              APPLY_INCR_EXE
              APRUN_APPLY_INCR
+             DOIAU
+             SNOW_WINDOW_BEGIN
 
         Raises
         ------
@@ -553,38 +561,67 @@ def add_increments(config: Dict) -> None:
 
         # need backgrounds to create analysis from increments after LETKF
         logger.info("Copy backgrounds into anl/ directory for creating analysis from increments")
-        template = f'{to_fv3time(config.current_cycle)}.sfc_data.tile{{tilenum}}.nc'
+        bkgtimes = []
+        if config.DOIAU:
+            # want analysis at beginning and middle of window
+            bkgtimes.append(config.SNOW_WINDOW_BEGIN)
+        bkgtimes.append(config.current_cycle)
         anllist = []
-        for itile in range(1, config.ntiles + 1):
-            filename = template.format(tilenum=itile)
-            src = os.path.join(config.COM_ATMOS_RESTART_PREV, filename)
-            dest = os.path.join(config.DATA, "anl", filename)
-            anllist.append([src, dest])
+        for bkgtime in bkgtimes:
+            template = f'{to_fv3time(bkgtime)}.sfc_data.tile{{tilenum}}.nc'
+            for itile in range(1, config.ntiles + 1):
+                filename = template.format(tilenum=itile)
+                src = os.path.join(config.COM_ATMOS_RESTART_PREV, filename)
+                dest = os.path.join(config.DATA, "anl", filename)
+                anllist.append([src, dest])
         FileHandler({'copy': anllist}).sync()
 
-        logger.info("Create namelist for APPLY_INCR_EXE")
-        nml_template = config.APPLY_INCR_NML_TMPL
-        nml_data = Jinja(nml_template, config).render
-        logger.debug(f"apply_incr_nml:\n{nml_data}")
-
-        nml_file = os.path.join(config.DATA, "apply_incr_nml")
-        with open(nml_file, "w") as fho:
-            fho.write(nml_data)
-
-        logger.info("Link APPLY_INCR_EXE into DATA/")
-        exe_src = config.APPLY_INCR_EXE
-        exe_dest = os.path.join(config.DATA, os.path.basename(exe_src))
-        if os.path.exists(exe_dest):
-            rm_p(exe_dest)
-        os.symlink(exe_src, exe_dest)
-
-        # execute APPLY_INCR_EXE to create analysis files
-        exe = Executable(config.APRUN_APPLY_INCR)
-        exe.add_default_arg(os.path.join(config.DATA, os.path.basename(exe_src)))
-        logger.info(f"Executing {exe}")
-        try:
-            exe()
-        except OSError:
-            raise OSError(f"Failed to execute {exe}")
-        except Exception:
-            raise WorkflowException(f"An error occured during execution of {exe}")
+        if config.DOIAU:
+            logger.info("Copying increments to beginning of window")
+            template_in = f'snowinc.{to_fv3time(config.current_cycle)}.sfc_data.tile{{tilenum}}.nc'
+            template_out = f'snowinc.{to_fv3time(config.SNOW_WINDOW_BEGIN)}.sfc_data.tile{{tilenum}}.nc'
+            inclist = []
+            for itile in range(1, config.ntiles + 1):
+                filename_in = template_in.format(tilenum=itile)
+                filename_out = template_out.format(tilenum=itile)
+                src = os.path.join(config.DATA, 'anl', filename_in)
+                dest = os.path.join(config.DATA, 'anl', filename_out)
+                inclist.append([src, dest])
+            FileHandler({'copy': inclist}).sync()
+
+        # loop over times to apply increments
+        for bkgtime in bkgtimes:
+            logger.info("Processing analysis valid: {bkgtime}")
+            logger.info("Create namelist for APPLY_INCR_EXE")
+            nml_template = config.APPLY_INCR_NML_TMPL
+            nml_config = {
+                'current_cycle': bkgtime,
+                'CASE': config.CASE,
+                'DATA': config.DATA,
+                'HOMEgfs': config.HOMEgfs,
+                'OCNRES': config.OCNRES,
+            }
+            nml_data = Jinja(nml_template, nml_config).render
+            logger.debug(f"apply_incr_nml:\n{nml_data}")
+
+            nml_file = os.path.join(config.DATA, "apply_incr_nml")
+            with open(nml_file, "w") as fho:
+                fho.write(nml_data)
+
+            logger.info("Link APPLY_INCR_EXE into DATA/")
+            exe_src = config.APPLY_INCR_EXE
+            exe_dest = os.path.join(config.DATA, os.path.basename(exe_src))
+            if os.path.exists(exe_dest):
+                rm_p(exe_dest)
+            os.symlink(exe_src, exe_dest)
+
+            # execute APPLY_INCR_EXE to create analysis files
+            exe = Executable(config.APRUN_APPLY_INCR)
+            exe.add_default_arg(os.path.join(config.DATA, os.path.basename(exe_src)))
+            logger.info(f"Executing {exe}")
+            try:
+                exe()
+            except OSError:
+                raise OSError(f"Failed to execute {exe}")
+            except Exception:
+                raise WorkflowException(f"An error occured during execution of {exe}")