Add model_component variable to all

NOAA-EMC · May 29, 2024 · 9654412 · 9654412
1 parent 980a149
commit 9654412
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 32 deletions.
diff --git a/3dvar.yaml.j2 b/3dvar.yaml.j2
@@ -1,3 +1,6 @@
+# Set the model component to be used in later configuration
+{% set model_component = model_component|default('model_component') %}
+
 cost function:
 
   cost type: {{cost_type}}
@@ -9,35 +12,26 @@ cost function:
 
   geometry:
 {% filter indent(width=4) %}
-{% set geometry_background_file = geometry_background_file|default('geometry_background', true) ~ '.yaml.j2' %}
+{% set geometry_background_file = geometry_background_file|default(model_component ~ 'geometry_background', true) ~ '.yaml.j2' %}
 {% include geometry_background_file %}
 {% endfilter %}
 
   analysis variables: {{analysis_variables}}
 
   background:
 {% filter indent(width=4) %}
-{% set background_file = background_file|default('background', true) ~ '.yaml.j2' %}
+{% set background_file = background_file|default(model_component ~ 'background', true) ~ '.yaml.j2' %}
 {% include background_file %}
 {% endfilter %}
 
   background error:
 {% filter indent(width=4) %}
-{% set background_error_file = background_error_file|default('background_error', true) ~ '.yaml.j2' %}
+{% set background_error_file = background_error_file|default(model_component ~ 'background_error', true) ~ '.yaml.j2' %}
 {% include background_error_file %}
 {% endfilter %}
 
   observations:
-
-# There is a conditional here in case this 3DVar YAML is being used for EDA
-{% if obs_perturbations_file is defined %}
-    obs perturbations:
-{% filter indent(width=6) %}
-{% set obs_perturbations_file = obs_perturbations_file|default('obs_perturbations', true) ~ '.yaml.j2' %}
-{% include obs_perturbations_file %}
-{% endfilter %}
-{% endif %}
-
+    obs perturbations: {{ obs_perturbations | default(false, true) }}
     observers:
 {% for observation_from_jcb in observations %}
 {% if use_observer(observation_from_jcb) %}
@@ -54,7 +48,7 @@ variational:
 # Loop over outer loops
 {% for i in range(1, number_of_outer_loops+1) %}
 {% filter indent(width=2) %}
-{% set var_outer_loop_file = '3dvar_outer_loop_' + i|string + '.yaml.j2' %}
+{% set var_outer_loop_file = model_component ~ '3dvar_outer_loop_' + i|string + '.yaml.j2' %}
 {% include var_outer_loop_file %}
 {% endfilter %}
 {% endfor %}
@@ -71,30 +65,30 @@ final:
 {% if final_increment_to_latlon_file is defined %}
   increment to latlon:
 {% filter indent(width=4) %}
-{% set final_increment_to_latlon_file = final_increment_to_latlon_file|default('final_increment_to_latlon', true) ~ '.yaml.j2' %}
+{% set final_increment_to_latlon_file = final_increment_to_latlon_file|default(model_component ~ 'final_increment_to_latlon', true) ~ '.yaml.j2' %}
 {% include final_increment_to_latlon_file %}
 {% endfilter %}
 {% endif %}
 
 {% if final_analysis_to_latlon_file is defined %}
   analysis to latlon:
 {% filter indent(width=4) %}
-{% set final_analysis_to_latlon_file = final_analysis_to_latlon_file|default('final_analysis_to_latlon', true) ~ '.yaml.j2' %}
+{% set final_analysis_to_latlon_file = final_analysis_to_latlon_file|default(model_component ~ 'final_analysis_to_latlon', true) ~ '.yaml.j2' %}
 {% include final_analysis_to_latlon_file %}
 {% endfilter %}
 {% endif %}
 
 {% if final_increment_file is defined %}
   increment:
 {% filter indent(width=4) %}
