From 3c1318fc4faf93ccff24c1e3da4811acbc52165c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 10 May 2010 17:17:49 +0100
Subject: [PATCH] ENH: Converted all cellSet/faceSet to topoSet.
---
.../mesh/manipulation/topoSet/topoSet.C | 1 +
.../mixerVessel2D/system/faceSetDict | 25 --------------
.../system/faceSetDict_noBoundaryFaces | 25 --------------
.../system/faceSetDict_rotorFaces | 25 --------------
.../mixerVessel2D/system/faceSetDict | 25 --------------
.../system/faceSetDict_noBoundaryFaces | 25 --------------
.../system/faceSetDict_rotorFaces | 25 --------------
.../coalChemistryFoam/simplifiedSiwek/Allrun | 2 +-
.../system/{cellSetDict => topoSetDict} | 21 +++++++-----
.../multiphase/cavitatingFoam/les/Allclean | 4 +--
.../multiphase/cavitatingFoam/les/Allrun | 4 +--
.../les/throttle/system/topoSetDict.1 | 33 ++++++++++++++++++
.../les/throttle/system/topoSetDict.2 | 33 ++++++++++++++++++
.../les/throttle/system/topoSetDict.3 | 33 ++++++++++++++++++
.../les/throttle3D/system/cellSetDict.1 | 31 -----------------
.../les/throttle3D/system/cellSetDict.2 | 31 -----------------
.../les/throttle3D/system/cellSetDict.3 | 31 -----------------
.../les/throttle3D/system/topoSetDict.1 | 33 ++++++++++++++++++
.../les/throttle3D/system/topoSetDict.2 | 33 ++++++++++++++++++
.../les/throttle3D/system/topoSetDict.3 | 33 ++++++++++++++++++
.../cavitatingFoam/ras/throttle/Allclean | 2 +-
.../cavitatingFoam/ras/throttle/Allrun | 4 +--
.../ras/throttle/system/cellSetDict.1 | 25 --------------
.../ras/throttle/system/cellSetDict.2 | 25 --------------
.../ras/throttle/system/cellSetDict.3 | 25 --------------
.../ras/throttle/system/topoSetDict | 33 ++++++++++++++++++
.../ras/throttle/system/topoSetDict.1} | 19 ++++++-----
.../ras/throttle/system/topoSetDict.2 | 33 ++++++++++++++++++
.../ras/throttle/system/topoSetDict.3 | 33 ++++++++++++++++++
.../interDyMFoam/ras/floatingObject/Allclean | 1 -
.../interDyMFoam/ras/floatingObject/Allrun | 13 +------
.../ras/floatingObject/system/cellSetDict.2 | 24 -------------
.../system/{cellSetDict.1 => topoSetDict} | 24 ++++++++-----
.../MRFInterFoam/mixerVessel2D/makeMesh | 7 +---
.../mixerVessel2D/system/cellSetDict | 25 --------------
.../mixerVessel2D/system/faceSetDict | 25 --------------
.../system/faceSetDict_noBoundaryFaces | 25 --------------
.../system/faceSetDict_rotorFaces | 25 --------------
.../mixerVessel2D/system/topoSetDict | 34 +++++++++++++++++++
.../interFoam/les/nozzleFlow2D/Allrun | 10 +++---
.../les/nozzleFlow2D/system/cellSetDict | 25 --------------
.../les/nozzleFlow2D/system/cellSetDict.1 | 25 --------------
.../les/nozzleFlow2D/system/cellSetDict.2 | 25 --------------
.../les/nozzleFlow2D/system/topoSetDict} | 18 +++++-----
.../les/nozzleFlow2D/system/topoSetDict.1} | 19 ++++++-----
.../les/nozzleFlow2D/system/topoSetDict.2} | 18 +++++-----
46 files changed, 415 insertions(+), 600 deletions(-)
delete mode 100644 tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict
delete mode 100644 tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
delete mode 100644 tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
delete mode 100644 tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
delete mode 100644 tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
delete mode 100644 tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
rename tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/{cellSetDict => topoSetDict} (76%)
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2
delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
create mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
delete mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
delete mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2
delete mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3
create mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
rename tutorials/{lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict => multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1} (78%)
create mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
create mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.2
rename tutorials/multiphase/interDyMFoam/ras/floatingObject/system/{cellSetDict.1 => topoSetDict} (74%)
delete mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/cellSetDict
delete mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict
delete mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
delete mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_rotorFaces
create mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
delete mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
delete mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1
delete mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
rename tutorials/multiphase/{cavitatingFoam/les/throttle/system/cellSetDict.1 => interFoam/les/nozzleFlow2D/system/topoSetDict} (78%)
rename tutorials/multiphase/{cavitatingFoam/les/throttle/system/cellSetDict.3 => interFoam/les/nozzleFlow2D/system/topoSetDict.1} (78%)
rename tutorials/multiphase/{cavitatingFoam/les/throttle/system/cellSetDict.2 => interFoam/les/nozzleFlow2D/system/topoSetDict.2} (78%)
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index bd15b1cc081..d794ae342da 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
case topoSetSource::INVERT:
Info<< " Inverting set" << endl;
currentSet().invert(currentSet().maxSize(mesh));
+ currentSet().write();
break;
default:
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict
deleted file mode 100644
index d4c9e000656..00000000000
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
deleted file mode 100644
index 38fa0208ed9..00000000000
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_noBoundaryFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
deleted file mode 100644
index 3ccb7ad761d..00000000000
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_rotorFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action new;
-
-topoSetSources ( cellToFace { set rotor ; option all ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
deleted file mode 100644
index d4c9e000656..00000000000
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
deleted file mode 100644
index 38fa0208ed9..00000000000
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_noBoundaryFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
deleted file mode 100644
index 3ccb7ad761d..00000000000
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_rotorFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action new;
-
-topoSetSources ( cellToFace { set rotor ; option all ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
index a67553deb14..666ec8f2867 100755
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun
@@ -10,7 +10,7 @@ application=`getApplication`
runApplication blockMesh
# create ignition cells cellSet
-runApplication cellSet
+runApplication topoSet
runApplication $application
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/cellSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
similarity index 76%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/cellSetDict
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index bd2802d8bd1..ccaf0363cd2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/cellSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -10,21 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ object topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name ignitionCells;
-
-action new;
-
-topoSetSources
+actions
(
- sphereToCell
{
- centre ( 0.125 0.375 0.05 );
- radius 0.005;
+ name ignitionCells;
+ type cellSet;
+ action new;
+
+ source sphereToCell;
+ sourceDict
+ {
+ centre ( 0.125 0.375 0.05 );
+ radius 0.005;
+ }
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allclean b/tutorials/multiphase/cavitatingFoam/les/Allclean
index fae8abfab6a..68db65d125c 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/les/Allclean
@@ -9,7 +9,7 @@ cd ${0%/*} || exit 1 # run from this directory
rm -rf constant/polyMesh/sets > /dev/null 2>&1
rm -rf 0/polyMesh > /dev/null 2>&1
- rm system/cellSetDict > /dev/null 2>&1
+ rm system/topoSetDict > /dev/null 2>&1
cleanCase
)
@@ -21,7 +21,7 @@ cd ${0%/*} || exit 1 # run from this directory
rm -rf constant/polyMesh/sets > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
cp -r 0.org 0
- rm system/cellSetDict > /dev/null 2>&1
+ rm system/topoSetDict > /dev/null 2>&1
rm -rf processor[0-9] > /dev/null 2>&1
cleanCase
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index caff26f5710..2cf6a091a2f 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -12,8 +12,8 @@ refineMeshByCellSet()
while [ $# -ge 1 ]
do
echo "creating cell set for primary zone - $1"
- cp system/cellSetDict.$1 system/cellSetDict
- cellSet > log.cellSet.$1 2>&1
+ cp system/topoSetDict.$1 system/topoSetDict
+ topoSet > log.topoSet.$1 2>&1
echo "refining primary zone - $1"
refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
new file mode 100644
index 00000000000..1e1592ee394
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box (0.004 -0.001 -1) (0.012 0.001 1);
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
new file mode 100644
index 00000000000..ab0289c1567
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
new file mode 100644
index 00000000000..3e504e9aef3
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box (0.00475 -0.000375 -1) (0.009 0.000375 1);
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1
deleted file mode 100644
index 2eb73c024ed..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 );
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2
deleted file mode 100644
index 8a78bbba80f..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 );
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3
deleted file mode 100644
index 3eb51acdc42..00000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.3;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 );
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
new file mode 100644
index 00000000000..cd2329f57dc
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 );
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
new file mode 100644
index 00000000000..a8a80dff4d0
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 );
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
new file mode 100644
index 00000000000..67021ba2196
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 );
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
index 96f49541209..c49b5e9af36 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
rm -rf constant/polyMesh/sets > /dev/null 2>&1
rm -rf 0/polyMesh > /dev/null 2>&1
-rm system/cellSetDict > /dev/null 2>&1
+rm system/topoDict > /dev/null 2>&1
cleanCase
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 878222cf807..9f117b0ba86 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -11,8 +11,8 @@ refineMeshByCellSet()
while [ $# -ge 1 ]
do
echo "creating cell set for primary zone - $1"
- cp system/cellSetDict.$1 system/cellSetDict
- cellSet > log.cellSet.$1 2>&1
+ cp system/topoSetDict.$1 system/topoSetDict
+ topoSet > log.topoSet.$1 2>&1
echo "refining primary zone - $1"
refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
deleted file mode 100644
index 93a5a661f8b..00000000000
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2
deleted file mode 100644
index c7826d86894..00000000000
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3
deleted file mode 100644
index 87b315aafbb..00000000000
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.3;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
new file mode 100644
index 00000000000..30e3ea00069
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ;
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
similarity index 78%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
index 304f1d94454..01e4f46a66a 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
@@ -11,20 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object cellSetDict;
+ object topoSetDict.1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name filter;
-
-action new;
-
-topoSetSources
+actions
(
- // Cells with cell centre within box
- boxToCell
{
- box (1.5 -1 -1) (2 1 1);
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ;
+ }
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
new file mode 100644
index 00000000000..20bc81f6ba9
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ;
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
new file mode 100644
index 00000000000..30e3ea00069
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ;
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
index 2c6db87c7f2..d16400a94f6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allclean
@@ -4,7 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-rm system/cellSetDict > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
cleanCase
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
index 8016666d736..5613186ba27 100755
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun
@@ -7,19 +7,8 @@ cd ${0%/*} || exit 1 # run from this directory
# Set application name
application="interDyMFoam"
-makeMeshByCellSet()
-{
- while [ $# -ge 1 ]
- do
- echo "Running cellSet operation $1"
- cp system/cellSetDict.$1 system/cellSetDict
- cellSet > log.cellSet.$1 2>&1
- shift
- done
-}
-
runApplication blockMesh
-makeMeshByCellSet 1 2
+runApplication topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
cp -r 0.org 0 > /dev/null 2>&1
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.2 b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.2
deleted file mode 100644
index 57cc0658f72..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.2
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action invert;
-
-topoSetSources ();
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.1 b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
similarity index 74%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.1
rename to tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
index 90a225e6a9a..c696d169b42 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/cellSetDict.1
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
@@ -10,20 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ object topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
-
-action new;
-
-topoSetSources
+actions
(
- boxToCell
{
- box (0.35 0.35 0.44) (0.65 0.65 0.56);
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box (0.35 0.35 0.44) (0.65 0.65 0.56);
+ }
+ }
+
+ {
+ name c0;
+ type cellSet;
+ action invert;
}
);
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/makeMesh
index b0be10d8e5f..8ef4993fdeb 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/makeMesh
@@ -2,10 +2,5 @@
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
blockMesh
-cellSet
-#- MRF determines its own faceZone if not supplied
-#cp system/faceSetDict_rotorFaces system/faceSetDict
-#faceSet
-#cp system/faceSetDict_noBoundaryFaces system/faceSetDict
-#faceSet
+topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/cellSetDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/cellSetDict
deleted file mode 100644
index ae58e6ff702..00000000000
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/cellSetDict
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action new;
-
-topoSetSources ( zoneToCell { name rotor ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict
deleted file mode 100644
index d4c9e000656..00000000000
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
deleted file mode 100644
index 38fa0208ed9..00000000000
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_noBoundaryFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action delete;
-
-topoSetSources ( boundaryToFace { } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_rotorFaces b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_rotorFaces
deleted file mode 100644
index 3ccb7ad761d..00000000000
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/faceSetDict_rotorFaces
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object faceSetDict_rotorFaces;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name rotor;
-
-action new;
-
-topoSetSources ( cellToFace { set rotor ; option all ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
new file mode 100644
index 00000000000..b89e6319bf4
--- /dev/null
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+actions
+(
+ {
+ name rotor;
+ type cellSet;
+ action new;
+ source zoneToCell;
+ sourceDict
+ {
+ name rotor;
+ }
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index c233dfa3568..cb29d4ff801 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -17,19 +17,19 @@ runRefineMesh()
runApplication blockMesh
i=1
-if [ -f log.cellSet ]
+if [ -f log.topoSet ]
then
i=3
fi
while [ "$i" -lt 3 ]
do
- if [ -f log.cellSet ]
+ if [ -f log.topoSet ]
then
- mv log.cellSet log.cellSet.1
+ mv log.topoSet log.topoSet.1
fi
- cp system/cellSetDict.${i} system/cellSetDict
- runApplication cellSet
+ cp system/topoSetDict.${i} system/topoSetDict
+ runApplication topoSet
runRefineMesh
cp -r 1e-08/polyMesh/* constant/polyMesh
rm -rf 1e-08
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
deleted file mode 100644
index f7d399ef060..00000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1
deleted file mode 100644
index adf351bd6fa..00000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0008 4e-05 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
deleted file mode 100644
index f7d399ef060..00000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object cellSetDict.2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
similarity index 78%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
index 8b6a6950d8c..cf1a5033ebe 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
@@ -11,19 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object cellSetDict.1;
+ object topoSetDict.2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
-
-action new;
-
-topoSetSources
+actions
(
- boxToCell
{
- box (0.004 -0.001 -1) (0.012 0.001 1);
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 );
+ }
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
similarity index 78%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
index 967c4deacc2..5c87356b4a8 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
@@ -11,21 +11,22 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object cellSetDict.3;
+ object topoSetDict.1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
-
-action new;
-
-topoSetSources
+actions
(
- boxToCell
{
- box (0.00475 -0.000375 -1) (0.009 0.000375 1);
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0 0 -2e-05 ) ( 0.0036 0.0008 4e-05 ) ;
+ }
}
);
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
similarity index 78%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
index 9c999712069..cf1a5033ebe 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
@@ -11,19 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object cellSetDict.2;
+ object topoSetDict.2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
-
-action new;
-
-topoSetSources
+actions
(
- boxToCell
{
- box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
+ name c0;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceDict
+ {
+ box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 );
+ }
}
);
--
GitLab