Passing fundamental tests.

christinaholtNOAA · Feb 28, 2025 · 926c426 · 926c426
1 parent 3541df0
commit 926c426
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/parm/wflow/plot.yaml b/parm/wflow/plot.yaml
@@ -31,7 +31,6 @@ metatask_plot_allvars:
         nprocs: '{{ task_plot_allvars.execution.batchargs.nodes * task_plot_allvars.execution.batchargs.tasks_per_node }}'
         fhr: '#fhr#'
       native: '{{ platform.SCHED_NATIVE_CMD }}'
-      cores: !int '{{ task_plot_allvars.execution.batchargs.cores }}'
       nodes: '{{ task_plot_allvars.execution.batchargs.nodes }}:ppn={{ task_plot_allvars.execution.batchargs.tasks_per_node }}'
       exclusive: '{{ task_plot_allvars.execution.batchargs.exclusive }}'
       partition: '{{ "&PARTITION_DEFAULT;" if platform.get("PARTITION_DEFAULT") }}'

diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml
@@ -53,7 +53,6 @@ rocoto:
       native:
     metatask_run_ensemble:
       task_run_fcst_mem#mem#:
-        cores:
         native: '{{ platform.SCHED_NATIVE_CMD }}'
         nodes: '{{ nnodes }}:ppn={{ ppn }}:tpp={{ task_run_fcst.fv3.execution.threads // 1 }}'
         nodesize: '{{ platform.NCORES_PER_NODE }}'

diff --git a/ush/setup.py b/ush/setup.py
@@ -681,12 +681,12 @@ def _remove_tag(tasks, tag):
             obs_basedirs_orig = list(obs_basedirs_dict.values())
             obs_basedirs_uniq = list(set(obs_basedirs_orig))
             if len(obs_basedirs_orig) != len(obs_basedirs_uniq):
-                obs_locations = [f"{v} = {p}" for v, p in obs_basedirs_dict.items()]
+                obs_locations = "\n".join([f"{v} = {p}" for v, p in obs_basedirs_dict.items()])
                 msg = dedent(
                     f"""
                     The base directories for the obs files must be distinct, but at least two
                     are identical:
-                    {"\n".join(obs_locations)}
+                    {obs_locations}
 
                     Modify these in the SRW App's user configuration file to make them distinct
                     and rerun.