-{% set final_increment_file = final_increment_file|default('final_increment', true) ~ '.yaml.j2' %}
+{% set final_increment_file = final_increment_file|default(model_component ~ 'final_increment', true) ~ '.yaml.j2' %}
 {% include final_increment_file %}
 {% endfilter %}
 {% endif %}
 
 # Optionally write out the final analysis
 {% if output_file is defined %}
 output:
-{% set output_file = output_file|default('output', true) ~ '.yaml.j2' %}
+{% set output_file = output_file|default(model_component ~ 'output', true) ~ '.yaml.j2' %}
 {% include output_file %}
 {% endif %}
diff --git a/hofx3d.yaml.j2 b/hofx3d.yaml.j2
@@ -1,21 +1,25 @@
+# Set the model component to be used in later configuration
+{% set model_component = model_component|default('model_component') %}
+
 time window:
   begin: '{{window_begin}}'
   length: '{{window_length}}'
   bound to include: '{{ bound_to_include | default("begin", true) }}'
 
 geometry:
 {% filter indent(width=2) %}
-{% set geometry_background_file = geometry_background_file|default('geometry_background', true) ~ '.yaml.j2' %}
+{% set geometry_background_file = geometry_background_file|default(model_component ~ 'geometry_background', true) ~ '.yaml.j2' %}
 {% include geometry_background_file %}
 {% endfilter %}
 
 state:
 {% filter indent(width=2) %}
-{% set background_file = background_file|default('background', true) ~ '.yaml.j2' %}
+{% set background_file = background_file|default(model_component ~ 'background', true) ~ '.yaml.j2' %}
 {% include background_file %}
 {% endfilter %}
 
 observations:
+  obs perturbations: {{ obs_perturbations | default(false, true) }}
   observers:
 {% for observation_from_jcb in observations %}
 {% if use_observer(observation_from_jcb) %}

diff --git a/hofx4d.yaml.j2 b/hofx4d.yaml.j2
@@ -1,3 +1,6 @@
+# Set the model component to be used in later configuration
+{% set model_component = model_component|default('model_component') %}
+
 time window:
   begin: '{{window_begin}}'
   length: '{{window_length}}'
@@ -6,23 +9,24 @@ forecast length: '{{window_length}}'
 
 geometry:
 {% filter indent(width=2) %}
-{% set geometry_background_file = geometry_background_file|default('geometry_background', true) ~ '.yaml.j2' %}
+{% set geometry_background_file = geometry_background_file|default(model_component ~ 'geometry_background', true) ~ '.yaml.j2' %}
 {% include geometry_background_file %}
 {% endfilter %}
 
 initial condition:
 {% filter indent(width=2) %}
-{% set initial_condition_file = initial_condition_file|default('initial_condition', true) ~ '.yaml.j2' %}
+{% set initial_condition_file = initial_condition_file|default(model_component ~ 'initial_condition', true) ~ '.yaml.j2' %}
 {% include initial_condition_file %}
 {% endfilter %}
 
 model:
-{% set model_file = model_file|default('model', true) ~ '.yaml.j2' %}
+{% set model_file = model_file|default(model_component ~ 'model', true) ~ '.yaml.j2' %}
 {% filter indent(width=2) %}
 {% include model_file %}
 {% endfilter %}
 
 observations:
+  obs perturbations: {{ obs_perturbations | default(false, true) }}
   observers:
 {% for observation_from_jcb in observations %}
 {% if use_observer(observation_from_jcb) %}

diff --git a/local_ensemble_da.yaml.j2 b/local_ensemble_da.yaml.j2
@@ -1,6 +1,9 @@
+# Set the model component to be used in later configuration
+{% set model_component = model_component|default('model_component') %}
+
 geometry:
 {% filter indent(width=2) %}
-{% set geometry_background_file = geometry_background_file|default('geometry_background', true) ~ '.yaml.j2' %}
+{% set geometry_background_file = geometry_background_file|default(model_component ~ 'geometry_background', true) ~ '.yaml.j2' %}
 {% include geometry_background_file %}
 {% endfilter %}
 
