resolved conflicts and updates, still testing

NOAA-GSL · Oct 29, 2024 · 70bdfb4 · 70bdfb4
2 parents e3e522f + 03489e7
commit 70bdfb4
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/ush/setup.py b/ush/setup.py
@@ -146,6 +146,16 @@ def load_config_for_setup(ushdir, default_config_path, user_config_path):
     ccpp_config = get_yaml_config(ushdir / "ccpp_suites_defaults.yaml").get(ccpp_suite, {})
     default_config.update_from(ccpp_config)
 
+    # Load external model-specific settings
+    tasks = [("task_get_extrn_ics", "EXTRN_MDL_NAME_ICS", "task_make_lbcs"),
+        ("task_get_extrn_lbcs", "EXTRN_MDL_NAME_LBCS", "task_make_ics")]
+
+    for task, mdl_key, make_key in tasks:
+        extrn_mdl = cfg_d[task][mdl_key]
+        extrn_cfg = get_yaml_config(Path(ushdir, "external_model_defaults.yaml")).get(extrn_mdl, {})
+        del extrn_cfg[make_key]
+        update_dict(extrn_cfg, cfg_d)
+
     # Load external model-specific settings
     tasks = [("task_get_extrn_ics", "EXTRN_MDL_NAME_ICS", "task_make_lbcs"),
         ("task_get_extrn_lbcs", "EXTRN_MDL_NAME_LBCS", "task_make_ics")]