diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index bd15b1cc0816406ca7614201a29bca8cb6235c1e..d794ae342dadc1ccf673d4164ff2c07a8346f708 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 d4c9e000656215078417d03c0b5ee507e6e6e6fe..0000000000000000000000000000000000000000
--- 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 38fa0208ed993427b2efc3666064c6b779a76487..0000000000000000000000000000000000000000
--- 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 3ccb7ad761db3fee6092b9ae449cec5f39dab7d7..0000000000000000000000000000000000000000
--- 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 d4c9e000656215078417d03c0b5ee507e6e6e6fe..0000000000000000000000000000000000000000
--- 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 38fa0208ed993427b2efc3666064c6b779a76487..0000000000000000000000000000000000000000
--- 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 3ccb7ad761db3fee6092b9ae449cec5f39dab7d7..0000000000000000000000000000000000000000
--- 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 a67553deb14e863ee3f35a13ce357064e89f0591..666ec8f286754a2f2a0cf06c22d5f8b0734fe534 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 bd2802d8bd1e987d85e9d4544c43da6b6a38886b..ccaf0363cd2ef22c4f6fbb6592e7c86d3a2644de 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 fae8abfab6ac1ea15d5a90c621f49283fef00012..68db65d125ca2da943f0c82f7b0938c91ad68030 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 caff26f5710565c3a7b6f59ac4700c0fa745bdff..2cf6a091a2f8b0f7ba1449ce22397946414ab3e6 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 0000000000000000000000000000000000000000..1e1592ee3947fda488902ffe223d0cd80cb10a87
--- /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 0000000000000000000000000000000000000000..ab0289c1567a526370b45505a04f387746cf0c85
--- /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 0000000000000000000000000000000000000000..3e504e9aef3625c77ba795e15386b6f30782472e
--- /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 2eb73c024edbbc6e8953c6930c3c49ce9ee72a7d..0000000000000000000000000000000000000000
--- 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 8a78bbba80f8c2d5a34714f97daf8843faa54f7b..0000000000000000000000000000000000000000
--- 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 3eb51acdc42ca51002c6442bd8984a38c3627da5..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..cd2329f57dc9a5147b8a2119d8a6b38c1a251a79
--- /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 0000000000000000000000000000000000000000..a8a80dff4d06f5a83814132ac693a86dd43c8737
--- /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 0000000000000000000000000000000000000000..67021ba21966f0bb8674a7e3025413596fac0a86
--- /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 96f4954120902b82775fb4306988b750b9ffc867..c49b5e9af36de8c6afe806d2b5f32894dd24f8da 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 878222cf8073e32639ef1ac88124d48eec31a2ac..9f117b0ba86f3a54a3c558c64664c9187fe0a74f 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 93a5a661f8b0caba56ddd379d7131af04004e721..0000000000000000000000000000000000000000
--- 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 c7826d86894a81e56962ba3f119d563a69c624fe..0000000000000000000000000000000000000000
--- 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 87b315aafbb6e1334f0a4abcd7909a52a88ca10b..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..30e3ea000690d8013563d83f490e46eb87b284d5
--- /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 304f1d94454dc7c37c6311c0c4e79d9752a0a257..01e4f46a66a52ea3358ae27ed27cf4b1e598e0c4 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 0000000000000000000000000000000000000000..20bc81f6ba96ab1d17f6d0d0c793af7672bc07da
--- /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 0000000000000000000000000000000000000000..30e3ea000690d8013563d83f490e46eb87b284d5
--- /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 2c6db87c7f2bb23426b422dc88288ae44ead4a52..d16400a94f636d461b62f6f909c2d64d7e29c335 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 8016666d736b3578214f1f73ea686ba14240b8ce..5613186ba273788a02ac993acd72a66c0297b7f1 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 57cc0658f727238910e5a2351eae60f342221ff0..0000000000000000000000000000000000000000
--- 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 90a225e6a9a91a84eb563e3ddfb54503a4b4d8d7..c696d169b42e2ae2a11b894e1b11e774f9c29e01 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 b0be10d8e5f2b0525cec8f23c93585fde73f5879..8ef4993fdebc0faac8bb6c69426059aba4b3faac 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 ae58e6ff702f01cfe32e36bf109c1eb6b8c812ee..0000000000000000000000000000000000000000
--- 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 d4c9e000656215078417d03c0b5ee507e6e6e6fe..0000000000000000000000000000000000000000
--- 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 38fa0208ed993427b2efc3666064c6b779a76487..0000000000000000000000000000000000000000
--- 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 3ccb7ad761db3fee6092b9ae449cec5f39dab7d7..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..b89e6319bf4bd7d6cb248e0105e475ee765b957a
--- /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 c233dfa35686061c78ae2ff691c49d1637967800..cb29d4ff80133e1194304732b82d06ec83321824 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 f7d399ef0600ae835fc1774965faa89a606a6922..0000000000000000000000000000000000000000
--- 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 adf351bd6fafc5b5992ff39cfb71eb3eef2e660c..0000000000000000000000000000000000000000
--- 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 f7d399ef0600ae835fc1774965faa89a606a6922..0000000000000000000000000000000000000000
--- 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 8b6a6950d8c9066c0d3c81bd0880c42a4627e453..cf1a5033ebedb5c82f5c12eca3daeee6b5e20c07 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 967c4deacc28e72510a92df3985d92c1ce74e469..5c87356b4a86979b6d34150daf439621cb586346 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 9c999712069c212a24b43e3986757b0484ebf4de..cf1a5033ebedb5c82f5c12eca3daeee6b5e20c07 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 );
+ }
}
);