Merge branch 'main' of github.com:illinois-ceesd/drivers_y3-prediction

scalability_test/scal1node_tioga.flux.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+#flux: --nodes=1
+#flux: --time=360
+#flux: --output=scal8.txt
+##BSUB -J scale4
+
+source ../emirge/config/activate_env.sh
+source ../emirge/mirgecom/scripts/mirge-testing-env.sh
+source ../scripts/multi_scalability.sh -p ../ -n 8 -N 1
+
+
+

scalability_test/scal2nodes_tioga.flux.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#flux: --nodes=2
+#flux: --time=60
+#flux: --output=scal16.txt
+
+source ../emirge/config/activate_env.sh
+source ../emirge/mirgecom/scripts/mirge-testing-env.sh
+source ../scripts/multi_scalability.sh -p ../ -s 16 -n 16 -N 2
+

scalability_test/scal4nodes_tioga.flux.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#flux: --nodes=4
+#flux: --time=120
+#flux: --output=scal32.txt
+
+source ../emirge/config/activate_env.sh
+source ../emirge/mirgecom/scripts/mirge-testing-env.sh
+source ../scripts/multi_scalability.sh -p ../ -s 32 -n 32 -N 4
+

scalability_test/scal8nodes_tioga.flux.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#flux: --nodes=8
+#flux: --time=60
+#flux: --output=scal64.txt
+
+source ../emirge/config/activate_env.sh
+source ../emirge/mirgecom/scripts/mirge-testing-env.sh
+source ../scripts/multi_scalability.sh -p ../ -s 64 -n 64 -N 8
+
+

scripts/multi_scalability.sh

@@ -10,6 +10,7 @@
 # -n => number of ranks to end with (default=16)
 
 NONOPT_ARGS=()
+
 while [[ $# -gt 0 ]]; do
     case $1 in
         -e|--env)
@@ -27,6 +28,11 @@ while [[ $# -gt 0 ]]; do
             shift 
             shift
             ;;
+        -N|--nnodes)
+            NUM_NODES="$2"
+            shift 
+            shift
+            ;;
         -s|--start)
             NUM_PROCS_1="$2"
             shift 
@@ -69,6 +75,7 @@ LOG_PATH=${LOG_PATH:-"log_data"}
 DRIVER_PATH=${DRIVER_PATH:-"."}
 NUM_PROCS=${NUM_PROCS:-"4"}
 NUM_PROCS_1=${NUM_PROCS_1:-"1"}
+NUM_NODES=${NUM_NODES:-""}
 INSTALL=${INSTALL:-"NO"}
 TEST_PATH=${TEST_PATH:-"scalability_test"}
 
@@ -183,9 +190,14 @@ while [ $nrank -le $NUM_PROCS ]; do
     rm actii.msh
     ./mkmsh --size=${msize} --nelem=${nelem} --link
     cd ../
-
+    rm -f run_params_np${nrank}.yaml
+    sed "s|mesh_filename: .*|mesh_filename: data/actii_np${nrank}.msh|" run_params.yaml > run_params_np${nrank}.yaml
     set -x
-    $MPI_EXEC -n ${nrank} $PARALLEL_SPAWNER python -u -O -m mpi4py driver.py -c ${casename} -g ${LOG_PATH} -i run_params.yaml --log --lazy
+    runoptions="-n ${nrank}"
+    if [[ ! -z ${NUM_NODES} ]];then
+        runoptions="-N ${NUM_NODES} -n ${nrank}"
+    fi
+    $MPI_EXEC ${runoptions} $PARALLEL_SPAWNER python -u -O -m mpi4py driver.py -c ${casename} -g ${LOG_PATH} -i run_params_np${nrank}.yaml --log --lazy
     return_code=$?
     set +x