Make separate JCB algo yamls for CI tests

NOAA-EMC · Dec 2, 2024 · d907017 · d907017
1 parent 4af258c
commit d907017
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/ci/cases/yamls/soca_gfs_defaults_ci.yaml
@@ -4,3 +4,5 @@ base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_JEDIOCNVAR: "YES"
   DO_TEST_MODE: "YES"
+marineanl:
+  JCB_ALGO_YAML_VAR: "{{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/soca/jcb-prototype_3dfgat_C48mx500_3DVarAOWCDA.yaml.j2"
diff --git a/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml b/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
@@ -7,9 +7,15 @@ base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_TEST_MODE: "YES"
 atmanl:
+  JCB_ALGO_YAML_VAR: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_3dvar_C96C48_ufs_hybatmDA.yaml.j2"
+  JCB_ALGO_YAML_FV3INC: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_3dvar-fv3inc_C96C48_ufs_hybatmDA.yaml.j2"
   LAYOUT_X_ATMANL: 4
   LAYOUT_Y_ATMANL: 4
 atmensanl:
+  JCB_ALGO_YAML_LETKF: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_lgetkf_C96C48_ufs_hybatmDA.yaml.j2"
+  JCB_ALGO_YAML_OBS: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_lgetkf_observer_C96C48_ufs_hybatmDA.yaml.j2"
+  JCB_ALGO_YAML_SOL: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_lgetkf_solver_C96C48_ufs_hybatmDA.yaml.j2"
+  JCB_ALGO_YAML_FV3INC: "${HOMEgfs}/sorc/gdas/test/gw-ci/atm/jcb-prototype_lgetkf-fv3inc_C96C48_ufs_hybatmDA.yaml.j2"
   LAYOUT_X_ATMENSANL: 4
   LAYOUT_Y_ATMENSANL: 4
 esfc:

diff --git a/parm/config/gfs/config.marineanl b/parm/config/gfs/config.marineanl
@@ -6,6 +6,7 @@
 echo "BEGIN: config.marineanl"
 
 export JEDI_CONFIG_YAML="${PARMgfs}/gdas/soca_bmat_jedi_config.yaml.j2"
+export JCB_ALGO_YAML_VAR=@JCB_ALGO_YAML_VAR@
 
 export MARINE_OBS_YAML_DIR="${PARMgfs}/gdas/soca/obs/config"
 export MARINE_OBS_LIST_YAML=@SOCA_OBS_LIST@

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -54,6 +54,7 @@ marineanl:
   SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
   SOCA_OBS_LIST: "${PARMgfs}/gdas/soca/obs/obs_list.yaml"  # TODO: This is also repeated in oceanprepobs
   SOCA_NINNER: 100
+  JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/soca/marine-jcb-3dfgat.yaml.j2"
 
 prepoceanobs:
   SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"

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
@@ -225,7 +225,7 @@ def _prep_variational_yaml(self: Task) -> None:
         jcb_algo_yaml = os.path.join(self.task_config.PARMsoca, 'marine-jcb-3dfgat.yaml.j2')
 
         jcb_base_config = parse_j2yaml(jcb_base_yaml, envconfig_jcb)
-        jcb_algo_config = parse_j2yaml(jcb_algo_yaml, envconfig_jcb)
+        jcb_algo_config = parse_j2yaml(self.task_config.JCB_ALGO_YAML_VAR, envconfig_jcb)
 
         # Override base with the application specific config
         jcb_config = {**jcb_base_config, **jcb_algo_config}