Merge branch 'lanl:main' into main

.gitmodules

@@ -4,19 +4,20 @@
 	branch = ats5
 [submodule "umt"]
 	path = umt
-	url = https://github.com/LLNL/UMT.git
+	url = git@github.com:LLNL/UMT.git
 [submodule "trilinos"]
 	path = trilinos
-	url = https://github.com/trilinos/Trilinos.git
+	url = git@github.com:trilinos/Trilinos.git
 [submodule "sparta"]
 	path = sparta
-	url = https://github.com/sparta/sparta.git
+	url = git@github.com:sparta/sparta.git
 [submodule "parthenon"]
 	path = parthenon
-	url = https://github.com/parthenon-hpc-lab/parthenon.git
-[submodule "spatter"]
-	path = spatter
-	url = [email protected]:lanl/spatter.git
+	url = [email protected]:parthenon-hpc-lab/parthenon.git
 [submodule "utils/pavilion"]
 	path = utils/pavilion
 	url = [email protected]:hpc/pavilion2.git
+[submodule "microbenchmarks/spatter"]
+	path = microbenchmarks/spatter
+	url = [email protected]:lanl/spatter.git
+	branch = main

doc/sphinx/03_vibe/do_cpu_throughput.sh

@@ -22,7 +22,7 @@ count=${NP}
 
 #BEGIN Do not change the following for official benchmarking 
 NXB=16
-NLIM=10
+NLIM=250
 NLVL=3
 #END
 
@@ -33,7 +33,7 @@ TIMING_FILE_NAME="cpu_throughput.csv"
 EXEC=./burgers-benchmark # executable
 INP=../../../benchmarks/burgers/burgers.pin
 
-HEADER="No. Cores, Actual"
+HEADER="No. Cores, Size, Actual"
 echo "Saving timing to ${TIMING_FILE_NAME}"
 echo "${HEADER}"
 echo "${HEADER}" > ${TIMING_FILE_NAME}
@@ -46,14 +46,14 @@ for NX in 32 64 96 128 160 192; do
 	outfile=$(printf "strong-scale-%d-%d.out" ${NX} ${count})
 	errfile=$(printf "strong-scale-%d-%d.err" ${NX} ${count})
 	echo "saving to output file ${outfile}"
-	ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
-	CMD="srun --cpu-bind=ldoms -n ${NP} -c ${NT} -o ${outfile} -e ${errfile} ${ARGS}"
+	ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+	CMD="srun -n ${NP} --hint=nomultithread -o ${outfile} -e ${errfile} ${ARGS}"
 	echo ${CMD}
 	${CMD}
 	wait
 	zc=$(grep 'zone-cycles/wallsecond = ' ${outfile} | cut -d '=' -f 2 | xargs)
 	echo ${zc}
-	OUTSTR="${count}, ${zc}"
+	OUTSTR="${count},${NX},${zc}"
 	echo "${OUTSTR}"
 	echo "${OUTSTR}" >> ${TIMING_FILE_NAME}
 	i=$((${i} + 1))

doc/sphinx/03_vibe/do_gpu_throughput.sh

@@ -24,7 +24,7 @@ for NX in 32 64 96 128 160 192; do
     echo "Mesh base size = ${NX}"
     outfile=$(printf "gpu-throughput-%d.out" ${NX})
     echo "saving to output file ${outfile}"
-    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
     CMD="${ARGS} | tee ${outfile}"
     echo ${CMD}
     ${ARGS} | tee ${outfile}

doc/sphinx/03_vibe/do_strong_scaling_cpu.sh

@@ -40,7 +40,7 @@ for count in  8 32 56 88 112; do
     outfile=$(printf "strong-scale-%d.out" ${count})
     errfile=$(printf "strong-scale-%d.err" ${count})
     echo "saving to output file ${outfile}"
-    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
     CMD="srun -n ${count} --hint=nomultithread  -o ${outfile} -e ${errfile} ${ARGS}"
     echo ${CMD}
     ${CMD}