Make JEDI cycling toggle switches YAML configurable and their names m…

…ore explicit (#1607) * make some JEDI cycling options configurable through YAML
NOAA-EMC · May 12, 2023 · 255d99b · 255d99b
1 parent a8edbc7
commit 255d99b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/parm/config/gefs/config.base.emc.dyn b/parm/config/gefs/config.base.emc.dyn
@@ -288,8 +288,8 @@ export imp_physics=@IMP_PHYSICS@
 
 # Shared parameters
 # DA engine
-export DO_JEDIVAR="NO"
-export DO_JEDIENS="NO"
+export DO_JEDIATMVAR="NO"
+export DO_JEDIATMENS="NO"
 export DO_JEDIOCNVAR="NO"
 export DO_JEDILANDDA="NO"
 export DO_MERGENSST="NO"

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
@@ -288,11 +288,11 @@ export imp_physics=@IMP_PHYSICS@
 
 # Shared parameters
 # DA engine
-export DO_JEDIVAR="NO"
-export DO_JEDIENS="NO"
-export DO_JEDIOCNVAR="NO"
-export DO_JEDILANDDA="NO"
-export DO_MERGENSST="NO"
+export DO_JEDIATMVAR="@DO_JEDIATMVAR@"
+export DO_JEDIATMENS="@DO_JEDIATMENS@"
+export DO_JEDIOCNVAR="@DO_JEDIOCNVAR@"
+export DO_JEDILANDDA="@DO_JEDILANDDA@"
+export DO_MERGENSST="@DO_MERGENSST@"
 
 # Hybrid related
 export DOHYBVAR="@DOHYBVAR@"

diff --git a/parm/config/gfs/config.base.nco.static b/parm/config/gfs/config.base.nco.static
@@ -193,8 +193,8 @@ export imp_physics=8
 
 # Shared parameters
 # DA engine
-export DO_JEDIVAR="NO"
-export DO_JEDIENS="NO"
+export DO_JEDIATMVAR="NO"
+export DO_JEDIATMENS="NO"
 
 # Hybrid related
 export DOHYBVAR="YES"

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -1,3 +1,9 @@
+base:
+  DO_JEDIATMVAR: "NO"
+  DO_JEDIATMENS: "NO"
+  DO_JEDIOCNVAR: "NO"
+  DO_JEDILANDDA: "NO"
+  DO_MERGENSST: "NO"
 aeroanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1

diff --git a/workflow/applications.py b/workflow/applications.py
@@ -106,8 +106,8 @@ def __init__(self, conf: Configuration) -> None:
         self.do_vrfy = _base.get('DO_VRFY', True)
         self.do_fit2obs = _base.get('DO_FIT2OBS', True)
         self.do_metp = _base.get('DO_METP', False)
-        self.do_jediatmvar = _base.get('DO_JEDIVAR', False)
-        self.do_jediatmens = _base.get('DO_JEDIENS', False)
+        self.do_jediatmvar = _base.get('DO_JEDIATMVAR', False)
+        self.do_jediatmens = _base.get('DO_JEDIATMENS', False)
         self.do_jediocnvar = _base.get('DO_JEDIOCNVAR', False)
         self.do_jedilandda = _base.get('DO_JEDILANDDA', False)
         self.do_mergensst = _base.get('DO_MERGENSST', False)