From 56beea43be04968c72740e17f44d3cfeb0d5add6 Mon Sep 17 00:00:00 2001
From: Jonathan Frawley <jonathan.frawley@durham.ac.uk>
Date: Thu, 21 Jan 2021 14:18:10 +0000
Subject: [PATCH] Fix minor issues

---
 benchmark-fast/job-aps.sh | 13 +++++++++----
 benchmark-fast/job-arm.sh |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/benchmark-fast/job-aps.sh b/benchmark-fast/job-aps.sh
index 15d174f..9dba62f 100644
--- a/benchmark-fast/job-aps.sh
+++ b/benchmark-fast/job-aps.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-#SBATCH --job-name="rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job"
+#SBATCH --job-name="swiftaps"
 #SBATCH --ntasks=1
 #SBATCH --ntasks-per-node=1
-#SBATCH --output=rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job.out
-#SBATCH --error=rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job.err
+#SBATCH --output=swiftaps.out
+#SBATCH --error=swiftaps.err
 #SBATCH --time=0:40:0
 #SBATCH -p bluefield1 
 ##SBATCH -A durham
@@ -18,10 +18,15 @@ module load gsl/2.4
 module load fftw/3.3.8epyc
 module load python/3.6.5
 module load vtune
+
+
 pushd swiftsim/examples/PMillennium/PMillennium-768
 
 #mpirun -np 1 ../../swift_mpi --pin --cosmology --self-gravity -v 1 --threads=32 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml
 #mpirun -np 1 ../../swift_mpi --cosmology --self-gravity -v 1 --threads=32 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml
 
-mpirun -np 1 aps --collection-mode=mpi,omp ../../swift_mpi --cosmology --self-gravity -v 1 --threads=32 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml
+export MPS_STAT_LEVEL=2
+export APS_ARGS="--collection-mode=mpi,omp"
+
+mpirun -np 1 aps $APS_ARGS ../../swift_mpi --cosmology --self-gravity -v 1 --threads=32 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml
 
diff --git a/benchmark-fast/job-arm.sh b/benchmark-fast/job-arm.sh
index 11ebb5c..fe63649 100644
--- a/benchmark-fast/job-arm.sh
+++ b/benchmark-fast/job-arm.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-#SBATCH --job-name="rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job"
+#SBATCH --job-name="swiftarm"
 #SBATCH --ntasks=1
 #SBATCH --ntasks-per-node=1
-#SBATCH --output=rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job.out
-#SBATCH --error=rfm_PMillenium768SingleMultiRanksBenchmarkTest_1_128_job.err
+#SBATCH --output=swiftaps.out
+#SBATCH --error=swiftaps.err
 #SBATCH --time=0:40:0
 #SBATCH -p bluefield1 
 ##SBATCH -A durham
-- 
GitLab