Merge branch 'fix/if_blocks' of github.com:davidhuber-noaa/global-wor…

…kflow into fix/if_blocks * 'fix/if_blocks' of github.com:davidhuber-noaa/global-workflow: Simplify build scripts
DavidHuber-NOAA · Feb 20, 2025 · 9d68203 · 9d68203
2 parents d29ec6f + 86ba57e
commit 9d68203
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/sorc/build_compute.sh b/sorc/build_compute.sh
@@ -87,7 +87,7 @@ finished=false
 ${runcmd}
 echo "Running builds on compute nodes"
 while [[ "${finished}" == "false" ]]; do
-   sleep 3m
+   sleep 1m
    ${runcmd}
    state="$("${HOMEgfs}/ci/scripts/utils/rocotostat.py" -w "${build_xml}" -d "${build_db}")"
    if [[ "${verbose_opt}" == "true" ]]; then

diff --git a/workflow/build_compute.py b/workflow/build_compute.py
@@ -63,7 +63,7 @@ def get_task_spec(task_name: str, task_spec: Dict, host_spec: Dict) -> Dict:
     task_dict.task_name = task_name
     task_dict.cycledef = "build"
     task_dict.maxtries = 1
-    task_dict.command = f"cd {HOMEgfs}/sorc/; {task_spec.command}"
+    task_dict.command = f"cd {HOMEgfs}/sorc/; {task_spec.command} -j {task_spec.cores}"
     task_dict.job_name = task_name
     task_dict.log = f"{HOMEgfs}/sorc/logs/{task_name}.log"
 

diff --git a/workflow/build_opts.yaml b/workflow/build_opts.yaml
@@ -22,61 +22,61 @@ systems:
     - "gefs_ww3_prepost"
 build:
   gfs_model:
-    command: "./build_ufs.sh -e gfs_model.x -j 12"
+    command: "./build_ufs.sh -e gfs_model.x"
     cores: 12
     walltime: "00:30:00"
 
   gfs_ww3prepost:
-    command: "./build_ww3prepost.sh -j 4"
+    command: "./build_ww3prepost.sh"
     cores: 4
     walltime: "00:10:00"
 
   gefs_model:
-    command: "./build_ufs.sh -w -e gefs_model.x -j 12"
+    command: "./build_ufs.sh -w -e gefs_model.x"
     cores: 12
     walltime: "00:30:00"
 
   gefs_ww3_prepost:
-    command: "./build_ww3prepost.sh -w -j 4"
+    command: "./build_ww3prepost.sh -w"
     cores: 4
     walltime: "00:10:00"
 
   sfs_model:
-    command: "./build_ufs.sh -y -e sfs_model.x -j 12"
+    command: "./build_ufs.sh -y -e sfs_model.x"
     cores: 12
     walltime: "00:30:00"
 
   upp:
-    command: "./build_upp.sh -j 8"
+    command: "./build_upp.sh"
     cores: 8
     walltime: "00:10:00"
 
   gsi_enkf:
-    command: "./build_gsi_enkf.sh -j 8"
+    command: "./build_gsi_enkf.sh"
     cores: 8
     walltime: "00:15:00"
 
   gsi_monitor:
-    command: "./build_gsi_monitor.sh -j 4"
+    command: "./build_gsi_monitor.sh"
     cores: 4
     walltime: "00:10:00"
 
   gsi_utils:
-    command: "./build_gsi_utils.sh -j 6"
+    command: "./build_gsi_utils.sh"
     cores: 6
     walltime: "00:10:00"
 
   ufs_utils:
-    command: "./build_ufs_utils.sh -j 8"
+    command: "./build_ufs_utils.sh"
     cores: 8
     walltime: "00:10:00"
 
   gfs_utils:
-    command: "./build_gfs_utils.sh -j 6"
+    command: "./build_gfs_utils.sh"
     cores: 6
     walltime: "00:10:00"
 
   gdas:
-    command: "./build_gdas.sh -j 24"
-    cores: 24
+    command: "./build_gdas.sh"
+    cores: 40
     walltime: "01:30:00"