From 467354e059261af6d9e33693faa2feaac5675d1a Mon Sep 17 00:00:00 2001
From: Galen Shipman <gshipman@lanl.gov>
Date: Wed, 18 Oct 2023 11:13:45 -0600
Subject: [PATCH] update parthenon nx values

---
 doc/sphinx/03_vibe/do_cpu_throughput.sh     | 10 +++++-----
 doc/sphinx/03_vibe/do_gpu_throughput.sh     |  2 +-
 doc/sphinx/03_vibe/do_strong_scaling_cpu.sh |  2 +-
 parthenon                                   |  2 +-
 sparta                                      |  2 +-
 trilinos                                    |  2 +-
 utils/pavilion                              |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/sphinx/03_vibe/do_cpu_throughput.sh b/doc/sphinx/03_vibe/do_cpu_throughput.sh
index ff855283..6dee173c 100755
--- a/doc/sphinx/03_vibe/do_cpu_throughput.sh
+++ b/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))
diff --git a/doc/sphinx/03_vibe/do_gpu_throughput.sh b/doc/sphinx/03_vibe/do_gpu_throughput.sh
index cfad025c..14046730 100755
--- a/doc/sphinx/03_vibe/do_gpu_throughput.sh
+++ b/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}
diff --git a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh b/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
index 01f45348..90462f76 100755
--- a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
+++ b/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}
diff --git a/parthenon b/parthenon
index c75ce20f..11c53d1c 160000
--- a/parthenon
+++ b/parthenon
@@ -1 +1 @@
-Subproject commit c75ce20f938a4adaedb4425584954c3e74d56868
+Subproject commit 11c53d1cd4ada0629e06d069b70b410234ed0bde
diff --git a/sparta b/sparta
index ca0ce28f..83d5f3a9 160000
--- a/sparta
+++ b/sparta
@@ -1 +1 @@
-Subproject commit ca0ce28fd76080d8b2828db77adde14fdc382c76
+Subproject commit 83d5f3a92c5fc0b59d4d973c6b1dddc4d77a7147
diff --git a/trilinos b/trilinos
index 5aaae1ad..f3ff0b54 160000
--- a/trilinos
+++ b/trilinos
@@ -1 +1 @@
-Subproject commit 5aaae1ada6fe1ce777e671a0ff84fdc4f0779406
+Subproject commit f3ff0b54c5158790295daff089ff0d286bda3c2c
diff --git a/utils/pavilion b/utils/pavilion
index f502ca86..69b2d45d 160000
--- a/utils/pavilion
+++ b/utils/pavilion
@@ -1 +1 @@
-Subproject commit f502ca86fa27f4bc894aa19232c9f1f42361e269
+Subproject commit 69b2d45d696e623127c106b50525ba65daa23d76