Updated job scripts of 3d advection settings.

bench/advection/convergence_3d/runs/README.rst

@@ -9,14 +9,11 @@ Used commands (local):
 
 Used commands (remote):
   ./build.sh 2>&1 | tee build.sh.log
-  ./gen_jobs
-  sbatch ../jobs/hex8r_o1.slurm
-  sbatch ../jobs/hex8r_o2.slurm
-  sbatch ../jobs/hex8r_o3.slurm
-  sbatch ../jobs/hex8r_o4.slurm
-  sbatch ../jobs/hex8r_o5.slurm
-  sbatch ../jobs/tet4_o1.slurm
-  sbatch ../jobs/tet4_o2.slurm
-  sbatch ../jobs/tet4_o3.slurm
-  sbatch ../jobs/tet4_o4.slurm
-  sbatch ../jobs/tet4_o5.slurm
+  sbatch jobs/hex8r_o1.slurm
+  sbatch jobs/hex8r_o2.slurm
+  sbatch jobs/hex8r_o3.slurm
+  sbatch jobs/tet4_o1.slurm
+  sbatch jobs/tet4_o2.slurm
+  sbatch jobs/tet4_o3.slurm
+  sbatch jobs/tet4_o4.slurm
+  sbatch jobs/tet4_o5.slurm

bench/advection/convergence_3d/runs/gen_jobs.js

@@ -31,7 +31,7 @@ const { exit } = require('process');
 
 for( var l_ty of ['hex8r', 'tet4'] ) {
   for( var l_or of [1, 2, 3, 4, 5] ) {
-    var l_job = 'jobs/submit_' + l_ty + '_o' + l_or + '.xml';
+    var l_job = 'jobs/submit_' + l_ty + '_o' + l_or + '.slurm';
 
     console.log( 'generating: ', l_job )
 

bench/advection/convergence_3d/runs/submit.njk

@@ -21,9 +21,9 @@
 # @section DESCRIPTION
 # Submits a batch jobs for the first order runs.
 ##
-#SBATCH -J conv_3d_{{i_elementType}}_o{{i_order}}
-#SBATCH -o conv_3d_{{i_elementType}}_o{{i_order}}.o%j
-#SBATCH -e conv_3d_{{i_elementType}}_o{{i_order}}.e%j
+#SBATCH -J {{i_elementType}}_o{{i_order}}
+#SBATCH -o {{i_elementType}}_o{{i_order}}.o%j
+#SBATCH -e {{i_elementType}}_o{{i_order}}.e%j
 #SBATCH -p normal
 #SBATCH -N 1
 #SBATCH -n 8
@@ -34,17 +34,15 @@ date
 
 OMP_NUM_THREADS=14
 
-cd ..
-mkdir o${{i_order}}
-cd o${{i_order}}
+cd ${SLURM_SUBMIT_DIR}
 
 for cfr in 1 4 8
 do
-  mkdir -p {{i_elementType}}_o${{i_order}}_${cfr}
-  cd {{i_elementType}}_o${{i_order}}_${cfr}
+  mkdir -p {{i_elementType}}_o{{i_order}}_${cfr}
+  cd {{i_elementType}}_o{{i_order}}_${cfr}
   ln -s ../../configs .
   ln -s ../../meshes .
-  ../run.sh -t {{i_elementType}} -e $(pwd)/../edge_{{i_elementType}}_o${{i_order}}_${cfr}
+  ../run.sh -t {{i_elementType}} -e $(pwd)/../edge_{{i_elementType}}_o{{i_order}}_${cfr}
   cd ..
 done