Make nodes and tasks configurable per job

blueprints/test_chemistry/config.bash

@@ -97,3 +97,11 @@ chembcInpFile=waccm.inp
 
 # TUV photolysis option 4 data file
 TUVDataPath="/alcc/gpfs2/home/mbees/data/tuv/TUV.phot.bz2"
+
+# --- overriding default values ---
+
+nNodesMain=1
+nTasksPerNodeMain=7
+
+nNodesSpinup=1
+nTasksPerNodeSpinup=7

machine_profiles/alcc_spack/batch_preambles/main

@@ -5,8 +5,8 @@
 #SBATCH -o __runDir__/__mainJobName__.%j.%N.out
 #SBATCH -D __runDir__
 #SBATCH -J __mainJobName__
-#SBATCH --nodes=3
-#SBATCH --ntasks-per-node=28
+#SBATCH --nodes=__nNodesMain__
+#SBATCH --ntasks-per-node=__nTasksPerNodeMain__
 #SBATCH --mem-per-cpu=2000
 #SBATCH --mail-type=FAIL
 #SBATCH --mail-user=christoph.knote@med.uni-augsburg.de

machine_profiles/alcc_spack/batch_preambles/spinup

@@ -4,8 +4,8 @@
 #SBATCH -o __runDir__/__spinupJobName__.%j.%N.out
 #SBATCH -D __runDir__
 #SBATCH -J __spinupJobName__
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=28
+#SBATCH --nodes=__nNodesSpinup__
+#SBATCH --ntasks-per-node=__nTasksPerNodeSpinup__
 #SBATCH --mem-per-cpu=2000
 #SBATCH --mail-type=FAIL
 #SBATCH --mail-user=christoph.knote@med.uni-augsburg.de

machine_profiles/alcc_spack/profile.bash

@@ -15,6 +15,12 @@ mpiCommandPre="mpirun"
 mpiCommandMain="mpirun"
 mpiCommandReal=${mpiCommandPre}
 
+nNodesMain=3
+nTasksPerNodeMain=28
+
+nNodesSpinup=1
+nTasksPerNodeSpinup=28
+
 # --- Batch system ---
 
 # argument to submit a job in a held state

master.bash

@@ -267,6 +267,10 @@ s/__refDateTxt__/${dateTxt}/g
 s/__domains__/${max_dom}/g
 s/__removeRunDir__/${removeRunDir}/g
 s/__metIncSec__/${metIncSec}/g
+s/__nNodesMain__/${nNodesMain}/g
+s/__nTasksPerNodeMain__/${nTasksPerNodeMain}/g
+s/__nNodesSpinup__/${nNodesSpinup}/g
+s/__nTasksPerNodeSpinup__/${nTasksPerNodeSpinup}/g
 EOF
 
 # real run from -spinup to +fcstTime