@@ -13,7 +16,7 @@ increment variables: {{increment_variables}}
 
 background:
 {% filter indent(width=2) %}
-{% set background_ensemble_file = background_ensemble_file|default('background_ensemble', true) ~ '.yaml.j2' %}
+{% set background_ensemble_file = background_ensemble_file|default(model_component ~ 'background_ensemble', true) ~ '.yaml.j2' %}
 {% include background_ensemble_file %}
 {% endfilter %}
 
@@ -104,7 +107,7 @@ driver:
 {% if driver_use_control_member %}
 control member:
 {% filter indent(width=2) %}
-{% set control_member_file = control_member_file|default('control_member', true) ~ '.yaml.j2' %}
+{% set control_member_file = control_member_file|default(model_component ~ 'control_member', true) ~ '.yaml.j2' %}
 {% include control_member_file %}
 {% endfilter %}
 {% endif %}
@@ -114,7 +117,7 @@ control member:
 {% if driver_save_posterior_mean or driver_save_posterior_ensemble %}
 output:
 {% filter indent(width=2) %}
-{% set posterior_output_file = posterior_output_file|default('posterior_output', true) ~ '.yaml.j2' %}
+{% set posterior_output_file = posterior_output_file|default(model_component ~ 'posterior_output', true) ~ '.yaml.j2' %}
 {% include posterior_output_file %}
 {% endfilter %}
 {% endif %}
@@ -124,7 +127,7 @@ output:
 {% if driver_save_prior_mean %}
 output mean prior:
 {% filter indent(width=2) %}
-{% set output_mean_prior_file = output_mean_prior_file|default('output_mean_prior', true) ~ '.yaml.j2' %}
+{% set output_mean_prior_file = output_mean_prior_file|default(model_component ~ 'output_mean_prior', true) ~ '.yaml.j2' %}
 {% include output_mean_prior_file %}
 {% endfilter %}
 {% endif %}
@@ -134,7 +137,7 @@ output mean prior:
 {% if driver_save_posterior_mean_increment %}
 output increment:
 {% filter indent(width=2) %}
-{% set output_increment_file = output_increment_file|default('output_increment', true) ~ '.yaml.j2' %}
+{% set output_increment_file = output_increment_file|default(model_component ~ 'output_increment', true) ~ '.yaml.j2' %}
 {% include output_increment_file %}
 {% endfilter %}
 {% endif %}
@@ -144,7 +147,7 @@ output increment:
 {% if driver_save_posterior_ensemble_increments %}
 output ensemble increments:
 {% filter indent(width=2) %}
-{% set output_ensemble_increments_file = output_ensemble_increments_file|default('output_ensemble_increments', true) ~ '.yaml.j2' %}
+{% set output_ensemble_increments_file = output_ensemble_increments_file|default(model_component ~ 'output_ensemble_increments', true) ~ '.yaml.j2' %}
 {% include output_ensemble_increments_file %}
 {% endfilter %}
 {% endif %}
@@ -154,7 +157,7 @@ output ensemble increments:
 {% if driver_save_prior_variance %}
 output variance prior:
 {% filter indent(width=2) %}
-{% set output_variance_prior_file = output_variance_prior_file|default('output_variance_prior', true) ~ '.yaml.j2' %}
+{% set output_variance_prior_file = output_variance_prior_file|default(model_component ~ 'output_variance_prior', true) ~ '.yaml.j2' %}
 {% include output_variance_prior_file %}
 {% endfilter %}
 {% endif %}
@@ -164,7 +167,7 @@ output variance prior:
 {% if driver_save_posterior_variance %}
 output variance posterior:
 {% filter indent(width=2) %}
-{% set output_variance_posterior_file = output_variance_posterior_file|default('output_variance_posterior', true) ~ '.yaml.j2' %}
+{% set output_variance_posterior_file = output_variance_posterior_file|default(model_component ~ 'output_variance_posterior', true) ~ '.yaml.j2' %}
 {% include output_variance_posterior_file %}
 {% endfilter %}
 {% endif %}