Merge branch 'master' into save_seed

AlexJamesWright · Mar 26, 2021 · 46345e6 · 46345e6
2 parents 568e697 + e060205
commit 46345e6
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 132 deletions.
diff --git a/METHODAdvert.gif b/METHODAdvert.gif
diff --git a/Scripts/IridisEnv/examples_cpu_job.sh b/Scripts/IridisEnv/examples_cpu_job.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# This script submits a Southampton Iridis5 batch job running on 
+# 4 procs for the example in Examples/KelvinHelmholtz/SingleFluidIdealRandomMPIHDF5
+
+# Note the seed after the ./main command would need removing for non-random cases.
+# (KelvinHelmholtz/SingleFluidIdealMPI)
+
 #SBATCH --ntasks-per-node=4     # Tasks per node
 #SBATCH --nodes=1                # Number of nodes requested
 #SBATCH --time=00:10:00          # walltime

diff --git a/Scripts/IridisEnv/tests_job_cpu.sh b/Scripts/IridisEnv/tests_job_cpu.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script submits a Southampton Iridis5 batch job for the cpu tests
+# in Tests/CPU
+
 #SBATCH --ntasks-per-node=4     # Tasks per node
 #SBATCH --nodes=1                # Number of nodes requested
 #SBATCH --time=00:10:00          # walltime
@@ -11,10 +14,17 @@ module load hdf5/1.10.2/gcc/parallel
 #module load hdf5/1.10.2/gcc/serial
 
 module list
-
 source ../../venv/bin/activate
 
-export PYTHONPATH=$PYTHONPATH:../../Scripts:/home/amb1u19/METHOD_branches/METHOD_dev_hdf5/Scripts
+# -------------- PARAMETERS USERS NEED TO EDIT -------------------
+
+# Enter absolute path to METHOD/Scripts directory here
+SCRIPT_DIR=/absolute/path/to/method/root/Scripts
+
+# -----------------------------------------------------------------
+
+# Let python find the scripts for comparing hdf5 files
+export PYTHONPATH=$PYTHONPATH:$SCRIPT_DIR
 
 gcc --version
 make clean

diff --git a/Scripts/IridisEnv/tests_job_gpu.sh b/Scripts/IridisEnv/tests_job_gpu.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script submits a Southampton Iridis5 batch job for the gpu tests
+# in Tests/GPU
+
 #SBATCH --ntasks-per-node=2     # Tasks per node
 #SBATCH --nodes=1                # Number of nodes requested
 #SBATCH --partition=gtx1080
@@ -15,7 +18,15 @@ module list
 
 source ../../venv/bin/activate
 
-export PYTHONPATH=$PYTHONPATH:../../Scripts:/home/amb1u19/METHOD_branches/METHOD_dev_hdf5/Scripts
+# -------------- PARAMETERS USERS NEED TO EDIT -------------------
+
+# Enter absolute path to METHOD/Scripts directory here
+SCRIPT_DIR=/absolute/path/to/method/root/Scripts
+
+# -----------------------------------------------------------------
+
+# Let python find the scripts for comparing hdf5 files
+export PYTHONPATH=$PYTHONPATH:$SCRIPT_DIR
 
 make clean
 make gpu_test