Merge branch 'feeature/swartz-alternative' of...

Merge branch 'feeature/swartz-alternative' of bitbucket.org:tmaric/geomtransport into feeature/swartz-alternative

simulation-cases/verification/transport/advection/3Ddeformation/3Ddeformation-errors-analyze.py

@@ -41,7 +41,7 @@ def main():
 
     print(latexData)
 
-    tableFileName = table_file_name(templateCaseName)
+    tableFileName = table_file_name(templateCaseName, pattern)
 
     latexFile = open(tableFileName + ".tex", "w")
     latexFile.write(latexData)

simulation-cases/verification/transport/advection/3Ddeformation/Allrun.slurm

@@ -11,9 +11,14 @@ then
     exit 1
 fi
 
-# FIXME: Extract the special hex generation for large cases. TM 
 voFoamParameterInit $CASE $CASE.parameter $PATTERN  && \
-sed -i 's/256 256 256/128 128 128/g' "$PATTERN"_00003_voFoam-hex-deformation3D/system/blockMeshDict &&
+
+LARGE_CASE_DIR="$PATTERN"_00003_voFoam-hex-deformation3D
+
+if [ -d  "$LARGE_CASE_DIR" ]; 
+then 
+    sed -i 's/256 256 256/128 128 128/g' $LARGE_CASE_DIR/system/blockMeshDict 
+fi
 
 for case in "$PATTERN"*;
 do 
@@ -22,6 +27,7 @@ do
     echo sbatch --parsable ../00-mesh.sbatch 2>&1
     MESH=$(sbatch --parsable ../00-mesh.sbatch 2>&1) 
 
+
     echo sbatch --parsable --dependency=afterok:"$MESH" ../01-decomp.sbatch  2>&1 
     DECOMPOSE=$(sbatch --parsable --dependency=afterok:"$MESH" ../01-decomp.sbatch 2>&1) 
 

simulation-cases/verification/transport/advection/3Ddeformation/voFoam-hex-deformation3D.parameter

@@ -9,6 +9,6 @@ values
 
     N 
     ( 
-        32 64 128 256
+        32 64 128
     );
 }

simulation-cases/verification/transport/advection/3Dshear/3Dshear-errors-analyze.py

@@ -35,7 +35,7 @@ def main():
 
     print(latexData)
 
-    tableFileName = table_file_name(templateCaseName) 
+    tableFileName = table_file_name(templateCaseName, pattern) 
 
     latexFile = open(tableFileName + ".tex", "w")
     latexFile.write(latexData)