diff --git a/tools/HPC scripts/gprmax_openmp.sh b/tools/HPC scripts/gprmax_omp.sh similarity index 88% rename from tools/HPC scripts/gprmax_openmp.sh rename to tools/HPC scripts/gprmax_omp.sh index 22d93f0f..43237dc4 100644 --- a/tools/HPC scripts/gprmax_openmp.sh +++ b/tools/HPC scripts/gprmax_omp.sh @@ -1,8 +1,5 @@ -#!/bin/bash +#!/bin/sh ##################################################################################### -### Specify bash shell: -#$ -S /bin/bash - ### Change to current working directory: #$ -cwd @@ -13,10 +10,10 @@ #$ -m ea -M joe.bloggs@email.com ### Parallel environment ($NSLOTS): -#$ -pe OpenMP 8 +#$ -pe sharedmem 16 ### Job script name: -#$ -N test_openmp.sh +#$ -N gprmax_omp.sh ##################################################################################### ### Initialise environment module diff --git a/tools/HPC scripts/gprmax_openmp_mpi.sh b/tools/HPC scripts/gprmax_omp_mpi.sh similarity index 88% rename from tools/HPC scripts/gprmax_openmp_mpi.sh rename to tools/HPC scripts/gprmax_omp_mpi.sh index 3d1e096a..e6869c49 100644 --- a/tools/HPC scripts/gprmax_openmp_mpi.sh +++ b/tools/HPC scripts/gprmax_omp_mpi.sh @@ -1,8 +1,5 @@ -#!/bin/bash +#!/bin/sh ##################################################################################### -### Specify bash shell: -#$ -S /bin/bash - ### Change to current working directory: #$ -cwd @@ -12,11 +9,14 @@ ### Email options: #$ -m ea -M joe.bloggs@email.com +### Resource reservation: +#$ -R y + ### Parallel environment ($NSLOTS): -#$ -pe openmpi_fillup_mark2 800 +#$ -pe mpi 800 ### Job script name: -#$ -N test_mpi.sh +#$ -N gprmax_omp_mpi.sh ##################################################################################### ### Initialise environment module diff --git a/user_models/cylinder_Ascan_2D.out b/user_models/cylinder_Ascan_2D.out index be4a2d71..1b0d394c 100644 Binary files a/user_models/cylinder_Ascan_2D.out and b/user_models/cylinder_Ascan_2D.out differ diff --git a/user_models/cylinder_Bscan_2D_merged.out b/user_models/cylinder_Bscan_2D_merged.out deleted file mode 100644 index 956d61e1..00000000 Binary files a/user_models/cylinder_Bscan_2D_merged.out and /dev/null differ