From 5e5b26edd510380af6df1f60c905a8a45d9aefb0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 14 Jul 2008 14:50:35 +0200
Subject: [PATCH] update dictionary headers and FoamFile entry to 1.5 format
---
applications/test/router/routerDict | 28 ++---
.../autoRefineMesh/autoRefineMeshDict | 37 +++---
.../mesh/advanced/modifyMesh/modifyMeshDict | 21 ++--
.../mesh/advanced/selectCells/selectCellsDict | 27 ++---
.../snappyHexMesh/snappyHexMeshDict | 37 +++---
.../mesh/manipulation/cellSet/cellSetDict | 25 ++---
.../manipulation/createPatch/createPatchDict | 22 ++--
.../mesh/manipulation/faceSet/faceSetDict | 22 ++--
.../manipulation/mirrorMesh/mirrorMeshDict | 30 ++---
.../mesh/manipulation/pointSet/pointSetDict | 26 ++---
.../manipulation/refineMesh/refineMeshDict | 27 ++---
.../foamDataToFluent/foamDataToFluentDict | 24 ++--
.../miscellaneous/postChannel/postChannelDict | 25 ++---
.../preProcessing/mapFields/mapFieldsDict | 26 ++---
.../preProcessing/setFields/setFieldsDict | 22 ++--
.../surface/surfaceSubset/surfaceSubsetDict | 28 ++---
.../adiabaticFlameT/Hydrogen.log | 22 ++--
.../adiabaticFlameT/Methane.log | 22 ++--
.../adiabaticFlameT/Propane.log | 38 ++-----
.../adiabaticFlameT/controlDict | 105 ++++++++++++------
.../equilibriumFlameT/Hydrogen.log | 20 ++--
.../equilibriumFlameT/controlDict | 99 ++++++++++++-----
.../dynamicRefineFvMesh/dynamicMeshDict | 23 +---
src/postProcessing/fieldAverage/controlDict | 19 +---
.../constant/dynamicMeshDict | 18 +--
.../constant/polyMesh/blockMeshDict | 35 +++---
.../constant/transportProperties | 22 ++--
.../iglooWithFridges/system/controlDict | 22 ++--
.../iglooWithFridges/system/fvSchemes | 22 ++--
.../iglooWithFridges/system/fvSolution | 24 ++--
.../iglooWithFridges/system/snappyHexMeshDict | 36 +++---
.../motorBike/constant/polyMesh/blockMeshDict | 34 +++---
.../motorBike/constant/transportProperties | 22 ++--
.../motorBike/system/controlDict | 22 ++--
.../snappyHexMesh/motorBike/system/fvSchemes | 22 ++--
.../snappyHexMesh/motorBike/system/fvSolution | 21 ++--
.../motorBike/system/snappyHexMeshDict | 36 +++---
37 files changed, 459 insertions(+), 652 deletions(-)
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
index a1fce32c48a..0d349d5f8b3 100644
--- a/applications/test/router/routerDict
+++ b/applications/test/router/routerDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object routeDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object routeDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,10 +26,3 @@ paths
);
// ************************************************************************* //
-
-
-
-
-
-
-
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
index e6a15b2d5bb..1edf2946d6c 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
@@ -1,33 +1,26 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object autoRefineMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object autoRefineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Surface to keep to
-surface "plexi.ftr";
+surface "plexi.ftr";
// What is outside. These points have to be inside a cell (so not on a face!)
-outsidePoints ((-0.99001 -0.99001 -0.99001));
+outsidePoints ((-0.99001 -0.99001 -0.99001));
//
@@ -51,11 +44,11 @@ curvature 0.9;
nCutLayers 2;
// Refine until smallest edge of mesh < minEdgeLen
-minEdgeLen 0.1;
+minEdgeLen 0.1;
// Or until the number of cells would become more than (stops one level before
// this)
-cellLimit 2500000;
+cellLimit 2500000;
//
@@ -111,16 +104,16 @@ directions
// refinement level difference between neighbouring cells. Set to large if
// there is no need for a limit.
-splitLevel 2;
+splitLevel 2;
// Cut purely geometric (will cut hexes through vertices) or take topology
// into account.
-geometricCut false;
+geometricCut false;
// Whether to use hex topology. This will never cut hex through vertices.
-useHexTopology yes;
+useHexTopology yes;
// Write meshes from intermediate steps
-writeMesh true;
+writeMesh true;
// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
index 7ddbdf55505..00cba81e43b 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- class dictionary;
- object modifyMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object modifyMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
index ca1a66730d6..6211d4c8f07 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict
+++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object selectCellsDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object selectCellsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,13 +18,13 @@ FoamFile
// Whether to use surface. If false no surface will be read and only
// outsidePoints/selectOutside will be used to determine cells to keep.
-useSurface false;
+useSurface false;
// Surface to keep to
-surface "plexi.ftr";
+surface "plexi.ftr";
// What is outside
-outsidePoints ((-1 -1 -1));
+outsidePoints ((-1 -1 -1));
//
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index e97b1ee9a75..5777ae8a8a3 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object autoHexMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object autoHexMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -129,7 +122,7 @@ castellatedMeshControls
{
// Surface-wise min and max refinement level
level (2 2);
-
+
// Optional region-wise level specification
regions
{
@@ -231,7 +224,7 @@ addLayersControls
// is the
// thickness of the layer furthest away from the wall.
// Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.3;
+ finalLayerRatio 0.3;
//- Minimum thickness of cell layer. If for any reason layer
// cannot be above minThickness do not add layer.
@@ -254,20 +247,20 @@ addLayersControls
// before upon reaching a correct mesh.
nRelaxIter 5;
- // Number of smoothing iterations of surface normals
+ // Number of smoothing iterations of surface normals
nSmoothSurfaceNormals 1;
- // Number of smoothing iterations of interior mesh movement direction
+ // Number of smoothing iterations of interior mesh movement direction
nSmoothNormals 3;
// Smooth layer thickness over surface patches
nSmoothThickness 10;
- // Stop layer growth on highly warped cells
+ // Stop layer growth on highly warped cells
maxFaceThicknessRatio 0.5;
- // Reduce layer growth where ratio thickness to medial
- // distance is large
+ // Reduce layer growth where ratio thickness to medial
+ // distance is large
maxThicknessToMedialRatio 0.3;
// Angle used to pick up medial axis points
@@ -313,7 +306,7 @@ meshQualityControls
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
- //- minFaceWeight (0 -> 0.5)
+ //- minFaceWeight (0 -> 0.5)
minFaceWeight 0.05;
//- minVolRatio (0 -> 1)
diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSetDict b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
index ef169f50557..3bda8ccd01a 100644
--- a/applications/utilities/mesh/manipulation/cellSet/cellSetDict
+++ b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- class dictionary;
- object cellSetDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object cellSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -36,7 +29,7 @@ topoSetSources
// Copy elements from cellSet
cellToCell
{
- set c1;
+ set c1;
}
// Select based on faceSet
@@ -51,7 +44,7 @@ topoSetSources
}
// Select based on pointSet
- pointToCell
+ pointToCell
{
set p0;
option any; // cell with any point in pointSet
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 31d00780217..1153d0204d7 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object createPatcheDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object createPatchDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,7 +22,6 @@ matchTolerance 1E-3;
// Do a synchronisation of coupled points.
pointSync true;
-
// Patches to create.
// If no patches does a coupled point and face synchronisation anyway.
patches
diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSetDict b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
index 4121a000187..4f6c0d15096 100644
--- a/applications/utilities/mesh/manipulation/faceSet/faceSetDict
+++ b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- class dictionary;
- object faceSetDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object faceSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -86,5 +79,4 @@ topoSetSources
}
);
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
index cfa3e68d5f7..bb6cfe7a1e2 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
@@ -1,36 +1,28 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 1.0;
- format ascii;
-
- root "";
- case "";
- instance "system";
- local "";
-
- class dictionary;
- object mirrorMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object mirrorMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-planeType pointAndNormal;
+planeType pointAndNormal;
pointAndNormalDict
{
- basePoint (0 0 0);
- normalVector (0 1 0);
+ basePoint (0 0 0);
+ normalVector (0 1 0);
}
-planeTolerance 1e-3;
-
+planeTolerance 1e-3;
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSetDict b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
index cb1c8b2d15b..27a43d3ad9b 100644
--- a/applications/utilities/mesh/manipulation/pointSet/pointSetDict
+++ b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- class dictionary;
- object pointSetDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object pointSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,9 +26,9 @@ action new;
topoSetSources
(
// Copy elements from pointSet
- pointToPoint
+ pointToPoint
{
- set p1;
+ set p1;
}
// Select based on cellSet
@@ -76,5 +69,4 @@ topoSetSources
}
);
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
index 67c49c13d5e..f05502b755c 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object refineMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object refineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,13 +52,13 @@ directions
// Whether to use hex topology. This will
// - if patchLocal: all cells on selected patch should be hex
// - split all hexes in 2x2x2 through the middle of edges.
-useHexTopology true;
+useHexTopology true;
// Cut purely geometric (will cut hexes through vertices) or take topology
// into account. Incompatible with useHexTopology
-geometricCut false;
+geometricCut false;
// Write meshes from intermediate steps
-writeMesh false;
+writeMesh false;
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
index 32ca5ceb856..469257e90a5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
@@ -1,25 +1,17 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- note "FOAM to Fluent interface control dictionary";
-
- class dictionary;
- object foamDataToFluentDict;
+ version 2.0;
+ format ascii;
+ note "OpenFOAM to Fluent interface control dictionary";
+ class dictionary;
+ object foamDataToFluentDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
index cf5aedac366..1785207adc5 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
@@ -1,31 +1,24 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object postChannelDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object postChannelDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Nx 40;
-Ny
+Ny
(
- 50
+ 50
);
Nz 30;
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index d44eff5cbae..3f78955a055 100644
--- a/applications/utilities/preProcessing/mapFields/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict
@@ -1,39 +1,31 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object mapFieldsDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object mapFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// List of pairs of source/target patches for mapping
-patchMap
+patchMap
(
lid movingWall
);
// List of target patches cutting the source domain (these need to be
// handled specially e.g. interpolated from internal values)
-cuttingPatches
+cuttingPatches
(
fixedWalls
);
-
// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict
index 4867e4f3bfd..13521c54731 100644
--- a/applications/utilities/preProcessing/setFields/setFieldsDict
+++ b/applications/utilities/preProcessing/setFields/setFieldsDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "system";
- local "";
-
- class dictionary;
- object setFieldsDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,5 +34,4 @@ regions
}
);
-
// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index 5ca59575f8a..70879af6f42 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.2/run/icoFoam";
- case "cavityTut";
- instance "system";
- local "";
-
- class dictionary;
- object surfaceSubsetDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object surfaceSubsetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32,9 +25,10 @@ localPoints ( );
edges ();
// Select triangles (with face centre) inside box
-zone (
-(0 -10000 125)
-(10000 10000 10000)
+zone
+(
+ (0 -10000 125)
+ (10000 10000 10000)
);
// Select triangles (with face centre) inside or outside of another surface.
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
index f3e81b294e5..954e40b6b75 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
@@ -1,19 +1,19 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3.2 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
-Exec : adiabaticFlameT controlDict
-Date : Aug 20 2006
-Time : 12:23:19
-Host : dm
-PID : 28866
-Root :
-Case :
-Nprocs : 1
+Exec : adiabaticFlameT -case . controlDict
+Date : Jul 14 2008
+Time : 14:35:28
+Host : auglx106
+PID : 21193
+Case : ./.
+nProcs : 1
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Reading Burcat data dictionary
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 34.0752;
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
index f61db76d64f..c27fa56c2eb 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
@@ -1,19 +1,19 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.2.1 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
-Exec : adiabaticFlameT controlDict
-Date : Dec 06 2005
-Time : 15:25:54
-Host : dm
-PID : 19011
-Root :
-Case :
-Nprocs : 1
+Exec : adiabaticFlameT -case . controlDict
+Date : Jul 14 2008
+Time : 14:36:14
+Host : auglx106
+PID : 21199
+Case : ./.
+nProcs : 1
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Reading Burcat data dictionary
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 17.1271;
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
index edab3b35ba7..37aa406a656 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
@@ -1,39 +1,21 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
+Exec : adiabaticFlameT -case . controlDict
+Date : Jul 14 2008
+Time : 14:36:39
+Host : auglx106
+PID : 21203
+Case : ./.
+nProcs : 1
-Exec : adiabaticFlameT controlDict
-Date : Dec 01 2004
-Time : 14:24:02
-Host : dm
-PID : 8154
-Root :
-Case :
-Nprocs : 1
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Reading Burcat data dictionary
---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry
- CH3 ) 2 N-NO2 CH3 ) 2 N-NO2 1 90.0819 200 6000 1000 12.4704 0.0186035 -6.89302e-06 1.13155e-09 -6.84339e-14 -6246.84 -39.5039 4.2251 0.0224382 3.20606e-05 -5.84889e-08 2.50091e-11 -3013.8 7.7452;
- on line 1067 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData"
- entry already in dictionary :
-ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::CH3, lines 553-555, IOstream: Version 2.0, format ASCII, line 553, OPENED, GOOD
-
---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry
- CH3 ) 2 CHOH CH3 ) 2 CHOH 1 60.0959 200 6000 1000 9.64268 0.0200225 -7.11954e-06 1.14138e-09 -6.79937e-14 -37484 -25.6345 4.30799 0.0102502 6.19844e-05 -9.03296e-08 3.7406e-11 -34924.9 7.5584;
- on line 1387 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData"
- entry already in dictionary :
-ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::CH3, lines 553-555, IOstream: Version 2.0, format ASCII, line 553, OPENED, GOOD
-
---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry
- NH2 NH2 1 16.0226 200 6000 1000 2.84766 0.00314285 -8.98666e-07 1.30324e-10 -7.48854e-15 21823.9 6.47181 4.20556 -0.00213553 7.2682e-06 -5.93028e-09 1.80672e-12 21535.2 -0.146632;
- on line 3411 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData"
- entry already in dictionary :
-ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::NH2, lines 637-639, IOstream: Version 2.0, format ASCII, line 637, OPENED, GOOD
-
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;
phi = 0.01
ft = 0.000641534
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
index 5d9621792c1..e7970f8e6dd 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/controlDict
+++ b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
@@ -1,36 +1,69 @@
-T0 300.0;
-
-fuel H2;
-n 0;
-m 2;
-
-
-/*
-fuel CH4(ANHARMONIC);
-n 1;
-m 4;
-*/
-
-/*
-fuel ETHYLENE;
-n 2;
-m 4;
-*/
-
-/*
-fuel PROPANE;
-n 3;
-m 8;
-*/
-
-/*
-fuel ISO-OCTANE(I-P);
-n 8;
-m 18;
-*/
-
-/*
-fuel C7H16;
-n 7;
-m 16;
-*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ note "settings for calculating the adiabatic flame temperature";
+ class dictionary;
+ object controlDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+T0 300.0;
+
+H2
+{
+ fuel H2;
+ n 0;
+ m 2;
+}
+
+CH4
+{
+ fuel CH4(ANHARMONIC);
+ n 1;
+ m 4;
+}
+
+ETHYLENE
+{
+ fuel ETHYLENE;
+ n 2;
+ m 4;
+}
+
+PROPANE
+{
+ fuel PROPANE;
+ n 3;
+ m 8;
+}
+
+OCTANE
+{
+ fuel ISO-OCTANE(I-P);
+ n 8;
+ m 18;
+}
+
+C7H16
+{
+ fuel C7H16;
+ n 7;
+ m 16;
+}
+
+
+$H2;
+// $CH4;
+// $PROPANE;
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
index bc84afd42d3..8884bc24996 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
@@ -1,19 +1,19 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3.2 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
+Exec : equilibriumFlameT -case . controlDict
+Date : Jul 14 2008
+Time : 14:42:27
+Host : auglx106
+PID : 21318
+Case : ./.
+nProcs : 1
-Exec : equilibriumFlameT controlDict
-Date : Aug 20 2006
-Time : 12:29:44
-Host : dm
-PID : 28934
-Root :
-Case :
-Nprocs : 1
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Reading Burcat data dictionary
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
index 51f670d4390..65893bfd38f 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/controlDict
+++ b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
@@ -1,30 +1,69 @@
-P 1e5;
-
-fuel H2;
-n 0;
-m 2;
-
-/*
-fuel CH4ANHARMONIC;
-n 1;
-m 4;
-*/
-/*
-fuel ETHYLENE;
-n 2;
-m 4;
-*/
-
-/*
-fuel PROPANE;
-n 3;
-m 8;
-*/
-
-/*
-fuel ISOOCTANE;
-n 8;
-m 18;
-*/
-
-end;
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ note "settings for calculating the equilibrium flame temperature";
+ class dictionary;
+ object controlDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+P 1e5;
+
+H2
+{
+ fuel H2;
+ n 0;
+ m 2;
+}
+
+CH4
+{
+ fuel CH4(ANHARMONIC);
+ n 1;
+ m 4;
+}
+
+ETHYLENE
+{
+ fuel ETHYLENE;
+ n 2;
+ m 4;
+}
+
+PROPANE
+{
+ fuel PROPANE;
+ n 3;
+ m 8;
+}
+
+OCTANE
+{
+ fuel ISOOCTANE;
+ n 8;
+ m 18;
+}
+
+C7H16
+{
+ fuel C7H16;
+ n 7;
+ m 16;
+}
+
+
+$H2;
+// $CH4;
+// $PROPANE;
+
+
+// ************************************************************************* //
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 48d9bfcedff..177824b65ce 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
@@ -1,27 +1,16 @@
-
-
-
-
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.4 |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object dynamicMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object dynamicMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/fieldAverage/controlDict b/src/postProcessing/fieldAverage/controlDict
index 5dc2b007f9b..40e3a2d4a72 100644
--- a/src/postProcessing/fieldAverage/controlDict
+++ b/src/postProcessing/fieldAverage/controlDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.4 |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object controlDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
index 56eb2294e88..5bf94e70a20 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -1,23 +1,16 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.4 |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object motionProperties;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object motionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,5 +31,4 @@ solidBodyMotionFvMeshCoeffs
}
}
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
index f842cbb8fd2..d97dbb8e268 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -1,31 +1,23 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object blockMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
convertToMeters 1;
-vertices
+vertices
(
(-2.03 -2.0 0)
( 8.03 -2.0 0)
@@ -37,18 +29,18 @@ vertices
(-2.03 8.0 5)
);
-blocks
+blocks
(
hex (0 1 2 3 4 5 6 7) (20 20 20) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-patches
+patches
(
- patch maxY
+ patch maxY
(
(3 7 6 2)
)
@@ -74,9 +66,8 @@ patches
)
);
-mergePatchPairs
+mergePatchPairs
(
);
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties b/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties
index 285cbf44dec..c61d913dc87 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties
+++ b/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties
@@ -1,28 +1,20 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object transportProperties;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
nu nu [0 2 -1 0 0 0 0] 0.01;
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict b/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict
index 3303982fb7c..36315909db2 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict
+++ b/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object controlDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,5 +46,4 @@ timePrecision 6;
runTimeModifiable yes;
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes
index b89a35be133..51ebb81a9da 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes
+++ b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object fvSchemes;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,5 +60,4 @@ fluxRequired
p;
}
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution
index da311c99cde..9e9998642e7 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution
+++ b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution
@@ -1,30 +1,23 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object fvSolution;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- //p ICCG 1e-06 0;
+ // p ICCG 1e-06 0;
p AMG 1e-06 0 10;
U BICCG 1e-05 0;
@@ -41,5 +34,4 @@ PISO
pRefValue 0;
}
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
index 3286958275b..4b547f7a513 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object autoHexMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object autoHexMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -219,7 +212,7 @@ addLayersControls
// is the
// thickness of the layer furthest away from the wall.
// Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.5;
+ finalLayerRatio 0.5;
//- Minimum thickness of cell layer. If for any reason layer
// cannot be above minThickness do not add layer.
@@ -242,20 +235,20 @@ addLayersControls
// before upon reaching a correct mesh.
nRelaxIter 5;
- // Number of smoothing iterations of surface normals
+ // Number of smoothing iterations of surface normals
nSmoothSurfaceNormals 1;
- // Number of smoothing iterations of interior mesh movement direction
+ // Number of smoothing iterations of interior mesh movement direction
nSmoothNormals 3;
// Smooth layer thickness over surface patches
nSmoothThickness 10;
- // Stop layer growth on highly warped cells
+ // Stop layer growth on highly warped cells
maxFaceThicknessRatio 0.5;
- // Reduce layer growth where ratio thickness to medial
- // distance is large
+ // Reduce layer growth where ratio thickness to medial
+ // distance is large
maxThicknessToMedialRatio 0.3;
// Angle used to pick up medial axis points
@@ -301,7 +294,7 @@ meshQualityControls
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
- //- minFaceWeight (0 -> 0.5)
+ //- minFaceWeight (0 -> 0.5)
minFaceWeight 0.05;
//- minVolRatio (0 -> 1)
@@ -334,5 +327,4 @@ debug 0;
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict b/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
index ec09ef5e887..c618a0a9acd 100644
--- a/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
+++ b/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
@@ -1,31 +1,23 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object blockMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
convertToMeters 1;
-vertices
+vertices
(
(-20.29 -10 -4.232e-05)
( 41.71 -10 -4.232e-05)
@@ -37,18 +29,18 @@ vertices
(-20.29 10 20)
);
-blocks
+blocks
(
hex (0 1 2 3 4 5 6 7) (60 20 20) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-patches
+patches
(
- patch maxY
+ patch maxY
(
(3 7 6 2)
)
@@ -74,7 +66,7 @@ patches
)
);
-mergePatchPairs
+mergePatchPairs
(
);
diff --git a/tutorials/snappyHexMesh/motorBike/constant/transportProperties b/tutorials/snappyHexMesh/motorBike/constant/transportProperties
index 285cbf44dec..c61d913dc87 100644
--- a/tutorials/snappyHexMesh/motorBike/constant/transportProperties
+++ b/tutorials/snappyHexMesh/motorBike/constant/transportProperties
@@ -1,28 +1,20 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object transportProperties;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
nu nu [0 2 -1 0 0 0 0] 0.01;
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/controlDict b/tutorials/snappyHexMesh/motorBike/system/controlDict
index 3303982fb7c..36315909db2 100644
--- a/tutorials/snappyHexMesh/motorBike/system/controlDict
+++ b/tutorials/snappyHexMesh/motorBike/system/controlDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object controlDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,5 +46,4 @@ timePrecision 6;
runTimeModifiable yes;
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSchemes b/tutorials/snappyHexMesh/motorBike/system/fvSchemes
index b89a35be133..51ebb81a9da 100644
--- a/tutorials/snappyHexMesh/motorBike/system/fvSchemes
+++ b/tutorials/snappyHexMesh/motorBike/system/fvSchemes
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object fvSchemes;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,5 +60,4 @@ fluxRequired
p;
}
-
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSolution b/tutorials/snappyHexMesh/motorBike/system/fvSolution
index da311c99cde..242f5524a28 100644
--- a/tutorials/snappyHexMesh/motorBike/system/fvSolution
+++ b/tutorials/snappyHexMesh/motorBike/system/fvSolution
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "";
- case "";
- instance "";
- local "";
-
- class dictionary;
- object fvSolution;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict b/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict
index 5e206f019fb..e3d24a69219 100644
--- a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict
+++ b/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict
@@ -1,23 +1,16 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
- version 2.0;
- format ascii;
-
- root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
- case "cavity";
- instance "system";
- local "";
-
- class dictionary;
- object autoHexMeshDict;
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object autoHexMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -466,7 +459,7 @@ addLayersControls
// is the
// thickness of the layer furthest away from the wall.
// Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.3;
+ finalLayerRatio 0.3;
//- Minimum thickness of cell layer. If for any reason layer
// cannot be above minThickness do not add layer.
@@ -489,20 +482,20 @@ addLayersControls
// before upon reaching a correct mesh.
nRelaxIter 3;
- // Number of smoothing iterations of surface normals
+ // Number of smoothing iterations of surface normals
nSmoothSurfaceNormals 1;
- // Number of smoothing iterations of interior mesh movement direction
+ // Number of smoothing iterations of interior mesh movement direction
nSmoothNormals 3;
// Smooth layer thickness over surface patches
nSmoothThickness 10;
- // Stop layer growth on highly warped cells
+ // Stop layer growth on highly warped cells
maxFaceThicknessRatio 0.5;
- // Reduce layer growth where ratio thickness to medial
- // distance is large
+ // Reduce layer growth where ratio thickness to medial
+ // distance is large
maxThicknessToMedialRatio 0.3;
// Angle used to pick up medial axis points
@@ -548,7 +541,7 @@ meshQualityControls
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
- //- minFaceWeight (0 -> 0.5)
+ //- minFaceWeight (0 -> 0.5)
minFaceWeight 0.02;
//- minVolRatio (0 -> 1)
@@ -581,5 +574,4 @@ debug 0;
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
-
// ************************************************************************* //
--
GitLab