From d7743bbf017f26fb37c83f711637bd340575d511 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 9 May 2023 10:16:59 +0100
Subject: [PATCH] tutorials: circuitBoardCooling: Make the test loop run both
 extrusion strategies

---
 .../Allmesh-extrudeFromInternalFaces          | 18 ++++++++++++++
 ...FromPatches => Allmesh-extrudeFromPatches} | 11 ++++-----
 .../CHT/circuitBoardCooling/Allrun            | 24 ++++++++++++++-----
 ...BafflesDict => createBafflesDict.baffle1D} |  0
 ...FromPatches => createBafflesDict.baffle3D} |  0
 ...ToRegionMeshDict.extrudeFromInternalFaces} |  0
 6 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100755 tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces
 rename tutorials/modules/multiRegion/CHT/circuitBoardCooling/{Allrun-extrudeFromPatches => Allmesh-extrudeFromPatches} (63%)
 rename tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/{createBafflesDict => createBafflesDict.baffle1D} (100%)
 rename tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/{createBafflesDict.extrudeFromPatches => createBafflesDict.baffle3D} (100%)
 rename tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/{extrudeToRegionMeshDict => extrudeToRegionMeshDict.extrudeFromInternalFaces} (100%)

diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces
new file mode 100755
index 0000000000..07401ba60b
--- /dev/null
+++ b/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
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun-extrudeFromPatches b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches
similarity index 63%
rename from tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun-extrudeFromPatches
rename to tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches
index abb3d43497..13a815e2f7 100755
--- a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun-extrudeFromPatches
+++ b/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 \
-    -dict system/fluid/createBafflesDict.extrudeFromPatches
+runApplication -s baffle3D createBaffles -region fluid -overwrite \
+    -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 $(getApplication)
-
-paraFoam -touchAll
+runApplication -s baffle1D createBaffles -region fluid -overwrite \
+    -dict system/fluid/createBafflesDict.baffle1D
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun
index 9635c11285..b96df5580b 100755
--- a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/Allrun
+++ b/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 topoSet -region fluid
-runApplication extrudeToRegionMesh -region fluid -overwrite
+    runApplication -s extrudeFromPatches foamCloneCase . extrudeFromPatches
+    cp -r All* include extrudeFromPatches
 
-# Create the 1D baffle
-runApplication createBaffles -region fluid -overwrite
+    (cd extrudeFromInternalFaces && ./Allrun extrudeFromInternalFaces)
+
+    (cd extrudeFromPatches && ./Allrun extrudeFromPatches)
+
+    exit
+fi
+
+# If not a test, just run one strategy
+[ -n "$1" ] && strategy=$1 || strategy=extrudeFromInternalFaces
+
+./Allmesh-$strategy
 
 runApplication $(getApplication)
 
diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.baffle1D
similarity index 100%
rename from tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict
rename to tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.baffle1D
diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.extrudeFromPatches b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.baffle3D
similarity index 100%
rename from tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.extrudeFromPatches
rename to tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/createBafflesDict.baffle3D
diff --git a/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/extrudeToRegionMeshDict b/tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/extrudeToRegionMeshDict.extrudeFromInternalFaces
similarity index 100%
rename from tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/extrudeToRegionMeshDict
rename to tutorials/modules/multiRegion/CHT/circuitBoardCooling/system/fluid/extrudeToRegionMeshDict.extrudeFromInternalFaces