tutorials: circuitBoardCooling: Make the test loop run both extrusion strategies

tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces

@@ -0,0 +1,18 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh -region fluid
+
+# Create the 3D baffle
+runApplication topoSet -region fluid
+runApplication extrudeToRegionMesh -region fluid -overwrite \
+    -dict system/fluid/extrudeToRegionMeshDict.extrudeFromInternalFaces
+
+# Create the 1D baffle
+runApplication -s baffle1D createBaffles -region fluid -overwrite \
+    -dict system/fluid/createBafflesDict.baffle1D
+
+#------------------------------------------------------------------------------

tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches

@@ -7,16 +7,13 @@ cd ${0%/*} || exit 1 # Run from this directory
 runApplication blockMesh -region fluid
 
 # Create the 3D baffle
-runApplication -s extrudeFromPatches createBaffles -region fluid -overwrite \
+runApplication -s baffle3D createBaffles -region fluid -overwrite \
-    -dict system/fluid/createBafflesDict.extrudeFromPatches
+    -dict system/fluid/createBafflesDict.baffle3D
 runApplication extrudeToRegionMesh -region fluid -overwrite \
     -dict system/fluid/extrudeToRegionMeshDict.extrudeFromPatches
 
 # Create the 1D baffle
-runApplication createBaffles -region fluid -overwrite
+runApplication -s baffle1D createBaffles -region fluid -overwrite \
-
+    -dict system/fluid/createBafflesDict.baffle1D
-runApplication $(getApplication)
-
-paraFoam -touchAll
 
 #------------------------------------------------------------------------------

tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun

@@ -4,14 +4,26 @@ cd ${0%/*} || exit 1 # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication blockMesh -region fluid
+# If a test, try both extrusion strategies
+if isTest "$@"
+then
+    runApplication -s extrudeFromInternalFaces foamCloneCase . extrudeFromInternalFaces
+    cp -r All* include extrudeFromInternalFaces
 
-# Create the 3D baffle
+    runApplication -s extrudeFromPatches foamCloneCase . extrudeFromPatches
-runApplication topoSet -region fluid
+    cp -r All* include extrudeFromPatches
-runApplication extrudeToRegionMesh -region fluid -overwrite
 
-# Create the 1D baffle
+    (cd extrudeFromInternalFaces && ./Allrun extrudeFromInternalFaces)
-runApplication createBaffles -region fluid -overwrite
+
+    (cd extrudeFromPatches && ./Allrun extrudeFromPatches)
+
+    exit
+fi
+
+# If not a test, just run one strategy
+[ -n "$1" ] && strategy=$1 || strategy=extrudeFromInternalFaces
+
+./Allmesh-$strategy
 
 runApplication $(getApplication)