From 93c8dc69e124847d8cc0980f681cbc8d7e882d2c Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@tom.emea.sgi.com>
Date: Wed, 23 Nov 2011 11:42:19 +0000
Subject: [PATCH] ENH: Uptoda topoSet in tutorial for fireFoam
---
.../fireFoam/les/oppositeBurningPanels/Allrun | 12 ++--
.../les/oppositeBurningPanels/cRefine.setSet | 1 -
.../oppositeBurningPanels/cRefine.topoSetDict | 32 +++++++++
.../les/oppositeBurningPanels/f.setSet | 2 -
.../les/oppositeBurningPanels/f.topoSetDict | 66 +++++++++++++++++++
.../les/oppositeBurningPanels/fBurner.setSet | 1 -
.../oppositeBurningPanels/fBurner.topoSetDict | 32 +++++++++
.../les/oppositeBurningPanels/fZone.setSet | 2 -
.../fireFoam/les/smallPoolFire2D/Allrun | 2 +-
.../les/smallPoolFire2D/makeFaceSet.setSet | 1 -
.../les/smallPoolFire2D/system/topoSetDict | 32 +++++++++
.../fireFoam/les/smallPoolFire3D/Allrun | 2 +-
.../les/smallPoolFire3D/makeFaceSet.setSet | 1 -
.../les/smallPoolFire3D/system/topoSetDict | 32 +++++++++
14 files changed, 201 insertions(+), 17 deletions(-)
delete mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet
create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict
delete mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet
create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict
delete mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet
create mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict
delete mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet
delete mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet
create mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
delete mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
create mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 026f614b536..b1c10493e9b 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -9,20 +9,18 @@ application=`getApplication`
runApplication blockMesh
-runApplication setSet -batch cRefine.setSet
+runApplication topoSet -dict cRefine.topoSetDict
runApplication refineMesh -overwrite -dict
-rm log.setSet
-runApplication setSet -batch f.setSet
-rm log.setSet
-runApplication setSet -batch fZone.setSet
+rm log.topoSet
+runApplication topoSet -dict f.topoSetDict
# create the pyrolysis region.
runApplication extrudeToRegionMesh -overwrite
-rm log.setSet
-runApplication setSet -batch fBurner.setSet
+rm log.topoSet
+runApplication topoSet -dict fBurner.topoSetDict
runApplication createPatch -overwrite
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet
deleted file mode 100644
index 526bfc6a738..00000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.setSet
+++ /dev/null
@@ -1 +0,0 @@
-cellSet refineCells new boxToCell (-0.15 0.0 -0.3)(0.15 2.4 0.3)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict
new file mode 100644
index 00000000000..e5f361be93c
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/cRefine.topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name refineCells;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceInfo
+ {
+ box (-0.15 0.0 -0.3)(0.15 2.4 0.3);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet
deleted file mode 100644
index 10dfed3e4a8..00000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.setSet
+++ /dev/null
@@ -1,2 +0,0 @@
-faceSet fLeft new boxToFace (-0.151 0 -0.3)(-0.14999 2.4 0.3)
-faceSet fRight new boxToFace (0.14999 0 -0.3)(0.151 2.4 0.3)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict
new file mode 100644
index 00000000000..fe77b152d86
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/f.topoSetDict
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name fLeft;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.151 0 -0.3)(-0.14999 2.4 0.3);
+ }
+ }
+ {
+ name fRight;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (0.14999 0 -0.3)(0.151 2.4 0.3);
+ }
+ }
+
+ {
+ name fRight_zone;
+ type faceZoneSet;
+ action new;
+ source setToFaceZone;
+ sourceInfo
+ {
+ faceSet fRight;
+ }
+ }
+
+ {
+ name fLeft_zone;
+ type faceZoneSet;
+ action new;
+ source setToFaceZone;
+ sourceInfo
+ {
+ faceSet fLeft;
+ }
+ }
+
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet
deleted file mode 100644
index eebf5d28b30..00000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet fBurner new boxToFace (-0.15 -0.001 -0.30) (0.15 0.001 0.30)
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict
new file mode 100644
index 00000000000..ef751dd06f1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fBurner.topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name fBurner;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet
deleted file mode 100644
index 75644274d55..00000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/fZone.setSet
+++ /dev/null
@@ -1,2 +0,0 @@
-faceZoneSet fRight_zone new setToFaceZone fRight
-faceZoneSet fLeft_zone new setToFaceZone fLeft
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
index 23c0a4ac9a6..70560dade2c 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
-runApplication setSet -batch makeFaceSet.setSet
+runApplication topoSet
runApplication createPatch -overwrite
# Run
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet b/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet
deleted file mode 100644
index 78681a75058..00000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/makeFaceSet.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet f0 new boxToFace (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
new file mode 100644
index 00000000000..0b8b1e0dc48
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name f0;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
index 1bfc0610535..ebd159495f7 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -7,7 +7,7 @@
application=`getApplication`
runApplication blockMesh
-runApplication setSet -batch makeFaceSet.setSet
+runApplication topoSet
runApplication createPatch -overwrite
runApplication decomposePar -force
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet b/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
deleted file mode 100644
index cf52389ea39..00000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
+++ /dev/null
@@ -1 +0,0 @@
-faceSet f0 new boxToFace (-0.1 -0.001 -0.1)(0.1 0.005 0.1)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
new file mode 100644
index 00000000000..6e4e4d02c08
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name f0;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
+ }
+ }
+);
+
+// ************************************************************************* //
--
GitLab