From 5f556ffb4a220d587e33ed05b4e117c97981edd0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 7 Nov 2018 10:33:36 +0100
Subject: [PATCH] ENH: make sourceInfo sub-dictionary optional for topoSet
(#1060)
- helps reduce clutter in the topoSetDict files.
Caveats when using this.
The older specification styles using "name" will conflict with the
set name. Eg,
{
name f0
type faceSet;
action add;
source patchToFace;
sourceInfo
{
name inlet;
}
}
would flattened to the following
{
name f0
type faceSet;
action add;
source patchToFace;
name inlet;
}
which overwrites the "name" used for the faceSet.
The solution is to use the updated syntax:
{
name f0
type faceSet;
action add;
source patchToFace;
patch inlet;
}
---
.../mesh/manipulation/topoSet/topoSet.C | 24 +--
.../heatTransfer/system/topoSetDict | 20 +-
.../cylinderAndBackground/system/topoSetDict | 10 +-
.../system/topoSetDict | 29 +--
.../LES/compartmentFire/system/topoSetDict | 102 +++--------
.../system/filmRegion/topoSetDict | 24 +--
.../system/topoSetDict | 15 +-
.../system/cRefine.topoSetDict | 5 +-
.../system/f.topoSetDict | 21 +--
.../system/fBurner.topoSetDict | 5 +-
.../LES/simplePMMApanel/system/topoSetDict | 26 +--
.../LES/smallPoolFire2D/system/topoSetDict | 5 +-
.../LES/smallPoolFire3D/system/topoSetDict | 5 +-
.../twoSimpleRotors/system/topoSetDict | 47 ++---
.../cylinderAndBackground/system/topoSetDict | 10 +-
.../externalCoupledHeater/system/topoSetDict | 70 ++-----
.../externalSolarLoad/system/topoSetDict | 47 +----
.../multiRegionHeater/system/topoSetDict | 70 ++-----
.../reverseBurner/system/gas/topoSetDict | 5 +-
.../system/cabin/topoSetDict | 15 +-
.../system/cabin/topoSetDictRegister | 26 +--
.../windshieldCondensation/system/topoSetDict | 15 +-
.../windshieldDefrost/system/topoSetDict | 15 +-
.../externalCoupledHeater/system/topoSetDict | 70 ++-----
.../heatExchanger/system/air/topoSetDict.1 | 47 +----
.../heatExchanger/system/air/topoSetDict.2 | 15 +-
.../system/topoSetDict | 70 ++-----
.../cylinderAndBackground/system/topoSetDict | 10 +-
.../simpleRotor/system/topoSetDict | 20 +-
.../twoSimpleRotors/system/topoSetDict | 53 ++----
.../background_overset/system/topoSetDict | 13 +-
.../RAS/TJunctionFan/system/topoSetDict | 32 +---
.../RAS/elipsekkLOmega/system/topoSetDict | 5 +-
.../oscillatingInletACMI2D/system/topoSetDict | 30 +--
.../system/createInletOutletSets.topoSetDict | 29 +--
.../mixerVesselAMI2D/system/topoSetDict | 5 +-
.../laminar/porousBlockage/system/topoSetDict | 10 +-
.../simpleFoam/pipeCyclic/system/topoSetDict | 29 +--
.../simpleFoam/simpleCar/system/topoSetDict | 10 +-
.../turbineSiting/system/topoSetDict | 20 +-
.../simplifiedSiwek/system/topoSetDict | 9 +-
.../cylinder/system/topoSetDict | 10 +-
.../filter/system/topoSetDict | 69 ++-----
.../hotBoxes/system/topoSetDict | 20 +-
.../system/wallFilmRegion.topoSet | 10 +-
.../splashPanel/system/wallFilmRegion.topoSet | 10 +-
.../createWallFilmRegionPatches.topoSet | 20 +-
.../mesh/foamyHexMesh/blob/system/topoSetDict | 59 ++----
.../flange/system/topoSetDict-background | 16 +-
.../flange/system/topoSetDict-slices | 57 ++----
.../simpleShapes/system/topoSetDict | 57 ++----
.../mesh/parallel/filter/system/topoSetDict | 68 ++-----
.../refineFieldDirs/system/topoSetDict.range1 | 11 +-
.../refineFieldDirs/system/topoSetDict.range2 | 11 +-
.../refineFieldDirs/system/topoSetDict.range3 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier1 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier2 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier3 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier4 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier5 | 11 +-
.../refineFieldDirs/system/topoSetDict.tier6 | 11 +-
.../addLayersToFaceZone/system/topoSetDict | 34 +---
.../simple-cube1/system/topoSetDict | 41 +----
.../simple-cube1/system/topoSetDict.patches | 25 +--
.../twoPhasePachuka/system/topoSetDict | 10 +-
.../LES/throttle/system/topoSetDict.1 | 5 +-
.../LES/throttle/system/topoSetDict.2 | 5 +-
.../LES/throttle/system/topoSetDict.3 | 5 +-
.../LES/throttle3D/system/topoSetDict.1 | 5 +-
.../LES/throttle3D/system/topoSetDict.2 | 5 +-
.../LES/throttle3D/system/topoSetDict.3 | 5 +-
.../RAS/throttle/system/topoSetDict.1 | 5 +-
.../RAS/throttle/system/topoSetDict.2 | 5 +-
.../RAS/throttle/system/topoSetDict.3 | 5 +-
.../laminar/sphereDrop/system/topoSetDict | 173 ++++++------------
.../RAS/mixerVessel2D/system/topoSetDict | 5 +-
.../LES/nozzleFlow2D/system/topoSetDict.1 | 5 +-
.../LES/nozzleFlow2D/system/topoSetDict.2 | 5 +-
.../RAS/DTCHull/system/topoSetDict.1 | 5 +-
.../RAS/DTCHull/system/topoSetDict.2 | 5 +-
.../RAS/DTCHull/system/topoSetDict.3 | 5 +-
.../RAS/DTCHull/system/topoSetDict.4 | 5 +-
.../RAS/DTCHull/system/topoSetDict.5 | 5 +-
.../RAS/DTCHull/system/topoSetDict.6 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.1 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.2 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.3 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.4 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.5 | 5 +-
.../RAS/DTCHullMoving/system/topoSetDict.6 | 6 +-
.../damBreakPorousBaffle/system/topoSetDict | 18 +-
.../RAS/floatingObject/system/topoSetDict | 5 +-
.../damBreakWithObstacle/system/topoSetDict | 5 +-
.../laminar/mixerVessel2D/system/topoSetDict | 5 +-
.../system/topoSetDict.createBlockage | 14 +-
.../system/topoSetDict.createCollector | 10 +-
.../system/topoSetDict.createPatch | 21 +--
.../system/topoSetDict | 10 +-
.../damBreakWithObstacle/system/topoSetDict | 5 +-
.../system/topoSetDict | 15 +-
.../system/topoSetDict2 | 11 +-
.../standingWave/system/topoSetDict1 | 5 +-
.../standingWave/system/topoSetDict2 | 5 +-
.../system/createInletOutletSets.topoSetDict | 29 +--
.../mixerVessel2D/system/topoSetDict | 5 +-
.../mixerVesselAMI2D/system/topoSetDict | 5 +-
.../laminar/mixerVessel2D/system/topoSetDict | 5 +-
.../boatAndPropeller/system/topoSetDictHull | 57 ++----
.../system/topoSetDictPropeller | 54 ++----
.../boatAndPropeller/system/topoSetDictRefine | 11 +-
.../boatAndPropeller/system/topoSetDictRudder | 54 ++----
.../background/system/topoSetDict | 10 +-
.../floatingBody/system/topoSetDict | 5 +-
.../twoSimpleRotors/system/topoSetDict | 45 ++---
.../oscillatingBox/system/topoSetDict | 20 +-
.../system/topoSetDict-selectBottom | 12 +-
.../oscillatingBox/system/topoSetDict | 20 +-
.../laminar/mixerVessel2D/system/topoSetDict | 5 +-
.../laminar/mixerVessel2D/system/topoSetDict | 5 +-
.../laminar/mixerVessel2D/system/topoSetDict | 5 +-
120 files changed, 612 insertions(+), 1851 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index a9cd056c58f..abc0cccfda1 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -251,8 +251,8 @@ int main(int argc, char *argv[])
|| action == topoSetSource::CLEAR
)
{
- currentSet = topoSet::New(setType, mesh, setName, 10000);
- Info<< "Created " << currentSet().type() << " "
+ currentSet = topoSet::New(setType, mesh, setName, 16384);
+ Info<< "Created " << currentSet().type() << ' '
<< setName << endl;
}
else if (action == topoSetSource::REMOVE)
@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
setName,
IOobject::MUST_READ
);
- Info<< "Read set " << currentSet().type() << " "
+ Info<< "Read set " << currentSet().type() << ' '
<< setName << " with size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;
@@ -283,14 +283,14 @@ int main(int argc, char *argv[])
case topoSetSource::ADD:
case topoSetSource::SUBTRACT:
{
- const word sourceName(dict.get<word>("source"));
+ const word sourceType(dict.get<word>("source"));
- Info<< " Applying source " << sourceName << endl;
+ Info<< " Applying source " << sourceType << endl;
autoPtr<topoSetSource> source = topoSetSource::New
(
- sourceName,
+ sourceType,
mesh,
- dict.subDict("sourceInfo")
+ dict.optionalSubDict("sourceInfo")
);
source().applyToSet(action, currentSet());
@@ -308,14 +308,14 @@ int main(int argc, char *argv[])
case topoSetSource::SUBSET:
{
- const word sourceName(dict.get<word>("source"));
+ const word sourceType(dict.get<word>("source"));
- Info<< " Applying source " << sourceName << endl;
+ Info<< " Applying source " << sourceType << endl;
autoPtr<topoSetSource> source = topoSetSource::New
(
- sourceName,
+ sourceType,
mesh,
- dict.subDict("sourceInfo")
+ dict.optionalSubDict("sourceInfo")
);
// Backup current set.
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
if (currentSet.valid())
{
Info<< " "
- << currentSet().type() << " "
+ << currentSet().type() << ' '
<< currentSet().name() << " now size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
index 6f2912d7982..35f50effe5c 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((0.001 0.001 0.001));
- }
+ insidePoints ((0.001 0.001 0.001));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
@@ -51,10 +45,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
{
@@ -62,10 +53,7 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- box (0.4 0.4 -100)(0.6 0.6 100);
- }
+ box (0.4 0.4 -100)(0.6 0.6 100);
}
{
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
index 87e94cc80bf..a210f05c941 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((-1.999 0 -1.999));
- }
+ insidePoints ((-1.999 0 -1.999));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
index 1df81ee70f1..38e668eefff 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -17,15 +17,12 @@ FoamFile
actions
(
- {
+ {
name blockedFacesSet;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (1 1 0.99) (2 2 1);
- }
+ box (1 1 0.99) (2 2 1);
}
{
@@ -33,10 +30,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (2.4 2.4 0) (3 3 1);
- }
+ box (2.4 2.4 0) (3 3 1);
}
{
@@ -44,10 +38,7 @@ actions
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (0 0 0) (0.6 0.6 1);
- }
+ box (0 0 0) (0.6 0.6 1);
}
{
@@ -55,11 +46,8 @@ actions
type faceSet;
action add;
source cellToFace;
- sourceInfo
- {
- set blockedCellsSet;
- option all;
- }
+ set blockedCellsSet;
+ option all;
}
{
@@ -67,10 +55,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (1.0 1.99 0) (2.0 2.09 0.6);
- }
+ box (1.0 1.99 0) (2.0 2.09 0.6);
}
);
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
index 0f3ab08509c..7a4b7aab340 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.201 -0.001 -0.201)(-0.199 0.031 0.201);
- }
+ box (-0.201 -0.001 -0.201)(-0.199 0.031 0.201);
}
{
@@ -33,20 +30,14 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet slot_bottom;
- }
+ faceSet slot_bottom;
}
{
name slot_top;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.201 0.369 -0.201)(-0.199 0.401 0.201);
- }
+ box (-0.201 0.369 -0.201)(-0.199 0.401 0.201);
}
{
@@ -54,10 +45,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet slot_top;
- }
+ faceSet slot_top;
}
{
@@ -65,10 +53,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch inlet;
- }
+ patch inlet;
}
{
@@ -76,10 +61,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.201 -0.001 -0.201)(0.201 0.401 0.201);
- }
+ box (-0.201 -0.001 -0.201)(0.201 0.401 0.201);
}
{
@@ -87,10 +69,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set compartment_fire;
- }
+ set compartment_fire;
}
{
@@ -98,10 +77,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.2001 0.0301 -0.2001)(-0.1999 0.3701 0.2001);
- }
+ box (-0.2001 0.0301 -0.2001)(-0.1999 0.3701 0.2001);
}
{
@@ -109,10 +85,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet internalWallPanel;
- }
+ faceSet internalWallPanel;
}
{
@@ -120,21 +93,15 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.2001 -0.0001 -0.2001)(0.2001 0.4001 -0.1999);
- }
+ box (-0.2001 -0.0001 -0.2001)(0.2001 0.4001 -0.1999);
}
-{
+ {
name wallFaces_front;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.2001 -0.0001 0.1999)(0.2001 0.4001 0.2001);
- }
+ box (-0.2001 -0.0001 0.1999)(0.2001 0.4001 0.2001);
}
{
@@ -142,10 +109,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.2001 0.3999 -0.2001)(0.2001 0.4001 0.2001);
- }
+ box (-0.2001 0.3999 -0.2001)(0.2001 0.4001 0.2001);
}
{
@@ -153,10 +117,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (0.1999 -0.0001 -0.2001)(0.2001 0.4001 0.2001);
- }
+ box (0.1999 -0.0001 -0.2001)(0.2001 0.4001 0.2001);
}
{
@@ -164,10 +125,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFaces_back;
- }
+ faceSet wallFaces_back;
}
{
@@ -175,10 +133,7 @@ actions
type faceZoneSet;
action add;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFaces_front;
- }
+ faceSet wallFaces_front;
}
{
@@ -186,10 +141,7 @@ actions
type faceZoneSet;
action add;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFaces_top;
- }
+ faceSet wallFaces_top;
}
{
@@ -197,10 +149,7 @@ actions
type faceZoneSet;
action add;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFaces_side;
- }
+ faceSet wallFaces_side;
}
{
@@ -208,10 +157,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.2001 -0.001 -0.2001)(0.2001 0.001 0.2001);
- }
+ box (-0.2001 -0.001 -0.2001)(0.2001 0.001 0.2001);
}
{
@@ -219,10 +165,7 @@ actions
type faceZoneSet;
action add;
source setToFaceZone;
- sourceInfo
- {
- faceSet baseFace;
- }
+ faceSet baseFace;
}
{
@@ -230,10 +173,7 @@ actions
type faceZoneSet;
action subtract;
source setToFaceZone;
- sourceInfo
- {
- faceSet inletFace;
- }
+ faceSet inletFace;
}
);
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
index 323b2185904..279b5d45d8a 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-1 -0.00001 -0.00001) (1 1.00001 0.00001);
- }
+ box (-1 -0.00001 -0.00001) (1 1.00001 0.00001);
}
@@ -34,32 +31,23 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-1 0.99999 -0.00001) (1 1.00001 2.00001);
- }
+ box (-1 0.99999 -0.00001) (1 1.00001 2.00001);
}
- {
+ {
name f2;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-1 -0.00001 1.99999) (1 1.00001 2.00001);
- }
+ box (-1 -0.00001 1.99999) (1 1.00001 2.00001);
}
- {
+ {
name f3;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-1 -0.00001 -0.00001) (1 0.00001 2.00001);
- }
+ box (-1 -0.00001 -0.00001) (1 0.00001 2.00001);
}
);
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
index 492c5bd72f8..23597bd3b17 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.1 -2.1 -0.1)(0.201 2.51 0.01);
- }
+ box (-0.1 -2.1 -0.1)(0.201 2.51 0.01);
}
@@ -34,10 +31,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch coupledWallTmp;
- }
+ patch coupledWallTmp;
}
{
@@ -45,10 +39,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet coupledWall;
- }
+ faceSet coupledWall;
}
);
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
index a07810ce233..d713a767e55 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.15 0.0 -0.3)(0.15 2.4 0.3);
- }
+ box (-0.15 0.0 -0.3)(0.15 2.4 0.3);
}
);
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
index 3bd72877ff3..f935256a0f6 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
@@ -22,20 +22,14 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.151 0 -0.3)(-0.14999 2.4 0.3);
- }
+ box (-0.151 0 -0.3)(-0.14999 2.4 0.3);
}
{
name fRight;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (0.14999 0 -0.3)(0.151 2.4 0.3);
- }
+ box (0.14999 0 -0.3)(0.151 2.4 0.3);
}
{
@@ -43,10 +37,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet fRight;
- }
+ faceSet fRight;
}
{
@@ -54,12 +45,8 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet fLeft;
- }
+ faceSet fLeft;
}
-
);
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
index 24c8c67fd4e..26e173de6f9 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
- }
+ box (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
}
);
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
index b1abf7f6bc0..f61c8ec4f29 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
@@ -18,25 +18,19 @@ FoamFile
actions
(
{
- name coupledPatch;
- type faceSet;
- action new;
- source patchToFace;
- sourceInfo
- {
- patch coupledPatch;
- }
+ name coupledPatch;
+ type faceSet;
+ action new;
+ source patchToFace;
+ patch coupledPatch;
}
{
- name panel;
- type faceZoneSet;
- action new;
- source setToFaceZone;
- sourceInfo
- {
- faceSet coupledPatch;
- }
+ name panel;
+ type faceZoneSet;
+ action new;
+ source setToFaceZone;
+ faceSet coupledPatch;
}
);
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
index f20d93e09bb..8a6b810ae73 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
- }
+ box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
}
);
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
index a133e6ff2f6..00190e6bd5d 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
- }
+ box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
}
);
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
index 12893748211..23148c4ee97 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.001 0.001 0.001));
- }
+ insidePoints ((0.001 0.001 0.001));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
@@ -49,11 +43,8 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.0116 0.00151 0.001));//((0.0076 0.00151 0.001));
- set c1;
- }
+ insidePoints ((0.0116 0.00151 0.001));//((0.0076 0.00151 0.001));
+ set c1;
}
{
@@ -61,10 +52,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
// Select box to remove from region 1 and 2
@@ -74,10 +62,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
{
@@ -85,10 +70,7 @@ actions
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
{
@@ -96,15 +78,12 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (0.0025 0.0045 -100)(0.0075 0.0055 100)
- //(0.0085 0.0025 -100)(0.0095 0.0075 100)
- (0.0125 0.0025 -100)(0.0135 0.0075 100)
- );
- }
+ boxes
+ (
+ (0.0025 0.0045 -100)(0.0075 0.0055 100)
+ //(0.0085 0.0025 -100)(0.0095 0.0075 100)
+ (0.0125 0.0025 -100)(0.0135 0.0075 100)
+ );
}
{
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
index 87e94cc80bf..a210f05c941 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((-1.999 0 -1.999));
- }
+ insidePoints ((-1.999 0 -1.999));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
index 016d855e58f..4f160b93ada 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 0 -100 )(0.01001 0.00999 100);
- }
+ box (-0.01001 0 -100 )(0.01001 0.00999 100);
}
{
name heaterCellSet;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
- }
+ box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
}
{
name heater;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
// leftSolid
@@ -55,20 +46,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0 -100 )(-0.01001 0.00999 100);
- }
+ box (-100 0 -100 )(-0.01001 0.00999 100);
}
{
name leftSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
// rightSolid
@@ -77,20 +62,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.01001 0 -100 )(100 0.00999 100);
- }
+ box (0.01001 0 -100 )(100 0.00999 100);
}
{
name rightSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
// topAir
@@ -99,20 +78,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0.00999 -100 )(100 100 100);
- }
+ box (-100 0.00999 -100 )(100 100 100);
}
{
name topAir;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
@@ -122,40 +95,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
{
name bottomWaterCellSet;
@@ -167,10 +128,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set bottomWaterCellSet;
- }
+ set bottomWaterCellSet;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
index 1928aeb4f18..4bce492b082 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
@@ -24,10 +24,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (15.5 15.5 0)(24.5 24.5 9);
- }
+ box (15.5 15.5 0)(24.5 24.5 9);
}
// floor
@@ -36,21 +33,15 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0 0 -2)(41 41 0);
- }
+ box (0 0 -2)(41 41 0);
}
- {
+ {
name floor;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set floor;
- }
+ set floor;
}
//air
@@ -65,10 +56,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set floor;
- }
+ set floor;
}
{
@@ -76,10 +64,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set solid; // name of cellSet
- }
+ set solid; // cellSet
}
{
@@ -87,10 +72,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (17 17 0)(23 23 7.5);
- }
+ box (17 17 0)(23 23 7.5);
}
//- Define again solid
@@ -99,10 +81,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (15.5 15.5 0)(24.5 24.5 9);
- }
+ box (15.5 15.5 0)(24.5 24.5 9);
}
{
@@ -110,10 +89,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set cavity;
- }
+ set cavity;
}
{
@@ -121,10 +97,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set solid; // name of cellSet
- }
+ set solid; // cellSet
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
index 016d855e58f..21a04248b87 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 0 -100 )(0.01001 0.00999 100);
- }
+ box (-0.01001 0 -100)(0.01001 0.00999 100);
}
{
name heaterCellSet;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
- }
+ box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
}
{
name heater;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
// leftSolid
@@ -55,20 +46,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0 -100 )(-0.01001 0.00999 100);
- }
+ box (-100 0 -100 )(-0.01001 0.00999 100);
}
{
name leftSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
// rightSolid
@@ -77,20 +62,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.01001 0 -100 )(100 0.00999 100);
- }
+ box (0.01001 0 -100 )(100 0.00999 100);
}
{
name rightSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
// topAir
@@ -99,20 +78,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0.00999 -100 )(100 100 100);
- }
+ box (-100 0.00999 -100 )(100 100 100);
}
{
name topAir;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
@@ -122,40 +95,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
{
name bottomWaterCellSet;
@@ -167,10 +128,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set bottomWaterCellSet;
- }
+ set bottomWaterCellSet;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
index 5d66a41ceb3..46c62b68fa3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.01 0.1 -0.01) (0.02 0.11 0.01);
- }
+ box (0.01 0.1 -0.01) (0.02 0.11 0.01);
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
index f737a59393b..0080bf32b9d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -100) (100 0.1 0.25);
- }
+ box (-100 -100 -100) (100 0.1 0.25);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 0.45) (100 0.1 100);
- }
+ box (-100 -100 0.45) (100 0.1 100);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 0.05 0.33) (100 0.1 0.38);
- }
+ box (-100 0.05 0.33) (100 0.1 0.38);
}
{
name c0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
index 72f6e28086e..f7bd0bb97fb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
@@ -22,22 +22,16 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.126 0.08665 0.2565) (0.02 0.090665 0.446);
- }
+ box (-0.126 0.08665 0.2565) (0.02 0.090665 0.446);
}
- {
+ {
name f1Zone;
type faceZoneSet;
action new;
source setAndNormalToFaceZone;
- sourceInfo
- {
- faceSet f1;
- normal (0 1 0);
- }
+ faceSet f1;
+ normal (0 1 0);
}
{
@@ -45,11 +39,8 @@ actions
type cellZoneSet;
action new;
source faceToCell;
- sourceInfo
- {
- set f1Zone;
- option neighbour;
- }
+ set f1Zone;
+ option neighbour;
}
{
@@ -57,10 +48,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
index f737a59393b..0080bf32b9d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -100) (100 0.1 0.25);
- }
+ box (-100 -100 -100) (100 0.1 0.25);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 0.45) (100 0.1 100);
- }
+ box (-100 -100 0.45) (100 0.1 100);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 0.05 0.33) (100 0.1 0.38);
- }
+ box (-100 0.05 0.33) (100 0.1 0.38);
}
{
name c0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
index f737a59393b..0080bf32b9d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -100) (100 0.1 0.25);
- }
+ box (-100 -100 -100) (100 0.1 0.25);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 0.45) (100 0.1 100);
- }
+ box (-100 -100 0.45) (100 0.1 100);
}
{
name c0;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-100 0.05 0.33) (100 0.1 0.38);
- }
+ box (-100 0.05 0.33) (100 0.1 0.38);
}
{
name c0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
index 016d855e58f..aa8e81ff631 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 0 -100 )(0.01001 0.00999 100);
- }
+ box (-0.01001 0 -100 )(0.01001 0.00999 100);
}
{
name heaterCellSet;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
- }
+ box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
}
{
name heater;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
// leftSolid
@@ -55,20 +46,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0 -100 )(-0.01001 0.00999 100);
- }
+ box (-100 0 -100)(-0.01001 0.00999 100);
}
{
name leftSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
// rightSolid
@@ -77,20 +62,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.01001 0 -100 )(100 0.00999 100);
- }
+ box (0.01001 0 -100 )(100 0.00999 100);
}
{
name rightSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
// topAir
@@ -99,20 +78,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0.00999 -100 )(100 100 100);
- }
+ box (-100 0.00999 -100 )(100 100 100);
}
{
name topAir;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
@@ -122,40 +95,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
{
name bottomWaterCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
{
name bottomWaterCellSet;
@@ -167,10 +128,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set bottomWaterCellSet;
- }
+ set bottomWaterCellSet;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
index 73cbe27a8da..c20bf6ab11d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
@@ -23,31 +23,22 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone cylinder;
- }
+ zone cylinder;
}
{
name rotorFaces;
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set rotorCells;
- option all;
- }
+ set rotorCells;
+ option all;
}
{
name rotorFaces;
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (-100 -100 0.1) (100 100 0.15);
- }
+ box (-100 -100 0.1) (100 100 0.15);
}
{
@@ -55,10 +46,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set rotorFaces;
- }
+ set rotorFaces;
}
{
@@ -66,10 +54,7 @@ actions
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (-100 0.249 -100) (100 0.251 100);
- }
+ box (-100 0.249 -100) (100 0.251 100);
}
{
@@ -77,10 +62,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set rotorFaces;
- }
+ set rotorFaces;
}
{
@@ -88,10 +70,7 @@ actions
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (0.249 -100 -100) (0.251 100 100);
- }
+ box (0.249 -100 -100) (0.251 100 100);
}
{
@@ -99,20 +78,14 @@ actions
type faceSet;
action add;
source faceToFace;
- sourceInfo
- {
- set rotorBlades2;
- }
+ set rotorBlades2;
}
{
name rotorBlades;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet rotorBladesFaceSet;
- }
+ faceSet rotorBladesFaceSet;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
index 2ab44cc7d5c..26da96861d3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zones (cylinder innerCylinder);
- }
+ zones (cylinder innerCylinder);
}
{
name rotorCells;
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 0.1) (100 100 0.15);
- }
+ box (-100 -100 0.1) (100 100 0.15);
}
{
name rotor;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rotorCells;
- }
+ set rotorCells;
}
);
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
index 7f34c2cf520..2cf1d8e4776 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
@@ -23,30 +23,21 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 0 -100 )(0.01001 0.00999 100);
- }
+ box (-0.01001 0 -100 )(0.01001 0.00999 100);
}
{
name heaterCellSet;
type cellSet;
action add;
source boxToCell;
- sourceInfo
- {
- box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
- }
+ box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
}
{
name heater;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
// leftSolid
@@ -55,20 +46,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0 -100 )(-0.01001 0.00999 100);
- }
+ box (-100 0 -100)(-0.01001 0.00999 100);
}
{
name leftSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
// rightSolid
@@ -77,20 +62,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.01001 0 -100 )(100 0.00999 100);
- }
+ box (0.01001 0 -100 )(100 0.00999 100);
}
{
name rightSolid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
// topAir
@@ -99,20 +78,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0.00999 -100 )(100 100 100);
- }
+ box (-100 0.00999 -100 )(100 100 100);
}
{
name topAir;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
@@ -122,40 +95,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set heaterCellSet;
- }
+ set heaterCellSet;
}
{
name bottomAirCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set leftSolidCellSet;
- }
+ set leftSolidCellSet;
}
{
name bottomAirCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rightSolidCellSet;
- }
+ set rightSolidCellSet;
}
{
name bottomAirCellSet;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set topAirCellSet;
- }
+ set topAirCellSet;
}
{
name bottomAirCellSet;
@@ -167,10 +128,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set bottomAirCellSet;
- }
+ set bottomAirCellSet;
}
);
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
index e544a8bddfe..68ad86b4c1a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((-4.999 0 -3.999));
- }
+ insidePoints ((-4.999 0 -3.999));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
index ec2a4de33e6..85a4922ec72 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((0.001 0.001 0.001));
- }
+ insidePoints ((0.001 0.001 0.001));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
@@ -51,10 +45,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
{
@@ -62,10 +53,7 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- box (0.0025 0.0045 -100)(0.0075 0.0055 100);
- }
+ box (0.0025 0.0045 -100)(0.0075 0.0055 100);
}
{
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
index 14957ba5c2a..e7288acf458 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -21,10 +21,10 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.001 0.001 0.001));
- }
+ insidePoints
+ (
+ (0.001 0.001 0.001)
+ );
}
{
@@ -32,10 +32,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
@@ -49,11 +46,11 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.0076 0.00151 0.001));
- set c1;
- }
+ set c1;
+ insidePoints
+ (
+ (0.0076 0.00151 0.001)
+ );
}
{
@@ -61,10 +58,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
// Select box to remove from region 1 and 2
@@ -74,10 +68,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
{
@@ -85,10 +76,7 @@ actions
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
{
@@ -96,15 +84,12 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (0.0025 0.0045 -100)(0.0075 0.0055 100)
- (0.0085 0.0025 -100)(0.0095 0.0075 100)
- // (0.0104 0.0025 -100)(0.0115 0.0075 100)
- );
- }
+ boxes
+ (
+ (0.0025 0.0045 -100)(0.0075 0.0055 100)
+ (0.0085 0.0025 -100)(0.0095 0.0075 100)
+ // (0.0104 0.0025 -100)(0.0115 0.0075 100)
+ );
}
{
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
index 826f61c295f..1d2498a6971 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
@@ -21,10 +21,10 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0 -1 0.1));
- }
+ insidePoints
+ (
+ (0 -1 0.1)
+ );
}
{
@@ -32,10 +32,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
index 51c370663d5..75859b5ca28 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (0.099 -0.006 0.004)(0.101 0.006 0.016);
- }
+ box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
{
@@ -33,10 +30,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-10 -10 -10)(0.1 10 10);
- }
+ box (-10 -10 -10)(0.1 10 10);
}
{
@@ -44,11 +38,8 @@ actions
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet cyclicFacesFaceSet;
- cellSet cyclicFacesSlaveCells;
- }
+ faceSet cyclicFacesFaceSet;
+ cellSet cyclicFacesSlaveCells;
}
{
@@ -56,10 +47,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (0.099 -10 -10)(0.101 10 10);
- }
+ box (0.099 -10 -10)(0.101 10 10);
}
{
@@ -67,10 +55,7 @@ actions
type faceSet;
action subtract;
source boxToFace;
- sourceInfo
- {
- box (0.099 -0.006 0.004)(0.101 0.006 0.016);
- }
+ box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
{
@@ -78,10 +63,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet baffleFaceSet;
- }
+ faceSet baffleFaceSet;
}
);
diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
index c7b4393a9fa..d6997901910 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
- }
+ box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
}
);
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
index efe8b3f4c65..cc21e2ed00b 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
@@ -25,20 +25,14 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch couple1;
- }
+ patch couple1;
}
{
name couple1Faces;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet couple1FaceSet;
- }
+ faceSet couple1FaceSet;
}
// Create faceZone for patch couple2
@@ -47,20 +41,14 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch couple2;
- }
+ patch couple2;
}
{
name couple2Faces;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet couple2FaceSet;
- }
+ faceSet couple2FaceSet;
}
// Create cellZone for moving cells in inlet channel
@@ -69,20 +57,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -100) (1.0001 100 100);
- }
+ box (-100 -100 -100) (1.0001 100 100);
}
{
name inletChannel;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set inletChannelCellSet;
- }
+ set inletChannelCellSet;
}
);
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
index a1aea929c53..e69dca47259 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch outerCylinder;
- }
+ patch outerCylinder;
}
{
@@ -33,10 +30,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set boundaryFaces;
- }
+ set boundaryFaces;
}
{
@@ -44,10 +38,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set boundaryFaces;
- }
+ set boundaryFaces;
}
{
@@ -55,11 +46,8 @@ actions
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- normal (0 -1 0); // Vector
- cos 0.3; // Tolerance (max cos of angle)
- }
+ normal (0 -1 0);
+ cos 0.3; // Tolerance (max cos of angle)
}
{
@@ -67,11 +55,8 @@ actions
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- normal (0 1 0); // Vector
- cos 0.3; // Tolerance (max cos of angle)
- }
+ normal (0 1 0);
+ cos 0.3; // Tolerance (max cos of angle)
}
);
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict
index c89d90af46e..a6fb8ca4296 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict
@@ -25,10 +25,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch "AMI.*";
- }
+ patch "AMI.*";
}
);
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
index fcaec4a6697..6c1f46feba8 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
@@ -23,20 +23,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.5 -0.5 -1) (0.5 0.5 1);
- }
+ box (-0.5 -0.5 -1) (0.5 0.5 1);
}
{
name porousBlockage;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set porousBlockageCellSet;
- }
+ set porousBlockageCellSet;
}
);
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
index ebf3952fe09..4fc45824c02 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
@@ -22,31 +22,22 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch side1;
- }
+ patch side1;
}
{
name f0;
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (0 -100 -100)(100 -0.2 100);
- }
+ box (0 -100 -100)(100 -0.2 100);
}
{
name c0;
type cellSet;
action new;
source faceToCell;
- sourceInfo
- {
- set f0;
- option any;
- }
+ set f0;
+ option any;
}
@@ -55,21 +46,15 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch walls;
- }
+ patch walls;
}
{
name c0;
type cellSet;
action subtract;
source faceToCell;
- sourceInfo
- {
- set walls;
- option any;
- }
+ set walls;
+ option any;
}
);
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict b/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
index 32e5372ded9..8080ae795d2 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
@@ -22,20 +22,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (2.05 0.4 -1) (2.1 0.85 1);
- }
+ box (2.05 0.4 -1) (2.1 0.85 1);
}
{
name porousZone;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set porousCells;
- }
+ set porousCells;
}
);
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
index 326e2f3f483..aa8dcff2c83 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
@@ -23,20 +23,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (581850.5 4785805 1061) (581850.8 4785815 1071);
- }
+ box (581850.5 4785805 1061) (581850.8 4785815 1071);
}
{
name actuationDisk1;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set actuationDisk1CellSet;
- }
+ set actuationDisk1CellSet;
}
// actuationDisk2
@@ -45,20 +39,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (581754 4785658 1065) (581754.4 4785668 1075);
- }
+ box (581754 4785658 1065) (581754.4 4785668 1075);
}
{
name actuationDisk2;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set actuationDisk2CellSet;
- }
+ set actuationDisk2CellSet;
}
);
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index 58ff35ed4a2..db3623ba1f1 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -22,12 +22,9 @@ actions
type cellSet;
action new;
- source sphereToCell;
- sourceInfo
- {
- origin (0.125 0.375 0.05);
- radius 0.005;
- }
+ source sphereToCell;
+ origin (0.125 0.375 0.05);
+ radius 0.005;
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
index f237aab344b..e00bfe98868 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
@@ -22,20 +22,14 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch filmWalls;
- }
+ patch filmWalls;
}
{
name wallFilmFaces;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFilmFaceSet;
- }
+ faceSet wallFilmFaceSet;
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index edabc2c08d5..ca05051ed35 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -23,62 +23,43 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (1.5 -10 -10) (2 10 10);
- }
+ box (1.5 -10 -10) (2 10 10);
}
{
name filter;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set filterCellSet;
- }
+ set filterCellSet;
}
-
{
name leftFluidCellSet;
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-10 -10 -10) (1.5 10 10);
- }
+ box (-10 -10 -10) (1.5 10 10);
}
{
name leftFluid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftFluidCellSet;
- }
+ set leftFluidCellSet;
}
{
name rightFluidCellSet;
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (2 -1 -1) (10 10 10);
- }
+ box (2 -1 -1) (10 10 10);
}
{
name rightFluid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightFluidCellSet;
- }
+ set rightFluidCellSet;
}
@@ -88,22 +69,16 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set filterCellSet;
- option all;
- }
+ set filterCellSet;
+ option all;
}
{
name cycLeftFaceSet;
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set leftFluidCellSet;
- option all;
- }
+ set leftFluidCellSet;
+ option all;
}
// Create faceZone from cycLeft
{
@@ -111,10 +86,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet cycLeftFaceSet;
- }
+ faceSet cycLeftFaceSet;
}
// cycRight
@@ -123,22 +95,16 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set filterCellSet;
- option all;
- }
+ set filterCellSet;
+ option all;
}
{
name cycRightFaceSet;
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set rightFluidCellSet;
- option all;
- }
+ set rightFluidCellSet;
+ option all;
}
// Create faceZone from cycRight
{
@@ -146,10 +112,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet cycRightFaceSet;
- }
+ faceSet cycRightFaceSet;
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
index c60ef73a85c..3b1c04ab341 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
@@ -32,40 +32,28 @@ actions
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.4 0.1 0.1) (0.6 0.3 0.3);
- }
+ box (0.4 0.1 0.1) (0.6 0.3 0.3);
}
{
name c0;
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.4 0.1 0.4) (0.6 0.3 0.6);
- }
+ box (0.4 0.1 0.4) (0.6 0.3 0.6);
}
{
name c0;
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.4 0.4 0.1) (0.6 0.6 0.3);
- }
+ box (0.4 0.4 0.1) (0.6 0.6 0.3);
}
{
name c0;
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.4 0.4 0.4) (0.6 0.6 0.6);
- }
+ box (0.4 0.4 0.4) (0.6 0.6 0.6);
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
index 8b7edbdfbfa..73bd3e37495 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
@@ -22,20 +22,14 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch filmWalls;
- }
+ patch filmWalls;
}
{
name wallFilmFaces;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFilmFaceSet;
- }
+ faceSet wallFilmFaceSet;
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
index f237aab344b..e00bfe98868 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
@@ -22,20 +22,14 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch filmWalls;
- }
+ patch filmWalls;
}
{
name wallFilmFaces;
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet wallFilmFaceSet;
- }
+ faceSet wallFilmFaceSet;
}
);
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
index 9645fc72802..399c1054672 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
@@ -22,40 +22,28 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.00001 -0.00001 -1) (0.10001 0.00001 1);
- }
+ box (-0.00001 -0.00001 -1) (0.10001 0.00001 1);
}
{
name sideFaces2;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box ( 0.09999 -0.00001 -1) (0.10001 0.05001 1);
- }
+ box (0.09999 -0.00001 -1) (0.10001 0.05001 1);
}
{
name sideFaces3;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.00001 0.04999 -1) (1.00001 0.05001 1);
- }
+ box (-0.00001 0.04999 -1) (1.00001 0.05001 1);
}
{
name sideFaces4;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.00001 -0.00001 -1) (0.00001 0.05001 1);
- }
+ box (-0.00001 -0.00001 -1) (0.00001 0.05001 1);
}
);
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
index 8d1ac69992b..306b566468c 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -0.2)(100 100 100);
- }
+ box (-100 -100 -0.2)(100 100 100);
}
{
@@ -33,11 +30,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
{
@@ -51,11 +45,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -65,10 +56,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.32 -100 -100)(100 100 100);
- }
+ box (-0.32 -100 -100)(100 100 100);
}
{
@@ -76,11 +64,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
{
@@ -94,11 +79,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -108,11 +90,8 @@ actions
type cellSet;
action new;
source sphereToCell;
- sourceInfo
- {
- origin (-0.3 -0.3 -0.3);
- radius 0.4;
- }
+ origin (-0.3 -0.3 -0.3);
+ radius 0.4;
}
{
@@ -120,11 +99,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set sp;
- option all;
- }
+ set sp;
+ option all;
}
{
@@ -138,11 +114,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set sp;
- option all;
- }
+ set sp;
+ option all;
}
);
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
index 7fb6380806c..c09d82ac66d 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
@@ -139,8 +139,8 @@ FoamFile
// source fieldToCell;
// {
// field U; // Note: uses mag(U) since volVectorField
-// min 0.1;
-// max 0.5;
+// min 0.1;
+// max 0.5;
// }
//
// // Mesh region (non-face connected part of (subset of)mesh)
@@ -204,7 +204,7 @@ FoamFile
// // Faces with normal to within certain angle aligned with vector.
// source normalToFace;
// {
-// normal (0 0 1); // Vector
+// normal (0 0 1); // Vector
// cos 0.01; // Tolerance (max cos of angle)
// }
//
@@ -222,15 +222,15 @@ FoamFile
// // Select based on cellSet
// source cellToPoint;
// {
-// set c0;
-// option all; // all points of cell
+// set c0;
+// option all; // all points of cell
// }
//
// // Select based on faceSet
// source faceToPoint;
// {
-// set f0; // name of faceSet
-// option all; // all points of face
+// set f0; // name of faceSet
+// option all; // all points of face
// }
//
// // Select by explicitly providing point labels
@@ -304,7 +304,7 @@ actions
name background;
type cellSet;
action new;
- source surfaceToCell;
+ source surfaceToCell;
sourceInfo
{
file "constant/triSurface/flange.obj";
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
index 0d5969cdf0a..56b3acb7d5c 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
@@ -26,10 +26,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 $zSlice)(100 100 100);
- }
+ box (-100 -100 $zSlice)(100 100 100);
}
{
@@ -37,11 +34,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
{
@@ -55,11 +49,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -69,10 +60,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 $ySlice -100)(100 100 100);
- }
+ box (-100 $ySlice -100)(100 100 100);
}
{
@@ -80,11 +68,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set y;
- option all;
- }
+ set y;
+ option all;
}
{
@@ -98,11 +83,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set y;
- option all;
- }
+ set y;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -112,10 +94,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box ($xSlice -100 -100)(100 100 100);
- }
+ box ($xSlice -100 -100)(100 100 100);
}
{
@@ -123,11 +102,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
{
@@ -141,11 +117,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
);
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
index 2759e0c89d2..b2f5d09cea1 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 0)(100 100 100);
- }
+ box (-100 -100 0)(100 100 100);
}
{
@@ -33,11 +30,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
{
@@ -51,11 +45,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set z;
- option all;
- }
+ set z;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -65,10 +56,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100 0.1 -100)(100 100 100);
- }
+ box (-100 0.1 -100)(100 100 100);
}
{
@@ -76,11 +64,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set y;
- option all;
- }
+ set y;
+ option all;
}
{
@@ -94,11 +79,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set y;
- option all;
- }
+ set y;
+ option all;
}
// ~~~~~~~~~~~~~~~~ //
@@ -108,10 +90,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.3 -100 -100)(100 100 100);
- }
+ box (0.3 -100 -100)(100 100 100);
}
{
@@ -119,11 +98,8 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
{
@@ -137,11 +113,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set x;
- option all;
- }
+ set x;
+ option all;
}
);
diff --git a/tutorials/mesh/parallel/filter/system/topoSetDict b/tutorials/mesh/parallel/filter/system/topoSetDict
index 08681f52eb2..d88a8df8bbb 100644
--- a/tutorials/mesh/parallel/filter/system/topoSetDict
+++ b/tutorials/mesh/parallel/filter/system/topoSetDict
@@ -23,20 +23,14 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (1.5 -10 -10) (2 10 10);
- }
+ box (1.5 -10 -10) (2 10 10);
}
{
name filter;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set filterCells;
- }
+ set filterCells;
}
@@ -45,40 +39,28 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-10 -10 -10) (1.5 10 10);
- }
+ box (-10 -10 -10) (1.5 10 10);
}
{
name leftFluid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set leftFluidCells;
- }
+ set leftFluidCells;
}
{
name rightFluidCells;
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (2 -1 -1) (10 10 10);
- }
+ box (2 -1 -1) (10 10 10);
}
{
name rightFluid;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set rightFluidCells;
- }
+ set rightFluidCells;
}
@@ -88,22 +70,16 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set filterCells;
- option all;
- }
+ set filterCells;
+ option all;
}
{
name cycLeftFaces;
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set leftFluidCells;
- option all;
- }
+ set leftFluidCells;
+ option all;
}
// Create faceZone from cycLeft
{
@@ -111,10 +87,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet cycLeftFaces; // name of faceSet
- }
+ faceSet cycLeftFaces; // name of faceSet
}
// cycRight
@@ -123,22 +96,16 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set filterCells;
- option all;
- }
+ set filterCells;
+ option all;
}
{
name cycRightFaces;
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set rightFluidCells;
- option all;
- }
+ set rightFluidCells;
+ option all;
}
// Create faceZone from cycRight
{
@@ -146,10 +113,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet cycRightFaces; // name of faceSet
- }
+ faceSet cycRightFaces; // name of faceSet
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
index 79a306b3005..df713e959af 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
@@ -21,13 +21,10 @@ actions
name range1;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 13.36;
- max 18.47;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 13.36;
+ max 18.47;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
index d5dafe5ad11..cf9e47d8e18 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
@@ -21,13 +21,10 @@ actions
name range1;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 7.00;
- max 18.47;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 7.0;
+ max 18.47;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
index 9f080f73255..8c0d1f9e146 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
@@ -21,13 +21,10 @@ actions
name range1;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 3.67;
- max 18.47;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 3.67;
+ max 18.47;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
index 7cf11f55940..209ee71db34 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
@@ -21,13 +21,10 @@ actions
name tier1;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 0.64;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 0.64;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
index 449ba4be7d7..dc9ad5fe1fe 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
@@ -21,13 +21,10 @@ actions
name tier2;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 1.03;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 1.03;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
index b6403dac16f..e2d4af298d1 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
@@ -21,13 +21,10 @@ actions
name tier3;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 1.94;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 1.94;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
index b679a929c65..8ff5f8feeb5 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
@@ -21,13 +21,10 @@ actions
name tier4;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 3.67;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 3.67;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
index bec068d51f6..522d090aa6a 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
@@ -21,13 +21,10 @@ actions
name tier5;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 7.00;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 7.0;
}
);
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
index 2a0afb91fa3..516bdea5301 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
@@ -21,13 +21,10 @@ actions
name tier6;
type cellSet;
action new;
- source fieldToCell;
- sourceInfo
- {
- field radiusFieldXY;
- min 0.0;
- max 13.36;
- }
+ source fieldToCell;
+ field radiusFieldXY;
+ min 0;
+ max 13.36;
}
);
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
index eda3047248d..c867002b1ac 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
@@ -23,31 +23,22 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100e-3 -100e-3 -100e-3) (2e-3 100e-3 100e-3);
- }
+ box (-100e-3 -100e-3 -100e-3) (2e-3 100e-3 100e-3);
}
{
name A;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (1.999e-3 -100e-3 -100e-3) (2.001e-3 100e-3 100e-3);
- }
+ box (1.999e-3 -100e-3 -100e-3) (2.001e-3 100e-3 100e-3);
}
{
name A;
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet A; // name of faceSet
- cellSet leftA; // name of cellSet of slave side
- }
+ faceSet A; // name of faceSet
+ cellSet leftA; // name of cellSet of slave side
}
@@ -57,31 +48,22 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-100e-3 -100e-3 -100e-3) (8e-3 100e-3 100e-3);
- }
+ box (-100e-3 -100e-3 -100e-3) (8e-3 100e-3 100e-3);
}
{
name B;
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (7.999e-3 -100e-3 -100e-3) (8.001e-3 100e-3 100e-3);
- }
+ box (7.999e-3 -100e-3 -100e-3) (8.001e-3 100e-3 100e-3);
}
{
name B;
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet B; // name of faceSet
- cellSet leftB; // name of cellSet of slave side
- }
+ faceSet B; // name of faceSet
+ cellSet leftB; // name of cellSet of slave side
}
);
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
index 754f878051b..1558cce2f25 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
@@ -22,13 +22,10 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints
- (
- (0.99 0.99 0.99)
- );
- }
+ insidePoints
+ (
+ (0.99 0.99 0.99)
+ );
}
{
@@ -36,10 +33,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1 -1 -1)(0.5 0.5 0.5);
- }
+ box (-1 -1 -1)(0.5 0.5 0.5);
}
{
@@ -47,10 +41,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set corner;
- }
+ set corner;
}
{
@@ -58,10 +49,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set outer;
- }
+ set outer;
}
{
@@ -69,10 +57,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set corner;
- }
+ set corner;
}
{
@@ -86,20 +71,14 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set outer;
- }
+ set outer;
}
{
name final;
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set inner;
- }
+ set inner;
}
);
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
index c5d0a898ebc..6af6b99ed7a 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
@@ -19,10 +19,7 @@ newFromPatch
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch outer;
- }
+ patch outer;
}
subsetNormal
@@ -30,10 +27,7 @@ subsetNormal
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- cos 0.1;
- }
+ cos 0.1;
}
actions
@@ -47,10 +41,7 @@ actions
{
name outerx;
$subsetNormal;
- sourceInfo
- {
- normal (-1 0 0);
- }
+ normal (-1 0 0);
}
// outery
@@ -62,10 +53,7 @@ actions
{
name outery;
$subsetNormal;
- sourceInfo
- {
- normal (0 -1 0);
- }
+ normal (0 -1 0);
}
// outerz
@@ -77,10 +65,7 @@ actions
{
name outerz;
$subsetNormal;
- sourceInfo
- {
- normal (0 0 -1);
- }
+ normal (0 0 -1);
}
);
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
index f442fd015ba..62e6b498b3c 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (-0.01 -0.01 -0.03)(0.01 0.01 0.001);
- }
+ box (-0.01 -0.01 -0.03)(0.01 0.01 0.001);
}
{
@@ -33,10 +30,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet inlet;
- }
+ faceSet inlet;
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
index c78f5337207..7f407764e69 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.004 -0.001 -1) (0.012 0.001 1);
- }
+ 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
index 80d499b242f..3f73a7283d3 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
- }
+ 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
index b7bf3eaec12..9d915e1a4c1 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.00475 -0.000375 -1) (0.009 0.000375 1);
- }
+ 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
index c78f5337207..7f407764e69 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.004 -0.001 -1) (0.012 0.001 1);
- }
+ 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
index 80d499b242f..3f73a7283d3 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
- }
+ 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
index b7bf3eaec12..9d915e1a4c1 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.00475 -0.000375 -1) (0.009 0.000375 1);
- }
+ box (0.00475 -0.000375 -1) (0.009 0.000375 1);
}
);
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
index c78f5337207..7f407764e69 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.004 -0.001 -1) (0.012 0.001 1);
- }
+ 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
index 80d499b242f..3f73a7283d3 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
- }
+ 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
index b7bf3eaec12..9d915e1a4c1 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.00475 -0.000375 -1) (0.009 0.000375 1);
- }
+ box (0.00475 -0.000375 -1) (0.009 0.000375 1);
}
);
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
index 15b0923bb7e..e115f5e5e39 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
@@ -25,10 +25,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone topBlock;
- }
+ zone topBlock;
}
// Create cellSet centralBlock from cellZone centralBlock created by blockMesh
@@ -37,22 +34,16 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone centralBlock;
- }
+ zone centralBlock;
}
// Create cellSet bottomBlock from cellZone bottomBlock created by blockMesh
{
- name bottomBlockCells;
- type cellSet;
- action new;
- source zoneToCell;
- sourceInfo
- {
- zone bottomBlock;
- }
+ name bottomBlockCells;
+ type cellSet;
+ action new;
+ source zoneToCell;
+ zone bottomBlock;
}
@@ -64,10 +55,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch top;
- }
+ patch top;
}
// Only keep those that border the top block topBlock
@@ -76,11 +64,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set topBlockCells;
- option all;
- }
+ set topBlockCells;
+ option all;
}
// Convert top from faceSet to faceZone
@@ -89,11 +74,8 @@ actions
type faceZoneSet;
action new;
source setAndNormalToFaceZone;
- sourceInfo
- {
- faceSet top;
- normal (0 -1 0);
- }
+ faceSet top;
+ normal (0 -1 0);
}
@@ -101,15 +83,12 @@ actions
// Get all faces in topBlock
{
- name centralTopFaces;
- type faceSet;
- action new;
- source cellToFace;
- sourceInfo
- {
- set topBlockCells;
- option all;
- }
+ name centralTopFaces;
+ type faceSet;
+ action new;
+ source cellToFace;
+ set topBlockCells;
+ option all;
}
// Get the faces that border topBlock and centralBlock
@@ -118,11 +97,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set centralBlockCells;
- option all;
- }
+ set centralBlockCells;
+ option all;
}
// Convert topBlockFaces from faceSet to faceZone
@@ -131,11 +107,8 @@ actions
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet centralTopFaces;
- cellSet topBlockCells;
- }
+ faceSet centralTopFaces;
+ cellSet topBlockCells;
}
@@ -144,15 +117,12 @@ actions
// Get all faces in bottomBlock
{
- name centralBottomFaces;
- type faceSet;
- action new;
- source cellToFace;
- sourceInfo
- {
- set bottomBlockCells;
- option all;
- }
+ name centralBottomFaces;
+ type faceSet;
+ action new;
+ source cellToFace;
+ set bottomBlockCells;
+ option all;
}
// Get the faces that border centralBlock and bottomBlock
@@ -161,11 +131,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set centralBlockCells;
- option all;
- }
+ set centralBlockCells;
+ option all;
}
// Convert centralBottomFaces from faceSet to faceZone
@@ -174,11 +141,8 @@ actions
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet centralBottomFaces;
- cellSet centralBlockCells;
- }
+ faceSet centralBottomFaces;
+ cellSet centralBlockCells;
}
@@ -190,10 +154,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch bottom;
- }
+ patch bottom;
}
// Only keep those that border the bottom block bottomBlockCells
@@ -202,11 +163,8 @@ actions
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set bottomBlockCells;
- option all;
- }
+ set bottomBlockCells;
+ option all;
}
// Convert bottom from faceSet to faceZone
@@ -215,11 +173,8 @@ actions
type faceZoneSet;
action new;
source setAndNormalToFaceZone;
- sourceInfo
- {
- faceSet bottom;
- normal (0 1 0);
- }
+ faceSet bottom;
+ normal (0 1 0);
}
@@ -233,30 +188,21 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set topBlockCells;
- }
+ set topBlockCells;
}
{
name LARTopCells;
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- box (-100 0.95 -100)(100 100 100);
- }
+ box (-100 0.95 -100)(100 100 100);
}
{
name LARTopCells;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set LARTopCells;
- }
+ set LARTopCells;
}
// upate old topBlock cellZone
@@ -265,10 +211,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set LARTopCells;
- }
+ set LARTopCells;
}
{
name topBlock;
@@ -280,45 +223,33 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set topBlockCells;
- }
+ set topBlockCells;
}
// generate face zone between LARTopCells and topBlockCells cellSets
{
- name LARTopFaces;
- type faceSet;
- action new;
- source cellToFace;
- sourceInfo
- {
- set LARTopCells;
- option all;
- }
+ name LARTopFaces;
+ type faceSet;
+ action new;
+ source cellToFace;
+ set LARTopCells;
+ option all;
}
{
name LARTopFaces;
type faceSet;
action subset;
source cellToFace;
- sourceInfo
- {
- set topBlockCells;
- option all;
- }
+ set topBlockCells;
+ option all;
}
{
name LARTopFaces;
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet LARTopFaces;
- cellSet topBlockCells;
- }
+ faceSet LARTopFaces;
+ cellSet topBlockCells;
}
);
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
index fb0e9387899..4fc1d5cc617 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0 0 -2e-05) (0.0036 0.0008 4e-05);
- }
+ box (0 0 -2e-05) (0.0036 0.0008 4e-05);
}
);
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
index 685dc67477e..e6747cc2e94 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0 0 -2e-05) (0.0036 0.0003 2e-05);
- }
+ box (0 0 -2e-05) (0.0036 0.0003 2e-05);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
index ec61daf4a7f..85e5243894b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-10 -6 -3) (10 0 3);
- }
+ box (-10 -6 -3) (10 0 3);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
index 02dd242335f..273ab129c08 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-5 -3 -2.5) (9 0 2);
- }
+ box (-5 -3 -2.5) (9 0 2);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
index 76994848ebd..5e7fd9f0e2c 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-3 -1.5 -1) (8 0 1.5);
- }
+ box (-3 -1.5 -1) (8 0 1.5);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
index 6baf0e66fea..9d00c592df6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-2 -1 -0.6) (7 0 1);
- }
+ box (-2 -1 -0.6) (7 0 1);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
index e9892e9a7fc..7096bb3c6b5 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1 -0.6 -0.3) (6.5 0 0.8);
- }
+ box (-1 -0.6 -0.3) (6.5 0 0.8);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
index bcdc33cfd99..58de4332772 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.5 -0.55 -0.15) (6.25 0 0.65);
- }
+ box (-0.5 -0.55 -0.15) (6.25 0 0.65);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
index ec61daf4a7f..85e5243894b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-10 -6 -3) (10 0 3);
- }
+ box (-10 -6 -3) (10 0 3);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
index 02dd242335f..273ab129c08 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-5 -3 -2.5) (9 0 2);
- }
+ box (-5 -3 -2.5) (9 0 2);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
index 76994848ebd..5e7fd9f0e2c 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-3 -1.5 -1) (8 0 1.5);
- }
+ box (-3 -1.5 -1) (8 0 1.5);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
index 6baf0e66fea..9d00c592df6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-2 -1 -0.6) (7 0 1);
- }
+ box (-2 -1 -0.6) (7 0 1);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
index e9892e9a7fc..7096bb3c6b5 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1 -0.6 -0.3) (6.5 0 0.8);
- }
+ box (-1 -0.6 -0.3) (6.5 0 0.8);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
index bcdc33cfd99..17d196e9c18 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
@@ -22,10 +22,8 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-0.5 -0.55 -0.15) (6.25 0 0.65);
- }
+
+ box (-0.5 -0.55 -0.15) (6.25 0 0.65);
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
index 8da88afab99..14cb7f452a5 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
- sourceInfo
- {
- box (0.3015 0.0493 -1) (0.3069 0.2077 1);
- }
+ box (0.3015 0.0493 -1) (0.3069 0.2077 1);
}
{
@@ -33,10 +30,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1 0 -1) (0.305 0.31 1);
- }
+ box (-1 0 -1) (0.305 0.31 1);
}
{
@@ -44,11 +38,9 @@ actions
type faceZoneSet;
action new;
source setsToFaceZone;
- sourceInfo
- {
- faceSet cyclicFacesFaceSet;
- cellSet cyclicFacesSlaveCells;
- }
+
+ faceSet cyclicFacesFaceSet;
+ cellSet cyclicFacesSlaveCells;
}
);
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
index 5525b4118fa..ced2a13f4e5 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.35 0.35 0.1) (0.65 0.55 0.6);
- }
+ box (0.35 0.35 0.1) (0.65 0.55 0.6);
}
{
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
index 49101640d22..6a6337c68aa 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
@@ -32,10 +32,7 @@ actions
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.375 0.375 0) (0.625 0.625 0.25);
- }
+ box (0.375 0.375 0) (0.625 0.625 0.25);
}
);
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
index 1b7f229e2cc..6c7e01070fe 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
@@ -21,15 +21,13 @@ actions
name blockage;
type cellSet;
action new;
-// source boxToCell;
+ // source boxToCell;
+ // box (0.015 0.010 0.015) (0.035 0.015 0.035);
+
source cylinderToCell;
- sourceInfo
- {
-// box (0.015 0.010 0.015) (0.035 0.015 0.035);
- p1 (0.025 0.02 0.025);
- p2 (0.025 0.022 0.025);
- radius 0.01;
- }
+ p1 (0.025 0.02 0.025);
+ p2 (0.025 0.022 0.025);
+ radius 0.01;
}
{
name blockage;
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
index 5d45a4ed6d6..118dde1e017 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch sides;
- }
+ patch sides;
}
{
@@ -33,10 +30,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet f0;
- }
+ faceSet f0;
}
);
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
index c7a28566808..fd6e7d83816 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
@@ -22,12 +22,10 @@ actions
type cellSet;
action new;
source cylinderToCell;
- sourceInfo
- {
- p1 (0.025 1 0.025);
- p2 (0.025 0.049 0.025);
- radius 0.0015;
- }
+
+ p1 (0.025 1 0.025);
+ p2 (0.025 0.049 0.025);
+ radius 0.0015;
}
// Get all faces in cellSet and assign to injectorFaces
@@ -36,11 +34,9 @@ actions
type faceSet;
action new;
source cellToFace;
- sourceInfo
- {
- set c0;
- option all;
- }
+
+ set c0;
+ option all;
}
// Keep in injectorFaces all faces in boundary faces
@@ -49,9 +45,6 @@ actions
type faceSet;
action subset;
source boundaryToFace;
- sourceInfo
- {
- }
}
);
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict
index f9d5d483cbf..4fd27f90b7c 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict
@@ -21,12 +21,10 @@ actions
type cellZoneSet;
action new;
source fieldToCell;
- sourceInfo
- {
- field MangrovesIndex;
- min 0.5;
- max 1.5;
- }
+
+ field MangrovesIndex;
+ min 0.5;
+ max 1.5;
}
);
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
index 49101640d22..6a6337c68aa 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
@@ -32,10 +32,7 @@ actions
type cellSet;
action subtract;
source boxToCell;
- sourceInfo
- {
- box (0.375 0.375 0) (0.625 0.625 0.25);
- }
+ box (0.375 0.375 0) (0.625 0.625 0.25);
}
);
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
index 12e3841fc99..146dc754ef9 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
@@ -22,15 +22,12 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (.1 -1e10 0.08) (.9 1e10 0.2)
- (.75 -1e10 0.2) (.92 1e10 0.9)
- (.1 -1e10 0.2) (.25 1e10 0.7)
- );
- }
+ boxes
+ (
+ (0.1 -1e10 0.08) (0.9 1e10 0.2)
+ (0.75 -1e10 0.2) (0.92 1e10 0.9)
+ (0.1 -1e10 0.2) (0.25 1e10 0.7)
+ );
}
);
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2 b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
index c94a8d22bee..d2bd5917dca 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
@@ -22,13 +22,10 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (.4 -1e10 0.09) (.7 1e10 0.15)
- );
- }
+ boxes
+ (
+ (0.4 -1e10 0.09) (0.7 1e10 0.15)
+ );
}
);
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1 b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
index cf2b62dd632..8364e083817 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1e10 -1e10 0.3) (1e10 1e10 0.7);
- }
+ box (-1e10 -1e10 0.3) (1e10 1e10 0.7);
}
);
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2 b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
index 76df522f1be..bfc25ea71f2 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (-1e10 -1e10 0.4) (1e10 1e10 0.6);
- }
+ box (-1e10 -1e10 0.4) (1e10 1e10 0.6);
}
);
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
index a1aea929c53..e69dca47259 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch outerCylinder;
- }
+ patch outerCylinder;
}
{
@@ -33,10 +30,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set boundaryFaces;
- }
+ set boundaryFaces;
}
{
@@ -44,10 +38,7 @@ actions
type faceSet;
action new;
source faceToFace;
- sourceInfo
- {
- set boundaryFaces;
- }
+ set boundaryFaces;
}
{
@@ -55,11 +46,8 @@ actions
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- normal (0 -1 0); // Vector
- cos 0.3; // Tolerance (max cos of angle)
- }
+ normal (0 -1 0);
+ cos 0.3; // Tolerance (max cos of angle)
}
{
@@ -67,11 +55,8 @@ actions
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- normal (0 1 0); // Vector
- cos 0.3; // Tolerance (max cos of angle)
- }
+ normal (0 1 0);
+ cos 0.3; // Tolerance (max cos of angle)
}
);
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
index c89d90af46e..a6fb8ca4296 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
@@ -25,10 +25,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch "AMI.*";
- }
+ patch "AMI.*";
}
);
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
index 13a0176bd45..692065dfd8d 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
@@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone background;
- }
+ zone background;
}
{
name hullBox0; // all around bgr
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone hullBox;
- }
+ zone hullBox;
}
{
name propeller0; // all around bgr
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone propeller;
- }
+ zone propeller;
}
{
name rudder0; // all around bgr
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rudder;
- }
+ zone rudder;
}
{
@@ -62,25 +50,18 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set hullBox0;
- }
+ set hullBox0;
}
-
{
name box; // hole in mesh
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (0.05 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
- );
- }
+ boxes
+ (
+ (0.05 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
+ );
}
{
@@ -93,40 +74,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set box;
- }
+ set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set propeller0;
- }
+ set propeller0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rudder0;
- }
+ set rudder0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set bgr0;
- }
+ set bgr0;
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
index cd94103ab28..7121b53baa8 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
@@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone background;
- }
+ zone background;
}
{
name hullBox0; // all around hull
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone hullBox;
- }
+ zone hullBox;
}
{
name propeller0; // all around propeller
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone propeller;
- }
+ zone propeller;
}
{
name rudder0; // all around rudder
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rudder;
- }
+ zone rudder;
}
{
@@ -62,10 +50,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set propeller0;
- }
+ set propeller0;
}
@@ -74,13 +59,10 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
+ boxes
+ (
(-0.0199 -0.0499 -0.0499)( -0.00998 0.0499 0.0499) //propeller
- );
- }
+ );
}
{
@@ -93,40 +75,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set box;
- }
+ set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set rudder0;
- }
+ set rudder0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set hullBox0;
- }
+ set hullBox0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set bgr0;
- }
+ set bgr0;
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
index c404227953d..0a7d6aea766 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
@@ -21,13 +21,10 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (-0.2 -0.2 -0.2)(0.0 0.2 0.2) //hullBox
- );
- }
+ boxes
+ (
+ (-0.2 -0.2 -0.2)(0.0 0.2 0.2) //hullBox
+ );
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
index b70cb4fee3b..c88acea18c2 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
@@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone background;
- }
+ zone background;
}
{
name hullBox0; // all around hull
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone hullBox;
- }
+ zone hullBox;
}
{
name propeller0; // all around propeller
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone propeller;
- }
+ zone propeller;
}
{
name rudder0; // all around rudder
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rudder;
- }
+ zone rudder;
}
{
@@ -62,10 +50,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set rudder0;
- }
+ set rudder0;
}
@@ -74,13 +59,10 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
+ boxes
+ (
(-0.10 -0.0749 -0.00499)(-0.050 0.0749 0.00499) //rudder
- );
- }
+ );
}
{
@@ -93,40 +75,28 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set box;
- }
+ set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set propeller0;
- }
+ set propeller0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set hullBox0;
- }
+ set hullBox0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set bgr0;
- }
+ set bgr0;
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
index 117b950b96f..5d96b34c87e 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
- sourceInfo
- {
- insidePoints ((0.1 0.1 0.1));
- }
+ insidePoints ((0.1 0.1 0.1));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
index 3deeb03c5c1..aa770a9f3c7 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.38 0.38 0.2) (0.62 0.62 0.6);
- }
+ box (0.38 0.38 0.2) (0.62 0.62 0.6);
}
{
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
index 95d02e89a80..70e878dc036 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.001 0.001 0.001));
- }
+ insidePoints ((0.001 0.001 0.001));
}
{
@@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c0;
- }
+ set c0;
}
{
@@ -49,11 +43,8 @@ actions
type cellSet;
action new;
source regionsToCell;
- sourceInfo
- {
- insidePoints ((0.0116 0.00151 0.001));
- set c1;
- }
+ insidePoints ((0.0116 0.00151 0.001));
+ set c1;
}
{
@@ -61,10 +52,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
// Select box to remove from region 1 and 2
@@ -74,10 +62,7 @@ actions
type cellSet;
action new;
source cellToCell;
- sourceInfo
- {
- set c1;
- }
+ set c1;
}
{
@@ -85,10 +70,7 @@ actions
type cellSet;
action add;
source cellToCell;
- sourceInfo
- {
- set c2;
- }
+ set c2;
}
{
@@ -96,14 +78,11 @@ actions
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- boxes
- (
- (0.0025 0.0045 -100)(0.0075 0.0055 100)
- (0.0125 0.0025 -100)(0.0135 0.0075 100)
- );
- }
+ boxes
+ (
+ (0.0025 0.0045 -100)(0.0075 0.0055 100)
+ (0.0125 0.0025 -100)(0.0135 0.0075 100)
+ );
}
{
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
index 8e258e26d37..22770a8bf52 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.1 0.8 -100) (0.4 100 100);
- }
+ box (0.1 0.8 -100) (0.4 100 100);
}
{
@@ -39,10 +36,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch freeSurface;
- }
+ patch freeSurface;
}
{
@@ -50,10 +44,7 @@ actions
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (-100 0.9 -100) (0.2 100 100);
- }
+ box (-100 0.9 -100) (0.2 100 100);
}
{
@@ -61,10 +52,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet f0FaceSet;
- }
+ faceSet f0FaceSet;
}
);
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
index f1f9c238617..7c1535be74c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
@@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch floatingObject;
- }
+ patch floatingObject;
}
{
@@ -33,11 +30,8 @@ actions
type faceSet;
action subset;
source normalToFace;
- sourceInfo
- {
- normal (0 1 0); // Vector
- cos 0.01; // Tolerance (max cos of angle)
- }
+ normal (0 1 0); // Vector
+ cos 0.01; // Tolerance (max cos of angle)
}
);
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
index 8e258e26d37..22770a8bf52 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceInfo
- {
- box (0.1 0.8 -100) (0.4 100 100);
- }
+ box (0.1 0.8 -100) (0.4 100 100);
}
{
@@ -39,10 +36,7 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- patch freeSurface;
- }
+ patch freeSurface;
}
{
@@ -50,10 +44,7 @@ actions
type faceSet;
action subset;
source boxToFace;
- sourceInfo
- {
- box (-100 0.9 -100) (0.2 100 100);
- }
+ box (-100 0.9 -100) (0.2 100 100);
}
{
@@ -61,10 +52,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
- sourceInfo
- {
- faceSet f0FaceSet;
- }
+ faceSet f0FaceSet;
}
);
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 1aa54cc8196..bf60e2bdc0c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceInfo
- {
- zone rotor;
- }
+ zone rotor;
}
);
--
GitLab