From 5982a1aab45e6d1231ed6a507ac89ff7877185d7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Jun 2020 10:11:33 +0200
Subject: [PATCH] STYLE: update tutorials
- use simpler decomposeParDict in tutorials, several had old
'boilerplate' decomposeParDict
- use simpler libs () format
- update surface sampling to use dictionary format
---
.../hexRef8/block/system/decomposeParDict | 155 ------------------
.../cavity/system/decomposeParDict | 131 ---------------
.../cavity/system/decomposeParDict-scotch | 1 +
.../heatTransfer/system/decomposeParDict | 10 +-
.../cavity_pinched/system/decomposeParDict | 125 +-------------
.../movingCone/system/cuttingPlane | 6 +-
.../angledDuct/implicit/system/sampling | 6 +-
.../gasMixing/injectorPipe/system/fluxSummary | 6 +-
.../squareBend/system/samplingDebug | 4 +-
.../movingBox/system/decomposeParDict | 8 +-
.../constrained/SQP/system/decomposeParDict | 8 +-
.../unconstrained/SD/system/decomposeParDict | 8 +-
.../transient/system/cuttingPlane | 6 +-
.../LES/vortexShed/system/controlDict | 6 +-
.../rotatingFanInRoom/system/decomposeParDict | 5 +-
.../laminar/movingCone/system/cuttingPlane | 6 +-
.../pisoFoam/LES/pitzDaily/system/controlDict | 13 +-
.../LES/pitzDailyMapped/system/controlDict | 13 +-
.../simpleFoam/airFoil2D/system/controlDict | 4 +-
.../simpleFoam/bump2D/system/decomposeParDict | 4 +-
.../simpleFoam/motorBike/system/cuttingPlane | 6 +-
.../simpleFoam/squareBend/system/sampling | 4 +-
.../squareBend/system/samplingDebug | 4 +-
.../system/cuttingPlane | 6 +-
.../laminar/sloshingTank2D/system/controlDict | 6 +-
.../poolEvaporation/system/decomposeParDict | 22 +--
.../laminar/sloshingTank2D/system/controlDict | 6 +-
.../sloshingTank2D3DoF/system/controlDict | 6 +-
.../sloshingTank2D/system/controlDict | 6 +-
29 files changed, 76 insertions(+), 515 deletions(-)
delete mode 100644 applications/test/hexRef8/block/system/decomposeParDict
diff --git a/applications/test/hexRef8/block/system/decomposeParDict b/applications/test/hexRef8/block/system/decomposeParDict
deleted file mode 100644
index c8e54bf2dce..00000000000
--- a/applications/test/hexRef8/block/system/decomposeParDict
+++ /dev/null
@@ -1,155 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- note "mesh decomposition control dictionary";
- object decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 2;
-
-//- Use the volScalarField named here as a weight for each cell in the
-// decomposition. For example, use a particle population field to decompose
-// for a balanced number of particles in a lagrangian simulation.
-// weightField dsmcRhoNMean;
-
-//method scotch;
-//method hierarchical;
-// method simple;
-//method metis;
-method manual;
-// method multiLevel;
-// method structured; // does 2D decomposition of structured mesh
-
-multiLevelCoeffs
-{
- // Decomposition methods to apply in turn. This is like hierarchical but
- // fully general - every method can be used at every level.
-
- level0
- {
- numberOfSubdomains 64;
- //method simple;
- //simpleCoeffs
- //{
- // n (2 1 1);
- // delta 0.001;
- //}
- method scotch;
- }
- level1
- {
- numberOfSubdomains 4;
- method scotch;
- }
-}
-
-// Desired output
-
-simpleCoeffs
-{
- n (2 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (1 2 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- method recursive;
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
-scotchCoeffs
-{
- //processorWeights
- //(
- // 1
- // 1
- // 1
- // 1
- //);
- //writeGraph true;
- //strategy "b";
-}
-
-manualCoeffs
-{
- dataFile "manualDecomposition";
-}
-
-structuredCoeffs
-{
- // Patches to do 2D decomposition on. Structured mesh only; cells have
- // to be in 'columns' on top of patches.
- patches (movingWall);
-
- // Method to use on the 2D subset
- method scotch;
-}
-
-
-/*
-constraints
-{
- //- Keep owner and neighbour on same processor for faces in zones:
- faces
- {
- type preserveFaceZones;
- zones (heater solid1 solid3);
- }
- //- Keep owner and neighbour on same processor for faces in patches:
- // (makes sense only for cyclic patches)
- patches
- {
- type preservePatches,
- patches (cyclic_half0 cyclic_half1);
- }
- //- Keep all of faceSet on a single processor. This puts all cells
- // connected with a point, edge or face on the same processor.
- // (just having face connected cells might not guarantee a balanced
- // decomposition)
- // The processor can be -1 (the decompositionMethod chooses the processor
- // for a good load balance) or explicitly provided (upsets balance).
- processors
- {
- type singleProcessorFaceSets;
- sets ((f0 -1));
- }
-}
-*/
-
-
-//// Is the case distributed? Note: command-line argument -roots takes
-//// precedence
-//distributed yes;
-//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
-//(
-// "/tmp"
-// "/tmp"
-//);
-
-// ************************************************************************* //
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
index 1b033661113..228b92c0a32 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
@@ -17,137 +17,6 @@ FoamFile
numberOfSubdomains 2;
-//- Use the volScalarField named here as a weight for each cell in the
-// decomposition. For example, use a particle population field to decompose
-// for a balanced number of particles in a lagrangian simulation.
-// weightField dsmcRhoNMean;
-
method scotch;
-//method hierarchical;
-// method simple;
-// method metis;
-// method manual;
-// method multiLevel;
-// method structured; // does 2D decomposition of structured mesh
-
-multiLevelCoeffs
-{
- // Decomposition methods to apply in turn. This is like hierarchical but
- // fully general - every method can be used at every level.
-
- level0
- {
- numberOfSubdomains 64;
- //method simple;
- //simpleCoeffs
- //{
- // n (2 1 1);
- // delta 0.001;
- //}
- method scotch;
- }
- level1
- {
- numberOfSubdomains 4;
- method scotch;
- }
-}
-
-// Desired output
-
-simpleCoeffs
-{
- n (2 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (1 2 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
-scotchCoeffs
-{
- //processorWeights
- //(
- // 1
- // 1
- // 1
- // 1
- //);
- //writeGraph true;
- //strategy "b";
-}
-
-manualCoeffs
-{
- dataFile "decompositionData";
-}
-
-structuredCoeffs
-{
- // Patches to do 2D decomposition on. Structured mesh only; cells have
- // to be in 'columns' on top of patches.
- patches (movingWall);
-
- // Method to use on the 2D subset
- method scotch;
-}
-
-/*
-constraints
-{
- //- Keep owner and neighbour on same processor for faces in zones:
- faces
- {
- type preserveFaceZones;
- zones (heater solid1 solid3);
- }
- //- Keep owner and neighbour on same processor for faces in patches:
- // (makes sense only for cyclic patches)
- patches
- {
- type preservePatches,
- patches (cyclic_half0 cyclic_half1);
- }
- //- Keep all of faceSet on a single processor. This puts all cells
- // connected with a point, edge or face on the same processor.
- // (just having face connected cells might not guarantee a balanced
- // decomposition)
- // The processor can be -1 (the decompositionMethod chooses the processor
- // for a good load balance) or explicitly provided (upsets balance).
- processors
- {
- type singleProcessorFaceSets;
- sets ((f0 -1));
- }
-}
-*/
-
-
-//// Is the case distributed? Note: command-line argument -roots takes
-//// precedence
-//distributed yes;
-//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
-//(
-// "/tmp"
-// "/tmp"
-//);
// ************************************************************************* //
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
index e877d6dd4a4..3758d178a56 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
@@ -19,6 +19,7 @@ numberOfSubdomains 2;
//method scotch;
method hierarchical;
+
hierarchicalCoeffs
{
n (2 1 1);
diff --git a/applications/test/parallelOverset/heatTransfer/system/decomposeParDict b/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
index 22be9c98eb1..e3b6ed227a9 100644
--- a/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
+++ b/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
@@ -29,16 +29,10 @@ numberOfSubdomains 2;
method hierarchical;
-hierarchicalCoeffs
+coeffs
{
n (1 2 1);
- delta 0.001;
- order xyz;
-}
-
-manualCoeffs
-{
- dataFile "decompositionData";
+ // order xyz; //< default order = xyz
}
// ************************************************************************* //
diff --git a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
index 356710dc3c0..31c5ed09cb2 100644
--- a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
+++ b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
@@ -17,136 +17,13 @@ FoamFile
numberOfSubdomains 2;
-//- Use the volScalarField named here as a weight for each cell in the
-// decomposition. For example, use a particle population field to decompose
-// for a balanced number of particles in a lagrangian simulation.
-// weightField dsmcRhoNMean;
-
-//method scotch;
method hierarchical;
-// method simple;
-// method metis;
-// method manual;
-// method multiLevel;
-// method structured; // does 2D decomposition of structured mesh
-multiLevelCoeffs
-{
- // Decomposition methods to apply in turn. This is like hierarchical but
- // fully general - every method can be used at every level.
-
- level0
- {
- numberOfSubdomains 64;
- //method simple;
- //simpleCoeffs
- //{
- // n (2 1 1);
- // delta 0.001;
- //}
- method scotch;
- }
- level1
- {
- numberOfSubdomains 4;
- method scotch;
- }
-}
-
-// Desired output
-
-simpleCoeffs
+coeffs
{
n (2 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (2 1 1);
- delta 0.001;
order xyz;
}
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
-scotchCoeffs
-{
- //processorWeights
- //(
- // 1
- // 1
- // 1
- // 1
- //);
- //writeGraph true;
- //strategy "b";
-}
-
-manualCoeffs
-{
- dataFile "decompositionData";
-}
-
-structuredCoeffs
-{
- // Patches to do 2D decomposition on. Structured mesh only; cells have
- // to be in 'columns' on top of patches.
- patches (movingWall);
-
- // Method to use on the 2D subset
- method scotch;
-}
-
-/*
-constraints
-{
- //- Keep owner and neighbour on same processor for faces in zones:
- faces
- {
- type preserveFaceZones;
- zones (heater solid1 solid3);
- }
- //- Keep owner and neighbour on same processor for faces in patches:
- // (makes sense only for cyclic patches)
- patches
- {
- type preservePatches,
- patches (cyclic_half0 cyclic_half1);
- }
- //- Keep all of faceSet on a single processor. This puts all cells
- // connected with a point, edge or face on the same processor.
- // (just having face connected cells might not guarantee a balanced
- // decomposition)
- // The processor can be -1 (the decompositionMethod chooses the processor
- // for a good load balance) or explicitly provided (upsets balance).
- processors
- {
- type singleProcessorFaceSets;
- sets ((f0 -1));
- }
-}
-*/
-
-//// Is the case distributed? Note: command-line argument -roots takes
-//// precedence
-//distributed yes;
-//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
-//(
-// "/tmp"
-// "/tmp"
-//);
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
index da13b206cc0..990a23202fa 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@ cuttingPlane
interpolationScheme cellPoint;
surfaces
- (
+ {
zNormal
{
type cuttingPlane;
@@ -31,7 +31,7 @@ cuttingPlane
}
interpolate true;
}
- );
+ }
}
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
index 97787368e75..6dd39e9806e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -97,7 +97,7 @@ plane
fields ( cellZoneID );
surfaces
- (
+ {
zNormal
{
type cuttingPlane;
@@ -109,7 +109,7 @@ plane
}
interpolate false;
}
- );
+ }
}
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fluxSummary b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fluxSummary
index 2ca102dbf56..76a7fd7e08d 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fluxSummary
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fluxSummary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -13,11 +13,11 @@ flux
libs (fieldFunctionObjects);
mode functionObjectSurface;
surfaces
- (
+ {
sampled.plane-0.25
sampled.plane-0.45
sampled.plane-0.55
- );
+ }
// Optional entries
phi rhoU;
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/samplingDebug b/tutorials/compressible/rhoSimpleFoam/squareBend/system/samplingDebug
index 7aa8cd37214..c5e0f79dfb3 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/samplingDebug
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/samplingDebug
@@ -51,7 +51,7 @@ debug
}
surfaces
- (
+ {
angledPlane
{
type distanceSurface;
@@ -120,7 +120,7 @@ debug
${_plane}
bounds (-1 -1 -1) (0 0 1);
}
- );
+ }
}
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
index c2e7e3f0397..0910c53ea97 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
@@ -17,14 +17,12 @@ FoamFile
numberOfSubdomains 4;
-
method scotch;
-hierarchicalCoeffs
+coeffs
{
- n (2 1 1);
- delta 0.001;
- order xyz;
+ n (2 2 1);
+ // order xyz; //< default order = xyz
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
index 391c2d87877..751fd7a911c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
@@ -17,11 +17,11 @@ FoamFile
numberOfSubdomains 4;
method hierarchical;
-hierarchicalCoeffs
+
+coeffs
{
- n (4 1 1);
- delta 0.001;
- order xyz;
+ n (4 1 1);
+ // order xyz; //< default order = xyz
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/system/decomposeParDict
index 391c2d87877..751fd7a911c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/SD/system/decomposeParDict
@@ -17,11 +17,11 @@ FoamFile
numberOfSubdomains 4;
method hierarchical;
-hierarchicalCoeffs
+
+coeffs
{
- n (4 1 1);
- delta 0.001;
- order xyz;
+ n (4 1 1);
+ // order xyz; //< default order = xyz
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
index 46f07946e68..56631bbabcb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -29,7 +29,7 @@ cuttingPlane
interpolationScheme cellPoint;
surfaces
- (
+ {
yNormal
{
type cuttingPlane;
@@ -41,7 +41,7 @@ cuttingPlane
}
interpolate true;
}
- );
+ }
}
}
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
index 9a90a30b1e1..df02c33d237 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -99,7 +99,7 @@ functions
interpolationScheme cellPoint;
surfaces
- (
+ {
zNormal
{
type cuttingPlane;
@@ -111,7 +111,7 @@ functions
}
interpolate false;
}
- );
+ }
}
forces
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
index 39213dfa289..6911e8f5dba 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
@@ -19,10 +19,9 @@ numberOfSubdomains 4;
method hierarchical;
-hierarchicalCoeffs
+coeffs
{
- n (2 2 1);
- delta 0.001;
+ n (2 2 1);
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
index da13b206cc0..990a23202fa 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@ cuttingPlane
interpolationScheme cellPoint;
surfaces
- (
+ {
zNormal
{
type cuttingPlane;
@@ -31,7 +31,7 @@ cuttingPlane
}
interpolate true;
}
- );
+ }
}
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
index 05ff3813c0b..72eb7b2049b 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -96,13 +96,10 @@ functions
);
}
+ // Sample near-wall velocity
surfaceSampling
{
- // Sample near-wall velocity
-
- type surfaces;
-
- // Where to load it from (if not already in solver)
+ type surfaces;
libs (sampling);
writeControl writeTime;
@@ -117,7 +114,7 @@ functions
);
surfaces
- (
+ {
nearWall
{
type patchInternalField;
@@ -126,7 +123,7 @@ functions
interpolate true;
triangulate false;
}
- );
+ }
}
#includeFunc scalarTransport
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
index 3debaa70c89..cdbb898e645 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -96,13 +96,10 @@ functions
);
}
+ // Sample near-wall velocity
surfaceSampling
{
- // Sample near-wall velocity
-
- type surfaces;
-
- // Where to load it from (if not already in solver)
+ type surfaces;
libs (sampling);
writeControl writeTime;
@@ -117,7 +114,7 @@ functions
);
surfaces
- (
+ {
nearWall
{
type patchInternalField;
@@ -126,7 +123,7 @@ functions
interpolate true;
triangulate false;
}
- );
+ }
}
}
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index 7074601dbd8..b6231376224 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -50,15 +50,15 @@ functions
momErr
{
type momentumError;
+ libs (fieldFunctionObjects);
executeControl writeTime;
writeControl writeTime;
- libs (libfieldFunctionObjects);
}
contErr
{
- libs (libfieldFunctionObjects);
type div;
+ libs (fieldFunctionObjects);
field phi;
executeControl writeTime;
writeControl writeTime;
diff --git a/tutorials/incompressible/simpleFoam/bump2D/system/decomposeParDict b/tutorials/incompressible/simpleFoam/bump2D/system/decomposeParDict
index a4e2e26feb8..584512cccbe 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/bump2D/system/decomposeParDict
@@ -19,10 +19,12 @@ numberOfSubdomains 8;
method hierarchical;
-hierarchicalCoeffs
+coeffs
{
n (8 1 1);
// delta 0.001; //< default value = 0.001
// order xyz; //< default order = xyz
}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 59d88b8d389..b187058f05e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ cuttingPlane
interpolationScheme cellPoint;
surfaces
- (
+ {
yNormal
{
type cuttingPlane;
@@ -30,7 +30,7 @@ cuttingPlane
}
interpolate true;
}
- );
+ }
}
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/sampling b/tutorials/incompressible/simpleFoam/squareBend/system/sampling
index 696cea14d6e..1ad273a933c 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/sampling
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/sampling
@@ -91,7 +91,7 @@ sampled
}
surfaces
- (
+ {
// Top channel
plane1
{
@@ -117,7 +117,7 @@ sampled
surfaceType triSurfaceMesh;
surfaceName angledPlane.obj;
}
- );
+ }
}
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/samplingDebug b/tutorials/incompressible/simpleFoam/squareBend/system/samplingDebug
index 1ddb2ec9775..8b938c7f173 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/samplingDebug
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/samplingDebug
@@ -27,7 +27,7 @@ debug
}
surfaces
- (
+ {
angledPlane
{
type distanceSurface;
@@ -46,7 +46,7 @@ debug
regularise true;
interpolate true;
}
- );
+ }
}
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/cuttingPlane b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/cuttingPlane
index 59d88b8d389..b187058f05e 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/cuttingPlane
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/cuttingPlane
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ cuttingPlane
interpolationScheme cellPoint;
surfaces
- (
+ {
yNormal
{
type cuttingPlane;
@@ -30,7 +30,7 @@ cuttingPlane
}
interpolate true;
}
- );
+ }
}
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
index b914208e33a..1e2c0dacd3c 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -85,14 +85,14 @@ functions
interpolationScheme cellPoint;
surfaces
- (
+ {
walls
{
type patch;
patches (walls);
triangulate false;
}
- );
+ }
}
}
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
index 087c88f826f..079a1e134a9 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict
@@ -19,27 +19,9 @@ numberOfSubdomains 4;
method simple;
-simpleCoeffs
+coeffs
{
- n (2 2 1);
- delta 0.001;
+ n (2 2 1);
}
-hierarchicalCoeffs
-{
- n (1 1 1);
- delta 0.001;
- order xyz;
-}
-
-manualCoeffs
-{
- dataFile "";
-}
-
-distributed no;
-
-roots ( );
-
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
index f8f4e4bff86..f333ae0a19f 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -85,14 +85,14 @@ functions
interpolationScheme cellPoint;
surfaces
- (
+ {
walls
{
type patch;
patches (walls);
triangulate false;
}
- );
+ }
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
index f8f4e4bff86..f333ae0a19f 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -85,14 +85,14 @@ functions
interpolationScheme cellPoint;
surfaces
- (
+ {
walls
{
type patch;
patches (walls);
triangulate false;
}
- );
+ }
}
}
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
index fdf2b5d405d..81dd9be4bff 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v1912 |
+| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -86,14 +86,14 @@ functions
interpolationScheme cellPoint;
surfaces
- (
+ {
walls
{
type patch;
patches (walls);
triangulate false;
}
- );
+ }
}
}
--
GitLab