fv3-schema-update (#405)

ufs-community · Feb 7, 2024 · b8c2081 · b8c2081
1 parent bd64cb0
commit b8c2081
Show file tree

Hide file tree

Showing 9 changed files with 632 additions and 127 deletions.
diff --git a/docs/sections/user_guide/uw_yaml/forecast_yaml.rst b/docs/sections/user_guide/uw_yaml/forecast_yaml.rst
@@ -198,7 +198,7 @@ The MPI command used to run the model executable. Typical options are ``srun``,
 
 ``scheduler:``
 ^^^^^^^^^^^^^^
-The name of the batch system. Supported options are ``lfs``, ``pbs``, and ``slurm``.
+The name of the batch system. Supported options are ``lsf``, ``pbs``, and ``slurm``.
 
 The ``preprocessing:`` block
 ----------------------------

diff --git a/src/uwtools/drivers/driver.py b/src/uwtools/drivers/driver.py
@@ -85,8 +85,10 @@ def run_cmd(self) -> str:
         :return: Collated string that contains MPI command, runtime arguments, and exec name.
         """
         components = [
-            self._platform_config.get("mpicmd"),  # MPI run program
-            *[str(x) for x in self._config["runtime_info"].get("mpi_args", [])],  # MPI arguments
+            self._platform_config["mpicmd"],  # MPI run program
+            *[
+                str(x) for x in self._config.get("runtime_info", {}).get("mpi_args", [])
+            ],  # MPI arguments
             self._config["executable"],  # NWP tool executable name
         ]
         return " ".join(filter(None, components))
@@ -149,28 +151,22 @@ def _create_user_updated_config(
         config_class: Type[Config], config_values: dict, output_path: OptionalPath
     ) -> None:
         """
-        The standard procedure for updating a file of a configuration class type with user-provided
-        values.
+        Create a config from a base file, user-provided values, of a combination of the two.
 
-        :param config_class: The Config subclass matching the configure file type.
-        :param config_values: The in-memory configuration object to update base values with.
+        :param config_class: The Config subclass matching the config type.
+        :param config_values: The configuration object to update base values with.
         :param output_path: Optional path to dump file to.
         """
-
-        # User-supplied values that override any settings in the base
-        # file.
         user_values = config_values.get("update_values", {})
-
         if base_file := config_values.get("base_file"):
             config_obj = config_class(base_file)
             config_obj.update_values(user_values)
             config_obj.dereference()
             config_obj.dump(output_path)
         else:
             config_class.dump_dict(cfg=user_values, path=output_path)
-
-        msg = f"Configure file {output_path} created"
-        log.info(msg)
+        if output_path:
+            log.info(f"Wrote config to {output_path}")
 
     def _validate(self) -> bool:
         """

diff --git a/src/uwtools/drivers/forecast.py b/src/uwtools/drivers/forecast.py
@@ -164,7 +164,7 @@ def resources(self) -> Mapping:
         """
 
         return {
-            "account": self._experiment_config["user"]["account"],
+            "account": self._experiment_config["platform"]["account"],
             "scheduler": self._experiment_config["platform"]["scheduler"],
             **self._config["jobinfo"],
         }
@@ -238,7 +238,7 @@ def _mpi_env_variables(self, delimiter: str = " ") -> str:
         """
         envvars = {
             "KMP_AFFINITY": "scatter",
-            "OMP_NUM_THREADS": self._config["runtime_info"].get("threads", 1),
+            "OMP_NUM_THREADS": self._config.get("runtime_info", {}).get("threads", 1),
             "OMP_STACKSIZE": "512m",
             "MPI_TYPE_DEPTH": 20,
             "ESMF_RUNTIME_COMPLIANCECHECK": "OFF:depth=4",