Modifying PE_MEMBER01 so that it corresponds to the number of procs

needed by the run_fcst task

Author: mkavulich

ush/config_defaults.yaml

@@ -1836,7 +1836,7 @@ task_run_fcst:
   #
   QUILTING: true
 
-  PE_MEMBER01: !int '{{ task_run_fcst.fv3.execution.threads * (task_run_fcst.LAYOUT_Y * task_run_fcst.LAYOUT_X + task_run_fcst.WRTCMP_write_groups * task_run_fcst.WRTCMP_write_tasks_per_group) + fire.FIRE_NUM_TASKS if task_run_fcst.QUILTING else task_run_fcst.fv3.execution.threads * (task_run_fcst.LAYOUT_Y * task_run_fcst.LAYOUT_X) + fire.FIRE_NUM_TASKS }}'
+  PE_MEMBER01: !int '{{ task_run_fcst.fv3.execution.threads * (task_run_fcst.LAYOUT_Y * task_run_fcst.LAYOUT_X + task_run_fcst.WRTCMP_write_groups * task_run_fcst.WRTCMP_write_tasks_per_group) + (fire.FIRE_NUM_TASKS * fire.OMP_NUM_THREADS_FIRE) if task_run_fcst.QUILTING else task_run_fcst.fv3.execution.threads * (task_run_fcst.LAYOUT_Y * task_run_fcst.LAYOUT_X) + (fire.FIRE_NUM_TASKS * fire.OMP_NUM_THREADS_FIRE) }}'
 
   WRTCMP_write_groups: ""
   WRTCMP_write_tasks_per_group: ""

ush/create_ufs_configure_file.py

@@ -31,10 +31,16 @@ def create_ufs_configure_file(run_dir,cfg):
 
     # Set necessary variables for each coupled configuration
 
-    atm_end = str(int(cfg["PE_MEMBER01"]) - int(cfg["FIRE_NUM_TASKS"]) -1)
+    print(f"{cfg['PE_MEMBER01']=}")
+    print(f"{cfg['FIRE_NUM_TASKS']=}")
+    print(f"{cfg['OMP_NUM_THREADS_FIRE']=}")
+    atm_end = str(int(cfg["PE_MEMBER01"]) - int(cfg["FIRE_NUM_TASKS"] * cfg['OMP_NUM_THREADS_FIRE']) - 1)
     aqm_end = str(int(cfg["LAYOUT_X"]) * int(cfg["LAYOUT_Y"]) - 1)
-    fire_start = str(int(cfg["PE_MEMBER01"]) - int(cfg["FIRE_NUM_TASKS"]))
+    fire_start = str(int(cfg["PE_MEMBER01"]) - int(cfg["FIRE_NUM_TASKS"] * cfg['OMP_NUM_THREADS_FIRE']))
     fire_end = str(int(cfg["PE_MEMBER01"]) - 1)
+    print(f"{atm_end=}")
+    print(f"{fire_start=}")
+    print(f"{fire_end=}")
 
     atm_petlist_bounds = f'0 {atm_end}'
     if cfg["CPL_AQM"]: