From 80b8071e7550c32e305bea1637004b1a9cc18938 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 20 May 2010 08:24:55 +0200
Subject: [PATCH 01/77] ENH: add default control values to ease SIMPLE->PIMPLE
transition
- add const-ness for control variables
- drop unused fluxGradp variable
- use lookupOrDefault instead of found/lookup combination
---
.../mhdFoam/readBPISOControls.H | 5 +--
.../readFluidMultiRegionSIMPLEControls.H | 28 ++++-----------
.../readSolidMultiRegionSIMPLEControls.H | 10 +++---
.../readFluidMultiRegionPIMPLEControls.H | 10 +++---
.../fluid/readFluidMultiRegionPISOControls.H | 34 +++++++------------
.../chtMultiRegionFoam/readPIMPLEControls.H | 4 ++-
.../solid/readSolidMultiRegionPISOControls.H | 8 ++---
.../pimpleDyMFoam/readControls.H | 19 ++++-------
.../compressibleInterDyMFoam/readControls.H | 19 ++++-------
.../multiphase/interDyMFoam/readControls.H | 15 +++-----
.../readSolidDisplacementFoamControls.H | 3 +-
.../general/include/readPIMPLEControls.H | 20 ++++++-----
.../general/include/readPISOControls.H | 20 ++++++-----
.../general/include/readSIMPLEControls.H | 15 ++++----
.../general/include/readTimeControls.H | 14 +++-----
.../engineFoam/kivaTest/system/fvSolution | 1 -
.../boundaryWallFunctions/system/fvSolution | 1 -
.../system/fvSolution | 1 -
18 files changed, 93 insertions(+), 134 deletions(-)
diff --git a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
index 4363850cdf8..5ddbdab95ea 100644
--- a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
+++ b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H
@@ -1,3 +1,4 @@
-const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
+ const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
+
+ const int nBcorr = Bpiso.lookupOrDefault<int>("nCorrectors", 1);
-int nBcorr(readInt(Bpiso.lookup("nCorrectors")));
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
index 3054562d5d6..e69527a97cc 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
@@ -1,25 +1,11 @@
- dictionary simple = fluidRegions[i].solutionDict().subDict("SIMPLE");
+ const dictionary& simple = fluidRegions[i].solutionDict().subDict("SIMPLE");
- int nNonOrthCorr = 0;
- if (simple.found("nNonOrthogonalCorrectors"))
- {
- nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors"));
- }
+ const int nNonOrthCorr =
+ simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool momentumPredictor = true;
- if (simple.found("momentumPredictor"))
- {
- momentumPredictor = Switch(simple.lookup("momentumPredictor"));
- }
+ const bool momentumPredictor =
+ simple.lookupOrDefault<bool>("momentumPredictor", true);
- bool fluxGradp = false;
- if (simple.found("fluxGradp"))
- {
- fluxGradp = Switch(simple.lookup("fluxGradp"));
- }
+ const bool transonic =
+ simple.lookupOrDefault<bool>("transonic", false);
- bool transonic = false;
- if (simple.found("transonic"))
- {
- transonic = Switch(simple.lookup("transonic"));
- }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
index 22e9b177f18..e1d58d9f654 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
@@ -1,7 +1,5 @@
- dictionary simple = solidRegions[i].solutionDict().subDict("SIMPLE");
+ const dictionary& simple = solidRegions[i].solutionDict().subDict("SIMPLE");
+
+ const int nNonOrthCorr =
+ simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- int nNonOrthCorr = 0;
- if (simple.found("nNonOrthogonalCorrectors"))
- {
- nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors"));
- }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
index 413c0225f0a..0591b366233 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
@@ -1,9 +1,11 @@
const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
- int nCorr(readInt(pimple.lookup("nCorrectors")));
+ const int nCorr =
+ pimple.lookupOrDefault<int>("nCorrectors", 1);
- int nNonOrthCorr =
+ const int nNonOrthCorr =
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool momentumPredictor =
- pimple.lookupOrDefault<Switch>("momentumPredictor", true);
+ const bool momentumPredictor =
+ pimple.lookupOrDefault<bool>("momentumPredictor", true);
+
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
index 75d6d96d111..c03366ae7a7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
@@ -1,27 +1,17 @@
- dictionary piso = fluidRegions[i].solutionDict().subDict("PISO");
+ const dictionary& piso = fluidRegions[i].solutionDict().subDict("PISO");
- int nCorr(readInt(piso.lookup("nCorrectors")));
+ const int nOuterCorr =
+ piso.lookupOrDefault<int>("nOuterCorrectors", 1);
- int nNonOrthCorr = 0;
- if (piso.found("nNonOrthogonalCorrectors"))
- {
- nNonOrthCorr = readInt(piso.lookup("nNonOrthogonalCorrectors"));
- }
+ const int nCorr =
+ piso.lookupOrDefault<int>("nCorrectors", 1);
- bool momentumPredictor = true;
- if (piso.found("momentumPredictor"))
- {
- momentumPredictor = Switch(piso.lookup("momentumPredictor"));
- }
+ const int nNonOrthCorr =
+ piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool transonic = false;
- if (piso.found("transonic"))
- {
- transonic = Switch(piso.lookup("transonic"));
- }
+ const bool momentumPredictor =
+ piso.lookupOrDefault<bool>("momentumPredictor", true);
+
+ const bool transonic =
+ piso.lookupOrDefault<bool>("transonic", false);
- int nOuterCorr = 1;
- if (piso.found("nOuterCorrectors"))
- {
- nOuterCorr = readInt(piso.lookup("nOuterCorrectors"));
- }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
index 42793d9b9fd..f6371c47cbc 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
@@ -4,4 +4,6 @@
const dictionary& pimple = solutionDict.subDict("PIMPLE");
- int nOuterCorr(readInt(pimple.lookup("nOuterCorrectors")));
+ const int nOuterCorr =
+ pimple.lookupOrDefault<int>("nOuterCorrectors", 1);
+
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H
index ce6a1c5bb26..0c965a8322a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H
@@ -1,7 +1,5 @@
const dictionary& piso = solidRegions[i].solutionDict().subDict("PISO");
- int nNonOrthCorr = 0;
- if (piso.found("nNonOrthogonalCorrectors"))
- {
- nNonOrthCorr = readInt(piso.lookup("nNonOrthogonalCorrectors"));
- }
+ const int nNonOrthCorr =
+ piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
index 3bd20c5c5c6..bee4e4d7b83 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
@@ -1,14 +1,9 @@
-# include "readTimeControls.H"
-# include "readPIMPLEControls.H"
+ #include "readTimeControls.H"
+ #include "readPIMPLEControls.H"
- bool correctPhi = false;
- if (pimple.found("correctPhi"))
- {
- correctPhi = Switch(pimple.lookup("correctPhi"));
- }
+ const bool correctPhi =
+ pimple.lookupOrDefault<bool>("correctPhi", false);
+
+ const bool checkMeshCourantNo =
+ pimple.lookupOrDefault<bool>("checkMeshCourantNo", false);
- bool checkMeshCourantNo = false;
- if (pimple.found("checkMeshCourantNo"))
- {
- checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
- }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
index a2e4ef3747f..11c3e8071e8 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@@ -1,5 +1,5 @@
- #include "readPISOControls.H"
- #include "readTimeControls.H"
+ #include "readPISOControls.H"
+ #include "readTimeControls.H"
label nAlphaCorr
(
@@ -19,14 +19,9 @@
<< exit(FatalError);
}
- bool correctPhi = true;
- if (piso.found("correctPhi"))
- {
- correctPhi = Switch(piso.lookup("correctPhi"));
- }
+ const bool correctPhi =
+ piso.lookupOrDefault<bool>("correctPhi", true);
+
+ const bool checkMeshCourantNo =
+ piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
- bool checkMeshCourantNo = false;
- if (piso.found("checkMeshCourantNo"))
- {
- checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
- }
diff --git a/applications/solvers/multiphase/interDyMFoam/readControls.H b/applications/solvers/multiphase/interDyMFoam/readControls.H
index 3640d73adc6..8264a051c23 100644
--- a/applications/solvers/multiphase/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/readControls.H
@@ -1,14 +1,9 @@
# include "readTimeControls.H"
# include "readPISOControls.H"
- bool correctPhi = true;
- if (piso.found("correctPhi"))
- {
- correctPhi = Switch(piso.lookup("correctPhi"));
- }
+ const bool correctPhi =
+ piso.lookupOrDefault<bool>("correctPhi", true);
+
+ const bool checkMeshCourantNo =
+ piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
- bool checkMeshCourantNo = false;
- if (piso.found("checkMeshCourantNo"))
- {
- checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
- }
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
index 343b7bcaed4..8b59cc497e5 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H
@@ -1,5 +1,6 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
-int nCorr(readInt(stressControl.lookup("nCorrectors")));
+const int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
+
scalar convergenceTolerance(readScalar(stressControl.lookup("D")));
Switch compactNormalStress(stressControl.lookup("compactNormalStress"));
diff --git a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
index 9de98ee20b5..3d9fd3c7eca 100644
--- a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
@@ -1,13 +1,17 @@
- dictionary pimple = mesh.solutionDict().subDict("PIMPLE");
+ const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
- int nOuterCorr(readInt(pimple.lookup("nOuterCorrectors")));
- int nCorr(readInt(pimple.lookup("nCorrectors")));
+ const int nOuterCorr =
+ pimple.lookupOrDefault<int>("nOuterCorrectors", 1);
- int nNonOrthCorr =
+ const int nCorr =
+ pimple.lookupOrDefault<int>("nCorrectors", 1);
+
+ const int nNonOrthCorr =
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool momentumPredictor =
- pimple.lookupOrDefault<Switch>("momentumPredictor", true);
+ const bool momentumPredictor =
+ pimple.lookupOrDefault<bool>("momentumPredictor", true);
+
+ const bool transonic =
+ pimple.lookupOrDefault<bool>("transonic", false);
- bool transonic =
- pimple.lookupOrDefault<Switch>("transonic", false);
diff --git a/src/finiteVolume/cfdTools/general/include/readPISOControls.H b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
index de763e00b0c..850ee1401d0 100644
--- a/src/finiteVolume/cfdTools/general/include/readPISOControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
@@ -1,15 +1,17 @@
- dictionary piso = mesh.solutionDict().subDict("PISO");
+ const dictionary& piso = mesh.solutionDict().subDict("PISO");
- int nCorr(readInt(piso.lookup("nCorrectors")));
+ const int nOuterCorr =
+ piso.lookupOrDefault<int>("nOuterCorrectors", 1);
+
+ const int nCorr =
+ piso.lookupOrDefault<int>("nCorrectors", 1);
- int nNonOrthCorr =
+ const int nNonOrthCorr =
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool momentumPredictor =
- piso.lookupOrDefault<Switch>("momentumPredictor", true);
+ const bool momentumPredictor =
+ piso.lookupOrDefault<bool>("momentumPredictor", true);
- bool transonic =
- piso.lookupOrDefault<Switch>("transonic", false);
+ const bool transonic =
+ piso.lookupOrDefault<bool>("transonic", false);
- int nOuterCorr =
- piso.lookupOrDefault<int>("nOuterCorrectors", 1);
diff --git a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
index b3ea4bf674b..6019876e113 100644
--- a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
@@ -1,14 +1,11 @@
- dictionary simple = mesh.solutionDict().subDict("SIMPLE");
+ const dictionary& simple = mesh.solutionDict().subDict("SIMPLE");
- int nNonOrthCorr =
+ const int nNonOrthCorr =
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
- bool momentumPredictor =
- simple.lookupOrDefault<Switch>("momentumPredictor", true);
+ const bool momentumPredictor =
+ simple.lookupOrDefault<bool>("momentumPredictor", true);
- bool fluxGradp =
- simple.lookupOrDefault<Switch>("fluxGradp", false);
-
- bool transonic =
- simple.lookupOrDefault<Switch>("transonic", false);
+ const bool transonic =
+ simple.lookupOrDefault<bool>("transonic", false);
diff --git a/src/finiteVolume/cfdTools/general/include/readTimeControls.H b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
index 1bedd175576..8255c9af4ca 100644
--- a/src/finiteVolume/cfdTools/general/include/readTimeControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,15 +29,11 @@ Description
\*---------------------------------------------------------------------------*/
-Switch adjustTimeStep
-(
- runTime.controlDict().lookup("adjustTimeStep")
-);
+const bool adjustTimeStep =
+ runTime.controlDict().lookupOrDefault<bool>("adjustTimeStep", false);
-scalar maxCo
-(
- readScalar(runTime.controlDict().lookup("maxCo"))
-);
+scalar maxCo =
+ runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
scalar maxDeltaT =
runTime.controlDict().lookupOrDefault<scalar>("maxDeltaT", GREAT);
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
index 9c14f182e1c..79eef886e40 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -46,7 +46,6 @@ PISO
nCorrectors 2;
nNonOrthogonalCorrectors 1;
momentumPredictor yes;
- fluxGradp no;
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
index a165f8313b9..a5181189a79 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
@@ -63,7 +63,6 @@ PISO
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
- fluxGradp no;
}
relaxationFactors
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
index 0f80d7dab7c..cc4a943f944 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
@@ -71,7 +71,6 @@ PISO
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
- fluxGradp no;
}
relaxationFactors
--
GitLab
From 227631742ddf8242e7e6022ad18bd7604d50aff0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 20 May 2010 08:42:07 +0200
Subject: [PATCH 02/77] ENH: add const-ness to pressureImplicitPorosity control
---
.../rhoPorousSimpleFoam/createFields.H | 23 ++++++-------------
.../porousSimpleFoam/createFields.H | 23 ++++++-------------
2 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index 09b75191db1..faa6108fb4d 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -65,22 +65,13 @@
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
thermalPorousZones pZones(mesh);
- Switch pressureImplicitPorosity(false);
+ // nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
- if (pZones.size())
- {
- // nUCorrectors for pressureImplicitPorosity
- if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
- {
- nUCorr = readInt
- (
- mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
- );
- }
+ const bool pressureImplicitPorosity =
+ (
+ pZones.size()
+ && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr)
+ && (nUCorr > 0)
+ );
- if (nUCorr > 0)
- {
- pressureImplicitPorosity = true;
- }
- }
diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
index 6861ae0005e..7ce03c19672 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
@@ -43,22 +43,13 @@
porousZones pZones(mesh);
- Switch pressureImplicitPorosity(false);
+ // nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
- if (pZones.size())
- {
- // nUCorrectors for pressureImplicitPorosity
- if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
- {
- nUCorr = readInt
- (
- mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
- );
- }
+ const bool pressureImplicitPorosity =
+ (
+ pZones.size()
+ && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr)
+ && (nUCorr > 0)
+ );
- if (nUCorr > 0)
- {
- pressureImplicitPorosity = true;
- }
- }
--
GitLab
From 9525d57d71d4db48ff82ac6094fbe24a312cd2bf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 20 May 2010 08:52:45 +0200
Subject: [PATCH 03/77] STYLE: use readIfPresent instead of found/lookup
combination
---
.../T/smoluchowskiJumpTFvPatchScalarField.C | 43 ++++++-------
.../rhoCentralFoam/readFluxScheme.H | 3 +-
.../readThermophysicalProperties.H | 14 +++--
.../readThermodynamicProperties.H | 15 +++--
.../twoPhaseEulerFoam/createFields.H | 4 +-
.../decomposePar/domainDecomposition.C | 6 +-
.../constraint/cyclic/cyclicPolyPatch.C | 9 ++-
.../fvMotionSolverEngineMesh.C | 5 +-
.../layeredEngineMesh/layeredEngineMesh.C | 5 +-
.../freestream/freestreamFvPatchField.C | 5 +-
.../timeVaryingMappedFixedValueFvPatchField.C | 5 +-
.../potential/potential/potential.C | 8 +--
.../layerParameters/layerParameters.C | 11 +---
.../meshRefinementProblemCells.C | 8 +--
.../refinementSurfaces/refinementSurfaces.C | 19 +-----
.../decompose/ptscotchDecomp/ptscotchDecomp.C | 56 ++++++++---------
.../decompose/scotchDecomp/scotchDecomp.C | 60 +++++++++----------
...gidBodyDisplacementPointPatchVectorField.C | 4 +-
18 files changed, 116 insertions(+), 164 deletions(-)
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index a6d98559a75..24ce0fe938d 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -29,14 +29,9 @@ License
#include "volFields.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
+Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -52,7 +47,8 @@ smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
valueFraction() = 0.0;
}
-smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
+
+Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
(
const smoluchowskiJumpTFvPatchScalarField& ptf,
const fvPatch& p,
@@ -67,7 +63,7 @@ smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
{}
-smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
+Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -118,7 +114,7 @@ smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
}
-smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
+Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
(
const smoluchowskiJumpTFvPatchScalarField& ptpsf,
const DimensionedField<scalar, volMesh>& iF
@@ -134,7 +130,7 @@ smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Map from self
-void smoluchowskiJumpTFvPatchScalarField::autoMap
+void Foam::smoluchowskiJumpTFvPatchScalarField::autoMap
(
const fvPatchFieldMapper& m
)
@@ -144,7 +140,7 @@ void smoluchowskiJumpTFvPatchScalarField::autoMap
// Reverse-map the given fvPatchField onto this fvPatchField
-void smoluchowskiJumpTFvPatchScalarField::rmap
+void Foam::smoluchowskiJumpTFvPatchScalarField::rmap
(
const fvPatchField<scalar>& ptf,
const labelList& addr
@@ -155,7 +151,7 @@ void smoluchowskiJumpTFvPatchScalarField::rmap
// Update the coefficients associated with the patch field
-void smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
+void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
{
if (updated())
{
@@ -174,11 +170,16 @@ void smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
// Prandtl number reading consistent with rhoCentralFoam
const dictionary& thermophysicalProperties =
db().lookupObject<IOdictionary>("thermophysicalProperties");
- dimensionedScalar Pr = dimensionedScalar("Pr", dimless, 1.0);
- if (thermophysicalProperties.found("Pr"))
- {
- Pr = thermophysicalProperties.lookup("Pr");
- }
+
+ dimensionedScalar Pr
+ (
+ dimensionedScalar::lookupOrDefault
+ (
+ "Pr",
+ thermophysicalProperties,
+ 1.0
+ )
+ );
Field<scalar> C2 = pmu/prho
*sqrt(ppsi*constant::mathematical::piByTwo)
@@ -197,7 +198,7 @@ void smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
// Write
-void smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
+void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
os.writeKeyword("accommodationCoeff")
@@ -211,10 +212,12 @@ void smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
makePatchTypeField(fvPatchScalarField, smoluchowskiJumpTFvPatchScalarField);
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+}
-} // End namespace Foam
// ************************************************************************* //
diff --git a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
index 9f54c43ef33..13f8f02c9c6 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
@@ -1,7 +1,6 @@
word fluxScheme("Kurganov");
-if (mesh.schemesDict().found("fluxScheme"))
+if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
{
- fluxScheme = word(mesh.schemesDict().lookup("fluxScheme"));
if ((fluxScheme == "Tadmor") || (fluxScheme == "Kurganov"))
{
Info<< "fluxScheme: " << fluxScheme << endl;
diff --git a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
index 435bcb7745e..2f4e267e5ed 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
@@ -14,9 +14,13 @@ IOdictionary thermophysicalProperties
)
);
-dimensionedScalar Pr = dimensionedScalar("Pr", dimless, 1.0);
+dimensionedScalar Pr
+(
+ dimensionedScalar::lookupOrDefault
+ (
+ "Pr",
+ thermophysicalProperties,
+ 1.0
+ )
+);
-if (thermophysicalProperties.found("Pr"))
-{
- Pr = thermophysicalProperties.lookup("Pr");
-}
diff --git a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
index 3b8c82c8e59..3f8a17b43e2 100644
--- a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
@@ -26,8 +26,13 @@
dimensionedScalar gamma = Cp/Cv;
- dimensionedScalar Pr = dimensionedScalar("Pr", dimless, 1.0);
- if (thermodynamicProperties.found("Pr"))
- {
- Pr = thermodynamicProperties.lookup("Pr");
- }
+ dimensionedScalar Pr
+ (
+ dimensionedScalar::lookupOrDefault
+ (
+ "Pr",
+ thermodynamicProperties,
+ 1.0
+ )
+ );
+
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 8a126905810..5f800bcfeda 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -175,10 +175,8 @@
);
word dragPhase("blended");
- if (interfacialProperties.found("dragPhase"))
+ if (interfacialProperties.readIfPresent("dragPhase", dragPhase))
{
- dragPhase = word(interfacialProperties.lookup("dragPhase"));
-
bool validDrag =
dragPhase == "a" || dragPhase == "b" || dragPhase == "blended";
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index b144e757583..0d90c2ab086 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -110,11 +110,7 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
procProcessorPatchStartIndex_(nProcs_),
cyclicParallel_(false)
{
- if (decompositionDict_.found("distributed"))
- {
- Switch distributed(decompositionDict_.lookup("distributed"));
- distributed_ = distributed;
- }
+ decompositionDict_.readIfPresent("distributed", distributed_);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 1341d8083da..d77552cf0ce 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -43,10 +43,10 @@ namespace Foam
addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, word);
addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, dictionary);
-
+}
template<>
-const char* NamedEnum<cyclicPolyPatch::transformType, 4>::names[] =
+const char* Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>::names[] =
{
"unknown",
"rotational",
@@ -54,9 +54,8 @@ const char* NamedEnum<cyclicPolyPatch::transformType, 4>::names[] =
"noOrdering"
};
-const NamedEnum<cyclicPolyPatch::transformType, 4>
- cyclicPolyPatch::transformTypeNames;
-}
+const Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>
+ Foam::cyclicPolyPatch::transformTypeNames;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
index a7d107a0fda..a9dc31ff229 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
@@ -45,10 +45,7 @@ Foam::fvMotionSolverEngineMesh::fvMotionSolverEngineMesh(const IOobject& io)
pistonLayers_("pistonLayers", dimLength, 0.0),
motionSolver_(*this, engineDB_.engineDict().lookup("motionSolver"))
{
- if (engineDB_.engineDict().found("pistonLayers"))
- {
- engineDB_.engineDict().lookup("pistonLayers") >> pistonLayers_;
- }
+ engineDB_.engineDict().readIfPresent("pistonLayers", pistonLayers_);
}
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 17ce100ed67..e3caab294d6 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -44,10 +44,7 @@ Foam::layeredEngineMesh::layeredEngineMesh(const IOobject& io)
engineMesh(io),
pistonLayers_("pistonLayers", dimLength, 0.0)
{
- if (engineDB_.engineDict().found("pistonLayers"))
- {
- engineDB_.engineDict().lookup("pistonLayers") >> pistonLayers_;
- }
+ engineDB_.engineDict().readIfPresent("pistonLayers", pistonLayers_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 6b0dab35833..8153405f0ba 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -80,10 +80,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
fvPatchField<Type>::operator=(freestreamValue());
}
- if (dict.found("phi"))
- {
- dict.lookup("phi") >> this->phiName_;
- }
+ dict.readIfPresent("phi", this->phiName_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 82e21eea9db..ed0f8504c0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -130,10 +130,7 @@ timeVaryingMappedFixedValueFvPatchField
<< endl;
}
- if (dict.found("fieldTableName"))
- {
- dict.lookup("fieldTableName") >> fieldTableName_;
- }
+ dict.readIfPresent("fieldTableName", fieldTableName_);
if (dict.found("value"))
{
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index a54ef7f153d..3bc59326341 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -229,18 +229,12 @@ void Foam::potential::potential::readPotentialDict()
if (potentialDict.found("external"))
{
-
Info<< nl << "Reading external forces:" << endl;
const dictionary& externalDict = potentialDict.subDict("external");
- // *********************************************************************
// gravity
-
- if (externalDict.found("gravity"))
- {
- gravity_ = externalDict.lookup("gravity");
- }
+ externalDict.readIfPresent("gravity", gravity_);
}
Info<< nl << tab << "gravity = " << gravity_ << endl;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 348f9ce4142..99b231f2345 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -218,10 +218,7 @@ Foam::layerParameters::layerParameters
<< endl;
}
- if (dict.found("nRelaxedIter"))
- {
- dict.lookup("nRelaxedIter") >> nRelaxedIter_;
- }
+ dict.readIfPresent("nRelaxedIter", nRelaxedIter_);
if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
{
@@ -303,10 +300,8 @@ Foam::layerParameters::layerParameters
<< endl;
}
- if (dict.found("nRelaxedIter"))
- {
- dict.lookup("nRelaxedIter") >> nRelaxedIter_;
- }
+ dict.readIfPresent("nRelaxedIter", nRelaxedIter_);
+
if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
{
FatalErrorIn("layerParameters::layerParameters(..)")
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index f4a887279ea..03dda28ede7 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -522,11 +522,9 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Collapse checking parameters
- scalar volFraction = -1;
- if (motionDict.found("minVolCollapseRatio"))
- {
- volFraction = readScalar(motionDict.lookup("minVolCollapseRatio"));
- }
+ const scalar volFraction =
+ motionDict.lookupOrDefault<scalar>("minVolCollapseRatio", -1);
+
const bool checkCollapse = (volFraction > 0);
scalar minArea = -1;
scalar maxNonOrtho = -1;
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index e53d7ae03f8..f10b815b9d5 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -151,17 +151,10 @@ Foam::refinementSurfaces::refinementSurfaces
}
// Global perpendicular angle
- if (dict.found("perpendicularAngle"))
- {
- globalAngle[surfI] = readScalar(dict.lookup("perpendicularAngle"));
- }
+ dict.readIfPresent("perpendicularAngle", globalAngle[surfI]);
//// Global patch name per surface
- //if (dict.found("patchType"))
- //{
- // dict.lookup("patchType") >> globalPatchType[surfI];
- //}
-
+ //dict.readIfPresent("patchType", globalPatchType[surfI]);
if (dict.found("regions"))
{
@@ -446,13 +439,7 @@ Foam::refinementSurfaces::refinementSurfaces
}
// Global perpendicular angle
- if (dict.found("perpendicularAngle"))
- {
- globalAngle[surfI] = readScalar
- (
- dict.lookup("perpendicularAngle")
- );
- }
+ dict.readIfPresent("perpendicularAngle", globalAngle[surfI]);
if (dict.found("regions"))
{
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index cded55bcd7a..5a75055df2b 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -22,8 +22,8 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
From scotch forum:
-
- By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
+
+ By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
2008-08-22 10:09 Strategy handling in Scotch is a bit tricky. In order
not to be confused, you must have a clear view of how they are built.
Here are some rules:
@@ -178,45 +178,39 @@ Foam::label Foam::ptscotchDecomp::decompose
// const dictionary& scotchCoeffs =
// decompositionDict_.subDict("ptscotchCoeffs");
//
-// if (scotchCoeffs.found("writeGraph"))
+// if (scotchCoeffs.lookupOrDefault("writeGraph", false))
// {
-// Switch writeGraph(scotchCoeffs.lookup("writeGraph"));
+// OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
//
-// if (writeGraph)
-// {
-// OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
+// Info<< "Dumping Scotch graph file to " << str.name() << endl
+// << "Use this in combination with gpart." << endl;
//
-// Info<< "Dumping Scotch graph file to " << str.name() << endl
-// << "Use this in combination with gpart." << endl;
+// label version = 0;
+// str << version << nl;
+// // Numer of vertices
+// str << xadj.size()-1 << ' ' << adjncy.size() << nl;
+// // Numbering starts from 0
+// label baseval = 0;
+// // Has weights?
+// label hasEdgeWeights = 0;
+// label hasVertexWeights = 0;
+// label numericflag = 10*hasEdgeWeights+hasVertexWeights;
+// str << baseval << ' ' << numericflag << nl;
+// for (label cellI = 0; cellI < xadj.size()-1; cellI++)
+// {
+// label start = xadj[cellI];
+// label end = xadj[cellI+1];
+// str << end-start;
//
-// label version = 0;
-// str << version << nl;
-// // Numer of vertices
-// str << xadj.size()-1 << ' ' << adjncy.size() << nl;
-// // Numbering starts from 0
-// label baseval = 0;
-// // Has weights?
-// label hasEdgeWeights = 0;
-// label hasVertexWeights = 0;
-// label numericflag = 10*hasEdgeWeights+hasVertexWeights;
-// str << baseval << ' ' << numericflag << nl;
-// for (label cellI = 0; cellI < xadj.size()-1; cellI++)
+// for (label i = start; i < end; i++)
// {
-// label start = xadj[cellI];
-// label end = xadj[cellI+1];
-// str << end-start;
-//
-// for (label i = start; i < end; i++)
-// {
-// str << ' ' << adjncy[i];
-// }
-// str << nl;
+// str << ' ' << adjncy[i];
// }
+// str << nl;
// }
// }
// }
-
// Strategy
// ~~~~~~~~
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index 534044646f0..95b7fd25490 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -22,8 +22,8 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
From scotch forum:
-
- By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
+
+ By: Francois PELLEGRINI RE: Graph mapping 'strategy' string [ reply ]
2008-08-22 10:09 Strategy handling in Scotch is a bit tricky. In order
not to be confused, you must have a clear view of how they are built.
Here are some rules:
@@ -178,40 +178,35 @@ Foam::label Foam::scotchDecomp::decompose
const dictionary& scotchCoeffs =
decompositionDict_.subDict("scotchCoeffs");
- if (scotchCoeffs.found("writeGraph"))
+ if (scotchCoeffs.lookupOrDefault("writeGraph", false))
{
- Switch writeGraph(scotchCoeffs.lookup("writeGraph"));
-
- if (writeGraph)
+ OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
+
+ Info<< "Dumping Scotch graph file to " << str.name() << endl
+ << "Use this in combination with gpart." << endl;
+
+ label version = 0;
+ str << version << nl;
+ // Numer of vertices
+ str << xadj.size()-1 << ' ' << adjncy.size() << nl;
+ // Numbering starts from 0
+ label baseval = 0;
+ // Has weights?
+ label hasEdgeWeights = 0;
+ label hasVertexWeights = 0;
+ label numericflag = 10*hasEdgeWeights+hasVertexWeights;
+ str << baseval << ' ' << numericflag << nl;
+ for (label cellI = 0; cellI < xadj.size()-1; cellI++)
{
- OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
-
- Info<< "Dumping Scotch graph file to " << str.name() << endl
- << "Use this in combination with gpart." << endl;
-
- label version = 0;
- str << version << nl;
- // Numer of vertices
- str << xadj.size()-1 << ' ' << adjncy.size() << nl;
- // Numbering starts from 0
- label baseval = 0;
- // Has weights?
- label hasEdgeWeights = 0;
- label hasVertexWeights = 0;
- label numericflag = 10*hasEdgeWeights+hasVertexWeights;
- str << baseval << ' ' << numericflag << nl;
- for (label cellI = 0; cellI < xadj.size()-1; cellI++)
+ label start = xadj[cellI];
+ label end = xadj[cellI+1];
+ str << end-start;
+
+ for (label i = start; i < end; i++)
{
- label start = xadj[cellI];
- label end = xadj[cellI+1];
- str << end-start;
-
- for (label i = start; i < end; i++)
- {
- str << ' ' << adjncy[i];
- }
- str << nl;
+ str << ' ' << adjncy[i];
}
+ str << nl;
}
}
}
@@ -229,7 +224,6 @@ Foam::label Foam::scotchDecomp::decompose
const dictionary& scotchCoeffs =
decompositionDict_.subDict("scotchCoeffs");
-
string strategy;
if (scotchCoeffs.readIfPresent("strategy", strategy))
{
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 8b248991d5c..fdcfa25e1a6 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -76,11 +76,9 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
rhoInf_ = readScalar(dict.lookup("rhoInf"));
}
- if (dict.found("g"))
+ if (dict.readIfPresent("g", g_))
{
lookupGravity_ = -2;
-
- g_ = dict.lookup("g");
}
if (!dict.found("value"))
--
GitLab
From ff30e6b61a2de4aea19d3230c41a862fb0aa5e32 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 20 May 2010 14:17:18 +0200
Subject: [PATCH 04/77] STYLE: can use bool instead of Switch version of
dictionary::lookupOrDefault
- both versions handle the same input words.
Only need the <Switch> version when the destination variable is
also a Switch and we need to output the word later.
---
.../fluid/readFluidMultiRegionSIMPLEControls.H | 4 ++--
.../fluid/readFluidMultiRegionPIMPLEControls.H | 2 +-
.../fluid/readFluidMultiRegionPISOControls.H | 4 ++--
.../solvers/incompressible/pimpleDyMFoam/readControls.H | 4 ++--
.../solvers/multiphase/bubbleFoam/createRASTurbulence.H | 2 +-
.../multiphase/compressibleInterDyMFoam/readControls.H | 4 ++--
applications/solvers/multiphase/interDyMFoam/readControls.H | 4 ++--
applications/solvers/multiphase/settlingFoam/createFields.H | 2 +-
applications/utilities/surface/surfaceSubset/surfaceSubset.C | 2 +-
src/OpenFOAM/global/argList/argList.C | 3 +--
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H | 3 +--
src/OpenFOAM/matrices/solution/solution.C | 2 +-
src/OpenFOAM/matrices/solution/solution.H | 3 +--
.../cfdTools/general/include/readPIMPLEControls.H | 4 ++--
src/finiteVolume/cfdTools/general/include/readPISOControls.H | 4 ++--
.../cfdTools/general/include/readSIMPLEControls.H | 4 ++--
src/finiteVolume/cfdTools/general/include/readTimeControls.H | 2 +-
.../coordinateRotation/EulerCoordinateRotation.C | 3 +--
.../coordinateRotation/STARCDCoordinateRotation.C | 3 +--
src/meshTools/coordinateSystems/cylindricalCS.C | 3 +--
src/meshTools/coordinateSystems/sphericalCS.C | 3 +--
21 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
index e69527a97cc..f8a11b7159e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
@@ -4,8 +4,8 @@
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- simple.lookupOrDefault<bool>("momentumPredictor", true);
+ simple.lookupOrDefault("momentumPredictor", true);
const bool transonic =
- simple.lookupOrDefault<bool>("transonic", false);
+ simple.lookupOrDefault("transonic", false);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
index 0591b366233..71e49a33a80 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
@@ -7,5 +7,5 @@
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- pimple.lookupOrDefault<bool>("momentumPredictor", true);
+ pimple.lookupOrDefault("momentumPredictor", true);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
index c03366ae7a7..1f8cdb82a33 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
@@ -10,8 +10,8 @@
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- piso.lookupOrDefault<bool>("momentumPredictor", true);
+ piso.lookupOrDefault("momentumPredictor", true);
const bool transonic =
- piso.lookupOrDefault<bool>("transonic", false);
+ piso.lookupOrDefault("transonic", false);
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
index bee4e4d7b83..8789bd0ab4b 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
@@ -2,8 +2,8 @@
#include "readPIMPLEControls.H"
const bool correctPhi =
- pimple.lookupOrDefault<bool>("correctPhi", false);
+ pimple.lookupOrDefault("correctPhi", false);
const bool checkMeshCourantNo =
- pimple.lookupOrDefault<bool>("checkMeshCourantNo", false);
+ pimple.lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
index 1ae6219fd6f..cec2cc8bb35 100644
--- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
+++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
@@ -96,7 +96,7 @@
)
);
- if (RASProperties.lookupOrDefault<Switch>("printCoeffs", false))
+ if (RASProperties.lookupOrDefault("printCoeffs", false))
{
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
index 11c3e8071e8..a5a2a183e5b 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@@ -20,8 +20,8 @@
}
const bool correctPhi =
- piso.lookupOrDefault<bool>("correctPhi", true);
+ piso.lookupOrDefault("correctPhi", true);
const bool checkMeshCourantNo =
- piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
+ piso.lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/multiphase/interDyMFoam/readControls.H b/applications/solvers/multiphase/interDyMFoam/readControls.H
index 8264a051c23..10b09bf8ffa 100644
--- a/applications/solvers/multiphase/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/readControls.H
@@ -2,8 +2,8 @@
# include "readPISOControls.H"
const bool correctPhi =
- piso.lookupOrDefault<bool>("correctPhi", true);
+ piso.lookupOrDefault("correctPhi", true);
const bool checkMeshCourantNo =
- piso.lookupOrDefault<bool>("checkMeshCourantNo", false);
+ piso.lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index c8e05c4209c..598b49bcc6c 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -276,7 +276,7 @@
)
);
- if (RASProperties.lookupOrDefault<Switch>("printCoeffs", false))
+ if (RASProperties.lookupOrDefault("printCoeffs", false))
{
Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
<< "wallFunctionCoeffs" << wallFunctionDict << endl;
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 3246358d9b7..51255242ef9 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
);
const bool invertSelection =
- meshSubsetDict.lookupOrDefault<bool>("invertSelection", false);
+ meshSubsetDict.lookupOrDefault("invertSelection", false);
// Mark the cells for the subset
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 82c6ff47c95..6fc06a69cc6 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -28,7 +28,6 @@ License
#include "clock.H"
#include "IFstream.H"
#include "dictionary.H"
-#include "Switch.H"
#include "IOobject.H"
#include "JobInfo.H"
#include "labelList.H"
@@ -564,7 +563,7 @@ Foam::argList::argList
}
// distributed data
- if (decompDict.lookupOrDefault<Switch>("distributed", false))
+ if (decompDict.lookupOrDefault("distributed", false))
{
fileNameList roots;
decompDict.lookup("roots") >> roots;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 54908a720d6..d0287653cfc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -58,7 +58,6 @@ SourceFiles
#include "labelField.H"
#include "primitiveFields.H"
#include "LUscalarMatrix.H"
-#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,7 +74,7 @@ class GAMGSolver
{
// Private data
- Switch cacheAgglomeration_;
+ bool cacheAgglomeration_;
//- Number of pre-smoothing sweeps
label nPreSweeps_;
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 5aa40ae572e..179641bea0d 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -255,7 +255,7 @@ bool Foam::solution::read()
if (dict.found("cache"))
{
cache_ = dict.subDict("cache");
- caching_ = cache_.lookupOrDefault<Switch>("active", true);
+ caching_ = cache_.lookupOrDefault("active", true);
}
if (dict.found("relaxationFactors"))
diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H
index a2e06b19de4..8a24ca0eb44 100644
--- a/src/OpenFOAM/matrices/solution/solution.H
+++ b/src/OpenFOAM/matrices/solution/solution.H
@@ -36,7 +36,6 @@ SourceFiles
#define solution_H
#include "IOdictionary.H"
-#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +56,7 @@ class solution
dictionary cache_;
//- Switch for the caching mechanism
- Switch caching_;
+ bool caching_;
//- Dictionary of relaxation factors for all the fields
dictionary relaxationFactors_;
diff --git a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
index 3d9fd3c7eca..7e88ec410b7 100644
--- a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H
@@ -10,8 +10,8 @@
pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- pimple.lookupOrDefault<bool>("momentumPredictor", true);
+ pimple.lookupOrDefault("momentumPredictor", true);
const bool transonic =
- pimple.lookupOrDefault<bool>("transonic", false);
+ pimple.lookupOrDefault("transonic", false);
diff --git a/src/finiteVolume/cfdTools/general/include/readPISOControls.H b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
index 850ee1401d0..61cb2f7a8c7 100644
--- a/src/finiteVolume/cfdTools/general/include/readPISOControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
@@ -10,8 +10,8 @@
piso.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- piso.lookupOrDefault<bool>("momentumPredictor", true);
+ piso.lookupOrDefault("momentumPredictor", true);
const bool transonic =
- piso.lookupOrDefault<bool>("transonic", false);
+ piso.lookupOrDefault("transonic", false);
diff --git a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
index 6019876e113..26575dde417 100644
--- a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H
@@ -4,8 +4,8 @@
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
const bool momentumPredictor =
- simple.lookupOrDefault<bool>("momentumPredictor", true);
+ simple.lookupOrDefault("momentumPredictor", true);
const bool transonic =
- simple.lookupOrDefault<bool>("transonic", false);
+ simple.lookupOrDefault("transonic", false);
diff --git a/src/finiteVolume/cfdTools/general/include/readTimeControls.H b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
index 8255c9af4ca..60b2e204928 100644
--- a/src/finiteVolume/cfdTools/general/include/readTimeControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
@@ -30,7 +30,7 @@ Description
\*---------------------------------------------------------------------------*/
const bool adjustTimeStep =
- runTime.controlDict().lookupOrDefault<bool>("adjustTimeStep", false);
+ runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
scalar maxCo =
runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index e9f9882c8b0..68f3c272bf5 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -25,7 +25,6 @@ License
#include "EulerCoordinateRotation.H"
-#include "Switch.H"
#include "mathematicalConstants.H"
#include "addToRunTimeSelectionTable.H"
@@ -137,7 +136,7 @@ Foam::EulerCoordinateRotation::EulerCoordinateRotation
rotation.component(vector::X),
rotation.component(vector::Y),
rotation.component(vector::Z),
- dict.lookupOrDefault<Switch>("degrees", true)
+ dict.lookupOrDefault("degrees", true)
);
}
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index c8277b9071d..7bea35f466e 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -25,7 +25,6 @@ License
#include "STARCDCoordinateRotation.H"
-#include "Switch.H"
#include "mathematicalConstants.H"
#include "addToRunTimeSelectionTable.H"
@@ -138,7 +137,7 @@ Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
rotation.component(vector::X),
rotation.component(vector::Y),
rotation.component(vector::Z),
- dict.lookupOrDefault<Switch>("degrees", true)
+ dict.lookupOrDefault("degrees", true)
);
}
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinateSystems/cylindricalCS.C
index 588397eeab0..372e06cfc77 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.C
+++ b/src/meshTools/coordinateSystems/cylindricalCS.C
@@ -26,7 +26,6 @@ License
#include "cylindricalCS.H"
#include "one.H"
-#include "Switch.H"
#include "mathematicalConstants.H"
#include "addToRunTimeSelectionTable.H"
@@ -106,7 +105,7 @@ Foam::cylindricalCS::cylindricalCS
)
:
coordinateSystem(name, dict),
- inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
+ inDegrees_(dict.lookupOrDefault("degrees", true))
{}
diff --git a/src/meshTools/coordinateSystems/sphericalCS.C b/src/meshTools/coordinateSystems/sphericalCS.C
index 40cf2630884..9aa8343407d 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.C
+++ b/src/meshTools/coordinateSystems/sphericalCS.C
@@ -26,7 +26,6 @@ License
#include "sphericalCS.H"
#include "one.H"
-#include "Switch.H"
#include "mathematicalConstants.H"
#include "addToRunTimeSelectionTable.H"
@@ -106,7 +105,7 @@ Foam::sphericalCS::sphericalCS
)
:
coordinateSystem(name, dict),
- inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
+ inDegrees_(dict.lookupOrDefault("degrees", true))
{}
--
GitLab
From 7e9adc7b31cda4b8cd476d14435f96873d884236 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 1 Jun 2010 09:23:47 +0200
Subject: [PATCH 05/77] ENH: add wmakeFindEmptyMake, -help option for
wmakeFilesAndOptions
wmakeFindEmptyMake:
- Find 'Make/' directories without 'files' or 'options'.
These typically correspond to (partially) removed applications.
---
wmake/wmakeFilesAndOptions | 35 ++++++++++++++-
wmake/wmakeFindEmptyMake | 87 ++++++++++++++++++++++++++++++++++++++
2 files changed, 121 insertions(+), 1 deletion(-)
create mode 100755 wmake/wmakeFindEmptyMake
diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions
index 61984eea074..d2e8cf29c22 100755
--- a/wmake/wmakeFilesAndOptions
+++ b/wmake/wmakeFilesAndOptions
@@ -26,7 +26,7 @@
# wmakeFilesAndOptions
#
# Description
-# Script to scan the current directory for directories and source files
+# Scan current directory for directories and source files
# and construct Make/files and Make/options
#
# Usage : wmakeFilesAndOptions
@@ -34,6 +34,39 @@
#------------------------------------------------------------------------------
Script=${0##*/}
+usage() {
+ while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+ cat<<USAGE
+
+usage: ${0##*/}
+
+ Scan current directory for directories and source files
+ and construct 'Make/files' and 'Make/options'
+
+USAGE
+ exit 1
+}
+
+
+# simple parse options
+while [ "$#" -gt 0 ]
+do
+ case "$1" in
+ -h | -help) # provide immediate help
+ usage
+ ;;
+ -*)
+ usage "unknown option: '$*'"
+ ;;
+ *)
+ break
+ ;;
+ esac
+done
+
+# no arguments
+[ "$#" -eq 0 ] || usage "unexpected arguments: '$*'"
+
#
# check environment variables
#
diff --git a/wmake/wmakeFindEmptyMake b/wmake/wmakeFindEmptyMake
new file mode 100755
index 00000000000..d6edb387d8c
--- /dev/null
+++ b/wmake/wmakeFindEmptyMake
@@ -0,0 +1,87 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+# \\/ M anipulation |
+#-------------------------------------------------------------------------------
+# License
+# This file is part of OpenFOAM.
+#
+# OpenFOAM is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+# wmakeFindEmptyMake
+#
+# Description
+# Find 'Make/' directories without 'files' or 'options'.
+# These typically correspond to (partially) removed applications.
+#
+#------------------------------------------------------------------------------
+usage() {
+ while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+ cat<<USAGE
+
+usage: ${0##*/} [dir1 .. dirN]
+
+ Find 'Make/' directories without 'files' or 'options'.
+ These typically correspond to (partially) removed applications.
+
+USAGE
+ exit 1
+}
+
+#------------------------------------------------------------------------------
+findName=lnInclude
+
+# simple parse options
+while [ "$#" -gt 0 ]
+do
+ case "$1" in
+ -h | -help) # provide immediate help
+ usage
+ ;;
+ -*)
+ usage "unknown option: '$*'"
+ ;;
+ *)
+ break
+ ;;
+ esac
+done
+
+
+# default to searching from pwd
+[ "$#" -gt 0 ] || set -- .
+
+for checkDir
+do
+ if [ -d $checkDir ]
+ then
+ echo "searching: $checkDir for 'Make' directories without 'files' or 'options'" 1>&2
+ echo "---------" 1>&2
+ else
+ echo "skipping non-dir: $checkDir" 1>&2
+ echo "----------------" 1>&2
+ continue
+ fi
+
+ find $checkDir -depth -type d -name Make -print | while read MakeDir
+ do
+ [ -f "$MakeDir/files" -o -f "$MakeDir/options" ] || echo $MakeDir
+ done
+done
+
+#------------------------------------------------------------------------------
--
GitLab
From 824df2c3789eb93234f983e7597d9a8e32c7c507 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 1 Jun 2010 10:14:56 +0200
Subject: [PATCH 06/77] ENH: add org-pdflatex to create pdf files
---
bin/org-pdflatex | 1 +
bin/tools/org-batch | 32 +++++++++++++++++++++++++++++---
2 files changed, 30 insertions(+), 3 deletions(-)
create mode 120000 bin/org-pdflatex
diff --git a/bin/org-pdflatex b/bin/org-pdflatex
new file mode 120000
index 00000000000..b7b47c1517b
--- /dev/null
+++ b/bin/org-pdflatex
@@ -0,0 +1 @@
+tools/org-batch
\ No newline at end of file
diff --git a/bin/tools/org-batch b/bin/tools/org-batch
index 90b60f0464b..ae97370dbd0 100755
--- a/bin/tools/org-batch
+++ b/bin/tools/org-batch
@@ -37,8 +37,9 @@ usage() {
Usage: ${0##*/} [OPTIONS] file1 [.. fileN]
options:
- -html create html (default)
- -latex create LaTeX
+ -html create html (default)
+ -latex create LaTeX
+ -pdflatex create pdf via pdflatex
* Batch process emacs org-mode files to create html/LaTeX etc.
@@ -49,8 +50,14 @@ USAGE
# default is html export:
mode=html
+unset makePDF
+echo "have $Script"
case $Script in
+*pdflatex)
+ mode=latex
+ makePDF=pdflatex
+ ;;
*latex)
mode=latex
;;
@@ -59,7 +66,6 @@ case $Script in
;;
esac
-
# parse options
while [ "$#" -gt 0 ]
do
@@ -75,6 +81,11 @@ do
mode=latex
shift
;;
+ -pdflatex)
+ mode=latex
+ makePDF=pdflatex
+ shift
+ ;;
-*)
usage "unknown option: '$*'"
;;
@@ -98,6 +109,21 @@ do
then
emacs --batch -l org --visit=$org \
--funcall org-export-as-$mode-batch
+
+ # post-processing step to create pdf
+ case "$makePDF" in
+ pdflatex)
+ input="${org%.org}.tex"
+
+ if [ -f "$input" ]
+ then
+ pdflatex "$input"
+ else
+ echo "No $input to convert to pdf"
+ fi
+ ;;
+ esac
+
else
echo "File not found"
fi
--
GitLab
From 35d3be771ebad93daf1912b18ccddd1195f29341 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 1 Jun 2010 10:19:11 +0200
Subject: [PATCH 07/77] STYLE: fix spelling, backslashes etc. in
codingStyleGuide.org
- now passes through LaTeX with fewer complaints.
- added note about braces for 'case' statements.
- could not formulate a sensible rule about when return statements
need parentheses and when not.
- did not update codingStyleGuide.pdf ... I don't even know if it
should be part of the git repo at all
---
doc/codingStyleGuide.org | 46 +++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 94a1b51536e..589f946839a 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -2,7 +2,7 @@
#
#+TITLE: OpenFOAM C++ style guide
#+AUTHOR: OpenCFD Ltd.
-#+DATE: May 2010
+#+DATE: June 2010
#+LINK: http://www.opencfd.co.uk
#+OPTIONS: author:nil ^:{}
@@ -13,9 +13,12 @@
+ The normal indentation is 4 spaces per logical level.
+ Use spaces for indentation, not tab characters.
+ Avoid trailing whitespace.
- + The body of control statements (eg, =if=, =else=, =while=, etc).
+ + The body of control statements (eg, =if=, =else=, =while=, etc). is
always delineated with brace brackets. A possible exception can be
- made with =break= or =continue= as part of a control structure.
+ made in conjunction with =break= or =continue= as part of a control
+ structure.
+ + The body of =case= statements is usually delineated with brace brackets.
+ + A fall-through =case= should be commented as such.
+ stream output
+ =<<= is always four characters after the start of the stream,
@@ -132,22 +135,25 @@
+ Use two empty lines between functions
*** Coding Practice
- + passing data as arguments or return
- Pass bool, label and scalar as copy, anything larger by reference.
+ + passing data as arguments or return values.
+ + Pass bool, label and scalar as copy, anything larger by reference.
+ const
- Use everywhere it is applicable.
+ + Use everywhere it is applicable.
- + variable initialisation using =
-
- : const className& variableName = otherClass.data();
+ + variable initialisation using
+#+BEGIN_EXAMPLE
+ const className& variableName = otherClass.data();
+#+END_EXAMPLE
NOT
- : const className& variableName(otherClass.data());
+#+BEGIN_EXAMPLE
+ const className& variableName(otherClass.data());
+#+END_EXAMPLE
+ virtual functions
- If a class is virtual - make all derived classes virtual.
+ + If a class is virtual, make all derived classes virtual.
*** Conditional Statements
#+BEGIN_EXAMPLE
@@ -169,7 +175,7 @@
}
#+END_EXAMPLE
- NOT (no space between =if= and =(=)
+ NOT (no space between =if= and =(= used)
#+BEGIN_EXAMPLE
if(condition)
@@ -201,7 +207,7 @@
}
#+END_EXAMPLE
- NOT (no space between =for= and =(=)
+ NOT this (no space between =for= and =(= used)
#+BEGIN_EXAMPLE
for(i = 0; i < maxI; i++)
@@ -349,7 +355,7 @@
* (k + t);
#+END_EXAMPLE
- This is sometime more legible when surrounded by extra parentheses:
+ This is sometimes more legible when surrounded by extra parentheses:
#+BEGIN_EXAMPLE
variableName =
@@ -437,15 +443,15 @@
*** Doxygen Special Commands
- Doxygen has a large number of special commands with a '\' prefix or a
- (alternatively) an '@' prefix.
+ Doxygen has a large number of special commands with a =\= prefix or
+ (alternatively) an =@= prefix.
- The '@' prefix form is recommended for most Doxygen specials, since it
+ The =@= prefix form is recommended for most Doxygen specials, since it
has the advantage of standing out. It also happens to be what projects
like gcc and VTK are using.
- The '\' prefix form, however, looks a bit better for the '\n' newline
- command and when escaping single characters - eg, '\@', '\<', '\>', etc.
+ The =\= prefix form, however, looks a bit better for the =\n= newline
+ command and when escaping single characters - eg, =\@=, =\<=, =\>=, etc.
Since the filtering removes the leading 4 spaces within the blocks, the
Doxygen commmands can be inserted within the block without problems.
@@ -514,7 +520,7 @@
#+END_EXAMPLE
-*** Documenting Typedefs and classes defined via macros
+*** Documenting typedefs and classes defined via macros
... not yet properly resolved
--
GitLab
From 47f692db8cfa5bbffc7ae62357f2cfd5627234de Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 1 Jun 2010 16:53:15 +0200
Subject: [PATCH 08/77] ENH: add non-const access for
lduMatrix::solverPerformance::solverName()
- use it to report the correct solverName for vector/tensor fields
---
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H | 7 +++++++
src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C | 1 +
2 files changed, 8 insertions(+)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 924c1e51f0e..83b75ab24a5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -145,6 +145,13 @@ public:
return solverName_;
}
+ //- Return solver name
+ word& solverName()
+ {
+ return solverName_;
+ }
+
+
//- Return initial residual
scalar initialResidual() const
{
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index b4889660f6c..fcf1a6a4b9f 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -150,6 +150,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
solverPerf.print();
solverPerfVec = max(solverPerfVec, solverPerf);
+ solverPerfVec.solverName() = solverPerf.solverName();
psi.internalField().replace(cmpt, psiCmpt);
diag() = saveDiag;
--
GitLab
From d572f40c6359b5a42f85980c4cd4aadf9cb889a1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 17 May 2010 12:56:30 +0200
Subject: [PATCH 09/77] ENH: allow retention of 'FoamFile' when reading
dictionaries
- used in expandDictionary
---
.../expandDictionary/expandDictionary.C | 11 +-
src/OpenFOAM/db/dictionary/dictionary.H | 11 +-
src/OpenFOAM/db/dictionary/dictionaryIO.C | 111 +++++++++++-------
3 files changed, 85 insertions(+), 48 deletions(-)
diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
index 08e8f29f24d..86b1caec440 100644
--- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
+++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
@@ -42,6 +42,12 @@ using namespace Foam;
int main(int argc, char *argv[])
{
+ argList::addNote
+ (
+ "Read the specified dictionary file, expand the macros etc. and write\n"
+ "the resulting dictionary to standard output."
+ );
+
argList::noBanner();
argList::noParallel();
argList::validArgs.append("inputDict");
@@ -49,9 +55,10 @@ int main(int argc, char *argv[])
const string dictName = args[1];
- Info<<"//\n// expansion of dictionary " << dictName << "\n//\n";
+ IOobject::writeBanner(Info)
+ <<"//\n// " << dictName << "\n//\n";
- dictionary(IFstream(dictName)()).write(Info, false);
+ dictionary(IFstream(dictName)(), true).write(Info, false);
IOobject::writeDivider(Info);
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index c483aed5570..3c3d5043539 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -191,10 +191,14 @@ public:
Istream&
);
- //- Construct top-level dictionary from Istream, reading entries
- // until EOF
+ //- Construct top-level dictionary from Istream,
+ // reading entries until EOF
dictionary(Istream&);
+ //- Construct top-level dictionary from Istream,
+ // reading entries until EOF, optionally keeping the header
+ dictionary(Istream&, const bool keepHeader);
+
//- Construct as copy given the parent dictionary
dictionary(const dictionary& parentDict, const dictionary&);
@@ -441,6 +445,9 @@ public:
//- Read dictionary from Istream
bool read(Istream&);
+ //- Read dictionary from Istream, optionally keeping the header
+ bool read(Istream&, const bool keepHeader);
+
// Write
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 1c452bafaf3..54d2877da2a 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -28,13 +28,61 @@ License
#include "inputModeEntry.H"
#include "regExp.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-bool Foam::dictionary::read(Istream& is)
+Foam::dictionary::dictionary
+(
+ const fileName& name,
+ const dictionary& parentDict,
+ Istream& is
+)
+:
+ dictionaryName(parentDict.name() + "::" + name),
+ parent_(parentDict)
+{
+ read(is);
+}
+
+
+Foam::dictionary::dictionary(Istream& is)
+:
+ dictionaryName(is.name()),
+ parent_(dictionary::null)
+{
+ // Reset input mode as this is a "top-level" dictionary
+ functionEntries::inputModeEntry::clear();
+
+ read(is);
+}
+
+
+Foam::dictionary::dictionary(Istream& is, const bool keepHeader)
+:
+ dictionaryName(is.name()),
+ parent_(dictionary::null)
+{
+ // Reset input mode as this is a "top-level" dictionary
+ functionEntries::inputModeEntry::clear();
+
+ read(is, keepHeader);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::dictionary> Foam::dictionary::New(Istream& is)
+{
+ return autoPtr<dictionary>(new dictionary(is));
+}
+
+
+// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+
+bool Foam::dictionary::read(Istream& is, const bool keepHeader)
{
if (!is.good())
{
- FatalIOErrorIn("dictionary::read(Istream&, const word&)", is)
+ FatalIOErrorIn("dictionary::read(Istream&, bool)", is)
<< "Istream not OK for reading dictionary "
<< exit(FatalIOError);
@@ -50,12 +98,15 @@ bool Foam::dictionary::read(Istream& is)
while (!is.eof() && entry::New(*this, is))
{}
- // Remove the FoamFile header entry if it exists
- remove("FoamFile");
+ // normally remove the FoamFile header entry if it exists
+ if (!keepHeader)
+ {
+ remove("FoamFile");
+ }
if (is.bad())
{
- Info<< "dictionary::read(Istream&, const word&) : "
+ Info<< "dictionary::read(Istream&, bool) : "
<< "Istream not OK after reading dictionary " << name()
<< endl;
@@ -66,6 +117,12 @@ bool Foam::dictionary::read(Istream& is)
}
+bool Foam::dictionary::read(Istream& is)
+{
+ return this->read(is, false);
+}
+
+
bool Foam::dictionary::substituteKeyword(const word& keyword)
{
word varName = keyword(1, keyword.size()-1);
@@ -90,40 +147,6 @@ bool Foam::dictionary::substituteKeyword(const word& keyword)
}
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::dictionary::dictionary
-(
- const fileName& name,
- const dictionary& parentDict,
- Istream& is
-)
-:
- dictionaryName(parentDict.name() + "::" + name),
- parent_(parentDict)
-{
- read(is);
-}
-
-
-Foam::dictionary::dictionary(Istream& is)
-:
- dictionaryName(is.name()),
- parent_(dictionary::null)
-{
- // Reset input mode as this is a "top-level" dictionary
- functionEntries::inputModeEntry::clear();
-
- read(is);
-}
-
-
-Foam::autoPtr<Foam::dictionary> Foam::dictionary::New(Istream& is)
-{
- return autoPtr<dictionary>(new dictionary(is));
-}
-
-
// * * * * * * * * * * * * * * Istream Operator * * * * * * * * * * * * * * //
Foam::Istream& Foam::operator>>(Istream& is, dictionary& dict)
@@ -145,7 +168,7 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
{
if (subDict)
{
- os << nl << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os << nl << indent << token::BEGIN_BLOCK << incrIndent << nl;
}
forAllConstIter(IDLList<entry>, *this, iter)
@@ -153,12 +176,12 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
const entry& e = *iter;
// Write entry
- os << e;
+ os << e;
// Add extra new line between entries for "top-level" dictionaries
if (!subDict && parent() == dictionary::null && e != *last())
{
- os << nl;
+ os << nl;
}
// Check stream before going to next entry.
@@ -173,7 +196,7 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
if (subDict)
{
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os << decrIndent << indent << token::END_BLOCK << endl;
}
}
--
GitLab
From 59c0e8e24d98cc4002eb54c390d67d1096e0d79d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 09:13:48 +0200
Subject: [PATCH 10/77] STYLE: fix 'forAll (' -> 'forAll(' format (again)
---
.../fluentMeshToFoam/create3DCellShape.C | 2 +-
.../decomposePar/domainDecompositionMesh.C | 18 +++++++++---------
.../cyclicGAMGInterface/cyclicGAMGInterface.C | 6 +++---
.../processorCyclicPointPatch.C | 10 +++++-----
.../polyMesh/globalMeshData/globalPoints.C | 2 +-
.../meshes/polyMesh/polyMeshFromShapeMesh.C | 2 +-
.../basic/InteractionLists/InteractionLists.C | 4 ++--
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index ddf722d3241..adcce3869d9 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -90,7 +90,7 @@ cellShape create3DCellShape
// make a list of outward-pointing faces
labelListList localFaces(faceLabels.size());
- forAll (faceLabels, faceI)
+ forAll(faceLabels, faceI)
{
const label curFaceLabel = faceLabels[faceI];
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 46febf2b44d..2cc678ce7a8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -130,7 +130,7 @@ void Foam::domainDecomposition::decomposeMesh()
procFaceAddressing_.setSize(nProcs_);
// Internal faces
- forAll (neighbour, facei)
+ forAll(neighbour, facei)
{
if (cellToProc_[owner[facei]] == cellToProc_[neighbour[facei]])
{
@@ -141,16 +141,16 @@ void Foam::domainDecomposition::decomposeMesh()
// for all processors, set the size of start index and patch size
// lists to the number of patches in the mesh
- forAll (procPatchSize_, procI)
+ forAll(procPatchSize_, procI)
{
procPatchSize_[procI].setSize(patches.size());
procPatchStartIndex_[procI].setSize(patches.size());
}
- forAll (patches, patchi)
+ forAll(patches, patchi)
{
// Reset size and start index for all processors
- forAll (procPatchSize_, procI)
+ forAll(procPatchSize_, procI)
{
procPatchSize_[procI][patchi] = 0;
procPatchStartIndex_[procI][patchi] =
@@ -167,7 +167,7 @@ void Foam::domainDecomposition::decomposeMesh()
const unallocLabelList& patchFaceCells =
patches[patchi].faceCells();
- forAll (patchFaceCells, facei)
+ forAll(patchFaceCells, facei)
{
const label curProc = cellToProc_[patchFaceCells[facei]];
@@ -190,7 +190,7 @@ void Foam::domainDecomposition::decomposeMesh()
const unallocLabelList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
- forAll (patchFaceCells, facei)
+ forAll(patchFaceCells, facei)
{
const label curProc = cellToProc_[patchFaceCells[facei]];
const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
@@ -216,7 +216,7 @@ void Foam::domainDecomposition::decomposeMesh()
List<DynamicList<DynamicList<label> > > interPatchFaces(nProcs_);
// Processor boundaries from internal faces
- forAll (neighbour, facei)
+ forAll(neighbour, facei)
{
label ownerProc = cellToProc_[owner[facei]];
label nbrProc = cellToProc_[neighbour[facei]];
@@ -249,7 +249,7 @@ void Foam::domainDecomposition::decomposeMesh()
}
// Processor boundaries from split cyclics
- forAll (patches, patchi)
+ forAll(patches, patchi)
{
if (isA<cyclicPolyPatch>(patches[patchi]))
{
@@ -279,7 +279,7 @@ void Foam::domainDecomposition::decomposeMesh()
}
// Add faces with different owner and neighbour processors
- forAll (patchFaceCells, facei)
+ forAll(patchFaceCells, facei)
{
const label ownerProc = cellToProc_[patchFaceCells[facei]];
const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 2aac532ce16..29ab1a93a9f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -76,7 +76,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
label nCoarseFaces = 0;
- forAll (localRestrictAddressing, ffi)
+ forAll(localRestrictAddressing, ffi)
{
label curMaster = -1;
label curSlave = -1;
@@ -164,7 +164,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
if (owner())
{
// On master side, the owner addressing is stored in table of contents
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
@@ -200,7 +200,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
else
{
// On slave side, the owner addressing is stored in linked lists
- forAll (contents, masterI)
+ forAll(contents, masterI)
{
SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C
index 363ae015dca..a5fcf1721a7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C
@@ -69,7 +69,7 @@ addToRunTimeSelectionTable
//
// faceList masterFaces(pp.size());
//
-// forAll (pp, faceI)
+// forAll(pp, faceI)
// {
// masterFaces[faceI] = pp[faceI].reverseFace();
// }
@@ -119,13 +119,13 @@ addToRunTimeSelectionTable
//
// label noFiltPoints = 0;
//
-// forAll (meshPoints_, pointI)
+// forAll(meshPoints_, pointI)
// {
// label curP = meshPoints_[pointI];
//
// bool found = false;
//
-// forAll (sharedPoints, sharedI)
+// forAll(sharedPoints, sharedI)
// {
// if (sharedPoints[sharedI] == curP)
// {
@@ -165,7 +165,7 @@ addToRunTimeSelectionTable
// // Create a HashSet of the point labels for this patch
// Map<label> patchPointSet(2*ppmp.size());
//
-// forAll (ppmp, ppi)
+// forAll(ppmp, ppi)
// {
// patchPointSet.insert(ppmp[ppi], ppi);
// }
@@ -296,7 +296,7 @@ addToRunTimeSelectionTable
// // Create a HashSet of the point labels for the patch
// Map<label> patchPointSet(2*fmp.size());
//
-// forAll (fmp, ppi)
+// forAll(fmp, ppi)
// {
// patchPointSet.insert(fmp[ppi], ppi);
// }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 03070256454..73b0b3fec14 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -1164,7 +1164,7 @@ Foam::labelList Foam::globalPoints::reverseMeshPoints
faceList masterFaces(nbrPatch.size());
- forAll (nbrPatch, faceI)
+ forAll(nbrPatch, faceI)
{
masterFaces[faceI] = nbrPatch[faceI].reverseFace();
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 3898cd43f09..4657cfc5c87 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -856,7 +856,7 @@ Foam::polyMesh::polyMesh
// Warning: Patches can only be added once the face list is
// completed, as they hold a subList of the face list
- forAll (boundaryFaces, patchI)
+ forAll(boundaryFaces, patchI)
{
dictionary patchDict(boundaryDicts[patchI]);
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 83ab477ee4a..391a41aa5b7 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -932,7 +932,7 @@ void Foam::InteractionLists<ParticleType>::prepareParticlesToRefer
IDLList<ParticleType>& particlesToRefer = referredParticles_[i];
- forAll (realParticles, rM)
+ forAll(realParticles, rM)
{
const ParticleType& particle = *realParticles[rM];
@@ -1188,7 +1188,7 @@ void Foam::InteractionLists<ParticleType>::receiveReferredData
{
UIPstream str(domain, pBufs);
- forAll (constructMap, i)
+ forAll(constructMap, i)
{
referredParticles_[constructMap[i]] = IDLList<ParticleType>
(
--
GitLab
From 182b368bf6354224f28b02a1cc881a3c3c12c410 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 17 May 2010 16:06:53 +0200
Subject: [PATCH 11/77] ENH: change return type of Time::stopAt to report if
the setting changed
---
src/OpenFOAM/db/Time/Time.C | 4 +++-
src/OpenFOAM/db/Time/Time.H | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 0afa8d69b34..b9eebc0d7f1 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -552,8 +552,9 @@ bool Foam::Time::end() const
}
-void Foam::Time::stopAt(const stopAtControls sa) const
+bool Foam::Time::stopAt(const stopAtControls sa) const
{
+ const bool changed = (stopAt_ != sa);
stopAt_ = sa;
// adjust endTime
@@ -565,6 +566,7 @@ void Foam::Time::stopAt(const stopAtControls sa) const
{
endTime_ = GREAT;
}
+ return changed;
}
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 7596fee0c9b..55b02813c99 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -406,7 +406,8 @@ public:
//- Adjust the current stopAtControl. Note that this value
// only persists until the next time the dictionary is read.
- virtual void stopAt(const stopAtControls) const;
+ // Return true if the stopAtControl changed.
+ virtual bool stopAt(const stopAtControls) const;
//- Reset the time and time-index to those of the given time
virtual void setTime(const Time&);
--
GitLab
From db07daf6ba1e30aaccb6a46e2e1def05e8a4e58f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 17 May 2010 16:24:32 +0200
Subject: [PATCH 12/77] BUG: race condition when removing ABORT file
---
.../abortCalculation/abortCalculation.C | 59 +++++++++++++------
1 file changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 9cd6a2af07a..49ae674ef6f 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,6 +28,7 @@ License
#include "error.H"
#include "Time.H"
#include "OSspecific.H"
+#include "PstreamReduceOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -52,8 +53,12 @@ const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
void Foam::abortCalculation::removeFile() const
{
- if (isFile(abortFile_))
+ bool hasAbort = isFile(abortFile_);
+ reduce(hasAbort, orOp<bool>());
+
+ if (hasAbort && Pstream::master())
{
+ // cleanup ABORT file (on master only)
rm(abortFile_);
}
}
@@ -92,14 +97,9 @@ Foam::abortCalculation::~abortCalculation()
void Foam::abortCalculation::read(const dictionary& dict)
{
- word actionName;
-
if (dict.found("action"))
{
- action_ = actionTypeNames_.read
- (
- dict.lookup("action")
- );
+ action_ = actionTypeNames_.read(dict.lookup("action"));
}
else
{
@@ -115,27 +115,48 @@ void Foam::abortCalculation::read(const dictionary& dict)
void Foam::abortCalculation::execute()
{
- if (isFile(abortFile_))
+ bool hasAbort = isFile(abortFile_);
+ reduce(hasAbort, orOp<bool>());
+
+ if (hasAbort)
{
switch (action_)
{
case noWriteNow :
- obr_.time().stopAt(Time::saNoWriteNow);
- Info<< "user requested abort - "
- "stop immediately without writing data" << endl;
+ {
+ if (obr_.time().stopAt(Time::saNoWriteNow))
+ {
+ Info<< "USER REQUESTED ABORT (timeIndex="
+ << obr_.time().timeIndex()
+ << "): stop without writing data"
+ << endl;
+ }
break;
+ }
case writeNow :
- obr_.time().stopAt(Time::saWriteNow);
- Info<< "user requested abort - "
- "stop immediately with writing data" << endl;
+ {
+ if (obr_.time().stopAt(Time::saWriteNow))
+ {
+ Info<< "USER REQUESTED ABORT (timeIndex="
+ << obr_.time().timeIndex()
+ << "): stop+write data"
+ << endl;
+ }
break;
+ }
case nextWrite :
- obr_.time().stopAt(Time::saNextWrite);
- Info<< "user requested abort - "
- "stop after next data write" << endl;
+ {
+ if (obr_.time().stopAt(Time::saNextWrite))
+ {
+ Info<< "USER REQUESTED ABORT (timeIndex="
+ << obr_.time().timeIndex()
+ << "): stop after next data write"
+ << endl;
+ }
break;
+ }
}
}
}
@@ -149,7 +170,7 @@ void Foam::abortCalculation::end()
void Foam::abortCalculation::write()
{
- execute();
+ // Do nothing - only valid on execute
}
--
GitLab
From 7abd54708c2abb9d9e0de07cf8a97d4bf5721c45 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 18 May 2010 09:24:46 +0200
Subject: [PATCH 13/77] ENH: improve robustness of outputFilterOutputControl
---
src/OpenFOAM/containers/NamedEnum/NamedEnum.C | 18 +++++++--------
.../outputFilterOutputControl.C | 22 +++++++++++++++----
.../outputFilterOutputControl.H | 9 +++++---
3 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index 76b8c58765b..b39664af247 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
@@ -33,25 +33,25 @@ Foam::NamedEnum<Enum, nEnum>::NamedEnum()
:
HashTable<int>(2*nEnum)
{
- for (int i=0; i<nEnum; i++)
+ for (int enumI = 0; enumI < nEnum; ++enumI)
{
- if (!names[i] || names[i][0] == '\0')
+ if (!names[enumI] || names[enumI][0] == '\0')
{
- stringList goodNames(i);
+ stringList goodNames(enumI);
- for (int j = 0; j < i; j++)
+ for (int i = 0; i < enumI; ++i)
{
- goodNames[j] = names[j];
+ goodNames[i] = names[i];
}
FatalErrorIn("NamedEnum<Enum, nEnum>::NamedEnum()")
- << "Illegal enumeration name at position " << i << endl
+ << "Illegal enumeration name at position " << enumI << endl
<< "after entries " << goodNames << ".\n"
<< "Possibly your NamedEnum<Enum, nEnum>::names array"
<< " is not of size " << nEnum << endl
<< abort(FatalError);
}
- insert(names[i], i);
+ insert(names[enumI], enumI);
}
}
@@ -61,7 +61,7 @@ Foam::NamedEnum<Enum, nEnum>::NamedEnum()
template<class Enum, int nEnum>
Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
{
- word name(is);
+ const word name(is);
HashTable<int>::const_iterator iter = find(name);
@@ -71,7 +71,7 @@ Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
(
"NamedEnum<Enum, nEnum>::read(Istream&) const", is
) << name << " is not in enumeration: "
- << toc() << exit(FatalIOError);
+ << sortedToc() << exit(FatalIOError);
}
return Enum(iter());
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index 2644b0d0009..82e74c55c76 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,17 +68,27 @@ Foam::outputFilterOutputControl::~outputFilterOutputControl()
void Foam::outputFilterOutputControl::read(const dictionary& dict)
{
- outputControl_ = outputControlNames_.read(dict.lookup("outputControl"));
+ if (dict.found("outputControl"))
+ {
+ outputControl_ = outputControlNames_.read(dict.lookup("outputControl"));
+ }
+ else
+ {
+ outputControl_ = ocTimeStep;
+ }
switch (outputControl_)
{
case ocTimeStep:
{
- dict.lookup("outputInterval") >> outputInterval_;
+ outputInterval_ = dict.lookupOrDefault<label>("outputInterval", 0);
+ break;
}
+
default:
{
// do nothing
+ break;
}
}
}
@@ -97,17 +107,21 @@ bool Foam::outputFilterOutputControl::output() const
);
break;
}
+
case ocOutputTime:
{
return time_.outputTime();
break;
}
+
default:
{
+ // this error should not actually be possible
FatalErrorIn("bool Foam::outputFilterOutputControl::output()")
- << "Unknown output control: "
+ << "Undefined output control: "
<< outputControlNames_[outputControl_] << nl
<< abort(FatalError);
+ break;
}
}
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
index 865e4cb2c4d..3e6412f4656 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -25,6 +25,8 @@ Class
Foam::outputFilterOutputControl
Description
+ An output control for function objects.
+ The default is time-step execution at every interval.
SourceFiles
outputFilterOutputControl.C
@@ -51,10 +53,11 @@ class outputFilterOutputControl
{
public:
+ //- The output control options
enum outputControls
{
- ocTimeStep,
- ocOutputTime
+ ocTimeStep, /*!< execution is coupled to the time-step */
+ ocOutputTime /*!< execution is coupled to the output-time */
};
@@ -71,7 +74,7 @@ private:
//- Type of output
outputControls outputControl_;
- //- The execution interval (in time steps) when using TIMESTEP mode
+ //- The execution interval (in time steps) when using @c timeStep mode,
// a value <= 1 means execute at every time step
label outputInterval_;
--
GitLab
From 402f17f73f67980800beb93ff8360ad4049c61c9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 18 May 2010 10:47:27 +0200
Subject: [PATCH 14/77] STYLE: swirlMassFlowRateInletVelocity ->
swirlFlowRateInletVelocity
- improve documentation, use GPL version 3
---
src/finiteVolume/Make/files | 2 +-
.../flowRateInletVelocityFvPatchVectorField.C | 4 +-
.../flowRateInletVelocityFvPatchVectorField.H | 6 +-
...FlowRateInletVelocityFvPatchVectorField.C} | 70 +++++++++----------
...FlowRateInletVelocityFvPatchVectorField.H} | 64 +++++++++++------
5 files changed, 83 insertions(+), 63 deletions(-)
rename src/finiteVolume/fields/fvPatchFields/derived/{swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C => swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C} (71%)
rename src/finiteVolume/fields/fvPatchFields/derived/{swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H => swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H} (70%)
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 3fa33b7e206..7928295d991 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -156,7 +156,7 @@ $(derivedFvPatchFields)/turbulentIntensityKineticEnergyInlet/turbulentIntensityK
$(derivedFvPatchFields)/uniformFixedValue/uniformFixedValueFvPatchFields.C
$(derivedFvPatchFields)/waveTransmissive/waveTransmissiveFvPatchFields.C
$(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
-$(derivedFvPatchFields)/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
+$(derivedFvPatchFields)/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
fvsPatchFields = fields/fvsPatchFields
$(fvsPatchFields)/fvsPatchField/fvsPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 489b82927f0..a0684b9618d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -118,9 +118,9 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
}
// a simpler way of doing this would be nice
- scalar avgU = -flowRate_/gSum(patch().magSf());
+ const scalar avgU = -flowRate_/gSum(patch().magSf());
- vectorField n = patch().nf();
+ tmp<vectorField> n = patch().nf();
const surfaceScalarField& phi =
db().lookupObject<surfaceScalarField>(phiName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index f86fdbe29ae..690c7160b0a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -37,9 +37,9 @@ Description
@verbatim
inlet
{
- type flowRateInletVelocity;
- flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
- value uniform (0 0 0); // placeholder
+ type flowRateInletVelocity;
+ flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
+ value uniform (0 0 0); // placeholder
}
@endverbatim
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
similarity index 71%
rename from src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
rename to src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 44a2239dca3..7114dc1d26f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "swirlMassFlowRateInletVelocityFvPatchVectorField.H"
+#include "swirlFlowRateInletVelocityFvPatchVectorField.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
@@ -33,8 +33,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::
-swirlMassFlowRateInletVelocityFvPatchVectorField::
-swirlMassFlowRateInletVelocityFvPatchVectorField
+swirlFlowRateInletVelocityFvPatchVectorField::
+swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF
@@ -49,10 +49,10 @@ swirlMassFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlMassFlowRateInletVelocityFvPatchVectorField::
-swirlMassFlowRateInletVelocityFvPatchVectorField
+swirlFlowRateInletVelocityFvPatchVectorField::
+swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf,
+ const swirlFlowRateInletVelocityFvPatchVectorField& ptf,
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -66,8 +66,8 @@ swirlMassFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlMassFlowRateInletVelocityFvPatchVectorField::
-swirlMassFlowRateInletVelocityFvPatchVectorField
+swirlFlowRateInletVelocityFvPatchVectorField::
+swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
@@ -83,10 +83,10 @@ swirlMassFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlMassFlowRateInletVelocityFvPatchVectorField::
-swirlMassFlowRateInletVelocityFvPatchVectorField
+swirlFlowRateInletVelocityFvPatchVectorField::
+swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf
+ const swirlFlowRateInletVelocityFvPatchVectorField& ptf
)
:
fixedValueFvPatchField<vector>(ptf),
@@ -98,10 +98,10 @@ swirlMassFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlMassFlowRateInletVelocityFvPatchVectorField::
-swirlMassFlowRateInletVelocityFvPatchVectorField
+swirlFlowRateInletVelocityFvPatchVectorField::
+swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf,
+ const swirlFlowRateInletVelocityFvPatchVectorField& ptf,
const DimensionedField<vector, volMesh>& iF
)
:
@@ -115,25 +115,28 @@ swirlMassFlowRateInletVelocityFvPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
+void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
{
if (updated())
{
return;
}
- scalar totArea = gSum(patch().magSf());
+ const scalar totArea = gSum(patch().magSf());
// a simpler way of doing this would be nice
- scalar avgU = -flowRate_/totArea;
+ const scalar avgU = -flowRate_/totArea;
- vector center = gSum(patch().Cf()*patch().magSf())/totArea;
- vector normal = gSum(patch().nf()*patch().magSf())/totArea;
+ const vector avgCenter = gSum(patch().Cf()*patch().magSf())/totArea;
+ const vector avgNormal = gSum(patch().Sf())/totArea;
- vectorField tangVelo =
+ // Update angular velocity - convert [rpm] to [rad/s]
+ vectorField tangentialVelocity =
+ (
(rpm_*constant::mathematical::pi/30.0)
- *(patch().Cf() - center) ^ normal;
+ * (patch().Cf() - avgCenter) ^ avgNormal
+ );
- vectorField n = patch().nf();
+ tmp<vectorField> n = patch().nf();
const surfaceScalarField& phi =
db().lookupObject<surfaceScalarField>(phiName_);
@@ -141,7 +144,7 @@ void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
if (phi.dimensions() == dimVelocity*dimArea)
{
// volumetric flow-rate
- operator==(tangVelo + n*avgU);
+ operator==(tangentialVelocity + n*avgU);
}
else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
{
@@ -149,13 +152,13 @@ void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
patch().lookupPatchField<volScalarField, scalar>(rhoName_);
// mass flow-rate
- operator==(tangVelo + n*avgU/rhop);
+ operator==(tangentialVelocity + n*avgU/rhop);
}
else
{
FatalErrorIn
(
- "swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
+ "swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
) << "dimensions of " << phiName_ << " are incorrect" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
@@ -167,18 +170,15 @@ void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
}
-void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
+void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
+(
+ Ostream& os
+) const
{
fvPatchField<vector>::write(os);
os.writeKeyword("flowRate") << flowRate_ << token::END_STATEMENT << nl;
- if (phiName_ != "phi")
- {
- os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
- }
- if (rhoName_ != "rho")
- {
- os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
- }
+ writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
os.writeKeyword("rpm") << rpm_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
@@ -191,7 +191,7 @@ namespace Foam
makePatchTypeField
(
fvPatchVectorField,
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
similarity index 70%
rename from src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
rename to src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
index 0ea56eb798f..4576f39c6c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
@@ -22,11 +22,11 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::swirlMassFlowRateInletVelocityFvPatchVectorField
+ Foam::swirlFlowRateInletVelocityFvPatchVectorField
Description
Describes a volumetric/mass flow normal vector boundary condition by its
- magnitude as an integral over its area with a swirl component determined
+ magnitude as an integral over its area, with a swirl component determined
by the RPM
The basis of the patch (volumetric or mass) is determined by the
@@ -38,22 +38,30 @@ Description
@verbatim
inlet
{
- type swirlMassFlowRateInletVelocity;
- flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
- rpm 100;
+ type swirlFlowRateInletVelocity;
+ flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
+ rpm 100;
+ value uniform (0 0 0); // placeholder
}
@endverbatim
Note
- The value is positive inwards
+ - May not work correctly for transonic inlets
+ - Swirl is defined in RPM about the patch centre-axis according
+ to a right-hand rule (inwards axis).
+ - Primarily useful for planar patches.
+
+See Also
+ Foam::flowRateInletVelocityFvPatchVectorField
SourceFiles
- swirlMassFlowRateInletVelocityFvPatchVectorField.C
+ swirlFlowRateInletVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/
-#ifndef swirlMassFlowRateInletVelocityFvPatchVectorField_H
-#define swirlMassFlowRateInletVelocityFvPatchVectorField_H
+#ifndef swirlFlowRateInletVelocityFvPatchVectorField_H
+#define swirlFlowRateInletVelocityFvPatchVectorField_H
#include "fixedValueFvPatchFields.H"
@@ -62,10 +70,10 @@ SourceFiles
namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class swirlMassFlowRateInletVelocityFvPatchVectorField Declaration
+ Class swirlFlowRateInletVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
-class swirlMassFlowRateInletVelocityFvPatchVectorField
+class swirlFlowRateInletVelocityFvPatchVectorField
:
public fixedValueFvPatchVectorField
{
@@ -80,27 +88,27 @@ class swirlMassFlowRateInletVelocityFvPatchVectorField
//- Name of the density field used to normalize the mass flux
word rhoName_;
- //- RPM
+ //- Swirl rate [rpm]
scalar rpm_;
public:
//- Runtime type information
- TypeName("swirlMassFlowRateInletVelocity");
+ TypeName("swirlFlowRateInletVelocity");
// Constructors
//- Construct from patch and internal field
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&
);
//- Construct from patch, internal field and dictionary
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&,
@@ -110,18 +118,18 @@ public:
//- Construct by mapping given
// flowRateInletVelocityFvPatchVectorField
// onto a new patch
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&,
+ const swirlFlowRateInletVelocityFvPatchVectorField&,
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&
+ const swirlFlowRateInletVelocityFvPatchVectorField&
);
//- Construct and return a clone
@@ -129,14 +137,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlMassFlowRateInletVelocityFvPatchVectorField(*this)
+ new swirlFlowRateInletVelocityFvPatchVectorField(*this)
);
}
//- Construct as copy setting internal field reference
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&,
+ const swirlFlowRateInletVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>&
);
@@ -148,7 +156,7 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlMassFlowRateInletVelocityFvPatchVectorField(*this, iF)
+ new swirlFlowRateInletVelocityFvPatchVectorField(*this, iF)
);
}
@@ -169,6 +177,18 @@ public:
return flowRate_;
}
+ //- Return the swirl rpm
+ scalar rpm() const
+ {
+ return rpm_;
+ }
+
+ //- Return reference to the swirl rpm to allow adjustment
+ scalar& rpm()
+ {
+ return rpm_;
+ }
+
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
--
GitLab
From 3430e4eaae2a8e4610237dcd232f083b7636810f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 18 May 2010 11:25:25 +0200
Subject: [PATCH 15/77] STYLE: fix minor typo in header
---
.../directionMixedFvPatchField.C | 33 ++++++++-----------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 7db899daa1a..e402e4edcac 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -1,6 +1,6 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | OpenOAM: The Open Source CFD Toolbox
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
@@ -26,15 +26,10 @@ License
#include "directionMixedFvPatchField.H"
#include "symmTransformField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-directionMixedFvPatchField<Type>::directionMixedFvPatchField
+Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -48,7 +43,7 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-directionMixedFvPatchField<Type>::directionMixedFvPatchField
+Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const directionMixedFvPatchField<Type>& ptf,
const fvPatch& p,
@@ -64,7 +59,7 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-directionMixedFvPatchField<Type>::directionMixedFvPatchField
+Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -81,7 +76,7 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-directionMixedFvPatchField<Type>::directionMixedFvPatchField
+Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const directionMixedFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -97,7 +92,7 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void directionMixedFvPatchField<Type>::autoMap
+void Foam::directionMixedFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -110,7 +105,7 @@ void directionMixedFvPatchField<Type>::autoMap
template<class Type>
-void directionMixedFvPatchField<Type>::rmap
+void Foam::directionMixedFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -128,7 +123,8 @@ void directionMixedFvPatchField<Type>::rmap
template<class Type>
-tmp<Field<Type> > directionMixedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> >
+Foam::directionMixedFvPatchField<Type>::snGrad() const
{
Field<Type> pif = this->patchInternalField();
@@ -146,7 +142,7 @@ tmp<Field<Type> > directionMixedFvPatchField<Type>::snGrad() const
template<class Type>
-void directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!this->updated())
{
@@ -168,7 +164,8 @@ void directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
template<class Type>
-tmp<Field<Type> > directionMixedFvPatchField<Type>::snGradTransformDiag() const
+Foam::tmp<Foam::Field<Type> >
+Foam::directionMixedFvPatchField<Type>::snGradTransformDiag() const
{
vectorField diag(valueFraction_.size());
@@ -193,7 +190,7 @@ tmp<Field<Type> > directionMixedFvPatchField<Type>::snGradTransformDiag() const
template<class Type>
-void directionMixedFvPatchField<Type>::write(Ostream& os) const
+void Foam::directionMixedFvPatchField<Type>::write(Ostream& os) const
{
transformFvPatchField<Type>::write(os);
refValue_.writeEntry("refValue", os);
@@ -203,8 +200,4 @@ void directionMixedFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
--
GitLab
From 4712e131d9732384210d2e3ce65c318a4583c33c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 18 May 2010 14:41:53 +0200
Subject: [PATCH 16/77] STYLE: add some usage comments to some conversion
utilities
STYLE: move polyDualMesh from conversion -> manipulation
---
.../Optional/ccm26ToFoam/ccm26ToFoam.C | 16 ++++++++++------
.../conversion/foamToStarMesh/foamToStarMesh.C | 6 +++++-
.../mesh/conversion/star3ToFoam/star3ToFoam.C | 9 +++++++--
.../mesh/conversion/star4ToFoam/star4ToFoam.C | 5 +++++
.../polyDualMesh/Make/files | 0
.../polyDualMesh/Make/options | 0
.../polyDualMesh/meshDualiser.C | 13 -------------
.../polyDualMesh/meshDualiser.H | 0
.../polyDualMesh/polyDualMeshApp.C | 0
9 files changed, 27 insertions(+), 22 deletions(-)
rename applications/utilities/mesh/{conversion => manipulation}/polyDualMesh/Make/files (100%)
rename applications/utilities/mesh/{conversion => manipulation}/polyDualMesh/Make/options (100%)
rename applications/utilities/mesh/{conversion => manipulation}/polyDualMesh/meshDualiser.C (99%)
rename applications/utilities/mesh/{conversion => manipulation}/polyDualMesh/meshDualiser.H (100%)
rename applications/utilities/mesh/{conversion => manipulation}/polyDualMesh/polyDualMeshApp.C (100%)
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 58070fc473c..decabfeae01 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -579,12 +579,17 @@ void ReadCells
int main(int argc, char *argv[])
{
+ argList::addNote
+ (
+ "read CCM files as written by proSTAR/ccm\n"
+ " - does not handle 'interfaces' (couples), cyclics or data\n"
+ " - does not handle mesh regions (porosity, solids, ...)\n"
+ );
argList::noParallel();
- argList::validArgs.append("ccm26 file");
-
-# include "setRootCase.H"
-# include "createTime.H"
+ argList::validArgs.append("ccmFile");
+ #include "setRootCase.H"
+ #include "createTime.H"
// Foam mesh data
// ~~~~~~~~~~~~~~
@@ -615,6 +620,7 @@ int main(int argc, char *argv[])
{
const fileName ccmFile = args[1];
+ const word ccmExt = ccmFile.ext();
if (!isFile(ccmFile))
{
@@ -623,8 +629,6 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
- word ccmExt = ccmFile.ext();
-
if (ccmExt != "ccm" && ccmExt != "ccmg")
{
FatalErrorIn(args.executable())
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index 09e34235e5f..2587a5d4571 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -62,6 +62,10 @@ using namespace Foam;
int main(int argc, char *argv[])
{
+ argList::addNote
+ (
+ "read OpenFOAM mesh and write a pro-STAR (v4) bnd/cel/vrt format"
+ );
argList::noParallel();
timeSelector::addOptions();
@@ -74,7 +78,7 @@ int main(int argc, char *argv[])
argList::addBoolOption
(
"noBnd",
- "suppress writing the .bnd file"
+ "suppress writing a boundary (.bnd) file"
);
# include "setRootCase.H"
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index de32c0f5b3d..8d8c565387d 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -38,8 +38,13 @@ Description
int main(int argc, char *argv[])
{
+ argList::addNote
+ (
+ "convert pro-STAR (v3) mesh to OpenFOAM"
+ );
+
argList::noParallel();
- argList::validArgs.append("STAR mesh file prefix");
+ argList::validArgs.append("pro-STAR prefix");
argList::addOption
(
"scale",
@@ -56,7 +61,7 @@ int main(int argc, char *argv[])
const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
-# include "createTime.H"
+ #include "createTime.H"
starMesh makeMesh(args[1], runTime, scaleFactor);
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index fc956582b3e..53dd66c234a 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -59,6 +59,11 @@ using namespace Foam;
int main(int argc, char *argv[])
{
+ argList::addNote
+ (
+ "convert pro-STAR (v4) mesh to OpenFOAM"
+ );
+
argList::noParallel();
argList::validArgs.append("pro-STAR prefix");
argList::addBoolOption
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/Make/files b/applications/utilities/mesh/manipulation/polyDualMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/conversion/polyDualMesh/Make/files
rename to applications/utilities/mesh/manipulation/polyDualMesh/Make/files
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/Make/options b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/conversion/polyDualMesh/Make/options
rename to applications/utilities/mesh/manipulation/polyDualMesh/Make/options
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
similarity index 99%
rename from applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
rename to applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 74a89fdc5e3..bdfb35bd504 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -881,9 +881,6 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh)
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::meshDualiser::setRefinement
@@ -1469,14 +1466,4 @@ void Foam::meshDualiser::setRefinement
}
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
similarity index 100%
rename from applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
rename to applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
similarity index 100%
rename from applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
rename to applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
--
GitLab
From e1801bc74c31d6ecf98d854e09bba060a31dfa76 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 10:21:26 +0200
Subject: [PATCH 17/77] ENH: add solverPerformance::fieldName(), simplified
data::setSolverPerformance
---
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H | 7 +++++++
src/OpenFOAM/meshes/data/data.C | 11 ++++++++++-
src/OpenFOAM/meshes/data/data.H | 8 +++++++-
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 83b75ab24a5..53708f58e27 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -152,6 +152,13 @@ public:
}
+ //- Return field name
+ const word& fieldName() const
+ {
+ return fieldName_;
+ }
+
+
//- Return initial residual
scalar initialResidual() const
{
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index 6e8813f7792..f3d4381e15a 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,4 +69,13 @@ void Foam::data::setSolverPerformance
}
+void Foam::data::setSolverPerformance
+(
+ const lduMatrix::solverPerformance& sp
+) const
+{
+ setSolverPerformance(sp.fieldName(), sp);
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index c8e6f98421c..5aa70849230 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -90,6 +90,12 @@ public:
const word& name,
const lduMatrix::solverPerformance&
) const;
+
+ //- Add/set the solverPerformance entry, using its fieldName
+ void setSolverPerformance
+ (
+ const lduMatrix::solverPerformance&
+ ) const;
};
--
GitLab
From 895a077cb1b30d049e30225db9f0334a4984d26c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 18 May 2010 11:38:07 +0200
Subject: [PATCH 18/77] STYLE: fixup some dictionary headers
---
applications/test/Hashing/hashingTests | 14 +++----
applications/test/dictionary/testDictRegex | 14 +++----
applications/test/regex/testRegexps | 14 +++----
applications/test/router/routerDict | 2 +-
applications/test/spline/test-splines | 2 +-
applications/test/wordRe/testRegexps | 14 +++----
.../autoRefineMesh/autoRefineMeshDict | 2 +-
.../mesh/advanced/modifyMesh/modifyMeshDict | 2 +-
.../mesh/advanced/selectCells/selectCellsDict | 2 +-
.../generation/extrudeMesh/extrudeProperties | 2 +-
.../snappyHexMesh/snappyHexMeshDict | 2 +-
.../manipulation/createPatch/createPatchDict | 2 +-
.../manipulation/mirrorMesh/mirrorMeshDict | 2 +-
.../manipulation/refineMesh/refineMeshDict | 2 +-
.../mesh/manipulation/topoSet/topoSetDict | 2 +-
.../decomposePar/decomposeParDict | 14 +++----
.../foamDataToFluent/foamDataToFluentDict | 2 +-
.../miscellaneous/pdfPlot/pdfDict | 2 +-
.../miscellaneous/postChannel/postChannelDict | 2 +-
.../sampling/probeLocations/probesDict | 14 +++----
.../postProcessing/sampling/sample/sampleDict | 2 +-
.../changeDictionary/changeDictionaryDict | 2 +-
.../preProcessing/mapFields/mapFieldsDict | 2 +-
.../preProcessing/setFields/setFieldsDict | 2 +-
.../surfaceMeshConvert/coordinateSystems | 2 +-
.../surface/surfaceSubset/surfaceSubsetDict | 2 +-
.../adiabaticFlameT/Hydrogen.log | 2 +-
.../adiabaticFlameT/Methane.log | 2 +-
.../adiabaticFlameT/Propane.log | 2 +-
.../adiabaticFlameT/controlDict | 2 +-
.../equilibriumFlameT/Hydrogen.log | 2 +-
.../equilibriumFlameT/controlDict | 2 +-
etc/cellModels | 2 +-
etc/controlDict | 2 +-
.../dynamicRefineFvMesh/dynamicMeshDict | 2 +-
.../field/fieldAverage/controlDict | 2 +-
src/sampling/probes/probesDict | 2 +-
tutorials/DNS/dnsFoam/boxTurb16/0.org/U | 2 +-
.../DNS/dnsFoam/boxTurb16/0.org/enstrophy | 2 +-
tutorials/DNS/dnsFoam/boxTurb16/0.org/p | 2 +-
tutorials/DNS/dnsFoam/boxTurb16/0/U | 2 +-
tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy | 2 +-
tutorials/DNS/dnsFoam/boxTurb16/0/p | 2 +-
.../boxTurb16/constant/polyMesh/blockMeshDict | 2 +-
tutorials/basic/laplacianFoam/flange/0/T | 2 +-
.../flange/constant/polyMesh/boundary.org | 2 +-
.../basic/potentialFoam/cylinder/0.org/U | 2 +-
.../basic/potentialFoam/cylinder/0.org/p | 2 +-
tutorials/basic/potentialFoam/cylinder/0/U | 2 +-
tutorials/basic/potentialFoam/cylinder/0/p | 2 +-
.../cylinder/constant/polyMesh/blockMeshDict | 2 +-
.../basic/potentialFoam/pitzDaily/0.org/U | 2 +-
.../basic/potentialFoam/pitzDaily/0.org/p | 2 +-
tutorials/basic/potentialFoam/pitzDaily/0/U | 2 +-
tutorials/basic/potentialFoam/pitzDaily/0/p | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../basic/scalarTransportFoam/pitzDaily/0/T | 2 +-
.../basic/scalarTransportFoam/pitzDaily/0/U | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../combustion/XiFoam/les/pitzDaily/0/Su | 2 +-
tutorials/combustion/XiFoam/les/pitzDaily/0/T | 2 +-
.../combustion/XiFoam/les/pitzDaily/0/Tu | 2 +-
tutorials/combustion/XiFoam/les/pitzDaily/0/U | 2 +-
.../combustion/XiFoam/les/pitzDaily/0/Xi | 2 +-
.../XiFoam/les/pitzDaily/0/alphaSgs | 2 +-
tutorials/combustion/XiFoam/les/pitzDaily/0/b | 2 +-
tutorials/combustion/XiFoam/les/pitzDaily/0/k | 2 +-
.../combustion/XiFoam/les/pitzDaily/0/muSgs | 2 +-
tutorials/combustion/XiFoam/les/pitzDaily/0/p | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/Su | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/T | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/Tu | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/U | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/Xi | 2 +-
.../XiFoam/les/pitzDaily3D/0/alphaSgs | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/b | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/k | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/muSgs | 2 +-
.../combustion/XiFoam/les/pitzDaily3D/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/Su | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/T | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/Tu | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/U | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/Xi | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/b | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/ft | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/fu | 2 +-
.../XiFoam/ras/moriyoshiHomogeneous/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../combustion/dieselFoam/aachenBomb/0/N2 | 2 +-
.../combustion/dieselFoam/aachenBomb/0/O2 | 2 +-
.../combustion/dieselFoam/aachenBomb/0/T | 2 +-
.../combustion/dieselFoam/aachenBomb/0/U | 2 +-
.../dieselFoam/aachenBomb/0/Ydefault | 2 +-
.../combustion/dieselFoam/aachenBomb/0/ft | 2 +-
.../combustion/dieselFoam/aachenBomb/0/fu | 2 +-
.../combustion/dieselFoam/aachenBomb/0/p | 2 +-
.../aachenBomb/constant/injectorProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../kivaTest/constant/polyMesh/boundary.org | 2 +-
.../fireFoam/les/smallPoolFire2D/0/G | 2 +-
.../fireFoam/les/smallPoolFire2D/0/IDefault | 2 +-
.../fireFoam/les/smallPoolFire2D/0/T | 2 +-
.../fireFoam/les/smallPoolFire2D/0/U | 2 +-
.../fireFoam/les/smallPoolFire2D/0/alphaSgs | 2 +-
.../fireFoam/les/smallPoolFire2D/0/b | 2 +-
.../fireFoam/les/smallPoolFire2D/0/ft | 2 +-
.../fireFoam/les/smallPoolFire2D/0/fu | 2 +-
.../fireFoam/les/smallPoolFire2D/0/k | 2 +-
.../fireFoam/les/smallPoolFire2D/0/muSgs | 2 +-
.../fireFoam/les/smallPoolFire2D/0/p | 2 +-
.../smallPoolFire2D/constant/LESProperties | 2 +-
.../les/smallPoolFire2D/constant/SpeciesTable | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/thermophysicalProperties | 2 +-
.../constant/turbulenceProperties | 2 +-
.../les/smallPoolFire2D/system/controlDict | 2 +-
.../smallPoolFire2D/system/createPatchDict | 2 +-
.../les/smallPoolFire2D/system/fvSchemes | 2 +-
.../les/smallPoolFire2D/system/fvSolution | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/CH4 | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/N2 | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/O2 | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/T | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/U | 2 +-
.../ras/counterFlowFlame2D/0/Ydefault | 2 +-
.../ras/counterFlowFlame2D/0/alphat | 2 +-
.../ras/counterFlowFlame2D/0/epsilon | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/k | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/mut | 2 +-
.../reactingFoam/ras/counterFlowFlame2D/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0.org/T | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0.org/U | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0.org/p | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0/T | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0/U | 2 +-
.../rhoCentralFoam/LadenburgJet60psi/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/biconic25-55Run35/0/T | 2 +-
.../rhoCentralFoam/biconic25-55Run35/0/U | 2 +-
.../rhoCentralFoam/biconic25-55Run35/0/p | 2 +-
.../biconic25-55Run35/constant/pointsHeader | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/forwardStep/0/Ma | 2 +-
.../rhoCentralFoam/forwardStep/0/T | 2 +-
.../rhoCentralFoam/forwardStep/0/U | 2 +-
.../rhoCentralFoam/forwardStep/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/obliqueShock/0/T | 2 +-
.../rhoCentralFoam/obliqueShock/0/U | 2 +-
.../rhoCentralFoam/obliqueShock/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/shockTube/0.org/T | 2 +-
.../rhoCentralFoam/shockTube/0.org/U | 2 +-
.../rhoCentralFoam/shockTube/0.org/p | 2 +-
.../compressible/rhoCentralFoam/shockTube/0/T | 2 +-
.../compressible/rhoCentralFoam/shockTube/0/U | 2 +-
.../compressible/rhoCentralFoam/shockTube/0/p | 2 +-
.../shockTube/constant/polyMesh/blockMeshDict | 2 +-
.../rhoCentralFoam/wedge15Ma5/0/T | 2 +-
.../rhoCentralFoam/wedge15Ma5/0/U | 2 +-
.../rhoCentralFoam/wedge15Ma5/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/B | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/T | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/U | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/k | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/muSgs | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/muTilda | 2 +-
.../rhoPimpleFoam/les/pitzDaily/0/p | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../rhoPimpleFoam/ras/angledDuct/0/T | 2 +-
.../rhoPimpleFoam/ras/angledDuct/0/U | 2 +-
.../rhoPimpleFoam/ras/angledDuct/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../ras/angledDuct/constant/porousZones | 2 +-
.../compressible/rhoPimpleFoam/ras/cavity/0/T | 2 +-
.../compressible/rhoPimpleFoam/ras/cavity/0/U | 2 +-
.../compressible/rhoPimpleFoam/ras/cavity/0/p | 2 +-
.../rhoPorousMRFPimpleFoam/mixerVessel2D/0/T | 2 +-
.../rhoPorousMRFPimpleFoam/mixerVessel2D/0/U | 2 +-
.../rhoPorousMRFPimpleFoam/mixerVessel2D/0/p | 2 +-
.../mixerVessel2D/constant/MRFZones | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../mixerVessel2D/constant/porousZones | 2 +-
.../angledDuctImplicit/0/T | 2 +-
.../angledDuctImplicit/0/U | 2 +-
.../angledDuctImplicit/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../angledDuctImplicit/constant/porousZones | 2 +-
.../rhoSimplecFoam/squareBend/0/T | 2 +-
.../rhoSimplecFoam/squareBend/0/U | 2 +-
.../rhoSimplecFoam/squareBend/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../compressible/rhoSonicFoam/forwardStep/0/T | 2 +-
.../compressible/rhoSonicFoam/forwardStep/0/U | 2 +-
.../compressible/rhoSonicFoam/forwardStep/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../rhoSonicFoam/shockTube/0.org/T | 2 +-
.../rhoSonicFoam/shockTube/0.org/U | 2 +-
.../rhoSonicFoam/shockTube/0.org/magU | 2 +-
.../rhoSonicFoam/shockTube/0.org/p | 2 +-
.../rhoSonicFoam/shockTube/0/magU | 2 +-
.../shockTube/constant/polyMesh/blockMeshDict | 2 +-
.../rhopSonicFoam/shockTube/0.org/T | 2 +-
.../rhopSonicFoam/shockTube/0.org/U | 2 +-
.../rhopSonicFoam/shockTube/0.org/p | 2 +-
.../compressible/rhopSonicFoam/shockTube/0/T | 2 +-
.../compressible/rhopSonicFoam/shockTube/0/U | 2 +-
.../compressible/rhopSonicFoam/shockTube/0/p | 2 +-
.../shockTube/constant/polyMesh/blockMeshDict | 2 +-
.../compressible/rhopSonicFoam/wedge15Ma5/0/T | 2 +-
.../compressible/rhopSonicFoam/wedge15Ma5/0/U | 2 +-
.../compressible/rhopSonicFoam/wedge15Ma5/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../sonicFoam/laminar/forwardStep/0/T | 2 +-
.../sonicFoam/laminar/forwardStep/0/U | 2 +-
.../sonicFoam/laminar/forwardStep/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../sonicFoam/laminar/shockTube/0.org/T | 2 +-
.../sonicFoam/laminar/shockTube/0.org/U | 2 +-
.../sonicFoam/laminar/shockTube/0.org/magU | 2 +-
.../sonicFoam/laminar/shockTube/0.org/p | 2 +-
.../sonicFoam/laminar/shockTube/0/T | 2 +-
.../sonicFoam/laminar/shockTube/0/U | 2 +-
.../sonicFoam/laminar/shockTube/0/magU | 2 +-
.../sonicFoam/laminar/shockTube/0/p | 2 +-
.../shockTube/constant/polyMesh/blockMeshDict | 2 +-
.../sonicFoam/ras/nacaAirfoil/0/T | 2 +-
.../sonicFoam/ras/nacaAirfoil/0/U | 2 +-
.../sonicFoam/ras/nacaAirfoil/0/p | 2 +-
.../constant/polyMesh/boundary.org | 2 +-
.../compressible/sonicFoam/ras/prism/0/T | 2 +-
.../compressible/sonicFoam/ras/prism/0/U | 2 +-
.../compressible/sonicFoam/ras/prism/0/p | 2 +-
.../ras/prism/constant/polyMesh/blockMeshDict | 2 +-
.../sonicLiquidFoam/decompressionTank/0/U | 2 +-
.../sonicLiquidFoam/decompressionTank/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/boundaryT | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/boundaryU | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/dsmcRhoN | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/fD | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/iDof | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/internalE | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/linearKE | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/momentum | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/q | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/rhoM | 2 +-
.../dsmcFoam/freeSpacePeriodic/0/rhoN | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../dsmcFoam/freeSpaceStream/0/boundaryT | 2 +-
.../dsmcFoam/freeSpaceStream/0/boundaryU | 2 +-
.../dsmcFoam/freeSpaceStream/0/dsmcRhoN | 2 +-
.../dsmcFoam/freeSpaceStream/0/fD | 2 +-
.../dsmcFoam/freeSpaceStream/0/iDof | 2 +-
.../dsmcFoam/freeSpaceStream/0/internalE | 2 +-
.../dsmcFoam/freeSpaceStream/0/linearKE | 2 +-
.../dsmcFoam/freeSpaceStream/0/momentum | 2 +-
.../dsmcFoam/freeSpaceStream/0/q | 2 +-
.../dsmcFoam/freeSpaceStream/0/rhoM | 2 +-
.../dsmcFoam/freeSpaceStream/0/rhoN | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../dsmcFoam/supersonicCorner/0/boundaryT | 2 +-
.../dsmcFoam/supersonicCorner/0/boundaryU | 2 +-
.../dsmcFoam/supersonicCorner/0/dsmcRhoN | 2 +-
.../dsmcFoam/supersonicCorner/0/fD | 2 +-
.../dsmcFoam/supersonicCorner/0/iDof | 2 +-
.../dsmcFoam/supersonicCorner/0/internalE | 2 +-
.../dsmcFoam/supersonicCorner/0/linearKE | 2 +-
.../dsmcFoam/supersonicCorner/0/momentum | 2 +-
.../dsmcFoam/supersonicCorner/0/q | 2 +-
.../dsmcFoam/supersonicCorner/0/rhoM | 2 +-
.../dsmcFoam/supersonicCorner/0/rhoN | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../dsmcFoam/wedge15Ma5/0/boundaryT | 2 +-
.../dsmcFoam/wedge15Ma5/0/boundaryU | 2 +-
.../dsmcFoam/wedge15Ma5/0/dsmcRhoN | 2 +-
.../discreteMethods/dsmcFoam/wedge15Ma5/0/fD | 2 +-
.../dsmcFoam/wedge15Ma5/0/iDof | 2 +-
.../dsmcFoam/wedge15Ma5/0/internalE | 2 +-
.../dsmcFoam/wedge15Ma5/0/linearKE | 2 +-
.../dsmcFoam/wedge15Ma5/0/momentum | 2 +-
.../discreteMethods/dsmcFoam/wedge15Ma5/0/q | 2 +-
.../dsmcFoam/wedge15Ma5/0/rhoM | 2 +-
.../dsmcFoam/wedge15Ma5/0/rhoN | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../mdEquilibrationFoam/periodicCubeArgon/0/U | 37 +++++++++++++++++++
.../constant/moleculeProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../periodicCubeArgon/system/controlDict | 2 +-
.../periodicCubeArgon/system/decomposeParDict | 2 +-
.../system/mdEquilibrationDict | 2 +-
.../periodicCubeArgon/system/mdInitialiseDict | 2 +-
.../periodicCubeArgon/system/potentialDict | 2 +-
.../mdEquilibrationFoam/periodicCubeWater/0/U | 37 +++++++++++++++++++
.../constant/moleculeProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../periodicCubeWater/system/controlDict | 2 +-
.../periodicCubeWater/system/decomposeParDict | 2 +-
.../system/mdEquilibrationDict | 2 +-
.../periodicCubeWater/system/mdInitialiseDict | 2 +-
.../periodicCubeWater/system/potentialDict | 2 +-
.../molecularDynamics/mdFoam/nanoNozzle/0/U | 2 +-
.../nanoNozzle/constant/moleculeProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../mdFoam/nanoNozzle/system/controlDict | 2 +-
.../mdFoam/nanoNozzle/system/decomposeParDict | 2 +-
.../nanoNozzle/system/mdEquilibrationDict | 2 +-
.../mdFoam/nanoNozzle/system/mdInitialiseDict | 2 +-
.../mdFoam/nanoNozzle/system/potentialDict | 2 +-
.../electrostaticFoam/chargedWire/0/phi | 2 +-
.../electrostaticFoam/chargedWire/0/rho | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../electromagnetics/mhdFoam/hartmann/0/B | 2 +-
.../electromagnetics/mhdFoam/hartmann/0/U | 2 +-
.../electromagnetics/mhdFoam/hartmann/0/p | 2 +-
.../electromagnetics/mhdFoam/hartmann/0/pB | 2 +-
.../hartmann/constant/polyMesh/blockMeshDict | 2 +-
.../financial/financialFoam/europeanCall/0/V | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../buoyantBoussinesqPimpleFoam/hotRoom/0/T | 2 +-
.../hotRoom/0/T.org | 2 +-
.../buoyantBoussinesqPimpleFoam/hotRoom/0/U | 2 +-
.../hotRoom/0/alphat | 2 +-
.../buoyantBoussinesqPimpleFoam/hotRoom/0/p | 2 +-
.../hotRoom/constant/polyMesh/blockMeshDict | 2 +-
.../hotRoom/constant/transportProperties | 2 +-
.../buoyantBoussinesqSimpleFoam/hotRoom/0/T | 2 +-
.../hotRoom/0/T.org | 2 +-
.../buoyantBoussinesqSimpleFoam/hotRoom/0/U | 2 +-
.../hotRoom/0/alphat | 2 +-
.../buoyantBoussinesqSimpleFoam/hotRoom/0/p | 2 +-
.../hotRoom/constant/polyMesh/blockMeshDict | 2 +-
.../hotRoom/constant/transportProperties | 2 +-
.../iglooWithFridges/0/T | 2 +-
.../iglooWithFridges/0/U | 2 +-
.../iglooWithFridges/0/alphat | 2 +-
.../iglooWithFridges/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/transportProperties | 2 +-
.../constant/triSurface/fridgeA.eMesh | 2 +-
.../iglooWithFridges/system/snappyHexMeshDict | 2 +-
.../buoyantPimpleFoam/hotRoom/0/T | 2 +-
.../buoyantPimpleFoam/hotRoom/0/T.org | 2 +-
.../buoyantPimpleFoam/hotRoom/0/U | 2 +-
.../buoyantPimpleFoam/hotRoom/0/p | 2 +-
.../hotRoom/constant/polyMesh/blockMeshDict | 2 +-
.../buoyantSimpleFoam/buoyantCavity/0/T | 2 +-
.../buoyantSimpleFoam/buoyantCavity/0/U | 2 +-
.../buoyantSimpleFoam/buoyantCavity/0/p | 2 +-
.../buoyantCavity/constant/RASProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/thermophysicalProperties | 2 +-
.../buoyantCavity/system/controlDict | 2 +-
.../buoyantCavity/system/fvSchemes | 2 +-
.../buoyantCavity/system/sampleDict | 2 +-
.../buoyantSimpleFoam/hotRoom/0/T | 2 +-
.../buoyantSimpleFoam/hotRoom/0/T.org | 2 +-
.../buoyantSimpleFoam/hotRoom/0/U | 2 +-
.../buoyantSimpleFoam/hotRoom/0/p | 2 +-
.../hotRoom/constant/polyMesh/blockMeshDict | 2 +-
.../hotRadiationRoom/0/G | 2 +-
.../hotRadiationRoom/0/T | 2 +-
.../hotRadiationRoom/0/U | 2 +-
.../hotRadiationRoom/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../hotRadiationRoomFvDOM/0/G | 2 +-
.../hotRadiationRoomFvDOM/0/IDefault | 2 +-
.../hotRadiationRoomFvDOM/0/T | 2 +-
.../hotRadiationRoomFvDOM/0/U | 2 +-
.../hotRadiationRoomFvDOM/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../chtMultiRegionFoam/multiRegionHeater/0/K | 2 +-
.../chtMultiRegionFoam/multiRegionHeater/0/T | 2 +-
.../chtMultiRegionFoam/multiRegionHeater/0/U | 2 +-
.../chtMultiRegionFoam/multiRegionHeater/0/cp | 2 +-
.../chtMultiRegionFoam/multiRegionHeater/0/p | 2 +-
.../multiRegionHeater/0/rho | 2 +-
.../constant/bottomAir/RASProperties | 2 +-
.../bottomAir/thermophysicalProperties | 2 +-
.../constant/bottomAir/turbulenceProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/topAir/RASProperties | 2 +-
.../constant/topAir/thermophysicalProperties | 2 +-
.../constant/topAir/turbulenceProperties | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/bottomAir/decomposeParDict | 14 +++----
.../system/bottomAir/fvSchemes | 2 +-
.../system/bottomAir/fvSolution | 2 +-
.../multiRegionHeater/system/decomposeParDict | 14 +++----
.../multiRegionHeater/system/fvSchemes | 2 +-
.../multiRegionHeater/system/fvSolution | 2 +-
.../system/heater/changeDictionaryDict | 2 +-
.../system/heater/decomposeParDict | 14 +++----
.../multiRegionHeater/system/heater/fvSchemes | 2 +-
.../system/heater/fvSolution | 2 +-
.../system/leftSolid/changeDictionaryDict | 2 +-
.../system/leftSolid/decomposeParDict | 14 +++----
.../system/leftSolid/fvSchemes | 2 +-
.../system/leftSolid/fvSolution | 2 +-
.../system/rightSolid/changeDictionaryDict | 2 +-
.../system/rightSolid/decomposeParDict | 14 +++----
.../system/rightSolid/fvSchemes | 2 +-
.../system/rightSolid/fvSolution | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/topAir/decomposeParDict | 14 +++----
.../multiRegionHeater/system/topAir/fvSchemes | 2 +-
.../system/topAir/fvSolution | 2 +-
.../snappyMultiRegionHeater/0/K | 2 +-
.../snappyMultiRegionHeater/0/T | 2 +-
.../snappyMultiRegionHeater/0/U | 2 +-
.../snappyMultiRegionHeater/0/cp | 2 +-
.../snappyMultiRegionHeater/0/p | 2 +-
.../snappyMultiRegionHeater/0/rho | 2 +-
.../constant/bottomAir/RASProperties | 2 +-
.../bottomAir/thermophysicalProperties | 2 +-
.../constant/bottomAir/turbulenceProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/topAir/RASProperties | 2 +-
.../constant/topAir/thermophysicalProperties | 2 +-
.../constant/topAir/turbulenceProperties | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/bottomAir/decomposeParDict | 14 +++----
.../system/bottomAir/fvSchemes | 2 +-
.../system/bottomAir/fvSolution | 2 +-
.../system/decomposeParDict | 14 +++----
.../snappyMultiRegionHeater/system/fvSchemes | 2 +-
.../snappyMultiRegionHeater/system/fvSolution | 2 +-
.../system/heater/changeDictionaryDict | 2 +-
.../system/heater/decomposeParDict | 14 +++----
.../system/heater/fvSchemes | 2 +-
.../system/heater/fvSolution | 2 +-
.../system/leftSolid/changeDictionaryDict | 2 +-
.../system/leftSolid/decomposeParDict | 14 +++----
.../system/leftSolid/fvSchemes | 2 +-
.../system/leftSolid/fvSolution | 2 +-
.../system/rightSolid/changeDictionaryDict | 2 +-
.../system/rightSolid/decomposeParDict | 14 +++----
.../system/rightSolid/fvSchemes | 2 +-
.../system/rightSolid/fvSolution | 2 +-
.../system/snappyHexMeshDict | 2 +-
.../system/topAir/changeDictionaryDict | 2 +-
.../system/topAir/decomposeParDict | 14 +++----
.../system/topAir/fvSchemes | 2 +-
.../system/topAir/fvSolution | 2 +-
.../multiRegionHeater/0/K | 2 +-
.../multiRegionHeater/0/T | 2 +-
.../multiRegionHeater/0/U | 2 +-
.../multiRegionHeater/0/cp | 2 +-
.../multiRegionHeater/0/p | 2 +-
.../multiRegionHeater/0/rho | 2 +-
.../constant/bottomAir/RASProperties | 2 +-
.../bottomAir/thermophysicalProperties | 2 +-
.../constant/bottomAir/turbulenceProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/topAir/RASProperties | 2 +-
.../constant/topAir/thermophysicalProperties | 2 +-
.../constant/topAir/turbulenceProperties | 2 +-
.../system/bottomAir/changeDictionaryDict | 2 +-
.../system/bottomAir/decomposeParDict | 14 +++----
.../multiRegionHeater/system/decomposeParDict | 14 +++----
.../multiRegionHeater/system/fvSchemes | 2 +-
.../multiRegionHeater/system/fvSolution | 2 +-
.../system/heater/changeDictionaryDict | 2 +-
.../system/heater/decomposeParDict | 14 +++----
.../multiRegionHeater/system/heater/fvSchemes | 2 +-
.../system/heater/fvSolution | 2 +-
.../system/leftSolid/changeDictionaryDict | 2 +-
.../system/leftSolid/decomposeParDict | 14 +++----
.../system/rightSolid/changeDictionaryDict | 2 +-
.../system/rightSolid/decomposeParDict | 14 +++----
.../system/topAir/changeDictionaryDict | 2 +-
.../system/topAir/decomposeParDict | 14 +++----
.../multiRegionHeater/system/topAir/fvSchemes | 2 +-
.../system/topAir/fvSolution | 2 +-
.../cavity/constant/polyMesh/blockMeshDict | 24 ++++++------
.../MRFSimpleFoam/mixerVessel2D/0/U | 2 +-
.../MRFSimpleFoam/mixerVessel2D/0/p | 2 +-
.../mixerVessel2D/constant/MRFZones | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../boundaryFoam/boundaryLaunderSharma/0/R | 2 +-
.../boundaryFoam/boundaryLaunderSharma/0/U | 2 +-
.../boundaryLaunderSharma/0/epsilon | 2 +-
.../boundaryFoam/boundaryLaunderSharma/0/k | 2 +-
.../boundaryLaunderSharma/0/nuTilda | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../boundaryFoam/boundaryWallFunctions/0/R | 2 +-
.../boundaryFoam/boundaryWallFunctions/0/U | 2 +-
.../boundaryWallFunctions/0/nuTilda | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../boundaryWallFunctionsProfile/0/U | 2 +-
.../boundaryWallFunctionsProfile/0/nuTilda | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../channelFoam/channel395/0.org/B | 2 +-
.../channelFoam/channel395/0.org/U | 2 +-
.../channelFoam/channel395/0.org/k | 2 +-
.../channelFoam/channel395/0.org/nuSgs | 2 +-
.../channelFoam/channel395/0.org/nuTilda | 2 +-
.../channelFoam/channel395/0.org/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
tutorials/incompressible/icoFoam/cavity/0/U | 2 +-
tutorials/incompressible/icoFoam/cavity/0/p | 2 +-
.../cavity/constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/icoFoam/cavityClipped/0/U | 2 +-
.../incompressible/icoFoam/cavityClipped/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/icoFoam/cavityGrade/0/U | 2 +-
.../incompressible/icoFoam/cavityGrade/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
tutorials/incompressible/icoFoam/elbow/0/U | 2 +-
tutorials/incompressible/icoFoam/elbow/0/p | 2 +-
.../elbow/constant/polyMesh/boundary.org | 2 +-
.../nonNewtonianIcoFoam/offsetCylinder/0/U | 2 +-
.../nonNewtonianIcoFoam/offsetCylinder/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../pimpleDyMFoam/movingCone/0/U | 2 +-
.../pimpleDyMFoam/movingCone/0/p | 2 +-
.../pimpleDyMFoam/movingCone/0/pointMotionUx | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../wingFlutter2D_pimpleDyMFoam/0.org/U | 2 +-
.../0.org/include/fixedInlet | 2 +-
.../0.org/include/frontBackTopBottomPatches | 2 +-
.../0.org/include/initialConditions | 2 +-
.../wingFlutter2D_pimpleDyMFoam/0.org/k | 2 +-
.../wingFlutter2D_pimpleDyMFoam/0.org/omega | 2 +-
.../wingFlutter2D_pimpleDyMFoam/0.org/p | 2 +-
.../constant/dynamicMeshDict | 2 +-
.../constant/transportProperties | 2 +-
.../system/fvSchemes | 2 +-
.../system/fvSolution | 2 +-
.../wingFlutter/wingFlutter2D_simpleFoam/0/U | 2 +-
.../0/include/fixedInlet | 2 +-
.../0/include/frontBackTopBottomPatches | 2 +-
.../0/include/initialConditions | 2 +-
.../wingFlutter/wingFlutter2D_simpleFoam/0/k | 2 +-
.../wingFlutter2D_simpleFoam/0/omega | 2 +-
.../wingFlutter/wingFlutter2D_simpleFoam/0/p | 2 +-
.../constant/extrudeProperties | 2 +-
.../constant/transportProperties | 2 +-
.../system/createPatchDict | 2 +-
.../wingFlutter2D_simpleFoam/system/fvSchemes | 2 +-
.../system/fvSolution | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../system/snappyHexMeshDict | 2 +-
.../pimpleFoam/t-junction-with-fan/0/U | 2 +-
.../pimpleFoam/t-junction-with-fan/0/nuTilda | 2 +-
.../pimpleFoam/t-junction-with-fan/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/pimpleFoam/t-junction/0/U | 2 +-
.../pimpleFoam/t-junction/0/nuTilda | 2 +-
.../incompressible/pimpleFoam/t-junction/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/pisoFoam/les/pitzDaily/0/B | 2 +-
.../incompressible/pisoFoam/les/pitzDaily/0/U | 2 +-
.../incompressible/pisoFoam/les/pitzDaily/0/k | 2 +-
.../pisoFoam/les/pitzDaily/0/nuSgs | 2 +-
.../pisoFoam/les/pitzDaily/0/nuTilda | 2 +-
.../incompressible/pisoFoam/les/pitzDaily/0/p | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../pisoFoam/les/pitzDailyDirectMapped/0/B | 2 +-
.../pisoFoam/les/pitzDailyDirectMapped/0/U | 2 +-
.../pisoFoam/les/pitzDailyDirectMapped/0/k | 2 +-
.../les/pitzDailyDirectMapped/0/nuSgs | 2 +-
.../les/pitzDailyDirectMapped/0/nuTilda | 2 +-
.../pisoFoam/les/pitzDailyDirectMapped/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/pisoFoam/ras/cavity/0/R | 2 +-
.../incompressible/pisoFoam/ras/cavity/0/U | 2 +-
.../pisoFoam/ras/cavity/0/nuTilda | 2 +-
.../incompressible/pisoFoam/ras/cavity/0/p | 2 +-
.../cavity/constant/polyMesh/blockMeshDict | 2 +-
.../porousSimpleFoam/angledDuctImplicit/0/T | 2 +-
.../porousSimpleFoam/angledDuctImplicit/0/U | 2 +-
.../porousSimpleFoam/angledDuctImplicit/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../angledDuctImplicit/constant/porousZones | 2 +-
.../constant/transportProperties | 2 +-
.../squareBump/system/controlDict | 2 +-
.../squareBump/system/fvSchemes | 2 +-
.../squareBump/system/fvSolution | 2 +-
.../squareBump/system/setFieldsDict | 2 +-
.../incompressible/simpleFoam/airFoil2D/0/U | 2 +-
.../simpleFoam/airFoil2D/0/nuTilda | 2 +-
.../incompressible/simpleFoam/airFoil2D/0/nut | 2 +-
.../incompressible/simpleFoam/airFoil2D/0/p | 2 +-
.../airFoil2D/constant/polyMesh/boundary | 2 +-
.../airFoil2D/constant/polyMesh/cells | 2 +-
.../airFoil2D/constant/polyMesh/faces | 2 +-
.../airFoil2D/constant/polyMesh/neighbour | 2 +-
.../airFoil2D/constant/polyMesh/owner | 2 +-
.../airFoil2D/constant/polyMesh/points | 2 +-
.../incompressible/simpleFoam/motorBike/0/U | 2 +-
.../simpleFoam/motorBike/0/include/fixedInlet | 2 +-
.../motorBike/0/include/frontBackUpperPatches | 2 +-
.../motorBike/0/include/initialConditions | 2 +-
.../incompressible/simpleFoam/motorBike/0/k | 2 +-
.../simpleFoam/motorBike/0/omega | 2 +-
.../incompressible/simpleFoam/motorBike/0/p | 2 +-
.../motorBike/constant/RASProperties | 2 +-
.../motorBike/constant/polyMesh/blockMeshDict | 2 +-
.../motorBike/constant/transportProperties | 2 +-
.../simpleFoam/motorBike/system/controlDict | 2 +-
.../motorBike/system/decomposeParDict | 2 +-
.../simpleFoam/motorBike/system/fvSchemes | 2 +-
.../simpleFoam/motorBike/system/fvSolution | 2 +-
.../motorBike/system/snappyHexMeshDict | 2 +-
.../incompressible/simpleFoam/pitzDaily/0/R | 2 +-
.../incompressible/simpleFoam/pitzDaily/0/U | 2 +-
.../simpleFoam/pitzDaily/0/nuTilda | 2 +-
.../incompressible/simpleFoam/pitzDaily/0/p | 2 +-
.../pitzDaily/constant/polyMesh/blockMeshDict | 2 +-
.../simpleFoam/pitzDailyExptInlet/0/R | 2 +-
.../simpleFoam/pitzDailyExptInlet/0/U | 2 +-
.../simpleFoam/pitzDailyExptInlet/0/nuTilda | 2 +-
.../simpleFoam/pitzDailyExptInlet/0/p | 2 +-
.../constant/boundaryData/inlet/0/U | 2 +-
.../constant/boundaryData/inlet/0/epsilon | 2 +-
.../constant/boundaryData/inlet/0/k | 2 +-
.../constant/boundaryData/inlet/points | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../incompressible/simpleSRFFoam/mixer/0/Urel | 2 +-
.../simpleSRFFoam/mixer/0/epsilon | 2 +-
.../incompressible/simpleSRFFoam/mixer/0/p | 2 +-
.../mixer/constant/polyMesh/blockMeshDict | 2 +-
.../constant/coalCloud1Positions | 2 +-
.../constant/limestonePositions | 2 +-
.../simplifiedSiwek/system/topoSetDict | 2 +-
.../filter/0.org/G | 2 +-
.../filter/0.org/H2O | 2 +-
.../filter/0.org/N2 | 2 +-
.../filter/0.org/O2 | 2 +-
.../filter/0.org/T | 2 +-
.../filter/0.org/U | 2 +-
.../filter/0.org/p | 2 +-
.../filter/0/G | 2 +-
.../filter/0/H2O | 2 +-
.../filter/0/N2 | 2 +-
.../filter/0/O2 | 2 +-
.../filter/0/T | 2 +-
.../filter/0/U | 2 +-
.../filter/0/p | 2 +-
.../filter/constant/RASProperties | 2 +-
.../filter/constant/polyMesh/blockMeshDict | 2 +-
.../filter/constant/reactingCloud1Positions | 2 +-
.../filter/constant/turbulenceProperties | 2 +-
.../parcelInBox/0/G | 2 +-
.../parcelInBox/0/H2O | 2 +-
.../parcelInBox/0/T | 2 +-
.../parcelInBox/0/U | 2 +-
.../parcelInBox/0/air | 2 +-
.../parcelInBox/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/reactingCloud1Positions | 2 +-
.../parcelInBox/constant/turbulenceProperties | 2 +-
.../parcelInBox/system/probesDict | 14 +++----
.../verticalChannel/0.org/H2O | 2 +-
.../verticalChannel/0.org/T | 2 +-
.../verticalChannel/0.org/air | 2 +-
.../verticalChannel/0.org/p | 2 +-
.../verticalChannel/0/H2O | 2 +-
.../verticalChannel/0/T | 2 +-
.../verticalChannel/0/air | 2 +-
.../verticalChannel/0/p | 2 +-
.../verticalChannel/constant/RASProperties | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/turbulenceProperties | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/T | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/Tf | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/U | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/USpf | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/Uf | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/deltaf | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/p | 2 +-
.../multipleBoxes/0.org/wallFilmRegion/pSpf | 2 +-
.../multipleBoxes/0/wallFilmRegion/T | 2 +-
.../multipleBoxes/0/wallFilmRegion/Tf | 2 +-
.../multipleBoxes/0/wallFilmRegion/U | 2 +-
.../multipleBoxes/0/wallFilmRegion/USpf | 2 +-
.../multipleBoxes/0/wallFilmRegion/Uf | 2 +-
.../multipleBoxes/0/wallFilmRegion/deltaf | 2 +-
.../multipleBoxes/0/wallFilmRegion/p | 2 +-
.../multipleBoxes/0/wallFilmRegion/pSpf | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../multipleBoxes/constant/reactingCloud1Axes | 2 +-
.../constant/reactingCloud1Positions | 2 +-
.../reactingParcelFilmFoam/panel/0.org/T | 2 +-
.../reactingParcelFilmFoam/panel/0.org/p | 2 +-
.../panel/0.org/wallFilmRegion/T | 2 +-
.../panel/0.org/wallFilmRegion/Tf | 2 +-
.../panel/0.org/wallFilmRegion/U | 2 +-
.../panel/0.org/wallFilmRegion/USpf | 2 +-
.../panel/0.org/wallFilmRegion/Uf | 2 +-
.../panel/0.org/wallFilmRegion/deltaf | 2 +-
.../panel/0.org/wallFilmRegion/p | 2 +-
.../panel/0.org/wallFilmRegion/pSpf | 2 +-
.../reactingParcelFilmFoam/panel/0/T | 2 +-
.../reactingParcelFilmFoam/panel/0/p | 2 +-
.../panel/0/wallFilmRegion/T | 2 +-
.../panel/0/wallFilmRegion/Tf | 2 +-
.../panel/0/wallFilmRegion/U | 2 +-
.../panel/0/wallFilmRegion/USpf | 2 +-
.../panel/0/wallFilmRegion/Uf | 2 +-
.../panel/0/wallFilmRegion/deltaf | 2 +-
.../panel/0/wallFilmRegion/p | 2 +-
.../panel/0/wallFilmRegion/pSpf | 2 +-
.../panel/constant/polyMesh/blockMeshDict | 2 +-
.../panel/system/createPatchDict | 2 +-
.../system/wallFilmRegion/createPatchDict | 2 +-
.../reactingParcelFoam/evaporationTest/0/T | 2 +-
.../reactingParcelFoam/evaporationTest/0/U | 2 +-
.../reactingParcelFoam/evaporationTest/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/reactingCloud1Positions | 2 +-
.../rhoPisoTwinParcelFoam/simplifiedSiwek/0/G | 2 +-
.../rhoPisoTwinParcelFoam/simplifiedSiwek/0/T | 2 +-
.../rhoPisoTwinParcelFoam/simplifiedSiwek/0/U | 2 +-
.../rhoPisoTwinParcelFoam/simplifiedSiwek/0/p | 2 +-
.../constant/kinematicCloud1Positions | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/thermoCloud1Positions | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../SnakeRiverCanyon/system/decomposeParDict | 14 +++----
.../bubbleFoam/bubbleColumn/0.org/Ua | 2 +-
.../bubbleFoam/bubbleColumn/0.org/Ub | 2 +-
.../bubbleFoam/bubbleColumn/0.org/alpha | 2 +-
.../bubbleFoam/bubbleColumn/0.org/epsilon | 2 +-
.../bubbleFoam/bubbleColumn/0.org/k | 2 +-
.../bubbleFoam/bubbleColumn/0.org/p | 2 +-
.../multiphase/bubbleFoam/bubbleColumn/0/Ua | 2 +-
.../multiphase/bubbleFoam/bubbleColumn/0/Ub | 2 +-
.../bubbleFoam/bubbleColumn/0/alpha | 2 +-
.../bubbleFoam/bubbleColumn/0/epsilon | 2 +-
.../multiphase/bubbleFoam/bubbleColumn/0/k | 2 +-
.../multiphase/bubbleFoam/bubbleColumn/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../cavitatingFoam/les/throttle/0/U | 2 +-
.../cavitatingFoam/les/throttle/0/gamma | 2 +-
.../cavitatingFoam/les/throttle/0/k | 2 +-
.../cavitatingFoam/les/throttle/0/nuSgs | 2 +-
.../cavitatingFoam/les/throttle/0/p | 2 +-
.../cavitatingFoam/les/throttle/0/rho | 2 +-
.../throttle/constant/polyMesh/blockMeshDict | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/U | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/gamma | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/k | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/nuSgs | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/p | 2 +-
.../cavitatingFoam/les/throttle3D/0.org/rho | 2 +-
.../cavitatingFoam/les/throttle3D/0/U | 2 +-
.../cavitatingFoam/les/throttle3D/0/gamma | 2 +-
.../cavitatingFoam/les/throttle3D/0/k | 2 +-
.../cavitatingFoam/les/throttle3D/0/nuSgs | 2 +-
.../cavitatingFoam/les/throttle3D/0/p | 2 +-
.../cavitatingFoam/les/throttle3D/0/rho | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../cavitatingFoam/ras/throttle/0/U | 2 +-
.../cavitatingFoam/ras/throttle/0/gamma | 2 +-
.../cavitatingFoam/ras/throttle/0/p | 2 +-
.../cavitatingFoam/ras/throttle/0/rho | 2 +-
.../throttle/constant/polyMesh/blockMeshDict | 2 +-
.../les/depthCharge2D/0/U | 2 +-
.../les/depthCharge2D/0/alpha1.org | 2 +-
.../les/depthCharge2D/0/p.org | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../les/depthCharge3D/0/U | 2 +-
.../les/depthCharge3D/0/alpha1.org | 2 +-
.../les/depthCharge3D/0/p.org | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../ras/damBreakWithObstacle/0-orig/U | 2 +-
.../ras/damBreakWithObstacle/0-orig/alpha1 | 2 +-
.../damBreakWithObstacle/0-orig/alpha1.org | 2 +-
.../ras/damBreakWithObstacle/0-orig/p | 2 +-
.../ras/damBreakWithObstacle/0/alpha1.org | 2 +-
.../interDyMFoam/ras/damBreakWithObstacle/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../interDyMFoam/ras/floatingObject/0.org/p | 2 +-
.../floatingObject/constant/dynamicMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../ras/floatingObject/system/topoSetDict | 2 +-
.../interDyMFoam/ras/sloshingTank2D/0/U | 2 +-
.../ras/sloshingTank2D/0/alpha1.org | 2 +-
.../interDyMFoam/ras/sloshingTank2D/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../interDyMFoam/ras/sloshingTank2D3DoF/0/U | 2 +-
.../ras/sloshingTank2D3DoF/0/alpha1.org | 2 +-
.../interDyMFoam/ras/sloshingTank2D3DoF/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../interDyMFoam/ras/sloshingTank3D/0/U | 2 +-
.../ras/sloshingTank3D/0/alpha1.org | 2 +-
.../interDyMFoam/ras/sloshingTank3D/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../interDyMFoam/ras/sloshingTank3D3DoF/0/U | 2 +-
.../ras/sloshingTank3D3DoF/0/alpha1.org | 2 +-
.../interDyMFoam/ras/sloshingTank3D3DoF/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../interDyMFoam/ras/sloshingTank3D6DoF/0/U | 2 +-
.../ras/sloshingTank3D6DoF/0/alpha1.org | 2 +-
.../interDyMFoam/ras/sloshingTank3D6DoF/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../interDyMFoam/ras/testTubeMixer/0/U | 2 +-
.../ras/testTubeMixer/0/alpha1.org | 2 +-
.../interDyMFoam/ras/testTubeMixer/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../MRFInterFoam/mixerVessel2D/0/alpha1.org | 2 +-
.../interFoam/MRFInterFoam/mixerVessel2D/0/p | 2 +-
.../mixerVessel2D/constant/MRFZones | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../multiphase/interFoam/laminar/damBreak/0/U | 2 +-
.../interFoam/laminar/damBreak/0/alpha1 | 2 +-
.../interFoam/laminar/damBreak/0/alpha1.org | 2 +-
.../multiphase/interFoam/laminar/damBreak/0/p | 2 +-
.../damBreak/constant/polyMesh/blockMeshDict | 2 +-
.../multiphase/interFoam/les/nozzleFlow2D/0/B | 2 +-
.../multiphase/interFoam/les/nozzleFlow2D/0/U | 2 +-
.../interFoam/les/nozzleFlow2D/0/alpha1 | 2 +-
.../multiphase/interFoam/les/nozzleFlow2D/0/k | 2 +-
.../interFoam/les/nozzleFlow2D/0/nuSgs | 2 +-
.../interFoam/les/nozzleFlow2D/0/nuTilda | 2 +-
.../multiphase/interFoam/les/nozzleFlow2D/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../nozzleFlow2D/constant/polyMesh/boundary | 2 +-
.../constant/polyMesh/boundary.org | 2 +-
.../interFoam/ras/damBreak/0/alpha1 | 2 +-
.../interFoam/ras/damBreak/0/alpha1.org | 2 +-
.../interFoam/ras/damBreak/0/nuTilda | 2 +-
.../multiphase/interFoam/ras/damBreak/0/p | 2 +-
.../damBreak/constant/polyMesh/blockMeshDict | 2 +-
.../interMixingFoam/laminar/damBreak/0/U | 2 +-
.../laminar/damBreak/0/alpha1.org | 2 +-
.../laminar/damBreak/0/alpha2.org | 2 +-
.../laminar/damBreak/0/alpha3.org | 2 +-
.../interMixingFoam/laminar/damBreak/0/p | 2 +-
.../damBreak/constant/polyMesh/blockMeshDict | 2 +-
.../constant/turbulenceProperties | 2 +-
.../cavitatingBullet/system/controlDict | 2 +-
.../cavitatingBullet/system/fvSchemes | 2 +-
.../cavitatingBullet/system/fvSolution | 2 +-
.../cavitatingBullet/system/snappyHexMeshDict | 2 +-
.../laminar/damBreak4phase/0/U | 2 +-
.../laminar/damBreak4phase/0/alphaair | 2 +-
.../laminar/damBreak4phase/0/alphamercury | 2 +-
.../laminar/damBreak4phase/0/alphaoil | 2 +-
.../laminar/damBreak4phase/0/alphawater | 2 +-
.../laminar/damBreak4phase/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../laminar/damBreak4phaseFine/0/U | 2 +-
.../laminar/damBreak4phaseFine/0/alphaair | 2 +-
.../laminar/damBreak4phaseFine/0/alphamercury | 2 +-
.../laminar/damBreak4phaseFine/0/alphaoil | 2 +-
.../laminar/damBreak4phaseFine/0/alphawater | 2 +-
.../laminar/damBreak4phaseFine/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../multiphase/settlingFoam/ras/dahl/0/U | 2 +-
.../multiphase/settlingFoam/ras/dahl/0/alpha | 2 +-
.../settlingFoam/ras/dahl/0/epsilon | 2 +-
.../multiphase/settlingFoam/ras/dahl/0/k | 2 +-
.../multiphase/settlingFoam/ras/dahl/0/pmh | 2 +-
.../ras/dahl/constant/polyMesh/blockMeshDict | 2 +-
.../multiphase/settlingFoam/ras/tank3D/0/U | 2 +-
.../settlingFoam/ras/tank3D/0/alpha | 2 +-
.../settlingFoam/ras/tank3D/0/epsilon | 2 +-
.../multiphase/settlingFoam/ras/tank3D/0/k | 2 +-
.../multiphase/settlingFoam/ras/tank3D/0/pmh | 2 +-
.../ras/tank3D/constant/polyMesh/boundary | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/Theta | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/Ua | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/Ub | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/alpha | 2 +-
.../twoPhaseEulerFoam/bed/0/epsilon | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/k | 2 +-
.../multiphase/twoPhaseEulerFoam/bed/0/p | 2 +-
.../bed/constant/polyMesh/blockMeshDict | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/Theta | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/Ua | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/Ub | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/alpha | 2 +-
.../twoPhaseEulerFoam/bed2/0/epsilon | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/k | 2 +-
.../multiphase/twoPhaseEulerFoam/bed2/0/p | 2 +-
.../bed2/constant/polyMesh/blockMeshDict | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/Theta | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/Ua | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/Ub | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/alpha | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/epsilon | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/k | 2 +-
.../twoPhaseEulerFoam/bubbleColumn/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../solidDisplacementFoam/plateHole/0/D | 2 +-
.../solidDisplacementFoam/plateHole/0/T | 2 +-
.../plateHole/constant/polyMesh/blockMeshDict | 2 +-
.../beamEndLoad/0/D | 2 +-
.../beamEndLoad/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
909 files changed, 1148 insertions(+), 1074 deletions(-)
create mode 100644 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
create mode 100644 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
diff --git a/applications/test/Hashing/hashingTests b/applications/test/Hashing/hashingTests
index 162854bbefc..2ccc793e748 100644
--- a/applications/test/Hashing/hashingTests
+++ b/applications/test/Hashing/hashingTests
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index 01d4274ba8d..e1833efb3f6 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/applications/test/regex/testRegexps b/applications/test/regex/testRegexps
index 72287eea434..fca98249c60 100644
--- a/applications/test/regex/testRegexps
+++ b/applications/test/regex/testRegexps
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
index b21e5544fef..310c2653e3e 100644
--- a/applications/test/router/routerDict
+++ b/applications/test/router/routerDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/test/spline/test-splines b/applications/test/spline/test-splines
index 63f7bd17dd1..05ab2185cdd 100644
--- a/applications/test/spline/test-splines
+++ b/applications/test/spline/test-splines
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
(
diff --git a/applications/test/wordRe/testRegexps b/applications/test/wordRe/testRegexps
index c18cac80287..0eefa0f781a 100644
--- a/applications/test/wordRe/testRegexps
+++ b/applications/test/wordRe/testRegexps
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
index 9c57e17dbf7..334ea8cd308 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
index f2cf2616929..b656cbffcad 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
index 87f91eafb40..10b73f34b53 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict
+++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties b/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
index 9a047e78229..4fe5c4321d1 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 788b154a6e9..f83ccc48546 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 10fd55e5a17..fae13ed51b5 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
index 0405c7cfede..a891f605d2f 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
index 5a460c5d2ee..c8b6a44f48b 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 40afc5ecb92..334a12b2ce3 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index a183ebd0cb4..88d620ced11 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
index da3b4fef6ef..455a58afcbd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
index d236d5ea8b3..a6df8ead18c 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
index 37739bb8590..c19349de64c 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probesDict b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
index 3f7679f0ded..835ca7a2fb5 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/probesDict
+++ b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM 1.4.1 |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index e892508a92d..8584bdec952 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
index 164641cc1d0..20b92e066d0 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index f2d36024721..af5db49b832 100644
--- a/applications/utilities/preProcessing/mapFields/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict
index af1bf618453..58a745dac15 100644
--- a/applications/utilities/preProcessing/setFields/setFieldsDict
+++ b/applications/utilities/preProcessing/setFields/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
index 0ce72e67bc2..7ea094c1f40 100644
--- a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
+++ b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index f956a24789a..ede8e0658dc 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
index cd2ea615d4d..2e4d05dd351 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : adiabaticFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
index 1e65197392d..93a5fb01eb0 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : adiabaticFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
index 45e2b912f61..a4fdd46fa16 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : adiabaticFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
index 289c9733818..8663ce69f53 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/controlDict
+++ b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
index 20f74642e85..32c6070c77f 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : equilibriumFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
index 666313208bb..88ddd86d3ae 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/controlDict
+++ b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/etc/cellModels b/etc/cellModels
index ca710a777bf..b4aa84f39b6 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/controlDict b/etc/controlDict
index 891e010e0cc..ea497f7f079 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 6502bb5d967..50f34957aa6 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 70187fad00c..fe04eaf8bd5 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/sampling/probes/probesDict b/src/sampling/probes/probesDict
index 83da4ce91a7..90c0fe96de2 100644
--- a/src/sampling/probes/probesDict
+++ b/src/sampling/probes/probesDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/U b/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
index 9b2701a3ae5..2bce99f0db0 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
index 254013e6c9f..f0b1acde983 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/p b/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
index 0738f6a8678..a3f723593b3 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/U b/tutorials/DNS/dnsFoam/boxTurb16/0/U
index 9b2701a3ae5..2bce99f0db0 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/U
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
index 254013e6c9f..f0b1acde983 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/p b/tutorials/DNS/dnsFoam/boxTurb16/0/p
index 0738f6a8678..a3f723593b3 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/p
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
index 7758339eba3..9973b0032f3 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/0/T b/tutorials/basic/laplacianFoam/flange/0/T
index fda50237c21..eb6b0630dfb 100644
--- a/tutorials/basic/laplacianFoam/flange/0/T
+++ b/tutorials/basic/laplacianFoam/flange/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
index 77d8d3c4b1b..612c3415e0f 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
+++ b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/U b/tutorials/basic/potentialFoam/cylinder/0.org/U
index c2b2150d9b3..c4ac2d9f945 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.org/U
+++ b/tutorials/basic/potentialFoam/cylinder/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/p b/tutorials/basic/potentialFoam/cylinder/0.org/p
index 3d61ee194e9..906f2b8441e 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.org/p
+++ b/tutorials/basic/potentialFoam/cylinder/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0/U b/tutorials/basic/potentialFoam/cylinder/0/U
index c2b2150d9b3..c4ac2d9f945 100644
--- a/tutorials/basic/potentialFoam/cylinder/0/U
+++ b/tutorials/basic/potentialFoam/cylinder/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0/p b/tutorials/basic/potentialFoam/cylinder/0/p
index 3d61ee194e9..906f2b8441e 100644
--- a/tutorials/basic/potentialFoam/cylinder/0/p
+++ b/tutorials/basic/potentialFoam/cylinder/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
index 98f2805eff0..0425c44ef2b 100644
--- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/U b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
index ec085adb4f5..6ce2a587ad0 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.org/U
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/p b/tutorials/basic/potentialFoam/pitzDaily/0.org/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.org/p
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/U b/tutorials/basic/potentialFoam/pitzDaily/0/U
index ec085adb4f5..6ce2a587ad0 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0/U
+++ b/tutorials/basic/potentialFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/p b/tutorials/basic/potentialFoam/pitzDaily/0/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0/p
+++ b/tutorials/basic/potentialFoam/pitzDaily/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
index ed4cbba8d5b..0d47b7393d9 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
index c8dd4f1a789..f5ecaaa1aea 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
index 650d0b95406..3fbfd04efad 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
index 0d7442b7b59..5f6bd6c4c3e 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/T
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
index 2ecafa1cdb2..29395f8940e 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
index c625528d164..e51b3a346f4 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/U
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
index 3ab3f03da4b..5d71d1eeae4 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index 145d82f010e..acf91702560 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
index 231a96a26d3..3a1dc34da5a 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/b
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
index 8c3df7e4bab..f0a968598d8 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/k
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
index 05bf1b53293..1f439921e10 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
index 4893a741d7d..cc2360484ba 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/p
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 5935b5b9bf1..273b2a1d0e7 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
index d3cc26e7d8e..0cabf049d59 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
index f8c2f8ec0c3..5b58b8a0eec 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
index c0fa420d2b6..61f387f5dfc 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
index 6067884afc1..3fb7f1e42ba 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
index eb94d243a82..ec71d6c1fc5 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index 3b3abcca8bf..10e71fe17d6 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
index 072346a532c..6805fdd6b46 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
index 862110ed4c7..fa03d9be8dc 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
index 3894d39183d..83e2c621d33 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
index bfd7be5db2f..a7fe5c25913 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
index 2caf83dfc8a..6eac04dd477 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
index d2e580c0f43..7e94b7be7ba 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
index 756840b371a..07563246953 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
index ec98da12f2d..594b9d8f136 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
index 8451816bf8b..399882c98ae 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
index e21fdfd192d..6a6679b4934 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
index 11f03d6cd01..6d79d7ef46a 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
index ac78cadd819..bb2261438e7 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
index 7d5810b1767..f4de3286b3b 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
index 0a690886a05..0f754753b52 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
index ac183157082..24d80f61cb2 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 b/tutorials/combustion/dieselFoam/aachenBomb/0/N2
index 3c377c50351..f153e95df0d 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/N2
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/N2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/O2 b/tutorials/combustion/dieselFoam/aachenBomb/0/O2
index d966d53a96c..77a26da9239 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/O2
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/O2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/T b/tutorials/combustion/dieselFoam/aachenBomb/0/T
index accaf72fb0f..5ce3d1719fc 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/T
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/U b/tutorials/combustion/dieselFoam/aachenBomb/0/U
index 06ed818a6b5..8b1633e9034 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/U
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
index ed460af0e6b..982cb78702a 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/ft b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
index f9dbf9d442a..cb43f04d74a 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/ft
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/fu b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
index 5a3a35f68da..58a0d91732b 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/fu
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p
index 7cc844fdccf..e73e0d9748f 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/p
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
index 1dd31857dba..223d2839e83 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
index 070a7befc06..f7be24a59f7 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
index dfe1035aab1..fe21e4cf458 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
index fd0982491c6..1cb000fd6b6 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
index 61b02dea13d..9b5a4aaba07 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
index 1c7d1ebb4d5..326c221fcb3 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
index 48e4aab470d..cd208831a41 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
index c840a07a08e..d280f5f5be1 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
index 0fbbd652fef..4dd9299c18f 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
index 44b0a149551..85daec9f303 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
index e3b3011de31..2f6a283d17e 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
index 80db42f64f8..3c869cb21ce 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
index f8b645f718b..e82c20fd75a 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
index d25a0c7e11d..19305abecd5 100755
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
index 17f30efd1fb..f516bbc0353 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
index 98d27237ea1..43b9cb32668 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
index 0f18c0d7338..84fecf9489c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 2e4a2e74af5..7ee7270c9c4 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
index d44ea0a3712..a0ced45af58 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index b2ef1f85d98..31c2ca798c8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
index 1d9cb818fce..600018cf28b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 8b24cb3469f..18b578964e9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index ac4b5ee3ed9..b7272e5ab31 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
index dcdd095f09c..1215229094d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
index 3a0de95a3ce..8566c3dc243 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
index 3a038966c2d..ee78235a174 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
index 254322f38e0..770c1f6fff1 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
index 374e9131d30..7352601cb7d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
index da2957b4c84..11aff05e315 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
index cf60ba7894a..55e1248927f 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon
index 52209c27a3d..0dcc148e106 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k
index 6b2458ec765..ee1ce9c6d01 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut
index 3fd75130c23..a09e783af6f 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/mut
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
index 9de9e6bced1..78f63564fa8 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
index 87a0f24bdac..9911942144f 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
index 94a83152f75..78d45ada859 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
index 7ae764cdc8f..18f61b36137 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
index a16582984ce..d7db059aeee 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
index 13f3623dbad..8d83f66b7af 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
index 0d3da1ba789..fa84a2cdc9a 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
index 92841d280b7..236ba29395d 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
index 86b0c61b1c2..572455f0529 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
index 5194ec98dff..dbaa5ab1cd1 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
index dd6f7a1733c..0426d873242 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
index 3e679952bd5..fb709cba971 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
index 083e7714f3a..ae769b73145 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
index f2082350de5..9ca19696d5e 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
index 81a1384e4b0..6b18131bdbd 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
index 007785e3bcb..b1300d4bbda 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
index 932d7ae8e1f..25e016803cf 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
index 583933f34ae..0b64e4439f0 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
index b85cc7385b0..ff13de03c7d 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
index 98ec2dbd269..675cb6d2ee5 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
index 99db71dfd95..8d3d63fb73c 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
index 9c672841a65..2378dcf6030 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
index cbcfc6c55a5..593073bcc65 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/T
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/U
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/p
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
index 5de374c3717..84f6d25381c 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
index 74c9fa43c01..ab439e5da6c 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
index c903efcbb17..a6d47e78c41 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
index 583933f34ae..0b64e4439f0 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index c9d3dd16eb2..2b1abb18980 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B
index 94cbead26d3..7247fcdbef3 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
index 10dca5a78cd..e507e033427 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
index 1cbf4b00ef4..a7a2e67efa6 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
index 7f07f9dd1c3..8b7e616bd1c 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
index 3d660931766..c329a43522e 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
index aa318f8418e..34fc080cf7a 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
index 4893a741d7d..cc2360484ba 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
index e1df9439877..4600a6cc79a 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index fa9053408e1..300f2217166 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
index 9dc24513e79..0a670cc92eb 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict
index 0438819b250..5863a04e716 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
index 6d6d0669392..1eabb3e673c 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
index 634799837ea..e081bbf9e38 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
index e93d5c74482..2fdcf77f745 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
index 4c2a23c3d1e..745a9e12ffb 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
index f3d50407620..4b749d4c748 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T
index c8760070627..11aacec2587 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U
index ee6588db423..7576a5dc544 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p
index de53bf93f6d..89b97cd69d5 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
index bff11fb77f1..00f3baa8b4d 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index ef73b0c7b75..d00ff96582b 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index dccc042d224..9f72950a336 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
index e7986b4d348..85f3ddcc32c 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
index e1df9439877..4600a6cc79a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index 88f50942586..0b3a166e5b3 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
index 9dc24513e79..0a670cc92eb 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
index 0438819b250..5863a04e716 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 6d6d0669392..1eabb3e673c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
index 43602a72a6b..5494cc74271 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/T b/tutorials/compressible/rhoSimplecFoam/squareBend/0/T
index c8a138aa587..2e8687cf010 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/T
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/U b/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
index 971e760d3de..8b6eee4ba58 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/p b/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
index fa45b63e2ce..cb8900c8271 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict
index f8b06e3446c..723e1a8948b 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/T b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T
index 74c9fa43c01..ab439e5da6c 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/T
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/U b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U
index 488db5a6749..ea567fe8794 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/U
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/p b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p
index 583933f34ae..0b64e4439f0 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/p
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
index 43f728fbec3..d3a3349ed66 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU
index 0fd4b44e6f0..4a82eb7719c 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU
index 0fd4b44e6f0..4a82eb7719c 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/magU
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
index c9bce43fbbb..2cca973a7b5 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/T b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/T
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/U b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/U
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/p b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/p
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
index 5de374c3717..84f6d25381c 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
index 74c9fa43c01..ab439e5da6c 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
index ad82f1f256f..3235e3c3f74 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
index 9ec17cbfc06..57da73d4f0c 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index c9d3dd16eb2..2b1abb18980 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
index 74c9fa43c01..ab439e5da6c 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
index 488db5a6749..ea567fe8794 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
index 5e993bac238..f919e8ed31d 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
index 43f728fbec3..d3a3349ed66 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
index 0fd4b44e6f0..4a82eb7719c 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
index 26cd813bf2c..04e9eb34ed4 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
index 50171289430..989a9aa6c40 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
index 0fd4b44e6f0..4a82eb7719c 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
index 7a9a0ce1aeb..2ac9b838003 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
index c9bce43fbbb..2cca973a7b5 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
index 41259fbd7cd..a488a851d7a 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
index c1e2d42a81d..3d45213e747 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
index ff971336468..6bfbcbc5202 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
index d033035f97c..cf0c785ac05 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/T b/tutorials/compressible/sonicFoam/ras/prism/0/T
index 97bca6a5fc8..a7d30232908 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/T
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/U b/tutorials/compressible/sonicFoam/ras/prism/0/U
index 1f0102c348d..fc2e64ae1e2 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/U
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/p b/tutorials/compressible/sonicFoam/ras/prism/0/p
index be0a9f3334e..4fefb770173 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/p
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
index 5422cfc5a63..f167766b853 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
index 9610e2068b2..1d20bd2da21 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
index 0084d6dc3f7..ed95d613b8e 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
index 1dd311e1c2a..17d703a3a04 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
index ece1ab678bf..a6bf1f0650b 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
index c75e5506a6f..565d0f91bb1 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
index 2494f1643f1..6abc56f15ce 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
index bcc188d7b5a..3f123353d0f 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
index 1dd93605f14..998dceab966 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
index b5e11bb7385..8afabc293fb 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
index 4edb0c49dcb..50e8fd12e50 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
index 1b17cb300b1..57bd3fbe675 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
index e4cb992d829..eb9e3655654 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
index 2eb277f9c6a..9e95c235a09 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
index 7d6a6991986..c712cbfca92 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
index 18351b2877d..97bf4695307 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
index b4415cdcacc..2cfde8992df 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
index c4a7ffe6977..0d9e96d66e7 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
index 82319420206..d83c09b2269 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
index fbc135df531..5c7e8435f49 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
index 04bb9394b0a..f6a14ca9581 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
index ff19c819e40..58c7a464f20 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
index e8c080b09df..e1a071e627c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
index 53327c5862c..f597df58049 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
index 4a8b2d2c3e7..906229f0fd8 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
index 730a121aa8e..02dc5b642e6 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
index b52b74dc006..3d3e599d1c2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
index eafb3dc32af..69cde6440d9 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
index 196febe8030..562a25c503b 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
index 91eab0e837f..497cf3201ae 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
index b005545e664..c17242ed617 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
index fae3c26dc89..5cb9bf62874 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
index 1e13af9370f..2d6fc415cab 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
index 976ec30e748..fc66ad0a443 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
index b26e99313c3..71e0100e21a 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
index 05d234bd2a9..c33b2e6c9cb 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
index 5e954626a4b..d6461db437c 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
index 7ec6f3368f6..c9f47a595d6 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
index f847c22cd09..1e1977851a3 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
index b9ec0f2ebfb..bd60593f88f 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
index f587cd73801..024d218ec78 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
index 415380b9891..c292565bd13 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
index 07c6a1b456e..bad10b7276b 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
index 646849b96e5..cf079de827a 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
index 1ce7e3b052b..5967f899185 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
index b13d432e3a2..52220cd583f 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
index 189311cb1dc..abedbe96dce 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
index 979ab3893ad..6563ccf963e 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
index 5de76599352..bb772f8afca 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
index 3f9855fdb93..ba2c19c3d82 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
index f4305a74a99..d74c7e6568d 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index 5ef67b3d584..37d08d80d2f 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
new file mode 100644
index 00000000000..786c02fc0c7
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ periodicX
+ {
+ type cyclic;
+ }
+ periodicY
+ {
+ type cyclic;
+ }
+ periodicZ
+ {
+ type cyclic;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
index 947047da698..434cdea83b0 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
index 769ffba2437..8a432d8218a 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 6846736f6be..4da03ed3f3d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
index 78b5c29d385..1c829f6d4cb 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
index 992b7b3d47c..33e684a3ee5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
index 0c0439ca09b..32ad6ab7f31 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
index 5d6aca13c1c..bf7767259ec 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
n| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
new file mode 100644
index 00000000000..786c02fc0c7
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ periodicX
+ {
+ type cyclic;
+ }
+ periodicY
+ {
+ type cyclic;
+ }
+ periodicZ
+ {
+ type cyclic;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
index b7167f77ac3..f62302881c4 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
index bb24cc7054e..6ca693e6a02 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index dda6c1a4de2..ad34ce0b2c3 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
index 3d0485eefa8..9e252f9135d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
index aa3060834fe..68019a7f1e6 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
index 2c2f42d851a..d4b32368717 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
index c1af478bcc0..98ae840006b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
index b9dc8a00f4c..188b54d50d3 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
index 14f7fb31776..83a924ce2b7 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
index 11d54e00c52..d4c6546e3e2 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 708791f4ec1..7e5b2dcfa9c 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
index 8c5e563a648..061d98f166e 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
index aa3060834fe..68019a7f1e6 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
index 5b10f0048d1..2373141f8a2 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
index c1af478bcc0..98ae840006b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
index 301b230f427..ca10e4a9f62 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
index ab4ad199e69..f0abe5c74ae 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
index 5cc96fdb796..caa5da75d90 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/B b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
index 7027728c0a6..3ce5a237b34 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/B
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/U b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
index 9ddff278440..f269e2a862d 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/U
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/p b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
index 61a8a915554..da9131c4243 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/p
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/pB b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
index 0d7b5a060d1..f3e16d564e9 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
index 885c2b67ded..aa90c2b886e 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V
index 43902e350fb..3eea666e14f 100644
--- a/tutorials/financial/financialFoam/europeanCall/0/V
+++ b/tutorials/financial/financialFoam/europeanCall/0/V
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
index 4a90e62405e..544668f7215 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
+++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T
index 76b8877c7e7..0a7701acf8c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
index 76b8877c7e7..0a7701acf8c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
index 2d20d38354d..3f054f0a23d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
index 5398bd05954..fcaa8d0c1dd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
index fa5d55a2b2e..12d1bdf61ad 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index e6ba59b71dd..84848b66f0c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
index 12e263d48c0..edc9d789a47 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T
index 18610a300b6..c4031678832 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
index 18610a300b6..c4031678832 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
index 2d20d38354d..3f054f0a23d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
index 5398bd05954..fcaa8d0c1dd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
index fa5d55a2b2e..12d1bdf61ad 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index e6ba59b71dd..84848b66f0c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
index 12e263d48c0..edc9d789a47 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index a63d9d4ad92..7ef0fa06e2b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 3d3a738a377..3403ec4715d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index e425ac8eb5b..42d75c5d3ed 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index a3743ec6591..de044e16032 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
index eec7278da05..03b5b6722eb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
index 12e263d48c0..edc9d789a47 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
index 5ee3242eb38..ed62a3046c0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 4c921888160..6f6506f595d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
index 8d91e2e9f11..75ad17a3a43 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
index 8d91e2e9f11..75ad17a3a43 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
index 2d20d38354d..3f054f0a23d 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
index 60476789b96..c93d03abc69 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index e6ba59b71dd..84848b66f0c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
index c15520f9948..e270b4ef128 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
index 3e850b913b8..2858e65d322 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
index 19224ed2b04..2eda19d6adc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
index 8abafb5ce5c..28b914fd762 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
index 31828802868..5dbe4b8413c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 6f5a818e17d..c1d6b112e91 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index e250c63939d..b0a009a45b7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index 517ebe571ff..3aa1a122cc9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
index e2b70a1cfe2..9625d2cd11f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
index 76b8877c7e7..0a7701acf8c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org
index 76b8877c7e7..0a7701acf8c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
index 2d20d38354d..3f054f0a23d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
index 60476789b96..c93d03abc69 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index e6ba59b71dd..84848b66f0c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
index 6139ef5da8a..44a41769a9d 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
index 513a57a47ae..026b3aa7665 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
index 68b5a4fa264..9a2a7f88bf6 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
index f1dea8c1898..8ac4cd06242 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
index 4e67bfd893d..153904f7560 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G
index 6139ef5da8a..44a41769a9d 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault
index 9f2e99587e8..44c3e87c9b2 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T
index 513a57a47ae..026b3aa7665 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U
index 68b5a4fa264..9a2a7f88bf6 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
index f1dea8c1898..8ac4cd06242 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
index 4e67bfd893d..153904f7560 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
index 4068676987c..4d9246ebcba 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
index c6ae16042a2..beaf073ba5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
index 42ab6a0a093..153de0bd092 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
index 84aab72ae1c..853fd78eebb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
index 0233591ba35..64f7bcda23c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
index e8c31261f17..8a0910516d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
index 0d135f28e9f..2e7d3413fc1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index c2d48ee2b07..fcb0e7a6a93 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
index 9edb2bbd94b..a8317a372fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
index 06d8984cac7..51e6fe0e74d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
index 29aa27e2378..09a9a55851d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index af8ff6f5eb4..ae93c0c12f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties
index e009ce86dad..e63bbc50815 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index b9a8773586c..949d7d15215 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index cedcc3c6116..14b6f258e20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
index 16947842afa..49a947de37a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
index 7662a20c90a..e46addeb9a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
index fd0e7cced2f..034233532a9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index b2b1284ef3a..20dac9a399e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 05d3011024a..a9c6ea7f0bc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 7e1adc24b3c..5fa61a7f8f9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 6e9192301de..1934047abf2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index cedcc3c6116..14b6f258e20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index 27f5cfb1dd7..c2e710a010a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
index 4068676987c..4d9246ebcba 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
index c6ae16042a2..beaf073ba5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
index 42ab6a0a093..153de0bd092 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
index 84aab72ae1c..853fd78eebb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
index 0233591ba35..64f7bcda23c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
index e8c31261f17..8a0910516d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
index 7af714ce80c..9f5e8cf39b7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index c2d48ee2b07..fcb0e7a6a93 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
index 9edb2bbd94b..a8317a372fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
index 33ec044c079..c9a3d6ffbd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
index 7af714ce80c..9f5e8cf39b7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index c2d48ee2b07..fcb0e7a6a93 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
index 9edb2bbd94b..a8317a372fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index 60db2d7cffa..4420a87f360 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index cedcc3c6116..14b6f258e20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index a2f76a21ca2..17e88546c2a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
index 75c18cb4784..db9c8ba2c3a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
index fd0e7cced2f..034233532a9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 8e65b465fb3..282c8e4ca9d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 0ff29fa63a4..4fc8984feca 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 18df13896bb..dc4fe7b846c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
index 74053b0ab3d..655585fe6be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
index 19370a0e39c..3ea75f5e695 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
index 5c92e704da1..10ddad813a6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index 943461dcb55..a00b3414327 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index cedcc3c6116..14b6f258e20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index 27f5cfb1dd7..c2e710a010a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
index 4068676987c..4d9246ebcba 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T
index c6ae16042a2..beaf073ba5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U
index 42ab6a0a093..153de0bd092 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
index 84aab72ae1c..853fd78eebb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p
index 0233591ba35..64f7bcda23c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
index e8c31261f17..8a0910516d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/RASProperties
index 0d135f28e9f..2e7d3413fc1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index c2d48ee2b07..fcb0e7a6a93 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
index 9edb2bbd94b..a8317a372fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
index 06d8984cac7..51e6fe0e74d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/RASProperties
index 29aa27e2378..09a9a55851d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index af8ff6f5eb4..ae93c0c12f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/turbulenceProperties
index e009ce86dad..e63bbc50815 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index b9a8773586c..949d7d15215 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
index 7662a20c90a..e46addeb9a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
index ddc551d45ed..064b9b08f65 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
index b2b1284ef3a..20dac9a399e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
index aadaf61f87d..c2eadba0fb4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
index 5cf50f1f1e8..e4c42fc4202 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 05d3011024a..a9c6ea7f0bc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 7e1adc24b3c..5fa61a7f8f9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 5c811e67833..2b1dbdcf90d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
index aad15ee459b..d8deb33bf49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index fde79823199..a6dff430789 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
index e620dcb6521..65446b252a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
index 8cd967d0a92..7e7c4a0e500 100644
--- a/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -16,7 +16,7 @@ FoamFile
convertToMeters 0.1;
-vertices
+vertices
(
(0 0 0)
(1 0 0)
@@ -28,35 +28,35 @@ vertices
(0 1 0.1)
);
-blocks
+blocks
(
hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-//patches
+//patches
//(
-// wall movingWall
+// wall movingWall
// (
// (3 7 6 2)
// )
-// wall fixedWalls
+// wall fixedWalls
// (
// (0 4 7 3)
// (2 6 5 1)
// (1 5 4 0)
// )
-// empty frontAndBack
+// empty frontAndBack
// (
// (0 3 2 1)
// (4 5 6 7)
// )
//);
-boundary
+boundary
(
movingWall
{
@@ -78,7 +78,7 @@ boundary
);
}
- frontAndBack
+ frontAndBack
{
type empty;
faces
@@ -90,7 +90,7 @@ boundary
);
-mergePatchPairs
+mergePatchPairs
(
);
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
index ee6588db423..7576a5dc544 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
index f5153f11ad8..211f49a0c10 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
index e995f6f4484..8ace7c09a37 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index 552afa40de3..7081624ee25 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index 5175a417653..1b90bac98f8 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
index 4c521594c67..b33acb44654 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
index c9e313803e4..784fbb9baa3 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
index 52126ce7546..8fb76ffd9a0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
index c0be82cd30a..6a96cf0b240 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
index a9534f20fbf..5c1b09dbe52 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
index 4bb886708ff..0d38ae153c0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
index 1c5c5223874..55889c67c00 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
index cc15bf6bfee..97071ba36c9 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
index 1a0a5c1a46e..f1e8e44413e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
index e74a803e10b..07252504214 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
index 24fd8182135..066ca8c6c83 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
index 1a0a5c1a46e..f1e8e44413e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
index e74a803e10b..07252504214 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/B b/tutorials/incompressible/channelFoam/channel395/0.org/B
index afb27554914..bf5b13f4521 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/B
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/B
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/U b/tutorials/incompressible/channelFoam/channel395/0.org/U
index 77aea5e8f06..e213cd42ef2 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/U
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/k b/tutorials/incompressible/channelFoam/channel395/0.org/k
index c2e41f797b2..e462a91de5a 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/k
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
index 0779277fe26..ced8d700d47 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
index af18403bb51..119fd37657c 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/p b/tutorials/incompressible/channelFoam/channel395/0.org/p
index 4c9f41f7f42..6b3ab6d990c 100644
--- a/tutorials/incompressible/channelFoam/channel395/0.org/p
+++ b/tutorials/incompressible/channelFoam/channel395/0.org/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
index 57e0203eca9..af950b6ec41 100644
--- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U
index 86a9f78b7a2..efc5a91fe3d 100644
--- a/tutorials/incompressible/icoFoam/cavity/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/0/p
index 14768e8f18d..8898350acf1 100644
--- a/tutorials/incompressible/icoFoam/cavity/0/p
+++ b/tutorials/incompressible/icoFoam/cavity/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
index eda42b96024..fb778ba61c9 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavityClipped/0/U
index 3d32047c87b..e4d9db421be 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/0/U
+++ b/tutorials/incompressible/icoFoam/cavityClipped/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavityClipped/0/p
index da7b082e71f..1b1a9084085 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/0/p
+++ b/tutorials/incompressible/icoFoam/cavityClipped/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
index 414dc7787fd..87489029c2c 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavityGrade/0/U
index b29cc1d70d3..8baa56780bf 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/0/U
+++ b/tutorials/incompressible/icoFoam/cavityGrade/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavityGrade/0/p
index 5765e5aa1b6..c19bffc19f4 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/0/p
+++ b/tutorials/incompressible/icoFoam/cavityGrade/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
index 329e58a71a9..93b10a09991 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/U b/tutorials/incompressible/icoFoam/elbow/0/U
index 68169029dfd..666b59a28e7 100644
--- a/tutorials/incompressible/icoFoam/elbow/0/U
+++ b/tutorials/incompressible/icoFoam/elbow/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/p b/tutorials/incompressible/icoFoam/elbow/0/p
index eb2b6282726..6791ebf14d8 100644
--- a/tutorials/incompressible/icoFoam/elbow/0/p
+++ b/tutorials/incompressible/icoFoam/elbow/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
index 7b89e8a1fc5..dfac095efdd 100644
--- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
+++ b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
index 056feccbd42..ab6eba0f78a 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
index 0b4f34f6a85..6367b89e05a 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
index 8d28ff87d41..1171971216c 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
index ed08e0cd93d..882677871a9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
index 711b6e28658..fae0e625b5a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
index e0a68b5aff1..7fd57360dba 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
index c738ec6d98b..3fab7c27e59 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U
index 345f30007b0..adc41fd7a51 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet
index ccf1d6e897b..a4c24f48f96 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
index 70336f846e6..dfe4f42bd5c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions
index e0d098096ae..ec8f512b697 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k
index 8ba642effb8..67887f27edd 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega
index 2024b25ef7a..2c3ae490c42 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p
index 78a5d152994..5206b484392 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict
index 986a599c5f6..36045963c76 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties
index a9d8bf659c4..530e23bba84 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes
index 2bee15799db..286a0e47f0e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution
index 038b442397e..c432c600cb5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U
index bd35fcfb40c..c63f88d76a0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet
index ccf1d6e897b..a4c24f48f96 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches
index 70336f846e6..dfe4f42bd5c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions
index e0d098096ae..ec8f512b697 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k
index 8ba642effb8..67887f27edd 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega
index 2024b25ef7a..2c3ae490c42 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p
index 78a5d152994..5206b484392 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties
index bbb18ba9e66..08b0437e51f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties
index a9d8bf659c4..530e23bba84 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict
index b75b8e1075f..71a1a89704b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes
index 2eb6038d7f1..12c4007e1c2 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution
index e99098b5b9c..4020e040fa0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict
index 1a5ba112ca6..5c13cba12f7 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict
index 2300d792071..743813fefcf 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
index 749fb95b703..f67e822f254 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
index 14f47a7b67a..4b9cc50f552 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
index 14a655e690a..8d1c49bc66a 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
index 288339e21a7..f9e5926b41f 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U
index 937d3966b25..d4b36a17322 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/U
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
index fe8744b3989..d97e548826e 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/p b/tutorials/incompressible/pimpleFoam/t-junction/0/p
index 93170d7a0cb..2e95ffcae30 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/p
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
index 7f78827df0a..0646f8c8a56 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/B b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/B
index 94cbead26d3..7247fcdbef3 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/B
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/B
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
index 7ed39fbf24c..86af6cb642c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
index 7f07f9dd1c3..8b7e616bd1c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
index 5a94fb1c503..8443f1a57b2 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
index e35b20fd644..b38fd323fd2 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B
index b4b6cda3e1b..82b9ce7ca26 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U
index 7cce4aecb57..faa9809d78b 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k
index 898cfe01f2c..bc606e685a3 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
index 5a94fb1c503..8443f1a57b2 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
index 1278c197377..a7c8e902c54 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
index 83338d7e0b7..a1420ab9ae9 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/R b/tutorials/incompressible/pisoFoam/ras/cavity/0/R
index bba9b5b414e..bdf8398e635 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/R
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/R
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/U b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
index 86a9f78b7a2..efc5a91fe3d 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/U
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda b/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
index 616a37e3007..5762805202d 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/p b/tutorials/incompressible/pisoFoam/ras/cavity/0/p
index 14768e8f18d..8898350acf1 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/p
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
index 52c065ae83d..5fb6428c770 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
index e1df9439877..4600a6cc79a 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index 88f50942586..0b3a166e5b3 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
index 4794b84b189..92af2a10280 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
index 0438819b250..5863a04e716 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
index 6d6d0669392..1eabb3e673c 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
index 634799837ea..e081bbf9e38 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
index 7f3bedaae59..0fa6827f06e 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index 5de491639a1..feb97fc3d26 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
index 155410c1be9..663af1f5ec9 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index 18870c0af00..d1d3fa39706 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
index b79b2a11e81..2f6f2c7f4ea 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
index 7883f151b93..b9195998291 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
index 9f005f2f65c..952c12eb639 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index 96e4a43d3c2..3e13a3b875e 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/p b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
index 4c7cbbd80a8..d6194d2707c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/p
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
index 5b35737d185..6be85586c59 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
index 8817844624a..e184b856b95 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
index 2778803f123..daad58d3f69 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
index cc9ea68b321..f0086fa788b 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
index bd4633a6775..42123de4289 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
index 38310185184..1cad198322f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/U b/tutorials/incompressible/simpleFoam/motorBike/0/U
index b074474b00d..2ce3a6fff95 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet
index ccf1d6e897b..a4c24f48f96 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/include/fixedInlet
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches b/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches
index d858932a9d7..6db619f38d4 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions b/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions
index a90ff786cc5..c8fa21f3b54 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0/k
index f8da4fe9ab3..076a183a9cb 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0/omega
index dcd88e8d675..274011e8169 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/omega
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/p b/tutorials/incompressible/simpleFoam/motorBike/0/p
index 9bf8e9d43df..7ab531ef650 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
index e0f7c78180d..24a4e1ec3e9 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
index 2fdea02592f..c1b88f75251 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
index 7f3bedaae59..0fa6827f06e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 72478f821e1..4761ae70373 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
index c8c86b3fd87..7a1f92e1681 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index b83088fb0e6..cd5ed7425c6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index e99098b5b9c..4020e040fa0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index affc38cb2da..9f6ce045206 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/R b/tutorials/incompressible/simpleFoam/pitzDaily/0/R
index 2eb8459d869..9a4e4f96bec 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/R
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/R
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
index ec085adb4f5..6ce2a587ad0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
index be7ac0223a2..e2034bcc242 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/p b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
index 2eb8459d869..9a4e4f96bec 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
index cc7970b18e8..c49915e890e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
index be7ac0223a2..e2034bcc242 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
index db9c0a3a745..f8b31673964 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
index c3bb73b5a9b..7efaf20113f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
index f6c97ebb3d7..4aa34033d01 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
index f8e3d4273fe..5d217e794f0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
index 83cbf6a2e79..423ff6219d1 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
index 89852b13afd..964452a9e6c 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
index dbf1defeade..827be9b4a1a 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
index c4b875bc8ac..91f1e6fdc5d 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/p b/tutorials/incompressible/simpleSRFFoam/mixer/0/p
index dfb6fe99fe2..d60013671c7 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/p
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
index 948100235fa..967148c5ad9 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index 4b5bfcf4219..9ec2a85526d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
index 36f4c7a3fb6..2a53304fdaa 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index 814c5a8f9e2..41968dd9bff 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
index e95384474bf..a2574a4c9b3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
index b99dfc07c7c..f3e42d766b6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
index bac9361933b..5df0cf4b0fd 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
index 7fa3e2e4886..4e3d62fa854 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
index 00f9fd04b86..896b646bfdb 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
index a0c6dd9ec1e..68d953f8d0f 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
index ba5cc3d6069..9892e5b61fe 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
index e95384474bf..a2574a4c9b3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
index b99dfc07c7c..f3e42d766b6 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
index bac9361933b..5df0cf4b0fd 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
index 7fa3e2e4886..4e3d62fa854 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
index 00f9fd04b86..896b646bfdb 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
index a0c6dd9ec1e..68d953f8d0f 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
index ba5cc3d6069..9892e5b61fe 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: splitCyclic |
+| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
index a6b95d334d3..d13d2161c46 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
index a7981f61867..71e5d329a7c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
index 380a953bfb4..3d89cfc87ad 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
index d49f3cf71d0..f089b5aa1f0 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
index 6e8fb5d0e6c..161079237f2 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
index f49b0231f03..72caac37b54 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
index 5d813907a80..accf5dd0830 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
index 2ef22841924..962641cf24e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
index 8a461bd1475..0b6f5a1ecc7 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
index 9523758e82c..c1b0c45daa8 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
index 68bb6d93691..36a2c0b6e00 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
index 98646ad46e9..7482b743899 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties
index 693c0989a7a..c00a70ffcd1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
index ae04abedd6a..08fb2ca37de 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM 1.4.1 |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O
index 3e46197b969..aa35b84aff9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/T
index 69f5653ca78..4a53e52e1a3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/air
index 5fbc4f5e7f9..e54716bb87c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/air
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/air
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/p
index 983de9aa2e9..cc559b5f01e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O
index 3e46197b969..aa35b84aff9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T
index 69f5653ca78..4a53e52e1a3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air
index 5fbc4f5e7f9..e54716bb87c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
index 983de9aa2e9..cc559b5f01e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties
index 02c52e85d00..a780880b240 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
index 8f1fd10943b..2cb8bbb4bd2 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index d49f3cf71d0..f089b5aa1f0 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/T b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/T
index ac30f9d6366..c0ec071c9b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Tf
index d0b01aa6f80..44eacb8ce34 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/U b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/U
index bc29aca83ad..b92c0bb9fa6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/USpf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/USpf
index 5a52c991691..bfaf11072f0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/USpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/USpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Uf
index 1720f371e36..fb9983b0443 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/deltaf
index b8de19a2e12..d2359386afd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/p b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/p
index c016f0b3e77..1eccd6ea378 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/pSpf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/pSpf
index 8d5ec13bfdf..283a9871278 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/pSpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0.org/wallFilmRegion/pSpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/T b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/T
index ac30f9d6366..c0ec071c9b3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Tf
index d0b01aa6f80..44eacb8ce34 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/U b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/U
index bc29aca83ad..b92c0bb9fa6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/USpf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/USpf
index 5a52c991691..bfaf11072f0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/USpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/USpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Uf
index 1720f371e36..fb9983b0443 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/deltaf
index b8de19a2e12..d2359386afd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/p b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/p
index c016f0b3e77..1eccd6ea378 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/pSpf b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/pSpf
index 8d5ec13bfdf..283a9871278 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/pSpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/0/wallFilmRegion/pSpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/polyMesh/blockMeshDict
index 22a062a6db9..2360627d561 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes
index a254f7f2b43..fb67e7d1ac4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions
index af3a75c15bb..fe81377d7a5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/T
index a006148876a..4bac918f711 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/p b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/p
index b02e9e00f01..1d1dc79489e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/T b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/T
index 9ea9e845535..61084f931da 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Tf
index 69c9e2a5c84..ce2dbca1f7a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/U b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/U
index 47f15fad957..cfd4eb3b56d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/USpf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/USpf
index 28f9e6b8312..31c395cf5c5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/USpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/USpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Uf
index bdb198e7976..718d0f8981a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/deltaf
index bd4dc96fec7..680a919369d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/p b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/p
index 9b201d1dabc..d038a768836 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/pSpf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/pSpf
index 53cacbdc73a..90cb0e6f9d6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/pSpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0.org/wallFilmRegion/pSpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T
index a006148876a..4bac918f711 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p
index b02e9e00f01..1d1dc79489e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/T b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/T
index 9ea9e845535..61084f931da 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Tf
index 69c9e2a5c84..ce2dbca1f7a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/U b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/U
index 47f15fad957..cfd4eb3b56d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/USpf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/USpf
index 28f9e6b8312..31c395cf5c5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/USpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/USpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Uf
index bdb198e7976..718d0f8981a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/deltaf
index bd4dc96fec7..680a919369d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/p b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/p
index 9b201d1dabc..d038a768836 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/pSpf b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/pSpf
index 53cacbdc73a..90cb0e6f9d6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/pSpf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/wallFilmRegion/pSpf
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/polyMesh/blockMeshDict
index 8d35586fcfb..f210eb8a654 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
index 4260fe53ff4..d1ec0b43543 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
index 887efae0205..35814b7beb6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T
index 557c2a00a45..7af14ccae9a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U
index ab700ac7fc1..e8ca849242b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p
index d9e704b77ee..33a8121aaa6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
index f027e3747b8..e607484c06a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
index 4936063330b..9aa7e858c1a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
index e1d465f7391..4ab82893823 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
index fdef44841c2..64412b357f5 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
index 52c0f33bf0a..ce40d1cce57 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
index 413fb65ee01..ca72907fdaf 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
index 8e86b07a312..8ce16d7a47e 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
index 48cc0c40f34..7dfdefa13ae 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
index 836a2125c4b..ee07fc2fd13 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
index fb5719202fd..5f0eec5065a 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index cc32e107da6..bbbd6ec481c 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-| ========= |
-| \\ / OpenFOAM |
-| \\ / |
-| \\ / The Open Source CFD Toolbox |
-| \\/ http://www.OpenFOAM.org |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
index 290ca17103b..852331bc83f 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
index 27a20646050..7b849ddc86b 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
index 620076aa4f5..d0e20aa930d 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
index 74d99a03410..dd4026c3f1d 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
index d1cf7598254..2613426bdce 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
index 97628b7599d..4cff4010165 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
index 7c7c20286a6..6034d0c751f 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
index 858e81fca7c..0d22e95a266 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
index 23a28e0e408..0f2b2147503 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
index 74d99a03410..dd4026c3f1d 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
index d1cf7598254..2613426bdce 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index fd48cfbe774..3af4d065e41 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
index 226eff6239f..8211d45402c 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
index d8b7d8aff2e..3b8cf58b5ed 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
index 78e7fc8ec37..6549e7a1a18 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
index bd99b180046..beb5e8ad004 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
index 61362a1185b..cefaae04021 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
index 43b40be4864..65ceada6de5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
index e4987690002..537983c812f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
index 72cc5089cbe..c5fe8c454af 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
index 24516751f40..1df4f1e9d15 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
index b518bc63ecc..c4186a9b8e7 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
index 06970f3e495..93806551c76 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
index d8e57ead937..d02d49e0972 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
index 1a1b0bb9c62..497247ea216 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
index 4b434b5f7dd..d7ce75fc2e4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
index 24516751f40..1df4f1e9d15 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
index b518bc63ecc..c4186a9b8e7 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
index 06970f3e495..93806551c76 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
index d8e57ead937..d02d49e0972 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
index 1a1b0bb9c62..497247ea216 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
index 4b434b5f7dd..d7ce75fc2e4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
index e6d091009eb..7097a7fd468 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
index df97c737026..71b56102692 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
index 78e7fc8ec37..6549e7a1a18 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
index 43b40be4864..65ceada6de5 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
index e4987690002..537983c812f 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
index 72cc5089cbe..c5fe8c454af 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U
index efd12704820..360c554fe8e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org
index a21ae5c855f..4c1f958e8b0 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org
index 427d8c26c16..29b3ad1dd7b 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
index c76e0e94bcf..acbeff0f775 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U
index 97acd94621f..91ef2164cb2 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org
index 4772b35127a..3ef23b09de4 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org
index e0e94930821..c5897539abc 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
index 2ea938f2068..e87a9075ef0 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/U b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/U
index 898782da0f2..1d8d21b809d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/U
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1 b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1
index d4b188f0254..3dd23ca8542 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1.org
index d4b188f0254..3dd23ca8542 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
index a07be1723a3..f92d8da369a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/alpha1.org
index d4b188f0254..3dd23ca8542 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
index a07be1723a3..f92d8da369a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
index df92de808db..d3bc3b6f5a2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p
index b5127205565..7beceea5a60 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
index 083baf725a1..2ccb8389ba4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
index 611466bb780..548ad0064e7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
index 7fdf7ca03a2..2d9e6e21d30 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
index cc537fd8a34..fbc6ab7a177 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
index 1411e6ce4a7..2203f7e5d0d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
index cc5521b16f5..ebc41278261 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
index 70aa130dc86..0341c304769 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
index 63a339f2b9a..3fb3c4a7d4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
index cc537fd8a34..fbc6ab7a177 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
index 1411e6ce4a7..2203f7e5d0d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
index cc5521b16f5..ebc41278261 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
index 70aa130dc86..0341c304769 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
index 63a339f2b9a..3fb3c4a7d4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
index a1abb4874af..cef053f0557 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
index fbbc61ac18a..a9e92e77c4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
index dd16aa2b670..e1b9c008e5a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
index 49a0cf9faec..348445a1078 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
index 4060d827218..f16c37b1b9d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
index a1abb4874af..cef053f0557 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
index fbbc61ac18a..a9e92e77c4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
index dd16aa2b670..e1b9c008e5a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
index 49a0cf9faec..348445a1078 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
index 4060d827218..f16c37b1b9d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
index a1abb4874af..cef053f0557 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
index fbbc61ac18a..a9e92e77c4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
index dd16aa2b670..e1b9c008e5a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
index 49a0cf9faec..348445a1078 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
index 4060d827218..f16c37b1b9d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
index a1abb4874af..cef053f0557 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
index fbbc61ac18a..a9e92e77c4c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p
index dd16aa2b670..e1b9c008e5a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict
index ed9075c3ac5..e807f388d3e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/alpha1.org b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/alpha1.org
index b8cc18736b9..6d51bd063a7 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/p b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/p
index db463ab1bee..4ea08586b90 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/MRFZones
index 0ef40d2fc80..2ed99cbdc2a 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/MRFZones
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index 552afa40de3..7081624ee25 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index 5175a417653..1b90bac98f8 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
index 26852141c21..a916058a370 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1 b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1
index b7b66879d3d..0f40f11f194 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
index b7b66879d3d..0f40f11f194 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
index b77bfe91183..57caa25d462 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
index a2553926d29..46ba31da890 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B
index ac37c4d02d2..d569e87ce23 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
index 2fbf889b498..481c06a662f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
index 555614b8295..add26afe4ba 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
index d79a980fe35..15b10ced508 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
index 22a1a3ccae5..93359824435 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
index eaf7f5fc914..204cfbb358d 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p
index 0785a10958c..a7a3b919fd2 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
index 3da20b0cea9..771303be571 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
index ddc972e63dd..a30c09779c8 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
index ddc972e63dd..a30c09779c8 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
index c48d7b02969..b7dded56b09 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
index c48d7b02969..b7dded56b09 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda b/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
index d0e5e2e1c74..7727e252532 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p b/tutorials/multiphase/interFoam/ras/damBreak/0/p
index b77bfe91183..57caa25d462 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
index a2553926d29..46ba31da890 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
index 26852141c21..a916058a370 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha1.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha1.org
index f0bdefa8cdd..18e74caf803 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha1.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha1.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha2.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha2.org
index 122e71daced..042ba2a84a3 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha2.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha2.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha3.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha3.org
index f3d69ec0826..aec86a3f98f 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha3.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha3.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p
index b77bfe91183..57caa25d462 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
index a2553926d29..46ba31da890 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
index 6f307153531..3eb31bf607d 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index 6262dc6bdea..d3b6f996b4f 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index fc9f400f23e..ae81912fbcf 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index 169c2b903b9..dc1aeecc04b 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 9e2f08ee67c..2760a6814db 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
index 99656a7c348..95fe4a50d1c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
index 7dace65475a..1d7db61ae0f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
index 93894106324..eb770a8d943 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
index 606e71d5b6e..c97aec687b5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
index 05a6fc2edb3..fb4b3a2c334 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
index b77bfe91183..57caa25d462 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
index a2553926d29..46ba31da890 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U
index 99656a7c348..95fe4a50d1c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaair
index 4441a5df028..83693b7b8e8 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaair
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaair
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphamercury
index 9f2ae07b73c..171627ee36f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphamercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphamercury
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaoil
index 0caca07b5fd..3ba2034d4a2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaoil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphaoil
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphawater
index 500a8c8e7b0..9b6fd853386 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphawater
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphawater
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
index b77bfe91183..57caa25d462 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
index 2133317874d..9bf44fd6f66 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/U b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
index a0a0043af1b..097104af65f 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
index ca6b9f8f7a0..071ae37fd7a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
index 27b4ba3c1fe..45dd8a22792 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/k b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
index 6bd1a6b4164..c4746372dd4 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/pmh b/tutorials/multiphase/settlingFoam/ras/dahl/0/pmh
index a2a965130f5..ffffdae8050 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/pmh
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/pmh
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
index 28b3bb25fea..d4e6e63e58d 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
index bac98acc6cf..2225c01c349 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
index 18e136580a9..cfdaca1e1ee 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
index 634512f9512..05ba38c6462 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
index 5bc3ea2d511..d41ccc00f1e 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/pmh b/tutorials/multiphase/settlingFoam/ras/tank3D/0/pmh
index fafd5b9bb17..b6d7779938e 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/pmh
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/pmh
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
index 5d48248b2e6..931b4164387 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
index 6ba52b9f30f..9dc4815fc91 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
index 6ee0d6d1bc0..8cddab864b8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
index a34a308197a..52e464a1ddb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
index 3ad8dd0aa24..bc06977aed1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
index 55f4ac67865..c143a8d4918 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
index 48e7b295ae5..4d63bf283ef 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 2028ac422a7..48de7326de1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
index 46813128f98..b53f8402827 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
index 3a01b0c106b..2ddeacd7185 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
index 1826401e4e0..10968909fed 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
index 7914675720f..47c04d80f67 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
index 55975fe34db..e156448740e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
index c29b1859e83..8e2ed5e8609 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
index 9a8dbe0f01f..cf6be6bb426 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
index 658b9abcc3b..f52ff703e02 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
index 8188166eff3..196f5c7f97d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
index b177c93a4ba..700d77bb8d5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
index 7c7c20286a6..6034d0c751f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
index 858e81fca7c..0d22e95a266 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
index 23a28e0e408..0f2b2147503 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
index 74d99a03410..dd4026c3f1d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
index d1cf7598254..2613426bdce 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index fd48cfbe774..3af4d065e41 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
index 226eff6239f..8211d45402c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
index 0b4e256c715..918606efcab 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
index 8abec760d6f..e31bae514f2 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
index 76c0da85fc3..acc15964b32 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
index 5e3af9404b4..e04a2bbc2b4 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
index c1c8677397a..bd9e60862e8 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
index 633de6a4063..6ce7fc85b2b 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
--
GitLab
From fed2e54dfa10149869a70ca79086f24fb7e7a06a Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 24 May 2010 13:50:24 +0100
Subject: [PATCH 19/77] ENH: collisionRecord IO.
---
.../KinematicParcel/KinematicParcel.H | 12 +++--
.../KinematicParcel/KinematicParcelI.H | 4 +-
.../KinematicParcel/KinematicParcelIO.C | 46 ++++++++++++++++++-
.../defineBasicKinematicParcel.C | 9 ++++
4 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 9b8691c534f..ecca55d056a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -33,7 +33,7 @@ Description
- drag
- turbulent dispersion
- wall interactions
- - many-body collisions
+ - many-body collisions, including memory of data from previous collision
SourceFiles
KinematicParcelI.H
@@ -59,6 +59,9 @@ SourceFiles
namespace Foam
{
+typedef CollisionRecordList<vector, vector> collisionRecordList;
+typedef IOList<collisionRecordList> collisionRecordIOList;
+
template<class ParcelType>
class KinematicParcel;
@@ -268,7 +271,7 @@ protected:
vector UTurb_;
//- Particle collision records
- CollisionRecordList<vector, vector> collisionRecords_;
+ collisionRecordList collisionRecords_;
// Cell-based quantities
@@ -400,8 +403,7 @@ public:
inline const vector& UTurb() const;
//- Return const access to the collision records
- inline const CollisionRecordList<vector, vector>&
- collisionRecords() const;
+ inline const collisionRecordList& collisionRecords() const;
// Edit
@@ -440,7 +442,7 @@ public:
inline vector& UTurb();
//- Return access to collision records
- inline CollisionRecordList<vector, vector>& collisionRecords();
+ inline collisionRecordList& collisionRecords();
// Helper functions
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index e551c38b9e5..1a274b258b1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -348,7 +348,7 @@ inline bool& Foam::KinematicParcel<ParcelType>::active()
template <class ParcelType>
-inline const Foam::CollisionRecordList<Foam::vector, Foam::vector>&
+inline const Foam::collisionRecordList&
Foam::KinematicParcel<ParcelType>::collisionRecords() const
{
return collisionRecords_;
@@ -426,7 +426,7 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
template <class ParcelType>
-inline Foam::CollisionRecordList<Foam::vector, Foam::vector>&
+inline Foam::collisionRecordList&
Foam::KinematicParcel<ParcelType>::collisionRecords()
{
return collisionRecords_;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 6220aade2a2..becbc5a3bc4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -43,7 +43,8 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+ " (torquex torquey torquez)"
+ " rho"
+ " tTurb"
- + " (UTurbx UTurby UTurbz)";
+ + " (UTurbx UTurby UTurbz)"
+ + " pairCollisions wallCollisions";
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -167,6 +168,31 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
c.checkFieldIOobject(c, UTurb);
+ collisionRecordIOList collisionRecords
+ (
+ IOobject
+ (
+ "collisionRecords",
+ c.time().timeName(),
+ c,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ )
+ );
+
+ if (collisionRecords.size() != c.size())
+ {
+ FatalErrorIn
+ (
+ "void Foam::KinematicParcel<ParcelType>::readFields"
+ "(Cloud<ParcelType>& c)"
+ ) << "Size of " << collisionRecords.name()
+ << " field " << collisionRecords.size()
+ << " does not match the number of particles " << c.size()
+ << abort(FatalError);
+ }
+
label i = 0;
forAllIter(typename Cloud<ParcelType>, c, iter)
{
@@ -182,6 +208,7 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
p.rho_ = rho[i];
p.tTurb_ = tTurb[i];
p.UTurb_ = UTurb[i];
+ p.collisionRecords_ = collisionRecords[i];
i++;
}
}
@@ -213,7 +240,22 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
+ collisionRecordIOList collisionRecords
+ (
+ IOobject
+ (
+ "collisionRecords",
+ c.time().timeName(),
+ c,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ np
+ );
+
label i = 0;
+
forAllConstIter(typename Cloud<ParcelType>, c, iter)
{
const KinematicParcel<ParcelType>& p = iter();
@@ -229,6 +271,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
rho[i] = p.rho();
tTurb[i] = p.tTurb();
UTurb[i] = p.UTurb();
+ collisionRecords[i] = p.collisionRecords();
i++;
}
@@ -243,6 +286,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
rho.write();
tTurb.write();
UTurb.write();
+ collisionRecords.write();
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 7e713921dab..5ae80dddaa2 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -25,14 +25,23 @@ License
#include "basicKinematicParcel.H"
#include "KinematicCloud.H"
+#include "KinematicParcel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+
defineTemplateTypeNameAndDebug(Cloud<basicKinematicParcel>, 0);
defineParcelTypeNameAndDebug(KinematicCloud<basicKinematicParcel>, 0);
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ collisionRecordIOList,
+ "collisionRecordList",
+ 0
+ );
};
--
GitLab
From d7cade2b6b14c60421f7bc3327ca937faf4c179b Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 24 May 2010 18:12:12 +0100
Subject: [PATCH 20/77] ENH. Removing cbrt - very expensive - this will need
to be switchable or in a different model.
---
.../WallCollisionRecord/WallCollisionRecord.H | 2 +-
.../basicKinematicParcel/defineBasicKinematicParcel.C | 1 -
.../PairSpringSliderDashpot/PairSpringSliderDashpot.C | 9 ++++++---
.../WallSpringSliderDashpot/WallSpringSliderDashpot.C | 6 ++++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
index 33f021fc7c5..96d605dd4ad 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -82,7 +82,7 @@ class WallCollisionRecord
// //- Recording whether or not this record has been accessed
bool accessed_;
- //- The position of wall impact relative to the cell centre
+ //- The position of wall impact relative to the particle centre
vector pRel_;
//- Collision data, stored as if the storing particle was the
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 5ae80dddaa2..37c71946b3c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -31,7 +31,6 @@ License
namespace Foam
{
-
defineTemplateTypeNameAndDebug(Cloud<basicKinematicParcel>, 0);
defineParcelTypeNameAndDebug(KinematicCloud<basicKinematicParcel>, 0);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index 54bf3ab659e..7216ad09142 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -45,7 +45,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
// Finding minimum diameter to avoid excessive arithmetic
- scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+ scalar dEff = p.d();
+ // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
RMin = min(dEff, RMin);
@@ -158,9 +159,11 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
{
vector r_AB = (pA.position() - pB.position());
- scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_);
+ //scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_);
+ scalar dAEff = pA.d();
- scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_);
+ // scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_);
+ scalar dBEff = pB.d();
scalar normalOverlapMag = 0.5*(dAEff + dBEff) - mag(r_AB);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index 4bf524e387c..b2e05f1ab5d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -45,7 +45,8 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
// Finding minimum diameter to avoid excessive arithmetic
- scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+ scalar dEff = p.d();
+ // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
rMin = min(dEff, rMin);
@@ -181,7 +182,8 @@ Foam::scalar Foam::WallSpringSliderDashpot<CloudType>::pREff
const typename CloudType::parcelType& p
) const
{
- return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
+ // return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
+ return p.d()/2;
}
template<class CloudType>
--
GitLab
From bcdc6291ca12ca11dc62e4f8db411bee9eac8a23 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 25 May 2010 11:53:52 +0100
Subject: [PATCH 21/77] ENH. Making equivalent size collisions switchable.
---
.../PairSpringSliderDashpot.C | 26 ++++++++++++++---
.../PairSpringSliderDashpot.H | 4 +++
.../WallSpringSliderDashpot.C | 28 +++++++++++++++----
.../WallSpringSliderDashpot.H | 4 +++
4 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index 7216ad09142..ad3f95ad497 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -46,7 +46,11 @@ void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
// Finding minimum diameter to avoid excessive arithmetic
scalar dEff = p.d();
- // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+
+ if (useEquivalentSize_)
+ {
+ dEff *= cbrt(p.nParticle()*volumeFactor_);
+ }
RMin = min(dEff, RMin);
@@ -95,8 +99,14 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
this->coeffDict().lookup("collisionResolutionSteps")
)
),
- volumeFactor_(this->dict().lookupOrDefault("volumeFactor", 1.0))
+ volumeFactor_(1.0),
+ useEquivalentSize_(Switch(this->dict().lookup("useEquivalentSize")))
{
+ if (useEquivalentSize_)
+ {
+ volumeFactor_ = readScalar(this->dict().lookup("volumeFactor"));
+ }
+
scalar nu = this->owner().constProps().poissonsRatio();
scalar E = this->owner().constProps().youngsModulus();
@@ -159,12 +169,20 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
{
vector r_AB = (pA.position() - pB.position());
- //scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_);
scalar dAEff = pA.d();
- // scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_);
+ if (useEquivalentSize_)
+ {
+ dAEff *= cbrt(pA.nParticle()*volumeFactor_);
+ }
+
scalar dBEff = pB.d();
+ if (useEquivalentSize_)
+ {
+ dBEff *= cbrt(pB.nParticle()*volumeFactor_);
+ }
+
scalar normalOverlapMag = 0.5*(dAEff + dBEff) - mag(r_AB);
if (normalOverlapMag > 0)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index 58cd3850127..a8982b57eb9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -92,6 +92,10 @@ class PairSpringSliderDashpot
// factor
scalar volumeFactor_;
+ //- Switch to control use of equivalent size particles. Used
+ // because cbrt calculation is very expensive.
+ bool useEquivalentSize_;
+
// Private Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index b2e05f1ab5d..b4b8262cbff 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -46,7 +46,11 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
// Finding minimum diameter to avoid excessive arithmetic
scalar dEff = p.d();
- // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+
+ if (useEquivalentSize_)
+ {
+ dEff *= cbrt(p.nParticle()*volumeFactor_);
+ }
rMin = min(dEff, rMin);
@@ -65,6 +69,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
rMin /= 2.0;
}
+
template <class CloudType>
void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
(
@@ -163,8 +168,14 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
this->coeffDict().lookup("collisionResolutionSteps")
)
),
- volumeFactor_(this->dict().lookupOrDefault("volumeFactor", 1.0))
-{}
+ volumeFactor_(1.0),
+ useEquivalentSize_(Switch(this->dict().lookup("useEquivalentSize")))
+{
+ if (useEquivalentSize_)
+ {
+ volumeFactor_ = readScalar(this->dict().lookup("volumeFactor"));
+ }
+}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
@@ -182,10 +193,17 @@ Foam::scalar Foam::WallSpringSliderDashpot<CloudType>::pREff
const typename CloudType::parcelType& p
) const
{
- // return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
- return p.d()/2;
+ if (useEquivalentSize_)
+ {
+ return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
+ }
+ else
+ {
+ return p.d()/2;
+ }
}
+
template<class CloudType>
bool Foam::WallSpringSliderDashpot<CloudType>::controlsTimestep() const
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index 2aefa7d7e7d..2c0d7461d95 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -87,6 +87,10 @@ class WallSpringSliderDashpot
// factor
scalar volumeFactor_;
+ //- Switch to control use of equivalent size particles. Used
+ // because the calculation can be very expensive.
+ bool useEquivalentSize_;
+
// Private Member Functions
--
GitLab
From f4fd4c00dc807947f59c13d3bc55003e01df2f65 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 25 May 2010 19:46:58 +0100
Subject: [PATCH 22/77] ENH: Adding per-patch wall interaction.
Rearranged data storage in existing wall model. Improved stability.
---
.../WallCollisionRecordI.H | 2 +-
.../include/makeParcelCollisionModels.H | 8 +
.../makeReactingParcelCollisionModels.H | 10 +-
.../PairSpringSliderDashpot.C | 4 +-
.../PairSpringSliderDashpot.H | 5 +-
.../WallLocalSpringSliderDashpot.C | 354 ++++++++++++++++++
.../WallLocalSpringSliderDashpot.H | 184 +++++++++
.../WallModel/WallModel/WallModel.C | 8 +
.../WallModel/WallModel/WallModel.H | 3 +
.../WallSpringSliderDashpot.C | 66 ++--
.../WallSpringSliderDashpot.H | 14 +-
11 files changed, 604 insertions(+), 54 deletions(-)
create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
index 1a9a9feb0b9..42f5b4f4214 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -39,7 +39,7 @@ inline bool Foam::WallCollisionRecord<Type>::match
// Using the new data as the acceptance criterion
scalar cosAcceptanceAngle = magpRel/radius;
- if (cosAcceptanceAngle > 1.0)
+ if (cosAcceptanceAngle > 1.0 + SMALL)
{
Info<< "pRel_ " << pRel_ << " " << magpRel_ << nl
<< "pRel " << pRel << " " << magpRel << nl
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
index 98ef4bfbe5a..0c84d934bde 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -36,6 +36,7 @@ License
#include "PairSpringSliderDashpot.H"
#include "WallSpringSliderDashpot.H"
+#include "WallLocalSpringSliderDashpot.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -73,6 +74,13 @@ License
WallSpringSliderDashpot, \
KinematicCloud, \
ParcelType \
+ ); \
+ \
+ makeWallModelType \
+ ( \
+ WallLocalSpringSliderDashpot, \
+ KinematicCloud, \
+ ParcelType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
index f1bd4af8a1c..289615125fd 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
@@ -37,6 +37,7 @@ License
#include "PairSpringSliderDashpot.H"
#include "WallSpringSliderDashpot.H"
+#include "WallLocalSpringSliderDashpot.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -99,9 +100,16 @@ License
KinematicCloud, \
ParcelType, \
ThermoType \
+ ); \
+ \
+ makeWallModelThermoType \
+ ( \
+ WallLocalSpringSliderDashpot, \
+ KinematicCloud, \
+ ParcelType, \
+ ThermoType \
);
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index ad3f95ad497..fb732aa19d1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -100,11 +100,11 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
)
),
volumeFactor_(1.0),
- useEquivalentSize_(Switch(this->dict().lookup("useEquivalentSize")))
+ useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
{
if (useEquivalentSize_)
{
- volumeFactor_ = readScalar(this->dict().lookup("volumeFactor"));
+ volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
}
scalar nu = this->owner().constProps().poissonsRatio();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index a8982b57eb9..9fba1b35e7e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -58,9 +58,6 @@ class PairSpringSliderDashpot
// the same Poisson's ratio and Young's modulus
scalar Gstar_;
- //- Poisson's ratio of both particles
- scalar sigma_;
-
//- alpha-coefficient, related to coefficient of restitution
scalar alpha_;
@@ -93,7 +90,7 @@ class PairSpringSliderDashpot
scalar volumeFactor_;
//- Switch to control use of equivalent size particles. Used
- // because cbrt calculation is very expensive.
+ // because the calculation can be very expensive.
bool useEquivalentSize_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
new file mode 100644
index 00000000000..996c35801d9
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
@@ -0,0 +1,354 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "WallLocalSpringSliderDashpot.H"
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::WallLocalSpringSliderDashpot<CloudType>::findMinMaxProperties
+(
+ scalar& rMin,
+ scalar& rhoMax,
+ scalar& UMagMax
+) const
+{
+ rMin = VGREAT;
+ rhoMax = -VGREAT;
+ UMagMax = -VGREAT;
+
+ forAllConstIter(typename CloudType, this->owner(), iter)
+ {
+ const typename CloudType::parcelType& p = iter();
+
+ // Finding minimum diameter to avoid excessive arithmetic
+
+ scalar dEff = p.d();
+
+ if (useEquivalentSize_)
+ {
+ dEff *= cbrt(p.nParticle()*volumeFactor_);
+ }
+
+ rMin = min(dEff, rMin);
+
+ rhoMax = max(p.rho(), rhoMax);
+
+ UMagMax = max
+ (
+ mag(p.U()) + mag(p.omega())*dEff/2,
+ UMagMax
+ );
+ }
+
+ // Transform the minimum diameter into minimum radius
+ // rMin = dMin/2
+
+ rMin /= 2.0;
+}
+
+
+template <class CloudType>
+void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
+(
+ typename CloudType::parcelType& p,
+ const point& site,
+ const WallSiteData<vector>& data,
+ scalar pREff
+) const
+{
+ // wall patch index
+ label wPI = patchMap_[data.patchIndex()];
+
+ // data for this patch
+ scalar Estar = Estar_[wPI];
+ scalar Gstar = Gstar_[wPI];
+ scalar alpha = alpha_[wPI];
+ scalar b = b_[wPI];
+ scalar mu = mu_[wPI];
+
+ vector r_PW = p.position() - site;
+
+ vector U_PW = p.U() - data.wallData();
+
+ scalar normalOverlapMag = max(pREff - mag(r_PW), 0.0);
+
+ vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
+
+ scalar kN = (4.0/3.0)*sqrt(pREff)*Estar;
+
+ scalar etaN = alpha*sqrt(p.mass()*kN)*pow025(normalOverlapMag);
+
+ vector fN_PW =
+ rHat_PW
+ *(kN*pow(normalOverlapMag, b) - etaN*(U_PW & rHat_PW));
+
+ p.f() += fN_PW;
+
+ vector USlip_PW =
+ U_PW - (U_PW & rHat_PW)*rHat_PW
+ + (p.omega() ^ (pREff*-rHat_PW));
+
+ scalar deltaT = this->owner().mesh().time().deltaTValue();
+
+ vector& tangentialOverlap_PW =
+ p.collisionRecords().matchWallRecord(-r_PW, pREff).collisionData();
+
+ tangentialOverlap_PW += USlip_PW*deltaT;
+
+ scalar tangentialOverlapMag = mag(tangentialOverlap_PW);
+
+ if (tangentialOverlapMag > VSMALL)
+ {
+ scalar kT = 8.0*sqrt(pREff*normalOverlapMag)*Gstar;
+
+ scalar etaT = etaN;
+
+ // Tangential force
+ vector fT_PW;
+
+ if (kT*tangentialOverlapMag > mu*mag(fN_PW))
+ {
+ // Tangential force greater than sliding friction,
+ // particle slips
+
+ fT_PW = -mu*mag(fN_PW)*USlip_PW/mag(USlip_PW);
+
+ tangentialOverlap_PW = vector::zero;
+ }
+ else
+ {
+ fT_PW =
+ -kT*tangentialOverlapMag
+ *tangentialOverlap_PW/tangentialOverlapMag
+ - etaT*USlip_PW;
+ }
+
+ p.f() += fT_PW;
+
+ p.torque() += (pREff*-rHat_PW) ^ fT_PW;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
+(
+ const dictionary& dict,
+ CloudType& cloud
+)
+:
+ WallModel<CloudType>(dict, cloud, typeName),
+ Estar_(),
+ Gstar_(),
+ alpha_(),
+ b_(),
+ mu_(),
+ patchMap_(),
+ maxEstarIndex_(-1),
+ collisionResolutionSteps_
+ (
+ readScalar
+ (
+ this->coeffDict().lookup("collisionResolutionSteps")
+ )
+ ),
+ volumeFactor_(1.0),
+ useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
+{
+ if (useEquivalentSize_)
+ {
+ volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
+ }
+
+ scalar pNu = this->owner().constProps().poissonsRatio();
+
+ scalar pE = this->owner().constProps().youngsModulus();
+
+ const polyMesh& mesh = cloud.mesh();
+
+ const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
+
+ patchMap_.setSize(bMesh.size(), -1);
+
+ DynamicList<label> wallPatchIndices;
+
+ forAll(bMesh, patchI)
+ {
+ if (isA<wallPolyPatch>(bMesh[patchI]))
+ {
+ wallPatchIndices.append(bMesh[patchI].index());
+ }
+ }
+
+ label nWallPatches = wallPatchIndices.size();
+
+ Estar_.setSize(nWallPatches);
+ Gstar_.setSize(nWallPatches);
+ alpha_.setSize(nWallPatches);
+ b_.setSize(nWallPatches);
+ mu_.setSize(nWallPatches);
+
+ scalar maxEstar = -GREAT;
+
+ forAll(wallPatchIndices, wPI)
+ {
+ const dictionary& patchCoeffDict
+ (
+ this->coeffDict().subDict(bMesh[wallPatchIndices[wPI]].name())
+ );
+
+ patchMap_[wallPatchIndices[wPI]] = wPI;
+
+ scalar nu = dimensionedScalar
+ (
+ patchCoeffDict.lookup("poissonsRatio")
+ ).value();
+
+ scalar E = dimensionedScalar
+ (
+ patchCoeffDict.lookup("youngsModulus")
+ ).value();
+
+ Estar_[wPI] = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu))/E);
+
+ Gstar_[wPI] = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu - sqr(nu))/E));
+
+ alpha_[wPI] =
+ dimensionedScalar(patchCoeffDict.lookup("alpha")).value();
+
+ b_[wPI] = dimensionedScalar(patchCoeffDict.lookup("b")).value();
+
+ mu_[wPI] = dimensionedScalar(patchCoeffDict.lookup("mu")).value();
+
+ if (Estar_[wPI] > maxEstar)
+ {
+ maxEstarIndex_ = wPI;
+
+ maxEstar = Estar_[wPI];
+ }
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::WallLocalSpringSliderDashpot<CloudType>::~WallLocalSpringSliderDashpot()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::scalar Foam::WallLocalSpringSliderDashpot<CloudType>::pREff
+(
+ const typename CloudType::parcelType& p
+) const
+{
+ if (useEquivalentSize_)
+ {
+ return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
+ }
+ else
+ {
+ return p.d()/2;
+ }
+}
+
+
+template<class CloudType>
+bool Foam::WallLocalSpringSliderDashpot<CloudType>::controlsTimestep() const
+{
+ return true;
+}
+
+
+template<class CloudType>
+Foam::label Foam::WallLocalSpringSliderDashpot<CloudType>::nSubCycles() const
+{
+ if (!(this->owner().size()))
+ {
+ return 1;
+ }
+
+ scalar rMin;
+ scalar rhoMax;
+ scalar UMagMax;
+
+ findMinMaxProperties(rMin, rhoMax, UMagMax);
+
+ // Note: pi^(7/5)*(5/4)^(2/5) = 5.429675
+ scalar minCollisionDeltaT =
+ 5.429675
+ *rMin
+ *pow(rhoMax/(Estar_[maxEstarIndex_]*sqrt(UMagMax) + VSMALL), 0.4)
+ /collisionResolutionSteps_;
+
+ return ceil(this->owner().time().deltaTValue()/minCollisionDeltaT);
+}
+
+
+template<class CloudType>
+void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
+(
+ typename CloudType::parcelType& p,
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
+) const
+{
+ scalar pREff = this->pREff(p);
+
+ forAll(flatSitePoints, siteI)
+ {
+ evaluateWall
+ (
+ p,
+ flatSitePoints[siteI],
+ flatSiteData[siteI],
+ pREff
+ );
+ }
+
+ forAll(sharpSitePoints, siteI)
+ {
+ // Treating sharp sites like flat sites
+
+ evaluateWall
+ (
+ p,
+ sharpSitePoints[siteI],
+ sharpSiteData[siteI],
+ pREff
+ );
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
new file mode 100644
index 00000000000..4062c9928cb
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::WallLocalSpringSliderDashpot
+
+Description
+ Forces between particles and walls, interacting with a spring,
+ slider, damper model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef WallLocalSpringSliderDashpot_H
+#define WallLocalSpringSliderDashpot_H
+
+#include "WallModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+ Class WallLocalSpringSliderDashpot Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class WallLocalSpringSliderDashpot
+:
+ public WallModel<CloudType>
+{
+ // Private data
+
+ //- Effective Young's modulus value
+ scalarList Estar_;
+
+ //- Effective shear modulus value
+ scalarList Gstar_;
+
+ //- alpha-coefficient, related to coefficient of restitution
+ scalarList alpha_;
+
+ //- Spring power (b = 1 for linear, b = 3/2 for Hertzian)
+ scalarList b_;
+
+ //- Coefficient of friction in for tangential sliding
+ scalarList mu_;
+
+ //- Mapping the patch index to the model data
+ labelList patchMap_;
+
+ //- Index of the maximum value of Estar_
+ label maxEstarIndex_;
+
+ //- The number of steps over which to resolve the minimum
+ // harmonic approximation of the collision period
+ scalar collisionResolutionSteps_;
+
+ //- Volume factor for determining the equivalent size of a
+ // parcel where nParticles is not 1. The equivalent size of
+ // the parcel is
+ // parcelEquivVolume = volumeFactor*nParticles*p.volume()
+ // so
+ // parcelEquivD = cbrt(volumeFactor*nParticles)*p.d()
+ // + When volumeFactor = 1, the particles are compressed
+ // together so that the equivalent volume of the parcel is
+ // the sum of the constituent particles
+ // + When volumeFactor = 3*sqrt(2)/pi, the particles are
+ // close packed, but uncompressed.
+ // + When volumeFactor > 3*sqrt(2)/pi, the particles loosely
+ // grouped.
+ // 3*sqrt(2)/pi = 1.350474 is the volume factor for close
+ // packing, i.e pi/(3*sqrt(2)) is the maximum close packing
+ // factor
+ scalar volumeFactor_;
+
+ //- Switch to control use of equivalent size particles. Used
+ // because the calculation can be very expensive.
+ bool useEquivalentSize_;
+
+
+ // Private Member Functions
+
+ //- Find the appropriate properties for determining the minimum
+ //- allowable timestep
+ void findMinMaxProperties
+ (
+ scalar& rMin,
+ scalar& rhoMax,
+ scalar& vMagMax
+ ) const;
+
+ //- Calculate the wall interaction for a parcel at a given site
+ void evaluateWall
+ (
+ typename CloudType::parcelType& p,
+ const point& site,
+ const WallSiteData<vector>& data,
+ scalar pREff
+ ) const;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("WallLocalSpringSliderDashpot");
+
+
+ // Constructors
+
+ //- Construct from dictionary
+ WallLocalSpringSliderDashpot(const dictionary& dict, CloudType& cloud);
+
+
+ //- Destructor
+ virtual ~WallLocalSpringSliderDashpot();
+
+
+ // Member Functions
+
+ //- Return the volumeFactor
+ inline scalar volumeFactor() const
+ {
+ return volumeFactor_;
+ }
+
+ //- Return the effective radius for a particle for the model
+ virtual scalar pREff(const typename CloudType::parcelType& p) const;
+
+ //- Whether the WallModel has a timestep limit that will
+ // require subCycling
+ virtual bool controlsTimestep() const;
+
+ //- For WallModels that control the timestep, calculate the
+ // number of subCycles needed to satisfy the minimum
+ // allowable timestep
+ virtual label nSubCycles() const;
+
+ //- Calculate the wall interaction for a parcel
+ virtual void evaluateWall
+ (
+ typename CloudType::parcelType& p,
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
+ ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "WallLocalSpringSliderDashpot.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
index d8f1ffa84ee..d25cc29c6ab 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
@@ -58,6 +58,14 @@ Foam::WallModel<CloudType>::owner() const
}
+template<class CloudType>
+CloudType&
+Foam::WallModel<CloudType>::owner()
+{
+ return owner_;
+}
+
+
template<class CloudType>
const Foam::dictionary& Foam::WallModel<CloudType>::dict() const
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index 31fde4e2991..392825f8297 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -111,6 +111,9 @@ public:
//- Return the owner cloud object
const CloudType& owner() const;
+ //- Return non-const access to the owner cloud object
+ CloudType& owner();
+
//- Return the dictionary
const dictionary& dict() const;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index b4b8262cbff..a2cc666f15a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -76,19 +76,15 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
typename CloudType::parcelType& p,
const point& site,
const WallSiteData<vector>& data,
- scalar pNu,
- scalar pE,
scalar pREff,
- scalar Estar,
- scalar kN,
- scalar Gstar
+ scalar kN
) const
{
vector r_PW = p.position() - site;
vector U_PW = p.U() - data.wallData();
- scalar normalOverlapMag = pREff - mag(r_PW);
+ scalar normalOverlapMag = max(pREff - mag(r_PW), 0.0);
vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
@@ -115,7 +111,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
if (tangentialOverlapMag > VSMALL)
{
- scalar kT = 8.0*sqrt(pREff*normalOverlapMag)*Gstar;
+ scalar kT = 8.0*sqrt(pREff*normalOverlapMag)*Gstar_;
scalar etaT = etaN;
@@ -156,8 +152,8 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
)
:
WallModel<CloudType>(dict, cloud, typeName),
- E_(dimensionedScalar(this->coeffDict().lookup("youngsModulus")).value()),
- nu_(dimensionedScalar(this->coeffDict().lookup("poissonsRatio")).value()),
+ Estar_(),
+ Gstar_(),
alpha_(dimensionedScalar(this->coeffDict().lookup("alpha")).value()),
b_(dimensionedScalar(this->coeffDict().lookup("b")).value()),
mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value()),
@@ -169,12 +165,30 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
)
),
volumeFactor_(1.0),
- useEquivalentSize_(Switch(this->dict().lookup("useEquivalentSize")))
+ useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
{
if (useEquivalentSize_)
{
- volumeFactor_ = readScalar(this->dict().lookup("volumeFactor"));
+ volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
}
+
+ scalar nu = dimensionedScalar
+ (
+ this->coeffDict().lookup("poissonsRatio")
+ ).value();
+
+ scalar E = dimensionedScalar
+ (
+ this->coeffDict().lookup("youngsModulus")
+ ).value();
+
+ scalar pNu = this->owner().constProps().poissonsRatio();
+
+ scalar pE = this->owner().constProps().youngsModulus();
+
+ Estar_ = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu))/E);
+
+ Gstar_ = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu - sqr(nu))/E));
}
@@ -225,17 +239,11 @@ Foam::label Foam::WallSpringSliderDashpot<CloudType>::nSubCycles() const
findMinMaxProperties(rMin, rhoMax, UMagMax);
- scalar pNu = this->owner().constProps().poissonsRatio();
-
- scalar pE = this->owner().constProps().youngsModulus();
-
- scalar Estar = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu_))/E_);
-
// Note: pi^(7/5)*(5/4)^(2/5) = 5.429675
scalar minCollisionDeltaT =
5.429675
*rMin
- *pow(rhoMax/(Estar*sqrt(UMagMax) + VSMALL), 0.4)
+ *pow(rhoMax/(Estar_*sqrt(UMagMax) + VSMALL), 0.4)
/collisionResolutionSteps_;
return ceil(this->owner().time().deltaTValue()/minCollisionDeltaT);
@@ -252,17 +260,9 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
const List<WallSiteData<vector> >& sharpSiteData
) const
{
- scalar pNu = this->owner().constProps().poissonsRatio();
-
- scalar pE = this->owner().constProps().youngsModulus();
-
scalar pREff = this->pREff(p);
- scalar Estar = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu_))/E_);
-
- scalar kN = (4.0/3.0)*sqrt(pREff)*Estar;
-
- scalar GStar = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu_ - sqr(nu_))/E_));
+ scalar kN = (4.0/3.0)*sqrt(pREff)*Estar_;
forAll(flatSitePoints, siteI)
{
@@ -271,12 +271,8 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
p,
flatSitePoints[siteI],
flatSiteData[siteI],
- pNu,
- pE,
pREff,
- Estar,
- kN,
- GStar
+ kN
);
}
@@ -289,12 +285,8 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
p,
sharpSitePoints[siteI],
sharpSiteData[siteI],
- pNu,
- pE,
pREff,
- Estar,
- kN,
- GStar
+ kN
);
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index 2c0d7461d95..e11ac0127af 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -50,11 +50,11 @@ class WallSpringSliderDashpot
{
// Private data
- //- Young's modulus of the wall
- scalar E_;
+ //- Effective Young's modulus value
+ scalar Estar_;
- //- Poisson's ratio of the wall
- scalar nu_;
+ //- Effective shear modulus value
+ scalar Gstar_;
//- alpha-coefficient, related to coefficient of restitution
scalar alpha_;
@@ -109,12 +109,8 @@ class WallSpringSliderDashpot
typename CloudType::parcelType& p,
const point& site,
const WallSiteData<vector>& data,
- scalar pNu,
- scalar pE,
scalar pREff,
- scalar Estar,
- scalar kN,
- scalar Gstar
+ scalar kN
) const;
--
GitLab
From ef19832a783045426cf73a8a0bb6b7fa81504a05 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 26 May 2010 10:44:45 +0100
Subject: [PATCH 23/77] ENH. Looser tolerance on wall match error trigger.
---
.../WallCollisionRecord/WallCollisionRecord.C | 6 ++++++
.../WallCollisionRecord/WallCollisionRecord.H | 6 ++++++
.../WallCollisionRecord/WallCollisionRecordI.H | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
index d3141e660df..da116c4992c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -25,6 +25,12 @@ License
#include "WallCollisionRecord.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type>
+const Foam::scalar Foam::WallCollisionRecord<Type>::errorCosAngle(1.0 + 1e-6);
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
index 96d605dd4ad..f70d2045b66 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -92,6 +92,12 @@ class WallCollisionRecord
public:
+ // Static data members
+
+ //- Tolerance for detecting seriously erroneous wall matches
+ static const scalar errorCosAngle;
+
+
// Constructors
//- Construct null
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
index 42f5b4f4214..afb855cb334 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -39,7 +39,7 @@ inline bool Foam::WallCollisionRecord<Type>::match
// Using the new data as the acceptance criterion
scalar cosAcceptanceAngle = magpRel/radius;
- if (cosAcceptanceAngle > 1.0 + SMALL)
+ if (cosAcceptanceAngle > errorCosAngle)
{
Info<< "pRel_ " << pRel_ << " " << magpRel_ << nl
<< "pRel " << pRel << " " << magpRel << nl
--
GitLab
From 0f7a124152260882988ace170ba5d7c37bba3c47 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 27 May 2010 19:10:55 +0100
Subject: [PATCH 24/77] ENH. Adding more IOFieldFields, using them in
decomposePar and reconstructPar to decompose and reconstruct lagrangian
FieldField data.
---
.../decomposePar/decomposePar.C | 58 ++++++++
.../decomposePar/lagrangianFieldDecomposer.H | 29 ++++
...lagrangianFieldDecomposerDecomposeFields.C | 98 ++++++++++++++
.../reconstructPar/reconstructPar.C | 21 +++
src/OpenFOAM/Make/files | 5 +
.../diagTensorField/diagTensorFieldIOField.C | 50 +++++++
.../diagTensorField/diagTensorFieldIOField.H | 51 +++++++
.../sphericalTensorFieldIOField.C | 50 +++++++
.../sphericalTensorFieldIOField.H | 53 ++++++++
.../sphericalTensorIOField.C | 7 +-
.../symmTensorField/symmTensorFieldIOField.C | 50 +++++++
.../symmTensorField/symmTensorFieldIOField.H | 51 +++++++
.../Fields/tensorField/tensorFieldIOField.C | 50 +++++++
.../Fields/tensorField/tensorFieldIOField.H | 51 +++++++
.../vector2DField/vector2DFieldIOField.C | 50 +++++++
.../vector2DField/vector2DFieldIOField.H | 51 +++++++
.../Fields/vector2DField/vector2DIOField.C | 7 +-
.../CollisionRecordList/CollisionRecordList.C | 15 +++
.../CollisionRecordList/CollisionRecordList.H | 15 +++
.../CollisionRecordListI.H | 49 +++++++
.../PairCollisionRecord/PairCollisionRecord.H | 2 +-
.../KinematicParcel/KinematicParcel.H | 4 +
.../KinematicParcel/KinematicParcelIO.C | 23 +++-
.../reconstruct/reconstructLagrangian.H | 21 +++
.../reconstruct/reconstructLagrangianFields.C | 125 ++++++++++++++++++
25 files changed, 982 insertions(+), 4 deletions(-)
create mode 100644 src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.C
create mode 100644 src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
create mode 100644 src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.C
create mode 100644 src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
create mode 100644 src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.C
create mode 100644 src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
create mode 100644 src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.C
create mode 100644 src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
create mode 100644 src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.C
create mode 100644 src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
create mode 100644 src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index b50db4a76cc..3457c142bb8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -64,8 +64,11 @@ Usage
#include "IOobjectList.H"
#include "domainDecomposition.H"
#include "labelIOField.H"
+#include "labelFieldIOField.H"
#include "scalarIOField.H"
+#include "scalarFieldIOField.H"
#include "vectorIOField.H"
+#include "vectorFieldIOField.H"
#include "sphericalTensorIOField.H"
#include "symmTensorIOField.H"
#include "tensorIOField.H"
@@ -374,8 +377,20 @@ int main(int argc, char *argv[])
PtrList< List<SLList<indexedParticle*>*> > cellParticles(cloudDirs.size());
PtrList<PtrList<labelIOField> > lagrangianLabelFields(cloudDirs.size());
+ PtrList<PtrList<labelIOFieldField> > lagrangianLabelFieldFields
+ (
+ cloudDirs.size()
+ );
PtrList<PtrList<scalarIOField> > lagrangianScalarFields(cloudDirs.size());
+ PtrList<PtrList<scalarIOFieldField> > lagrangianScalarFieldFields
+ (
+ cloudDirs.size()
+ );
PtrList<PtrList<vectorIOField> > lagrangianVectorFields(cloudDirs.size());
+ PtrList<PtrList<vectorIOFieldField> > lagrangianVectorFieldFields
+ (
+ cloudDirs.size()
+ );
PtrList<PtrList<sphericalTensorIOField> > lagrangianSphericalTensorFields
(
cloudDirs.size()
@@ -487,6 +502,13 @@ int main(int argc, char *argv[])
lagrangianLabelFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianLabelFieldFields
+ );
+
lagrangianFieldDecomposer::readFields
(
cloudI,
@@ -494,6 +516,14 @@ int main(int argc, char *argv[])
lagrangianScalarFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianScalarFieldFields
+ );
+
+
lagrangianFieldDecomposer::readFields
(
cloudI,
@@ -501,6 +531,13 @@ int main(int argc, char *argv[])
lagrangianVectorFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianVectorFieldFields
+ );
+
lagrangianFieldDecomposer::readFields
(
cloudI,
@@ -529,8 +566,11 @@ int main(int argc, char *argv[])
lagrangianPositions.setSize(cloudI);
cellParticles.setSize(cloudI);
lagrangianLabelFields.setSize(cloudI);
+ lagrangianLabelFieldFields.setSize(cloudI);
lagrangianScalarFields.setSize(cloudI);
+ lagrangianScalarFieldFields.setSize(cloudI);
lagrangianVectorFields.setSize(cloudI);
+ lagrangianVectorFieldFields.setSize(cloudI);
lagrangianSphericalTensorFields.setSize(cloudI);
lagrangianSymmTensorFields.setSize(cloudI);
lagrangianTensorFields.setSize(cloudI);
@@ -725,8 +765,11 @@ int main(int argc, char *argv[])
if
(
lagrangianLabelFields[cloudI].size()
+ || lagrangianLabelFieldFields[cloudI].size()
|| lagrangianScalarFields[cloudI].size()
+ || lagrangianScalarFieldFields[cloudI].size()
|| lagrangianVectorFields[cloudI].size()
+ || lagrangianVectorFieldFields[cloudI].size()
|| lagrangianSphericalTensorFields[cloudI].size()
|| lagrangianSymmTensorFields[cloudI].size()
|| lagrangianTensorFields[cloudI].size()
@@ -737,16 +780,31 @@ int main(int argc, char *argv[])
cloudDirs[cloudI],
lagrangianLabelFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianLabelFieldFields[cloudI]
+ );
fieldDecomposer.decomposeFields
(
cloudDirs[cloudI],
lagrangianScalarFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianScalarFieldFields[cloudI]
+ );
fieldDecomposer.decomposeFields
(
cloudDirs[cloudI],
lagrangianVectorFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianVectorFieldFields[cloudI]
+ );
fieldDecomposer.decomposeFields
(
cloudDirs[cloudI],
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
index 52b2c235031..43d2b1645c0 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
@@ -37,6 +37,7 @@ SourceFiles
#define lagrangianFieldDecomposer_H
#include "Cloud.H"
+#include "IOFieldField.H"
#include "indexedParticle.H"
#include "passiveParticle.H"
@@ -102,6 +103,19 @@ public:
// PtrList<IOField<Type> >& lagrangianFields
);
+ template<class Type>
+ static void readFieldFields
+ (
+ const label cloudI,
+ const IOobjectList& lagrangianObjects,
+ PtrList
+ <
+ PtrList<IOFieldField<Field<Type>, Type> >
+ >& lagrangianFields
+// PtrList<IOFieldField<Field<Type>, Type > >& lagrangianFields
+ );
+
+
//- Decompose volume field
template<class Type>
tmp<IOField<Type> > decomposeField
@@ -110,12 +124,27 @@ public:
const IOField<Type>& field
) const;
+ template<class Type>
+ tmp<IOFieldField<Field<Type>, Type> > decomposeFieldField
+ (
+ const word& cloudName,
+ const IOFieldField<Field<Type>, Type>& field
+ ) const;
+
+
template<class GeoField>
void decomposeFields
(
const word& cloudName,
const PtrList<GeoField>& fields
) const;
+
+ template<class GeoField>
+ void decomposeFieldFields
+ (
+ const word& cloudName,
+ const PtrList<GeoField>& fields
+ ) const;
};
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
index 172be9c3c02..e479057d7c7 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
@@ -63,6 +63,56 @@ void Foam::lagrangianFieldDecomposer::readFields
}
+template<class Type>
+void Foam::lagrangianFieldDecomposer::readFieldFields
+(
+ const label cloudI,
+ const IOobjectList& lagrangianObjects,
+ PtrList<PtrList<IOFieldField<Field<Type>, Type> > >& lagrangianFields
+)
+{
+ // Search list of objects for lagrangian fields
+ IOobjectList lagrangianTypeObjectsA
+ (
+ lagrangianObjects.lookupClass(IOField<Field<Type> >::typeName)
+ );
+
+ IOobjectList lagrangianTypeObjectsB
+ (
+ lagrangianObjects.lookupClass(IOFieldField<Field<Type>, Type>::typeName)
+ );
+
+ lagrangianFields.set
+ (
+ cloudI,
+ new PtrList<IOFieldField<Field<Type>, Type> >
+ (
+ lagrangianTypeObjectsA.size() + lagrangianTypeObjectsB.size()
+ )
+ );
+
+ label lagrangianFieldi=0;
+
+ forAllIter(IOobjectList, lagrangianTypeObjectsA, iter)
+ {
+ lagrangianFields[cloudI].set
+ (
+ lagrangianFieldi++,
+ new IOFieldField<Field<Type>, Type>(*iter())
+ );
+ }
+
+ forAllIter(IOobjectList, lagrangianTypeObjectsB, iter)
+ {
+ lagrangianFields[cloudI].set
+ (
+ lagrangianFieldi++,
+ new IOFieldField<Field<Type>, Type>(*iter())
+ );
+ }
+}
+
+
template<class Type>
Foam::tmp<Foam::IOField<Type> >
Foam::lagrangianFieldDecomposer::decomposeField
@@ -94,6 +144,37 @@ Foam::lagrangianFieldDecomposer::decomposeField
}
+template<class Type>
+Foam::tmp<Foam::IOFieldField<Foam::Field<Type>, Type> >
+Foam::lagrangianFieldDecomposer::decomposeFieldField
+(
+ const word& cloudName,
+ const IOFieldField<Field<Type>, Type>& field
+) const
+{
+ // Create and map the internal field values
+ Field<Field<Type> > procField(field, particleIndices_);
+
+ // Create the field for the processor
+ return tmp<IOFieldField<Field<Type>, Type> >
+ (
+ new IOFieldField<Field<Type>, Type>
+ (
+ IOobject
+ (
+ field.name(),
+ procMesh_.time().timeName(),
+ cloud::prefix/cloudName,
+ procMesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ procField
+ )
+ );
+}
+
+
template<class GeoField>
void Foam::lagrangianFieldDecomposer::decomposeFields
(
@@ -111,4 +192,21 @@ void Foam::lagrangianFieldDecomposer::decomposeFields
}
+template<class GeoField>
+void Foam::lagrangianFieldDecomposer::decomposeFieldFields
+(
+ const word& cloudName,
+ const PtrList<GeoField>& fields
+) const
+{
+ if (particleIndices_.size())
+ {
+ forAll(fields, fieldI)
+ {
+ decomposeFieldField(cloudName, fields[fieldI])().write();
+ }
+ }
+}
+
+
// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 3a3b64b13bb..2566115cf81 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -402,6 +402,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<label>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
reconstructLagrangianFields<scalar>
(
cloudName,
@@ -409,6 +416,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<scalar>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
reconstructLagrangianFields<vector>
(
cloudName,
@@ -416,6 +430,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<vector>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
reconstructLagrangianFields<sphericalTensor>
(
cloudName,
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 2ea9004636a..9560986fbdf 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -497,10 +497,15 @@ $(Fields)/scalarField/scalarFieldIOField.C
$(Fields)/vectorField/vectorIOField.C
$(Fields)/vectorField/vectorFieldIOField.C
$(Fields)/vector2DField/vector2DIOField.C
+$(Fields)/vector2DField/vector2DFieldIOField.C
$(Fields)/sphericalTensorField/sphericalTensorIOField.C
+$(Fields)/sphericalTensorField/sphericalTensorFieldIOField.C
$(Fields)/diagTensorField/diagTensorIOField.C
+$(Fields)/diagTensorField/diagTensorFieldIOField.C
$(Fields)/symmTensorField/symmTensorIOField.C
+$(Fields)/symmTensorField/symmTensorFieldIOField.C
$(Fields)/tensorField/tensorIOField.C
+$(Fields)/tensorField/tensorFieldIOField.C
$(Fields)/transformField/transformField.C
pointPatchFields = fields/pointPatchFields
diff --git a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.C b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.C
new file mode 100644
index 00000000000..71690e22ce0
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ diagTensorField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "diagTensorFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ diagTensorFieldIOField,
+ "diagTensorFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ diagTensorIOFieldField,
+ "diagTensorCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
new file mode 100644
index 00000000000..b116463c73c
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::diagTensorFieldIOField
+
+Description
+ diagTensorFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef diagTensorFieldIOField_H
+#define diagTensorFieldIOField_H
+
+#include "diagTensorField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<diagTensorField> diagTensorFieldIOField;
+ typedef IOFieldField<diagTensorField, diagTensor> diagTensorIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.C b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.C
new file mode 100644
index 00000000000..13506e0537e
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ sphericalTensorField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "sphericalTensorFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ sphericalTensorFieldIOField,
+ "sphericalTensorFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ sphericalTensorIOFieldField,
+ "sphericalTensorCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
new file mode 100644
index 00000000000..8ba5b47ad95
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::sphericalTensorFieldIOField
+
+Description
+ sphericalTensorFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sphericalTensorFieldIOField_H
+#define sphericalTensorFieldIOField_H
+
+#include "sphericalTensorField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<sphericalTensorField> sphericalTensorFieldIOField;
+
+ typedef IOFieldField<sphericalTensorField, sphericalTensor>
+ sphericalTensorIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.C b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.C
index fd0370a0a86..f3eca5026b9 100644
--- a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.C
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.C
@@ -32,7 +32,12 @@ Description
namespace Foam
{
- defineTemplateTypeNameAndDebugWithName(sphericalTensorIOField, "sphericalTensorField", 0);
+ defineTemplateTypeNameAndDebugWithName
+ (
+ sphericalTensorIOField,
+ "sphericalTensorField",
+ 0
+ );
}
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.C
new file mode 100644
index 00000000000..b19ed85f6d3
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ symmTensorField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "symmTensorFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ symmTensorFieldIOField,
+ "symmTensorFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ symmTensorIOFieldField,
+ "symmTensorCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
new file mode 100644
index 00000000000..5cb8ca000b4
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::symmTensorFieldIOField
+
+Description
+ symmTensorFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef symmTensorFieldIOField_H
+#define symmTensorFieldIOField_H
+
+#include "symmTensorField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<symmTensorField> symmTensorFieldIOField;
+ typedef IOFieldField<symmTensorField, symmTensor> symmTensorIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.C
new file mode 100644
index 00000000000..0e0aa60c23f
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ tensorField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "tensorFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ tensorFieldIOField,
+ "tensorFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ tensorIOFieldField,
+ "tensorCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
new file mode 100644
index 00000000000..63ae540df09
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::tensorFieldIOField
+
+Description
+ tensorFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tensorFieldIOField_H
+#define tensorFieldIOField_H
+
+#include "tensorField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<tensorField> tensorFieldIOField;
+ typedef IOFieldField<tensorField, tensor> tensorIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.C b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.C
new file mode 100644
index 00000000000..13615a5e4c0
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ vector2DField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vector2DFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vector2DFieldIOField,
+ "vector2DFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vector2DIOFieldField,
+ "vector2DCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
new file mode 100644
index 00000000000..a559521b1a4
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+ Foam::vector2DFieldIOField
+
+Description
+ vector2DFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vector2DFieldIOField_H
+#define vector2DFieldIOField_H
+
+#include "vector2DField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<vector2DField> vector2DFieldIOField;
+ typedef IOFieldField<vector2DField, vector2D> vector2DIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.C b/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.C
index 646b4fd9d2e..9f07c4a0d8d 100644
--- a/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.C
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.C
@@ -32,7 +32,12 @@ Description
namespace Foam
{
- defineTemplateTypeNameAndDebugWithName(vector2DIOField, "vector2DField", 0);
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vector2DIOField,
+ "vector2DField",
+ 0
+ );
}
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
index 4fd7453f3ed..ef160cc6013 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
@@ -60,6 +60,21 @@ Foam::CollisionRecordList<PairType, WallType>::~CollisionRecordList()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+template<class PairType, class WallType>
+Foam::Field<PairType>
+Foam::CollisionRecordList<PairType, WallType>::pairData() const
+{
+ Field<PairType> f(pairRecords_.size());
+
+ forAll(pairRecords_, i)
+ {
+ f[i] = pairRecords_[i].collisionData();
+ }
+
+ return f;
+}
+
+
template<class PairType, class WallType>
Foam::PairCollisionRecord<PairType>&
Foam::CollisionRecordList<PairType, WallType>::matchPairRecord
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
index 2993b9df30d..1b2ebe750c6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
@@ -102,6 +102,17 @@ public:
// Member Functions
+ //- Return the active pair collisions
+ inline const DynamicList<PairCollisionRecord<PairType> >&
+ pairRecords() const;
+
+ //- Return the active wall collisions
+ inline const DynamicList<WallCollisionRecord<WallType> >&
+ wallRecords() const;
+
+ //- Return field of pair data from each record, used for field IO
+ Field<PairType> pairData() const;
+
//- Enquires if the proc and id pair of the other particle are
// present in the records. If so, return non-const access to
// the PairCollisionRecord (hence the data) and mark the
@@ -172,6 +183,10 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "CollisionRecordListI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#ifdef NoRepository
# include "CollisionRecordList.C"
#endif
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H
new file mode 100644
index 00000000000..0880662a402
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordListI.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class PairType, class WallType>
+const Foam::DynamicList<Foam::PairCollisionRecord<PairType> >&
+Foam::CollisionRecordList<PairType, WallType>::pairRecords() const
+{
+ return pairRecords_;
+}
+
+
+template<class PairType, class WallType>
+const Foam::DynamicList<Foam::WallCollisionRecord<WallType> >&
+Foam::CollisionRecordList<PairType, WallType>::wallRecords() const
+{
+ return wallRecords_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
index a14b645fb46..4d4a4d25f1e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
@@ -121,7 +121,7 @@ public:
//- Destructor
- ~PairCollisionRecord();
+ ~PairCollisionRecord();
// Member Functions
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index ecca55d056a..61bb778e98e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -53,6 +53,8 @@ SourceFiles
#include "KinematicCloud.H"
#include "CollisionRecordList.H"
+#include "labelFieldIOField.H"
+#include "vectorFieldIOField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,6 +62,8 @@ namespace Foam
{
typedef CollisionRecordList<vector, vector> collisionRecordList;
+typedef vectorIOFieldField pairDataIOFieldField;
+
typedef IOList<collisionRecordList> collisionRecordIOList;
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index becbc5a3bc4..39b66971bfc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -233,7 +233,8 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
IOField<vector> angularMomentum
(
- c.fieldIOobject("angularMomentum", IOobject::NO_READ), np
+ c.fieldIOobject("angularMomentum", IOobject::NO_READ),
+ np
);
IOField<vector> torque(c.fieldIOobject("torque", IOobject::NO_READ), np);
IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
@@ -254,6 +255,12 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
np
);
+ pairDataIOFieldField collisionRecords_pairData
+ (
+ c.fieldIOobject("collisionRecords_pairData", IOobject::NO_READ),
+ np
+ );
+
label i = 0;
forAllConstIter(typename Cloud<ParcelType>, c, iter)
@@ -272,6 +279,19 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
tTurb[i] = p.tTurb();
UTurb[i] = p.UTurb();
collisionRecords[i] = p.collisionRecords();
+ collisionRecords_pairData[i] = p.collisionRecords().pairData();
+
+ // collisionRecords_pairData[i].setSize
+ // (
+ // p.collisionRecords().pairRecords().size()
+ // );
+
+ // forAll(p.collisionRecords().pairRecords(), j)
+ // {
+ // collisionRecords_pairData[i][j] =
+ // p.collisionRecords().pairRecords()[j].collisionData();
+ // }
+
i++;
}
@@ -287,6 +307,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
tTurb.write();
UTurb.write();
collisionRecords.write();
+ collisionRecords_pairData.write();
}
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
index 297cd76767d..56ad97ae4aa 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H
@@ -38,6 +38,7 @@ SourceFiles
#include "cloud.H"
#include "polyMesh.H"
#include "IOobjectList.H"
+#include "IOFieldField.H"
#include "fvMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,6 +68,16 @@ tmp<IOField<Type> > reconstructLagrangianField
);
+template<class Type>
+tmp<IOFieldField<Field<Type>, Type> > reconstructLagrangianFieldField
+(
+ const word& cloudName,
+ const polyMesh& mesh,
+ const PtrList<fvMesh>& meshes,
+ const word& fieldName
+);
+
+
template<class Type>
void reconstructLagrangianFields
(
@@ -77,6 +88,16 @@ void reconstructLagrangianFields
);
+template<class Type>
+void reconstructLagrangianFieldFields
+(
+ const word& cloudName,
+ const polyMesh& mesh,
+ const PtrList<fvMesh>& meshes,
+ const IOobjectList& objects
+);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index 70ac1ee3edd..5cbc4ca36f1 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "IOField.H"
+#include "IOFieldField.H"
#include "Time.H"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
@@ -87,6 +88,67 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
}
+template<class Type>
+Foam::tmp<Foam::IOFieldField<Field<Type>, Type> >
+Foam::reconstructLagrangianFieldField
+(
+ const word& cloudName,
+ const polyMesh& mesh,
+ const PtrList<fvMesh>& meshes,
+ const word& fieldName
+)
+{
+ // Construct empty field on mesh
+ tmp<IOFieldField<Field<Type>, Type > > tfield
+ (
+ new IOFieldField<Field<Type>, Type>
+ (
+ IOobject
+ (
+ fieldName,
+ mesh.time().timeName(),
+ cloud::prefix/cloudName,
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ Field<Field<Type> >(0)
+ )
+ );
+ Field<Field<Type> >& field = tfield();
+
+ forAll(meshes, i)
+ {
+ // Check object on local mesh
+ IOobject localIOobject
+ (
+ fieldName,
+ meshes[i].time().timeName(),
+ cloud::prefix/cloudName,
+ meshes[i],
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ );
+
+ if (localIOobject.headerOk())
+ {
+ IOFieldField<Field<Type>, Type> fieldi(localIOobject);
+
+ label offset = field.size();
+ field.setSize(offset + fieldi.size());
+
+ forAll(fieldi, j)
+ {
+ field[offset + j] = fieldi[j];
+ }
+ }
+ }
+
+ return tfield;
+}
+
+
+
template<class Type>
void Foam::reconstructLagrangianFields
(
@@ -122,4 +184,67 @@ void Foam::reconstructLagrangianFields
}
+template<class Type>
+void Foam::reconstructLagrangianFieldFields
+(
+ const word& cloudName,
+ const polyMesh& mesh,
+ const PtrList<fvMesh>& meshes,
+ const IOobjectList& objects
+)
+{
+ {
+ const word fieldClassName(IOFieldField<Field<Type>, Type>::typeName);
+
+ IOobjectList fields = objects.lookupClass(fieldClassName);
+
+ if (fields.size())
+ {
+ Info<< " Reconstructing lagrangian "
+ << fieldClassName << "s\n" << endl;
+
+ forAllConstIter(IOobjectList, fields, fieldIter)
+ {
+ Info<< " " << fieldIter()->name() << endl;
+ reconstructLagrangianFieldField<Type>
+ (
+ cloudName,
+ mesh,
+ meshes,
+ fieldIter()->name()
+ )().write();
+ }
+
+ Info<< endl;
+ }
+ }
+
+ {
+ const word fieldClassName(IOField<Field<Type> >::typeName);
+
+ IOobjectList fields = objects.lookupClass(fieldClassName);
+
+ if (fields.size())
+ {
+ Info<< " Reconstructing lagrangian "
+ << fieldClassName << "s\n" << endl;
+
+ forAllConstIter(IOobjectList, fields, fieldIter)
+ {
+ Info<< " " << fieldIter()->name() << endl;
+ reconstructLagrangianFieldField<Type>
+ (
+ cloudName,
+ mesh,
+ meshes,
+ fieldIter()->name()
+ )().write();
+ }
+
+ Info<< endl;
+ }
+ }
+}
+
+
// ************************************************************************* //
--
GitLab
From 18925e6ee0d7c8880dcdb24e555a44899f127486 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 28 May 2010 15:20:55 +0100
Subject: [PATCH 25/77] ENH: added fileMonitor class (uses inotify)
---
doc/changes/inotify.txt | 44 ++++
src/OSspecific/POSIX/Make/files | 6 +
src/OSspecific/POSIX/Make/options | 3 +
src/OSspecific/POSIX/fileMonitor.C | 372 +++++++++++++++++++++++++++++
src/OSspecific/POSIX/fileMonitor.H | 159 ++++++++++++
5 files changed, 584 insertions(+)
create mode 100644 doc/changes/inotify.txt
create mode 100644 src/OSspecific/POSIX/fileMonitor.C
create mode 100644 src/OSspecific/POSIX/fileMonitor.H
diff --git a/doc/changes/inotify.txt b/doc/changes/inotify.txt
new file mode 100644
index 00000000000..85a5aa4349f
--- /dev/null
+++ b/doc/changes/inotify.txt
@@ -0,0 +1,44 @@
+2010-05-28
+
+Using asynchronous file modification (using inotify) instead of timestamp
+checking.
+
+- all files (usually only IOdictionary) that need to be monitored
+should be registered using MUST_READ_IF_MODIFIED. The MUST_READ should
+be used for objects that do not need to be re-read (e.g. fields).
+In the old system it would actually monitor e.g. 0/U and constant/polyMesh
+files.
+I've temporarily added a warning in IOdictionary if constructed with MUST_READ.
+Same for IOList,IOField,IOMap if constructed with MUST_READ_IF_MODIFIED
+(or is rereading supported?). Please let me know if something does not work or
+you see this warning.
+
+- all file monitoring is done by an instance of 'fileMonitor' in the Time
+class. The fileMonitor class can be found in OSspecific. Default is
+to use the (linux-specific) 'inotify' system calls.
+If compiled with -DFOAM_USE_STAT it will revert to the current 'stat' system
+calls.
+
+- inotify does not need timestamps. There is no need for fileModificationSkew
+to allow for time differences. (there can still temporarily be a difference
+in modified status between different processors due to nfs lagging)
+
+- all reductions to synchronise status on different processors are done with
+a single reduction instead of one reduction per registered object. This could
+be quite a gain on large numbers of processors.
+
+- fileMonitor stores two hashtables per file so there is a small overhead
+adding and removing files from monitoring.
+
+- if runTimeModifiable is false at start of run no files will get monitored,
+however if runTimeModified gets set to false during the run and monitored files
+will still get monitored (though never reloaded). This is only a hypothetical
+problem in that the kernel still stores events for the monitored files. However
+inotify is very efficient - e.g. it gets used to track changes on file systems
+for desktop search engines.
+
+- any monitored and modified file will get reloaded from the exact path
+that was monitored. In the old system it would/could do a re-search through all
+times.
+
+
diff --git a/src/OSspecific/POSIX/Make/files b/src/OSspecific/POSIX/Make/files
index f6e7c2d55ed..788a08105ae 100644
--- a/src/OSspecific/POSIX/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@@ -9,6 +9,12 @@ POSIX.C
cpuTime/cpuTime.C
clockTime/clockTime.C
+/*
+ * Note: fileMonitor assumes inotify by default. Compile with -DFOAM_USE_STAT
+ * to use stat (=timestamps) instead of inotify
+ */
+fileMonitor.C
+
#ifdef SunOS64
dummyPrintStack.C
#else
diff --git a/src/OSspecific/POSIX/Make/options b/src/OSspecific/POSIX/Make/options
index e69de29bb2d..b7e9d7211b0 100644
--- a/src/OSspecific/POSIX/Make/options
+++ b/src/OSspecific/POSIX/Make/options
@@ -0,0 +1,3 @@
+#ifdef SunOS64
+EXE_INC = -DFOAM_USE_STAT
+#endif
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
new file mode 100644
index 00000000000..2103aa242d8
--- /dev/null
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -0,0 +1,372 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ fileMonitor
+
+\*----------------------------------------------------------------------------*/
+
+#include "fileMonitor.H"
+#include "IOstreams.H"
+#include "Pstream.H"
+#include "PackedList.H"
+
+#ifdef FOAM_USE_STAT
+# include "OSspecific.H"
+# include "regIOobject.H" // for fileModificationSkew symbol
+#else
+# include <sys/inotify.h>
+# include <stropts.h>
+# include <sys/ioctl.h>
+#endif
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::fileMonitor, 0);
+
+template<>
+const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
+{
+ "unmodified",
+ "deleted",
+ "modified"
+};
+const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
+ Foam::fileMonitor::fileStateNames_;
+
+
+namespace Foam
+{
+ class fileStateEqOp
+ {
+ public:
+ void operator()(unsigned int& x, const unsigned int& y) const
+ {
+ // x,y are list of 2bits representing fileState
+
+ unsigned int mask = 3u;
+ unsigned int shift = 0;
+ unsigned int result = 0;
+
+ while (mask)
+ {
+ // Combine state
+ unsigned int xState = (x & mask) >> shift;
+ unsigned int yState = (y & mask) >> shift;
+
+ // Combine and add to result. Combine is such that UNMODIFIED
+ // wins.
+ unsigned int state = min(xState, yState);
+ result |= (state << shift);
+
+ shift += 2;
+ mask <<= 2;
+ }
+ x = result;
+ }
+ };
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+#ifdef FOAM_USE_STAT
+void Foam::fileMonitor::checkFiles() const
+{
+ for
+ (
+ HashTable<label, time_t>::iterator iter = lastModified_.begin();
+ iter != lastModified_.end();
+ ++iter
+ )
+ {
+ label watchFd = iter.key();
+ const fileName& fName = watchFile_[watchFd];
+ time_t newTime = lastModified(fName);
+
+ if (newTime == 0)
+ {
+ state_.set(watchFd, DELETED);
+ }
+ else
+ {
+ time_t oldTime = iter();
+ if (newTime > (oldTime + regIOobject::fileModificationSkew))
+ {
+ iter() = newTime;
+ state_.set(watchFd, MODIFIED);
+ }
+ else
+ {
+ state_.set(watchFd, UNMODIFIED);
+ }
+ }
+ }
+}
+#else
+void Foam::fileMonitor::checkFiles() const
+{
+ while (true)
+ {
+ struct timeval zeroTimeout = {0, 0};
+
+ int ready = select
+ (
+ inotifyFd_+1, // num filedescriptors in watchSet_
+ &watchSet_, // watchSet_ with only inotifyFd
+ NULL,
+ NULL,
+ &zeroTimeout
+ );
+
+ if (ready < 0)
+ {
+ FatalErrorIn("fileMonitor::updateStates()")
+ << "Problem in issuing select."
+ << abort(FatalError);
+ }
+ else if (FD_ISSET(inotifyFd_, &watchSet_))
+ {
+ struct inotify_event inotifyEvent;
+
+ // Read first event
+ ssize_t nBytes = read
+ (
+ inotifyFd_,
+ &inotifyEvent,
+ sizeof(inotifyEvent)
+ );
+
+ if (nBytes != sizeof(inotifyEvent))
+ {
+ FatalErrorIn("fileMonitor::updateStates(const fileName&)")
+ << "Read " << label(nBytes) << " ; expected "
+ << label(sizeof(inotifyEvent))
+ << abort(FatalError);
+ }
+
+ //Pout<< "mask:" << inotifyEvent.mask << endl;
+ //Pout<< "watchFd:" << inotifyEvent.wd << endl;
+ //Pout<< "watchName:" << watchFile_[inotifyEvent.wd] << endl;
+
+ switch (inotifyEvent.mask)
+ {
+ case IN_DELETE_SELF:
+ {
+ Map<fileState>::iterator iter =
+ state_.find(label(inotifyEvent.wd));
+ iter() = DELETED;
+ }
+ break;
+
+ case IN_MODIFY:
+ case IN_CLOSE_WRITE:
+ {
+ Map<fileState>::iterator iter =
+ state_.find(label(inotifyEvent.wd));
+ iter() = MODIFIED;
+ }
+ break;
+ }
+ }
+ else
+ {
+ // No data. Reset watchSet_
+ FD_SET(inotifyFd_, &watchSet_);
+ return;
+ }
+ }
+}
+#endif
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+// Null constructor
+#ifdef FOAM_USE_STAT
+
+Foam::fileMonitor::fileMonitor()
+:
+ state_(20),
+ watchFile_(20),
+ lastModified_(20)
+{}
+
+#else
+
+Foam::fileMonitor::fileMonitor()
+:
+ state_(20),
+ watchFile_(20),
+ inotifyFd_(inotify_init())
+{
+ //- Add notify descriptor to select set
+ FD_ZERO(&watchSet_);
+ FD_SET(inotifyFd_, &watchSet_);
+}
+
+#endif
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::fileMonitor::~fileMonitor()
+{
+ // Remove any remaining files
+ List<label> watchFds(state_.toc());
+ forAll(watchFds, i)
+ {
+ removeWatch(watchFds[i]);
+ }
+}
+
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
+{
+#ifdef FOAM_USE_STAT
+ label watchFd = lastModified_.size();
+ lastModified_.insert(watchFd, lastModified(fName));
+#else
+ label watchFd = inotify_add_watch
+ (
+ inotifyFd_,
+ fName.c_str(),
+ //IN_ALL_EVENTS
+ IN_CLOSE_WRITE | IN_DELETE_SELF | IN_MODIFY
+ );
+#endif
+
+ if (debug)
+ {
+ Pout<< "fileMonitor : added watch " << watchFd << " on file "
+ << fName << endl;
+ }
+
+ if (watchFd < 0)
+ {
+ WarningIn("fileMonitor::addWatch(const fileName&)")
+ << "could not add watch for file " << fName << endl;
+ }
+ else
+ {
+ state_.insert(watchFd, UNMODIFIED);
+ watchFile_.insert(watchFd, fName);
+ }
+ return watchFd;
+}
+
+
+bool Foam::fileMonitor::removeWatch(const label watchFd)
+{
+ if (debug)
+ {
+ Pout<< "fileMonitor : removing watch " << watchFd << " on file "
+ << watchFile_[watchFd] << endl;
+ }
+
+ state_.erase(watchFd);
+ watchFile_.erase(watchFd);
+#ifdef FOAM_USE_STAT
+ return lastModified_.erase(watchFd);
+#else
+ return inotify_rm_watch(inotifyFd_, int(watchFd)) == 0;
+#endif
+}
+
+
+const Foam::fileName& Foam::fileMonitor::getFile(const label watchFd) const
+{
+ return watchFile_[watchFd];
+}
+
+
+Foam::fileMonitor::fileState Foam::fileMonitor::getState(const label watchFd)
+const
+{
+ return state_[watchFd];
+}
+
+
+void Foam::fileMonitor::updateStates(const bool syncPar) const
+{
+ checkFiles();
+
+ if (syncPar)
+ {
+ PackedList<2> stats(state_.size());
+ label i = 0;
+ forAllConstIter(Map<fileState>, state_, iter)
+ {
+ stats[i++] = (unsigned int)(iter());
+ }
+ // Save local state for warning message below
+ PackedList<2> thisProcStats(stats);
+
+ Pstream::listCombineGather(stats.storage(), fileStateEqOp());
+
+ i = 0;
+ forAllIter(Map<fileState>, state_, iter)
+ {
+ if (thisProcStats[i] != UNMODIFIED)
+ {
+ if (stats[i] == UNMODIFIED)
+ {
+ WarningIn("fileMonitor::updateStates(const bool) const")
+ << "Delaying reading " << watchFile_[iter.key()]
+ << " due to inconsistent "
+ "file time-stamps between processors"
+ << endl;
+ }
+ else
+ {
+ unsigned int stat = stats[i];
+ iter() = fileState(stat);
+ }
+ }
+ i++;
+ }
+ }
+}
+
+
+void Foam::fileMonitor::setUnmodified(const label watchFd)
+{
+#ifdef FOAM_USE_STAT
+ lastModified_[watchFd] = lastModified(watchFile_[watchFd]);
+#endif
+
+ Map<fileState>::iterator iter = state_.find(watchFd);
+
+ if (iter == state_.end())
+ {
+ FatalErrorIn("fileMonitor::setUnmodified(const label)")
+ << "Illegal watchFd " << watchFd
+ << abort(FatalError);
+ }
+
+ iter() = UNMODIFIED;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
new file mode 100644
index 00000000000..b9922eb3e2a
--- /dev/null
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -0,0 +1,159 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ fileMonitor
+
+Description
+ Checking for changes to files.
+
+!!!!!!!NOTE:
+ Default is to use inotify (Linux specific, since 2.6.13)
+
+ Compile with FOAM_USE_STAT to use the stat function call.
+
+
+ - works fine except for if file gets deleted and recreated
+ it stops monitoring the file!
+ (does work though if the file gets moved)
+
+SourceFiles
+ fileMonitor.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fileMonitor_H
+#define fileMonitor_H
+
+#include <sys/types.h>
+#include "Map.H"
+#include "NamedEnum.H"
+#include "labelList.H"
+#include "className.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class fileMonitor;
+
+/*---------------------------------------------------------------------------*\
+ Class fileMonitor Declaration
+\*---------------------------------------------------------------------------*/
+
+class fileMonitor
+{
+
+public:
+
+ // Public data types
+
+ //- Enumeration defining the file state.
+ enum fileState
+ {
+ UNMODIFIED = 0,
+ DELETED = 1,
+ MODIFIED = 2
+ };
+
+ static const NamedEnum<fileState, 3> fileStateNames_;
+
+private:
+ // Private data
+
+ //- State for all watchFds
+ mutable Map<fileState> state_;
+
+ //- From watch descriptor to filename
+ HashTable<fileName, label> watchFile_;
+
+#ifdef FOAM_USE_STAT
+
+ //- From watch descriptor to modified time
+ mutable HashTable<label, time_t> lastModified_;
+#else
+ //- File descriptor for the inotify instance
+ int inotifyFd_;
+
+ //- Pre-allocated structure containing file descriptors
+ mutable fd_set watchSet_;
+
+#endif
+ //- Update state_ from any events.
+ void checkFiles() const;
+
+ //- Disallow default bitwise copy construct
+ fileMonitor(const fileMonitor&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const fileMonitor&);
+
+
+public:
+
+ // Declare name of the class and its debug switch
+ ClassName("fileMonitor");
+
+ // Constructors
+
+ //- Construct null
+ fileMonitor();
+
+
+ // Destructor
+
+ ~fileMonitor();
+
+
+ // Member Functions
+
+ //- Add file to watch. Returns watch descriptor
+ label addWatch(const fileName&);
+
+ //- Remove file to watch. Return true if successful
+ bool removeWatch(const label watchFd);
+
+ //- Get name of file being watched
+ const fileName& getFile(const label watchFd) const;
+
+ //- Check state using handle
+ fileState getState(const label watchFd) const;
+
+ //- Check state of all files. Updates state_.
+ void updateStates(const bool syncPar) const;
+
+ //- Reset state (e.g. after having read it) using handle
+ void setUnmodified(const label watchFd);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
--
GitLab
From 05314755780c2fe89217404561d982fb2568cd67 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 28 May 2010 16:12:54 +0100
Subject: [PATCH 26/77] ENH: IO Improvements, seg fault in parallel needing
found.
---
.../decomposePar/decomposePar.C | 55 +++++
.../reconstructPar/reconstructPar.C | 21 ++
src/lagrangian/basic/Cloud/Cloud.H | 9 +
src/lagrangian/basic/Cloud/CloudIO.C | 25 +++
.../CollisionRecordList/CollisionRecordList.C | 200 +++++++++++++++++-
.../CollisionRecordList/CollisionRecordList.H | 44 ++++
.../PairCollisionRecord/PairCollisionRecord.C | 16 +-
.../PairCollisionRecord/PairCollisionRecord.H | 1 +
.../WallCollisionRecord/WallCollisionRecord.C | 3 +-
.../WallCollisionRecord/WallCollisionRecord.H | 1 +
.../WallCollisionRecordI.H | 8 +
.../KinematicParcel/KinematicParcel.H | 3 +-
.../KinematicParcel/KinematicParcelIO.C | 155 ++++++++++----
.../defineBasicKinematicParcel.C | 7 -
.../reconstruct/reconstructLagrangianFields.C | 2 +-
15 files changed, 483 insertions(+), 67 deletions(-)
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 3457c142bb8..a3f67868612 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -70,8 +70,11 @@ Usage
#include "vectorIOField.H"
#include "vectorFieldIOField.H"
#include "sphericalTensorIOField.H"
+#include "sphericalTensorFieldIOField.H"
#include "symmTensorIOField.H"
+#include "symmTensorFieldIOField.H"
#include "tensorIOField.H"
+#include "tensorFieldIOField.H"
#include "pointFields.H"
#include "readFields.H"
@@ -395,14 +398,24 @@ int main(int argc, char *argv[])
(
cloudDirs.size()
);
+ PtrList<PtrList<sphericalTensorIOFieldField> >
+ lagrangianSphericalTensorFieldFields(cloudDirs.size());
PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
(
cloudDirs.size()
);
+ PtrList<PtrList<symmTensorIOFieldField> > lagrangianSymmTensorFieldFields
+ (
+ cloudDirs.size()
+ );
PtrList<PtrList<tensorIOField> > lagrangianTensorFields
(
cloudDirs.size()
);
+ PtrList<PtrList<tensorIOFieldField> > lagrangianTensorFieldFields
+ (
+ cloudDirs.size()
+ );
label cloudI = 0;
@@ -545,6 +558,13 @@ int main(int argc, char *argv[])
lagrangianSphericalTensorFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianSphericalTensorFieldFields
+ );
+
lagrangianFieldDecomposer::readFields
(
cloudI,
@@ -552,6 +572,13 @@ int main(int argc, char *argv[])
lagrangianSymmTensorFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianSymmTensorFieldFields
+ );
+
lagrangianFieldDecomposer::readFields
(
cloudI,
@@ -559,6 +586,13 @@ int main(int argc, char *argv[])
lagrangianTensorFields
);
+ lagrangianFieldDecomposer::readFieldFields
+ (
+ cloudI,
+ lagrangianObjects,
+ lagrangianTensorFieldFields
+ );
+
cloudI++;
}
}
@@ -572,8 +606,11 @@ int main(int argc, char *argv[])
lagrangianVectorFields.setSize(cloudI);
lagrangianVectorFieldFields.setSize(cloudI);
lagrangianSphericalTensorFields.setSize(cloudI);
+ lagrangianSphericalTensorFieldFields.setSize(cloudI);
lagrangianSymmTensorFields.setSize(cloudI);
+ lagrangianSymmTensorFieldFields.setSize(cloudI);
lagrangianTensorFields.setSize(cloudI);
+ lagrangianTensorFieldFields.setSize(cloudI);
// Any uniform data to copy/link?
@@ -771,8 +808,11 @@ int main(int argc, char *argv[])
|| lagrangianVectorFields[cloudI].size()
|| lagrangianVectorFieldFields[cloudI].size()
|| lagrangianSphericalTensorFields[cloudI].size()
+ || lagrangianSphericalTensorFieldFields[cloudI].size()
|| lagrangianSymmTensorFields[cloudI].size()
+ || lagrangianSymmTensorFieldFields[cloudI].size()
|| lagrangianTensorFields[cloudI].size()
+ || lagrangianTensorFieldFields[cloudI].size()
)
{
fieldDecomposer.decomposeFields
@@ -810,16 +850,31 @@ int main(int argc, char *argv[])
cloudDirs[cloudI],
lagrangianSphericalTensorFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianSphericalTensorFieldFields[cloudI]
+ );
fieldDecomposer.decomposeFields
(
cloudDirs[cloudI],
lagrangianSymmTensorFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianSymmTensorFieldFields[cloudI]
+ );
fieldDecomposer.decomposeFields
(
cloudDirs[cloudI],
lagrangianTensorFields[cloudI]
);
+ fieldDecomposer.decomposeFieldFields
+ (
+ cloudDirs[cloudI],
+ lagrangianTensorFieldFields[cloudI]
+ );
}
}
}
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 2566115cf81..3734296f512 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -444,6 +444,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<sphericalTensor>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
reconstructLagrangianFields<symmTensor>
(
cloudName,
@@ -451,6 +458,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<symmTensor>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
reconstructLagrangianFields<tensor>
(
cloudName,
@@ -458,6 +472,13 @@ int main(int argc, char *argv[])
procMeshes.meshes(),
sprayObjs
);
+ reconstructLagrangianFieldFields<tensor>
+ (
+ cloudName,
+ mesh,
+ procMeshes.meshes(),
+ sprayObjs
+ );
}
}
else
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 0520c51869d..25cf3fce33d 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -38,6 +38,7 @@ SourceFiles
#include "cloud.H"
#include "IDLList.H"
#include "IOField.H"
+#include "IOFieldField.H"
#include "polyMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -267,6 +268,14 @@ public:
const IOField<DataType>& data
) const;
+ //- Check lagrangian data fieldfield
+ template<class DataType>
+ void checkFieldFieldIOobject
+ (
+ const Cloud<ParticleType>& c,
+ const IOFieldField<Field<DataType>, DataType>& data
+ ) const;
+
//- Read the field data for the cloud of particles. Dummy at
// this level.
virtual void readFields();
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 24a65c1685e..9b4bf0d6185 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -205,6 +205,31 @@ void Foam::Cloud<ParticleType>::checkFieldIOobject
}
+template<class ParticleType>
+template<class DataType>
+void Foam::Cloud<ParticleType>::checkFieldFieldIOobject
+(
+ const Cloud<ParticleType>& c,
+ const IOFieldField<Field<DataType>, DataType>& data
+) const
+{
+ if (data.size() != c.size())
+ {
+ FatalErrorIn
+ (
+ "void Cloud<ParticleType>::checkFieldFieldIOobject"
+ "("
+ "const Cloud<ParticleType>&, "
+ "const IOFieldField<Field<DataType>, DataType>&"
+ ") const"
+ ) << "Size of " << data.name()
+ << " field " << data.size()
+ << " does not match the number of particles " << c.size()
+ << abort(FatalError);
+ }
+}
+
+
template<class ParticleType>
void Foam::Cloud<ParticleType>::readFields()
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
index ef160cc6013..aa2db0b4de6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
@@ -51,6 +51,104 @@ Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList(Istream& is)
}
+template<class PairType, class WallType>
+Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList
+(
+ const labelField& pairAccessed,
+ const labelField& pairOrigProcOfOther,
+ const labelField& pairOrigIdOfOther,
+ const Field<PairType>& pairData,
+ const labelField& wallAccessed,
+ const vectorField& wallPRel,
+ const Field<WallType>& wallData
+)
+:
+ pairRecords_(),
+ wallRecords_()
+{
+ label nPair = pairAccessed.size();
+
+ if
+ (
+ pairOrigProcOfOther.size() != nPair
+ || pairOrigIdOfOther.size() != nPair
+ || pairData.size() != nPair
+ )
+ {
+ FatalErrorIn
+ (
+ "Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList"
+ "("
+ "const labelField& pairAccessed,"
+ "const labelField& pairOrigProcOfOther,"
+ "const labelField& pairOrigIdOfOther,"
+ "const Field<PairType>& pairData,"
+ "const labelField& wallAccessed,"
+ "const vectorField& wallPRel,"
+ "const Field<WallType>& wallData"
+ ")"
+ )
+ << "Pair field size mismatch." << nl
+ << pairAccessed << nl
+ << pairOrigProcOfOther << nl
+ << pairOrigIdOfOther << nl
+ << pairData << nl
+ << abort(FatalError);
+ }
+
+ forAll(pairAccessed, i)
+ {
+ pairRecords_.append
+ (
+ PairCollisionRecord<PairType>
+ (
+ pairAccessed[i],
+ pairOrigProcOfOther[i],
+ pairOrigIdOfOther[i],
+ pairData[i]
+ )
+ );
+ }
+
+ label nWall = wallAccessed.size();
+
+ if (wallPRel.size() != nWall || wallData.size() != nWall)
+ {
+ FatalErrorIn
+ (
+ "Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList"
+ "("
+ "const labelField& pairAccessed,"
+ "const labelField& pairOrigProcOfOther,"
+ "const labelField& pairOrigIdOfOther,"
+ "const Field<PairType>& pairData,"
+ "const labelField& wallAccessed,"
+ "const vectorField& wallPRel,"
+ "const Field<WallType>& wallData"
+ ")"
+ )
+ << "Wall field size mismatch." << nl
+ << wallAccessed << nl
+ << wallPRel << nl
+ << wallData << nl
+ << abort(FatalError);
+ }
+
+ forAll(wallAccessed, i)
+ {
+ wallRecords_.append
+ (
+ WallCollisionRecord<WallType>
+ (
+ wallAccessed[i],
+ wallPRel[i],
+ wallData[i]
+ )
+ );
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * /
template<class PairType, class WallType>
@@ -60,6 +158,51 @@ Foam::CollisionRecordList<PairType, WallType>::~CollisionRecordList()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+template<class PairType, class WallType>
+Foam::labelField
+Foam::CollisionRecordList<PairType, WallType>::pairAccessed() const
+{
+ labelField f(pairRecords_.size());
+
+ forAll(pairRecords_, i)
+ {
+ f[i] = pairRecords_[i].accessed();
+ }
+
+ return f;
+}
+
+
+template<class PairType, class WallType>
+Foam::labelField
+Foam::CollisionRecordList<PairType, WallType>::pairOrigProcOfOther() const
+{
+ labelField f(pairRecords_.size());
+
+ forAll(pairRecords_, i)
+ {
+ f[i] = pairRecords_[i].origProcOfOther();
+ }
+
+ return f;
+}
+
+
+template<class PairType, class WallType>
+Foam::labelField
+Foam::CollisionRecordList<PairType, WallType>::pairOrigIdOfOther() const
+{
+ labelField f(pairRecords_.size());
+
+ forAll(pairRecords_, i)
+ {
+ f[i] = pairRecords_[i].origIdOfOther();
+ }
+
+ return f;
+}
+
+
template<class PairType, class WallType>
Foam::Field<PairType>
Foam::CollisionRecordList<PairType, WallType>::pairData() const
@@ -75,6 +218,51 @@ Foam::CollisionRecordList<PairType, WallType>::pairData() const
}
+template<class PairType, class WallType>
+Foam::labelField
+Foam::CollisionRecordList<PairType, WallType>::wallAccessed() const
+{
+ labelField f(wallRecords_.size());
+
+ forAll(wallRecords_, i)
+ {
+ f[i] = wallRecords_[i].accessed();
+ }
+
+ return f;
+}
+
+
+template<class PairType, class WallType>
+Foam::vectorField
+Foam::CollisionRecordList<PairType, WallType>::wallPRel() const
+{
+ vectorField f(wallRecords_.size());
+
+ forAll(wallRecords_, i)
+ {
+ f[i] = wallRecords_[i].pRel();
+ }
+
+ return f;
+}
+
+
+template<class PairType, class WallType>
+Foam::Field<WallType>
+Foam::CollisionRecordList<PairType, WallType>::wallData() const
+{
+ Field<WallType> f(wallRecords_.size());
+
+ forAll(wallRecords_, i)
+ {
+ f[i] = wallRecords_[i].collisionData();
+ }
+
+ return f;
+}
+
+
template<class PairType, class WallType>
Foam::PairCollisionRecord<PairType>&
Foam::CollisionRecordList<PairType, WallType>::matchPairRecord
@@ -100,12 +288,12 @@ Foam::CollisionRecordList<PairType, WallType>::matchPairRecord
}
// Record not found, create a new one and return it as the last
- // member of the list. The status of the record will be accessed
- // by construction.
+ // member of the list. Setting the status of the record to be accessed
+ // on construction.
pairRecords_.append
(
- PairCollisionRecord<PairType>(origProcOfOther, origIdOfOther)
+ PairCollisionRecord<PairType>(true, origProcOfOther, origIdOfOther)
);
return pairRecords_.last();
@@ -136,10 +324,10 @@ Foam::CollisionRecordList<PairType, WallType>::matchWallRecord
}
// Record not found, create a new one and return it as the last
- // member of the list. The status of the record will be accessed
- // by construction.
+ // member of the list. Setting the status of the record to be accessed
+ // on construction.
- wallRecords_.append(WallCollisionRecord<WallType>(pRel));
+ wallRecords_.append(WallCollisionRecord<WallType>(true, pRel));
return wallRecords_.last();
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
index 1b2ebe750c6..51aa29849f3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
@@ -95,6 +95,17 @@ public:
//- Construct from Istream
CollisionRecordList(Istream&);
+ //- Construct from component fields (for IO)
+ CollisionRecordList
+ (
+ const labelField& pairAccessed,
+ const labelField& pairOrigProcOfOther,
+ const labelField& pairOrigIdOfOther,
+ const Field<PairType>& pairData,
+ const labelField& wallAccessed,
+ const vectorField& wallPRel,
+ const Field<WallType>& wallData
+ );
//- Destructor
~CollisionRecordList();
@@ -110,9 +121,42 @@ public:
inline const DynamicList<WallCollisionRecord<WallType> >&
wallRecords() const;
+ // Fields representing the data from each record, i.e if the
+ // records 0-N containing each data members {a, b, c, d...}
+ // are organised:
+ //
+ // a0 b0 c0 d0 ...
+ // a1 b1 c1 d1 ...
+ // a2 b2 c2 d2 ...
+ // ...
+ // aN bN cN dN ...
+ //
+ // Then these field return, for example, (c0, c1, c2,... cN)
+
+ //- Return field of pair accessed from each record, used for
+ // field IO
+ labelField pairAccessed() const;
+
+ //- Return field of pair origProcOfOther from each record,
+ // used for field IO
+ labelField pairOrigProcOfOther() const;
+
+ //- Return field of pair origIdOfOther from each record, used
+ // for field IO
+ labelField pairOrigIdOfOther() const;
+
//- Return field of pair data from each record, used for field IO
Field<PairType> pairData() const;
+ //- Return field of wall accessed from each record, used for field IO
+ labelField wallAccessed() const;
+
+ //- Return field of wall pRel from each record, used for field IO
+ vectorField wallPRel() const;
+
+ //- Return field of wall data from each record, used for field IO
+ Field<WallType> wallData() const;
+
//- Enquires if the proc and id pair of the other particle are
// present in the records. If so, return non-const access to
// the PairCollisionRecord (hence the data) and mark the
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
index 0357d15c5dd..e20e58c433a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
@@ -30,8 +30,8 @@ License
template<class Type>
Foam::PairCollisionRecord<Type>::PairCollisionRecord()
:
- origProcOfOther_(-VGREAT),
- origIdOfOther_(-VGREAT),
+ origProcOfOther_(0),
+ origIdOfOther_(-1),
data_(pTraits<Type>::zero)
{}
@@ -39,6 +39,7 @@ Foam::PairCollisionRecord<Type>::PairCollisionRecord()
template<class Type>
Foam::PairCollisionRecord<Type>::PairCollisionRecord
(
+ bool accessed,
label origProcOfOther,
label origIdOfOther,
const Type& data
@@ -47,7 +48,14 @@ Foam::PairCollisionRecord<Type>::PairCollisionRecord
origProcOfOther_(origProcOfOther + 1),
origIdOfOther_(origIdOfOther),
data_(data)
-{}
+{
+ // Default assignment to origProcOfOther_ assumes accessed is true
+
+ if (!accessed)
+ {
+ setUnaccessed();
+ }
+}
template<class Type>
@@ -56,7 +64,7 @@ Foam::PairCollisionRecord<Type>::PairCollisionRecord
const PairCollisionRecord<Type>& pCR
)
:
- origProcOfOther_(pCR.origProcOfOther() + 1),
+ origProcOfOther_(pCR.origProcOfOther_),
origIdOfOther_(pCR.origIdOfOther_),
data_(pCR.data_)
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
index 4d4a4d25f1e..5604efd5493 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
@@ -108,6 +108,7 @@ public:
//- Construct from components
PairCollisionRecord
(
+ bool accessed,
label origProcOfOther,
label origIdOfOther,
const Type& data = pTraits<Type>::zero
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
index da116c4992c..04125ee7b32 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -45,11 +45,12 @@ Foam::WallCollisionRecord<Type>::WallCollisionRecord()
template<class Type>
Foam::WallCollisionRecord<Type>::WallCollisionRecord
(
+ bool accessed,
const vector& pRel,
const Type& data
)
:
- accessed_(true),
+ accessed_(accessed),
pRel_(pRel),
data_(data)
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
index f70d2045b66..7383ba64858 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -106,6 +106,7 @@ public:
//- Construct from components
WallCollisionRecord
(
+ bool accessed,
const vector& pRel,
const Type& data = pTraits<Type>::zero
);
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
index afb855cb334..59287144125 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -75,6 +75,14 @@ inline bool Foam::WallCollisionRecord<Type>::match
}
+template<class Type>
+inline const Foam::vector&
+Foam::WallCollisionRecord<Type>::pRel() const
+{
+ return pRel_;
+}
+
+
template<class Type>
inline const Type&
Foam::WallCollisionRecord<Type>::collisionData() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 61bb778e98e..8b693c62208 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -63,8 +63,7 @@ namespace Foam
typedef CollisionRecordList<vector, vector> collisionRecordList;
typedef vectorIOFieldField pairDataIOFieldField;
-
-typedef IOList<collisionRecordList> collisionRecordIOList;
+typedef vectorIOFieldField wallDataIOFieldField;
template<class ParcelType>
class KinematicParcel;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 39b66971bfc..7660070383d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -44,7 +44,13 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+ " rho"
+ " tTurb"
+ " (UTurbx UTurby UTurbz)"
- + " pairCollisions wallCollisions";
+ + " collisionRecordsPairAccessed"
+ + " collisionRecordsPairOrigProcOfOther"
+ + " collisionRecordsPairOrigIdOfOther"
+ + " (collisionRecordsPairData)"
+ + " collisionRecordsWallAccessed"
+ + " collisionRecordsWallPRel"
+ + " (collisionRecordsWallData)";
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -168,32 +174,58 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
c.checkFieldIOobject(c, UTurb);
- collisionRecordIOList collisionRecords
+ labelIOFieldField collisionRecordsPairAccessed
(
- IOobject
+ c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ)
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsPairAccessed);
+
+ labelIOFieldField collisionRecordsPairOrigProcOfOther
+ (
+ c.fieldIOobject
(
- "collisionRecords",
- c.time().timeName(),
- c,
- IOobject::MUST_READ,
- IOobject::NO_WRITE,
- false
+ "collisionRecordsPairOrigProcOfOther",
+ IOobject::MUST_READ
)
);
+ c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
- if (collisionRecords.size() != c.size())
- {
- FatalErrorIn
+ labelIOFieldField collisionRecordsPairOrigIdOfOther
+ (
+ c.fieldIOobject
(
- "void Foam::KinematicParcel<ParcelType>::readFields"
- "(Cloud<ParcelType>& c)"
- ) << "Size of " << collisionRecords.name()
- << " field " << collisionRecords.size()
- << " does not match the number of particles " << c.size()
- << abort(FatalError);
- }
+ "collisionRecordsPairOrigIdOfOther",
+ IOobject::MUST_READ
+ )
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
+
+ pairDataIOFieldField collisionRecordsPairData
+ (
+ c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ)
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsPairData);
+
+ labelIOFieldField collisionRecordsWallAccessed
+ (
+ c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ)
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsWallAccessed);
+
+ vectorIOFieldField collisionRecordsWallPRel
+ (
+ c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ)
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsWallPRel);
+
+ wallDataIOFieldField collisionRecordsWallData
+ (
+ c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ)
+ );
+ c.checkFieldFieldIOobject(c, collisionRecordsWallData);
label i = 0;
+
forAllIter(typename Cloud<ParcelType>, c, iter)
{
ParcelType& p = iter();
@@ -208,7 +240,17 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
p.rho_ = rho[i];
p.tTurb_ = tTurb[i];
p.UTurb_ = UTurb[i];
- p.collisionRecords_ = collisionRecords[i];
+ p.collisionRecords_ = collisionRecordList
+ (
+ collisionRecordsPairAccessed[i],
+ collisionRecordsPairOrigProcOfOther[i],
+ collisionRecordsPairOrigIdOfOther[i],
+ collisionRecordsPairData[i],
+ collisionRecordsWallAccessed[i],
+ collisionRecordsWallPRel[i],
+ collisionRecordsWallData[i]
+ );
+
i++;
}
}
@@ -241,23 +283,43 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
- collisionRecordIOList collisionRecords
+ labelIOFieldField collisionRecordsPairAccessed
+ (
+ c.fieldIOobject("collisionRecordsPairAccessed", IOobject::NO_READ),
+ np
+ );
+ labelIOFieldField collisionRecordsPairOrigProcOfOther
(
- IOobject
+ c.fieldIOobject
(
- "collisionRecords",
- c.time().timeName(),
- c,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
+ "collisionRecordsPairOrigProcOfOther",
+ IOobject::NO_READ
),
np
);
-
- pairDataIOFieldField collisionRecords_pairData
+ labelIOFieldField collisionRecordsPairOrigIdOfOther
(
- c.fieldIOobject("collisionRecords_pairData", IOobject::NO_READ),
+ c.fieldIOobject("collisionRecordsPairOrigIdOfOther", IOobject::NO_READ),
+ np
+ );
+ pairDataIOFieldField collisionRecordsPairData
+ (
+ c.fieldIOobject("collisionRecordsPairData", IOobject::NO_READ),
+ np
+ );
+ labelIOFieldField collisionRecordsWallAccessed
+ (
+ c.fieldIOobject("collisionRecordsWallAccessed", IOobject::NO_READ),
+ np
+ );
+ vectorIOFieldField collisionRecordsWallPRel
+ (
+ c.fieldIOobject("collisionRecordsWallPRel", IOobject::NO_READ),
+ np
+ );
+ wallDataIOFieldField collisionRecordsWallData
+ (
+ c.fieldIOobject("collisionRecordsWallData", IOobject::NO_READ),
np
);
@@ -278,19 +340,15 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
rho[i] = p.rho();
tTurb[i] = p.tTurb();
UTurb[i] = p.UTurb();
- collisionRecords[i] = p.collisionRecords();
- collisionRecords_pairData[i] = p.collisionRecords().pairData();
-
- // collisionRecords_pairData[i].setSize
- // (
- // p.collisionRecords().pairRecords().size()
- // );
-
- // forAll(p.collisionRecords().pairRecords(), j)
- // {
- // collisionRecords_pairData[i][j] =
- // p.collisionRecords().pairRecords()[j].collisionData();
- // }
+ collisionRecordsPairAccessed[i] = p.collisionRecords().pairAccessed();
+ collisionRecordsPairOrigProcOfOther[i] =
+ p.collisionRecords().pairOrigProcOfOther();
+ collisionRecordsPairOrigIdOfOther[i] =
+ p.collisionRecords().pairOrigIdOfOther();
+ collisionRecordsPairData[i] = p.collisionRecords().pairData();
+ collisionRecordsWallAccessed[i] = p.collisionRecords().wallAccessed();
+ collisionRecordsWallPRel[i] = p.collisionRecords().wallPRel();
+ collisionRecordsWallData[i] = p.collisionRecords().wallData();
i++;
}
@@ -306,8 +364,13 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
rho.write();
tTurb.write();
UTurb.write();
- collisionRecords.write();
- collisionRecords_pairData.write();
+ collisionRecordsPairAccessed.write();
+ collisionRecordsPairOrigProcOfOther.write();
+ collisionRecordsPairOrigIdOfOther.write();
+ collisionRecordsPairData.write();
+ collisionRecordsWallAccessed.write();
+ collisionRecordsWallPRel.write();
+ collisionRecordsWallData.write();
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 37c71946b3c..aee5402c347 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -34,13 +34,6 @@ namespace Foam
defineTemplateTypeNameAndDebug(Cloud<basicKinematicParcel>, 0);
defineParcelTypeNameAndDebug(KinematicCloud<basicKinematicParcel>, 0);
-
- defineTemplateTypeNameAndDebugWithName
- (
- collisionRecordIOList,
- "collisionRecordList",
- 0
- );
};
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index 5cbc4ca36f1..753a21ccbe9 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -89,7 +89,7 @@ Foam::tmp<Foam::IOField<Type> > Foam::reconstructLagrangianField
template<class Type>
-Foam::tmp<Foam::IOFieldField<Field<Type>, Type> >
+Foam::tmp<Foam::IOFieldField<Foam::Field<Type>, Type> >
Foam::reconstructLagrangianFieldField
(
const word& cloudName,
--
GitLab
From 96a3de7a434ce55f9a83f2f4918eb40efb60b4f4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 14:35:55 +0100
Subject: [PATCH 27/77] ENH: work with processors with 0 cells.
polyMesh::directions, checkMesh.
---
.../utilities/mesh/manipulation/checkMesh/checkTopology.C | 5 +++--
src/OpenFOAM/meshes/polyMesh/polyMesh.C | 3 +++
src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C | 5 ++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index f0aa4a0aaaa..9e96eec03f7 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -12,6 +12,7 @@ bool Foam::checkSync(const wordList& names)
List<wordList> allNames(Pstream::nProcs());
allNames[Pstream::myProcNo()] = names;
Pstream::gatherList(allNames);
+ Pstream::scatterList(allNames);
bool hasError = false;
@@ -72,8 +73,8 @@ Foam::label Foam::checkTopology
Info<< " ***FaceZone " << mesh.faceZones()[zoneI].name()
<< " is not correctly synchronised"
<< " across coupled boundaries."
- << " (coupled faces both"
- << " present in set but with opposite flipmap)" << endl;
+ << " (coupled faces are either not both "
+ << " present in set or have same flipmap)" << endl;
noFailedChecks++;
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index d0b3a7fa664..0ed5f56200f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -85,6 +85,9 @@ void Foam::polyMesh::calcDirections() const
}
}
+ reduce(nEmptyPatches, maxOp<label>());
+ reduce(nWedgePatches, maxOp<label>());
+
if (nEmptyPatches)
{
reduce(emptyDirVec, sumOp<vector>());
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index ddda6efaf96..cfc23d06b31 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -498,10 +498,9 @@ bool Foam::faceZone::checkParallelSync(const bool report) const
break;
}
}
-
- // Flip state should be opposite.
- if (myZoneFlip[bFaceI] == neiZoneFlip[bFaceI])
+ else if (myZoneFlip[bFaceI] == neiZoneFlip[bFaceI])
{
+ // Flip state should be opposite.
hasError = true;
if (report)
--
GitLab
From 8aaac0d5e26ac85f8a761f2a6cd2430c981707ee Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 15:22:40 +0100
Subject: [PATCH 28/77] BUG: Preserve face zone orientation (fvMeshSubset,
removeCels, addPatchCellLayer)
---
.../polyTopoChange/addPatchCellLayer.C | 32 +++++++---
.../polyTopoChange/removeCells.C | 4 +-
.../fvMesh/fvMeshSubset/fvMeshSubset.C | 58 +++++++++++++------
3 files changed, 67 insertions(+), 27 deletions(-)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 170052341d9..4ffbaa3cdc7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -349,7 +349,10 @@ Foam::label Foam::addPatchCellLayer::addSideFace
// Get my mesh face and its zone.
label meshFaceI = pp.addressing()[ownFaceI];
- label zoneI = mesh_.faceZones().whichZone(meshFaceI);
+ // Zone info comes from any side patch face. Otherwise -1 since we
+ // don't know what to put it in - inherit from the extruded faces?
+ label zoneI = -1; //mesh_.faceZones().whichZone(meshFaceI);
+ bool flip = false;
label addedFaceI = -1;
@@ -376,6 +379,12 @@ Foam::label Foam::addPatchCellLayer::addSideFace
)
{
otherPatchID = patches.whichPatch(faceI);
+ zoneI = mesh_.faceZones().whichZone(faceI);
+ if (zoneI != -1)
+ {
+ label index = mesh_.faceZones()[zoneI].whichFace(faceI);
+ flip = mesh_.faceZones()[zoneI].flipMap()[index];
+ }
break;
}
}
@@ -422,7 +431,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
false, // flux flip
otherPatchID, // patch for face
zoneI, // zone for face
- false // face zone flip
+ flip // face zone flip
)
);
}
@@ -488,7 +497,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
false, // flux flip
-1, // patch for face
zoneI, // zone for face
- false // face zone flip
+ flip // face zone flip
)
);
@@ -1027,12 +1036,21 @@ void Foam::addPatchCellLayer::setRefinement
// Get new neighbour
label nei;
label patchI;
+ label zoneI = -1;
+ bool flip = false;
+
if (i == addedCells[patchFaceI].size()-1)
{
// Top layer so is patch face.
nei = -1;
patchI = patchID[patchFaceI];
+ zoneI = mesh_.faceZones().whichZone(meshFaceI);
+ if (zoneI != -1)
+ {
+ const faceZone& fz = mesh_.faceZones()[zoneI];
+ flip = fz.flipMap()[fz.whichFace(meshFaceI)];
+ }
}
else
{
@@ -1055,7 +1073,7 @@ void Foam::addPatchCellLayer::setRefinement
false, // flux flip
patchI, // patch for face
zoneI, // zone for face
- false // face zone flip
+ flip // face zone flip
)
);
}
@@ -1076,8 +1094,6 @@ void Foam::addPatchCellLayer::setRefinement
layerFaces_[patchFaceI][0] = meshFaceI;
- label zoneI = mesh_.faceZones().whichZone(meshFaceI);
-
meshMod.setAction
(
polyModifyFace
@@ -1088,8 +1104,8 @@ void Foam::addPatchCellLayer::setRefinement
addedCells[patchFaceI][0], // neighbour
false, // face flip
-1, // patch for face
- false, // remove from zone
- zoneI, // zone for face
+ true, //false, // remove from zone
+ -1, //zoneI, // zone for face
false // face flip in zone
)
);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
index c778b65d0ad..23f47dfe0ab 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
@@ -322,7 +322,9 @@ void Foam::removeCells::setRefinement
if (zoneID >= 0)
{
const faceZone& fZone = faceZones[zoneID];
- zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+ // Note: we reverse the owner/neighbour of the face
+ // so should also select the other side of the zone
+ zoneFlip = !fZone.flipMap()[fZone.whichFace(faceI)];
}
//Pout<< "Putting exposed internal face " << faceI
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index f6266998a3e..bb5ac175064 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -276,28 +276,50 @@ void Foam::fvMeshSubset::subsetZones()
{
const faceZone& fz = faceZones[i];
- // Create list of mesh faces part of the new zone
- labelList subAddressing
- (
- subset
- (
- baseMesh().nFaces(),
- fz,
- faceMap()
- )
- );
-
- // Flipmap for all mesh faces
- boolList fullFlipStatus(baseMesh().nFaces(), false);
+ // Expand faceZone to full mesh
+ // +1 : part of faceZone, flipped
+ // -1 : ,, , unflipped
+ // 0 : not part of faceZone
+ labelList zone(baseMesh().nFaces(), 0);
forAll(fz, j)
{
- fullFlipStatus[fz[j]] = fz.flipMap()[j];
+ if (fz.flipMap()[j])
+ {
+ zone[fz[j]] = 1;
+ }
+ else
+ {
+ zone[fz[j]] = -1;
+ }
+ }
+
+ // Select faces
+ label nSub = 0;
+ forAll(faceMap(), j)
+ {
+ if (zone[faceMap()[j]] != 0)
+ {
+ nSub++;
+ }
}
- // Extract sub part
- boolList subFlipStatus(subAddressing.size(), false);
- forAll(subAddressing, j)
+ labelList subAddressing(nSub);
+ boolList subFlipStatus(nSub);
+ nSub = 0;
+ forAll(faceMap(), subFaceI)
{
- subFlipStatus[j] = fullFlipStatus[faceMap()[subAddressing[j]]];
+ label meshFaceI = faceMap()[subFaceI];
+ if (zone[meshFaceI] != 0)
+ {
+ subAddressing[nSub] = subFaceI;
+ label subOwner = subMesh().faceOwner()[subFaceI];
+ label baseOwner = baseMesh().faceOwner()[meshFaceI];
+ // If subowner is the same cell as the base keep the flip status
+ bool sameOwner = (cellMap()[subOwner] == baseOwner);
+ bool flip = (zone[meshFaceI] == 1);
+ subFlipStatus[nSub] = (sameOwner == flip);
+
+ nSub++;
+ }
}
fZonePtrs[i] = new faceZone
--
GitLab
From 1b152b6902d079af023e1c031b535de22af51858 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 15:28:27 +0100
Subject: [PATCH 29/77] BUG: paraview3/cshrc : using non-existing variable is
illegal in csh.
---
etc/apps/paraview3/cshrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index e8b85603ff0..ddb4502c275 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
end
# set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
+if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
--
GitLab
From 6f34c75d92144affed6ff40f864bed0a47d17a32 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 15:49:00 +0100
Subject: [PATCH 30/77] update
---
doc/changes/inotify.txt | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/doc/changes/inotify.txt b/doc/changes/inotify.txt
index 85a5aa4349f..146dc55a05a 100644
--- a/doc/changes/inotify.txt
+++ b/doc/changes/inotify.txt
@@ -1,7 +1,5 @@
2010-05-28
-
-Using asynchronous file modification (using inotify) instead of timestamp
-checking.
+Cleanup of automatic regIOobject rereading.
- all files (usually only IOdictionary) that need to be monitored
should be registered using MUST_READ_IF_MODIFIED. The MUST_READ should
@@ -11,7 +9,19 @@ files.
I've temporarily added a warning in IOdictionary if constructed with MUST_READ.
Same for IOList,IOField,IOMap if constructed with MUST_READ_IF_MODIFIED
(or is rereading supported?). Please let me know if something does not work or
-you see this warning.
+you see the warning
+ "Dictionary constructed with IOobject::MUST_READ instead of IOobject::MUST_READ_IF_MODIFIED." << nl
+
+
+- any monitored and modified file will get reloaded from the exact path
+that was monitored. In the old system it would/could do a re-search through all
+times.
+
+
+- all reductions to synchronise status on different processors are done with
+a single reduction instead of one reduction per registered object. This could
+be quite a gain on large numbers of processors.
+
- all file monitoring is done by an instance of 'fileMonitor' in the Time
class. The fileMonitor class can be found in OSspecific. Default is
@@ -19,26 +29,25 @@ to use the (linux-specific) 'inotify' system calls.
If compiled with -DFOAM_USE_STAT it will revert to the current 'stat' system
calls.
+
- inotify does not need timestamps. There is no need for fileModificationSkew
to allow for time differences. (there can still temporarily be a difference
in modified status between different processors due to nfs lagging)
-- all reductions to synchronise status on different processors are done with
-a single reduction instead of one reduction per registered object. This could
-be quite a gain on large numbers of processors.
- fileMonitor stores two hashtables per file so there is a small overhead
adding and removing files from monitoring.
+
- if runTimeModifiable is false at start of run no files will get monitored,
-however if runTimeModified gets set to false during the run and monitored files
+however if runTimeModified gets set to false during the run the files
will still get monitored (though never reloaded). This is only a hypothetical
problem in that the kernel still stores events for the monitored files. However
inotify is very efficient - e.g. it gets used to track changes on file systems
for desktop search engines.
-- any monitored and modified file will get reloaded from the exact path
-that was monitored. In the old system it would/could do a re-search through all
-times.
-
+- in the old system one could call modified() on any object and get
+and uptodate state. In the new system it will return the state from
+the last runTime++ (which if it triggered any re-reads will have reset the
+state anyway).
--
GitLab
From dd475e3c6b7ffd184eb6ac3e8f9b32a771cbec66 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 15:49:32 +0100
Subject: [PATCH 31/77] BUG: paraview3/cshrc : do not check non-existing vars
---
etc/apps/paraview3/cshrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index e8b85603ff0..ddb4502c275 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
end
# set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
+if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
--
GitLab
From 62b980f2034655f372e120a851ef75035ac0d7fd Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 1 Jun 2010 16:09:08 +0100
Subject: [PATCH 32/77] BUG: Fixing multiple processor patch problems in
parallel transfer of particles.
---
.../ProcessorTopology/ProcessorTopology.C | 30 +++++--
.../ProcessorTopology/ProcessorTopology.H | 3 +
src/lagrangian/basic/Cloud/Cloud.C | 89 +++++++++++++------
3 files changed, 87 insertions(+), 35 deletions(-)
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
index 85736f52e51..9aebf1d43d5 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
@@ -27,6 +27,7 @@ License
#include "ListOps.H"
#include "Pstream.H"
#include "commSchedule.H"
+#include "boolList.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -42,6 +43,8 @@ Foam::labelList Foam::ProcessorTopology<Patch, ProcPatch>::procNeighbours
label maxNb = 0;
+ boolList isNeighbourProc(Pstream::nProcs(), false);
+
forAll(patches, patchi)
{
const Patch& patch = patches[patchi];
@@ -51,19 +54,34 @@ Foam::labelList Foam::ProcessorTopology<Patch, ProcPatch>::procNeighbours
const ProcPatch& procPatch =
refCast<const ProcPatch>(patch);
- nNeighbours++;
+ label pNeighbProcNo = procPatch.neighbProcNo();
+
+ if (!isNeighbourProc[pNeighbProcNo])
+ {
+ nNeighbours++;
+
+ maxNb = max(maxNb, procPatch.neighbProcNo());
- maxNb = max(maxNb, procPatch.neighbProcNo());
+ isNeighbourProc[pNeighbProcNo] = true;
+ }
}
}
- labelList neighbours(nNeighbours);
+ labelList neighbours(nNeighbours, -1);
+
+ nNeighbours = 0;
+
+ forAll(isNeighbourProc, procI)
+ {
+ if (isNeighbourProc[procI])
+ {
+ neighbours[nNeighbours++] = procI;
+ }
+ }
procPatchMap_.setSize(maxNb + 1);
procPatchMap_ = -1;
- nNeighbours = 0;
-
forAll(patches, patchi)
{
const Patch& patch = patches[patchi];
@@ -73,8 +91,6 @@ Foam::labelList Foam::ProcessorTopology<Patch, ProcPatch>::procNeighbours
const ProcPatch& procPatch =
refCast<const ProcPatch>(patch);
- neighbours[nNeighbours++] = procPatch.neighbProcNo();
-
// Construct reverse map
procPatchMap_[procPatch.neighbProcNo()] = patchi;
}
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
index 2bb37934c66..d50ba659c45 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H
@@ -30,6 +30,9 @@ Description
*this[procI] gives the list of neighbouring processors.
+ TODO: This does not currently correctly support multiple processor
+ patches connecting two processors.
+
SourceFiles
ProcessorTopology.C
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index ceaf1c44d4f..95ae4d798a4 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -102,8 +102,18 @@ template<class TrackingData>
void Foam::Cloud<ParticleType>::move(TrackingData& td)
{
const globalMeshData& pData = polyMesh_.globalData();
- const labelList& processorPatches = pData.processorPatches();
- const labelList& processorPatchIndices = pData.processorPatchIndices();
+ const labelList& neighbourProcs = pData[Pstream::myProcNo()];
+ const labelList& procPatches = pData.processorPatches();
+ const labelList& procPatchIndices = pData.processorPatchIndices();
+ const labelList& procPatchNeighbours = pData.processorPatchNeighbours();
+ const polyBoundaryMesh& pbm = pMesh().boundaryMesh();
+
+ labelList neighbourProcIndices(Pstream::nProcs(), -1);
+
+ forAll(neighbourProcs, i)
+ {
+ neighbourProcIndices[neighbourProcs[i]] = i;
+ }
// Initialise the stepFraction moved for the particles
forAllIter(typename Cloud<ParticleType>, *this, pIter)
@@ -114,9 +124,19 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
// While there are particles to transfer
while (true)
{
- // List of lists of particles to be transfered for all the processor
- // patches
- List<IDLList<ParticleType> > transferList(processorPatches.size());
+ // List of lists of particles to be transfered for all of the
+ // neighbour processors
+ List<IDLList<ParticleType> > particleTransferLists
+ (
+ neighbourProcs.size()
+ );
+
+ // List of destination processorPatches indices for all of the
+ // neighbour processors
+ List<DynamicList<label> > patchIndexTransferLists
+ (
+ neighbourProcs.size()
+ );
// Loop over all particles
forAllIter(typename Cloud<ParticleType>, *this, pIter)
@@ -134,15 +154,28 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
// boundary face
if (Pstream::parRun() && p.facei_ >= pMesh().nInternalFaces())
{
- label patchi = pMesh().boundaryMesh().whichPatch(p.facei_);
- label n = processorPatchIndices[patchi];
+ label patchi = pbm.whichPatch(p.facei_);
// ... and the face is on a processor patch
// prepare it for transfer
- if (n != -1)
+ if (procPatchIndices[patchi] != -1)
{
+ label n = neighbourProcIndices
+ [
+ refCast<const processorPolyPatch>
+ (
+ pbm[patchi]
+ ).neighbProcNo()
+ ];
+
p.prepareForParallelTransfer(patchi, td);
- transferList[n].append(this->remove(&p));
+
+ particleTransferLists[n].append(this->remove(&p));
+
+ patchIndexTransferLists[n].append
+ (
+ procPatchNeighbours[patchi]
+ );
}
}
}
@@ -157,31 +190,30 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
break;
}
-
// Allocate transfer buffers
PstreamBuffers pBufs(Pstream::nonBlocking);
// Stream into send buffers
- forAll(transferList, i)
+ forAll(particleTransferLists, i)
{
- if (transferList[i].size())
+ if (particleTransferLists[i].size())
{
UOPstream particleStream
(
- refCast<const processorPolyPatch>
- (
- pMesh().boundaryMesh()[processorPatches[i]]
- ).neighbProcNo(),
+ neighbourProcs[i],
pBufs
);
- particleStream << transferList[i];
+ particleStream
+ << labelList(patchIndexTransferLists[i])
+ << particleTransferLists[i];
}
}
// Set up transfers when in non-blocking mode. Returns sizes (in bytes)
// to be sent/received.
labelListList allNTrans(Pstream::nProcs());
+
pBufs.finishedSends(allNTrans);
bool transfered = false;
@@ -203,34 +235,35 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
break;
}
-
// Retrieve from receive buffers
- forAll(processorPatches, i)
+ forAll(neighbourProcs, i)
{
- label patchi = processorPatches[i];
-
- const processorPolyPatch& procPatch =
- refCast<const processorPolyPatch>
- (pMesh().boundaryMesh()[patchi]);
+ label neighbProci = neighbourProcs[i];
- label neighbProci = procPatch.neighbProcNo();
+ label nRec = allNTrans[neighbProci][Pstream::myProcNo()];
- label nRecPs = allNTrans[neighbProci][Pstream::myProcNo()];
-
- if (nRecPs)
+ if (nRec)
{
UIPstream particleStream(neighbProci, pBufs);
+ labelList receivePatchIndex(particleStream);
+
IDLList<ParticleType> newParticles
(
particleStream,
typename ParticleType::iNew(*this)
);
+ label pI = 0;
+
forAllIter(typename Cloud<ParticleType>, newParticles, newpIter)
{
ParticleType& newp = newpIter();
+
+ label patchi = procPatches[receivePatchIndex[pI++]];
+
newp.correctAfterParallelTransfer(patchi, td);
+
addParticle(newParticles.remove(&newp));
}
}
--
GitLab
From 0b6d0300c94631cf56d45953c2caf136368939c9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 Jun 2010 17:23:47 +0100
Subject: [PATCH 33/77] ENH: cellSource postprocessing : allow all to select
all cells
---
.../field/fieldValues/cellSource/cellSource.C | 78 +++++++++----------
.../field/fieldValues/cellSource/cellSource.H | 3 +-
2 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index 97cd9393bd6..7f20d750473 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -32,14 +32,11 @@ License
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
-const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
-names[] =
-{
- "cellZone"
-};
+const char* NamedEnum<fieldValues::cellSource::sourceType, 2>::
+names[] = {"cellZone", "all"};
-const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
- Foam::fieldValues::cellSource::sourceTypeNames_;
+const NamedEnum<fieldValues::cellSource::sourceType, 2>
+ fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
@@ -57,35 +54,43 @@ const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
void Foam::fieldValues::cellSource::setCellZoneCells()
{
- label zoneId = mesh().cellZones().findZoneID(sourceName_);
-
- if (zoneId < 0)
+ switch (source_)
{
- FatalErrorIn("cellSource::cellSource::setCellZoneCells()")
- << "Unknown cell zone name: " << sourceName_
- << ". Valid cell zones are: " << mesh().cellZones().names()
- << nl << exit(FatalError);
- }
-
- const cellZone& cZone = mesh().cellZones()[zoneId];
+ case stCellZone:
+ {
+ label zoneId = mesh().cellZones().findZoneID(sourceName_);
+
+ if (zoneId < 0)
+ {
+ FatalErrorIn("cellSource::cellSource::setCellZoneCells()")
+ << "Unknown cell zone name: " << sourceName_
+ << ". Valid cell zones are: " << mesh().cellZones().names()
+ << nl << exit(FatalError);
+ }
+
+ cellId_ = mesh().cellZones()[zoneId];
+ nCells_ = returnReduce(cellId_.size(), sumOp<label>());
+ break;
+ }
- cellId_.setSize(cZone.size());
+ case stAll:
+ {
+ cellId_ = identity(mesh().nCells());
+ nCells_ = returnReduce(cellId_.size(), sumOp<label>());
+ break;
+ }
- label count = 0;
- forAll(cZone, i)
- {
- label cellI = cZone[i];
- cellId_[count] = cellI;
- count++;
+ default:
+ {
+ FatalErrorIn("cellSource::setCellZoneCells()")
+ << "Unknown source type. Valid source types are:"
+ << sourceTypeNames_ << nl << exit(FatalError);
+ }
}
- cellId_.setSize(count);
- nCells_ = returnReduce(cellId_.size(), sumOp<label>());
-
if (debug)
{
- Pout<< "Original cell zone size = " << cZone.size()
- << ", new size = " << count << endl;
+ Pout<< "Selected source size = " << cellId_.size() << endl;
}
}
@@ -94,20 +99,7 @@ void Foam::fieldValues::cellSource::setCellZoneCells()
void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
{
- switch (source_)
- {
- case stCellZone:
- {
- setCellZoneCells();
- break;
- }
- default:
- {
- FatalErrorIn("cellSource::initialise()")
- << "Unknown source type. Valid source types are:"
- << sourceTypeNames_ << nl << exit(FatalError);
- }
- }
+ setCellZoneCells();
Info<< type() << " " << name_ << ":" << nl
<< " total cells = " << nCells_ << nl
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index c271a1c997a..44f836428a9 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -89,7 +89,8 @@ public:
//- Source type enumeration
enum sourceType
{
- stCellZone
+ stCellZone,
+ stAll
};
//- Source type names
--
GitLab
From c51a2b0f63840d3c3fd3a0fa9cdf8cefe544a355 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 2 Jun 2010 09:48:07 +0100
Subject: [PATCH 34/77] ENH: have MUST_READ_IF_MODIFIED on IOdictionary
construction
---
TODO | 91 ++-----------------
.../DNS/dnsFoam/readTransportProperties.H | 2 +-
.../DNS/dnsFoam/readTurbulenceProperties.H | 2 +-
.../basic/laplacianFoam/createFields.H | 2 +-
.../basic/scalarTransportFoam/createFields.H | 2 +-
.../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 2 +-
.../solvers/combustion/PDRFoam/createFields.H | 2 +-
.../PDRFoam/readCombustionProperties.H | 2 +-
.../XiFoam/readCombustionProperties.H | 2 +-
.../readCombustionProperties.H | 2 +-
.../combustion/fireFoam/createFields.H | 2 +-
.../reactingFoam/readChemistryProperties.H | 2 +-
.../rhoReactingFoam/readChemistryProperties.H | 2 +-
.../readThermophysicalProperties.H | 2 +-
.../readThermodynamicProperties.H | 2 +-
.../readThermodynamicProperties.H | 2 +-
.../readThermodynamicProperties.H | 2 +-
.../sonicDyMFoam/readTransportProperties.H | 2 +-
.../readThermodynamicProperties.H | 2 +-
.../sonicLiquidFoam/readTransportProperties.H | 2 +-
.../readmdEquilibrationDict.H | 2 +-
.../electrostaticFoam/createFields.H | 2 +-
.../magneticFoam/createFields.H | 2 +-
.../electromagnetics/mhdFoam/createFields.H | 2 +-
.../financial/financialFoam/createFields.H | 2 +-
.../regionProperties/regionProperties.C | 2 +-
.../boundaryFoam/createFields.H | 2 +-
.../channelFoam/readTransportProperties.H | 2 +-
.../incompressible/icoFoam/createFields.H | 2 +-
.../readGravitationalAcceleration.H | 2 +-
.../readChemistryProperties.H | 2 +-
.../createFields.H | 2 +-
.../readChemistryProperties.H | 2 +-
.../reactingParcelFilmFoam/createFields.H | 2 +-
.../readChemistryProperties.H | 2 +-
.../readChemistryProperties.H | 2 +-
.../multiphase/bubbleFoam/createFields.H | 2 +-
.../bubbleFoam/createRASTurbulence.H | 2 +-
.../readThermodynamicProperties.H | 2 +-
.../phaseChangeTwoPhaseMixtureNew.C | 2 +-
.../multiphase/settlingFoam/createFields.H | 4 +-
.../twoPhaseEulerFoam/createFields.H | 4 +-
.../kineticTheoryModel/kineticTheoryModel.C | 2 +-
.../twoPhaseEulerFoam/readPPProperties.H | 2 +-
.../readMechanicalProperties.H | 2 +-
.../readThermalProperties.H | 2 +-
applications/test/LduMatrix/createFields.H | 2 +-
applications/test/dataEntry/testDataEntry.C | 2 +-
.../fvSolutionCombine/fvSolutionCombine.C | 2 +-
.../estimateScalarError/estimateScalarError.C | 2 +-
.../icoErrorEstimate/icoErrorEstimate.C | 2 +-
.../icoMomentError/icoMomentError.C | 2 +-
.../momentScalarError/momentScalarError.C | 2 +-
.../advanced/autoRefineMesh/autoRefineMesh.C | 4 +-
.../combinePatchFaces/combinePatchFaces.C | 2 +-
.../mesh/advanced/modifyMesh/modifyMesh.C | 2 +-
.../mesh/advanced/selectCells/edgeStats.C | 2 +-
.../mesh/advanced/selectCells/selectCells.C | 2 +-
.../conversion/foamToStarMesh/getTimeIndex.H | 2 +-
.../conversion/foamToSurface/getTimeIndex.H | 2 +-
.../mesh/generation/blockMesh/blockMeshApp.C | 4 +-
.../mesh/generation/extrudeMesh/extrudeMesh.C | 2 +-
.../generation/snappyHexMesh/snappyHexMesh.C | 4 +-
.../manipulation/createPatch/createPatch.C | 2 +-
.../manipulation/mirrorMesh/mirrorFvMesh.C | 2 +-
.../manipulation/mirrorMesh/readMirrorDict.H | 2 +-
.../mesh/manipulation/refineMesh/refineMesh.C | 2 +-
.../manipulation/renumberMesh/renumberMesh.C | 2 +-
.../mesh/manipulation/stitchMesh/stitchMesh.C | 2 +-
.../mesh/manipulation/topoSet/topoSet.C | 4 +-
.../decomposePar/decomposePar.C | 2 +-
.../decomposePar/domainDecomposition.C | 2 +-
.../redistributeMeshPar/redistributeMeshPar.C | 2 +-
.../foamDataToFluent/foamDataToFluent.C | 2 +-
.../foamToEnsightParts/getTimeIndex.H | 2 +-
.../foamToGMV/readConversionProperties.H | 2 +-
.../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 2 +-
.../vtkPV3blockMesh/vtkPV3blockMesh.C | 2 +-
.../fieldview9Reader/readerDatabase.C | 2 +-
.../lagrangian/particleTracks/createFields.H | 2 +-
.../execFlowFunctionObjects.C | 14 +--
.../miscellaneous/pdfPlot/createFields.H | 2 +-
.../miscellaneous/postChannel/postChannel.C | 2 +-
.../postChannel/readTransportProperties.H | 2 +-
.../postProcessing/velocityField/Mach/Mach.C | 2 +-
.../Mach/readThermodynamicProperties.H | 2 +-
.../postProcessing/velocityField/Pe/Pe.C | 8 +-
.../preProcessing/boxTurb/readBoxTurbDict.H | 2 +-
.../changeDictionary/changeDictionary.C | 4 +-
.../dsmcInitialise/dsmcInitialise.C | 2 +-
.../preProcessing/engineSwirl/createFields.H | 2 +-
.../foamUpgradeCyclics/foamUpgradeCyclics.C | 2 +-
.../foamUpgradeFvSolution.C | 2 +-
.../preProcessing/mapFields/mapFields.C | 10 +-
.../preProcessing/mdInitialise/mdInitialise.C | 2 +-
.../preProcessing/setFields/setFields.C | 2 +-
.../wallFunctionTable/wallFunctionTableApp.C | 2 +-
.../surfaceMeshExport/surfaceMeshExport.C | 2 +-
.../equilibriumCO/equilibriumCO.C | 2 +-
src/OSspecific/POSIX/fileMonitor.C | 35 ++++++-
src/OpenFOAM/db/IOobject/IOobject.C | 6 +-
src/OpenFOAM/db/IOobject/IOobject.H | 12 +++
src/OpenFOAM/db/IOobject/IOobjectReadHeader.C | 4 +-
src/OpenFOAM/db/IOobjects/IOField/IOField.C | 58 +++++++++++-
src/OpenFOAM/db/IOobjects/IOList/IOList.C | 56 +++++++++++-
src/OpenFOAM/db/IOobjects/IOMap/IOMap.C | 20 +++-
.../db/IOobjects/IOPtrList/IOPtrList.C | 20 +++-
.../db/IOobjects/IOdictionary/IOdictionary.C | 34 ++++++-
src/OpenFOAM/db/Time/Time.C | 47 +++++++++-
src/OpenFOAM/db/Time/Time.H | 32 ++++++-
src/OpenFOAM/db/Time/TimeIO.C | 44 +++++----
src/OpenFOAM/db/Time/findInstance.C | 8 +-
.../IOOutputFilter/IOOutputFilter.H | 2 +-
.../db/objectRegistry/objectRegistry.C | 4 +-
.../db/objectRegistry/objectRegistry.H | 1 -
src/OpenFOAM/db/regIOobject/regIOobject.C | 34 ++++++-
src/OpenFOAM/db/regIOobject/regIOobject.H | 15 ++-
src/OpenFOAM/db/regIOobject/regIOobjectI.H | 12 +++
src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 71 +++++++--------
.../db/regIOobject/regIOobjectWrite.C | 4 +-
.../GeometricField/GeometricField.C | 8 +-
src/OpenFOAM/matrices/solution/solution.C | 2 +-
src/OpenFOAM/matrices/tolerances/tolerances.C | 2 +-
.../polyBoundaryMesh/polyBoundaryMesh.C | 21 ++++-
.../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 15 +++
.../dynamicFvMesh/dynamicFvMeshNew.C | 2 +-
.../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C | 5 +-
.../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 +-
.../solidBodyMotionFvMesh.C | 5 +-
src/dynamicMesh/motionSolver/motionSolver.C | 4 +-
.../polyTopoChange/refinementHistory.C | 38 ++++++++
.../polyTopoChanger/polyTopoChanger.C | 10 ++
.../featureEdgeMesh/featureEdgeMesh.C | 20 ++++
.../engineMesh/engineMesh/engineMeshNew.C | 2 +-
src/engine/engineTime/engineTime.C | 2 +-
.../cfdTools/general/MRF/MRFZones.C | 2 +-
.../general/SRF/SRFModel/SRFModel/SRFModel.C | 2 +-
.../SRF/SRFModel/SRFModel/SRFModelNew.C | 2 +-
.../pressureGradientExplicitSource.C | 2 +-
.../finiteVolume/fvSchemes/fvSchemes.C | 2 +-
.../displacementInterpolationFvMotionSolver.C | 2 +-
src/lagrangian/basic/Cloud/CloudIO.C | 2 +-
src/lagrangian/dieselSpray/spray/spray.C | 4 +-
.../clouds/Templates/DsmcCloud/DsmcCloud.C | 4 +-
.../Templates/KinematicCloud/KinematicCloud.C | 2 +-
.../InjectionModel/InjectionModel.C | 2 +-
.../mdTools/createAutoCorrelationFunctions.H | 2 +-
.../molecule/moleculeCloud/moleculeCloud.C | 2 +-
.../potential/potential/potential.C | 8 +-
.../solidParticle/solidParticleCloud.C | 2 +-
.../distributedTriSurfaceMesh.C | 2 +-
.../cellSources/fieldToCell/fieldToCell.C | 3 +-
src/meshTools/sets/topoSets/cellZoneSet.C | 1 +
src/meshTools/sets/topoSets/faceZoneSet.C | 1 +
src/meshTools/sets/topoSets/pointZoneSet.C | 3 +-
src/meshTools/sets/topoSets/topoSet.C | 2 +
.../fieldAverage/fieldAverage/fieldAverage.C | 2 +-
src/sampling/include/buildPatch.H | 2 +-
src/surfMesh/MeshedSurface/MeshedSurface.C | 2 +-
.../surfZone/surfZone/surfZoneIOList.C | 6 +-
.../kinematicSingleLayer.C | 2 +-
.../surfaceFilmModel/surfaceFilmModel.C | 4 +-
.../surfaceFilmModel/surfaceFilmModelNew.C | 2 +-
.../basic/basicThermo/basicThermo.C | 2 +-
.../basicPsiThermo/basicPsiThermoNew.C | 2 +-
.../basicRhoThermo/basicRhoThermoNew.C | 2 +-
.../basicChemistryModel/basicChemistryModel.C | 2 +-
.../psiChemistryModel/psiChemistryModelNew.C | 2 +-
.../rhoChemistryModel/rhoChemistryModelNew.C | 2 +-
.../laminarFlameSpeed/laminarFlameSpeedNew.C | 2 +-
.../interpolationLookUpTable.C | 2 +-
.../radiationModel/radiationModel.C | 4 +-
.../radiationModel/radiationModelNew.C | 2 +-
.../hCombustionThermo/hCombustionThermoNew.C | 4 +-
.../hhuCombustionThermoNew.C | 2 +-
.../hsCombustionThermoNew.C | 4 +-
.../hReactionThermo/hReactionThermoNew.C | 4 +-
.../hsReactionThermo/hsReactionThermoNew.C | 4 +-
.../linearValveFvMesh/linearValveFvMesh.C | 5 +-
.../linearValveLayersFvMesh.C | 5 +-
.../mixerFvMesh/mixerFvMesh.C | 5 +-
.../movingConeTopoFvMesh.C | 5 +-
.../transportModel/transportModel.C | 2 +-
.../surfacePatch/surfacePatchIOList.C | 20 +++-
.../compressible/LES/LESModel/LESModel.C | 4 +-
.../compressible/RAS/RASModel/RASModel.C | 4 +-
.../regionProperties.C | 2 +-
.../turbulenceModel/turbulenceModel.C | 2 +-
.../incompressible/LES/LESModel/LESModel.C | 4 +-
.../incompressible/RAS/RASModel/RASModel.C | 4 +-
...UTabulatedWallFunctionFvPatchScalarField.C | 2 +-
.../turbulenceModel/turbulenceModel.C | 2 +-
192 files changed, 766 insertions(+), 398 deletions(-)
diff --git a/TODO b/TODO
index de142d2889f..aab3581489b 100644
--- a/TODO
+++ b/TODO
@@ -1,100 +1,23 @@
-- allocate/free tags.
-Not tested.
+- check
+ new fvMesh
+ new fvMeshSubset
+for consistency with createMesh.H
-OK - test blockMesh with cyclics
-unitTestCases/singleCyclic/
-OK - test cyclics sequential running.
-unitTestCases/singleCyclic/
-OK - test decomposePar
-tested channel395
+- Check the following:
-OK - FaceCellWave
- unitTestCases/twoCavityCyclicForWallDistance/
+doc/changes/inotify.txt
+
-OK - non-parallel finite volume : channelFoam
- unitTestCases/channel395-splitCyclic vs. channel395-dev
-OK - parallel finite volume with processorCyclic: channelFoam
- unitTestCases/channel395-splitCyclic vs. channel395-dev
-OK - preProcessing/foamUpgradeCyclics
-OK - gamg - sequential.
-Tested on channel395-splitCyclic with GAMG.
-OK - gamg parallel.
-Tested on channel395-splitCyclic with GAMG.
-- initTransfer in GAMGprocessorInterfaces using nonblocking+tags
-untested.
-OK - cyclic baffles.
-Tested on t-junction-with-fan
-OK. - jumpCyclics/fanFvPatchField. All usages of jump() now need to account
-for being owner() or not.
-Tested on t-junction-with-fan.
-OK - regionSplit
-tested on singleCyclic
-OK - pointFields on cyclics. volPointInterpolation.
-tested on channel395-splitCyclic
-OK - fvMeshSubset
-tested on singleCyclic
-OK - pointEdgeWave (maybe test through inversePointDistanceDiffusivity?)
-tested on twoCavityCyclicForWallDistance
-OK - scotchDecomp
-tested with testCalcCSR on twoCavityCyclicForWallDistance
-
-NOT WORKING - fvMeshDistribute to split cyclic patches into ones
- with different separation.
-tested on singleCyclic
-
-OK - test createPatch pointSync
-note: only works if face-centre position of 0th faces is ok since uses
-this for separation. Should in fact make cyclic planar using patch centre and
-normal?
-test on twoCavityCyclicForWallDistance with point (0 1 0) set to (0 1.001 0)
-
-NO PROBLEM - renumberMesh
-It doesn't do renumbering through cyclics.
-
-OK - rotational cyclics.
-Tested on movingCone-with-cyclics
-
-OK - LUscalarMatrix::convert still expects interfaces to be cyclic
-tested on channel395 with 'directSolveCoarsest true;'
-
-OK - grep for size()/2
-
-- all tutorials with cyclics:
- OK - incompressible/DNS/dnsFoam/boxTurb16
- OK - incompressible/channelFoam/channel395
- slight differences due to divergence. combustion/XiFoam/les/pitzDaily3D
- OK - no cyclics. combustion/fireFoam/les/smallPoolFire2D
- discreteMethods/dsmcFoam/freeSpacePeriodic
- discreteMethods/dsmcFoam/wedge15Ma5
- discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon
- OK - incompressible/boundaryFoam/boundaryLaunderSharma
- OK - incompressible/boundaryFoam/boundaryWallFunctions
- OK - incompressible/boundaryFoam/boundaryWallFunctionsProfile
- OK - needs createBaffles. incompressible/pimpleFoam/t-junction-with-fan
- OK - incompressible/simpleSRFFoam/mixer
- OK - needs createBaffles. lagrangian/porousExplicitSourceReactingParcelFoam/filter
- needs special coupledbcs. lagrangian/reactingParcelFilmFoam/multipleBoxes
-
-
-OK - createBaffles
-
-- have foamUpgradeCyclics split 'value' field
-- activeBaffleVelocity
-- kivaToFoam/readKivaGrid.H sorts cyclics (but in incorrect order?)
-- isoSurface.C
-- referredCellList.C
-- work out scheduled communication?
-OK - add neighbourPatch checking to 16x.
diff --git a/applications/solvers/DNS/dnsFoam/readTransportProperties.H b/applications/solvers/DNS/dnsFoam/readTransportProperties.H
index 77af096bf8a..0d809085427 100644
--- a/applications/solvers/DNS/dnsFoam/readTransportProperties.H
+++ b/applications/solvers/DNS/dnsFoam/readTransportProperties.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
index 20fd654ceff..ba1d5dcd802 100644
--- a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
+++ b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
@@ -7,7 +7,7 @@
"turbulenceProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/basic/laplacianFoam/createFields.H b/applications/solvers/basic/laplacianFoam/createFields.H
index 3359f2896c2..616afe1a885 100644
--- a/applications/solvers/basic/laplacianFoam/createFields.H
+++ b/applications/solvers/basic/laplacianFoam/createFields.H
@@ -23,7 +23,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H
index 54a0bc45eca..07731be3d6e 100644
--- a/applications/solvers/basic/scalarTransportFoam/createFields.H
+++ b/applications/solvers/basic/scalarTransportFoam/createFields.H
@@ -39,7 +39,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
index 385b9e53f0f..32b525859e7 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
@@ -62,7 +62,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
"combustionProperties",
Su.mesh().time().constant(),
Su.mesh(),
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
),
thermo
diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index 74a18ab6f5a..233383ab1cc 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -110,7 +110,7 @@
"PDRProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/PDRFoam/readCombustionProperties.H b/applications/solvers/combustion/PDRFoam/readCombustionProperties.H
index 9f4435b2519..acc5cb78686 100644
--- a/applications/solvers/combustion/PDRFoam/readCombustionProperties.H
+++ b/applications/solvers/combustion/PDRFoam/readCombustionProperties.H
@@ -7,7 +7,7 @@
"combustionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/XiFoam/readCombustionProperties.H b/applications/solvers/combustion/XiFoam/readCombustionProperties.H
index da0a3a94a24..58b0626fb41 100644
--- a/applications/solvers/combustion/XiFoam/readCombustionProperties.H
+++ b/applications/solvers/combustion/XiFoam/readCombustionProperties.H
@@ -7,7 +7,7 @@
"combustionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H b/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H
index 687d83ea946..84cf9b9756a 100644
--- a/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H
+++ b/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H
@@ -7,7 +7,7 @@ IOdictionary combustionProperties
"combustionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H
index 95bda056065..9a6274bb1a7 100644
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@@ -65,7 +65,7 @@ IOdictionary combustionProperties
"combustionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/combustion/reactingFoam/readChemistryProperties.H b/applications/solvers/combustion/reactingFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/combustion/reactingFoam/readChemistryProperties.H
+++ b/applications/solvers/combustion/reactingFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
+++ b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
index 435bcb7745e..5a63169d123 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
@@ -9,7 +9,7 @@ IOdictionary thermophysicalProperties
"thermophysicalProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H
index 1fc57fc5fdc..4e19adaae48 100644
--- a/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
index 3b8c82c8e59..2be7ce63ffd 100644
--- a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
index 1fc57fc5fdc..4e19adaae48 100644
--- a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H b/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H
index 1502e2033a0..c30f65b4458 100644
--- a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H
+++ b/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H
index d8dad7d8003..82f3655f465 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
index 1502e2033a0..c30f65b4458 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
+++ b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
index b94745d9df2..3f43981907d 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
@@ -7,7 +7,7 @@ IOdictionary mdEquilibrationDict
"mdEquilibrationDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H
index 64522273b81..04c86c4edb5 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H
+++ b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H
@@ -7,7 +7,7 @@
"physicalProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/electromagnetics/magneticFoam/createFields.H b/applications/solvers/electromagnetics/magneticFoam/createFields.H
index a3712c19aa1..22d40089213 100644
--- a/applications/solvers/electromagnetics/magneticFoam/createFields.H
+++ b/applications/solvers/electromagnetics/magneticFoam/createFields.H
@@ -21,7 +21,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H
index 04e05c032d0..fb5a0049322 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createFields.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/financial/financialFoam/createFields.H b/applications/solvers/financial/financialFoam/createFields.H
index 6cdbbe2bde3..dc0da4d2a3e 100644
--- a/applications/solvers/financial/financialFoam/createFields.H
+++ b/applications/solvers/financial/financialFoam/createFields.H
@@ -7,7 +7,7 @@
"financialProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.C
index 89eaaabd480..f85e8f5440a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.C
@@ -36,7 +36,7 @@ Foam::regionProperties::regionProperties(const Time& runTime)
"regionProperties",
runTime.time().constant(),
runTime.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index e99a9900131..90a66649892 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -44,7 +44,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/incompressible/channelFoam/readTransportProperties.H b/applications/solvers/incompressible/channelFoam/readTransportProperties.H
index 87c93c91958..abaee647c75 100644
--- a/applications/solvers/incompressible/channelFoam/readTransportProperties.H
+++ b/applications/solvers/incompressible/channelFoam/readTransportProperties.H
@@ -6,7 +6,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index 6a7d6b9a80a..02093c39386 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
index d609c186144..d8a8bf8d062 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
@@ -7,7 +7,7 @@ IOdictionary gravitationalProperties
"gravitationalProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H b/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
index 179ac149bad..0ad057e2299 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index 8048acd6484..909d0351f70 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -97,7 +97,7 @@
"additionalControls",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/readChemistryProperties.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/readChemistryProperties.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H
index ab51afe2836..f0bcf7597fc 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H
@@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 9367838a52b..57bb7e88d50 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -91,7 +91,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
index 1ae6219fd6f..015cfbb8374 100644
--- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
+++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
@@ -5,7 +5,7 @@
"RASProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
index d3fbb9307aa..3740f105633 100644
--- a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
index bffffd6aae8..27da4ad0c02 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
@@ -46,7 +46,7 @@ Foam::phaseChangeTwoPhaseMixture::New
"transportProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index c8e05c4209c..75d19c67797 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -50,7 +50,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -184,7 +184,7 @@
"RASProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 8a126905810..308a1089fb9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -153,7 +153,7 @@
"interfacialProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 611ce8fa167..57096ebd0c7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -56,7 +56,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
"kineticTheoryProperties",
Ua_.time().constant(),
Ua_.mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
index 3acbf758d04..c1b319cbc96 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H
@@ -5,7 +5,7 @@
"ppProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
index 91bd5f3da20..9f256bd6891 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@@ -7,7 +7,7 @@
"mechanicalProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
index a4c3082fb5a..12e10a607b4 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@@ -7,7 +7,7 @@
"thermalProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/test/LduMatrix/createFields.H b/applications/test/LduMatrix/createFields.H
index ea64f13026b..57714aa7871 100644
--- a/applications/test/LduMatrix/createFields.H
+++ b/applications/test/LduMatrix/createFields.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/testDataEntry.C
index 583701322b0..456f0d478d5 100644
--- a/applications/test/dataEntry/testDataEntry.C
+++ b/applications/test/dataEntry/testDataEntry.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
"dataEntryProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/test/fvSolutionCombine/fvSolutionCombine.C b/applications/test/fvSolutionCombine/fvSolutionCombine.C
index a98d803bf37..19abc81611f 100644
--- a/applications/test/fvSolutionCombine/fvSolutionCombine.C
+++ b/applications/test/fvSolutionCombine/fvSolutionCombine.C
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
dictName,
"system",
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
index 9b305731db1..8b2339233ca 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
+++ b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
index 33486ec3017..05a7e5c57cd 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
index 57629b59807..d0f668c8c9b 100644
--- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
+++ b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
index 72744a9f8d5..246380a029f 100644
--- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
+++ b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index c2f3640f2d1..3ef371188ec 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -639,7 +639,7 @@ int main(int argc, char *argv[])
"motionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@@ -669,7 +669,7 @@ int main(int argc, char *argv[])
"autoRefineMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 0b09b7859d7..21c9f5867a2 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -74,7 +74,7 @@ void checkSnapMesh
"snapMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 7cd57e792d5..befadc88e2d 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
"modifyMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.C b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
index 561cef9bfdf..103d963be5a 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.C
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
@@ -78,7 +78,7 @@ Foam::edgeStats::edgeStats(const polyMesh& mesh)
"motionProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index 8f798460504..f5ad8412f79 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
"selectCellsDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
index 85a92405dda..d722c432e3b 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
@@ -29,7 +29,7 @@
runTime.timeName(),
"uniform",
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
index 85a92405dda..d722c432e3b 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
@@ -29,7 +29,7 @@
runTime.timeName(),
"uniform",
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 3f8086bb803..a0baebaae71 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
: dictPath
),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
runTime.constant(),
polyMeshDir,
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 1d0ce53e738..9d28de41093 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
runTimeExtruded.constant(),
regionDir,
runTimeExtruded,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
);
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index e93112a4313..7ced14726d9 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
"snappyHexMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 43652bbbeae..7f80d01e5d9 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -532,7 +532,7 @@ int main(int argc, char *argv[])
: word::null
),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index f5b79e7de14..96a092fb227 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -39,7 +39,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
"mirrorMeshDict",
time().system(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/readMirrorDict.H b/applications/utilities/mesh/manipulation/mirrorMesh/readMirrorDict.H
index 6116514701e..138898842bf 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/readMirrorDict.H
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/readMirrorDict.H
@@ -7,7 +7,7 @@
"mirrorMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index ba3170d2810..f890c845466 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
"refineMeshDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 495e07f2901..19a80bac5f0 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 733cef024b8..9790aec1e14 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
args.options()["toleranceDict"],
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index 6f1c9957e4d..54fd6e0deea 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
(
dictPath,
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
: IOobject
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
dictName,
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
)
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index b50db4a76cc..5130f14da31 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
runTime.time().system(),
regionDir, // use region if non-standard
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 6575c31dd3e..2cc5c26b1a4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -94,7 +94,7 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
"decomposeParDict",
time().system(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index c3a2003d40b..5df7310f8ea 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index d469054ca31..35f6544f4d1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
"foamDataToFluentDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
index ecf12f8b137..491ada9a43d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
@@ -26,7 +26,7 @@
if (io.headerOk())
{
- io.readOpt() = IOobject::MUST_READ;
+ io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
IOdictionary timeObject(io);
timeObject.lookup("index") >> timeIndex;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
index b19e03ab198..60b547dfd2c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
@@ -5,7 +5,7 @@ IOdictionary conversionProperties
"conversionProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index a73b46621ed..1cd6f06b030 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -444,7 +444,7 @@ void Foam::vtkPV3Foam::updateFoamMesh()
meshRegion_,
dbPtr_().timeName(),
dbPtr_(),
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
index a7483a210c0..d11d2ae5bab 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
@@ -315,7 +315,7 @@ void Foam::vtkPV3blockMesh::updateFoamMesh()
dbPtr_().constant(),
polyMesh::meshSubDir,
dbPtr_(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
index e18963c3d13..536eed7fb49 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
@@ -260,7 +260,7 @@ void Foam::readerDatabase::loadMesh()
meshPtr_ = new fvMeshSubset
(
*runTimePtr_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::AUTO_WRITE
);
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 61c126e492a..d7ede226bf7 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -5,7 +5,7 @@ IOdictionary propsDict
"particleTrackProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
);
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 89858615820..ccc1ec29484 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -62,7 +62,7 @@ namespace Foam
args["dict"],
runTime.system(),
runTime,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
);
@@ -130,7 +130,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@@ -140,7 +140,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@@ -184,7 +184,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -214,7 +214,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@@ -224,7 +224,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@@ -266,7 +266,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index ddb1f663ad7..d7501086542 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -5,7 +5,7 @@
"pdfDict",
runTime.constant(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index 8c9cb587172..7d71845adb8 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
"postChannelDict",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/readTransportProperties.H b/applications/utilities/postProcessing/miscellaneous/postChannel/readTransportProperties.H
index 1e4bdd42928..cef26f6c352 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/readTransportProperties.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/readTransportProperties.H
@@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 53bd1a24880..391eee52374 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -98,7 +98,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/velocityField/Mach/readThermodynamicProperties.H b/applications/utilities/postProcessing/velocityField/Mach/readThermodynamicProperties.H
index 1fc57fc5fdc..4e19adaae48 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/readThermodynamicProperties.H
+++ b/applications/utilities/postProcessing/velocityField/Mach/readThermodynamicProperties.H
@@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index a94f474d110..8e26d3f33aa 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -81,7 +81,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@@ -90,7 +90,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@@ -174,7 +174,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -299,7 +299,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/boxTurb/readBoxTurbDict.H b/applications/utilities/preProcessing/boxTurb/readBoxTurbDict.H
index 60063b9d224..bcf5625a07c 100644
--- a/applications/utilities/preProcessing/boxTurb/readBoxTurbDict.H
+++ b/applications/utilities/preProcessing/boxTurb/readBoxTurbDict.H
@@ -7,7 +7,7 @@
"boxTurbDict",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 69a201e5587..e917feaa708 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
"changeDictionaryDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -405,7 +405,7 @@ int main(int argc, char *argv[])
fieldName,
instance,
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index d779a6427d3..edd7d7e7521 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
+++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
"dsmcInitialiseDict",
mesh.time().system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/engineSwirl/createFields.H b/applications/utilities/preProcessing/engineSwirl/createFields.H
index 596273a9bdc..11975d3717f 100644
--- a/applications/utilities/preProcessing/engineSwirl/createFields.H
+++ b/applications/utilities/preProcessing/engineSwirl/createFields.H
@@ -7,7 +7,7 @@ IOdictionary engineGeometry
"engineGeometry",
runTime.constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index cce68316c0c..ce0c4a8a691 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -279,7 +279,7 @@ void rewriteField
fieldName,
runTime.timeName(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
index 0cdf0cbe775..202ebad86d7 100644
--- a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
+++ b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
"fvSolution",
runTime.system(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 72dae9f8389..0eabfe6d3cb 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
"mapFieldsDict",
runTimeTarget.system(),
runTimeTarget,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeSource.system(),
runTimeSource,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeTarget.system(),
runTimeTarget,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeSource.system(),
runTimeSource,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -464,7 +464,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeTarget.system(),
runTimeTarget,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index 6e329a271f7..abefc1a0b2b 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
"mdInitialiseDict",
runTime.system(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index b3cbd8c8bcc..6676403d53e 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
"setFieldsDict",
runTime.system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
index 9c5b70c9680..8f9e755d45a 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
"wallFunctionDict",
runTime.constant(),
mesh,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
);
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index dda71c3565a..3995031b536 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
importName,
runTime.constant(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index c9c02d199b4..7a0c9baae37 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
"BurcatCpData",
runTime.constant(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 2103aa242d8..f7f0246c986 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -30,6 +30,7 @@ Class
#include "IOstreams.H"
#include "Pstream.H"
#include "PackedList.H"
+#include "PstreamReduceOps.H"
#ifdef FOAM_USE_STAT
# include "OSspecific.H"
@@ -57,12 +58,14 @@ const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
namespace Foam
{
- class fileStateEqOp
+ // Reduction operator for PackedList of fileState
+ class reduceFileStates
{
public:
- void operator()(unsigned int& x, const unsigned int& y) const
+ unsigned int operator()(const unsigned int x, const unsigned int y)
+ const
{
- // x,y are list of 2bits representing fileState
+ // x,y are sets of 2bits representing fileState
unsigned int mask = 3u;
unsigned int shift = 0;
@@ -82,7 +85,17 @@ namespace Foam
shift += 2;
mask <<= 2;
}
- x = result;
+ return result;
+ }
+ };
+
+ // Combine operator for PackedList of fileState
+ class combineReduceFileStates
+ {
+ public:
+ void operator()(unsigned int& x, const unsigned int y) const
+ {
+ x = reduceFileStates()(x, y);
}
};
}
@@ -323,7 +336,19 @@ void Foam::fileMonitor::updateStates(const bool syncPar) const
// Save local state for warning message below
PackedList<2> thisProcStats(stats);
- Pstream::listCombineGather(stats.storage(), fileStateEqOp());
+ if (stats.storage().size() == 1)
+ {
+ // Optimisation valid for most cases.
+ reduce(stats.storage()[0], reduceFileStates());
+ }
+ else
+ {
+ Pstream::listCombineGather
+ (
+ stats.storage(),
+ combineReduceFileStates()
+ );
+ }
i = 0;
forAllIter(Map<fileState>, state_, iter)
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index b9a0a258935..77617b64fc5 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -316,8 +316,12 @@ Foam::fileName Foam::IOobject::filePath() const
Foam::Istream* Foam::IOobject::objectStream()
{
- fileName fName = filePath();
+ return objectStream(filePath());
+}
+
+Foam::Istream* Foam::IOobject::objectStream(const fileName& fName)
+{
if (fName.size())
{
IFstream* isPtr = new IFstream(fName);
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 32ce285bfd8..4bb0a7c6c34 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -39,9 +39,16 @@ Description
@param MUST_READ
Object must be read from Istream on construction. \n
Error if Istream does not exist or can't be read.
+ Does not check timestamp or re-read.
+ @param MUST_READ_IF_MODIFIED
+ Object must be read from Istream on construction. \n
+ Error if Istream does not exist or can't be read. If object is
+ registered its timestamp will be checked every timestep and possibly
+ re-read.
@param READ_IF_PRESENT
Read object from Istream if Istream exists, otherwise don't. \n
Error only if Istream exists but can't be read.
+ Does not check timestamp or re-read.
@param NO_READ
Don't read
@@ -100,6 +107,7 @@ public:
enum readOption
{
MUST_READ,
+ MUST_READ_IF_MODIFIED,
READ_IF_PRESENT,
NO_READ
};
@@ -154,6 +162,10 @@ protected:
// The results is NULL if the stream construction failed
Istream* objectStream();
+ //- Construct and return an IFstream for the object given the
+ // exact file. The results is NULL if the stream construction failed
+ Istream* objectStream(const fileName&);
+
//- Set the object state to bad
void setBad(const string&);
diff --git a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
index fc85d5fa263..1f296fb7da7 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
@@ -39,7 +39,7 @@ bool Foam::IOobject::readHeader(Istream& is)
// Check Istream not already bad
if (!is.good())
{
- if (rOpt_ == MUST_READ)
+ if (rOpt_ == MUST_READ || rOpt_ == MUST_READ_IF_MODIFIED)
{
FatalIOErrorIn("IOobject::readHeader(Istream&)", is)
<< " stream not open for reading essential object from file "
@@ -102,7 +102,7 @@ bool Foam::IOobject::readHeader(Istream& is)
}
else
{
- if (rOpt_ == MUST_READ)
+ if (rOpt_ == MUST_READ || rOpt_ == MUST_READ_IF_MODIFIED)
{
FatalIOErrorIn("IOobject::readHeader(Istream&)", is)
<< " stream failure while reading header"
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 3b16672ea4a..4af4f270732 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -32,9 +32,21 @@ Foam::IOField<Type>::IOField(const IOobject& io)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOField::IOField(const IOobject&)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -49,9 +61,21 @@ Foam::IOField<Type>::IOField(const IOobject& io, const label size)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOField::IOField(const IOobject&, const label)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -70,9 +94,21 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOField::IOField(const IOobject&, const Field<Type>&)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -91,11 +127,25 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type> >& f)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "IOField::IOField(const IOobject&, const Xfer<Field<Type> >&)"
+ ) << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
Field<Type>::transfer(f());
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 39e0554b042..3e9b7856076 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -32,9 +32,20 @@ Foam::IOList<T>::IOList(const IOobject& io)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOList::IOList(const IOobject&)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -49,9 +60,20 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOList::IOList(const IOobject&, const label)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -70,9 +92,21 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("IOList::IOList(const IOobject&, const List<T>&)")
+ << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -91,11 +125,25 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T> >& list)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "IOList::IOList(const IOobject&, const Xfer<List<T> >&)"
+ ) << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOField does not support automatic rereading."
+ << endl;
+ }
+
List<T>::transfer(list());
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index 54f3646b104..67d95333c46 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
@@ -34,7 +34,10 @@ Foam::IOMap<T>::IOMap(const IOobject& io)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -50,7 +53,10 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const label size)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -71,7 +77,10 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -94,7 +103,10 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T> >& map)
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index ad3ef2e4cd8..565c77e0fb7 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -35,7 +35,10 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const INew& inewt)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -52,7 +55,10 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -84,7 +90,10 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
{
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -107,7 +116,10 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T> >& list)
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index 136c6bbd18f..c5a37789582 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -43,9 +43,24 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ)
+ {
+ WarningIn("IOdictionary::IOdictionary(const IOobject&)")
+ //FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)")
+ << "Dictionary constructed with IOobject::MUST_READ"
+ " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
+ << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
+ << endl;
+ //<< abort(FatalError);
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -61,9 +76,24 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ)
+ {
+ WarningIn
+ (
+ "IOdictionary::IOdictionary(const IOobject& const dictionary&)"
+ ) << "Dictionary constructed with IOobject::MUST_READ"
+ " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
+ << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
+ << endl;
+ }
+
if
(
- io.readOpt() == IOobject::MUST_READ
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 0afa8d69b34..90772004e97 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -217,7 +217,7 @@ Foam::Time::Time
controlDictName,
system(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -242,6 +242,12 @@ Foam::Time::Time
readLibs_(controlDict_, "libs"),
functionObjects_(*this)
{
+ // Time objects not registered so do like objectRegistry::checkIn ourselves.
+ if (runTimeModifiable_)
+ {
+ controlDict_.watchIndex() = addWatch(controlDict_.filePath());
+ }
+
setControls();
}
@@ -298,6 +304,13 @@ Foam::Time::Time
readLibs_(controlDict_, "libs"),
functionObjects_(*this)
{
+
+ // Time objects not registered so do like objectRegistry::checkIn ourselves.
+ if (runTimeModifiable_)
+ {
+ controlDict_.watchIndex() = addWatch(controlDict_.filePath());
+ }
+
setControls();
}
@@ -365,6 +378,38 @@ Foam::Time::~Time()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+Foam::label Foam::Time::addWatch(const fileName& fName) const
+{
+ return monitor_.addWatch(fName);
+}
+
+
+bool Foam::Time::removeWatch(const label watchIndex) const
+{
+ return monitor_.removeWatch(watchIndex);
+}
+
+const Foam::fileName& Foam::Time::getFile(const label watchIndex) const
+{
+ return monitor_.getFile(watchIndex);
+}
+
+
+Foam::fileMonitor::fileState Foam::Time::getState
+(
+ const label watchFd
+) const
+{
+ return monitor_.getState(watchFd);
+}
+
+
+void Foam::Time::setUnmodified(const label watchFd) const
+{
+ monitor_.setUnmodified(watchFd);
+}
+
+
Foam::word Foam::Time::timeName(const scalar t)
{
std::ostringstream buf;
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 7596fee0c9b..1021ba012e4 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -51,6 +51,7 @@ SourceFiles
#include "typeInfo.H"
#include "dlLibraryTable.H"
#include "functionObjectList.H"
+#include "fileMonitor.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,6 +72,9 @@ class Time
{
// Private data
+ //- file-change monitor for all registered files
+ mutable fileMonitor monitor_;
+
//- The controlDict
IOdictionary controlDict_;
@@ -275,11 +279,35 @@ public:
return graphFormat_;
}
+ //- Supports re-reading
+ const Switch& runTimeModifiable() const
+ {
+ return runTimeModifiable_;
+ }
+
//- Read control dictionary, update controls and time
virtual bool read();
- //- Read the objects that have been modified
- void readModifiedObjects();
+ // Automatic rereading
+
+ //- Read the objects that have been modified
+ void readModifiedObjects();
+
+ //- Add watching of a file. Returns handle
+ label addWatch(const fileName&) const;
+
+ //- Remove watch on a file (using handle)
+ bool removeWatch(const label) const;
+
+ //- Get name of file being watched (using handle)
+ const fileName& getFile(const label) const;
+
+ //- Get current state of file (using handle)
+ fileMonitor::fileState getState(const label) const;
+
+ //- Set current state of file (using handle) to unmodified
+ void setUnmodified(const label) const;
+
//- Return the location of "dir" containing the file "name".
// (eg, used in reading mesh data)
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 11031875dfb..dd6d1e98ed6 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -180,6 +180,11 @@ void Foam::Time::readDict()
controlDict_.readIfPresent("graphFormat", graphFormat_);
controlDict_.readIfPresent("runTimeModifiable", runTimeModifiable_);
+
+ if (!runTimeModifiable_ && controlDict_.watchIndex() != -1)
+ {
+ removeWatch(controlDict_.watchIndex());
+ }
}
@@ -201,35 +206,28 @@ void Foam::Time::readModifiedObjects()
{
if (runTimeModifiable_)
{
- // For parallel runs check if any object's file has been modified
- // and only call readIfModified on each object if this is the case
- // to avoid unnecessary reductions in readIfModified for each object
+ // Get state of all monitored objects (=registered objects with a
+ // valid filePath).
+ // Note: requires same ordering in objectRegistries on different
+ // processors!
+ monitor_.updateStates(Pstream::parRun());
- bool anyModified = true;
+//Pout<< "Time : runTimeModifiable_ and watchIndex:"
+// << controlDict_.watchIndex() << endl;
- if (Pstream::parRun())
- {
- anyModified = controlDict_.modified() || objectRegistry::modified();
- bool anyModifiedOnThisProc = anyModified;
- reduce(anyModified, andOp<bool>());
+ // Time handling is special since controlDict_ is the one dictionary
+ // that is not registered to any database.
- if (anyModifiedOnThisProc && !anyModified)
- {
- WarningIn("Time::readModifiedObjects()")
- << "Delaying reading objects due to inconsistent "
- "file time-stamps between processors"
- << endl;
- }
+ if (controlDict_.readIfModified())
+ {
+ readDict();
+ functionObjects_.read();
}
- if (anyModified)
- {
- if (controlDict_.readIfModified())
- {
- readDict();
- functionObjects_.read();
- }
+ bool registryModified = objectRegistry::modified();
+ if (registryModified)
+ {
objectRegistry::readModifiedObjects();
}
}
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index e588aeef4ca..b41a6bb9441 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.C
@@ -126,7 +126,11 @@ Foam::word Foam::Time::findInstance
<< endl;
}
- if (rOpt == IOobject::MUST_READ)
+ if
+ (
+ rOpt == IOobject::MUST_READ
+ || rOpt == IOobject::MUST_READ_IF_MODIFIED
+ )
{
FatalErrorIn
(
@@ -174,7 +178,7 @@ Foam::word Foam::Time::findInstance
return constant();
}
- if (rOpt == IOobject::MUST_READ)
+ if (rOpt == IOobject::MUST_READ || rOpt == IOobject::MUST_READ_IF_MODIFIED)
{
FatalErrorIn
(
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index b4e35c43a03..daef2de16f4 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -90,7 +90,7 @@ public:
const word& outputFilterName,
const objectRegistry&,
const fileName& dictName = OutputFilter::typeName() + "Dict",
- const IOobject::readOption rOpt = IOobject::MUST_READ,
+ const IOobject::readOption rOpt = IOobject::MUST_READ_IF_MODIFIED,
const bool loadFromFile = false
);
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 30ce98564d6..6309714e1ae 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -273,7 +273,7 @@ void Foam::objectRegistry::rename(const word& newName)
bool Foam::objectRegistry::modified() const
{
- for (const_iterator iter = cbegin(); iter != cend(); ++iter)
+ forAllConstIter(HashTable<regIOobject*>, *this, iter)
{
if (iter()->modified())
{
@@ -317,7 +317,7 @@ bool Foam::objectRegistry::writeObject
{
bool ok = true;
- for (const_iterator iter = cbegin(); iter != cend(); ++iter)
+ forAllConstIter(HashTable<regIOobject*>, *this, iter)
{
if (objectRegistry::debug)
{
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 10165b3e977..512c1858ed7 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -173,7 +173,6 @@ public:
//- Remove an regIOobject from registry
bool checkOut(regIOobject&) const;
-
// Reading
//- Return true if any of the object's files have been modified
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 22244ff8ace..bdbd9468ce9 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -45,7 +45,7 @@ Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime)
IOobject(io),
registered_(false),
ownedByRegistry_(false),
- lastModified_(0),
+ watchIndex_(-1),
eventNo_ // Do not get event for top level Time database
(
isTime
@@ -68,7 +68,7 @@ Foam::regIOobject::regIOobject(const regIOobject& rio)
IOobject(rio),
registered_(false),
ownedByRegistry_(false),
- lastModified_(rio.lastModified_),
+ watchIndex_(rio.watchIndex_),
eventNo_(db().getEvent()),
isPtr_(NULL)
{
@@ -83,7 +83,7 @@ Foam::regIOobject::regIOobject(const regIOobject& rio, bool registerCopy)
IOobject(rio),
registered_(false),
ownedByRegistry_(false),
- lastModified_(rio.lastModified_),
+ watchIndex_(-1),
eventNo_(db().getEvent()),
isPtr_(NULL)
{
@@ -133,6 +133,28 @@ bool Foam::regIOobject::checkIn()
// any mapping
registered_ = db().checkIn(*this);
+ if
+ (
+ registered_
+ && readOpt() == MUST_READ_IF_MODIFIED
+ && time().runTimeModifiable()
+ )
+ {
+ if (watchIndex_ != -1)
+ {
+ FatalErrorIn("regIOobject::checkIn()")
+ << "Object " << objectPath()
+ << " already watched with index " << watchIndex_
+ << abort(FatalError);
+ }
+
+ fileName f = filePath();
+ if (f != fileName::null)
+ {
+ watchIndex_ = time().addWatch(f);
+ }
+ }
+
// check-in on defaultRegion is allowed to fail, since subsetted meshes
// are created with the same name as their originating mesh
if (!registered_ && debug && name() != polyMesh::defaultRegion)
@@ -165,6 +187,12 @@ bool Foam::regIOobject::checkOut()
if (registered_)
{
registered_ = false;
+
+ if (watchIndex_ != -1)
+ {
+ time().removeWatch(watchIndex_);
+ watchIndex_ = -1;
+ }
return db().checkOut(*this);
}
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index f3c2cc83f8b..59e075420fe 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -67,8 +67,8 @@ private:
//- Is this object owned by the registry
bool ownedByRegistry_;
- //- Time of last modification
- mutable time_t lastModified_;
+ //- Modification watch index
+ mutable label watchIndex_;
//- eventNo of last update
label eventNo_;
@@ -209,10 +209,17 @@ public:
//- Read object
virtual bool read();
- //- Return true if the object's file has been modified
+ //- Return file-monitoring handle
+ inline label watchIndex() const;
+
+ //- Return file-monitoring handle
+ inline label& watchIndex();
+
+ //- Return true if the object's file (or files for objectRegistry)
+ // have been modified. (modified state is cached by Time)
virtual bool modified() const;
- //- Read object if modified
+ //- Read object if modified (as set by call to modified)
virtual bool readIfModified();
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index b092d0150d1..47127ce8683 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -90,4 +90,16 @@ inline Foam::label& Foam::regIOobject::eventNo()
}
+inline Foam::label Foam::regIOobject::watchIndex() const
+{
+ return watchIndex_;
+}
+
+
+inline Foam::label& Foam::regIOobject::watchIndex()
+{
+ return watchIndex_;
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 42b43a51e58..0082c936c64 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -26,7 +26,7 @@ License
#include "regIOobject.H"
#include "IFstream.H"
#include "Time.H"
-#include "PstreamReduceOps.H"
+//#include "PstreamReduceOps.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -52,14 +52,26 @@ Foam::Istream& Foam::regIOobject::readStream()
// Construct object stream and read header if not already constructed
if (!isPtr_)
{
- if (!(isPtr_ = objectStream()))
+
+ fileName objPath;
+ if (watchIndex_ != -1)
+ {
+ // File is being watched. Read exact file that is being watched.
+ objPath = time().getFile(watchIndex_);
+ }
+ else
+ {
+ objPath = filePath();
+ }
+
+ if (!(isPtr_ = objectStream(objPath)))
{
FatalIOError
(
"regIOobject::readStream()",
__FILE__,
__LINE__,
- objectPath(),
+ objPath,
0
) << "cannot open file"
<< exit(FatalIOError);
@@ -72,9 +84,10 @@ Foam::Istream& Foam::regIOobject::readStream()
}
}
- if (!lastModified_)
+ // Mark as uptodate if read succesfully
+ if (watchIndex_ != -1)
{
- lastModified_ = lastModified(filePath());
+ time().setUnmodified(watchIndex_);
}
return *isPtr_;
@@ -151,49 +164,27 @@ bool Foam::regIOobject::read()
bool Foam::regIOobject::modified() const
{
- return
- (
- lastModified_
- && lastModified(filePath()) > (lastModified_ + fileModificationSkew)
- );
+ if (watchIndex_ != -1)
+ {
+ return time().getState(watchIndex_) != fileMonitor::UNMODIFIED;
+ }
+ else
+ {
+ return false;
+ }
}
bool Foam::regIOobject::readIfModified()
{
- if (lastModified_)
+ if (watchIndex_ != -1)
{
- time_t newTimeStamp = lastModified(filePath());
-
- bool readFile = false;
-
- if (newTimeStamp > (lastModified_ + fileModificationSkew))
- {
- readFile = true;
- }
-
- if (Pstream::parRun())
- {
- bool readFileOnThisProc = readFile;
- reduce(readFile, andOp<bool>());
-
- if (readFileOnThisProc && !readFile)
- {
- WarningIn("regIOobject::readIfModified()")
- << "Delaying reading " << name()
- << " of class " << headerClassName()
- << " due to inconsistent "
- "file time-stamps between processors"
- << endl;
- }
- }
-
- if (readFile)
+ if (modified())
{
- lastModified_ = newTimeStamp;
+ const fileName& fName = time().getFile(watchIndex_);
Info<< "regIOobject::readIfModified() : " << nl
- << " Reading object " << name()
- << " from file " << filePath() << endl;
+ << " Re-reading object " << name()
+ << " from file " << fName << endl;
return read();
}
else
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 1f2c174fb44..8c03003e82a 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -114,9 +114,9 @@ bool Foam::regIOobject::writeObject
// Only update the lastModified_ time if this object is re-readable,
// i.e. lastModified_ is already set
- if (lastModified_)
+ if (watchIndex_ != -1)
{
- lastModified_ = lastModified(objectPath());
+ time().setUnmodified(watchIndex_);
}
return osGood;
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index b4960c341d2..9b6ad293f01 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -111,12 +111,16 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::readField(Istream& is)
template<class Type, template<class> class PatchField, class GeoMesh>
bool Foam::GeometricField<Type, PatchField, GeoMesh>::readIfPresent()
{
- if (this->readOpt() == IOobject::MUST_READ)
+ if
+ (
+ this->readOpt() == IOobject::MUST_READ
+ || this->readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
{
WarningIn
(
"GeometricField<Type, PatchField, GeoMesh>::readIfPresent()"
- ) << "read option IOobject::MUST_READ "
+ ) << "read option IOobject::MUST_READ or MUST_READ_IF_MODIFIED"
<< "suggests that a read constructor for field " << this->name()
<< " would be more appropriate." << endl;
}
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 5aa40ae572e..71359e5dabc 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -54,7 +54,7 @@ Foam::solution::solution(const objectRegistry& obr, const fileName& dictName)
dictName,
obr.time().system(),
obr,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/OpenFOAM/matrices/tolerances/tolerances.C b/src/OpenFOAM/matrices/tolerances/tolerances.C
index 9becd91b604..ff70e0b93ae 100644
--- a/src/OpenFOAM/matrices/tolerances/tolerances.C
+++ b/src/OpenFOAM/matrices/tolerances/tolerances.C
@@ -36,7 +36,7 @@ Foam::tolerances::tolerances(const Time& t, const fileName& dictName)
dictName,
t.system(),
t,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index f23a05879f6..3a1ff00b32c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -62,8 +62,27 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
regIOobject(io),
mesh_(mesh)
{
- if (readOpt() == IOobject::MUST_READ)
+ if
+ (
+ readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "polyBoundaryMesh::polyBoundaryMesh\n"
+ "(\n"
+ " const IOobject&,\n"
+ " const polyMesh&\n"
+ ")"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
+
polyPatchList& patches = *this;
// Read polyPatchList
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index fe1c6de03ec..babb31b6e85 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -86,9 +86,24 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
if
(
readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "ZoneMesh::ZoneMesh\n"
+ "(\n"
+ " const IOobject&,\n"
+ " const MeshType&\n"
+ ")"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
PtrList<ZoneType>& zones = *this;
// Read zones
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
index 9a4c920dfa0..a37db88c690 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -39,7 +39,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
"dynamicMeshDict",
io.time().constant(),
io.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
index cd937135fd5..18e4a32d78c 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -51,8 +51,9 @@ Foam::dynamicInkJetFvMesh::dynamicInkJetFvMesh(const IOobject& io)
"dynamicMeshDict",
io.time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
),
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 5ecd3efdb9f..5e992af1017 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -179,7 +179,7 @@ void Foam::dynamicRefineFvMesh::readDict()
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -1016,7 +1016,7 @@ bool Foam::dynamicRefineFvMesh::update()
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index 420304ecf76..88b7e521c05 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -51,8 +51,9 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
"dynamicMeshDict",
io.time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
),
diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C
index efc29c2afc9..a225c4430ee 100644
--- a/src/dynamicMesh/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolver/motionSolver.C
@@ -47,7 +47,7 @@ Foam::motionSolver::motionSolver(const polyMesh& mesh)
"dynamicMeshDict",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
"dynamicMeshDict",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
index 744fceb2d5e..9450b2c7170 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
@@ -331,9 +331,21 @@ Foam::refinementHistory::refinementHistory(const IOobject& io)
:
regIOobject(io)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "refinementHistory::refinementHistory(const IOobject&)"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
if
(
io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -365,9 +377,22 @@ Foam::refinementHistory::refinementHistory
freeSplitCells_(0),
visibleCells_(visibleCells)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "refinementHistory::refinementHistory"
+ "(const IOobject&, const List<splitCell8>&, const labelList&)"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
if
(
io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
@@ -399,9 +424,22 @@ Foam::refinementHistory::refinementHistory
regIOobject(io),
freeSplitCells_(0)
{
+ // Temporary warning
+ if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "refinementHistory::refinementHistory"
+ "(const IOobject&, const label)"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
if
(
io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 1f7de13abaf..dcb95344175 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -43,9 +43,19 @@ void Foam::polyTopoChanger::readModifiers()
if
(
readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("polyTopoChanger::readModifiers()")
+ << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
+
PtrList<polyMeshModifier>& modifiers = *this;
// Read modifiers
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index 4fe21656066..d8637404cb9 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -40,9 +40,19 @@ Foam::featureEdgeMesh::featureEdgeMesh(const IOobject& io)
if
(
io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("featureEdgeMesh::featureEdgeMesh(const IOobject&)")
+ << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
+
readStream(typeName) >> *this;
close();
}
@@ -82,9 +92,19 @@ Foam::featureEdgeMesh::featureEdgeMesh
if
(
io.readOpt() == IOobject::MUST_READ
+ || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
)
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn("featureEdgeMesh::featureEdgeMesh(const IOobject&)")
+ << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
+
readStream(typeName) >> *this;
close();
}
diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C
index b827036fd37..d34b881cc9c 100644
--- a/src/engine/engineMesh/engineMesh/engineMeshNew.C
+++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
"engineGeometry",
io.time().constant(),
io.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/engine/engineTime/engineTime.C b/src/engine/engineTime/engineTime.C
index 822f8224a8f..2f9ec62313d 100644
--- a/src/engine/engineTime/engineTime.C
+++ b/src/engine/engineTime/engineTime.C
@@ -72,7 +72,7 @@ Foam::engineTime::engineTime
"engineGeometry",
constant(),
*this,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
index 5ceb48af51e..cf7bdc8ff80 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
@@ -45,7 +45,7 @@ Foam::MRFZones::MRFZones(const fvMesh& mesh)
"MRFZones",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
),
MRFZone::iNew(mesh)
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 626718c9321..e753196cdea 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -53,7 +53,7 @@ Foam::SRF::SRFModel::SRFModel
"SRFProperties",
Urel.time().constant(),
Urel.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
index 5c2eb2ea762..20d358235b1 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
"SRFProperties",
Urel.time().constant(),
Urel.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index 6f5af3bfab9..b4351f34c70 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -70,7 +70,7 @@ Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
sourceName + "Properties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index e77b6c77a01..37b09def99f 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -64,7 +64,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
"fvSchemes",
obr.time().system(),
obr,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
index 977fdb89a0b..e1613e584d9 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
@@ -70,7 +70,7 @@ displacementInterpolationFvMotionSolver
"dynamicMeshDict",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 24a65c1685e..0744ac3fd47 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -45,7 +45,7 @@ void Foam::Cloud<ParticleType>::readCloudUniformProperties()
time().timeName(),
"uniform"/cloud::prefix/name(),
db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 4f98523b078..6ff9319f9a5 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -83,7 +83,7 @@ Foam::spray::spray
"sprayProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -98,7 +98,7 @@ Foam::spray::spray
"injectorProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
),
injector::iNew(U.time())
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 0d9e84533d6..ef819f62d39 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -608,7 +608,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
cloudName + "Properties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -830,7 +830,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
cloudName + "Properties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 7fc3cf86363..10fccde371c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -181,7 +181,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
cloudName + "Properties",
rho.mesh().time().constant(),
rho.mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 9b44324461b..c56ff296183 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -40,7 +40,7 @@ void Foam::InjectionModel<CloudType>::readProps()
owner_.db().time().timeName(),
"uniform"/cloud::prefix/owner_.name(),
owner_.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
index ebe1781e6fd..b257b7eece9 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
@@ -32,7 +32,7 @@ IOdictionary mdTransportProperitesDict
"mdTransportProperitesDict",
mesh.time().system(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 55f24f100f8..5fef0b1d0d4 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -56,7 +56,7 @@ void Foam::moleculeCloud::buildConstProps()
"moleculeProperties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index a54ef7f153d..f9d8dd683c4 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -104,7 +104,7 @@ void Foam::potential::potential::readPotentialDict()
"idList",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -120,7 +120,7 @@ void Foam::potential::potential::readPotentialDict()
"moleculeProperties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -151,7 +151,7 @@ void Foam::potential::potential::readPotentialDict()
"potentialDict",
mesh_.time().system(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@@ -260,7 +260,7 @@ void Foam::potential::potential::readMdInitialiseDict
"moleculeProperties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.C b/src/lagrangian/solidParticle/solidParticleCloud.C
index 753b760b14b..625116d525c 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.C
+++ b/src/lagrangian/solidParticle/solidParticleCloud.C
@@ -54,7 +54,7 @@ Foam::solidParticleCloud::solidParticleCloud
"particleProperties",
mesh_.time().constant(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index 70bfa897a93..a046f05050e 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -838,7 +838,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
"decomposeParDict",
searchableSurface::time().system(),
searchableSurface::time(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index 96ce8b6cbe4..b934db15efc 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -189,7 +189,8 @@ void Foam::fieldToCell::applyToSet
mesh().time().timeName(),
mesh(),
IOobject::MUST_READ,
- IOobject::AUTO_WRITE
+ IOobject::AUTO_WRITE,
+ false
);
if (!fieldObject.headerOk())
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 0a387c669ff..70de4a799c6 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -80,6 +80,7 @@ cellZoneSet::cellZoneSet
if
(
(r == IOobject::MUST_READ)
+ || (r == IOobject::MUST_READ_IF_MODIFIED)
|| (r == IOobject::READ_IF_PRESENT && zoneID != -1)
)
{
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index ed552af24b2..00669101c8a 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -82,6 +82,7 @@ faceZoneSet::faceZoneSet
if
(
(r == IOobject::MUST_READ)
+ || (r == IOobject::MUST_READ_IF_MODIFIED)
|| (r == IOobject::READ_IF_PRESENT && zoneID != -1)
)
{
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 64c1a29ed1e..00870ee652b 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -81,7 +81,8 @@ pointZoneSet::pointZoneSet
if
(
- (r == IOobject::MUST_READ)
+ r == IOobject::MUST_READ
+ || r == IOobject::MUST_READ_IF_MODIFIED
|| (r == IOobject::READ_IF_PRESENT && zoneID != -1)
)
{
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index fb9e79164ba..b4530e5b6ec 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -309,6 +309,7 @@ Foam::topoSet::topoSet(const IOobject& obj, const word& wantedType)
if
(
readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (
readOpt() == IOobject::READ_IF_PRESENT
&& headerOk()
@@ -356,6 +357,7 @@ Foam::topoSet::topoSet
if
(
readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (
readOpt() == IOobject::READ_IF_PRESENT
&& headerOk()
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index a47a8b83cc0..f27a3f8f490 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -258,7 +258,7 @@ void Foam::fieldAverage::readAveragingProperties()
obr_.time().timeName(),
"uniform",
obr_,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
diff --git a/src/sampling/include/buildPatch.H b/src/sampling/include/buildPatch.H
index 0d6338ebb03..e355d794905 100644
--- a/src/sampling/include/buildPatch.H
+++ b/src/sampling/include/buildPatch.H
@@ -6,7 +6,7 @@ IOdictionary planeToPatchDict
"planeToPatchDict",
runTime.system(),
runTime,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 91094607b49..5cc6a1260d8 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -374,7 +374,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
"dummyName",
t.timeName(),
t,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
),
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 430b1d20068..c5619801dc6 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -45,7 +45,11 @@ Foam::surfZoneIOList::surfZoneIOList
"(const IOobject& io)";
- if (readOpt() == IOobject::MUST_READ)
+ if
+ (
+ readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
{
surfZoneList& zones = *this;
diff --git a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
index 090b1091aee..1846f579714 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
@@ -587,7 +587,7 @@ Foam::surfaceFilmModels::kinematicSingleLayer::kinematicSingleLayer
filmRegionName_,
time_.timeName(),
time_,
- IOobject::MUST_READ
+ IOobject::MUST_READ_IF_MODIFIED
)
),
nHat_
diff --git a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.C b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.C
index 6eeb1398fe0..5dfb27e1a0f 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.C
@@ -74,7 +74,7 @@ Foam::surfaceFilmModels::surfaceFilmModel::surfaceFilmModel
"surfaceFilmProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -101,7 +101,7 @@ Foam::surfaceFilmModels::surfaceFilmModel::surfaceFilmModel
"surfaceFilmProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
index 78ac50b30f2..57347f91325 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
@@ -46,7 +46,7 @@ Foam::surfaceFilmModels::surfaceFilmModel::New
"surfaceFilmProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index eed0b677d3a..91c6be60fc7 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -153,7 +153,7 @@ Foam::basicThermo::basicThermo(const fvMesh& mesh)
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C
index e6f2d195f03..93b88ad4c47 100644
--- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C
index b5f8c88073c..78423b0234a 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
index 5d8e0285e9d..7aa4c2613e3 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
@@ -45,7 +45,7 @@ Foam::basicChemistryModel::basicChemistryModel(const fvMesh& mesh)
"chemistryProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
index 38d88071f1f..59addc69aab 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
"chemistryProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
index 95a6100de51..89439028c93 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
"chemistryProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
index f3e7e6ccc1a..ca85cac0da7 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
@@ -40,7 +40,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
"combustionProperties",
ct.T().time().constant(),
ct.T().db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
index 47377598827..90f6c8e54de 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
@@ -203,7 +203,7 @@ void Foam::interpolationLookUpTable<Type>::readTable
fileName_,
instance,
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
index fd17fe5fd97..d82e1ffe3e6 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
@@ -51,7 +51,7 @@ Foam::radiation::radiationModel::radiationModel(const volScalarField& T)
"radiationProperties",
T.time().constant(),
T.mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -79,7 +79,7 @@ Foam::radiation::radiationModel::radiationModel
"radiationProperties",
T.time().constant(),
T.mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C
index 1437b9195d5..861708ebecb 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C
@@ -44,7 +44,7 @@ Foam::radiation::radiationModel::New
"radiationProperties",
T.time().constant(),
T.mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C
index 7065df6d07a..aa1d03316d2 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -87,7 +87,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
index 5fb31430e72..20117977aaa 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::hhuCombustionThermo> Foam::hhuCombustionThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
index 4e4aecb6c78..9edb9111c29 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::hsCombustionThermo> Foam::hsCombustionThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -87,7 +87,7 @@ Foam::autoPtr<Foam::hsCombustionThermo> Foam::hsCombustionThermo::NewType
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C
index 3a186ec5ee9..df17d001f0a 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -87,7 +87,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C
index 3607d3458b6..0520bb72892 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::hsReactionThermo> Foam::hsReactionThermo::New
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@@ -87,7 +87,7 @@ Foam::autoPtr<Foam::hsReactionThermo> Foam::hsReactionThermo::NewType
"thermophysicalProperties",
mesh.time().constant(),
mesh,
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 44d22a11153..88ce5782ad3 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -272,8 +272,9 @@ Foam::linearValveFvMesh::linearValveFvMesh(const IOobject& io)
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
),
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 636e440b31e..f82895bf3bd 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -347,8 +347,9 @@ Foam::linearValveLayersFvMesh::linearValveLayersFvMesh(const IOobject& io)
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
)
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 6a050e1c701..e4049f988ab 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -289,8 +289,9 @@ Foam::mixerFvMesh::mixerFvMesh
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
),
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 7de4dcce20f..b319e1807ae 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -257,8 +257,9 @@ Foam::movingConeTopoFvMesh::movingConeTopoFvMesh(const IOobject& io)
"dynamicMeshDict",
time().constant(),
*this,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
)
).subDict(typeName + "Coeffs")
),
diff --git a/src/transportModels/incompressible/transportModel/transportModel.C b/src/transportModels/incompressible/transportModel/transportModel.C
index c9a0c8e20d8..e45e8206a92 100644
--- a/src/transportModels/incompressible/transportModel/transportModel.C
+++ b/src/transportModels/incompressible/transportModel/transportModel.C
@@ -43,7 +43,7 @@ Foam::transportModel::transportModel
"transportProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
)
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
index dc044c2d17a..849ab59c14d 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
@@ -46,8 +46,26 @@ Foam::surfacePatchIOList::surfacePatchIOList
"(const IOobject& io)";
- if (readOpt() == IOobject::MUST_READ)
+ if
+ (
+ readOpt() == IOobject::MUST_READ
+ || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+ )
{
+ if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+ {
+ WarningIn
+ (
+ "surfacePatchIOList::surfacePatchIOList\n"
+ "(\n"
+ " const IOobject&\n"
+ ")"
+ ) << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+ << " does not support automatic rereading."
+ << endl;
+ }
+
+
surfacePatchList& patches = *this;
// read polyPatchList
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index e95f9def5c5..bf1f726c32c 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -70,7 +70,7 @@ LESModel::LESModel
"LESProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -111,7 +111,7 @@ autoPtr<LESModel> LESModel::New
"LESProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 755318a1d8c..64594ff010e 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -71,7 +71,7 @@ RASModel::RASModel
"RASProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -117,7 +117,7 @@ autoPtr<RASModel> RASModel::New
"RASProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
index 89eaaabd480..f85e8f5440a 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
@@ -36,7 +36,7 @@ Foam::regionProperties::regionProperties(const Time& runTime)
"regionProperties",
runTime.time().constant(),
runTime.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 19f31068bf6..da27aa55ec9 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -81,7 +81,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
"turbulenceProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 574e387f1c4..1246bdc801b 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -69,7 +69,7 @@ LESModel::LESModel
"LESProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -108,7 +108,7 @@ autoPtr<LESModel> LESModel::New
"LESProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 87d50dedd7f..27e465720fa 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -70,7 +70,7 @@ RASModel::RASModel
"RASProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),
@@ -115,7 +115,7 @@ autoPtr<RASModel> RASModel::New
"RASProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index 79e9ab8383b..d211671ff46 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -138,7 +138,7 @@ nutUTabulatedWallFunctionFvPatchScalarField
uPlusTableName_,
patch().boundaryMesh().mesh().time().constant(),
patch().boundaryMesh().mesh(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
),
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 1aeea66fd31..79e94c07415 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -77,7 +77,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
"turbulenceProperties",
U.time().constant(),
U.db(),
- IOobject::MUST_READ,
+ IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
--
GitLab
From 3643df09b714a4dc6c4f00862ad0aa35447f3a1e Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 2 Jun 2010 10:27:46 +0100
Subject: [PATCH 35/77] ENH. Adding desciptive comments and removing
labelList() wrapping around DynamicList.
---
src/lagrangian/basic/Cloud/Cloud.C | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 95ae4d798a4..8f817df7fb1 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -101,13 +101,23 @@ template<class ParticleType>
template<class TrackingData>
void Foam::Cloud<ParticleType>::move(TrackingData& td)
{
+ const polyBoundaryMesh& pbm = pMesh().boundaryMesh();
const globalMeshData& pData = polyMesh_.globalData();
- const labelList& neighbourProcs = pData[Pstream::myProcNo()];
+
+ // Which patches are processor patches
const labelList& procPatches = pData.processorPatches();
+
+ // Indexing of patches into the procPatches list
const labelList& procPatchIndices = pData.processorPatchIndices();
+
+ // Indexing of equivalent patch on neighbour processor into the
+ // procPatches list on the neighbour
const labelList& procPatchNeighbours = pData.processorPatchNeighbours();
- const polyBoundaryMesh& pbm = pMesh().boundaryMesh();
+ // Which processors this processor is connected to
+ const labelList& neighbourProcs = pData[Pstream::myProcNo()];
+
+ // Indexing from the processor number into the neighbourProcs list
labelList neighbourProcIndices(Pstream::nProcs(), -1);
forAll(neighbourProcs, i)
@@ -205,7 +215,7 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
);
particleStream
- << labelList(patchIndexTransferLists[i])
+ << patchIndexTransferLists[i]
<< particleTransferLists[i];
}
}
--
GitLab
From 2eab4044f609d57135a365fed1df2e3c79e801c2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 2 Jun 2010 11:08:52 +0100
Subject: [PATCH 36/77] COMP: cellSource compilation
---
.../PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 2 +-
.../graphics/fieldview9Reader/readerDatabase.C | 2 +-
.../field/fieldValues/cellSource/cellSource.C | 6 +++---
.../field/fieldValues/cellSource/cellSource.H | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 1cd6f06b030..a73b46621ed 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -444,7 +444,7 @@ void Foam::vtkPV3Foam::updateFoamMesh()
meshRegion_,
dbPtr_().timeName(),
dbPtr_(),
- IOobject::MUST_READ_IF_MODIFIED
+ IOobject::MUST_READ
)
);
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
index 536eed7fb49..e18963c3d13 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
@@ -260,7 +260,7 @@ void Foam::readerDatabase::loadMesh()
meshPtr_ = new fvMeshSubset
(
*runTimePtr_,
- IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::MUST_READ,
IOobject::AUTO_WRITE
);
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index 7f20d750473..51f08c461e0 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -32,11 +32,11 @@ License
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
-const char* NamedEnum<fieldValues::cellSource::sourceType, 2>::
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>::
names[] = {"cellZone", "all"};
-const NamedEnum<fieldValues::cellSource::sourceType, 2>
- fieldValues::cellSource::sourceTypeNames_;
+const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>
+ Foam::fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 44f836428a9..c3a033f6442 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -94,7 +94,7 @@ public:
};
//- Source type names
- static const NamedEnum<sourceType, 1> sourceTypeNames_;
+ static const NamedEnum<sourceType, 2> sourceTypeNames_;
//- Operation type enumeration
--
GitLab
From 3ea59aff68eed00b5462c3c5d571c83bf4aabec2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 2 Jun 2010 11:21:28 +0100
Subject: [PATCH 37/77] STYLE: addPatchCellLayer : unused variable.
---
.../polyTopoChange/polyTopoChange/addPatchCellLayer.C | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 4ffbaa3cdc7..5ed3a5e9ea3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -1001,8 +1001,6 @@ void Foam::addPatchCellLayer::setRefinement
{
layerFaces_[patchFaceI].setSize(addedCells[patchFaceI].size() + 1);
- label zoneI = mesh_.faceZones().whichZone(meshFaceI);
-
// Get duplicated vertices on the patch face.
const face& f = pp.localFaces()[patchFaceI];
--
GitLab
From 3e56d3ebc79fa19e8fc4deda674d7e4049593156 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 2 Jun 2010 11:48:13 +0100
Subject: [PATCH 38/77] STYLE: solid.H typo in comment
---
src/thermophysicalModels/solids/solid/solid.H | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index 189feba08b3..bacdae17e44 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -131,7 +131,7 @@ public:
// Member Functions
- // Phisical constants which define the solid
+ // Physical constants which define the solid
//- Density [kg/m3]
inline scalar rho() const;
--
GitLab
From ed3c0abe429cdb049d0d6fd9c534888ba7cbcd49 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 14:18:19 +0200
Subject: [PATCH 39/77] COMP: missing namespace qualifier (somehow lost in the
merge shuffle)
COMP: mismatch in template parameter
---
.../field/fieldValues/cellSource/cellSource.C | 6 +++---
.../field/fieldValues/cellSource/cellSource.H | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index 7f20d750473..51f08c461e0 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -32,11 +32,11 @@ License
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
-const char* NamedEnum<fieldValues::cellSource::sourceType, 2>::
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>::
names[] = {"cellZone", "all"};
-const NamedEnum<fieldValues::cellSource::sourceType, 2>
- fieldValues::cellSource::sourceTypeNames_;
+const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>
+ Foam::fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 44f836428a9..c3a033f6442 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -94,7 +94,7 @@ public:
};
//- Source type names
- static const NamedEnum<sourceType, 1> sourceTypeNames_;
+ static const NamedEnum<sourceType, 2> sourceTypeNames_;
//- Operation type enumeration
--
GitLab
From 7b941b790ff1aeb08d7110d10a02e54a7080d435 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 14:35:03 +0200
Subject: [PATCH 40/77] ENH: add operator>> and operator!= to
lduMatrix::solverPerformance
- needed for reading a List<lduMatrix::solverPerformance>
---
.../matrices/lduMatrix/lduMatrix/lduMatrix.H | 5 ++
.../lduMatrix/lduMatrix/lduMatrixTests.C | 48 +++++++++++++++----
2 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 53708f58e27..9f3ef88a9ae 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -223,6 +223,10 @@ public:
//- Print summary of solver performance
void print() const;
+ // Member Operators
+
+ bool operator!=(const solverPerformance&) const;
+
// Friend functions
@@ -236,6 +240,7 @@ public:
// Ostream Operator
+ friend Istream& operator>>(Istream&, solverPerformance&);
friend Ostream& operator<<(Ostream&, const solverPerformance&);
};
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
index 6ec7861bc81..09d8258ba58 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
@@ -32,15 +32,7 @@ Description
Foam::lduMatrix::solverPerformance::solverPerformance(Istream& is)
{
- is.readBeginList("lduMatrix::solverPerformance");
- is >> solverName_
- >> fieldName_
- >> initialResidual_
- >> finalResidual_
- >> noIterations_
- >> converged_
- >> singular_;
- is.readEndList("lduMatrix::solverPerformance");
+ is >> *this;
}
@@ -118,6 +110,24 @@ void Foam::lduMatrix::solverPerformance::print() const
}
+bool Foam::lduMatrix::solverPerformance::operator!=
+(
+ const lduMatrix::solverPerformance& sp
+) const
+{
+ return
+ (
+ solverName() != sp.solverName()
+ || fieldName() != sp.fieldName()
+ || initialResidual() != sp.initialResidual()
+ || finalResidual() != sp.finalResidual()
+ || nIterations() != sp.nIterations()
+ || converged() != sp.converged()
+ || singular() != sp.singular()
+ );
+}
+
+
Foam::lduMatrix::solverPerformance Foam::max
(
const lduMatrix::solverPerformance& sp1,
@@ -137,6 +147,26 @@ Foam::lduMatrix::solverPerformance Foam::max
}
+Foam::Istream& Foam::operator>>
+(
+ Istream& is,
+ Foam::lduMatrix::solverPerformance& sp
+)
+{
+ is.readBeginList("lduMatrix::solverPerformance");
+ is >> sp.solverName_
+ >> sp.fieldName_
+ >> sp.initialResidual_
+ >> sp.finalResidual_
+ >> sp.noIterations_
+ >> sp.converged_
+ >> sp.singular_;
+ is.readEndList("lduMatrix::solverPerformance");
+
+ return is;
+}
+
+
Foam::Ostream& Foam::operator<<
(
Ostream& os,
--
GitLab
From db8b5e6b8a5c36e1c9837afff8fe91a8182d47a2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 15:36:49 +0200
Subject: [PATCH 41/77] ENH: retain a list of solverPerformance in data
- reset when the iteration changes
---
src/OpenFOAM/meshes/data/data.C | 23 +++++++++++++++++++++--
src/OpenFOAM/meshes/data/data.H | 8 +++++++-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index f3d4381e15a..c3c8182ebce 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -45,7 +45,8 @@ Foam::data::data(const objectRegistry& obr)
IOobject::NO_READ,
IOobject::NO_WRITE
)
- )
+ ),
+ prevTimeIndex_(0)
{
set("solverPerformance", dictionary());
}
@@ -65,7 +66,25 @@ void Foam::data::setSolverPerformance
const lduMatrix::solverPerformance& sp
) const
{
- const_cast<dictionary&>(solverPerformanceDict()).set(name, sp);
+ dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
+
+ List<lduMatrix::solverPerformance> perfs;
+
+ if (prevTimeIndex_ != this->time().timeIndex())
+ {
+ // reset solver performance between iterations
+ prevTimeIndex_ = this->time().timeIndex();
+ dict.clear();
+ }
+ else
+ {
+ dict.readIfPresent(name, perfs);
+ }
+
+ // append to list
+ perfs.setSize(perfs.size()+1, sp);
+
+ dict.set(name, perfs);
}
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index 5aa70849230..257434d3e19 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -47,13 +47,19 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class data Declaration
+ Class data Declaration
\*---------------------------------------------------------------------------*/
class data
:
public IOdictionary
{
+ // Private data
+
+ //- Previously used time-index, used for reset between iterations
+ mutable label prevTimeIndex_;
+
+
// Private Member Functions
//- Disallow default bitwise copy construct
--
GitLab
From fed204aad6dab7f88f6a2521bf3c0ac1bac9c49d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Jun 2010 15:56:51 +0200
Subject: [PATCH 42/77] ENH: use residual from the first iteration for
residualControl
---
.../jobControl/residualControl/residualControl.C | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
index a7ad2233cfc..b8205f86243 100644
--- a/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
@@ -47,8 +47,12 @@ bool Foam::residualControl::checkCriteria(const bool verbose) const
if (maxResiduals_.readIfPresent(variableName, maxResidual))
{
+ // use the residual from the first solution
const scalar eqnResidual =
- lduMatrix::solverPerformance(iter().stream()).initialResidual();
+ List<lduMatrix::solverPerformance>
+ (
+ iter().stream()
+ ).first().initialResidual();
achieved = achieved && (eqnResidual < maxResidual);
--
GitLab
From 2db6aa4cfb68162048ab0711789013c95e838087 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 Jun 2010 15:27:47 +0100
Subject: [PATCH 43/77] ENH: processorCyclic : warn for unsupported scheduled
comms
---
.../processorCyclic/processorCyclicFvPatchField.C | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index c0a785597dd..29af5002efd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -126,6 +126,20 @@ processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalIOError);
}
+
+ if (Pstream::defaultCommsType == Pstream::scheduled)
+ {
+ WarningIn
+ (
+ "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
+ "(\n"
+ " const fvPatch& p,\n"
+ " const DimensionedField<Type, volMesh>& iF,\n"
+ " const dictionary& dict\n"
+ ")\n"
+ ) << "Scheduled communication with split cyclics not supported."
+ << endl;
+ }
}
--
GitLab
From c9f9d384e5e0966079592b143958f4c37923a0f6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 Jun 2010 15:30:53 +0100
Subject: [PATCH 44/77] BUG: searchableCylinder : handling of points on axis
---
.../searchableSurface/searchableCylinder.C | 67 ++++++++++++-------
1 file changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index a3abdf197a7..7ad44f60d88 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -60,45 +60,66 @@ Foam::pointIndexHit Foam::searchableCylinder::findNearest
// Decompose sample-point1 into normal and parallel component
scalar parallel = (v & unitDir_);
- // Remove the parallel component
+ // Remove the parallel component and normalise
v -= parallel*unitDir_;
scalar magV = mag(v);
+ if (magV < ROOTVSMALL)
+ {
+ v = vector::zero;
+ }
+ else
+ {
+ v /= magV;
+ }
+
if (parallel <= 0)
{
// nearest is at point1 end cap. Clip to radius.
- if (magV < ROOTVSMALL)
- {
- info.setPoint(point1_);
- }
- else
- {
- //info.setPoint(point1_ + min(magV, radius_)*v/magV);
- info.setPoint(point1_ + radius_*(v/magV));
- }
+ info.setPoint(point1_ + min(magV, radius_)*v);
}
else if (parallel >= magDir_)
{
- // nearest is at point2
- if (magV < ROOTVSMALL)
- {
- info.setPoint(point2_);
- }
- else
- {
- info.setPoint(point2_ + min(magV, radius_)*v/magV);
- }
+ // nearest is at point2 end cap. Clip to radius.
+ info.setPoint(point2_ + min(magV, radius_)*v);
}
else
{
- if (magV < ROOTVSMALL)
+ // inbetween endcaps. Might either be nearer endcaps or cylinder wall
+
+ // distance to endpoint: parallel or parallel-magDir
+ // distance to cylinder wall: magV-radius_
+
+ // Nearest cylinder point
+ point cylPt = sample + (radius_-magV)*v;
+
+ if (parallel < 0.5*magDir_)
{
- info.setPoint(point1_ + parallel*unitDir_);
+ // Project onto p1 endcap
+ point end1Pt = point1_ + min(magV, radius_)*v;
+
+ if (magSqr(sample-cylPt) < magSqr(sample-end1Pt))
+ {
+ info.setPoint(cylPt);
+ }
+ else
+ {
+ info.setPoint(end1Pt);
+ }
}
else
{
- // Project onto radius
- info.setPoint(point1_ + parallel*unitDir_ + radius_*v/magV);
+ // Project onto p2 endcap
+ point end2Pt = point2_ + min(magV, radius_)*v;
+
+ if (magSqr(sample-cylPt) < magSqr(sample-end2Pt))
+ {
+ info.setPoint(cylPt);
+ }
+ else
+ {
+ info.setPoint(end2Pt);
+ }
}
}
--
GitLab
From dafbfb5c204449a6c7d5fd7f05c606e793e75766 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 Jun 2010 15:31:19 +0100
Subject: [PATCH 45/77] ENH: multiLevel decomposition method.
---
.../generation/snappyHexMesh/snappyHexMesh.C | 3 +-
.../manipulation/renumberMesh/renumberMesh.C | 12 +-
.../splitMeshRegions/splitMeshRegions.C | 63 +-
.../decomposePar/decomposeParDict | 30 +-
.../domainDecompositionDistribute.C | 12 +-
.../redistributeMeshPar/redistributeMeshPar.C | 5 +-
.../metisDecomp/dummyMetisDecomp.C | 10 +-
.../ptscotchDecomp/dummyPtscotchDecomp.C | 10 +-
.../scotchDecomp/dummyScotchDecomp.C | 26 +-
.../autoHexMeshDriver/autoHexMeshDriver.C | 6 +-
.../meshRefinement/meshRefinement.C | 2 +
.../distributedTriSurfaceMesh.C | 19 +-
.../decompose/decompositionMethods/Make/files | 1 +
.../decompositionMethod/decompositionMethod.C | 615 ++++++++----------
.../decompositionMethod/decompositionMethod.H | 206 +++---
.../geomDecomp/geomDecomp.H | 11 +
.../hierarchGeomDecomp/hierarchGeomDecomp.C | 52 +-
.../hierarchGeomDecomp/hierarchGeomDecomp.H | 31 +-
.../manualDecomp/manualDecomp.C | 23 +-
.../manualDecomp/manualDecomp.H | 23 +-
.../multiLevelDecomp/multiLevelDecomp.C | 293 +++++++++
.../multiLevelDecomp/multiLevelDecomp.H | 136 ++++
.../simpleGeomDecomp/simpleGeomDecomp.C | 39 +-
.../simpleGeomDecomp/simpleGeomDecomp.H | 25 +-
.../decompose/metisDecomp/metisDecomp.C | 130 ++--
.../decompose/metisDecomp/metisDecomp.H | 14 +-
.../decompose/ptscotchDecomp/ptscotchDecomp.C | 73 +--
.../decompose/ptscotchDecomp/ptscotchDecomp.H | 13 +-
.../decompose/scotchDecomp/scotchDecomp.C | 77 +--
.../decompose/scotchDecomp/scotchDecomp.H | 14 +-
30 files changed, 1143 insertions(+), 831 deletions(-)
create mode 100644 src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
create mode 100644 src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 7ced14726d9..c48abfbc396 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -334,8 +334,7 @@ int main(int argc, char *argv[])
(
decompositionMethod::New
(
- decomposeDict,
- mesh
+ decomposeDict
)
);
decompositionMethod& decomposer = decomposerPtr();
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 19a80bac5f0..3394b928b22 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -489,11 +489,17 @@ int main(int argc, char *argv[])
);
autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
(
- decomposeDict,
- mesh
+ decomposeDict
);
- labelList cellToRegion(decomposePtr().decompose(mesh.cellCentres()));
+ labelList cellToRegion
+ (
+ decomposePtr().decompose
+ (
+ mesh,
+ mesh.cellCentres()
+ )
+ );
// For debugging: write out region
{
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index e9c20f1afbf..7e3cd14588a 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -381,7 +381,8 @@ void subsetVolFields
const fvMesh& mesh,
const fvMesh& subMesh,
const labelList& cellMap,
- const labelList& faceMap
+ const labelList& faceMap,
+ const labelHashSet& addedPatches
)
{
const labelList patchMap(identity(mesh.boundaryMesh().size()));
@@ -412,14 +413,7 @@ void subsetVolFields
// get initialised.
forAll(tSubFld().boundaryField(), patchI)
{
- const fvPatchField<typename GeoField::value_type>& pfld =
- tSubFld().boundaryField()[patchI];
-
- if
- (
- isA<calculatedFvPatchField<typename GeoField::value_type> >
- (pfld)
- )
+ if (addedPatches.found(patchI))
{
tSubFld().boundaryField()[patchI] ==
pTraits<typename GeoField::value_type>::zero;
@@ -440,7 +434,8 @@ void subsetSurfaceFields
(
const fvMesh& mesh,
const fvMesh& subMesh,
- const labelList& faceMap
+ const labelList& faceMap,
+ const labelHashSet& addedPatches
)
{
const labelList patchMap(identity(mesh.boundaryMesh().size()));
@@ -470,14 +465,7 @@ void subsetSurfaceFields
// get initialised.
forAll(tSubFld().boundaryField(), patchI)
{
- const fvsPatchField<typename GeoField::value_type>& pfld =
- tSubFld().boundaryField()[patchI];
-
- if
- (
- isA<calculatedFvsPatchField<typename GeoField::value_type> >
- (pfld)
- )
+ if (addedPatches.found(patchI))
{
tSubFld().boundaryField()[patchI] ==
pTraits<typename GeoField::value_type>::zero;
@@ -852,6 +840,15 @@ void createAndWriteRegion
newMesh
);
+
+ // Make map of all added patches
+ labelHashSet addedPatches(2*interfaceToPatch.size());
+ forAllConstIter(EdgeMap<label>, interfaceToPatch, iter)
+ {
+ addedPatches.insert(iter());
+ addedPatches.insert(iter()+1);
+ }
+
Info<< "Mapping fields" << endl;
// Map existing fields
@@ -863,66 +860,76 @@ void createAndWriteRegion
mesh,
newMesh(),
map().cellMap(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetVolFields<volVectorField>
(
mesh,
newMesh(),
map().cellMap(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetVolFields<volSphericalTensorField>
(
mesh,
newMesh(),
map().cellMap(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetVolFields<volSymmTensorField>
(
mesh,
newMesh(),
map().cellMap(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetVolFields<volTensorField>
(
mesh,
newMesh(),
map().cellMap(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetSurfaceFields<surfaceScalarField>
(
mesh,
newMesh(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetSurfaceFields<surfaceVectorField>
(
mesh,
newMesh(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetSurfaceFields<surfaceSphericalTensorField>
(
mesh,
newMesh(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetSurfaceFields<surfaceSymmTensorField>
(
mesh,
newMesh(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
subsetSurfaceFields<surfaceTensorField>
(
mesh,
newMesh(),
- map().faceMap()
+ map().faceMap(),
+ addedPatches
);
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index a183ebd0cb4..0f09fca3539 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -19,6 +19,7 @@ FoamFile
numberOfSubdomains 4;
+
//- Keep owner and neighbour on same processor for faces in zones:
// preserveFaceZones (heater solid1 solid3);
@@ -28,15 +29,40 @@ numberOfSubdomains 4;
//preservePatches (cyclic_half0 cyclic_half1);
-method scotch;
+// method scotch;
// method hierarchical;
// method simple;
// method metis;
// method manual;
+method multiLevel;
+
+multiLevelCoeffs
+{
+ level0
+ {
+ numberOfSubdomains 2;
+ method simple;
+ simpleCoeffs
+ {
+ n (2 1 1);
+ delta 0.001;
+ }
+ }
+ level1
+ {
+ numberOfSubdomains 2;
+ method scotch;
+ }
+}
+
+
+// Desired output
+
+
simpleCoeffs
{
- n (2 2 1);
+ n (2 1 1);
delta 0.001;
}
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
index 6adf0639626..877395e38d4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
@@ -109,13 +109,12 @@ void Foam::domainDecomposition::distributeCells()
autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
(
- decompositionDict_,
- *this
+ decompositionDict_
);
if (sameProcFaces.empty())
{
- cellToProc_ = decomposePtr().decompose(cellCentres());
+ cellToProc_ = decomposePtr().decompose(*this, cellCentres());
}
else
{
@@ -174,7 +173,12 @@ void Foam::domainDecomposition::distributeCells()
// Do decomposition on agglomeration
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- cellToProc_ = decomposePtr().decompose(globalRegion, regionCentres);
+ cellToProc_ = decomposePtr().decompose
+ (
+ *this,
+ globalRegion,
+ regionCentres
+ );
}
Info<< "\nFinished decomposition in "
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 5df7310f8ea..173d6314dfd 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -594,8 +594,7 @@ int main(int argc, char *argv[])
(
decompositionMethod::New
(
- decompositionDict,
- mesh
+ decompositionDict
)
);
@@ -612,7 +611,7 @@ int main(int argc, char *argv[])
<< endl;
}
- finalDecomp = decomposer().decompose(mesh.cellCentres());
+ finalDecomp = decomposer().decompose(mesh, mesh.cellCentres());
}
// Dump decomposition to volScalarField
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index e7b61fd28db..4be4cd995b8 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -46,7 +46,7 @@ namespace Foam
(
decompositionMethod,
metisDecomp,
- dictionaryMesh
+ dictionary
);
}
@@ -80,12 +80,10 @@ Foam::label Foam::metisDecomp::decompose
Foam::metisDecomp::metisDecomp
(
- const dictionary& decompositionDict,
- const polyMesh& mesh
+ const dictionary& decompositionDict
)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -93,6 +91,7 @@ Foam::metisDecomp::metisDecomp
Foam::labelList Foam::metisDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
@@ -112,6 +111,7 @@ Foam::labelList Foam::metisDecomp::decompose
Foam::labelList Foam::metisDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& agglomWeights
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index 2e877de4a90..9e59239fd1f 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -48,7 +48,7 @@ namespace Foam
(
decompositionMethod,
ptscotchDecomp,
- dictionaryMesh
+ dictionary
);
}
@@ -85,12 +85,10 @@ Foam::label Foam::ptscotchDecomp::decompose
Foam::ptscotchDecomp::ptscotchDecomp
(
- const dictionary& decompositionDict,
- const polyMesh& mesh
+ const dictionary& decompositionDict
)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -98,6 +96,7 @@ Foam::ptscotchDecomp::ptscotchDecomp
Foam::labelList Foam::ptscotchDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
@@ -117,6 +116,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
Foam::labelList Foam::ptscotchDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& pointWeights
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index 3c846339320..007f708a5de 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -47,7 +47,7 @@ namespace Foam
(
decompositionMethod,
scotchDecomp,
- dictionaryMesh
+ dictionary
);
}
@@ -59,6 +59,7 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::scotchDecomp::decompose
(
+ const fileName& meshPath,
const List<int>& adjncy,
const List<int>& xadj,
const scalarField& cWeights,
@@ -68,13 +69,14 @@ Foam::label Foam::scotchDecomp::decompose
{
FatalErrorIn
(
- "label scotchDecomp::decompose"
- "("
- "const List<int>&, "
- "const List<int>&, "
- "const scalarField&, "
- "List<int>&"
- ")"
+ "label scotchDecomp::decompose\n"
+ "(\n"
+ "const fileName& meshPath,\n"
+ "const List<int>&,\n"
+ "const List<int>&,\n"
+ "const scalarField&,\n"
+ "List<int>&\n"
+ ")\n"
) << notImplementedMessage << exit(FatalError);
return -1;
@@ -85,12 +87,10 @@ Foam::label Foam::scotchDecomp::decompose
Foam::scotchDecomp::scotchDecomp
(
- const dictionary& decompositionDict,
- const polyMesh& mesh
+ const dictionary& decompositionDict
)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -98,6 +98,7 @@ Foam::scotchDecomp::scotchDecomp
Foam::labelList Foam::scotchDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
@@ -117,6 +118,7 @@ Foam::labelList Foam::scotchDecomp::decompose
Foam::labelList Foam::scotchDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& pointWeights
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 1fd66dfda8d..b5085a465ab 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -415,11 +415,7 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
{
// Decomposition
- decomposerPtr_ = decompositionMethod::New
- (
- decomposeDict,
- mesh_
- );
+ decomposerPtr_ = decompositionMethod::New(decomposeDict);
decompositionMethod& decomposer = decomposerPtr_();
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 0622273a4ef..43d1c740609 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1214,6 +1214,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
// Normal decomposition
distribution = decomposer.decompose
(
+ mesh_,
mesh_.cellCentres(),
cellWeights
);
@@ -1224,6 +1225,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
// Normal decomposition
distribution = decomposer.decompose
(
+ mesh_,
mesh_.cellCentres(),
cellWeights
);
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index a046f05050e..e736ec8945e 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -34,6 +34,7 @@ License
#include "IFstream.H"
#include "decompositionMethod.H"
+#include "geomDecomp.H"
#include "vectorList.H"
#include "PackedBoolList.H"
@@ -855,6 +856,19 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
<< " does not decompose in parallel."
<< " Please choose one that does." << exit(FatalError);
}
+
+ if (!isA<geomDecomp>(decomposer_()))
+ {
+ FatalErrorIn
+ (
+ "distributedTriSurfaceMesh::independentlyDistributedBbs"
+ "(const triSurface&)"
+ ) << "The decomposition method " << decomposer_().typeName
+ << " is not a geometric decomposition method." << endl
+ << "Only geometric decomposition methods are currently"
+ << " supported."
+ << exit(FatalError);
+ }
}
// Do decomposition according to triangle centre
@@ -864,8 +878,11 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
triCentres[triI] = s[triI].centre(s.points());
}
+
+ geomDecomp& decomposer = refCast<geomDecomp>(decomposer_());
+
// Do the actual decomposition
- labelList distribution(decomposer_->decompose(triCentres));
+ labelList distribution(decomposer.decompose(triCentres));
// Find bounding box for all triangles on new distribution.
diff --git a/src/parallel/decompose/decompositionMethods/Make/files b/src/parallel/decompose/decompositionMethods/Make/files
index 43bb9a25c1d..fccb8b7c8f6 100644
--- a/src/parallel/decompose/decompositionMethods/Make/files
+++ b/src/parallel/decompose/decompositionMethods/Make/files
@@ -3,5 +3,6 @@ geomDecomp/geomDecomp.C
simpleGeomDecomp/simpleGeomDecomp.C
hierarchGeomDecomp/hierarchGeomDecomp.C
manualDecomp/manualDecomp.C
+multiLevelDecomp/multiLevelDecomp.C
LIB = $(FOAM_LIBBIN)/libdecompositionMethods
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 4e026f9e487..e68e31c7b97 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -37,7 +37,6 @@ namespace Foam
{
defineTypeNameAndDebug(decompositionMethod, 0);
defineRunTimeSelectionTable(decompositionMethod, dictionary);
- defineRunTimeSelectionTable(decompositionMethod, dictionaryMesh);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -71,57 +70,45 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
}
-Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
-(
- const dictionary& decompositionDict,
- const polyMesh& mesh
-)
-{
- const word methodType(decompositionDict.lookup("method"));
-
- Info<< "Selecting decompositionMethod " << methodType << endl;
-
- dictionaryMeshConstructorTable::iterator cstrIter =
- dictionaryMeshConstructorTablePtr_->find(methodType);
-
- if (cstrIter == dictionaryMeshConstructorTablePtr_->end())
- {
- FatalErrorIn
- (
- "decompositionMethod::New"
- "(const dictionary& decompositionDict, "
- "const polyMesh& mesh)"
- ) << "Unknown decompositionMethod "
- << methodType << nl << nl
- << "Valid decompositionMethods are : " << endl
- << dictionaryMeshConstructorTablePtr_->sortedToc()
- << exit(FatalError);
- }
-
- return autoPtr<decompositionMethod>(cstrIter()(decompositionDict, mesh));
-}
-
-
Foam::labelList Foam::decompositionMethod::decompose
(
+ const polyMesh& mesh,
const pointField& points
)
{
- scalarField weights(0);
+ scalarField weights(points.size(), 1.0);
- return decompose(points, weights);
+ return decompose(mesh, points, weights);
}
Foam::labelList Foam::decompositionMethod::decompose
(
+ const polyMesh& mesh,
const labelList& fineToCoarse,
const pointField& coarsePoints,
const scalarField& coarseWeights
)
{
+ CompactListList<label> coarseCellCells;
+ calcCellCells
+ (
+ mesh,
+ fineToCoarse,
+ coarsePoints.size(),
+ coarseCellCells
+ );
+
// Decompose based on agglomerated points
- labelList coarseDistribution(decompose(coarsePoints, coarseWeights));
+ labelList coarseDistribution
+ (
+ decompose
+ (
+ coarseCellCells(),
+ coarsePoints,
+ coarseWeights
+ )
+ );
// Rework back into decomposition for original mesh_
labelList fineDistribution(fineToCoarse.size());
@@ -137,22 +124,20 @@ Foam::labelList Foam::decompositionMethod::decompose
Foam::labelList Foam::decompositionMethod::decompose
(
+ const polyMesh& mesh,
const labelList& fineToCoarse,
const pointField& coarsePoints
)
{
- // Decompose based on agglomerated points
- labelList coarseDistribution(decompose(coarsePoints));
-
- // Rework back into decomposition for original mesh_
- labelList fineDistribution(fineToCoarse.size());
-
- forAll(fineDistribution, i)
- {
- fineDistribution[i] = coarseDistribution[fineToCoarse[i]];
- }
-
- return fineDistribution;
+ scalarField cWeights(coarsePoints.size(), 1.0);
+
+ return decompose
+ (
+ mesh,
+ fineToCoarse,
+ coarsePoints,
+ cWeights
+ );
}
@@ -162,57 +147,12 @@ Foam::labelList Foam::decompositionMethod::decompose
const pointField& cc
)
{
- scalarField cWeights(0);
+ scalarField cWeights(cc.size(), 1.0);
return decompose(globalCellCells, cc, cWeights);
}
-void Foam::decompositionMethod::calcCellCells
-(
- const polyMesh& mesh,
- const labelList& fineToCoarse,
- const label nCoarse,
- labelListList& cellCells
-)
-{
- if (fineToCoarse.size() != mesh.nCells())
- {
- FatalErrorIn
- (
- "decompositionMethod::calcCellCells"
- "(const labelList&, labelListList&) const"
- ) << "Only valid for mesh agglomeration." << exit(FatalError);
- }
-
- List<DynamicList<label> > dynCellCells(nCoarse);
-
- forAll(mesh.faceNeighbour(), faceI)
- {
- label own = fineToCoarse[mesh.faceOwner()[faceI]];
- label nei = fineToCoarse[mesh.faceNeighbour()[faceI]];
-
- if (own != nei)
- {
- if (findIndex(dynCellCells[own], nei) == -1)
- {
- dynCellCells[own].append(nei);
- }
- if (findIndex(dynCellCells[nei], own) == -1)
- {
- dynCellCells[nei].append(own);
- }
- }
- }
-
- cellCells.setSize(dynCellCells.size());
- forAll(dynCellCells, coarseI)
- {
- cellCells[coarseI].transfer(dynCellCells[coarseI]);
- }
-}
-
-
// Return the minimum face between two cells. Only relevant for
// cells with multiple faces inbetween.
Foam::label Foam::decompositionMethod::masterFace
@@ -250,208 +190,209 @@ Foam::label Foam::decompositionMethod::masterFace
}
-void Foam::decompositionMethod::calcCSR
-(
- const polyMesh& mesh,
- List<int>& adjncy,
- List<int>& xadj
-)
-{
- const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-
- // Make Metis CSR (Compressed Storage Format) storage
- // adjncy : contains neighbours (= edges in graph)
- // xadj(celli) : start of information in adjncy for celli
-
-
- // Count unique faces between cells
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- labelList nFacesPerCell(mesh.nCells(), 0);
-
- // Internal faces
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
- {
- label own = mesh.faceOwner()[faceI];
- label nei = mesh.faceNeighbour()[faceI];
-
- if (faceI == masterFace(mesh, own, nei))
- {
- nFacesPerCell[own]++;
- nFacesPerCell[nei]++;
- }
- }
-
- // Coupled faces. Only cyclics done.
- HashSet<edge, Hash<edge> > cellPair(mesh.nFaces()-mesh.nInternalFaces());
-
- forAll(pbm, patchI)
- {
- if
- (
- isA<cyclicPolyPatch>(pbm[patchI])
- && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
- )
- {
- const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
- (
- pbm[patchI]
- );
-
- const unallocLabelList& faceCells = cycPatch.faceCells();
- const unallocLabelList& nbrCells =
- cycPatch.neighbPatch().faceCells();
-
- forAll(faceCells, facei)
- {
- label own = faceCells[facei];
- label nei = nbrCells[facei];
-
- if (cellPair.insert(edge(own, nei)))
- {
- nFacesPerCell[own]++;
- nFacesPerCell[nei]++;
- }
- }
- }
- }
-
+//void Foam::decompositionMethod::calcCSR
+//(
+// const polyMesh& mesh,
+// List<int>& adjncy,
+// List<int>& xadj
+//)
+//{
+// const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+//
+// // Make Metis CSR (Compressed Storage Format) storage
+// // adjncy : contains neighbours (= edges in graph)
+// // xadj(celli) : start of information in adjncy for celli
+//
+//
+// // Count unique faces between cells
+// // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// labelList nFacesPerCell(mesh.nCells(), 0);
+//
+// // Internal faces
+// for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+// {
+// label own = mesh.faceOwner()[faceI];
+// label nei = mesh.faceNeighbour()[faceI];
+//
+// if (faceI == masterFace(mesh, own, nei))
+// {
+// nFacesPerCell[own]++;
+// nFacesPerCell[nei]++;
+// }
+// }
+//
+// // Coupled faces. Only cyclics done.
+// HashSet<edge, Hash<edge> > cellPair(mesh.nFaces()-mesh.nInternalFaces());
+//
+// forAll(pbm, patchI)
+// {
+// if
+// (
+// isA<cyclicPolyPatch>(pbm[patchI])
+// && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
+// )
+// {
+// const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
+// (
+// pbm[patchI]
+// );
+//
+// const unallocLabelList& faceCells = cycPatch.faceCells();
+// const unallocLabelList& nbrCells =
+// cycPatch.neighbPatch().faceCells();
+//
+// forAll(faceCells, facei)
+// {
+// label own = faceCells[facei];
+// label nei = nbrCells[facei];
+//
+// if (cellPair.insert(edge(own, nei)))
+// {
+// nFacesPerCell[own]++;
+// nFacesPerCell[nei]++;
+// }
+// }
+// }
+// }
+//
+//
+// // Size tables
+// // ~~~~~~~~~~~
+//
+// // Sum nFacesPerCell
+// xadj.setSize(mesh.nCells()+1);
+//
+// label nConnections = 0;
+//
+// for (label cellI = 0; cellI < mesh.nCells(); cellI++)
+// {
+// xadj[cellI] = nConnections;
+// nConnections += nFacesPerCell[cellI];
+// }
+// xadj[mesh.nCells()] = nConnections;
+// adjncy.setSize(nConnections);
+//
+//
+//
+// // Fill tables
+// // ~~~~~~~~~~~
+//
+// nFacesPerCell = 0;
+//
+// // Internal faces
+// for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+// {
+// label own = mesh.faceOwner()[faceI];
+// label nei = mesh.faceNeighbour()[faceI];
+//
+// if (faceI == masterFace(mesh, own, nei))
+// {
+// adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
+// adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
+// }
+// }
+//
+// // Coupled faces. Only cyclics done.
+// cellPair.clear();
+// forAll(pbm, patchI)
+// {
+// if
+// (
+// isA<cyclicPolyPatch>(pbm[patchI])
+// && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
+// )
+// {
+// const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
+// (
+// pbm[patchI]
+// );
+//
+// const unallocLabelList& faceCells = cycPatch.faceCells();
+// const unallocLabelList& nbrCells =
+// cycPatch.neighbPatch().faceCells();
+//
+// forAll(faceCells, facei)
+// {
+// label own = faceCells[facei];
+// label nei = nbrCells[facei];
+//
+// if (cellPair.insert(edge(own, nei)))
+// {
+// adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
+// adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
+// }
+// }
+// }
+// }
+//}
+//
+//
+//// From cell-cell connections to Metis format (like CompactListList)
+//void Foam::decompositionMethod::calcCSR
+//(
+// const labelListList& cellCells,
+// List<int>& adjncy,
+// List<int>& xadj
+//)
+//{
+// labelHashSet nbrCells;
+//
+// // Count number of internal faces
+// label nConnections = 0;
+//
+// forAll(cellCells, coarseI)
+// {
+// nbrCells.clear();
+//
+// const labelList& cCells = cellCells[coarseI];
+//
+// forAll(cCells, i)
+// {
+// if (nbrCells.insert(cCells[i]))
+// {
+// nConnections++;
+// }
+// }
+// }
+//
+// // Create the adjncy array as twice the size of the total number of
+// // internal faces
+// adjncy.setSize(nConnections);
+//
+// xadj.setSize(cellCells.size()+1);
+//
+//
+// // Fill in xadj
+// // ~~~~~~~~~~~~
+// label freeAdj = 0;
+//
+// forAll(cellCells, coarseI)
+// {
+// xadj[coarseI] = freeAdj;
+//
+// nbrCells.clear();
+//
+// const labelList& cCells = cellCells[coarseI];
+//
+// forAll(cCells, i)
+// {
+// if (nbrCells.insert(cCells[i]))
+// {
+// adjncy[freeAdj++] = cCells[i];
+// }
+// }
+// }
+// xadj[cellCells.size()] = freeAdj;
+//}
- // Size tables
- // ~~~~~~~~~~~
- // Sum nFacesPerCell
- xadj.setSize(mesh.nCells()+1);
-
- label nConnections = 0;
-
- for (label cellI = 0; cellI < mesh.nCells(); cellI++)
- {
- xadj[cellI] = nConnections;
- nConnections += nFacesPerCell[cellI];
- }
- xadj[mesh.nCells()] = nConnections;
- adjncy.setSize(nConnections);
-
-
-
- // Fill tables
- // ~~~~~~~~~~~
-
- nFacesPerCell = 0;
-
- // Internal faces
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
- {
- label own = mesh.faceOwner()[faceI];
- label nei = mesh.faceNeighbour()[faceI];
-
- if (faceI == masterFace(mesh, own, nei))
- {
- adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
- adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
- }
- }
-
- // Coupled faces. Only cyclics done.
- cellPair.clear();
- forAll(pbm, patchI)
- {
- if
- (
- isA<cyclicPolyPatch>(pbm[patchI])
- && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
- )
- {
- const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
- (
- pbm[patchI]
- );
-
- const unallocLabelList& faceCells = cycPatch.faceCells();
- const unallocLabelList& nbrCells =
- cycPatch.neighbPatch().faceCells();
-
- forAll(faceCells, facei)
- {
- label own = faceCells[facei];
- label nei = nbrCells[facei];
-
- if (cellPair.insert(edge(own, nei)))
- {
- adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
- adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
- }
- }
- }
- }
-}
-
-
-// From cell-cell connections to Metis format (like CompactListList)
-void Foam::decompositionMethod::calcCSR
-(
- const labelListList& cellCells,
- List<int>& adjncy,
- List<int>& xadj
-)
-{
- labelHashSet nbrCells;
-
- // Count number of internal faces
- label nConnections = 0;
-
- forAll(cellCells, coarseI)
- {
- nbrCells.clear();
-
- const labelList& cCells = cellCells[coarseI];
-
- forAll(cCells, i)
- {
- if (nbrCells.insert(cCells[i]))
- {
- nConnections++;
- }
- }
- }
-
- // Create the adjncy array as twice the size of the total number of
- // internal faces
- adjncy.setSize(nConnections);
-
- xadj.setSize(cellCells.size()+1);
-
-
- // Fill in xadj
- // ~~~~~~~~~~~~
- label freeAdj = 0;
-
- forAll(cellCells, coarseI)
- {
- xadj[coarseI] = freeAdj;
-
- nbrCells.clear();
-
- const labelList& cCells = cellCells[coarseI];
-
- forAll(cCells, i)
- {
- if (nbrCells.insert(cCells[i]))
- {
- adjncy[freeAdj++] = cCells[i];
- }
- }
- }
- xadj[cellCells.size()] = freeAdj;
-}
-
-
-void Foam::decompositionMethod::calcDistributedCSR
+void Foam::decompositionMethod::calcCellCells
(
const polyMesh& mesh,
- List<int>& adjncy,
- List<int>& xadj
+ const labelList& agglom,
+ const label nCoarse,
+ CompactListList<label>& cellCells
)
{
// Create global cell numbers
@@ -459,14 +400,6 @@ void Foam::decompositionMethod::calcDistributedCSR
globalIndex globalCells(mesh.nCells());
-
- //
- // Make Metis Distributed CSR (Compressed Storage Format) storage
- // adjncy : contains cellCells (= edges in graph)
- // xadj(celli) : start of information in adjncy for celli
- //
-
-
const labelList& faceOwner = mesh.faceOwner();
const labelList& faceNeighbour = mesh.faceNeighbour();
const polyBoundaryMesh& patches = mesh.boundaryMesh();
@@ -475,7 +408,7 @@ void Foam::decompositionMethod::calcDistributedCSR
// Get renumbered owner on other side of coupled faces
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- List<int> globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
+ labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
forAll(patches, patchI)
{
@@ -504,18 +437,15 @@ void Foam::decompositionMethod::calcDistributedCSR
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Number of faces per cell
- List<int> nFacesPerCell(mesh.nCells(), 0);
+ labelList nFacesPerCell(mesh.nCells(), 0);
for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
{
- label own = faceOwner[faceI];
- label nei = faceNeighbour[faceI];
+ label own = agglom[faceOwner[faceI]];
+ label nei = agglom[faceNeighbour[faceI]];
- if (faceI == masterFace(mesh, own, nei))
- {
- nFacesPerCell[own]++;
- nFacesPerCell[nei]++;
- }
+ nFacesPerCell[own]++;
+ nFacesPerCell[nei]++;
}
// Handle coupled faces
@@ -532,7 +462,7 @@ void Foam::decompositionMethod::calcDistributedCSR
forAll(pp, i)
{
- label own = faceOwner[faceI];
+ label own = agglom[faceOwner[faceI]];
label globalNei = globalNeighbour[bFaceI];
if (cellPair.insert(edge(own, globalNei)))
{
@@ -545,43 +475,24 @@ void Foam::decompositionMethod::calcDistributedCSR
}
- // Fill in xadj
- // ~~~~~~~~~~~~
+ // Fill in offset and data
+ // ~~~~~~~~~~~~~~~~~~~~~~~
- xadj.setSize(mesh.nCells()+1);
-
- int freeAdj = 0;
-
- for (label cellI = 0; cellI < mesh.nCells(); cellI++)
- {
- xadj[cellI] = freeAdj;
-
- freeAdj += nFacesPerCell[cellI];
- }
- xadj[mesh.nCells()] = freeAdj;
-
-
-
- // Fill in adjncy
- // ~~~~~~~~~~~~~~
-
- adjncy.setSize(freeAdj);
+ cellCells.setSize(nFacesPerCell);
nFacesPerCell = 0;
+ labelList& m = cellCells.m();
+ const labelList& offsets = cellCells.offsets();
+
// For internal faces is just offsetted owner and neighbour
for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
{
- label own = faceOwner[faceI];
- label nei = faceNeighbour[faceI];
+ label own = agglom[faceOwner[faceI]];
+ label nei = agglom[faceNeighbour[faceI]];
- if (faceI == masterFace(mesh, own, nei))
- {
- adjncy[xadj[own] + nFacesPerCell[own]++] =
- globalCells.toGlobal(nei);
- adjncy[xadj[nei] + nFacesPerCell[nei]++] =
- globalCells.toGlobal(own);
- }
+ m[offsets[own] + nFacesPerCell[own]++] = globalCells.toGlobal(nei);
+ m[offsets[nei] + nFacesPerCell[nei]++] = globalCells.toGlobal(own);
}
// For boundary faces is offsetted coupled neighbour
@@ -597,17 +508,41 @@ void Foam::decompositionMethod::calcDistributedCSR
forAll(pp, i)
{
- label own = faceOwner[faceI];
+ label own = agglom[faceOwner[faceI]];
label globalNei = globalNeighbour[bFaceI];
if (cellPair.insert(edge(own, globalNei)))
{
- adjncy[xadj[own] + nFacesPerCell[own]++] = globalNei;
+ m[offsets[own] + nFacesPerCell[own]++] = globalNei;
}
faceI++;
bFaceI++;
}
}
}
+
+
+ // Check for duplicates connections between cells as a postprocessing step
+ // (since quite rare)
+ label startIndex = 0;
+ label newIndex = 0;
+ labelHashSet nbrCells;
+ forAll(cellCells, cellI)
+ {
+ nbrCells.clear();
+
+ label& endIndex = cellCells.offsets()[cellI+1];
+
+ for (label i = startIndex; i < endIndex; i++)
+ {
+ if (nbrCells.insert(cellCells.m()[i]))
+ {
+ cellCells.m()[newIndex++] = cellCells.m()[i];
+ }
+ }
+
+ startIndex = endIndex;
+ endIndex = newIndex;
+ }
}
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index dabca144c88..26ad6cc5e7c 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -37,6 +37,7 @@ SourceFiles
#include "polyMesh.H"
#include "pointField.H"
+#include "CompactListList.H"
namespace Foam
{
@@ -56,43 +57,37 @@ protected:
label nProcessors_;
- //- Helper: determine (non-parallel) cellCells from mesh agglomeration.
+ //- Helper: determine (global) cellCells from mesh agglomeration.
static void calcCellCells
(
const polyMesh& mesh,
const labelList& agglom,
const label nCoarse,
- labelListList& cellCells
+ CompactListList<label>& cellCells
);
//- Calculate the minimum face between two neighbouring cells
// (usually there is only one)
static label masterFace(const polyMesh&, const label, const label);
- // From mesh to compact row storage format
- // (like CompactListList)
- static void calcCSR
- (
- const polyMesh& mesh,
- List<int>& adjncy,
- List<int>& xadj
- );
+// // From mesh to compact row storage format
+// // (like CompactListList)
+// static void calcCSR
+// (
+// const polyMesh& mesh,
+// List<int>& adjncy,
+// List<int>& xadj
+// );
+//
+// // From cell-cell connections to compact row storage format
+// // (like CompactListList)
+// static void calcCSR
+// (
+// const labelListList& cellCells,
+// List<int>& adjncy,
+// List<int>& xadj
+// );
- // From cell-cell connections to compact row storage format
- // (like CompactListList)
- static void calcCSR
- (
- const labelListList& cellCells,
- List<int>& adjncy,
- List<int>& xadj
- );
-
- static void calcDistributedCSR
- (
- const polyMesh& mesh,
- List<int>& adjncy,
- List<int>& xadj
- );
private:
@@ -122,18 +117,6 @@ public:
(decompositionDict)
);
- declareRunTimeSelectionTable
- (
- autoPtr,
- decompositionMethod,
- dictionaryMesh,
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- ),
- (decompositionDict, mesh)
- );
-
// Selectors
@@ -143,13 +126,6 @@ public:
const dictionary& decompositionDict
);
- //- Return a reference to the selected decomposition method
- static autoPtr<decompositionMethod> New
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
-
// Constructors
@@ -171,63 +147,105 @@ public:
// Member Functions
+ label nDomains() const
+ {
+ return nProcessors_;
+ }
+
//- Is method parallel aware (i.e. does it synchronize domains across
// proc boundaries)
virtual bool parallelAware() const = 0;
- //- Return for every coordinate the wanted processor number. Use the
- // mesh connectivity (if needed)
- virtual labelList decompose
- (
- const pointField& points,
- const scalarField& pointWeights
- ) = 0;
-
- //- Like decompose but with uniform weights on the points
- virtual labelList decompose(const pointField&);
-
-
- //- Return for every coordinate the wanted processor number. Gets
- // passed agglomeration map (from fine to coarse cells) and coarse cell
- // location. Can be overridden by decomposers that provide this
- // functionality natively. Coarse cells are local to the processor
- // (if in parallel). If you want to have coarse cells spanning
- // processors use the globalCellCells instead.
- virtual labelList decompose
- (
- const labelList& cellToRegion,
- const pointField& regionPoints,
- const scalarField& regionWeights
- );
-
- //- Like decompose but with uniform weights on the regions
- virtual labelList decompose
- (
- const labelList& cellToRegion,
- const pointField& regionPoints
- );
+ // No topology (implemented by geometric decomposers)
- //- Return for every coordinate the wanted processor number. Explicitly
- // provided connectivity - does not use mesh_.
- // The connectivity is equal to mesh.cellCells() except for
- // - in parallel the cell numbers are global cell numbers (starting
- // from 0 at processor0 and then incrementing all through the
- // processors)
- // - the connections are across coupled patches
- virtual labelList decompose
- (
- const labelListList& globalCellCells,
- const pointField& cc,
- const scalarField& cWeights
- ) = 0;
+ //- Return for every coordinate the wanted processor number.
+ virtual labelList decompose
+ (
+ const pointField& points,
+ const scalarField& pointWeights
+ )
+ {
+ notImplemented
+ (
+ "decompositionMethod:decompose(const pointField&"
+ ", const scalarField&)"
+ );
+ return labelList(0);
+ }
+
+ //- Like decompose but with uniform weights on the points
+ virtual labelList decompose(const pointField&)
+ {
+ notImplemented
+ (
+ "decompositionMethod:decompose(const pointField&)"
+ );
+ return labelList(0);
+ }
+
+
+ // Topology provided by mesh
+
+ //- Return for every coordinate the wanted processor number. Use the
+ // mesh connectivity (if needed)
+ virtual labelList decompose
+ (
+ const polyMesh& mesh,
+ const pointField& points,
+ const scalarField& pointWeights
+ ) = 0;
+
+ //- Like decompose but with uniform weights on the points
+ virtual labelList decompose(const polyMesh&, const pointField&);
+
+
+ //- Return for every coordinate the wanted processor number. Gets
+ // passed agglomeration map (from fine to coarse cells) and coarse
+ // cell
+ // location. Can be overridden by decomposers that provide this
+ // functionality natively. Coarse cells are local to the processor
+ // (if in parallel). If you want to have coarse cells spanning
+ // processors use the globalCellCells instead.
+ virtual labelList decompose
+ (
+ const polyMesh& mesh,
+ const labelList& cellToRegion,
+ const pointField& regionPoints,
+ const scalarField& regionWeights
+ );
+
+ //- Like decompose but with uniform weights on the regions
+ virtual labelList decompose
+ (
+ const polyMesh& mesh,
+ const labelList& cellToRegion,
+ const pointField& regionPoints
+ );
+
+
+ // Topology provided explicitly addressing
+
+ //- Return for every coordinate the wanted processor number.
+ // The connectivity is equal to mesh.cellCells() except for
+ // - in parallel the cell numbers are global cell numbers
+ // (starting
+ // from 0 at processor0 and then incrementing all through the
+ // processors)
+ // - the connections are across coupled patches
+ virtual labelList decompose
+ (
+ const labelListList& globalCellCells,
+ const pointField& cc,
+ const scalarField& cWeights
+ ) = 0;
- //- Like decompose but with uniform weights on the cells
- virtual labelList decompose
- (
- const labelListList& globalCellCells,
- const pointField& cc
- );
+ //- Like decompose but with uniform weights on the cells
+ virtual labelList decompose
+ (
+ const labelListList& globalCellCells,
+ const pointField& cc
+ );
};
diff --git a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
index 14dfc5a1c12..f10b5f7c6e6 100644
--- a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H
@@ -71,6 +71,17 @@ public:
const dictionary& decompositionDict,
const word& derivedType
);
+
+ //- Return for every coordinate the wanted processor number.
+ virtual labelList decompose
+ (
+ const pointField& points,
+ const scalarField& pointWeights
+ ) = 0;
+
+ //- Like decompose but with uniform weights on the points
+ virtual labelList decompose(const pointField&) = 0;
+
};
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 98f80816080..3761d11b7fc 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -40,13 +40,6 @@ namespace Foam
hierarchGeomDecomp,
dictionary
);
-
- addToRunTimeSelectionTable
- (
- decompositionMethod,
- hierarchGeomDecomp,
- dictionaryMesh
- );
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -685,35 +678,6 @@ void Foam::hierarchGeomDecomp::sortComponent
}
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::hierarchGeomDecomp::hierarchGeomDecomp
-(
- const dictionary& decompositionDict
-)
-:
- geomDecomp(decompositionDict, typeName),
- decompOrder_()
-{
- setDecompOrder();
-}
-
-
-Foam::hierarchGeomDecomp::hierarchGeomDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh&
-)
-:
- geomDecomp(decompositionDict, hierarchGeomDecomp::typeName),
- decompOrder_()
-{
- setDecompOrder();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
Foam::labelList Foam::hierarchGeomDecomp::decompose
(
const pointField& points
@@ -797,4 +761,20 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
}
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::hierarchGeomDecomp::hierarchGeomDecomp
+(
+ const dictionary& decompositionDict
+)
+:
+ geomDecomp(decompositionDict, typeName),
+ decompOrder_()
+{
+ setDecompOrder();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index 62eef72ae32..b82b9890da7 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -154,7 +154,6 @@ class hierarchGeomDecomp
labelList& finalDecomp // overall decomposition
);
-
//- Disallow default bitwise copy construct and assignment
void operator=(const hierarchGeomDecomp&);
hierarchGeomDecomp(const hierarchGeomDecomp&);
@@ -171,13 +170,6 @@ public:
//- Construct given the decomposition dictionary
hierarchGeomDecomp(const dictionary& decompositionDict);
- //- Construct given the decomposition dictionary and mesh
- hierarchGeomDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
-
//- Destructor
virtual ~hierarchGeomDecomp()
@@ -192,8 +184,7 @@ public:
return true;
}
- //- Return for every coordinate the wanted processor number. Use the
- // mesh connectivity (if needed)
+ //- Return for every coordinate the wanted processor number.
virtual labelList decompose
(
const pointField&,
@@ -204,6 +195,26 @@ public:
// so kept separate for now.
virtual labelList decompose(const pointField&);
+
+ //- Return for every coordinate the wanted processor number. Use the
+ // mesh connectivity (if needed)
+ virtual labelList decompose
+ (
+ const polyMesh& mesh,
+ const pointField& cc,
+ const scalarField& cWeights
+ )
+ {
+ return decompose(cc, cWeights);
+ }
+
+ //- Without weights. Code for weighted decomposition is a bit complex
+ // so kept separate for now.
+ virtual labelList decompose(const polyMesh& mesh, const pointField& cc)
+ {
+ return decompose(cc);
+ }
+
//- Return for every coordinate the wanted processor number. Explicitly
// provided connectivity - does not use mesh_.
// The connectivity is equal to mesh.cellCells() except for
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
index 4c51c2a5914..b0a1377e444 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
@@ -43,34 +43,14 @@ namespace Foam
manualDecomp,
dictionary
);
-
- addToRunTimeSelectionTable
- (
- decompositionMethod,
- manualDecomp,
- dictionaryMesh
- );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::manualDecomp::manualDecomp(const dictionary& decompositionDict)
-:
- decompositionMethod(decompositionDict)
-{
- notImplemented("manualDecomp(const dictionary&)");
-}
-
-
-Foam::manualDecomp::manualDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh& mesh
-)
:
decompositionMethod(decompositionDict),
- meshPtr_(&mesh),
decompDataFile_
(
decompositionDict.subDict(word(decompositionDict.lookup("method"))
@@ -83,12 +63,11 @@ Foam::manualDecomp::manualDecomp
Foam::labelList Foam::manualDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
{
- const polyMesh& mesh = *meshPtr_;
-
labelIOList finalDecomp
(
IOobject
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
index e3da10ccacf..9976b9c08d0 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
@@ -50,8 +50,6 @@ class manualDecomp
{
// Private data
- const polyMesh* meshPtr_;
-
fileName decompDataFile_;
@@ -73,14 +71,6 @@ public:
//- Construct given the decomposition dictionary
manualDecomp(const dictionary& decompositionDict);
- //- Construct given the decomposition dictionary and mesh
- manualDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
-
-
//- Destructor
virtual ~manualDecomp()
{}
@@ -99,8 +89,9 @@ public:
// mesh connectivity (if needed)
virtual labelList decompose
(
- const pointField& points,
- const scalarField& pointWeights
+ const polyMesh& mesh,
+ const pointField& cc,
+ const scalarField& cWeights
);
//- Return for every coordinate the wanted processor number. Explicitly
@@ -117,8 +108,14 @@ public:
const scalarField& cWeights
)
{
- return decompose(cc, cWeights);
+ notImplemented
+ (
+ "decompose(const labelListList&, const pointField&"
+ ", const scalarField)"
+ );
+ return labelList(0);
}
+
};
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
new file mode 100644
index 00000000000..e9a61c729a5
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -0,0 +1,293 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "multiLevelDecomp.H"
+#include "addToRunTimeSelectionTable.H"
+#include "IFstream.H"
+#include "globalIndex.H"
+#include "mapDistribute.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(multiLevelDecomp, 0);
+
+ addToRunTimeSelectionTable
+ (
+ decompositionMethod,
+ multiLevelDecomp,
+ dictionary
+ );
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+// Given a subset of cells determine the new global indices. The problem
+// is in the cells from neighbouring processors which need to be renumbered.
+void Foam::multiLevelDecomp::subsetGlobalCellCells
+(
+ const labelListList& cellCells,
+ const labelList& set,
+ labelListList& subCellCells,
+ label& cutConnections
+) const
+{
+ // Determine new index for cells by inverting subset
+ labelList oldToNew(invert(cellCells.size(), set));
+
+ globalIndex globalCells(cellCells.size());
+
+ // Subset locally the elements for which I have data
+ subCellCells = UIndirectList<labelList>(cellCells, set);
+
+ // Get new indices for neighbouring processors
+ List<Map<label> > compactMap;
+ mapDistribute map(globalCells, subCellCells, compactMap);
+ map.distribute(oldToNew);
+
+ // Now subCellCells contains indices into oldToNew which are the
+ // new locations of the neighbouring cells.
+
+ cutConnections = 0;
+
+ forAll(subCellCells, subCellI)
+ {
+ labelList& cCells = subCellCells[subCellI];
+
+ // Keep the connections to valid mapped cells
+ label newI = 0;
+ forAll(cCells, i)
+ {
+ label subCellI = oldToNew[cCells[i]];
+ if (subCellI == -1)
+ {
+ cutConnections++;
+ }
+ else
+ {
+ cCells[newI++] = subCellI;
+ }
+ }
+ cCells.setSize(newI);
+ }
+}
+
+
+void Foam::multiLevelDecomp::decompose
+(
+ const labelListList& pointPoints,
+ const pointField& points,
+ const scalarField& pointWeights,
+ const labelList& pointMap, // map back to original points
+ const label levelI,
+
+ labelField& finalDecomp
+)
+{
+ labelList dist
+ (
+ methods_[levelI].decompose
+ (
+ pointPoints,
+ points,
+ pointWeights
+ )
+ );
+
+//Pout<< "At level " << levelI << endl;
+//forAll(dist, i)
+//{
+// Pout<< " " << i << " at:" << points[i]
+// << " original:" << pointMap[i] << " dist:" << dist[i]
+// << " connected to:" << pointField(points, pointPoints[i])
+// << endl;
+//}
+//Pout<< endl;
+
+ forAll(pointMap, i)
+ {
+ label orig = pointMap[i];
+ finalDecomp[orig] += dist[i];
+ }
+
+ if (levelI != methods_.size()-1)
+ {
+ // Recurse
+
+ // Determine points per domain
+ label n = methods_[levelI].nDomains();
+ labelListList domainToPoints(invertOneToMany(n, dist));
+
+ // 'Make space' for new levels of decomposition
+ finalDecomp *= methods_[levelI+1].nDomains();
+
+ // Extract processor+local index from point-point addressing
+
+ forAll(domainToPoints, domainI)
+ {
+ const labelList& myPoints = domainToPoints[domainI];
+
+ // Subset point-wise data.
+ pointField subPoints(points, myPoints);
+ scalarField subWeights(pointWeights, myPoints);
+ labelList subPointMap(UIndirectList<label>(pointMap, myPoints));
+ // Subset point-point addressing (adapt global numbering)
+ labelListList subPointPoints;
+ label nOutsideConnections;
+ subsetGlobalCellCells
+ (
+ pointPoints,
+ myPoints,
+ subPointPoints,
+ nOutsideConnections
+ );
+
+ //Info<< "At level " << levelI << " domain " << domainI
+ // << " have connections to other domains "
+ // << returnReduce(nOutsideConnections, sumOp<label>())
+ // << endl;
+
+ decompose
+ (
+ subPointPoints,
+ subPoints,
+ subWeights,
+ subPointMap,
+ levelI+1,
+
+ finalDecomp
+ );
+ }
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::multiLevelDecomp::multiLevelDecomp(const dictionary& decompositionDict)
+:
+ decompositionMethod(decompositionDict)
+{
+ const dictionary& myDict = decompositionDict_.subDict(typeName + "Coeffs");
+
+ methods_.setSize(myDict.size());
+ label i = 0;
+ forAllConstIter(dictionary, myDict, iter)
+ {
+ methods_.set(i++, decompositionMethod::New(iter().dict()));
+ }
+
+ label n = 1;
+ Info<< "decompositionMethod " << type() << " :" << endl;
+ forAll(methods_, i)
+ {
+ Info<< " level " << i << " decomposing with " << methods_[i].type()
+ << " into " << methods_[i].nDomains() << " subdomains." << endl;
+
+ n *= methods_[i].nDomains();
+ }
+
+ if (n != nDomains())
+ {
+ FatalErrorIn("multiLevelDecomp::multiLevelDecomp(const dictionary&)")
+ << "Top level decomposition specifies " << nDomains()
+ << " domains which is not equal to the product of"
+ << " all sub domains " << n
+ << exit(FatalError);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+bool Foam::multiLevelDecomp::parallelAware() const
+{
+ forAll(methods_, i)
+ {
+ if (!methods_[i].parallelAware())
+ {
+ return false;
+ }
+ }
+ return true;
+}
+
+
+Foam::labelList Foam::multiLevelDecomp::decompose
+(
+ const polyMesh& mesh,
+ const pointField& cc,
+ const scalarField& cWeights
+)
+{
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, identity(cc.size()), cc.size(), cellCells);
+
+ labelField finalDecomp(cc.size(), 0);
+ labelList cellMap(identity(cc.size()));
+
+ decompose
+ (
+ cellCells(),
+ cc,
+ cWeights,
+ cellMap, // map back to original cells
+ 0,
+
+ finalDecomp
+ );
+
+ return finalDecomp;
+}
+
+
+Foam::labelList Foam::multiLevelDecomp::decompose
+(
+ const labelListList& globalPointPoints,
+ const pointField& points,
+ const scalarField& pointWeights
+)
+{
+ labelField finalDecomp(points.size(), 0);
+ labelList pointMap(identity(points.size()));
+
+ decompose
+ (
+ globalPointPoints,
+ points,
+ pointWeights,
+ pointMap, // map back to original points
+ 0,
+
+ finalDecomp
+ );
+
+ return finalDecomp;
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
new file mode 100644
index 00000000000..a45c01f28e6
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::multiLevelDecomp
+
+Description
+ Decomposition given using consecutive application of decomposers.
+
+SourceFiles
+ multiLevelDecomp.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef multiLevelDecomp_H
+#define multiLevelDecomp_H
+
+#include "decompositionMethod.H"
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class multiLevelDecomp Declaration
+\*---------------------------------------------------------------------------*/
+
+class multiLevelDecomp
+:
+ public decompositionMethod
+{
+ // Private data
+
+ PtrList<decompositionMethod> methods_;
+
+
+ // Private Member Functions
+
+ //- Given connectivity across processors work out connectivity
+ // for a (consistent) subset
+ void subsetGlobalCellCells
+ (
+ const labelListList& cellCells,
+ const labelList& set,
+ labelListList& subCellCells,
+ label& cutConnections
+ ) const;
+
+ //- Decompose level methodI without addressing
+ void decompose
+ (
+ const labelListList& pointPoints,
+ const pointField& points,
+ const scalarField& pointWeights,
+ const labelList& pointMap, // map back to original points
+ const label levelI,
+
+ labelField& finalDecomp
+ );
+
+ //- Disallow default bitwise copy construct and assignment
+ void operator=(const multiLevelDecomp&);
+ multiLevelDecomp(const multiLevelDecomp&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("multiLevel");
+
+
+ // Constructors
+
+ //- Construct given the decomposition dictionary
+ multiLevelDecomp(const dictionary& decompositionDict);
+
+
+ //- Destructor
+ virtual ~multiLevelDecomp()
+ {}
+
+
+ // Member Functions
+
+ //- Is method parallel aware (i.e. does it synchronize domains across
+ // proc boundaries)
+ virtual bool parallelAware() const;
+
+ //- Return for every coordinate the wanted processor number. Use the
+ // mesh connectivity (if needed)
+ virtual labelList decompose
+ (
+ const polyMesh& mesh,
+ const pointField& points,
+ const scalarField& pointWeights
+ );
+
+ //- Return for every coordinate the wanted processor number. Explicitly
+ // provided connectivity - does not use mesh_.
+ virtual labelList decompose
+ (
+ const labelListList& globalCellCells,
+ const pointField& cc,
+ const scalarField& cWeights
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
index 6447c4fa74f..f4963e2e5ad 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
@@ -39,13 +39,6 @@ namespace Foam
simpleGeomDecomp,
dictionary
);
-
- addToRunTimeSelectionTable
- (
- decompositionMethod,
- simpleGeomDecomp,
- dictionaryMesh
- );
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -133,26 +126,6 @@ void Foam::simpleGeomDecomp::assignToProcessorGroup
}
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::simpleGeomDecomp::simpleGeomDecomp(const dictionary& decompositionDict)
-:
- geomDecomp(decompositionDict, typeName)
-{}
-
-
-Foam::simpleGeomDecomp::simpleGeomDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh&
-)
-:
- geomDecomp(decompositionDict, typeName)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
Foam::labelList Foam::simpleGeomDecomp::decompose(const pointField& points)
{
// construct a list for the final result
@@ -315,4 +288,16 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
return finalDecomp;
}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::simpleGeomDecomp::simpleGeomDecomp(const dictionary& decompositionDict)
+:
+ geomDecomp(decompositionDict, typeName)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
index 714916f62d6..7336b3b85d1 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
@@ -76,13 +76,6 @@ public:
//- Construct given the decomposition dictionary
simpleGeomDecomp(const dictionary& decompositionDict);
- //- Construct given the decomposition dictionary and mesh
- simpleGeomDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
-
//- Destructor
virtual ~simpleGeomDecomp()
@@ -98,16 +91,24 @@ public:
return false;
}
- virtual labelList decompose
- (
- const pointField& points
- );
+ virtual labelList decompose(const pointField&);
+
+ virtual labelList decompose(const pointField&, const scalarField&);
+
+ virtual labelList decompose(const polyMesh&, const pointField& points)
+ {
+ return decompose(points);
+ }
virtual labelList decompose
(
+ const polyMesh&,
const pointField& points,
const scalarField& pointWeights
- );
+ )
+ {
+ return decompose(points, pointWeights);
+ }
//- Explicitly provided connectivity
virtual labelList decompose
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index b198c88415e..0c24fc6ac79 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -41,12 +41,7 @@ namespace Foam
{
defineTypeNameAndDebug(metisDecomp, 0);
- addToRunTimeSelectionTable
- (
- decompositionMethod,
- metisDecomp,
- dictionaryMesh
- );
+ addToRunTimeSelectionTable(decompositionMethod, metisDecomp, dictionary);
}
@@ -170,31 +165,31 @@ Foam::label Foam::metisDecomp::decompose
}
}
- if (metisCoeffs.readIfPresent("cellWeightsFile", weightsFile))
- {
- Info<< "metisDecomp : Using cell-based weights." << endl;
-
- IOList<int> cellIOWeights
- (
- IOobject
- (
- weightsFile,
- mesh_.time().timeName(),
- mesh_,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- )
- );
- cellWeights.transfer(cellIOWeights);
-
- if (cellWeights.size() != xadj.size()-1)
- {
- FatalErrorIn("metisDecomp::decompose(const pointField&)")
- << "Number of cell weights " << cellWeights.size()
- << " does not equal number of cells " << xadj.size()-1
- << exit(FatalError);
- }
- }
+ //if (metisCoeffs.readIfPresent("cellWeightsFile", weightsFile))
+ //{
+ // Info<< "metisDecomp : Using cell-based weights." << endl;
+ //
+ // IOList<int> cellIOWeights
+ // (
+ // IOobject
+ // (
+ // weightsFile,
+ // mesh_.time().timeName(),
+ // mesh_,
+ // IOobject::MUST_READ,
+ // IOobject::AUTO_WRITE
+ // )
+ // );
+ // cellWeights.transfer(cellIOWeights);
+ //
+ // if (cellWeights.size() != xadj.size()-1)
+ // {
+ // FatalErrorIn("metisDecomp::decompose(const pointField&)")
+ // << "Number of cell weights " << cellWeights.size()
+ // << " does not equal number of cells " << xadj.size()-1
+ // << exit(FatalError);
+ // }
+ //}
}
int nProcs = nProcessors_;
@@ -304,14 +299,9 @@ Foam::label Foam::metisDecomp::decompose
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::metisDecomp::metisDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh& mesh
-)
+Foam::metisDecomp::metisDecomp(const dictionary& decompositionDict)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -319,11 +309,12 @@ Foam::metisDecomp::metisDecomp
Foam::labelList Foam::metisDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
{
- if (points.size() != mesh_.nCells())
+ if (points.size() != mesh.nCells())
{
FatalErrorIn
(
@@ -332,71 +323,53 @@ Foam::labelList Foam::metisDecomp::decompose
<< endl
<< "and supply one coordinate (cellCentre) for every cell." << endl
<< "The number of coordinates " << points.size() << endl
- << "The number of cells in the mesh " << mesh_.nCells()
+ << "The number of cells in the mesh " << mesh.nCells()
<< exit(FatalError);
}
- List<int> adjncy;
- List<int> xadj;
- calcCSR(mesh_, adjncy, xadj);
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, identity(mesh.nCells()), mesh.nCells(), cellCells);
// Decompose using default weights
- List<int> finalDecomp;
- decompose(adjncy, xadj, pointWeights, finalDecomp);
+ labelList decomp;
+ decompose(cellCells.m(), cellCells.offsets(), pointWeights, decomp);
- // Copy back to labelList
- labelList decomp(finalDecomp.size());
- forAll(decomp, i)
- {
- decomp[i] = finalDecomp[i];
- }
return decomp;
}
Foam::labelList Foam::metisDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& agglomWeights
)
{
- if (agglom.size() != mesh_.nCells())
+ if (agglom.size() != mesh.nCells())
{
FatalErrorIn
(
"metisDecomp::decompose"
"(const labelList&, const pointField&, const scalarField&)"
) << "Size of cell-to-coarse map " << agglom.size()
- << " differs from number of cells in mesh " << mesh_.nCells()
+ << " differs from number of cells in mesh " << mesh.nCells()
<< exit(FatalError);
}
// Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- {
- // Get cellCells on coarse mesh.
- labelListList cellCells;
- calcCellCells
- (
- mesh_,
- agglom,
- agglomPoints.size(),
- cellCells
- );
- calcCSR(cellCells, adjncy, xadj);
- }
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, agglom, agglomPoints.size(), cellCells);
// Decompose using default weights
- List<int> finalDecomp;
- decompose(adjncy, xadj, agglomWeights, finalDecomp);
+ labelList finalDecomp;
+ decompose(cellCells.m(), cellCells.offsets(), agglomWeights, finalDecomp);
- // Rework back into decomposition for original mesh_
+ // Rework back into decomposition for original mesh
labelList fineDistribution(agglom.size());
forAll(fineDistribution, i)
@@ -404,7 +377,7 @@ Foam::labelList Foam::metisDecomp::decompose
fineDistribution[i] = finalDecomp[agglom[i]];
}
- return fineDistribution;
+ return finalDecomp;
}
@@ -431,21 +404,12 @@ Foam::labelList Foam::metisDecomp::decompose
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- calcCSR(globalCellCells, adjncy, xadj);
-
+ CompactListList<label> cellCells(globalCellCells);
// Decompose using default weights
- List<int> finalDecomp;
- decompose(adjncy, xadj, cellWeights, finalDecomp);
+ labelList decomp;
+ decompose(cellCells.m(), cellCells.offsets(), cellWeights, decomp);
- // Copy back to labelList
- labelList decomp(finalDecomp.size());
- forAll(decomp, i)
- {
- decomp[i] = finalDecomp[i];
- }
return decomp;
}
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index f18ba8bd0f0..d6c7e26e411 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -48,10 +48,6 @@ class metisDecomp
:
public decompositionMethod
{
- // Private data
-
- const polyMesh& mesh_;
-
// Private Member Functions
@@ -76,12 +72,8 @@ public:
// Constructors
- //- Construct given the decomposition dictionary and mesh
- metisDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
+ //- Construct given the decomposition dictionary
+ metisDecomp(const dictionary&);
//- Destructor
@@ -104,6 +96,7 @@ public:
// value. The overall sum of weights might otherwise overflow.
virtual labelList decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
);
@@ -115,6 +108,7 @@ public:
// See note on weights above.
virtual labelList decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& regionPoints,
const scalarField& regionWeights
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index cded55bcd7a..b4aae52f38d 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -141,12 +141,7 @@ namespace Foam
{
defineTypeNameAndDebug(ptscotchDecomp, 0);
- addToRunTimeSelectionTable
- (
- decompositionMethod,
- ptscotchDecomp,
- dictionaryMesh
- );
+ addToRunTimeSelectionTable(decompositionMethod, ptscotchDecomp, dictionary);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -414,14 +409,9 @@ Foam::label Foam::ptscotchDecomp::decompose
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::ptscotchDecomp::ptscotchDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh& mesh
-)
+Foam::ptscotchDecomp::ptscotchDecomp(const dictionary& decompositionDict)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -429,11 +419,12 @@ Foam::ptscotchDecomp::ptscotchDecomp
Foam::labelList Foam::ptscotchDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
{
- if (points.size() != mesh_.nCells())
+ if (points.size() != mesh.nCells())
{
FatalErrorIn
(
@@ -443,7 +434,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
<< endl
<< "and supply one coordinate (cellCentre) for every cell." << endl
<< "The number of coordinates " << points.size() << endl
- << "The number of cells in the mesh " << mesh_.nCells()
+ << "The number of cells in the mesh " << mesh.nCells()
<< exit(FatalError);
}
@@ -457,20 +448,14 @@ Foam::labelList Foam::ptscotchDecomp::decompose
// Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- // Connections
- Field<int> adjncy;
- // Offsets into adjncy
- Field<int> xadj;
- calcDistributedCSR
- (
- mesh_,
- adjncy,
- xadj
- );
+
+
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, identity(mesh.nCells()), mesh.nCells(), cellCells);
// Decompose using default weights
List<int> finalDecomp;
- decompose(adjncy, xadj, pointWeights, finalDecomp);
+ decompose(cellCells.m(), cellCells.offsets(), pointWeights, finalDecomp);
// Copy back to labelList
labelList decomp(finalDecomp.size());
@@ -484,52 +469,40 @@ Foam::labelList Foam::ptscotchDecomp::decompose
Foam::labelList Foam::ptscotchDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& pointWeights
)
{
- if (agglom.size() != mesh_.nCells())
+ if (agglom.size() != mesh.nCells())
{
FatalErrorIn
(
"ptscotchDecomp::decompose(const labelList&, const pointField&)"
) << "Size of cell-to-coarse map " << agglom.size()
- << " differs from number of cells in mesh " << mesh_.nCells()
+ << " differs from number of cells in mesh " << mesh.nCells()
<< exit(FatalError);
}
// // For running sequential ...
// if (Pstream::nProcs() <= 1)
// {
-// return scotchDecomp(decompositionDict_, mesh_)
+// return scotchDecomp(decompositionDict_, mesh)
// .decompose(agglom, agglomPoints, pointWeights);
// }
// Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- {
- // Get cellCells on coarse mesh.
- labelListList cellCells;
- calcCellCells
- (
- mesh_,
- agglom,
- agglomPoints.size(),
- cellCells
- );
-
- calcCSR(cellCells, adjncy, xadj);
- }
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, agglom, agglomPoints.size(), cellCells);
// Decompose using weights
List<int> finalDecomp;
- decompose(adjncy, xadj, pointWeights, finalDecomp);
+ decompose(cellCells.m(), cellCells.offsets(), pointWeights, finalDecomp);
- // Rework back into decomposition for original mesh_
+ // Rework back into decomposition for original mesh
labelList fineDistribution(agglom.size());
forAll(fineDistribution, i)
@@ -561,7 +534,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
// // For running sequential ...
// if (Pstream::nProcs() <= 1)
// {
-// return scotchDecomp(decompositionDict_, mesh_)
+// return scotchDecomp(decompositionDict_, mesh)
// .decompose(globalCellCells, cellCentres, cWeights);
// }
@@ -570,13 +543,11 @@ Foam::labelList Foam::ptscotchDecomp::decompose
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- calcCSR(globalCellCells, adjncy, xadj);
+ CompactListList<label> cellCells(globalCellCells);
// Decompose using weights
List<int> finalDecomp;
- decompose(adjncy, xadj, cWeights, finalDecomp);
+ decompose(cellCells.m(), cellCells.offsets(), cWeights, finalDecomp);
// Copy back to labelList
labelList decomp(finalDecomp.size());
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 45649a0b818..d276137d4f4 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -48,11 +48,6 @@ class ptscotchDecomp
:
public decompositionMethod
{
- // Private data
-
- const polyMesh& mesh_;
-
-
// Private Member Functions
//- Check and print error message
@@ -80,11 +75,7 @@ public:
// Constructors
//- Construct given the decomposition dictionary and mesh
- ptscotchDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
+ ptscotchDecomp(const dictionary& decompositionDict);
//- Destructor
@@ -104,6 +95,7 @@ public:
// mesh connectivity (if needed)
virtual labelList decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
);
@@ -114,6 +106,7 @@ public:
// functionality natively.
virtual labelList decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& regionPoints,
const scalarField& regionWeights
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index 534044646f0..dc870abacd6 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -145,7 +145,7 @@ namespace Foam
(
decompositionMethod,
scotchDecomp,
- dictionaryMesh
+ dictionary
);
}
@@ -165,6 +165,7 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
// Call scotch with options from dictionary.
Foam::label Foam::scotchDecomp::decompose
(
+ const fileName& meshPath,
const List<int>& adjncy,
const List<int>& xadj,
const scalarField& cWeights,
@@ -184,7 +185,7 @@ Foam::label Foam::scotchDecomp::decompose
if (writeGraph)
{
- OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
+ OFstream str(meshPath + ".grf");
Info<< "Dumping Scotch graph file to " << str.name() << endl
<< "Use this in combination with gpart." << endl;
@@ -408,14 +409,9 @@ Foam::label Foam::scotchDecomp::decompose
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::scotchDecomp::scotchDecomp
-(
- const dictionary& decompositionDict,
- const polyMesh& mesh
-)
+Foam::scotchDecomp::scotchDecomp(const dictionary& decompositionDict)
:
- decompositionMethod(decompositionDict),
- mesh_(mesh)
+ decompositionMethod(decompositionDict)
{}
@@ -423,11 +419,12 @@ Foam::scotchDecomp::scotchDecomp
Foam::labelList Foam::scotchDecomp::decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
)
{
- if (points.size() != mesh_.nCells())
+ if (points.size() != mesh.nCells())
{
FatalErrorIn
(
@@ -437,20 +434,24 @@ Foam::labelList Foam::scotchDecomp::decompose
<< endl
<< "and supply one coordinate (cellCentre) for every cell." << endl
<< "The number of coordinates " << points.size() << endl
- << "The number of cells in the mesh " << mesh_.nCells()
+ << "The number of cells in the mesh " << mesh.nCells()
<< exit(FatalError);
}
- // Make Metis CSR (Compressed Storage Format) storage
- // adjncy : contains neighbours (= edges in graph)
- // xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- calcCSR(mesh_, adjncy, xadj);
+
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, identity(mesh.nCells()), mesh.nCells(), cellCells);
// Decompose using default weights
List<int> finalDecomp;
- decompose(adjncy, xadj, pointWeights, finalDecomp);
+ decompose
+ (
+ mesh.time().path()/mesh.name(),
+ cellCells.m(),
+ cellCells.offsets(),
+ pointWeights,
+ finalDecomp
+ );
// Copy back to labelList
labelList decomp(finalDecomp.size());
@@ -464,43 +465,35 @@ Foam::labelList Foam::scotchDecomp::decompose
Foam::labelList Foam::scotchDecomp::decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& agglomPoints,
const scalarField& pointWeights
)
{
- if (agglom.size() != mesh_.nCells())
+ if (agglom.size() != mesh.nCells())
{
FatalErrorIn
(
"scotchDecomp::decompose(const labelList&, const pointField&)"
) << "Size of cell-to-coarse map " << agglom.size()
- << " differs from number of cells in mesh " << mesh_.nCells()
+ << " differs from number of cells in mesh " << mesh.nCells()
<< exit(FatalError);
}
- // Make Metis CSR (Compressed Storage Format) storage
- // adjncy : contains neighbours (= edges in graph)
- // xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- {
- // Get cellCells on coarse mesh.
- labelListList cellCells;
- calcCellCells
- (
- mesh_,
- agglom,
- agglomPoints.size(),
- cellCells
- );
-
- calcCSR(cellCells, adjncy, xadj);
- }
+ CompactListList<label> cellCells;
+ calcCellCells(mesh, agglom, agglomPoints.size(), cellCells);
// Decompose using weights
List<int> finalDecomp;
- decompose(adjncy, xadj, pointWeights, finalDecomp);
+ decompose
+ (
+ mesh.time().path()/mesh.name(),
+ cellCells.m(),
+ cellCells.offsets(),
+ pointWeights,
+ finalDecomp
+ );
// Rework back into decomposition for original mesh_
labelList fineDistribution(agglom.size());
@@ -537,13 +530,11 @@ Foam::labelList Foam::scotchDecomp::decompose
// adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli
- List<int> adjncy;
- List<int> xadj;
- calcCSR(globalCellCells, adjncy, xadj);
+ CompactListList<label> cellCells(globalCellCells);
// Decompose using weights
List<int> finalDecomp;
- decompose(adjncy, xadj, cWeights, finalDecomp);
+ decompose(".", cellCells.m(), cellCells.offsets(), cWeights, finalDecomp);
// Copy back to labelList
labelList decomp(finalDecomp.size());
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 249b191f6c9..2cd376074cc 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -48,11 +48,6 @@ class scotchDecomp
:
public decompositionMethod
{
- // Private data
-
- const polyMesh& mesh_;
-
-
// Private Member Functions
//- Check and print error message
@@ -60,6 +55,7 @@ class scotchDecomp
label decompose
(
+ const fileName& meshPath,
const List<int>& adjncy,
const List<int>& xadj,
const scalarField& cWeights,
@@ -80,11 +76,7 @@ public:
// Constructors
//- Construct given the decomposition dictionary and mesh
- scotchDecomp
- (
- const dictionary& decompositionDict,
- const polyMesh& mesh
- );
+ scotchDecomp(const dictionary& decompositionDict);
//- Destructor
@@ -107,6 +99,7 @@ public:
// might otherwise overflow.
virtual labelList decompose
(
+ const polyMesh& mesh,
const pointField& points,
const scalarField& pointWeights
);
@@ -118,6 +111,7 @@ public:
// See note on weights above.
virtual labelList decompose
(
+ const polyMesh& mesh,
const labelList& agglom,
const pointField& regionPoints,
const scalarField& regionWeights
--
GitLab
From 9f8b5bb693d926738504400a59b77269eb6b80b1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 Jun 2010 15:33:00 +0100
Subject: [PATCH 46/77] ENH: P1 model : added radiative flux Qr.
---
...iffusiveRadiationMixedFvPatchScalarField.C | 2 +-
...iffusiveRadiationMixedFvPatchScalarField.C | 2 +-
.../radiation/radiationModel/P1/P1.C | 20 +++++++++++++++++++
.../radiation/radiationModel/P1/P1.H | 3 +++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index 6bec827a509..8f4e9b87259 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -172,7 +172,7 @@ updateCoeffs()
radiativeIntensityRay& ray =
const_cast<radiativeIntensityRay&>(dom.IRay(rayId));
- ray.Qr().boundaryField()[patchI] += Iw*(-n & ray.dAve());
+ ray.Qr().boundaryField()[patchI] += Iw*(n & ray.dAve());
forAll(Iw, faceI)
{
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index 6dfffad991b..d97689cb21e 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -167,7 +167,7 @@ updateCoeffs()
radiativeIntensityRay& ray =
const_cast<radiativeIntensityRay&>(dom.IRay(rayId));
- ray.Qr().boundaryField()[patchI] += Iw*(-n & ray.dAve());
+ ray.Qr().boundaryField()[patchI] += Iw*(n & ray.dAve());
const scalarField Eb =
dom.blackBody().bLambda(lambdaId).boundaryField()[patchI];
diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.C b/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
index b9fc90f74c0..74cf2165360 100644
--- a/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
@@ -68,6 +68,19 @@ Foam::radiation::P1::P1(const volScalarField& T)
),
mesh_
),
+ Qr_
+ (
+ IOobject
+ (
+ "Qr",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh_,
+ dimensionedScalar("Qr", dimMass/pow3(dimTime), 0.0)
+ ),
a_
(
IOobject
@@ -162,6 +175,13 @@ void Foam::radiation::P1::calculate()
==
- 4.0*(e_*physicoChemical::sigma*pow4(T_) + E_)
);
+
+ // Calculate radiative heat flux on boundaries.
+ forAll(mesh_.boundaryMesh(), patchI)
+ {
+ Qr_.boundaryField()[patchI] =
+ -gamma.boundaryField()[patchI]*G_.boundaryField()[patchI].snGrad();
+ }
}
diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
index 5300d3718ce..7c03d5313e0 100644
--- a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
@@ -63,6 +63,9 @@ class P1
//- Incident radiation / [W/m2]
volScalarField G_;
+ //- Total radiative heat flux [W/m2]
+ volScalarField Qr_;
+
//- Absorption coefficient
volScalarField a_;
--
GitLab
From e5e768403b82e2434f43fdc9857e8871881c970b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 Jun 2010 16:16:12 +0100
Subject: [PATCH 47/77] STYLE: decomposeParDict : added some more comment about
multiLevel
---
.../decomposePar/decomposeParDict | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index 35fe19489f9..9a304836939 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -17,7 +17,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 4;
+numberOfSubdomains 8;
//- Keep owner and neighbour on same processor for faces in zones:
@@ -29,28 +29,32 @@ numberOfSubdomains 4;
//preservePatches (cyclic_half0 cyclic_half1);
-// method scotch;
+method scotch;
// method hierarchical;
// method simple;
// method metis;
// method manual;
-method multiLevel;
+// method multiLevel;
multiLevelCoeffs
{
+ // Decomposition methods to apply in turn. This is like hierarchical but
+ // fully general - every method can be used at every level.
+
level0
{
numberOfSubdomains 2;
- method simple;
- simpleCoeffs
- {
- n (2 1 1);
- delta 0.001;
- }
+ //method simple;
+ //simpleCoeffs
+ //{
+ // n (2 1 1);
+ // delta 0.001;
+ //}
+ method scotch;
}
level1
{
- numberOfSubdomains 2;
+ numberOfSubdomains 4;
method scotch;
}
}
--
GitLab
From 435013ea0890c1d032bf1275704b73ccdc8434d7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 7 Jun 2010 08:56:55 +0200
Subject: [PATCH 48/77] ENH: consistency with DynamicList - add append(const
T&) to List
---
src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H | 4 ++--
src/OpenFOAM/containers/Lists/List/List.H | 5 ++++-
src/OpenFOAM/containers/Lists/List/ListI.H | 9 ++++++++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index d9bd00b1b19..f5967cf5b38 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -310,7 +310,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
const T& t
)
{
- label elemI = List<T>::size();
+ const label elemI = List<T>::size();
setSize(elemI + 1);
this->operator[](elemI) = t;
@@ -361,7 +361,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
inline T Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::remove()
{
- label elemI = List<T>::size() - 1;
+ const label elemI = List<T>::size() - 1;
if (elemI < 0)
{
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 17e3398a205..2999e0886ed 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -180,6 +180,9 @@ public:
//- Clear the list, i.e. set size to zero.
void clear();
+ //- Append an element at the end of the list
+ inline void append(const T&);
+
//- Append a List at the end of this list
inline void append(const UList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 51abd2d55ed..24b5c41996a 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -93,6 +93,13 @@ inline Foam::Xfer<Foam::List<T> > Foam::List<T>::xfer()
}
+template<class T>
+inline void Foam::List<T>::append(const T& t)
+{
+ setSize(size()+1, t);
+}
+
+
template<class T>
inline void Foam::List<T>::append(const UList<T>& lst)
{
--
GitLab
From 297a8b7d6cb9df764b346147a6eb79d47774080c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 7 Jun 2010 13:51:14 +0200
Subject: [PATCH 49/77] ENH: move fileMonitor stat vs. inotify to internal
class
- avoids potential mismatches between header and courtesy binaries
---
src/Allwmake | 2 +-
src/OSspecific/POSIX/Allwmake | 21 ++++
src/OSspecific/POSIX/Make/options | 4 +-
src/OSspecific/POSIX/fileMonitor.C | 170 ++++++++++++++++++-----------
src/OSspecific/POSIX/fileMonitor.H | 39 +++----
5 files changed, 147 insertions(+), 89 deletions(-)
create mode 100755 src/OSspecific/POSIX/Allwmake
diff --git a/src/Allwmake b/src/Allwmake
index 4da8d4f7192..e1589a40467 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -17,7 +17,7 @@ wmakeLnInclude OpenFOAM
wmakeLnInclude OSspecific/$WM_OSTYPE
Pstream/Allwmake
-wmake libo OSspecific/$WM_OSTYPE
+OSspecific/$WM_OSTYPE/Allwmake
wmake libso OpenFOAM
wmake libso lagrangian/basic
diff --git a/src/OSspecific/POSIX/Allwmake b/src/OSspecific/POSIX/Allwmake
new file mode 100755
index 00000000000..7819ce885bf
--- /dev/null
+++ b/src/OSspecific/POSIX/Allwmake
@@ -0,0 +1,21 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+#
+# use <sys/inotify.h> if available (Linux)
+# unless otherwise specified (with FOAM_USE_STAT)
+#
+# eg, ./Allwmake FOAM_USE_STAT
+#
+if [ -f /usr/include/sys/inotify.h -a "${1%USE_STAT}" = "$1" ]
+then
+ unset FOAM_FILE_MONITOR
+else
+ export FOAM_FILE_MONITOR="-DFOAM_USE_STAT"
+fi
+
+
+# make (non-shared) object
+wmake libo
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/OSspecific/POSIX/Make/options b/src/OSspecific/POSIX/Make/options
index b7e9d7211b0..be643469df3 100644
--- a/src/OSspecific/POSIX/Make/options
+++ b/src/OSspecific/POSIX/Make/options
@@ -1,3 +1 @@
-#ifdef SunOS64
-EXE_INC = -DFOAM_USE_STAT
-#endif
+EXE_INC = $(FOAM_FILE_MONITOR)
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index f7f0246c986..a812dec9429 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -37,7 +37,6 @@ Class
# include "regIOobject.H" // for fileModificationSkew symbol
#else
# include <sys/inotify.h>
-# include <stropts.h>
# include <sys/ioctl.h>
#endif
@@ -49,8 +48,8 @@ template<>
const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
{
"unmodified",
- "deleted",
- "modified"
+ "modified",
+ "deleted"
};
const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
Foam::fileMonitor::fileStateNames_;
@@ -58,7 +57,7 @@ const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
namespace Foam
{
- // Reduction operator for PackedList of fileState
+ //- Reduction operator for PackedList of fileState
class reduceFileStates
{
public:
@@ -89,7 +88,7 @@ namespace Foam
}
};
- // Combine operator for PackedList of fileState
+ //- Combine operator for PackedList of fileState
class combineReduceFileStates
{
public:
@@ -98,22 +97,101 @@ namespace Foam
x = reduceFileStates()(x, y);
}
};
+
+
+
+ //! @cond internalClass
+ //- Internal tracking via stat(3p) or inotify(7)
+ class fileMonitorWatcher
+ {
+ public:
+
+#ifdef FOAM_USE_STAT
+ //- From watch descriptor to modified time
+ HashTable<label, time_t> lastMod;
+
+ //- initialize HashTable size
+ inline fileMonitorWatcher(const label sz = 20)
+ :
+ lastMod(sz)
+ {}
+
+ inline label addWatch(const fileName& fName)
+ {
+ const label watchFd = lastMod.size();
+ lastMod.insert(watchFd, lastModified(fName));
+ return watchFd;
+ }
+
+ inline bool removeWatch(const label watchFd)
+ {
+ return lastMod.erase(watchFd);
+ }
+
+#else
+ //- File descriptor for the inotify instance
+ int fd;
+
+ //- Pre-allocated structure containing file descriptors
+ fd_set fdSet;
+
+ //- initialize inotify
+ inline fileMonitorWatcher(const label dummy = 0)
+ :
+ fd(inotify_init())
+ {
+ // Add notify descriptor to select fd_set
+ FD_ZERO(&fdSet);
+ FD_SET(fd, &fdSet);
+ }
+
+ //- test if file descriptor is set
+ inline bool isSet() const
+ {
+ return FD_ISSET(fd, &fdSet);
+ }
+
+ //- reset file descriptor
+ inline void reset()
+ {
+ FD_SET(fd, &fdSet);
+ }
+
+ inline label addWatch(const fileName& fName)
+ {
+ return inotify_add_watch
+ (
+ fd,
+ fName.c_str(),
+ // IN_ALL_EVENTS
+ IN_CLOSE_WRITE | IN_DELETE_SELF | IN_MODIFY
+ );
+ }
+
+ inline bool removeWatch(const label watchFd)
+ {
+ return inotify_rm_watch(fd, int(watchFd)) == 0;
+ }
+#endif
+
+ };
+ //! @endcond
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-#ifdef FOAM_USE_STAT
void Foam::fileMonitor::checkFiles() const
{
+#ifdef FOAM_USE_STAT
for
(
- HashTable<label, time_t>::iterator iter = lastModified_.begin();
- iter != lastModified_.end();
+ HashTable<label, time_t>::iterator iter = watcher_->lastMod.begin();
+ iter != watcher_->lastMod.end();
++iter
)
{
- label watchFd = iter.key();
+ const label watchFd = iter.key();
const fileName& fName = watchFile_[watchFd];
time_t newTime = lastModified(fName);
@@ -135,21 +213,18 @@ void Foam::fileMonitor::checkFiles() const
}
}
}
-}
#else
-void Foam::fileMonitor::checkFiles() const
-{
while (true)
{
struct timeval zeroTimeout = {0, 0};
int ready = select
(
- inotifyFd_+1, // num filedescriptors in watchSet_
- &watchSet_, // watchSet_ with only inotifyFd
- NULL,
- NULL,
- &zeroTimeout
+ watcher_->fd+1, // num filedescriptors in fdSet
+ &(watcher_->fdSet), // fdSet with only inotifyFd
+ NULL, // No writefds
+ NULL, // No errorfds
+ &zeroTimeout // eNo timeout
);
if (ready < 0)
@@ -158,14 +233,14 @@ void Foam::fileMonitor::checkFiles() const
<< "Problem in issuing select."
<< abort(FatalError);
}
- else if (FD_ISSET(inotifyFd_, &watchSet_))
+ else if (watcher_->isSet())
{
struct inotify_event inotifyEvent;
// Read first event
ssize_t nBytes = read
(
- inotifyFd_,
+ watcher_->fd,
&inotifyEvent,
sizeof(inotifyEvent)
);
@@ -178,9 +253,9 @@ void Foam::fileMonitor::checkFiles() const
<< abort(FatalError);
}
- //Pout<< "mask:" << inotifyEvent.mask << endl;
- //Pout<< "watchFd:" << inotifyEvent.wd << endl;
- //Pout<< "watchName:" << watchFile_[inotifyEvent.wd] << endl;
+ // Pout<< "mask:" << inotifyEvent.mask << nl
+ // << "watchFd:" << inotifyEvent.wd << nl
+ // << "watchName:" << watchFile_[inotifyEvent.wd] << endl;
switch (inotifyEvent.mask)
{
@@ -204,51 +279,37 @@ void Foam::fileMonitor::checkFiles() const
}
else
{
- // No data. Reset watchSet_
- FD_SET(inotifyFd_, &watchSet_);
+ // No data - reset
+ watcher_->reset();
return;
}
}
-}
#endif
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Null constructor
-#ifdef FOAM_USE_STAT
Foam::fileMonitor::fileMonitor()
:
state_(20),
watchFile_(20),
- lastModified_(20)
+ watcher_(new fileMonitorWatcher(20))
{}
-#else
-
-Foam::fileMonitor::fileMonitor()
-:
- state_(20),
- watchFile_(20),
- inotifyFd_(inotify_init())
-{
- //- Add notify descriptor to select set
- FD_ZERO(&watchSet_);
- FD_SET(inotifyFd_, &watchSet_);
-}
-
-#endif
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::fileMonitor::~fileMonitor()
{
- // Remove any remaining files
+ // Remove watch on any remaining files
List<label> watchFds(state_.toc());
forAll(watchFds, i)
{
removeWatch(watchFds[i]);
}
+
+ delete watcher_;
}
@@ -257,18 +318,7 @@ Foam::fileMonitor::~fileMonitor()
Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
{
-#ifdef FOAM_USE_STAT
- label watchFd = lastModified_.size();
- lastModified_.insert(watchFd, lastModified(fName));
-#else
- label watchFd = inotify_add_watch
- (
- inotifyFd_,
- fName.c_str(),
- //IN_ALL_EVENTS
- IN_CLOSE_WRITE | IN_DELETE_SELF | IN_MODIFY
- );
-#endif
+ const label watchFd = watcher_->addWatch(fName);
if (debug)
{
@@ -300,11 +350,7 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
state_.erase(watchFd);
watchFile_.erase(watchFd);
-#ifdef FOAM_USE_STAT
- return lastModified_.erase(watchFd);
-#else
- return inotify_rm_watch(inotifyFd_, int(watchFd)) == 0;
-#endif
+ return watcher_->removeWatch(watchFd);
}
@@ -331,7 +377,7 @@ void Foam::fileMonitor::updateStates(const bool syncPar) const
label i = 0;
forAllConstIter(Map<fileState>, state_, iter)
{
- stats[i++] = (unsigned int)(iter());
+ stats[i++] = static_cast<unsigned int>(iter());
}
// Save local state for warning message below
PackedList<2> thisProcStats(stats);
@@ -378,7 +424,7 @@ void Foam::fileMonitor::updateStates(const bool syncPar) const
void Foam::fileMonitor::setUnmodified(const label watchFd)
{
#ifdef FOAM_USE_STAT
- lastModified_[watchFd] = lastModified(watchFile_[watchFd]);
+ watcher_->lastMod[watchFd] = lastModified(watchFile_[watchFd]);
#endif
Map<fileState>::iterator iter = state_.find(watchFd);
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index b9922eb3e2a..fbb0c4e2d64 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -27,13 +27,13 @@ Class
Description
Checking for changes to files.
-!!!!!!!NOTE:
- Default is to use inotify (Linux specific, since 2.6.13)
+Note
+ The default is to use inotify (Linux specific, since 2.6.13)
- Compile with FOAM_USE_STAT to use the stat function call.
+ Compiling with FOAM_USE_STAT (or if /usr/include/sys/inotify.h
+ does not exist) uses the stat function call.
-
- - works fine except for if file gets deleted and recreated
+ - works fine except when a file is deleted and recreated:
it stops monitoring the file!
(does work though if the file gets moved)
@@ -48,7 +48,6 @@ SourceFiles
#include <sys/types.h>
#include "Map.H"
#include "NamedEnum.H"
-#include "labelList.H"
#include "className.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,9 +56,10 @@ namespace Foam
{
class fileMonitor;
+class fileMonitorWatcher;
/*---------------------------------------------------------------------------*\
- Class fileMonitor Declaration
+ Class fileMonitor Declaration
\*---------------------------------------------------------------------------*/
class fileMonitor
@@ -73,8 +73,8 @@ public:
enum fileState
{
UNMODIFIED = 0,
- DELETED = 1,
- MODIFIED = 2
+ MODIFIED = 1,
+ DELETED = 2,
};
static const NamedEnum<fileState, 3> fileStateNames_;
@@ -84,22 +84,16 @@ private:
//- State for all watchFds
mutable Map<fileState> state_;
-
+
//- From watch descriptor to filename
HashTable<fileName, label> watchFile_;
-#ifdef FOAM_USE_STAT
+ //- Watch mechanism (stat or inotify)
+ mutable fileMonitorWatcher *watcher_;
- //- From watch descriptor to modified time
- mutable HashTable<label, time_t> lastModified_;
-#else
- //- File descriptor for the inotify instance
- int inotifyFd_;
- //- Pre-allocated structure containing file descriptors
- mutable fd_set watchSet_;
+ // Private Member Functions
-#endif
//- Update state_ from any events.
void checkFiles() const;
@@ -121,14 +115,13 @@ public:
fileMonitor();
- // Destructor
-
- ~fileMonitor();
+ //- Destructor
+ ~fileMonitor();
// Member Functions
- //- Add file to watch. Returns watch descriptor
+ //- Add file to watch. Return watch descriptor
label addWatch(const fileName&);
//- Remove file to watch. Return true if successful
--
GitLab
From 394b05a7ab109e3d8043f9ed4220b3d97899d4f2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 7 Jun 2010 14:25:08 +0200
Subject: [PATCH 50/77] ENH: drop polyMeshAdderTemplates.C in favour of using
DynamicList::append
---
src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 28 ++++++-------
src/dynamicMesh/polyMeshAdder/polyMeshAdder.H | 10 -----
.../polyMeshAdder/polyMeshAdderTemplates.C | 41 -------------------
3 files changed, 12 insertions(+), 67 deletions(-)
delete mode 100644 src/dynamicMesh/polyMeshAdder/polyMeshAdderTemplates.C
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 76e0bd0f894..80b3ab92986 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -38,7 +38,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-//- Append all mapped elements of a list to a DynamicList
+// Append all mapped elements of a list to a DynamicList
void Foam::polyMeshAdder::append
(
const labelList& map,
@@ -50,7 +50,7 @@ void Foam::polyMeshAdder::append
forAll(lst, i)
{
- label newElem = map[lst[i]];
+ const label newElem = map[lst[i]];
if (newElem != -1)
{
@@ -60,7 +60,7 @@ void Foam::polyMeshAdder::append
}
-//- Append all mapped elements of a list to a DynamicList
+// Append all mapped elements of a list to a DynamicList
void Foam::polyMeshAdder::append
(
const labelList& map,
@@ -73,7 +73,7 @@ void Foam::polyMeshAdder::append
forAll(lst, i)
{
- label newElem = map[lst[i]];
+ const label newElem = map[lst[i]];
if (newElem != -1 && findSortedIndex(sortedLst, newElem) == -1)
{
@@ -170,8 +170,8 @@ void Foam::polyMeshAdder::mergePatchNames
)
{
// Insert the mesh0 patches and zones
- append(patches0.names(), allPatchNames);
- append(patches0.types(), allPatchTypes);
+ allPatchNames.append(patches0.names());
+ allPatchTypes.append(patches0.types());
// Patches
@@ -924,9 +924,7 @@ void Foam::polyMeshAdder::mergePointZones
)
{
zoneNames.setCapacity(pz0.size() + pz1.size());
-
- // Names
- append(pz0.names(), zoneNames);
+ zoneNames.append(pz0.names());
from1ToAll.setSize(pz1.size());
@@ -959,7 +957,7 @@ void Foam::polyMeshAdder::mergePointZones
forAll(pz1, zoneI)
{
// Relabel all points of zone and add to correct pzPoints.
- label allZoneI = from1ToAll[zoneI];
+ const label allZoneI = from1ToAll[zoneI];
append
(
@@ -991,8 +989,7 @@ void Foam::polyMeshAdder::mergeFaceZones
)
{
zoneNames.setCapacity(fz0.size() + fz1.size());
-
- append(fz0.names(), zoneNames);
+ zoneNames.append(fz0.names());
from1ToAll.setSize(fz1.size());
@@ -1092,8 +1089,7 @@ void Foam::polyMeshAdder::mergeCellZones
)
{
zoneNames.setCapacity(cz0.size() + cz1.size());
-
- append(cz0.names(), zoneNames);
+ zoneNames.append(cz0.names());
from1ToAll.setSize(cz1.size());
forAll(cz1, zoneI)
@@ -1108,14 +1104,14 @@ void Foam::polyMeshAdder::mergeCellZones
forAll(cz0, zoneI)
{
// Insert mesh0 cells
- append(cz0[zoneI], czCells[zoneI]);
+ czCells[zoneI].append(cz0[zoneI]);
}
// Cell mapping is trivial.
forAll(cz1, zoneI)
{
- label allZoneI = from1ToAll[zoneI];
+ const label allZoneI = from1ToAll[zoneI];
append(from1ToAllCells, cz1[zoneI], czCells[allZoneI]);
}
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index 90612cad909..1283da8b577 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -66,10 +66,6 @@ private:
// Private Member Functions
- //- Append all elements of a list to a DynamicList
- template<class T>
- static void append(const List<T>&, DynamicList<T>&);
-
//- Append all mapped elements of a list to a DynamicList
static void append
(
@@ -315,12 +311,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#ifdef NoRepository
-# include "polyMeshAdderTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdderTemplates.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdderTemplates.C
deleted file mode 100644
index a5a4ff4e80d..00000000000
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdderTemplates.C
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-//- Append all elements of a list to a DynamicList
-template<class T>
-void Foam::polyMeshAdder::append(const List<T>& lst, DynamicList<T>& dynLst)
-{
- dynLst.setCapacity(dynLst.size() + lst.size());
-
- forAll(lst, i)
- {
- dynLst.append(lst[i]);
- }
-}
-
-// ************************************************************************* //
--
GitLab
From 3277d0573ebf3ef9a5739f6a905054435cfee01f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 7 Jun 2010 14:37:48 +0200
Subject: [PATCH 51/77] STYLE: use 'using Field<Type>::operator[]' in
DynamicField
---
.../test/DynamicField/DynamicFieldTest.C | 3 ++
.../fields/Fields/DynamicField/DynamicField.H | 7 +--
.../Fields/DynamicField/DynamicFieldI.H | 51 +++++--------------
3 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/applications/test/DynamicField/DynamicFieldTest.C b/applications/test/DynamicField/DynamicFieldTest.C
index e78747fb0f8..3e5a8dfc547 100644
--- a/applications/test/DynamicField/DynamicFieldTest.C
+++ b/applications/test/DynamicField/DynamicFieldTest.C
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
dl.append(2);
dl.append(1);
Pout<< "appending : dl:" << dl << endl;
+
+ dl[2] *= 10;
+ Pout<< "assigning : dl:" << dl << endl;
}
{
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index a7715b245ac..a464ac9d224 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -175,10 +175,7 @@ public:
inline void operator=(const tmp<DynamicField<Type> >&);
//- Return element of Field.
- inline Type& operator[](const label i);
-
- //- Return element of constant Field.
- inline const Type& operator[](const label) const;
+ using Field<Type>::operator[];
// IOstream operators
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index b48db152044..bc54c71fbd0 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "DynamicField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-DynamicField<Type>::DynamicField()
+Foam::DynamicField<Type>::DynamicField()
:
Field<Type>(),
capacity_(0)
@@ -41,7 +36,7 @@ DynamicField<Type>::DynamicField()
template<class Type>
-DynamicField<Type>::DynamicField(const label size)
+Foam::DynamicField<Type>::DynamicField(const label size)
:
Field<Type>(size),
capacity_(Field<Type>::size())
@@ -73,7 +68,7 @@ inline Foam::DynamicField<Type>::DynamicField
template<class Type>
-DynamicField<Type>::DynamicField
+Foam::DynamicField<Type>::DynamicField
(
const UList<Type>& mapF,
const labelList& mapAddressing
@@ -85,7 +80,7 @@ DynamicField<Type>::DynamicField
template<class Type>
-DynamicField<Type>::DynamicField
+Foam::DynamicField<Type>::DynamicField
(
const UList<Type>& mapF,
const labelListList& mapAddressing,
@@ -99,7 +94,7 @@ DynamicField<Type>::DynamicField
//- Construct by mapping from the given field
template<class Type>
-DynamicField<Type>::DynamicField
+Foam::DynamicField<Type>::DynamicField
(
const UList<Type>& mapF,
const FieldMapper& map
@@ -111,7 +106,7 @@ DynamicField<Type>::DynamicField
template<class Type>
-DynamicField<Type>::DynamicField(const DynamicField<Type>& f)
+Foam::DynamicField<Type>::DynamicField(const DynamicField<Type>& f)
:
Field<Type>(f),
capacity_(Field<Type>::size())
@@ -119,7 +114,7 @@ DynamicField<Type>::DynamicField(const DynamicField<Type>& f)
template<class Type>
-DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse)
+Foam::DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse)
:
Field<Type>(f, reUse),
capacity_(Field<Type>::size())
@@ -127,7 +122,7 @@ DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse)
template<class Type>
-DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f)
+Foam::DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f)
:
Field<Type>(f),
capacity_(Field<Type>::size())
@@ -137,14 +132,14 @@ DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-Foam::label DynamicField<Type>::capacity() const
+Foam::label Foam::DynamicField<Type>::capacity() const
{
return capacity_;
}
template<class Type>
-void DynamicField<Type>::append(const Type& t)
+void Foam::DynamicField<Type>::append(const Type& t)
{
label elemI = Field<Type>::size();
setSize(elemI + 1);
@@ -156,7 +151,7 @@ void DynamicField<Type>::append(const Type& t)
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type>
-void DynamicField<Type>::operator=(const DynamicField<Type>& rhs)
+void Foam::DynamicField<Type>::operator=(const DynamicField<Type>& rhs)
{
if (this == &rhs)
{
@@ -171,7 +166,7 @@ void DynamicField<Type>::operator=(const DynamicField<Type>& rhs)
template<class Type>
-void DynamicField<Type>::operator=(const UList<Type>& rhs)
+void Foam::DynamicField<Type>::operator=(const UList<Type>& rhs)
{
Field<Type>::operator=(rhs);
capacity_ = Field<Type>::size();
@@ -179,7 +174,7 @@ void DynamicField<Type>::operator=(const UList<Type>& rhs)
template<class Type>
-void DynamicField<Type>::operator=(const tmp<DynamicField>& rhs)
+void Foam::DynamicField<Type>::operator=(const tmp<DynamicField>& rhs)
{
if (this == &(rhs()))
{
@@ -196,25 +191,7 @@ void DynamicField<Type>::operator=(const tmp<DynamicField>& rhs)
}
-template<class Type>
-Type& DynamicField<Type>::operator[](const label i)
-{
- return Field<Type>::operator[](i);
-}
-
-
-template<class Type>
-const Type& DynamicField<Type>::operator[](const label i) const
-{
- return Field<Type>::operator[](i);
-}
-
-
// * * * * * * * * * * * * * * * IOstream Operator * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
--
GitLab
From 0ebfd350590b84143d46c420f2bb3155d60daa32 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 7 Jun 2010 16:45:24 +0100
Subject: [PATCH 52/77] BUG: regIOobject : fix error message for files that
cannot be found
---
src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 0082c936c64..a4ac896a056 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -61,7 +61,21 @@ Foam::Istream& Foam::regIOobject::readStream()
}
else
{
+ // Search intelligently for file
objPath = filePath();
+
+ if (!objPath.size())
+ {
+ FatalIOError
+ (
+ "regIOobject::readStream()",
+ __FILE__,
+ __LINE__,
+ objectPath(),
+ 0
+ ) << "cannot find file"
+ << exit(FatalIOError);
+ }
}
if (!(isPtr_ = objectStream(objPath)))
--
GitLab
From f2750f7d21d420908dfaace7cf0215bc4b3785de Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 7 Jun 2010 17:11:32 +0100
Subject: [PATCH 53/77] STYLE: corrected spelling in comment
---
.../interpolationCellPoint/cellPointWeight/cellPointWeight.H | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
index 01599a2fd1f..6c439ea166f 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
@@ -87,7 +87,7 @@ public:
static int debug;
//- Tolerance used in calculating barycentric co-ordinates
- // (applied to normailised values)
+ // (applied to normalised values)
static scalar tol;
--
GitLab
From 3137861e7ef6b5e782f92ed6e847afec6f4f0173 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 9 Jun 2010 11:35:57 +0100
Subject: [PATCH 54/77] ENH: multiLevelDecomp : added debug statistics printing
---
.../decompositionMethod/decompositionMethod.H | 19 --
.../multiLevelDecomp/multiLevelDecomp.C | 167 +++++++++++++++---
.../multiLevelDecomp/multiLevelDecomp.H | 6 +-
3 files changed, 149 insertions(+), 43 deletions(-)
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index 26ad6cc5e7c..e57951a186e 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -70,25 +70,6 @@ protected:
// (usually there is only one)
static label masterFace(const polyMesh&, const label, const label);
-// // From mesh to compact row storage format
-// // (like CompactListList)
-// static void calcCSR
-// (
-// const polyMesh& mesh,
-// List<int>& adjncy,
-// List<int>& xadj
-// );
-//
-// // From cell-cell connections to compact row storage format
-// // (like CompactListList)
-// static void calcCSR
-// (
-// const labelListList& cellCells,
-// List<int>& adjncy,
-// List<int>& xadj
-// );
-
-
private:
// Private Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index e9a61c729a5..22f1d6a3d0d 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -50,10 +50,14 @@ namespace Foam
// is in the cells from neighbouring processors which need to be renumbered.
void Foam::multiLevelDecomp::subsetGlobalCellCells
(
+ const label nDomains,
+ const label domainI,
+ const labelList& dist,
+
const labelListList& cellCells,
const labelList& set,
labelListList& subCellCells,
- label& cutConnections
+ labelList& cutConnections
) const
{
// Determine new index for cells by inverting subset
@@ -68,10 +72,14 @@ void Foam::multiLevelDecomp::subsetGlobalCellCells
List<Map<label> > compactMap;
mapDistribute map(globalCells, subCellCells, compactMap);
map.distribute(oldToNew);
+ labelList allDist(dist);
+ map.distribute(allDist);
+
// Now subCellCells contains indices into oldToNew which are the
// new locations of the neighbouring cells.
+ cutConnections.setSize(nDomains);
cutConnections = 0;
forAll(subCellCells, subCellI)
@@ -85,7 +93,7 @@ void Foam::multiLevelDecomp::subsetGlobalCellCells
label subCellI = oldToNew[cCells[i]];
if (subCellI == -1)
{
- cutConnections++;
+ cutConnections[allDist[cCells[i]]]++;
}
else
{
@@ -118,16 +126,6 @@ void Foam::multiLevelDecomp::decompose
)
);
-//Pout<< "At level " << levelI << endl;
-//forAll(dist, i)
-//{
-// Pout<< " " << i << " at:" << points[i]
-// << " original:" << pointMap[i] << " dist:" << dist[i]
-// << " connected to:" << pointField(points, pointPoints[i])
-// << endl;
-//}
-//Pout<< endl;
-
forAll(pointMap, i)
{
label orig = pointMap[i];
@@ -146,30 +144,62 @@ void Foam::multiLevelDecomp::decompose
finalDecomp *= methods_[levelI+1].nDomains();
// Extract processor+local index from point-point addressing
+ if (debug && Pstream::master())
+ {
+ Pout<< "Decomposition at level " << levelI << " :" << endl;
+ }
- forAll(domainToPoints, domainI)
+ for (label domainI = 0; domainI < n; domainI++)
{
- const labelList& myPoints = domainToPoints[domainI];
+ // Extract elements for current domain
+ const labelList domainPoints(findIndices(dist, domainI));
// Subset point-wise data.
- pointField subPoints(points, myPoints);
- scalarField subWeights(pointWeights, myPoints);
- labelList subPointMap(UIndirectList<label>(pointMap, myPoints));
+ pointField subPoints(points, domainPoints);
+ scalarField subWeights(pointWeights, domainPoints);
+ labelList subPointMap(UIndirectList<label>(pointMap, domainPoints));
// Subset point-point addressing (adapt global numbering)
labelListList subPointPoints;
- label nOutsideConnections;
+ labelList nOutsideConnections;
subsetGlobalCellCells
(
+ n,
+ domainI,
+ dist,
+
pointPoints,
- myPoints,
+ domainPoints,
+
subPointPoints,
nOutsideConnections
);
- //Info<< "At level " << levelI << " domain " << domainI
- // << " have connections to other domains "
- // << returnReduce(nOutsideConnections, sumOp<label>())
- // << endl;
+ label nPoints = returnReduce(domainPoints.size(), plusOp<label>());
+ Pstream::listCombineGather(nOutsideConnections, plusEqOp<label>());
+ Pstream::listCombineScatter(nOutsideConnections);
+ label nPatches = 0;
+ label nFaces = 0;
+ forAll(nOutsideConnections, i)
+ {
+ if (nOutsideConnections[i] > 0)
+ {
+ nPatches++;
+ nFaces += nOutsideConnections[i];
+ }
+ }
+
+ string oldPrefix;
+ if (debug && Pstream::master())
+ {
+ Pout<< " Domain " << domainI << nl
+ << " Number of cells = " << nPoints << nl
+ << " Number of inter-domain patches = " << nPatches
+ << nl
+ << " Number of inter-domain faces = " << nFaces << nl
+ << endl;
+ oldPrefix = Pout.prefix();
+ Pout.prefix() = " " + oldPrefix;
+ }
decompose
(
@@ -181,6 +211,97 @@ void Foam::multiLevelDecomp::decompose
finalDecomp
);
+ if (debug && Pstream::master())
+ {
+ Pout.prefix() = oldPrefix;
+ }
+ }
+
+
+ if (debug)
+ {
+ // Do straight decompose of two levels
+ label nNext = methods_[levelI+1].nDomains();
+ label nTotal = n*nNext;
+
+ // Retrieve original level0 dictionary and modify number of domains
+ dictionary::const_iterator iter = decompositionDict_.begin();
+ dictionary myDict = iter().dict();
+ myDict.set("numberOfSubdomains", nTotal);
+
+ if (debug && Pstream::master())
+ {
+ Pout<< "Reference decomposition with " << myDict << " :"
+ << endl;
+ }
+
+ autoPtr<decompositionMethod> method0 = decompositionMethod::New
+ (
+ myDict
+ );
+ labelList dist
+ (
+ method0().decompose
+ (
+ pointPoints,
+ points,
+ pointWeights
+ )
+ );
+
+ for (label blockI = 0; blockI < n; blockI++)
+ {
+ // Count the number inbetween blocks of nNext size
+
+ label nPoints = 0;
+ labelList nOutsideConnections(n, 0);
+ forAll(pointPoints, pointI)
+ {
+ if ((dist[pointI] / nNext) == blockI)
+ {
+ nPoints++;
+
+ const labelList& pPoints = pointPoints[pointI];
+
+ forAll(pPoints, i)
+ {
+ label distBlockI = dist[pPoints[i]] / nNext;
+ if (distBlockI != blockI)
+ {
+ nOutsideConnections[distBlockI]++;
+ }
+ }
+ }
+ }
+
+ reduce(nPoints, plusOp<label>());
+ Pstream::listCombineGather
+ (
+ nOutsideConnections,
+ plusEqOp<label>()
+ );
+ Pstream::listCombineScatter(nOutsideConnections);
+ label nPatches = 0;
+ label nFaces = 0;
+ forAll(nOutsideConnections, i)
+ {
+ if (nOutsideConnections[i] > 0)
+ {
+ nPatches++;
+ nFaces += nOutsideConnections[i];
+ }
+ }
+
+ if (debug && Pstream::master())
+ {
+ Pout<< " Domain " << blockI << nl
+ << " Number of cells = " << nPoints << nl
+ << " Number of inter-domain patches = "
+ << nPatches << nl
+ << " Number of inter-domain faces = " << nFaces
+ << nl << endl;
+ }
+ }
}
}
}
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
index a45c01f28e6..7a41da06fb8 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
@@ -59,10 +59,14 @@ class multiLevelDecomp
// for a (consistent) subset
void subsetGlobalCellCells
(
+ const label nDomains,
+ const label domainI,
+ const labelList& dist,
+
const labelListList& cellCells,
const labelList& set,
labelListList& subCellCells,
- label& cutConnections
+ labelList& cutConnections
) const;
//- Decompose level methodI without addressing
--
GitLab
From 3fd4142911d5ff5c2b4e666902405fc8087287f4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 10 Jun 2010 08:19:28 +0100
Subject: [PATCH 55/77] BUG: foamToVTK incorrect symmTensor components
---
.../dataConversion/foamToVTK/writeFuns.C | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
index 7180c86f3d4..e2d10be7826 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
@@ -261,10 +261,12 @@ void Foam::writeFuns::insert
DynamicList<floatScalar>& dest
)
{
- for (direction cmpt = 0; cmpt < symmTensor::nComponents; ++cmpt)
- {
- dest.append(float(src[cmpt]));
- }
+ dest.append(float(src.xx()));
+ dest.append(float(src.yy()));
+ dest.append(float(src.zz()));
+ dest.append(float(src.xy()));
+ dest.append(float(src.yz()));
+ dest.append(float(src.xz()));
}
--
GitLab
From a85f1fd9fdbeb285da64e691985d778adc056988 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 10 Jun 2010 08:20:08 +0100
Subject: [PATCH 56/77] STYLE: changed comment in sampleDict
---
.../utilities/postProcessing/sampling/sample/sampleDict | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 8584bdec952..bc25120382f 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -132,7 +132,7 @@ surfaces
normalVector (0.1 0.1 1);
//- Optional: restrict to a particular zone
- // zoneName zone1;
+ // zone zone1;
}
interpolatedPlane
--
GitLab
From 02d586964439aa41a12196acb783d4636b39a4e5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 10 Jun 2010 08:21:14 +0100
Subject: [PATCH 57/77] BUG: multiLevelDecomp : access to lower level
dictionary
---
.../decompositionMethods/multiLevelDecomp/multiLevelDecomp.C | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 22f1d6a3d0d..5822d6a6710 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -225,7 +225,8 @@ void Foam::multiLevelDecomp::decompose
label nTotal = n*nNext;
// Retrieve original level0 dictionary and modify number of domains
- dictionary::const_iterator iter = decompositionDict_.begin();
+ dictionary::const_iterator iter =
+ decompositionDict_.subDict(typeName + "Coeffs").begin();
dictionary myDict = iter().dict();
myDict.set("numberOfSubdomains", nTotal);
--
GitLab
From 17d36e93538947c241d1e425b3321f5a1c5e4ce3 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 10 Jun 2010 12:53:54 +0100
Subject: [PATCH 58/77] multiphaseInterFoam: changed
alphaContactAngleFvPatchScalarField to
multiphaseAlphaContactAngleFvPatchScalarField
to avoid name clashed with the version of alphaContactAngleFvPatchScalarField in the interfaceProperties library.
---
.../multiphase/multiphaseInterFoam/Make/files | 2 +-
.../multiphaseInterFoam/Make/options | 6 ++--
.../multiphaseInterFoam/createFields.H | 2 +-
.../multiphaseInterFoam/multiphaseInterFoam.C | 2 +-
...haseAlphaContactAngleFvPatchScalarField.C} | 29 ++++++++++-------
...haseAlphaContactAngleFvPatchScalarField.H} | 32 +++++++++----------
.../multiphaseMixture/multiphaseMixture.C | 11 ++++---
.../multiphaseMixture/multiphaseMixture.H | 2 +-
8 files changed, 45 insertions(+), 41 deletions(-)
rename applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/{alphaContactAngle/alphaContactAngleFvPatchScalarField.C => multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C} (76%)
rename applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/{alphaContactAngle/alphaContactAngleFvPatchScalarField.H => multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H} (84%)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/files b/applications/solvers/multiphase/multiphaseInterFoam/Make/files
index 0204e6cabf9..4820de61a55 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/files
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/files
@@ -1,5 +1,5 @@
multiphaseMixture/phase/phase.C
-multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
multiphaseMixture/multiphaseMixture.C
multiphaseInterFoam.C
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 1fc821726c9..6e9363f13f8 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -2,17 +2,15 @@ EXE_INC = \
-I../interFoam \
-ImultiphaseMixture \
-ImultiphaseMixture/phase \
- -ImultiphaseMixture/alphaContactAngle \
+ -ImultiphaseMixture/multiphaseAlphaContactAngle \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
- -lfiniteVolume
+ -lfiniteVolume
\ No newline at end of file
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index fb644962940..6ef68821969 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -26,7 +26,7 @@
mesh
);
-# include "createPhi.H"
+ #include "createPhi.H"
multiphaseMixture mixture(U, phi);
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 1a5bed606d5..546e6353467 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
#include "continuityErrs.H"
- turbulence->correct();
+ //turbulence->correct();
runTime.write();
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
similarity index 76%
rename from applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
rename to applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
index 3cf76bab1b0..9cc9b7ed07d 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "multiphaseAlphaContactAngleFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
@@ -32,7 +32,8 @@ License
namespace Foam
{
-alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
+multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps::
+interfaceThetaProps
(
Istream& is
)
@@ -47,7 +48,7 @@ alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
Istream& operator>>
(
Istream& is,
- alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
+ multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
)
{
is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
@@ -58,7 +59,7 @@ Istream& operator>>
Ostream& operator<<
(
Ostream& os,
- const alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
+ const multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
)
{
os << tp.theta0_ << token::SPACE
@@ -72,7 +73,8 @@ Ostream& operator<<
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+multiphaseAlphaContactAngleFvPatchScalarField::
+multiphaseAlphaContactAngleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -82,9 +84,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{}
-alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+multiphaseAlphaContactAngleFvPatchScalarField::
+multiphaseAlphaContactAngleFvPatchScalarField
(
- const alphaContactAngleFvPatchScalarField& gcpsf,
+ const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -95,7 +98,8 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{}
-alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+multiphaseAlphaContactAngleFvPatchScalarField::
+multiphaseAlphaContactAngleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -109,9 +113,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
}
-alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+multiphaseAlphaContactAngleFvPatchScalarField::
+multiphaseAlphaContactAngleFvPatchScalarField
(
- const alphaContactAngleFvPatchScalarField& gcpsf,
+ const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@@ -122,7 +127,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
+void multiphaseAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
os.writeKeyword("thetaProperties")
@@ -133,7 +138,7 @@ void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makePatchTypeField(fvPatchScalarField, alphaContactAngleFvPatchScalarField);
+makePatchTypeField(fvPatchScalarField, multiphaseAlphaContactAngleFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
similarity index 84%
rename from applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
rename to applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
index 322d0975264..ccbb146abb2 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::alphaContactAngleFvPatchScalarField
+ Foam::multiphaseAlphaContactAngleFvPatchScalarField
Description
Contact-angle boundary condition for multi-phase interface-capturing
simulations. Used in conjuction with multiphaseMixture.
SourceFiles
- alphaContactAngleFvPatchScalarField.C
+ multiphaseAlphaContactAngleFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
-#ifndef alphaContactAngleFvPatchScalarField_H
-#define alphaContactAngleFvPatchScalarField_H
+#ifndef multiphaseAlphaContactAngleFvPatchScalarField_H
+#define multiphaseAlphaContactAngleFvPatchScalarField_H
#include "zeroGradientFvPatchFields.H"
#include "multiphaseMixture.H"
@@ -45,10 +45,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class alphaContactAngleFvPatch Declaration
+ Class multiphaseAlphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/
-class alphaContactAngleFvPatchScalarField
+class multiphaseAlphaContactAngleFvPatchScalarField
:
public zeroGradientFvPatchScalarField
{
@@ -132,31 +132,31 @@ private:
public:
//- Runtime type information
- TypeName("alphaContactAngle");
+ TypeName("multiphaseAlphaContactAngle");
// Constructors
//- Construct from patch and internal field
- alphaContactAngleFvPatchScalarField
+ multiphaseAlphaContactAngleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- alphaContactAngleFvPatchScalarField
+ multiphaseAlphaContactAngleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
- //- Construct by mapping given alphaContactAngleFvPatchScalarField
+ //- Construct by mapping given multiphaseAlphaContactAngleFvPatchScalarField
// onto a new patch
- alphaContactAngleFvPatchScalarField
+ multiphaseAlphaContactAngleFvPatchScalarField
(
- const alphaContactAngleFvPatchScalarField&,
+ const multiphaseAlphaContactAngleFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
@@ -167,14 +167,14 @@ public:
{
return tmp<fvPatchScalarField>
(
- new alphaContactAngleFvPatchScalarField(*this)
+ new multiphaseAlphaContactAngleFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
- alphaContactAngleFvPatchScalarField
+ multiphaseAlphaContactAngleFvPatchScalarField
(
- const alphaContactAngleFvPatchScalarField&,
+ const multiphaseAlphaContactAngleFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@@ -186,7 +186,7 @@ public:
{
return tmp<fvPatchScalarField>
(
- new alphaContactAngleFvPatchScalarField(*this, iF)
+ new multiphaseAlphaContactAngleFvPatchScalarField(*this, iF)
);
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 7af947d4a71..c6dba40e138 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "multiphaseMixture.H"
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "multiphaseAlphaContactAngleFvPatchScalarField.H"
#include "Time.H"
#include "subCycle.H"
#include "fvCFD.H"
@@ -351,10 +351,11 @@ void Foam::multiphaseMixture::correctContactAngle
forAll(boundary, patchi)
{
- if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
+ if (isA<multiphaseAlphaContactAngleFvPatchScalarField>(gbf[patchi]))
{
- const alphaContactAngleFvPatchScalarField& acap =
- refCast<const alphaContactAngleFvPatchScalarField>(gbf[patchi]);
+ const multiphaseAlphaContactAngleFvPatchScalarField& acap =
+ refCast<const multiphaseAlphaContactAngleFvPatchScalarField>
+ (gbf[patchi]);
vectorField& nHatPatch = nHatb[patchi];
@@ -362,7 +363,7 @@ void Foam::multiphaseMixture::correctContactAngle
mesh_.Sf().boundaryField()[patchi]
/mesh_.magSf().boundaryField()[patchi];
- alphaContactAngleFvPatchScalarField::thetaPropsTable::
+ multiphaseAlphaContactAngleFvPatchScalarField::thetaPropsTable::
const_iterator tp =
acap.thetaProps().find(interfacePair(alpha1, alpha2));
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 1d94d47e915..2a430da5b26 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -210,7 +210,7 @@ public:
//- Destructor
- ~multiphaseMixture()
+ virtual ~multiphaseMixture()
{}
--
GitLab
From d53f5edf5c98d54f1eab121077de710beaba5cba Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 10 Jun 2010 12:55:04 +0100
Subject: [PATCH 59/77] damBreak4phase: Tested and updated multiphaseInterFoam
solver tutorial.
---
.../laminar/damBreak4phase/0/U | 2 +-
.../laminar/damBreak4phase/0/alphaair | 10 ++---
.../laminar/damBreak4phase/0/alphamercury | 2 +-
.../laminar/damBreak4phase/0/alphaoil | 2 +-
.../laminar/damBreak4phase/0/alphas | 2 +-
.../laminar/damBreak4phase/0/alphawater | 2 +-
.../laminar/damBreak4phase/0/p | 2 +-
.../constant/polyMesh/blockMeshDict | 2 +-
.../damBreak4phase/constant/polyMesh/boundary | 2 +-
.../constant/transportProperties | 41 ++++++++++++++++++-
.../laminar/damBreak4phase/system/fvSchemes | 2 +-
.../laminar/damBreak4phase/system/fvSolution | 2 +-
.../laminar/damBreak4phaseFine/0/alphas | 2 +-
.../constant/polyMesh/boundary | 2 +-
.../constant/transportProperties | 41 ++++++++++++++++++-
.../damBreak4phaseFine/system/fvSchemes | 2 +-
.../damBreak4phaseFine/system/fvSolution | 4 +-
17 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
index 95fe4a50d1c..99656a7c348 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
index 1d7db61ae0f..9085d9c1842 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -16,7 +16,7 @@ FoamFile
dimensions [0 0 0 0 0 0 0];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
2268
(
0
@@ -2294,19 +2294,19 @@ boundaryField
{
leftWall
{
- type alphaContactAngle;
+ type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}
rightWall
{
- type alphaContactAngle;
+ type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}
lowerWall
{
- type alphaContactAngle;
+ type multiphaseAlphaContactAngle;
thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 );
value uniform 0;
}
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
index eb770a8d943..93894106324 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
index c97aec687b5..606e71d5b6e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
index aab82d6b243..a0f116ae898 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
index fb4b3a2c334..05a6fc2edb3 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
index 57caa25d462..b77bfe91183 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
index 46ba31da890..a2553926d29 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
index ff361faec56..41c06d5f3f4 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
index 8f819f80d12..006aaccab71 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
@@ -15,11 +15,48 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
+phases
+(
+ water
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ }
+
+ oil
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 500;
+ }
+
+ mercury
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
+ rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+ }
+
+ air
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ }
+);
refPhase air;
-sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
+sigmas
+(
+ (air water) 0.07
+ (air oil) 0.07
+ (air mercury) 0.07
+ (water oil) 0.07
+ (water mercury) 0.07
+ (oil mercury) 0.07
+);
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 4cb658ebdea..122c8a0127c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
- div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
+ div(phi,alpha) Gauss vanLeer;
div(phic,alpha) Gauss interfaceCompression;
}
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 8b11d7fe20b..08294be3422 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -94,7 +94,7 @@ PISO
nAlphaCorr 4;
nAlphaSubCycles 4;
cycleAlpha yes;
- cAlpha 4;
+ cAlpha 2;
}
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
index 1175f827f3f..4184b5fb204 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
index 265dfa013fe..04429b16df5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
index 8f819f80d12..006aaccab71 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -15,11 +15,48 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
+phases
+(
+ water
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ }
+
+ oil
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 500;
+ }
+
+ mercury
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
+ rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+ }
+
+ air
+ {
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ }
+);
refPhase air;
-sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
+sigmas
+(
+ (air water) 0.07
+ (air oil) 0.07
+ (air mercury) 0.07
+ (water oil) 0.07
+ (water mercury) 0.07
+ (oil mercury) 0.07
+);
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
index 4cb658ebdea..122c8a0127c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
- div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
+ div(phi,alpha) Gauss vanLeer;
div(phic,alpha) Gauss interfaceCompression;
}
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 8b11d7fe20b..af2be2341de 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -81,7 +81,7 @@ solvers
{
solver smoothSolver;
smoother GaussSeidel;
- tolerance 1e-08;
+ tolerance 1e-9;
relTol 0;
nSweeps 1;
}
@@ -94,7 +94,7 @@ PISO
nAlphaCorr 4;
nAlphaSubCycles 4;
cycleAlpha yes;
- cAlpha 4;
+ cAlpha 2;
}
--
GitLab
From 460faa33ed0c0fc951b0a5450df91ab8a5fa0697 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 10 Jun 2010 12:59:34 +0100
Subject: [PATCH 60/77] buoyantSimpleFoam buoyantCavity tutorial: Updated
Update not complete.
---
.../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T | 2 +-
.../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U | 2 +-
.../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p | 2 +-
.../buoyantCavity/constant/RASProperties | 2 +-
.../buoyantCavity/constant/polyMesh/blockMeshDict | 2 +-
.../buoyantCavity/constant/polyMesh/boundary | 2 +-
.../buoyantCavity/constant/thermophysicalProperties | 2 +-
.../buoyantCavity/system/controlDict | 2 +-
.../buoyantSimpleFoam/buoyantCavity/system/fvSchemes | 6 +++---
.../buoyantCavity/system/fvSolution | 12 +++++++-----
.../buoyantCavity/system/sampleDict | 2 +-
11 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
index e270b4ef128..c15520f9948 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
index 2858e65d322..3e850b913b8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
index 2eda19d6adc..19224ed2b04 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
index 28b914fd762..8abafb5ce5c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
index 5dbe4b8413c..31828802868 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
index 3d13809c69f..7cba6d73ec3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index c1d6b112e91..6f5a818e17d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index b0a009a45b7..e250c63939d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index 3aa1a122cc9..8a7b5900c1a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -39,7 +39,7 @@ laplacianSchemes
{
default none;
laplacian(muEff,U) Gauss linear uncorrected;
- laplacian((rho*(1|A(U))),p) Gauss linear uncorrected;
+ laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
laplacian(alphaEff,h) Gauss linear uncorrected;
laplacian(DkEff,k) Gauss linear uncorrected;
laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
@@ -59,7 +59,7 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p_rgh;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
index 451f5da1aa1..2b7472975c7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -17,11 +17,11 @@ FoamFile
solvers
{
- p
+ p_rgh
{
solver GAMG;
tolerance 1e-7;
- relTol 0.1;
+ relTol 0.01;
smoother DICGaussSeidel;
@@ -42,16 +42,18 @@ solvers
SIMPLE
{
+ momentumPredictor yes;
nNonOrthogonalCorrectors 0;
- pRefCell 0;
+ p_rghRefCell 0;
+ p_rghRefValue 100000;
pRefValue 100000;
convergence 1e-04;
}
relaxationFactors
{
- p 0.3;
- U 0.7;
+ p_rgh 0.9;
+ U 0.3;
h 0.7;
"(k|epsilon|omega)" 0.7;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
index 9625d2cd11f..e2b70a1cfe2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
--
GitLab
From cf1fa7115f488ee66fb892ae83dba03fb77b7d6b Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 10 Jun 2010 13:01:14 +0100
Subject: [PATCH 61/77] Tutorial updates -- incomplete.
These changes are pushed to avoid continuous merge conflicts caused by scripted
changes to all the tutorial files.
---
.../hotRoom/constant/polyMesh/boundary | 2 +-
.../hotRoom/system/fvSchemes | 6 ++----
.../hotRoom/system/fvSolution | 7 ++++---
.../iglooWithFridges/constant/polyMesh/boundary | 2 +-
.../iglooWithFridges/system/controlDict | 2 +-
.../iglooWithFridges/system/fvSchemes | 16 ++++++++--------
.../iglooWithFridges/system/fvSolution | 14 +++++++-------
.../ras/throttle/constant/polyMesh/boundary | 2 +-
.../cavitatingFoam/ras/throttle/system/fvSchemes | 8 ++++----
9 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary
index b66c382b6a9..0d4d0e498da 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 5471bec4f45..7547301c0a7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -32,8 +32,6 @@ divSchemes
div(phi,T) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
- div(phi,R) Gauss upwind;
- div(R) Gauss linear;
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -41,7 +39,7 @@ laplacianSchemes
{
default none;
laplacian(nuEff,U) Gauss linear corrected;
- laplacian((1|A(U)),p) Gauss linear corrected;
+ laplacian((1|A(U)),p_rgh) Gauss linear corrected;
laplacian(kappaEff,T) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
@@ -61,7 +59,7 @@ snGradSchemes
fluxRequired
{
default no;
- p ;
+ p_rgh ;
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index e27eae3fe5b..672d6cc22c6 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- p
+ p_rgh
{
solver PCG;
preconditioner DIC;
@@ -37,14 +37,15 @@ solvers
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pRefCell 0;
+ p_rghRefCell 0;
+ p_rghRefValue 0;
pRefValue 0;
}
relaxationFactors
{
rho 1;
- p 0.7;
+ p_rgh 0.7;
U 0.2;
T 0.7;
"(k|epsilon|R)" 0.7;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
index ed36d6f6c4c..e0608ea9d7b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 9ed612f7fd0..5d61414e9e5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -23,7 +23,7 @@ startTime 0;
stopAt endTime;
-endTime 1000;
+endTime 2000;
deltaT 1;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 5471bec4f45..c08ba97414e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -40,12 +40,12 @@ divSchemes
laplacianSchemes
{
default none;
- laplacian(nuEff,U) Gauss linear corrected;
- laplacian((1|A(U)),p) Gauss linear corrected;
- laplacian(kappaEff,T) Gauss linear corrected;
- laplacian(DkEff,k) Gauss linear corrected;
- laplacian(DepsilonEff,epsilon) Gauss linear corrected;
- laplacian(DREff,R) Gauss linear corrected;
+ laplacian(nuEff,U) Gauss linear limited 0.333;
+ laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333;
+ laplacian(kappaEff,T) Gauss linear limited 0.333;
+ laplacian(DkEff,k) Gauss linear limited 0.333;
+ laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
+ laplacian(DREff,R) Gauss linear limited 0.333;
}
interpolationSchemes
@@ -55,13 +55,13 @@ interpolationSchemes
snGradSchemes
{
- default corrected;
+ default limited 0.333;
}
fluxRequired
{
default no;
- p ;
+ p_rgh ;
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index b04fdc8e05f..0e0e41fd800 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- p
+ p_rgh
{
solver PCG;
preconditioner DIC;
@@ -25,7 +25,7 @@ solvers
relTol 0.01;
}
- "(U|T|k|epsilon|R)"
+ "(U|T|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
@@ -37,17 +37,17 @@ solvers
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pRefCell 0;
+ p_rghRefCell 0;
+ p_rghRefValue 0;
pRefValue 0;
}
relaxationFactors
{
- rho 1;
- p 0.3;
- U 0.7;
+ p_rgh 0.8;
+ U 0.2;
T 0.7;
- "(k|epsilon|R)" 0.7;
+ "(k|epsilon)" 0.7;
}
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index b5008d95cda..03d26bcf3c9 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 3aa1b53f3f6..0a25b3fe77b 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -28,10 +28,10 @@ interpolationSchemes
divSchemes
{
default none;
- div(phiv,rho) Gauss limitedLinear 0.2;
- div(phi,U) Gauss limitedLinearV 0.2;
- div(phiv,omega) Gauss limitedLinear 0.2;
- div(phiv,k) Gauss limitedLinear 0.2;
+ div(phiv,rho) Gauss limitedLinear 1;
+ div(phi,U) Gauss limitedLinearV 1;
+ div(phiv,omega) Gauss limitedLinear 1;
+ div(phiv,k) Gauss limitedLinear 1;
}
gradSchemes
--
GitLab
From bd77d50b5ffca4683da5232f85a774df6cf3ead9 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 10 Jun 2010 13:15:04 +0100
Subject: [PATCH 62/77] Miscellaneous developments from Hilary
---
.../extrudeMesh/extrudeModel/linearRadial/linearRadial.C | 4 +++-
.../extrudeMesh/extrudeModel/linearRadial/linearRadial.H | 1 +
.../interpolation/interpolationCell/interpolationCell.H | 2 +-
.../interpolationCellPoint/interpolationCellPoint.H | 3 ++-
.../volPointInterpolation/volPointInterpolation.H | 3 ++-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C
index 21c6813526a..ca3631f2242 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C
@@ -43,7 +43,8 @@ addToRunTimeSelectionTable(extrudeModel, linearRadial, dictionary);
linearRadial::linearRadial(const dictionary& dict)
:
extrudeModel(typeName, dict),
- R_(readScalar(coeffDict_.lookup("R")))
+ R_(readScalar(coeffDict_.lookup("R"))),
+ Rsurface_(coeffDict_.lookupOrDefault<scalar>("Rsurface", -1))
{}
@@ -65,6 +66,7 @@ point linearRadial::operator()
// radius of the surface
scalar rs = mag(surfacePoint);
vector rsHat = surfacePoint/rs;
+ if (Rsurface_ >= 0) rs = Rsurface_;
scalar r = rs + (R_ - rs)*sumThickness(layer);
return r*rsHat;
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
index 9b481dee06d..9b42bb6690e 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
@@ -51,6 +51,7 @@ class linearRadial
// Private data
scalar R_;
+ scalar Rsurface_;
public:
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
index 994d1cae404..c16d234613c 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
@@ -25,7 +25,7 @@ Class
Foam::interpolationCell
Description
- Foam::interpolationCell
+ Uses the cell value for any point in the cell
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
index b187d3ff08b..ab37149b145 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
@@ -25,7 +25,8 @@ Class
Foam::interpolationCellPoint
Description
- Foam::interpolationCellPoint
+ Given cell centre values and point (vertex) values decompose into
+ tetrahedra and linear interpolate within them.
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index fb46d50a871..d850c1b68d5 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -25,7 +25,8 @@ Class
Foam::volPointInterpolation
Description
- Foam::volPointInterpolation
+ Interpolate from cell centres to points (vertices) using inverse distance
+ weighting
SourceFiles
volPointInterpolation.C
--
GitLab
From 3cf1f5eacd2d0c2d48a41360fbc6829a8130a389 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 10:01:53 +0100
Subject: [PATCH 63/77] ENH: IOdictionary : print name in warning message about
READ_IF_MODIFIED
---
src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index c5a37789582..2e187ce5e4d 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -48,7 +48,8 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
{
WarningIn("IOdictionary::IOdictionary(const IOobject&)")
//FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)")
- << "Dictionary constructed with IOobject::MUST_READ"
+ << "Dictionary " << name()
+ << " constructed with IOobject::MUST_READ"
" instead of IOobject::MUST_READ_IF_MODIFIED." << nl
<< "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
<< endl;
@@ -82,7 +83,8 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
WarningIn
(
"IOdictionary::IOdictionary(const IOobject& const dictionary&)"
- ) << "Dictionary constructed with IOobject::MUST_READ"
+ ) << "Dictionary " << name()
+ << " constructed with IOobject::MUST_READ"
" instead of IOobject::MUST_READ_IF_MODIFIED." << nl
<< "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
<< endl;
--
GitLab
From 4418d3f003a24ab481ff54e040b69accfbbba7e1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 10:03:36 +0100
Subject: [PATCH 64/77] ENH: paraFoam : unset FOAM_ABORT to prevent backtrace
printing hanging paraFoam
---
bin/paraFoam | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bin/paraFoam b/bin/paraFoam
index 0efcfec95b5..4e2a120fc99 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -52,6 +52,10 @@ USAGE
exit 1
}
+# We want to do nice exit when running paraview to give paraview opportunity
+# to clean up
+unset FOAM_ABORT
+
unset regionName touchOpt
# reader extension
--
GitLab
From b7e17abf9efa99bee79c944fed97b8894f216c00 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 10:36:41 +0100
Subject: [PATCH 65/77] ENH: basicSolidThermo : first implementation of solid
thermo
---
.../basicSolidThermo/Make/files | 7 +
.../basicSolidThermo/Make/options | 7 +
.../basicSolidThermo/basicSolidThermo.C | 91 +++
.../basicSolidThermo/basicSolidThermo.H | 196 +++++
.../basicSolidThermo/basicSolidThermoI.H | 42 +
.../basicSolidThermo/newBasicSolidThermo.C | 77 ++
.../nonCSinterpolateSolidThermo.C | 232 ++++++
.../nonCSinterpolateSolidThermo.H | 124 +++
.../constSolidThermo/constSolidThermo.C | 410 ++++++++++
.../constSolidThermo/constSolidThermo.H | 158 ++++
.../directionalSolidThermo.C | 765 ++++++++++++++++++
.../directionalSolidThermo.H | 183 +++++
.../interpolatedSolidThermo.C | 501 ++++++++++++
.../interpolatedSolidThermo.H | 161 ++++
.../temperatureCoupledBase.C | 179 ++++
.../temperatureCoupledBase.H | 137 ++++
16 files changed, 3270 insertions(+)
create mode 100644 src/thermophysicalModels/basicSolidThermo/Make/files
create mode 100644 src/thermophysicalModels/basicSolidThermo/Make/options
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermoI.H
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.H
create mode 100644 src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
create mode 100644 src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.H
create mode 100644 src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
create mode 100644 src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
create mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
create mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
diff --git a/src/thermophysicalModels/basicSolidThermo/Make/files b/src/thermophysicalModels/basicSolidThermo/Make/files
new file mode 100644
index 00000000000..f7f64d01d21
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/Make/files
@@ -0,0 +1,7 @@
+constSolidThermo/constSolidThermo.C
+directionalSolidThermo/directionalSolidThermo.C
+basicSolidThermo/basicSolidThermo.C
+basicSolidThermo/newBasicSolidThermo.C
+interpolatedSolidThermo/interpolatedSolidThermo.C
+
+LIB = $(FOAM_LIBBIN)/libbasicSolidThermo
diff --git a/src/thermophysicalModels/basicSolidThermo/Make/options b/src/thermophysicalModels/basicSolidThermo/Make/options
new file mode 100644
index 00000000000..f3070a731e4
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+ -lmeshTools \
+ -lfiniteVolume
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
new file mode 100644
index 00000000000..e0c65a91d7f
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(basicSolidThermo, 0);
+ defineRunTimeSelectionTable(basicSolidThermo, mesh);
+}
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::basicSolidThermo::basicSolidThermo(const fvMesh& mesh)
+:
+ IOdictionary
+ (
+ IOobject
+ (
+ "solidThermophysicalProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE
+ )
+ ),
+ mesh_(mesh),
+ T_
+ (
+ IOobject
+ (
+ "T",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::basicSolidThermo::~basicSolidThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+bool Foam::basicSolidThermo::writeData(Ostream& os) const
+{
+ return true;
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const basicSolidThermo& s)
+{
+ s.writeData(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
new file mode 100644
index 00000000000..4b625825193
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::basicSolidThermo
+
+Description
+ The thermophysical properties of a basicSolidThermo
+
+SourceFiles
+ basicSolidThermo.C
+ newBasicSolidThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicSolidThermo_H
+#define basicSolidThermo_H
+
+#include "runTimeSelectionTables.H"
+#include "volFields.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class basicSolidThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicSolidThermo
+:
+ public IOdictionary
+{
+protected:
+
+ // Protected data
+
+ const fvMesh& mesh_;
+
+ //- Temperature [K]
+ volScalarField T_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("basicSolidThermo");
+
+
+ // Declare run-time constructor selection tables
+
+ declareRunTimeSelectionTable
+ (
+ autoPtr,
+ basicSolidThermo,
+ mesh,
+ (const fvMesh& mesh),
+ (mesh)
+ );
+
+
+ // Constructors
+
+ //- Construct from mesh
+ basicSolidThermo(const fvMesh&);
+
+ //- Return a pointer to a new basicSolidThermo created from
+ // the solidThermophysicalProperties dictionary
+ static autoPtr<basicSolidThermo> New(const fvMesh&);
+
+
+ // Destructor
+
+ virtual ~basicSolidThermo();
+
+
+ // Member Functions
+
+ //- Update properties
+ virtual void correct() = 0;
+
+
+ // Physical constants which define the basicSolidThermo
+
+ //- Temperature [K]
+ inline const volScalarField& T() const;
+
+ //- Temperature [K]
+ inline volScalarField& T();
+
+ //- Density [kg/m3]
+ virtual tmp<volScalarField> rho() const = 0;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<volScalarField> cp() const = 0;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volScalarField> K() const = 0;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volSymmTensorField> directionalK() const = 0;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<volScalarField> Hf() const = 0;
+
+ //- Emissivity []
+ virtual tmp<volScalarField> emissivity() const = 0;
+
+
+ // Per patch calculation
+
+ //- Density [kg/m3]
+ virtual tmp<scalarField> rho(const label patchI) const = 0;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<scalarField> cp(const label patchI) const = 0;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<scalarField> K(const label patchI) const = 0;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<symmTensorField> directionalK(const label) const =0;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<scalarField> Hf(const label patchI) const = 0;
+
+ //- Emissivity []
+ virtual tmp<scalarField> emissivity(const label) const = 0;
+
+// // Point wise properties
+//
+// //- Density [kg/m3]
+// virtual scalar rho(const scalar T) const = 0;
+//
+// //- Specific heat capacity [J/(kg.K)]
+// virtual scalar cp(const scalar T) const = 0;
+//
+// //- Thermal conductivity [W/(m.K)]
+// virtual scalar K(const scalar T) const = 0;
+//
+// //- Heat of formation [J/kg]
+// virtual scalar Hf(const scalar T) const = 0;
+//
+// //- Emissivity []
+// virtual scalar emissivity(const scalar T) const = 0;
+
+ // I-O
+
+ //- Write the basicSolidThermo properties
+ virtual bool writeData(Ostream& os) const = 0;
+
+ //- Read solidThermophysicalProperties dictionary
+ virtual bool read() = 0;
+
+
+ // Ostream Operator
+
+ friend Ostream& operator<<(Ostream& os, const basicSolidThermo& s);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "basicSolidThermoI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermoI.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermoI.H
new file mode 100644
index 00000000000..2b919b7e534
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermoI.H
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+const Foam::volScalarField& Foam::basicSolidThermo::T() const
+{
+ return T_;
+}
+
+
+Foam::volScalarField& Foam::basicSolidThermo::T()
+{
+ return T_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C
new file mode 100644
index 00000000000..34d3400a03b
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/newBasicSolidThermo.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::basicSolidThermo> Foam::basicSolidThermo::New
+(
+ const fvMesh& mesh
+)
+{
+ if (debug)
+ {
+ Info<< "basicSolidThermo::New(const fvMesh&): "
+ << "constructing basicSolidThermo"
+ << endl;
+ }
+
+ const word thermoType
+ (
+ IOdictionary
+ (
+ IOobject
+ (
+ "solidThermophysicalProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
+ )
+ ).lookup("thermoType")
+ );
+
+ meshConstructorTable::iterator cstrIter =
+ meshConstructorTablePtr_->find(thermoType);
+
+ if (cstrIter == meshConstructorTablePtr_->end())
+ {
+ FatalErrorIn
+ (
+ "basicSolidThermo::New(const fvMesh&, const word&)"
+ ) << "Unknown solidThermo type " << thermoType
+ << endl << endl
+ << "Valid solidThermo types are :" << endl
+ << meshConstructorTablePtr_->toc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<basicSolidThermo>(cstrIter()(mesh));
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.C
new file mode 100644
index 00000000000..fb0301397cc
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.C
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolateSolidThermo.H"
+#include "addToRunTimeSelectionTable.H"
+#include "interpolateXY.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(interpolateSolidThermo, 0);
+ addToRunTimeSelectionTable
+ (
+ basicSolidThermo,
+ interpolateSolidThermo,
+ dictionary
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::interpolateSolidThermo::interpolateSolidThermo
+(
+ const fvMesh& mesh,
+ const dictionary& dict
+)
+:
+ basicSolidThermo(mesh, dict, typeName),
+ TValues_(dict_.lookup("TValues")),
+ rhoValues_(dict_.lookup("rhoValues")),
+ cpValues_(dict_.lookup("cpValues")),
+ KValues_(dict_.lookup("KValues")),
+ HfValues_(dict_.lookup("HfValues")),
+ emissivityValues_(dict_.lookup("emissivityValues"))
+{
+ if
+ (
+ (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != cpValues_.size())
+ && (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != KValues_.size())
+ && (TValues_.size() != HfValues_.size())
+ && (TValues_.size() != emissivityValues_.size())
+ )
+ {
+ FatalIOErrorIn
+ (
+ "interpolateSolidThermo::interpolateSolidThermo\n"
+ "(\n"
+ " const fvMesh& mesh,\n"
+ " const dictionary& dict\n"
+ ")\n",
+ dict_
+ ) << "Size of property tables should be equal to size of Temperature"
+ << " values " << TValues_.size()
+ << exit(FatalIOError);
+ }
+
+ for (label i = 1; i < TValues_.size(); i++)
+ {
+ if (TValues_[i] <= TValues_[i-1])
+ {
+ FatalIOErrorIn
+ (
+ "interpolateSolidThermo::interpolateSolidThermo\n"
+ "(\n"
+ " const fvMesh& mesh,\n"
+ " const dictionary& dict\n"
+ ")\n",
+ dict_
+ ) << "Temperature values are not in increasing order "
+ << TValues_ << exit(FatalIOError);
+ }
+ }
+
+ correct();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::interpolateSolidThermo::~interpolateSolidThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::interpolateSolidThermo::correct()
+{
+ // rho
+ rho_.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ rhoValues_
+ );
+
+ forAll(rho_.boundaryField(), patchI)
+ {
+ rho_.boundaryField()[patchI] == interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ rhoValues_
+ );
+ }
+
+
+ // cp
+ cp_.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ cpValues_
+ );
+
+ forAll(cp_.boundaryField(), patchI)
+ {
+ cp_.boundaryField()[patchI] == interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ cpValues_
+ );
+ }
+
+
+ // K
+ K_.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_
+ );
+
+ forAll(K_.boundaryField(), patchI)
+ {
+ K_.boundaryField()[patchI] == interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ KValues_
+ );
+ }
+
+
+ // Hf
+ Hf_.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ HfValues_
+ );
+
+ forAll(Hf_.boundaryField(), patchI)
+ {
+ Hf_.boundaryField()[patchI] == interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ HfValues_
+ );
+ }
+
+
+ // emissivity
+ emissivity_.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ emissivityValues_
+ );
+
+ forAll(emissivity_.boundaryField(), patchI)
+ {
+ emissivity_.boundaryField()[patchI] == interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ emissivityValues_
+ );
+ }
+}
+
+
+void Foam::interpolateSolidThermo::write(Ostream& os) const
+{
+ basicSolidThermo::write(os);
+ os.writeKeyword("TValues") << TValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("rhoValues") << rhoValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("cpValues") << cpValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("HfValues") << HfValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("emissivityValues") << emissivityValues_
+ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const interpolateSolidThermo& s)
+{
+ s.write(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.H
new file mode 100644
index 00000000000..1394f1fdaeb
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/nonCSinterpolateSolidThermo.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::interpolateSolidThermo
+
+Description
+ The thermophysical properties of a interpolateSolidThermo
+
+SourceFiles
+ interpolateSolidThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolateSolidThermo_H
+#define interpolateSolidThermo_H
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class basicSolidThermo;
+
+Ostream& operator<<
+(
+ Ostream&,
+ const basicSolidThermo&
+);
+
+
+/*---------------------------------------------------------------------------*\
+ Class interpolateSolidThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class interpolateSolidThermo
+:
+ public basicSolidThermo
+{
+ // Private data
+
+ //- Temperature points for which there are values
+ const Field<scalar> TValues_;
+
+ //- Density at given temperatures
+ const Field<scalar> rhoValues_;
+
+ const Field<scalar> cpValues_;
+
+ const Field<symmTensor> KValues_;
+
+ const Field<scalar> HfValues_;
+
+ const Field<scalar> emissivityValues_;
+
+public:
+
+ //- Runtime type information
+ TypeName("interpolateSolidThermo");
+
+
+ // Constructors
+
+ //- Construct from mesh
+ interpolateSolidThermo(const fvMesh& mesh, const dictionary& dict);
+
+ // Destructor
+
+ virtual ~interpolateSolidThermo();
+
+
+ // Member Functions
+
+ //- Update properties
+ virtual void correct();
+
+
+ // I-O
+
+ //- Write the interpolateSolidThermo properties
+ virtual void write(Ostream& os) const;
+
+
+ // Ostream Operator
+
+ friend Ostream& operator<<
+ (
+ Ostream& os,
+ const interpolateSolidThermo& s
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
new file mode 100644
index 00000000000..0f9f65d2b0b
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
@@ -0,0 +1,410 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "constSolidThermo.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(constSolidThermo, 0);
+ addToRunTimeSelectionTable(basicSolidThermo, constSolidThermo, mesh);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::constSolidThermo::constSolidThermo(const fvMesh& mesh)
+:
+ basicSolidThermo(mesh),
+ constRho_("zero", dimDensity, 0.0),
+ constCp_("zero", dimEnergy/(dimMass*dimTemperature), 0.0),
+ constK_("zero", dimEnergy/dimTime/(dimLength*dimTemperature), 0.0),
+ constHf_("zero", dimEnergy/dimMass, 0.0),
+ constEmissivity_("zero", dimless, 0.0)
+{
+ read();
+ correct();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::constSolidThermo::~constSolidThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::constSolidThermo::correct()
+{}
+
+
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::rho() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "rho",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ constRho_
+ )
+ );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::cp() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "cp",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ constCp_
+ )
+ );
+}
+
+
+//Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::K() const
+//{
+// vector v(eigenValues(constK_.value()));
+//
+// if (mag(v.x() - v.z()) > SMALL)
+// {
+// FatalErrorIn("directionalSolidThermo::K() const")
+// << "Supplied K " << constK_
+// << " are not isotropic. Eigenvalues are "
+// << v << exit(FatalError);
+// }
+//
+// return tmp<volScalarField>
+// (
+// new volScalarField
+// (
+// IOobject
+// (
+// "K",
+// mesh_.time().timeName(),
+// mesh_,
+// IOobject::NO_READ,
+// IOobject::NO_WRITE
+// ),
+// mesh_,
+// v.x()
+// )
+// );
+//}
+
+
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::K() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ constK_
+ )
+ );
+}
+
+
+//Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalK()
+//const
+//{
+// return tmp<volSymmTensorField>
+// (
+// new volSymmTensorField
+// (
+// IOobject
+// (
+// "K",
+// mesh_.time().timeName(),
+// mesh_,
+// IOobject::NO_READ,
+// IOobject::NO_WRITE
+// ),
+// mesh_,
+// constK_
+// )
+// );
+//}
+Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalK() const
+{
+ dimensionedSymmTensor t
+ (
+ constK_.name(),
+ constK_.dimensions(),
+ symmTensor
+ (
+ constK_.value(),
+ 0.0,
+ 0.0,
+ constK_.value(),
+ 0.0,
+ constK_.value()
+ )
+ );
+ return tmp<volSymmTensorField>
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ t
+ )
+ );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::Hf() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "Hf",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ constHf_
+ )
+ );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::emissivity() const
+{
+ return tmp<volScalarField>
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "emissivity",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ constEmissivity_
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::rho
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ T_.boundaryField()[patchI].size(),
+ constRho_.value()
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::cp
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ T_.boundaryField()[patchI].size(),
+ constCp_.value()
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::K
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ T_.boundaryField()[patchI].size(),
+ constK_.value()
+ )
+ );
+}
+
+
+Foam::tmp<Foam::symmTensorField> Foam::constSolidThermo::directionalK
+(
+ const label patchI
+) const
+{
+ symmTensor t
+ (
+ constK_.value(),
+ 0.0,
+ 0.0,
+ constK_.value(),
+ 0.0,
+ constK_.value()
+ );
+ return tmp<symmTensorField>
+ (
+ new symmTensorField
+ (
+ T_.boundaryField()[patchI].size(),
+ t
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::Hf
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ T_.boundaryField()[patchI].size(),
+ constHf_.value()
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::emissivity
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ T_.boundaryField()[patchI].size(),
+ constEmissivity_.value()
+ )
+ );
+}
+
+
+bool Foam::constSolidThermo::read()
+{
+ return read(subDict(typeName + "Coeffs"));
+}
+
+
+bool Foam::constSolidThermo::read(const dictionary& dict)
+{
+ constRho_ = dimensionedScalar(dict.lookup("rho"));
+ constCp_ = dimensionedScalar(dict.lookup("cp"));
+ constK_ = dimensionedScalar(dict.lookup("K"));
+ constHf_ = dimensionedScalar(dict.lookup("Hf"));
+ constEmissivity_ = dimensionedScalar(dict.lookup("emissivity"));
+
+ Info<< "Constructed constSolidThermo with" << nl
+ << " rho : " << constRho_ << nl
+ << " cp : " << constCp_ << nl
+ << " K : " << constK_ << nl
+ << " Hf : " << constHf_ << nl
+ << " emissivity : " << constEmissivity_ << nl
+ << endl;
+
+ return true;
+}
+
+
+bool Foam::constSolidThermo::writeData(Ostream& os) const
+{
+ bool ok = basicSolidThermo::writeData(os);
+ os.writeKeyword("rho") << constRho_ << token::END_STATEMENT << nl;
+ os.writeKeyword("cp") << constCp_ << token::END_STATEMENT << nl;
+ os.writeKeyword("K") << constK_ << token::END_STATEMENT << nl;
+ os.writeKeyword("Hf") << constHf_ << token::END_STATEMENT << nl;
+ os.writeKeyword("emissivity") << constEmissivity_ << token::END_STATEMENT
+ << nl;
+ return ok && os.good();
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const constSolidThermo& s)
+{
+ s.writeData(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
new file mode 100644
index 00000000000..41b92bd18d2
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::constSolidThermo
+
+Description
+ The thermophysical properties of a constSolidThermo
+
+SourceFiles
+ constSolidThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constSolidThermo_H
+#define constSolidThermo_H
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class constSolidThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class constSolidThermo
+:
+ public basicSolidThermo
+{
+ //- Density [kg/m3]
+ dimensionedScalar constRho_;
+
+ //- Specific heat capacity [J/(kg.K)]
+ dimensionedScalar constCp_;
+
+ //- Thermal conductivity [W/(m.K)]
+ //dimensionedSymmTensor constK_;
+ dimensionedScalar constK_;
+
+ //- Heat of formation [J/kg]
+ dimensionedScalar constHf_;
+
+ //- Emissivity
+ dimensionedScalar constEmissivity_;
+
+public:
+
+ //- Runtime type information
+ TypeName("constSolidThermo");
+
+
+ // Constructors
+
+ //- Construct from mesh
+ constSolidThermo(const fvMesh& mesh);
+
+ // Destructor
+
+ virtual ~constSolidThermo();
+
+
+ // Member Functions
+
+ //- Update properties
+ virtual void correct();
+
+ //- Density [kg/m3]
+ virtual tmp<volScalarField> rho() const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<volScalarField> cp() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ // Note: needs supplied K to be isotropic
+ virtual tmp<volScalarField> K() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volSymmTensorField> directionalK() const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<volScalarField> Hf() const;
+
+ //- Emissivity []
+ virtual tmp<volScalarField> emissivity() const;
+
+
+ // Per patch calculation
+
+ //- Density [kg/m3]
+ virtual tmp<scalarField> rho(const label patchI) const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<scalarField> cp(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<scalarField> K(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<symmTensorField> directionalK(const label patchI) const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<scalarField> Hf(const label patchI) const;
+
+ //- Emissivity []
+ virtual tmp<scalarField> emissivity(const label) const;
+
+
+ // I-O
+
+ //- Write the constSolidThermo properties
+ virtual bool writeData(Ostream& os) const;
+
+ //- Read solidThermophysicalProperties dictionary
+ virtual bool read();
+
+ //- Read solidThermophysicalProperties dictionary
+ bool read(const dictionary&);
+
+
+
+ // Ostream Operator
+
+ friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
new file mode 100644
index 00000000000..e7caf0d8474
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C
@@ -0,0 +1,765 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "directionalSolidThermo.H"
+#include "addToRunTimeSelectionTable.H"
+#include "interpolateXY.H"
+#include "transform.H"
+#include "transformField.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(directionalSolidThermo, 0);
+ addToRunTimeSelectionTable
+ (
+ basicSolidThermo,
+ directionalSolidThermo,
+ mesh
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::directionalSolidThermo::directionalSolidThermo(const fvMesh& mesh)
+:
+ basicSolidThermo(mesh),
+ ccTransforms_
+ (
+ IOobject
+ (
+ "ccTransforms",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh,
+ dimLength
+ )
+{
+ read();
+
+ // Determine transforms for cell centres
+ forAll(mesh.C(), cellI)
+ {
+ vector dir = mesh.C()[cellI] - coordSys_.origin();
+ dir /= mag(dir);
+
+ // Define local coordinate system with
+ // - e1 : axis from cc to centre
+ // - e3 : rotation axis
+ coordinateSystem cs
+ (
+ "cc",
+ coordSys_.origin(),
+ coordSys_.e3(), //z',e3
+ dir //x',e1
+ );
+
+ ccTransforms_[cellI] = cs.R();
+ }
+
+ forAll(mesh.C().boundaryField(), patchI)
+ {
+ const fvPatchVectorField& patchC = mesh.C().boundaryField()[patchI];
+ fvPatchTensorField& patchT = ccTransforms_.boundaryField()[patchI];
+
+ tensorField tc(patchT.size());
+ forAll(tc, i)
+ {
+ vector dir = patchC[i] - coordSys_.origin();
+ dir /= mag(dir);
+
+ coordinateSystem cs
+ (
+ "cc",
+ coordSys_.origin(),
+ coordSys_.e3(), //z',e3
+ dir //x',e1
+ );
+
+ tc[i] = cs.R();
+ }
+ patchT = tc;
+ }
+
+ if (debug)
+ {
+ Info<< "directionalSolidThermo : dumping converted Kxx, Kyy, Kzz"
+ << endl;
+ {
+ volVectorField Kxx
+ (
+ IOobject
+ (
+ "Kxx",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE,
+ false
+ ),
+ mesh,
+ dimless
+ );
+ Kxx.internalField() = transform
+ (
+ ccTransforms_.internalField(),
+ vectorField
+ (
+ ccTransforms_.internalField().size(),
+ point(1, 0, 0)
+ )
+ );
+ forAll(Kxx.boundaryField(), patchI)
+ {
+ Kxx.boundaryField()[patchI] = transform
+ (
+ ccTransforms_.boundaryField()[patchI],
+ vectorField
+ (
+ ccTransforms_.boundaryField()[patchI].size(),
+ point(1, 0, 0)
+ )
+ );
+ }
+ Kxx.write();
+ }
+ {
+ volVectorField Kyy
+ (
+ IOobject
+ (
+ "Kyy",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE,
+ false
+ ),
+ mesh,
+ dimless
+ );
+ Kyy.internalField() = transform
+ (
+ ccTransforms_.internalField(),
+ vectorField
+ (
+ ccTransforms_.internalField().size(),
+ point(0, 1, 0)
+ )
+ );
+ forAll(Kyy.boundaryField(), patchI)
+ {
+ Kyy.boundaryField()[patchI] = transform
+ (
+ ccTransforms_.boundaryField()[patchI],
+ vectorField
+ (
+ ccTransforms_.boundaryField()[patchI].size(),
+ point(0, 1, 0)
+ )
+ );
+ }
+ Kyy.write();
+ }
+ {
+ volVectorField Kzz
+ (
+ IOobject
+ (
+ "Kzz",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE,
+ false
+ ),
+ mesh,
+ dimless
+ );
+ Kzz.internalField() = transform
+ (
+ ccTransforms_.internalField(),
+ vectorField
+ (
+ ccTransforms_.internalField().size(),
+ point(0, 0, 1)
+ )
+ );
+ forAll(Kzz.boundaryField(), patchI)
+ {
+ Kzz.boundaryField()[patchI] = transform
+ (
+ ccTransforms_.boundaryField()[patchI],
+ vectorField
+ (
+ ccTransforms_.boundaryField()[patchI].size(),
+ point(0, 0, 1)
+ )
+ );
+ }
+ Kzz.write();
+ }
+ }
+
+
+
+ correct();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::directionalSolidThermo::~directionalSolidThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::symmTensor Foam::directionalSolidThermo::transformPrincipal
+(
+ const tensor& tt,
+ const vector& st
+) const
+{
+ return symmTensor
+ (
+ tt.xx()*st.x()*tt.xx()
+ + tt.xy()*st.y()*tt.xy()
+ + tt.xz()*st.z()*tt.xz(),
+
+ tt.xx()*st.x()*tt.yx()
+ + tt.xy()*st.y()*tt.yy()
+ + tt.xz()*st.z()*tt.yz(),
+
+ tt.xx()*st.x()*tt.zx()
+ + tt.xy()*st.y()*tt.zy()
+ + tt.xz()*st.z()*tt.zz(),
+
+ tt.yx()*st.x()*tt.yx()
+ + tt.yy()*st.y()*tt.yy()
+ + tt.yz()*st.z()*tt.yz(),
+
+ tt.yx()*st.x()*tt.zx()
+ + tt.yy()*st.y()*tt.zy()
+ + tt.yz()*st.z()*tt.zz(),
+
+ tt.zx()*st.x()*tt.zx()
+ + tt.zy()*st.y()*tt.zy()
+ + tt.zz()*st.z()*tt.zz()
+ );
+}
+
+
+void Foam::directionalSolidThermo::transformField
+(
+ symmTensorField& fld,
+ const tensorField& tt,
+ const vectorField& st
+) const
+{
+ fld.setSize(tt.size());
+ forAll(fld, i)
+ {
+ fld[i] = transformPrincipal(tt[i], st[i]);
+ }
+}
+
+
+void Foam::directionalSolidThermo::correct()
+{}
+
+
+Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::rho() const
+{
+ tmp<volScalarField> trho
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "rho",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimDensity
+ )
+ );
+ volScalarField& rho = trho();
+
+ rho.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ rhoValues_
+ );
+
+ forAll(rho.boundaryField(), patchI)
+ {
+ rho.boundaryField()[patchI] == this->rho(patchI)();
+ }
+
+ return trho;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::cp() const
+{
+ tmp<volScalarField> tcp
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "cp",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/(dimMass*dimTemperature)
+ )
+ );
+ volScalarField& cp = tcp();
+
+ cp.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ cpValues_
+ );
+
+ forAll(cp.boundaryField(), patchI)
+ {
+ cp.boundaryField()[patchI] == this->cp(patchI)();
+ }
+
+ return tcp;
+}
+
+
+Foam::tmp<Foam::volSymmTensorField> Foam::directionalSolidThermo::directionalK()
+const
+{
+ tmp<volSymmTensorField> tK
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/dimTime/(dimLength*dimTemperature)
+ )
+ );
+ volSymmTensorField& K = tK();
+
+ // Get temperature interpolated properties (principal directions)
+ Field<vector> localK
+ (
+ interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_
+ )
+ );
+
+ // Transform into global coordinate system
+ transformField(K.internalField(), ccTransforms_.internalField(), localK);
+
+ forAll(K.boundaryField(), patchI)
+ {
+ K.boundaryField()[patchI] == this->directionalK(patchI)();
+ }
+
+ return tK;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::K() const
+{
+ forAll(KValues_, i)
+ {
+ const vector& v = KValues_[i];
+ if
+ (
+ v.x() != v.y()
+ || v.x() != v.z()
+ || v.y() != v.z()
+ )
+ {
+ FatalErrorIn("directionalSolidThermo::K() const")
+ << "Supplied K values " << KValues_
+ << " are not isotropic." << exit(FatalError);
+ }
+ }
+
+ // Get temperature interpolated properties (principal directions)
+ Field<vector> localK
+ (
+ interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_
+ )
+ );
+
+ tmp<volScalarField> tK
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/dimTime/(dimLength*dimTemperature)
+ )
+ );
+ volScalarField& K = tK();
+
+ K.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_.component(0)()
+ );
+
+ forAll(K.boundaryField(), patchI)
+ {
+ K.boundaryField()[patchI] == this->K(patchI)();
+ }
+
+ return tK;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::Hf() const
+{
+ tmp<volScalarField> tHf
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "Hf",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/dimMass
+ )
+ );
+ volScalarField& Hf = tHf();
+
+ Hf.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ HfValues_
+ );
+
+ forAll(Hf.boundaryField(), patchI)
+ {
+ Hf.boundaryField()[patchI] == this->Hf(patchI)();
+ }
+
+ return tHf;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::emissivity() const
+{
+ tmp<volScalarField> temissivity
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "emissivity",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimless
+ )
+ );
+ volScalarField& emissivity = temissivity();
+
+ emissivity.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ emissivityValues_
+ );
+
+ forAll(emissivity.boundaryField(), patchI)
+ {
+ emissivity.boundaryField()[patchI] == this->emissivity(patchI)();
+ }
+
+ return temissivity;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::rho
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ rhoValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::cp
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ cpValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::K
+(
+ const label patchI
+) const
+{
+ forAll(KValues_, i)
+ {
+ const vector& v = KValues_[i];
+ if
+ (
+ v.x() != v.y()
+ || v.x() != v.z()
+ || v.y() != v.z()
+ )
+ {
+ FatalErrorIn("directionalSolidThermo::K() const")
+ << "Supplied K values " << KValues_
+ << " are not isotropic." << exit(FatalError);
+ }
+ }
+
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ KValues_.component(0)()
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::symmTensorField> Foam::directionalSolidThermo::directionalK
+(
+ const label patchI
+) const
+{
+ const fvPatchScalarField& patchT = T_.boundaryField()[patchI];
+
+ Field<vector> localK(interpolateXY(patchT, TValues_, KValues_));
+
+ tmp<symmTensorField> tglobalK(new symmTensorField(localK.size()));
+ transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localK);
+
+ return tglobalK;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::Hf
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ HfValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::emissivity
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ emissivityValues_
+ )
+ )
+ );
+}
+
+
+bool Foam::directionalSolidThermo::read()
+{
+ return read(subDict(typeName + "Coeffs"));
+}
+
+
+bool Foam::directionalSolidThermo::read(const dictionary& dict)
+{
+ TValues_ = Field<scalar>(dict.lookup("TValues"));
+ rhoValues_ = Field<scalar>(dict.lookup("rhoValues"));
+ cpValues_ = Field<scalar>(dict.lookup("cpValues"));
+ KValues_ = Field<vector>(dict.lookup("KValues"));
+ HfValues_ = Field<scalar>(dict.lookup("HfValues"));
+ emissivityValues_ = Field<scalar>(dict.lookup("emissivityValues"));
+ coordSys_ = coordinateSystem(dict, mesh_);
+
+ Info<< "Constructed directionalSolidThermo with samples" << nl
+ << " T : " << TValues_ << nl
+ << " rho : " << rhoValues_ << nl
+ << " cp : " << cpValues_ << nl
+ << " K : " << KValues_ << nl
+ << " in coordinates system" << nl
+ << " type : " << coordSys_.type() << nl
+ << " e3 : " << coordSys_.e3() << nl
+ << " e1 : " << coordSys_.e1() << nl
+ << " Hf : " << HfValues_ << nl
+ << " emissivity : " << emissivityValues_ << nl
+ << endl;
+
+
+ if
+ (
+ (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != cpValues_.size())
+ && (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != KValues_.size())
+ && (TValues_.size() != HfValues_.size())
+ && (TValues_.size() != emissivityValues_.size())
+ )
+ {
+ FatalIOErrorIn("directionalSolidThermo::read()", dict)
+ << "Size of property tables should be equal to size of Temperature"
+ << " values " << TValues_.size()
+ << exit(FatalIOError);
+ }
+
+ for (label i = 1; i < TValues_.size(); i++)
+ {
+ if (TValues_[i] <= TValues_[i-1])
+ {
+ FatalIOErrorIn("directionalSolidThermo::read()", dict)
+ << "Temperature values are not in increasing order "
+ << TValues_ << exit(FatalIOError);
+ }
+ }
+ return true;
+}
+
+
+bool Foam::directionalSolidThermo::writeData(Ostream& os) const
+{
+ bool ok = basicSolidThermo::writeData(os);
+ os.writeKeyword("TValues") << TValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("rhoValues") << rhoValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("cpValues") << cpValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("HfValues") << HfValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("emissivityValues") << emissivityValues_
+ << token::END_STATEMENT << nl;
+
+ return ok && os.good();
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const directionalSolidThermo& s)
+{
+ s.writeData(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.H
new file mode 100644
index 00000000000..7cc9648744a
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.H
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::directionalSolidThermo
+
+Description
+ Directional conductivity + table interpolation.
+
+SourceFiles
+ directionalSolidThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef directionalSolidThermo_H
+#define directionalSolidThermo_H
+
+#include "basicSolidThermo.H"
+#include "coordinateSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class directionalSolidThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class directionalSolidThermo
+:
+ public basicSolidThermo
+{
+ // Private data
+
+ //- Temperature samples
+ Field<scalar> TValues_;
+
+ //- Density at given temperatures
+ Field<scalar> rhoValues_;
+
+ Field<scalar> cpValues_;
+
+ Field<vector> KValues_;
+
+ Field<scalar> HfValues_;
+
+ Field<scalar> emissivityValues_;
+
+ //- Coordinate system used for the directional properties
+ coordinateSystem coordSys_;
+
+ //- Transformation for cell centres
+ volTensorField ccTransforms_;
+
+
+ // Private Member Functions
+
+ //- Transform principal values of symmTensor
+ symmTensor transformPrincipal(const tensor& tt, const vector& st) const;
+
+ //- Transform principal values of symmTensor
+ void transformField
+ (
+ symmTensorField& fld,
+ const tensorField& tt,
+ const vectorField& st
+ ) const;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("directionalSolidThermo");
+
+
+ // Constructors
+
+ //- Construct from mesh
+ directionalSolidThermo(const fvMesh& mesh);
+
+ // Destructor
+
+ virtual ~directionalSolidThermo();
+
+
+ // Member Functions
+
+ //- Update properties
+ virtual void correct();
+
+ //- Density [kg/m3]
+ virtual tmp<volScalarField> rho() const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<volScalarField> cp() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volScalarField> K() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volSymmTensorField> directionalK() const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<volScalarField> Hf() const;
+
+ //- Emissivity []
+ virtual tmp<volScalarField> emissivity() const;
+
+
+ // Per patch calculation
+
+ //- Density [kg/m3]
+ virtual tmp<scalarField> rho(const label patchI) const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<scalarField> cp(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ // Note: needs Kvalues to be isotropic
+ virtual tmp<scalarField> K(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<symmTensorField> directionalK(const label patchI) const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<scalarField> Hf(const label patchI) const;
+
+ //- Emissivity []
+ virtual tmp<scalarField> emissivity(const label) const;
+
+
+ // I-O
+
+ //- Write the directionalSolidThermo properties
+ virtual bool writeData(Ostream& os) const;
+
+ //- Read the directionalSolidThermo properties
+ virtual bool read();
+
+ //- Read the directionalSolidThermo properties
+ bool read(const dictionary& dict);
+
+
+ // Ostream Operator
+
+ friend Ostream& operator<<
+ (
+ Ostream& os,
+ const directionalSolidThermo& s
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
new file mode 100644
index 00000000000..c82f431a65f
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
@@ -0,0 +1,501 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolatedSolidThermo.H"
+#include "addToRunTimeSelectionTable.H"
+#include "interpolateXY.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(interpolatedSolidThermo, 0);
+ addToRunTimeSelectionTable
+ (
+ basicSolidThermo,
+ interpolatedSolidThermo,
+ mesh
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::interpolatedSolidThermo::interpolatedSolidThermo(const fvMesh& mesh)
+:
+ basicSolidThermo(mesh)
+{
+ read();
+ correct();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::interpolatedSolidThermo::~interpolatedSolidThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::interpolatedSolidThermo::correct()
+{}
+
+
+Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::rho() const
+{
+ tmp<volScalarField> trho
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "rho",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimDensity
+ )
+ );
+ volScalarField& rho = trho();
+
+ rho.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ rhoValues_
+ );
+
+ forAll(rho.boundaryField(), patchI)
+ {
+ rho.boundaryField()[patchI] == this->rho(patchI)();
+ }
+
+ return trho;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::cp() const
+{
+ tmp<volScalarField> tcp
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "cp",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/(dimMass*dimTemperature)
+ )
+ );
+ volScalarField& cp = tcp();
+
+ cp.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ cpValues_
+ );
+
+ forAll(cp.boundaryField(), patchI)
+ {
+ cp.boundaryField()[patchI] == this->cp(patchI)();
+ }
+
+ return tcp;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::K() const
+{
+ tmp<volScalarField> tK
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/dimTime/(dimLength*dimTemperature)
+ )
+ );
+ volScalarField& K = tK();
+
+ K.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_
+ );
+
+ forAll(K.boundaryField(), patchI)
+ {
+ K.boundaryField()[patchI] == this->K(patchI)();
+ }
+
+ return tK;
+}
+
+
+Foam::tmp<Foam::volSymmTensorField>
+Foam::interpolatedSolidThermo::directionalK()
+const
+{
+ tmp<volSymmTensorField> tK
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "K",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimensionedSymmTensor
+ (
+ "zero",
+ dimEnergy/dimTime/(dimLength*dimTemperature),
+ symmTensor::zero
+ )
+ )
+ );
+ volSymmTensorField& K = tK();
+
+ Field<scalar> scalarK
+ (
+ interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ KValues_
+ )
+ );
+
+ K.internalField().replace(symmTensor::XX, scalarK);
+ K.internalField().replace(symmTensor::YY, scalarK);
+ K.internalField().replace(symmTensor::ZZ, scalarK);
+
+ forAll(K.boundaryField(), patchI)
+ {
+ K.boundaryField()[patchI] == this->directionalK(patchI)();
+ }
+
+ return tK;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::Hf() const
+{
+ tmp<volScalarField> tHf
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "Hf",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimEnergy/dimMass
+ )
+ );
+ volScalarField& Hf = tHf();
+
+ Hf.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ HfValues_
+ );
+
+ forAll(Hf.boundaryField(), patchI)
+ {
+ Hf.boundaryField()[patchI] == this->Hf(patchI)();
+ }
+
+ return tHf;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::emissivity() const
+{
+ tmp<volScalarField> temissivity
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "emissivity",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ mesh_,
+ dimless
+ )
+ );
+ volScalarField& emissivity = temissivity();
+
+ emissivity.internalField() = interpolateXY
+ (
+ T_.internalField(),
+ TValues_,
+ emissivityValues_
+ );
+
+ forAll(emissivity.boundaryField(), patchI)
+ {
+ emissivity.boundaryField()[patchI] == this->emissivity(patchI)();
+ }
+
+ return temissivity;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::rho
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ rhoValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::cp
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ cpValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::K
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ KValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::symmTensorField> Foam::interpolatedSolidThermo::directionalK
+(
+ const label patchI
+) const
+{
+ const fvPatchScalarField& patchT = T_.boundaryField()[patchI];
+
+ Field<scalar> scalarK(interpolateXY(patchT, TValues_, KValues_));
+
+ tmp<symmTensorField> tfld
+ (
+ new symmTensorField
+ (
+ scalarK.size(),
+ symmTensor::zero
+ )
+ );
+ symmTensorField& fld = tfld();
+
+ fld.replace(symmTensor::XX, scalarK);
+ fld.replace(symmTensor::YY, scalarK);
+ fld.replace(symmTensor::ZZ, scalarK);
+
+ return tfld;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::Hf
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ HfValues_
+ )
+ )
+ );
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::emissivity
+(
+ const label patchI
+) const
+{
+ return tmp<scalarField>
+ (
+ new scalarField
+ (
+ interpolateXY
+ (
+ T_.boundaryField()[patchI],
+ TValues_,
+ emissivityValues_
+ )
+ )
+ );
+}
+
+
+bool Foam::interpolatedSolidThermo::read()
+{
+ return read(subDict(typeName + "Coeffs"));
+}
+
+
+bool Foam::interpolatedSolidThermo::read(const dictionary& dict)
+{
+ TValues_ = Field<scalar>(dict.lookup("TValues"));
+ rhoValues_ = Field<scalar>(dict.lookup("rhoValues"));
+ cpValues_ = Field<scalar>(dict.lookup("cpValues"));
+ KValues_ = Field<scalar>(dict.lookup("KValues"));
+ HfValues_ = Field<scalar>(dict.lookup("HfValues"));
+ emissivityValues_ = Field<scalar>(dict.lookup("emissivityValues"));
+
+ Info<< "Constructed interpolatedSolidThermo with samples" << nl
+ << " T : " << TValues_ << nl
+ << " rho : " << rhoValues_ << nl
+ << " cp : " << cpValues_ << nl
+ << " K : " << KValues_ << nl
+ << " Hf : " << HfValues_ << nl
+ << " emissivity : " << emissivityValues_ << nl
+ << endl;
+
+ if
+ (
+ (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != cpValues_.size())
+ && (TValues_.size() != rhoValues_.size())
+ && (TValues_.size() != KValues_.size())
+ && (TValues_.size() != HfValues_.size())
+ && (TValues_.size() != emissivityValues_.size())
+ )
+ {
+ FatalIOErrorIn("interpolatedSolidThermo::read()", dict)
+ << "Size of property tables should be equal to size of Temperature"
+ << " values " << TValues_.size()
+ << exit(FatalIOError);
+ }
+
+ for (label i = 1; i < TValues_.size(); i++)
+ {
+ if (TValues_[i] <= TValues_[i-1])
+ {
+ FatalIOErrorIn("interpolatedSolidThermo::read()", dict)
+ << "Temperature values are not in increasing order "
+ << TValues_ << exit(FatalIOError);
+ }
+ }
+ return true;
+}
+
+
+bool Foam::interpolatedSolidThermo::writeData(Ostream& os) const
+{
+ bool ok = basicSolidThermo::writeData(os);
+ os.writeKeyword("TValues") << TValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("rhoValues") << rhoValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("cpValues") << cpValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("HfValues") << HfValues_ << token::END_STATEMENT << nl;
+ os.writeKeyword("emissivityValues") << emissivityValues_
+ << token::END_STATEMENT << nl;
+
+ return ok && os.good();
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const interpolatedSolidThermo& s)
+{
+ s.writeData(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
new file mode 100644
index 00000000000..571138e0231
--- /dev/null
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::interpolatedSolidThermo
+
+Description
+ Table interpolated solid thermo.
+
+SourceFiles
+ interpolatedSolidThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolatedSolidThermo_H
+#define interpolatedSolidThermo_H
+
+#include "basicSolidThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class interpolatedSolidThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class interpolatedSolidThermo
+:
+ public basicSolidThermo
+{
+ // Private data
+
+ //- Temperature samples
+ Field<scalar> TValues_;
+
+ //- Density at given temperatures
+ Field<scalar> rhoValues_;
+
+ Field<scalar> cpValues_;
+
+ Field<scalar> KValues_;
+
+ Field<scalar> HfValues_;
+
+ Field<scalar> emissivityValues_;
+
+public:
+
+ //- Runtime type information
+ TypeName("interpolatedSolidThermo");
+
+
+ // Constructors
+
+ //- Construct from mesh
+ interpolatedSolidThermo(const fvMesh& mesh);
+
+ // Destructor
+
+ virtual ~interpolatedSolidThermo();
+
+
+ // Member Functions
+
+ //- Update properties
+ virtual void correct();
+
+ //- Density [kg/m3]
+ virtual tmp<volScalarField> rho() const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<volScalarField> cp() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volScalarField> K() const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<volSymmTensorField> directionalK() const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<volScalarField> Hf() const;
+
+ //- Emissivity []
+ virtual tmp<volScalarField> emissivity() const;
+
+
+ // Per patch calculation
+
+ //- Density [kg/m3]
+ virtual tmp<scalarField> rho(const label patchI) const;
+
+ //- Specific heat capacity [J/(kg.K)]
+ virtual tmp<scalarField> cp(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ // Note: needs Kvalues to be isotropic
+ virtual tmp<scalarField> K(const label patchI) const;
+
+ //- Thermal conductivity [W/(m.K)]
+ virtual tmp<symmTensorField> directionalK(const label patchI) const;
+
+ //- Heat of formation [J/kg]
+ virtual tmp<scalarField> Hf(const label patchI) const;
+
+ //- Emissivity []
+ virtual tmp<scalarField> emissivity(const label) const;
+
+
+ // I-O
+
+ //- Write the interpolatedSolidThermo properties
+ virtual bool writeData(Ostream& os) const;
+
+ //- Read the interpolatedSolidThermo properties
+ virtual bool read();
+
+ //- Read the interpolatedSolidThermo properties
+ bool read(const dictionary& dict);
+
+
+ // Ostream Operator
+
+ friend Ostream& operator<<
+ (
+ Ostream& os,
+ const interpolatedSolidThermo& s
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
new file mode 100644
index 00000000000..1026ca123cb
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "temperatureCoupledBase.H"
+#include "volFields.H"
+#include "basicSolidThermo.H"
+#include "RASModel.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
+
+template<>
+const char* Foam::NamedEnum<Foam::temperatureCoupledBase::KMethodType, 4>::
+names[] =
+{
+ "basicThermo",
+ "solidThermo",
+ "directionalSolidThermo",
+ "lookup"
+};
+
+
+const Foam::NamedEnum<Foam::temperatureCoupledBase::KMethodType, 4>
+ Foam::temperatureCoupledBase::KMethodTypeNames_;
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::temperatureCoupledBase::temperatureCoupledBase
+(
+ const fvPatch& patch,
+ const word& calculationType,
+ const word& KName
+)
+:
+ patch_(patch),
+ method_(KMethodTypeNames_[calculationType]),
+ KName_(KName)
+{}
+
+
+Foam::temperatureCoupledBase::temperatureCoupledBase
+(
+ const fvPatch& patch,
+ const dictionary& dict
+)
+:
+ patch_(patch),
+ method_(KMethodTypeNames_.read(dict.lookup("K"))),
+ KName_(dict.lookup("KName"))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
+(
+ const scalarField& Tp
+) const
+{
+ const fvMesh& mesh = patch_.boundaryMesh().mesh();
+
+ switch (method_)
+ {
+ case BASICTHERMO:
+ {
+ const compressible::RASModel& model =
+ mesh.lookupObject<compressible::RASModel>("RASProperties");
+
+ return
+ model.alphaEff(patch_.index())
+ *model.thermo().Cp(Tp, patch_.index());
+ }
+ break;
+
+ case SOLIDTHERMO:
+ {
+ const basicSolidThermo& thermo =
+ mesh.lookupObject<basicSolidThermo>
+ (
+ "solidThermophysicalProperties"
+ );
+ return thermo.K(patch_.index());
+ }
+ break;
+
+ case DIRECTIONALSOLIDTHERMO:
+ {
+ vectorField n = patch_.nf();
+
+ const basicSolidThermo& thermo =
+ mesh.lookupObject<basicSolidThermo>
+ (
+ "solidThermophysicalProperties"
+ );
+ return n & thermo.directionalK(patch_.index()) & n;
+ }
+ break;
+
+ case LOOKUP:
+ {
+ if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
+ {
+ return patch_.lookupPatchField<volScalarField, scalar>(KName_);
+ }
+ else if
+ (
+ mesh.objectRegistry::foundObject<volSymmTensorField>(KName_)
+ )
+ {
+ const symmTensorField& KWall =
+ patch_.lookupPatchField<volSymmTensorField, scalar>(KName_);
+
+ vectorField n = patch_.nf();
+
+ return n & KWall & n;
+ }
+ else
+ {
+ FatalErrorIn("temperatureCoupledBase::K() const")
+ << "Did not find field " << KName_
+ << " on mesh " << mesh.name() << " patch " << patch_.name()
+ << endl
+ << "Please set 'K' to one of " << KMethodTypeNames_.toc()
+ << " and 'KName' to the name of the volScalar"
+ << " or volSymmTensor field (if K=lookup)"
+ << exit(FatalError);
+
+ return scalarField(0);
+ }
+ }
+
+ default:
+ {
+ FatalErrorIn("temperatureCoupledBase::K() const")
+ << "Unimplemented method " << method_ << endl
+ << "Please set 'K' to one of " << KMethodTypeNames_.toc()
+ << " and 'KName' to the name of the volScalar"
+ << " or volSymmTensor field (if K=lookup)"
+ << exit(FatalError);
+ }
+ break;
+ }
+ return scalarField(0);
+}
+
+
+void Foam::temperatureCoupledBase::write(Ostream& os) const
+{
+ os.writeKeyword("K") << KMethodTypeNames_[method_]
+ << token::END_STATEMENT << nl;
+ os.writeKeyword("KName") << KName_ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
new file mode 100644
index 00000000000..35b4de5e238
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ temperatureCoupledBase
+
+Description
+ Common functions for use in temperature coupled boundaries. For now only
+
+ K() : heat conduction at patch. Gets supplied how to lookup/calculate K:
+
+ - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
+ - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'solidThermo' : use basicSolidThermo K()
+ - 'directionalSolidThermo' directionalK()
+
+SourceFiles
+ temperatureCoupledBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef temperatureCoupledBase_H
+#define temperatureCoupledBase_H
+
+#include "scalarField.H"
+#include "NamedEnum.H"
+#include "fvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class temperatureCoupledBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class temperatureCoupledBase
+{
+public:
+ //- Type of supplied K
+ enum KMethodType
+ {
+ BASICTHERMO,
+ SOLIDTHERMO,
+ DIRECTIONALSOLIDTHERMO,
+ LOOKUP
+ };
+
+//private:
+
+ // Private data
+
+ static const NamedEnum<KMethodType, 4> KMethodTypeNames_;
+
+ //- Underlying patch
+ const fvPatch& patch_;
+
+ //- How to get K
+ const KMethodType method_;
+
+ //- Name of thermal conductivity field (if looked up from database)
+ const word KName_;
+
+
+public:
+
+ // Constructors
+
+ //- Construct from patch and K name
+ temperatureCoupledBase
+ (
+ const fvPatch& patch,
+ const word& calculationMethod,
+ const word& KName
+ );
+
+ //- Construct from patch and dictionary
+ temperatureCoupledBase
+ (
+ const fvPatch& patch,
+ const dictionary& dict
+ );
+
+
+ // Member functions
+
+ //- Method to obtain K
+ word KMethod() const
+ {
+ return KMethodTypeNames_[method_];
+ }
+
+ //- Name of thermal conductivity field
+ const word& KName() const
+ {
+ return KName_;
+ }
+
+ //- Given patch temperature calculate corresponding K field
+ tmp<scalarField> K(const scalarField& Tp) const;
+
+ //- Write
+ void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
--
GitLab
From 8fb546d34dd3afc6d8f74ce1263c600b36ad1264 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 10:59:53 +0100
Subject: [PATCH 66/77] ENH: IOField,IOList : added name printing in error
message.
---
src/OpenFOAM/db/IOobjects/IOField/IOField.C | 12 ++++++++----
src/OpenFOAM/db/IOobjects/IOList/IOList.C | 20 ++++++++++++--------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 4af4f270732..d5a6a8bec2c 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -36,7 +36,8 @@ Foam::IOField<Type>::IOField(const IOobject& io)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOField::IOField(const IOobject&)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ << "IOField " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
" but IOField does not support automatic rereading."
<< endl;
}
@@ -65,7 +66,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const label size)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOField::IOField(const IOobject&, const label)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ << "IOField " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
" but IOField does not support automatic rereading."
<< endl;
}
@@ -98,7 +100,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOField::IOField(const IOobject&, const Field<Type>&)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ << "IOField " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
" but IOField does not support automatic rereading."
<< endl;
}
@@ -133,7 +136,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type> >& f)
WarningIn
(
"IOField::IOField(const IOobject&, const Xfer<Field<Type> >&)"
- ) << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
+ ) << "IOField " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
" but IOField does not support automatic rereading."
<< endl;
}
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 3e9b7856076..ce4a27bc2fb 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -36,8 +36,9 @@ Foam::IOList<T>::IOList(const IOobject& io)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOList::IOList(const IOobject&)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
- " but IOField does not support automatic rereading."
+ << "IOList " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOList does not support automatic rereading."
<< endl;
}
if
@@ -64,8 +65,9 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOList::IOList(const IOobject&, const label)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
- " but IOField does not support automatic rereading."
+ << "IOList " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOList does not support automatic rereading."
<< endl;
}
if
@@ -96,8 +98,9 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("IOList::IOList(const IOobject&, const List<T>&)")
- << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
- " but IOField does not support automatic rereading."
+ << "IOList " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOList does not support automatic rereading."
<< endl;
}
@@ -131,8 +134,9 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T> >& list)
WarningIn
(
"IOList::IOList(const IOobject&, const Xfer<List<T> >&)"
- ) << "IOField constructed with IOobject::MUST_READ_IF_MODIFIED"
- " but IOField does not support automatic rereading."
+ ) << "IOList " << name()
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED"
+ " but IOList does not support automatic rereading."
<< endl;
}
--
GitLab
From 2b88a6829d6f7b1118c32c42176b311bf7d2d895 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:34:12 +0100
Subject: [PATCH 67/77] STYLE: sampledPlane : added comment about calling
update()
---
src/sampling/sampledSurface/sampledPlane/sampledPlane.H | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index b5dc66508e6..5142c631439 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -27,6 +27,8 @@ Class
Description
A sampledSurface defined by a cuttingPlane. Always triangulated.
+ Note: does not actually cut until update() called.
+
SourceFiles
sampledPlane.C
--
GitLab
From 4c3021ba617989859f0bbe88b585dacab9389390 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:38:22 +0100
Subject: [PATCH 68/77] ENH: chtMulti* : adapted to use solidBasicThermo
---
.../chtMultiRegionFoam/Make/options | 2 +
.../chtMultiRegionFoam/chtMultiRegionFoam.C | 1 +
.../chtMultiRegionSimpleFoam/Make/options | 2 +
.../chtMultiRegionSimpleFoam.C | 1 +
.../solid/createSolidFields.H | 76 +-----
.../solid/setRegionSolidFields.H | 16 +-
.../solid/createSolidFields.H | 76 +-----
.../solid/setRegionSolidFields.H | 16 +-
.../solid/solidRegionDiffusionNo.H | 10 +-
src/thermophysicalModels/Allwmake | 4 +
.../chtMultiRegionFoam/multiRegionHeater/0/K | 29 ---
.../chtMultiRegionFoam/multiRegionHeater/0/cp | 29 ---
.../multiRegionHeater/0/rho | 29 ---
.../multiRegionHeater/Allrun | 16 +-
.../heater/solidThermophysicalProperties | 76 ++++++
.../leftSolid/solidThermophysicalProperties | 1 +
.../constant/polyMesh/boundary | 2 +-
.../rightSolid/solidThermophysicalProperties | 1 +
.../multiRegionHeater/makeCellSets.setSet | 5 +
.../system/bottomAir/changeDictionaryDict | 5 +-
.../system/heater/changeDictionaryDict | 46 +---
.../system/leftSolid/changeDictionaryDict | 47 +---
.../system/rightSolid/changeDictionaryDict | 47 +---
.../system/topAir/changeDictionaryDict | 5 +-
.../snappyMultiRegionHeater/0/K | 29 ---
.../snappyMultiRegionHeater/0/cp | 29 ---
.../snappyMultiRegionHeater/0/rho | 29 ---
.../snappyMultiRegionHeater/Allrun | 14 +-
.../constant/bottomAir/RASProperties | 4 +-
.../heater/solidThermophysicalProperties | 76 ++++++
.../leftSolid/solidThermophysicalProperties | 76 ++++++
.../constant/polyMesh/blockMeshDict | 12 +-
.../constant/polyMesh/boundary | 2 +-
.../rightSolid/solidThermophysicalProperties | 76 ++++++
.../constant/topAir/RASProperties | 6 +-
.../constant/topAir/thermophysicalProperties | 2 +-
.../constant/topAir/turbulenceProperties | 2 +-
.../makeCellSets.setSet | 11 -
.../system/bottomAir/changeDictionaryDict | 224 +++--------------
.../system/controlDict | 7 +-
.../system/decomposeParDict | 4 +-
.../system/heater/changeDictionaryDict | 162 ++-----------
.../system/leftSolid/changeDictionaryDict | 138 ++---------
.../system/rightSolid/changeDictionaryDict | 137 ++---------
.../system/topAir/changeDictionaryDict | 225 ++++--------------
45 files changed, 530 insertions(+), 1277 deletions(-)
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index 4cd6539edfb..e7a1103a4fd 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -6,10 +6,12 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel
EXE_LIBS = \
-lbasicThermophysicalModels \
+ -lbasicSolidThermo \
-lspecie \
-lcompressibleRASModels \
-lcompressibleLESModels \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 738319ec100..922b94a8d61 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -37,6 +37,7 @@ Description
#include "regionProperties.H"
#include "compressibleCourantNo.H"
#include "solidRegionDiffNo.H"
+#include "basicSolidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index a97ce0aae4e..16648080799 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -7,6 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude
@@ -14,5 +15,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
+ -lbasicSolidThermo \
-lspecie \
-lcompressibleRASModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
index 927bd8124d8..be93fd01dff 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
@@ -35,6 +35,7 @@ Description
#include "fixedGradientFvPatchFields.H"
#include "regionProperties.H"
#include "compressibleCourantNo.H"
+#include "basicSolidThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
index 8f109a3f829..be13e670c32 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
@@ -1,8 +1,5 @@
// Initialise solid field pointer lists
- PtrList<volScalarField> rhos(solidRegions.size());
- PtrList<volScalarField> cps(solidRegions.size());
- PtrList<volScalarField> Ks(solidRegions.size());
- PtrList<volScalarField> Ts(solidRegions.size());
+ PtrList<basicSolidThermo> thermos(solidRegions.size());
// Populate solid field pointer lists
forAll(solidRegions, i)
@@ -10,75 +7,10 @@
Info<< "*** Reading solid mesh thermophysical properties for region "
<< solidRegions[i].name() << nl << endl;
- Info<< " Adding to rhos\n" << endl;
- rhos.set
+ Info<< " Adding to thermos\n" << endl;
+ thermos.set
(
i,
- new volScalarField
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to cps\n" << endl;
- cps.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "cp",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to Ks\n" << endl;
- Ks.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "K",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to Ts\n" << endl;
- Ts.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "T",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
+ basicSolidThermo::New(solidRegions[i])
);
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
index f9e80e3d723..1e78cc297ae 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
@@ -1,6 +1,14 @@
fvMesh& mesh = solidRegions[i];
+ basicSolidThermo& thermo = thermos[i];
- volScalarField& rho = rhos[i];
- volScalarField& cp = cps[i];
- volScalarField& K = Ks[i];
- volScalarField& T = Ts[i];
+ tmp<volScalarField> trho = thermo.rho();
+ const volScalarField& rho = trho();
+
+ tmp<volScalarField> tcp = thermo.cp();
+ const volScalarField& cp = tcp();
+
+ tmp<volScalarField> tK = thermo.K();
+ //tmp<volSymmTensorField> tK = thermo.directionalK();
+ const volScalarField& K = tK();
+
+ volScalarField& T = thermo.T();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index 8f109a3f829..be13e670c32 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -1,8 +1,5 @@
// Initialise solid field pointer lists
- PtrList<volScalarField> rhos(solidRegions.size());
- PtrList<volScalarField> cps(solidRegions.size());
- PtrList<volScalarField> Ks(solidRegions.size());
- PtrList<volScalarField> Ts(solidRegions.size());
+ PtrList<basicSolidThermo> thermos(solidRegions.size());
// Populate solid field pointer lists
forAll(solidRegions, i)
@@ -10,75 +7,10 @@
Info<< "*** Reading solid mesh thermophysical properties for region "
<< solidRegions[i].name() << nl << endl;
- Info<< " Adding to rhos\n" << endl;
- rhos.set
+ Info<< " Adding to thermos\n" << endl;
+ thermos.set
(
i,
- new volScalarField
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to cps\n" << endl;
- cps.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "cp",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to Ks\n" << endl;
- Ks.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "K",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
- );
-
- Info<< " Adding to Ts\n" << endl;
- Ts.set
- (
- i,
- new volScalarField
- (
- IOobject
- (
- "T",
- runTime.timeName(),
- solidRegions[i],
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- solidRegions[i]
- )
+ basicSolidThermo::New(solidRegions[i])
);
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index f9e80e3d723..1e78cc297ae 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -1,6 +1,14 @@
fvMesh& mesh = solidRegions[i];
+ basicSolidThermo& thermo = thermos[i];
- volScalarField& rho = rhos[i];
- volScalarField& cp = cps[i];
- volScalarField& K = Ks[i];
- volScalarField& T = Ts[i];
+ tmp<volScalarField> trho = thermo.rho();
+ const volScalarField& rho = trho();
+
+ tmp<volScalarField> tcp = thermo.cp();
+ const volScalarField& cp = tcp();
+
+ tmp<volScalarField> tK = thermo.K();
+ //tmp<volSymmTensorField> tK = thermo.directionalK();
+ const volScalarField& K = tK();
+
+ volScalarField& T = thermo.T();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
index 4b09671de2e..77dc6f04bf4 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
@@ -1,15 +1,17 @@
scalar DiNum = -GREAT;
- forAll(solidRegions, regionI)
+ forAll(solidRegions, i)
{
+# include "setRegionSolidFields.H"
+
DiNum = max
(
solidRegionDiffNo
(
- solidRegions[regionI],
+ solidRegions[i],
runTime,
- rhos[regionI]*cps[regionI],
- Ks[regionI]
+ rho*cp,
+ K
),
DiNum
);
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 38f4d54b476..a12ce3ea197 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -18,4 +18,8 @@ wmake libso radiation
wmake libso barotropicCompressibilityModel
wmake libso thermalPorousZone
+# Should be combined with solids&solidMixture
+wmake libso basicSolidThermo
+
+
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
deleted file mode 100644
index 4d9246ebcba..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object K;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 1 -3 -1 0 0 0];
-
-internalField uniform 80;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
deleted file mode 100644
index 853fd78eebb..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object cp;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 -1 0 0 0];
-
-internalField uniform 450;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
deleted file mode 100644
index 8a0910516d8..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object rho;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -3 0 0 0 0 0];
-
-internalField uniform 8000;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 8a25708db64..4a0f42fbe46 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -5,14 +5,8 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-rm -rf constant/polyMesh/sets
-
runApplication blockMesh
runApplication setSet -batch makeCellSets.setSet
-
-rm -f constant/polyMesh/sets/*_old
-
-runApplication setsToZones -noFlipMap
runApplication splitMeshRegions -cellZones -overwrite
# remove fluid fields from solid regions (important for post-processing)
@@ -21,11 +15,11 @@ do
rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U}
done
-# remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
- rm -f 0*/$i/{cp,K,rho}
-done
+## remove solid fields from fluid regions (important for post-processing)
+#for i in bottomAir topAir
+#do
+# rm -f 0*/$i/{cp,K,rho}
+#done
for i in bottomAir topAir heater leftSolid rightSolid
do
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
new file mode 120000
index 00000000000..1da00bc6bdb
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
@@ -0,0 +1 @@
+../heater/solidThermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
index 5bf895b5429..73459cea072 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
new file mode 120000
index 00000000000..1da00bc6bdb
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
@@ -0,0 +1 @@
+../heater/solidThermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
index 84c52f85b36..7e0c2bd5227 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
@@ -1,11 +1,16 @@
cellSet heater new boxToCell (-0.01 0 -100 )(0.01 0.01 100)
cellSet heater add boxToCell (-0.01 -100 -0.01)(0.01 0.01 0.01)
+cellZoneSet heater new setToCellZone heater
cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01 0.01 100)
+cellZoneSet leftSolid new setToCellZone leftSolid
cellSet rightSolid new boxToCell (0.01 0 -100 )(100 0.01 100)
+cellZoneSet rightSolid new setToCellZone rightSolid
cellSet topAir new boxToCell (-100 0.01 -100 )(100 100 100)
+cellZoneSet topAir new setToCellZone topAir
cellSet bottomAir clear
cellSet bottomAir add cellToCell heater
cellSet bottomAir add cellToCell leftSolid
cellSet bottomAir add cellToCell rightSolid
cellSet bottomAir add cellToCell topAir
cellSet bottomAir invert
+cellZoneSet bottomAir new setToCellZone bottomAir
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 949d7d15215..d3fa852bd9b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -55,9 +55,10 @@ dictionaryReplacement
"bottomAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index 20dac9a399e..ac0d8cdbd41 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -45,9 +45,10 @@ dictionaryReplacement
}
"heater_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
minY
@@ -58,47 +59,6 @@ dictionaryReplacement
}
}
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index a9c6ea7f0bc..b3453c48f5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -41,55 +41,14 @@ dictionaryReplacement
}
"leftSolid_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
}
}
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 5fa61a7f8f9..f6822937d8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -41,55 +41,14 @@ dictionaryReplacement
}
"rightSolid_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
}
}
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 1934047abf2..5dc9ca91e63 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -66,9 +66,10 @@ dictionaryReplacement
"topAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
deleted file mode 100644
index 4d9246ebcba..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object K;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 1 -3 -1 0 0 0];
-
-internalField uniform 80;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
deleted file mode 100644
index 853fd78eebb..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object cp;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 -1 0 0 0];
-
-internalField uniform 450;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
deleted file mode 100644
index 8a0910516d8..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object rho;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -3 0 0 0 0 0];
-
-internalField uniform 8000;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index d5e26522226..1bb6bd8b53a 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -9,19 +9,19 @@ rm -rf constant/polyMesh/sets
runApplication blockMesh
runApplication snappyHexMesh -overwrite
-runApplication splitMeshRegions -cellZones
+runApplication splitMeshRegions -cellZones -overwrite
# remove fluid fields from solid regions (important for post-processing)
for i in heater leftSolid rightSolid
do
- rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U}
+ rm -f 0*/$i/{mut,alphat,epsilon,k,p,U}
done
-# remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
- rm -f 0*/$i/{cp,K,rho}
-done
+# No solid fields to remove from fluid regions (important for post-processing)
+#for i in bottomAir topAir
+#do
+# rm -f 0*/$i/{cp,K,rho}
+#done
for i in bottomAir topAir heater leftSolid rightSolid
do
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
index 9f5e8cf39b7..2e7d3413fc1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
@@ -14,9 +14,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel kEpsilon;
+RASModel laminar;
-turbulence off;
+turbulence on;
printCoeffs on;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
index c9a3d6ffbd8..51e6fe0e74d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
convertToMeters 1;
-vertices
+vertices
(
(-0.1 -0.04 -0.05)
( 0.1 -0.04 -0.05)
@@ -28,18 +28,18 @@ vertices
(-0.1 0.04 0.05)
);
-blocks
+blocks
(
hex (0 1 2 3 4 5 6 7) (30 10 10) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-patches
+patches
(
- wall maxY
+ wall maxY
(
(3 7 6 2)
)
@@ -65,7 +65,7 @@ patches
)
);
-mergePatchPairs
+mergePatchPairs
(
);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
index 5a51a318319..591514a953a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
index 9f5e8cf39b7..09a9a55851d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -14,9 +14,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel kEpsilon;
+RASModel laminar;
-turbulence off;
+turbulence on;
printCoeffs on;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index fcb0e7a6a93..ae93c0c12f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
index a8317a372fc..e63bbc50815 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet
deleted file mode 100644
index 84c52f85b36..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet
+++ /dev/null
@@ -1,11 +0,0 @@
-cellSet heater new boxToCell (-0.01 0 -100 )(0.01 0.01 100)
-cellSet heater add boxToCell (-0.01 -100 -0.01)(0.01 0.01 0.01)
-cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01 0.01 100)
-cellSet rightSolid new boxToCell (0.01 0 -100 )(100 0.01 100)
-cellSet topAir new boxToCell (-100 0.01 -100 )(100 100 100)
-cellSet bottomAir clear
-cellSet bottomAir add cellToCell heater
-cellSet bottomAir add cellToCell leftSolid
-cellSet bottomAir add cellToCell rightSolid
-cellSet bottomAir add cellToCell topAir
-cellSet bottomAir invert
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index 4420a87f360..fea74b83155 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -16,52 +16,25 @@ FoamFile
dictionaryReplacement
{
- U
+ boundary
{
- internalField uniform (0 0 0);
- boundaryField
+ minX
{
- minX
- {
- type fixedValue;
- value uniform (0 0 0);
- }
- maxX
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- minY
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- minZ
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- maxZ
- {
- type fixedValue;
- value uniform (0 0 0);
- }
+ type wall;
+ }
+ maxX
+ {
+ type wall;
+ }
+ }
- bottomAir_to_leftSolid
- {
- type fixedValue;
- value uniform (0 0 0);
+ U
+ {
+ internalField uniform (0.01 0 0);
- }
- bottomAir_to_heater
- {
- type fixedValue;
- value uniform (0 0 0);
- }
- bottomAir_to_rightSolid
+ boundaryField
+ {
+ ".*"
{
type fixedValue;
value uniform (0 0 0);
@@ -71,47 +44,21 @@ dictionaryReplacement
T
{
+ internalField uniform 300;
+
boundaryField
{
- minX
- {
- type zeroGradient;
- }
- maxX
- {
- type zeroGradient;
- }
- minY
- {
- type zeroGradient;
- }
- minZ
+ ".*"
{
type zeroGradient;
}
- maxZ
- {
- type zeroGradient;
- }
- bottomAir_to_leftSolid
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- bottomAir_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- bottomAir_to_rightSolid
+
+ "bottomAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
@@ -125,47 +72,9 @@ dictionaryReplacement
boundaryField
{
- minX
- {
- type zeroGradient;
- value uniform 0.01;
- }
- maxX
+ ".*"
{
- type zeroGradient;
- value uniform 0.01;
- }
-
- minY
- {
- type zeroGradient;
- value uniform 0.01;
- }
-
- minZ
- {
- type zeroGradient;
- value uniform 0.01;
- }
- maxZ
- {
- type zeroGradient;
- value uniform 0.01;
- }
-
- bottomAir_to_leftSolid
- {
- type zeroGradient;
- value uniform 0.01;
- }
- bottomAir_to_heater
- {
- type zeroGradient;
- value uniform 0.01;
- }
- bottomAir_to_rightSolid
- {
- type zeroGradient;
+ type compressible::epsilonWallFunction;
value uniform 0.01;
}
}
@@ -174,49 +83,12 @@ dictionaryReplacement
k
{
internalField uniform 0.1;
+
boundaryField
{
- minX
- {
- type zeroGradient;
- value uniform 0.1;
- }
- maxX
- {
- type zeroGradient;
- value uniform 0.1;
- }
-
- minY
- {
- type zeroGradient;
- value uniform 0.1;
- }
-
- minZ
- {
- type zeroGradient;
- value uniform 0.1;
- }
- maxZ
- {
- type zeroGradient;
- value uniform 0.1;
- }
-
- bottomAir_to_leftSolid
- {
- type zeroGradient;
- value uniform 0.1;
- }
- bottomAir_to_heater
+ ".*"
{
- type zeroGradient;
- value uniform 0.1;
- }
- bottomAir_to_rightSolid
- {
- type zeroGradient;
+ type compressible::kqRWallFunction;
value uniform 0.1;
}
}
@@ -224,53 +96,17 @@ dictionaryReplacement
p
{
- internalField uniform 1E5;
+ internalField uniform 100000;
boundaryField
{
- minX
- {
- type buoyantPressure;
- value 1e5;
- }
- maxX
- {
- type buoyantPressure;
- value 1e5;
- }
- minY
- {
- type buoyantPressure;
- value 1e5;
- }
- minZ
- {
- type buoyantPressure;
- value 1e5;
- }
- maxZ
- {
- type buoyantPressure;
- value 1e5;
- }
- bottomAir_to_leftSolid
- {
- type buoyantPressure;
- value 1e5;
- }
- bottomAir_to_heater
- {
- type buoyantPressure;
- value 1e5;
- }
- bottomAir_to_rightSolid
+ ".*"
{
type buoyantPressure;
value 1e5;
}
}
}
-
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index 2f3a0001ef6..cc915cf3252 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
-application snappyHexMesh;
+application chtMultiRegionFoam;
startFrom latestTime;
@@ -30,9 +30,8 @@ endTime 200;
deltaT 0.001;
writeControl adjustableRunTime;
+
writeInterval 50;
-//writeControl timeStep;
-//writeInterval 100;
purgeWrite 0;
@@ -50,6 +49,8 @@ runTimeModifiable true;
maxCo 0.3;
+maxDi 10.0;
+
adjustTimeStep yes;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index d8deb33bf49..14d2b1bfdd5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -22,8 +22,8 @@ numberOfSubdomains 4;
//- Keep owner and neighbour on same processor for faces in zones:
// preserveFaceZones (heater solid1 solid3);
-method scotch;
-// method hierarchical;
+// method scotch;
+method hierarchical;
// method simple;
// method metis;
// method manual;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 282c8e4ca9d..ac0d8cdbd41 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -16,169 +16,49 @@ FoamFile
dictionaryReplacement
{
- T
+ boundary
{
- internalField uniform 300;
-
- boundaryField
+ minY
{
- minY
- {
- type fixedValue;
- value uniform 500;
- }
-
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
-
- heater_to_bottomAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
-
- }
- heater_to_leftSolid
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- heater_to_rightSolid
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- heater_to_topAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
+ type patch;
}
- }
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
+ minZ
{
- minY
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- heater_to_bottomAir
- {
- type zeroGradient;
- }
- heater_to_leftSolid
- {
- type zeroGradient;
- }
- heater_to_rightSolid
- {
- type zeroGradient;
- }
- heater_to_topAir
- {
- type zeroGradient;
- }
+ type patch;
}
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
+ maxZ
{
- minY
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- heater_to_bottomAir
- {
- type zeroGradient;
- }
- heater_to_leftSolid
- {
- type zeroGradient;
- }
- heater_to_rightSolid
- {
- type zeroGradient;
- }
- heater_to_topAir
- {
- type zeroGradient;
- }
+ type patch;
}
}
- cp
+ T
{
- internalField uniform 450;
+ internalField uniform 300;
boundaryField
{
- minY
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- heater_to_bottomAir
- {
- type zeroGradient;
- }
- heater_to_leftSolid
+ ".*"
{
type zeroGradient;
+ value uniform 300;
}
- heater_to_rightSolid
+ "heater_to_.*"
{
- type zeroGradient;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ neighbourFieldName T;
+ K solidThermo;
+ KName none;
+ value uniform 300;
}
- heater_to_topAir
+ minY
{
- type zeroGradient;
+ type fixedValue;
+ value uniform 500;
}
}
}
+
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 4fc8984feca..b3453c48f5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -16,144 +16,36 @@ FoamFile
dictionaryReplacement
{
- T
- {
- internalField uniform 300;
-
- boundaryField
- {
- minX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- leftSolid_to_bottomAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
-
- }
- leftSolid_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- leftSolid_to_topAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- }
- }
-
- rho
+ boundary
{
- internalField uniform 8000;
-
- boundaryField
+ minZ
{
- minX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- leftSolid_to_bottomAir
- {
- type zeroGradient;
- }
- leftSolid_to_heater
- {
- type zeroGradient;
- }
- leftSolid_to_topAir
- {
- type zeroGradient;
- }
+ type patch;
}
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
+ maxZ
{
- minX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- leftSolid_to_bottomAir
- {
- type zeroGradient;
- }
- leftSolid_to_heater
- {
- type zeroGradient;
- }
- leftSolid_to_topAir
- {
- type zeroGradient;
- }
+ type patch;
}
}
- cp
+ T
{
- internalField uniform 450;
+ internalField uniform 300;
boundaryField
{
- minX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- leftSolid_to_bottomAir
- {
- type zeroGradient;
- }
- leftSolid_to_heater
+ ".*"
{
type zeroGradient;
+ value uniform 300;
}
- leftSolid_to_topAir
+ "leftSolid_to_.*"
{
- type zeroGradient;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ neighbourFieldName T;
+ K solidThermo;
+ KName none;
+ value uniform 300;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index dc4fe7b846c..f6822937d8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -16,143 +16,36 @@ FoamFile
dictionaryReplacement
{
- T
+ boundary
{
- internalField uniform 300;
-
- boundaryField
+ minZ
{
- maxX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- rightSolid_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- rightSolid_to_bottomAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- rightSolid_to_topAir
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
+ type patch;
}
- }
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
+ maxZ
{
- maxX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- rightSolid_to_bottomAir
- {
- type zeroGradient;
- }
- rightSolid_to_heater
- {
- type zeroGradient;
- }
- rightSolid_to_topAir
- {
- type zeroGradient;
- }
+ type patch;
}
}
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- maxX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- rightSolid_to_bottomAir
- {
- type zeroGradient;
- }
- rightSolid_to_heater
- {
- type zeroGradient;
- }
- rightSolid_to_topAir
- {
- type zeroGradient;
- }
- }
- }
-
- cp
+ T
{
- internalField uniform 450;
+ internalField uniform 300;
boundaryField
{
- maxX
- {
- type zeroGradient;
- }
- minZ
- {
- type zeroGradient;
- }
- maxZ
- {
- type zeroGradient;
- }
- rightSolid_to_bottomAir
- {
- type zeroGradient;
- }
- rightSolid_to_heater
+ ".*"
{
type zeroGradient;
+ value uniform 300;
}
- rightSolid_to_topAir
+ "rightSolid_to_.*"
{
- type zeroGradient;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
+ neighbourFieldName T;
+ K solidThermo;
+ KName none;
+ value uniform 300;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index a00b3414327..5dc9ca91e63 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -18,52 +18,25 @@ dictionaryReplacement
{
U
{
- internalField uniform ( 0.01 0 0 );
+ internalField uniform (0.01 0 0);
+
boundaryField
{
- minX
- {
- type fixedValue;
- value uniform (0.01 0 0);
- }
- maxX
- {
- type inletOutlet;
- inletValue uniform (0 0 0);
- }
-
- maxY
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- minZ
- {
- type fixedValue;
- value uniform (0 0 0);
- }
- maxZ
+ ".*"
{
type fixedValue;
value uniform (0 0 0);
}
-
- topAir_to_leftSolid
- {
- type fixedValue;
- value uniform (0 0 0);
-
- }
- topAir_to_heater
+ minX
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0.01 0 0 );
}
- topAir_to_rightSolid
+ maxX
{
- type fixedValue;
- value uniform (0 0 0);
+ type inletOutlet;
+ inletValue uniform ( 0 0 0 );
+ value uniform ( 0 0 0 );
}
}
}
@@ -74,11 +47,11 @@ dictionaryReplacement
boundaryField
{
- maxY
+ ".*"
{
- type fixedValue;
- value uniform 300;
+ type zeroGradient;
}
+
minX
{
type fixedValue;
@@ -86,39 +59,17 @@ dictionaryReplacement
}
maxX
{
- type fixedValue;
- value uniform 300;
- }
- minZ
- {
- type fixedValue;
- value uniform 300;
- }
- maxZ
- {
- type fixedValue;
+ type inletOutlet;
+ inletValue uniform 300;
value uniform 300;
}
- topAir_to_leftSolid
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- topAir_to_heater
- {
- type compressible::turbulentTemperatureCoupledBaffle;
- neighbourFieldName T;
- K K;
- value uniform 300;
- }
- topAir_to_rightSolid
+ "topAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
@@ -126,55 +77,25 @@ dictionaryReplacement
epsilon
{
- // Set the value on all bc to non-zero. Not used in simulation
- // since zeroGradient; only used in initialisation.
+ internalField uniform 0.01;
+
boundaryField
{
- minX
+ ".*"
{
- type fixedValue;
- value uniform 0.01;
- }
- maxX
- {
- type zeroGradient;
- value uniform 0.01;
- }
-
- minY
- {
- type zeroGradient;
- value uniform 0.01;
- }
- maxY
- {
- type zeroGradient;
+ type compressible::epsilonWallFunction;
value uniform 0.01;
}
- minZ
- {
- type zeroGradient;
- value uniform 0.01;
- }
- maxZ
- {
- type zeroGradient;
- value uniform 0.01;
- }
- topAir_to_leftSolid
- {
- type zeroGradient;
- value uniform 0.01;
- }
- topAir_to_heater
+ minX
{
- type zeroGradient;
+ type fixedValue;
value uniform 0.01;
}
- topAir_to_rightSolid
+ maxX
{
- type zeroGradient;
+ type inletOutlet;
+ inletValue uniform 0.01;
value uniform 0.01;
}
}
@@ -183,50 +104,24 @@ dictionaryReplacement
k
{
internalField uniform 0.1;
+
boundaryField
{
- minX
- {
- type fixedValue;
- value uniform 0.1;
- }
-
- maxX
- {
- type zeroGradient;
- value uniform 0.1;
- }
-
- maxY
+ ".*"
{
- type zeroGradient;
+ type compressible::kqRWallFunction;
value uniform 0.1;
}
- minZ
- {
- type zeroGradient;
- value uniform 0.1;
- }
- maxZ
- {
- type zeroGradient;
- value uniform 0.1;
- }
-
- topAir_to_leftSolid
- {
- type zeroGradient;
- value uniform 0.1;
- }
- topAir_to_heater
+ minX
{
- type zeroGradient;
+ type fixedValue;
value uniform 0.1;
}
- topAir_to_rightSolid
+ maxX
{
- type zeroGradient;
+ type inletOutlet;
+ inletValue uniform 0.1;
value uniform 0.1;
}
}
@@ -234,59 +129,23 @@ dictionaryReplacement
p
{
- internalField uniform 1E5;
+ internalField uniform 100000;
boundaryField
{
- minX
+ ".*"
{
type buoyantPressure;
value 1e5;
}
+
maxX
{
type waveTransmissive;
- //field p;
- phi phi;
- rho rho;
- psi psi;
- gamma 1.4; // cp/cv
- fieldInf 1e5;
- lInf 0.40; // double length of domain
- value uniform 1e5;
- }
-
- maxY
- {
- type buoyantPressure;
- value 1e5;
- }
-
- minZ
- {
- type buoyantPressure;
- value 1e5;
- }
- maxZ
- {
- type buoyantPressure;
- value 1e5;
- }
-
- topAir_to_leftSolid
- {
- type buoyantPressure;
- value 1e5;
- }
- topAir_to_heater
- {
- type buoyantPressure;
- value 1e5;
- }
- topAir_to_rightSolid
- {
- type buoyantPressure;
- value 1e5;
+ gamma 1.4;
+ fieldInf 100000;
+ lInf 0.4;
+ value uniform 100000;
}
}
}
--
GitLab
From 9544280e658025107b80fa7877cfecb4ab158e95 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:39:16 +0100
Subject: [PATCH 69/77] ENH: Register turbulenceModel with optional name
(default is 'turbulenceModel')
Now instead of looking up RASModel we can lookup turbulenceModel instead.
---
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 5 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.H | 3 +-
.../DeardorffDiffStress/DeardorffDiffStress.C | 5 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 3 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 10 ++-
.../LES/GenEddyVisc/GenEddyVisc.H | 3 +-
.../LES/GenSGSStress/GenSGSStress.C | 6 +-
.../LES/GenSGSStress/GenSGSStress.H | 3 +-
.../compressible/LES/LESModel/LESModel.C | 32 ++++++--
.../compressible/LES/LESModel/LESModel.H | 11 ++-
.../LES/Smagorinsky/Smagorinsky.C | 5 +-
.../LES/Smagorinsky/Smagorinsky.H | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../LES/dynOneEqEddy/dynOneEqEddy.C | 5 +-
.../LES/dynOneEqEddy/dynOneEqEddy.H | 3 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.C | 5 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.H | 3 +-
.../compressible/LES/oneEqEddy/oneEqEddy.C | 5 +-
.../compressible/LES/oneEqEddy/oneEqEddy.H | 3 +-
.../compressible/RAS/LRR/LRR.C | 5 +-
.../compressible/RAS/LRR/LRR.H | 3 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 5 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 3 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 5 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 3 +-
.../compressible/RAS/Make/files | 4 -
.../compressible/RAS/Make/options | 1 +
.../compressible/RAS/RASModel/RASModel.C | 30 ++++++--
.../compressible/RAS/RASModel/RASModel.H | 11 ++-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 5 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 3 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../compressible/RAS/kEpsilon/kEpsilon.C | 5 +-
.../compressible/RAS/kEpsilon/kEpsilon.H | 3 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.C | 5 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.H | 3 +-
.../compressible/RAS/laminar/laminar.C | 5 +-
.../compressible/RAS/laminar/laminar.H | 3 +-
.../RAS/realizableKE/realizableKE.C | 5 +-
.../RAS/realizableKE/realizableKE.H | 3 +-
.../compressible/turbulenceModel/Make/files | 7 ++
.../compressible/turbulenceModel/Make/options | 10 ++-
.../temperatureCoupledBase.C | 24 +++---
.../temperatureCoupledBase.H | 18 ++---
...entHeatFluxTemperatureFvPatchScalarField.C | 23 +++---
...entHeatFluxTemperatureFvPatchScalarField.H | 7 +-
.../regionProperties.C | 0
.../regionProperties.H | 0
...mperatureCoupledBaffleFvPatchScalarField.C | 74 +++----------------
...mperatureCoupledBaffleFvPatchScalarField.H | 16 ++--
...tureCoupledBaffleMixedFvPatchScalarField.C | 74 +++----------------
...tureCoupledBaffleMixedFvPatchScalarField.H | 22 +++---
.../turbulenceModel/laminar/laminar.C | 13 +++-
.../turbulenceModel/laminar/laminar.H | 6 +-
.../turbulenceModel/turbulenceModel.C | 21 +++++-
.../turbulenceModel/turbulenceModel.H | 20 ++++-
.../DeardorffDiffStress/DeardorffDiffStress.C | 5 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 3 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 5 +-
.../LES/GenEddyVisc/GenEddyVisc.H | 3 +-
.../LES/GenSGSStress/GenSGSStress.C | 5 +-
.../LES/GenSGSStress/GenSGSStress.H | 3 +-
.../incompressible/LES/LESModel/LESModel.C | 33 +++++++--
.../incompressible/LES/LESModel/LESModel.H | 11 ++-
.../LES/LRRDiffStress/LRRDiffStress.C | 5 +-
.../LES/LRRDiffStress/LRRDiffStress.H | 3 +-
.../LES/Smagorinsky/Smagorinsky.C | 5 +-
.../LES/Smagorinsky/Smagorinsky.H | 3 +-
.../LES/Smagorinsky2/Smagorinsky2.C | 5 +-
.../LES/Smagorinsky2/Smagorinsky2.H | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 1 +
.../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 5 +-
.../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 3 +-
.../SpalartAllmarasIDDES.C | 5 +-
.../SpalartAllmarasIDDES.H | 3 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.C | 5 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.H | 3 +-
.../LES/dynOneEqEddy/dynOneEqEddy.C | 5 +-
.../LES/dynOneEqEddy/dynOneEqEddy.H | 3 +-
.../LES/dynSmagorinsky/dynSmagorinsky.C | 5 +-
.../LES/dynSmagorinsky/dynSmagorinsky.H | 3 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 3 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.H | 1 +
.../incompressible/LES/laminar/laminar.C | 5 +-
.../incompressible/LES/laminar/laminar.H | 3 +-
.../LES/locDynOneEqEddy/locDynOneEqEddy.C | 5 +-
.../LES/locDynOneEqEddy/locDynOneEqEddy.H | 3 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.C | 5 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.H | 3 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.C | 5 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.H | 3 +-
.../LES/scaleSimilarity/scaleSimilarity.C | 5 +-
.../LES/scaleSimilarity/scaleSimilarity.H | 3 +-
.../LES/spectEddyVisc/spectEddyVisc.C | 5 +-
.../LES/spectEddyVisc/spectEddyVisc.H | 3 +-
.../incompressible/RAS/LRR/LRR.C | 5 +-
.../incompressible/RAS/LRR/LRR.H | 3 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.C | 5 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.H | 3 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 5 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 3 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 5 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 3 +-
.../RAS/LienCubicKE/LienCubicKE.C | 5 +-
.../RAS/LienCubicKE/LienCubicKE.H | 3 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 5 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.H | 3 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 5 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.H | 3 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.C | 5 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.H | 3 +-
.../incompressible/RAS/RASModel/RASModel.C | 33 +++++++--
.../incompressible/RAS/RASModel/RASModel.H | 11 ++-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 5 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 3 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../incompressible/RAS/kEpsilon/kEpsilon.C | 5 +-
.../incompressible/RAS/kEpsilon/kEpsilon.H | 3 +-
.../incompressible/RAS/kOmega/kOmega.C | 5 +-
.../incompressible/RAS/kOmega/kOmega.H | 3 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.C | 5 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.H | 3 +-
.../incompressible/RAS/laminar/laminar.C | 5 +-
.../incompressible/RAS/laminar/laminar.H | 3 +-
.../incompressible/RAS/qZeta/qZeta.C | 5 +-
.../incompressible/RAS/qZeta/qZeta.H | 3 +-
.../RAS/realizableKE/realizableKE.C | 5 +-
.../RAS/realizableKE/realizableKE.H | 3 +-
.../turbulenceModel/laminar/laminar.C | 14 +++-
.../turbulenceModel/laminar/laminar.H | 7 +-
.../turbulenceModel/turbulenceModel.C | 24 +++++-
.../turbulenceModel/turbulenceModel.H | 19 ++++-
136 files changed, 586 insertions(+), 412 deletions(-)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C (88%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H (87%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C (92%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H (96%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C (100%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H (100%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C (82%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H (93%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C (79%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H (91%)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 39c2158ddaa..7cc76e0f8d0 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -50,10 +50,11 @@ PDRkEpsilon::PDRkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 483c7257dc6..c5e641012cc 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -112,7 +112,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index bfbff460d8f..0ae14cbcfa8 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -60,10 +60,11 @@ DeardorffDiffStress::DeardorffDiffStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
GenSGSStress(rho, U, phi, thermoPhysicalModel),
ck_
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 308f8ca669c..5400e8cf004 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index d379ce27512..9d00a040d2e 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -41,12 +41,18 @@ GenEddyVisc::GenEddyVisc
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
LESModel
(
- word("GenEddyVisc"), rho, U, phi, thermoPhysicalModel
+ word("GenEddyVisc"),
+ rho,
+ U,
+ phi,
+ thermoPhysicalModel,
+ turbulenceModelName
),
ce_
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
index d27132c0008..7fa5fb056e0 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -90,7 +90,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index bd70457c9f2..eeff8aa1c9e 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -41,7 +41,8 @@ GenSGSStress::GenSGSStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
LESModel
@@ -50,7 +51,8 @@ GenSGSStress::GenSGSStress
rho,
U,
phi,
- thermoPhysicalModel
+ thermoPhysicalModel,
+ turbulenceModelName
),
ce_
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 0eaedf16a2a..0ebcce8408b 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -90,7 +90,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index bf1f726c32c..1933b0b68c2 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -58,10 +58,11 @@ LESModel::LESModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermoPhysicalModel),
+ turbulenceModel(rho, U, phi, thermoPhysicalModel, turbulenceModelName),
IOdictionary
(
@@ -97,7 +98,8 @@ autoPtr<LESModel> LESModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -129,9 +131,11 @@ autoPtr<LESModel> LESModel::New
(
"LESModel::New"
"("
+ "const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "const basicThermo&"
+ "const basicThermo&, "
+ "const word&"
")"
) << "Unknown LESModel type "
<< modelType << nl << nl
@@ -140,7 +144,10 @@ autoPtr<LESModel> LESModel::New
<< exit(FatalError);
}
- return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
+ return autoPtr<LESModel>
+ (
+ cstrIter()(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
+ );
}
@@ -160,7 +167,20 @@ void LESModel::correct()
bool LESModel::read()
{
- if (regIOobject::read())
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject (from the turbulenceModel). Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
{
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index a1a05c83db2..a4fd1a3246f 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -121,9 +121,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -136,7 +137,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -148,7 +150,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index d525ab2513d..8370b5e50b4 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -68,10 +68,11 @@ Smagorinsky::Smagorinsky
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
GenEddyVisc(rho, U, phi, thermoPhysicalModel),
ck_
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
index 88f943366c2..4ef0452cfc6 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
@@ -96,7 +96,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 1ca27f56f6e..fbe4bfa1af5 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -106,10 +106,11 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
index b3f2f5692f7..17949151df2 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -111,7 +111,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 80b6cd6928e..b3beef1246c 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -90,10 +90,11 @@ dynOneEqEddy::dynOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
GenEddyVisc(rho, U, phi, thermoPhysicalModel),
filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 6685160e8f2..d2546bf4e20 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -107,7 +107,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index 8c5cd799672..48e89e77929 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -63,10 +63,11 @@ lowReOneEqEddy::lowReOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
GenEddyVisc(rho, U, phi, thermoPhysicalModel),
ck_
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
index babd2fdde15..693b80adcea 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
@@ -98,7 +98,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index 961ffed4dfa..593ba56a69a 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -59,10 +59,11 @@ oneEqEddy::oneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
GenEddyVisc(rho, U, phi, thermoPhysicalModel),
ck_
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index ac83307700e..de962849324 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index a67a4978515..0b0efbb58b6 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -50,10 +50,11 @@ LRR::LRR
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
index e1241528d6d..d9394d2f3ad 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
@@ -116,7 +116,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 43103326a96..1a4ebdbf63a 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -50,10 +50,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index e9343bec598..9a9f81ccd4c 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -125,7 +125,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index b7d12e08230..455b65f48f3 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -65,10 +65,11 @@ LaunderSharmaKE::LaunderSharmaKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index ce85709cfea..c2952c3b4d1 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -109,7 +109,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index 4301cde4259..ccfc9b6b27a 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -35,12 +35,8 @@ kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
/* Patch fields */
-derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
index b2b75c89904..0e3ec0f8fbe 100644
--- a/src/turbulenceModels/compressible/RAS/Make/options
+++ b/src/turbulenceModels/compressible/RAS/Make/options
@@ -1,6 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 64594ff010e..b0d48870d1f 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -59,10 +59,11 @@ RASModel::RASModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermophysicalModel),
+ turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName),
IOdictionary
(
@@ -103,7 +104,8 @@ autoPtr<RASModel> RASModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -138,7 +140,8 @@ autoPtr<RASModel> RASModel::New
"const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "basicThermo&"
+ "basicThermo&, "
+ "const word&"
")"
) << "Unknown RASModel type "
<< modelType << nl << nl
@@ -149,7 +152,7 @@ autoPtr<RASModel> RASModel::New
return autoPtr<RASModel>
(
- cstrIter()(rho, U, phi, thermophysicalModel)
+ cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
);
}
@@ -212,7 +215,22 @@ void RASModel::correct()
bool RASModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
lookup("turbulence") >> turbulence_;
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 331f86457ad..fd55a3b671f 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -134,9 +134,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -149,7 +150,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -161,7 +163,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 3aa82622fb8..44c5c0fbc11 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -49,10 +49,11 @@ RNGkEpsilon::RNGkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 43b39a7ac12..c0baeb01e88 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -105,7 +105,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 821f2cdb207..ce16b21445c 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -109,10 +109,11 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 8164624bddc..c29146f1b91 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -146,7 +146,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 023cf7d9b6f..efc93ab95ee 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -49,10 +49,11 @@ kEpsilon::kEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
index ca00c5d267b..9269be0620f 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index b7644b3d543..d0c7b9b5177 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -92,10 +92,11 @@ kOmegaSST::kOmegaSST
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
alphaK1_
(
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
index 0ee1502aa9e..240a3bb99d9 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -184,7 +184,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
index 6467eba7a02..f0069c4e9a1 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
@@ -47,10 +47,11 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel)
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
index 5543d532a14..c465fc9a4ae 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
@@ -68,7 +68,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 9a1c2a405c8..4490a43506f 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -90,10 +90,11 @@ realizableKE::realizableKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
index ab86cd0015b..45332c79881 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
@@ -123,7 +123,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
index 3f01b203540..8bd26ec944e 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/files
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files
@@ -1,4 +1,11 @@
turbulenceModel.C
laminar/laminar.C
+derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
+
+
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
index 075a03796ee..1a60c8b98c6 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/options
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options
@@ -1,8 +1,14 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude
LIB_LIBS = \
- -lfiniteVolume
+ -lbasicSolidThermo \
+ -lbasicThermophysicalModels \
+ -lspecie \
+ -lfiniteVolume \
+ -lmeshTools
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
similarity index 88%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 1026ca123cb..3fe205f4562 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -2,16 +2,16 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,15 +19,14 @@ License
for more details.
You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "temperatureCoupledBase.H"
#include "volFields.H"
#include "basicSolidThermo.H"
-#include "RASModel.H"
+#include "turbulenceModel.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
@@ -87,11 +86,14 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
{
case BASICTHERMO:
{
- const compressible::RASModel& model =
- mesh.lookupObject<compressible::RASModel>("RASProperties");
+ const compressible::turbulenceModel& model =
+ mesh.lookupObject<compressible::turbulenceModel>
+ (
+ "turbulenceModel"
+ );
return
- model.alphaEff(patch_.index())
+ model.alphaEff()().boundaryField()[patch_.index()]
*model.thermo().Cp(Tp, patch_.index());
}
break;
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
similarity index 87%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 35b4de5e238..57ed78cefa5 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -2,16 +2,16 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
temperatureCoupledBase
@@ -31,7 +30,8 @@ Description
K() : heat conduction at patch. Gets supplied how to lookup/calculate K:
- 'lookup' : lookup volScalarField (or volSymmTensorField) with name
- - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'basicThermo' : use basicThermo and default compressible::turbulenceModel
+ to calculate K
- 'solidThermo' : use basicSolidThermo K()
- 'directionalSolidThermo' directionalK()
@@ -68,7 +68,7 @@ public:
LOOKUP
};
-//private:
+private:
// Private data
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index f529a8caf1c..4b2a0c20b95 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -27,7 +27,6 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,6 +61,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(p, iF),
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
heatSource_(hsPower),
q_(p.size(), 0.0)
{}
@@ -77,6 +77,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
heatSource_(ptf.heatSource_),
q_(ptf.q_, mapper)
{}
@@ -91,6 +92,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(p, iF),
+ temperatureCoupledBase(patch(), dict),
heatSource_(heatSourceTypeNames_.read(dict.lookup("heatSource"))),
q_("q", dict, p.size())
{
@@ -106,6 +108,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(thftpsf),
+ temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
heatSource_(thftpsf.heatSource_),
q_(thftpsf.q_)
{}
@@ -119,6 +122,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(thftpsf, iF),
+ temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
heatSource_(thftpsf.heatSource_),
q_(thftpsf.q_)
{}
@@ -161,27 +165,19 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
return;
}
- const label patchI = patch().index();
-
- const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalarField alphaEffp = rasModel.alphaEff(patchI);
-
const scalarField& Tp = *this;
- const scalarField Cpp = rasModel.thermo().Cp(Tp, patchI);
-
switch (heatSource_)
{
case hsPower:
{
const scalar Ap = gSum(patch().magSf());
- gradient() = q_/(Ap*Cpp*alphaEffp);
+ gradient() = q_/(Ap*K(Tp));
break;
}
case hsFlux:
{
- gradient() = q_/(Cpp*alphaEffp);
+ gradient() = q_/K(Tp);
break;
}
default:
@@ -208,12 +204,11 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fixedGradientFvPatchScalarField::write(os);
os.writeKeyword("heatSource") << heatSourceTypeNames_[heatSource_]
<< token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
q_.writeEntry("q", os);
- gradient().writeEntry("gradient", os);
- writeEntry("value", os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
similarity index 96%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index d40ec1ab7c8..8d9024daf73 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -36,6 +36,7 @@ Description
type compressible::turbulentHeatFluxTemperature;
heatSource flux; // power [W]; flux [W/m2]
q uniform 10; // heat power or flux
+ K basicThermo; // calculate K by alphaEff*thermo.Cp
value uniform 300; // initial temperature value
}
@@ -48,9 +49,8 @@ SourceFiles
#ifndef turbulentHeatFluxTemperatureFvPatchScalarFields_H
#define turbulentHeatFluxTemperatureFvPatchScalarFields_H
-#include "fvPatchFields.H"
#include "fixedGradientFvPatchFields.H"
-#include "NamedEnum.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,8 @@ namespace compressible
class turbulentHeatFluxTemperatureFvPatchScalarField
:
- public fixedGradientFvPatchScalarField
+ public fixedGradientFvPatchScalarField,
+ public temperatureCoupledBase
{
public:
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
index 381b24ae0c0..9dc81a1f44f 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -29,8 +29,6 @@ License
#include "volFields.H"
#include "directMappedPatchBase.H"
#include "regionProperties.H"
-#include "basicThermo.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -111,8 +109,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF),
- neighbourFieldName_("undefined-neighbourFieldName"),
- KName_("undefined-K")
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
+ neighbourFieldName_("undefined-neighbourFieldName")
{}
@@ -126,8 +124,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
- neighbourFieldName_(ptf.neighbourFieldName_),
- KName_(ptf.KName_)
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+ neighbourFieldName_(ptf.neighbourFieldName_)
{}
@@ -140,8 +138,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- neighbourFieldName_(dict.lookup("neighbourFieldName")),
- KName_(dict.lookup("K"))
+ temperatureCoupledBase(patch(), dict),
+ neighbourFieldName_(dict.lookup("neighbourFieldName"))
{
if (!isA<directMappedPatchBase>(this->patch().patch()))
{
@@ -172,61 +170,13 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(wtcsf, iF),
- neighbourFieldName_(wtcsf.neighbourFieldName_),
- KName_(wtcsf.KName_)
+ temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()),
+ neighbourFieldName_(wtcsf.neighbourFieldName_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::scalarField>
-Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
-{
- const fvMesh& mesh = patch().boundaryMesh().mesh();
-
- if (KName_ == "none")
- {
- const compressible::RASModel& model =
- db().lookupObject<compressible::RASModel>("RASProperties");
-
- tmp<volScalarField> talpha = model.alphaEff();
-
- const basicThermo& thermo =
- db().lookupObject<basicThermo>("thermophysicalProperties");
-
- return
- talpha().boundaryField()[patch().index()]
- *thermo.Cp()().boundaryField()[patch().index()];
- }
- else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
- {
- return patch().lookupPatchField<volScalarField, scalar>(KName_);
- }
- else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
- {
- const symmTensorField& KWall =
- patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
-
- vectorField n = patch().nf();
-
- return n & KWall & n;
- }
- else
- {
- FatalErrorIn
- (
- "turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const"
- ) << "Did not find field " << KName_
- << " on mesh " << mesh.name() << " patch " << patch().name()
- << endl
- << "Please set 'K' to 'none', a valid volScalarField"
- << " or a valid volSymmTensorField." << exit(FatalError);
-
- return scalarField(0);
- }
-}
-
-
void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
{
if (updated())
@@ -283,7 +233,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
mapDistribute::distribute
(
Pstream::defaultCommsType,
@@ -294,7 +244,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
nbrKDelta
);
- tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+ tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
// Calculate common wall temperature. Reuse *this to store common value.
scalarField Twall
@@ -326,7 +276,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
// (*this-intFld())
// * patch().deltaCoeffs();
- scalar Q = gSum(K()*patch().magSf()*snGrad());
+ scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
@@ -354,7 +304,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::write
fixedValueFvPatchScalarField::write(os);
os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
<< token::END_STATEMENT << nl;
- os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
similarity index 93%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
index 2128c39d211..5236f5f9422 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
@@ -37,14 +37,14 @@ Description
{
type compressible::turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
- K K; // or none
+ K lookup;
+ KName K; // or none
value uniform 300;
}
Needs to be on underlying directMapped(Wall)FvPatch.
- Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
- the solver to calculate a 'K' field.
+ Note: see temperatureCoupledBase on ways to specify K.
Note: runs in parallel with arbitrary decomposition. Uses directMapped
functionality to calculate exchange.
@@ -64,6 +64,7 @@ SourceFiles
#define turbulentTemperatureCoupledBaffleFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,16 +77,14 @@ namespace Foam
class turbulentTemperatureCoupledBaffleFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public fixedValueFvPatchScalarField,
+ public temperatureCoupledBase
{
// Private data
//- Name of field on the neighbour region
const word neighbourFieldName_;
- //- Name of thermal conductivity field
- const word KName_;
-
// Private Member Functions
@@ -161,9 +160,6 @@ public:
// Member functions
- //- Get corresponding K field
- tmp<scalarField> K() const;
-
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
similarity index 79%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 278320f2531..e159c15df2b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -28,9 +28,6 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "directMappedPatchBase.H"
-#include "regionProperties.H"
-#include "basicThermo.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,8 +49,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- neighbourFieldName_("undefined-neighbourFieldName"),
- KName_("undefined-K")
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
+ neighbourFieldName_("undefined-neighbourFieldName")
{
this->refValue() = 0.0;
this->refGrad() = 0.0;
@@ -71,8 +68,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
- neighbourFieldName_(ptf.neighbourFieldName_),
- KName_(ptf.KName_)
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+ neighbourFieldName_(ptf.neighbourFieldName_)
{}
@@ -85,8 +82,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- neighbourFieldName_(dict.lookup("neighbourFieldName")),
- KName_(dict.lookup("K"))
+ temperatureCoupledBase(patch(), dict),
+ neighbourFieldName_(dict.lookup("neighbourFieldName"))
{
if (!isA<directMappedPatchBase>(this->patch().patch()))
{
@@ -134,60 +131,13 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(wtcsf, iF),
- neighbourFieldName_(wtcsf.neighbourFieldName_),
- KName_(wtcsf.KName_)
+ temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()),
+ neighbourFieldName_(wtcsf.neighbourFieldName_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-tmp<scalarField>
-turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K() const
-{
- const fvMesh& mesh = patch().boundaryMesh().mesh();
-
- if (KName_ == "none")
- {
- const compressible::RASModel& model =
- db().lookupObject<compressible::RASModel>("RASProperties");
-
- const basicThermo& thermo =
- db().lookupObject<basicThermo>("thermophysicalProperties");
-
- return
- model.alphaEff()().boundaryField()[patch().index()]
- *thermo.Cp()().boundaryField()[patch().index()];
- }
- else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
- {
- return patch().lookupPatchField<volScalarField, scalar>(KName_);
- }
- else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
- {
- const symmTensorField& KWall =
- patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
-
- vectorField n = patch().nf();
-
- return n & KWall & n;
- }
- else
- {
- FatalErrorIn
- (
- "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K()"
- " const"
- ) << "Did not find field " << KName_
- << " on mesh " << mesh.name() << " patch " << patch().name()
- << endl
- << "Please set 'K' to 'none', a valid volScalarField"
- << " or a valid volSymmTensorField." << exit(FatalError);
-
- return scalarField(0);
- }
-}
-
-
void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
{
if (updated())
@@ -240,7 +190,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
mapDistribute::distribute
(
Pstream::defaultCommsType,
@@ -251,7 +201,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
nbrKDelta
);
- tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+ tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
// Both sides agree on
@@ -281,7 +231,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
if (debug)
{
- scalar Q = gSum(K()*patch().magSf()*snGrad());
+ scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
@@ -307,7 +257,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
mixedFvPatchScalarField::write(os);
os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
<< token::END_STATEMENT << nl;
- os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
similarity index 91%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index 72ee4daf160..3561c957040 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -38,14 +38,18 @@ Description
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K; // or none
+ K lookup;
+ KName K;
value uniform 300;
}
Needs to be on underlying directMapped(Wall)FvPatch.
- Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
- the solver to calculate a 'K' field.
+ Note: K : heat conduction at patch. Gets supplied how to lookup/calculate K:
+ - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
+ - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'solidThermo' : use basicSolidThermo K()
+ - 'directionalSolidThermo' directionalK()
Note: runs in parallel with arbitrary decomposition. Uses directMapped
functionality to calculate exchange.
@@ -64,9 +68,8 @@ SourceFiles
#ifndef turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
#define turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
-//#include "fvPatchFields.H"
#include "mixedFvPatchFields.H"
-//#include "fvPatch.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,16 +84,14 @@ namespace compressible
class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
:
- public mixedFvPatchScalarField
+ public mixedFvPatchScalarField,
+ public temperatureCoupledBase
{
// Private data
//- Name of field on the neighbour region
const word neighbourFieldName_;
- //- Name of thermal conductivity field
- const word KName_;
-
public:
@@ -164,9 +165,6 @@ public:
// Member functions
- //- Get corresponding K field
- tmp<scalarField> K() const;
-
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
index a8a625e71d2..79432eecb69 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -51,10 +51,11 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermophysicalModel)
+ turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName)
{}
@@ -65,10 +66,14 @@ autoPtr<laminar> laminar::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
- return autoPtr<laminar>(new laminar(rho, U, phi, thermophysicalModel));
+ return autoPtr<laminar>
+ (
+ new laminar(rho, U, phi, thermophysicalModel, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
index 67296b79505..666d7bf7762 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
@@ -66,7 +66,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -78,7 +79,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index da27aa55ec9..46ba3145041 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -47,9 +47,21 @@ turbulenceModel::turbulenceModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
+ regIOobject
+ (
+ IOobject
+ (
+ turbulenceModelName,
+ U.time().constant(),
+ U.db(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ )
+ ),
runTime_(U.time()),
mesh_(U.mesh()),
@@ -67,7 +79,8 @@ autoPtr<turbulenceModel> turbulenceModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -99,7 +112,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
"turbulenceModel::New(const volScalarField&, "
"const volVectorField&, const surfaceScalarField&, "
- "basicThermo&)"
+ "basicThermo&, const word&)"
) << "Unknown turbulenceModel type "
<< modelType << nl << nl
<< "Valid turbulenceModel types:" << endl
@@ -109,7 +122,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
return autoPtr<turbulenceModel>
(
- cstrIter()(rho, U, phi, thermophysicalModel)
+ cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
);
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
index 420b24f680d..3f0f763783d 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -68,6 +68,8 @@ namespace compressible
\*---------------------------------------------------------------------------*/
class turbulenceModel
+:
+ public regIOobject
{
protected:
@@ -112,9 +114,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -126,7 +129,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = typeName
);
@@ -138,7 +142,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = typeName
);
@@ -224,6 +229,13 @@ public:
//- Read LESProperties or RASProperties dictionary
virtual bool read() = 0;
+
+ //- Default dummy write function
+ virtual bool writeData(Ostream&) const
+ {
+ return true;
+ }
+
};
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index fd5f421aa96..67840e4bcbd 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -55,10 +55,11 @@ DeardorffDiffStress::DeardorffDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenSGSStress(U, phi, transport),
ck_
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 43c8c5425aa..e3fb0e13dd7 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index 4e44ed284f8..b479e7bdf1a 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -40,10 +40,11 @@ GenEddyVisc::GenEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(word("GenEddyVisc"), U, phi, transport),
+ LESModel(word("GenEddyVisc"), U, phi, transport, turbulenceModelName),
ce_
(
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
index 3a30dbf22b3..44bea7082b5 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -81,7 +81,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
index f8e04ecd47d..f75d2d68eca 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
@@ -40,10 +40,11 @@ GenSGSStress::GenSGSStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(word("GenSGSStress"), U, phi, transport),
+ LESModel(word("GenSGSStress"), U, phi, transport, turbulenceModelName),
ce_
(
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
index 4a977b1c34e..1cb78c415ef 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
@@ -85,7 +85,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 1246bdc801b..530c9549f19 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -57,10 +57,11 @@ LESModel::LESModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- turbulenceModel(U, phi, transport),
+ turbulenceModel(U, phi, transport, turbulenceModelName),
IOdictionary
(
@@ -94,7 +95,8 @@ autoPtr<LESModel> LESModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -128,7 +130,8 @@ autoPtr<LESModel> LESModel::New
"("
"const volVectorField&, "
"const surfaceScalarField& ,"
- "transportModel&"
+ "transportModel&, "
+ "const word&"
")"
) << "Unknown LESModel type "
<< modelType << nl << nl
@@ -137,7 +140,10 @@ autoPtr<LESModel> LESModel::New
<< exit(FatalError);
}
- return autoPtr<LESModel>(cstrIter()(U, phi, transport));
+ return autoPtr<LESModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
@@ -158,7 +164,22 @@ void LESModel::correct()
bool LESModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
{
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 0d16f7e784c..eafb352fb2c 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -120,9 +120,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -134,7 +135,8 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -145,7 +147,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
index 59b160e317d..2b1e589bcbf 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
@@ -55,10 +55,11 @@ LRRDiffStress::LRRDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenSGSStress(U, phi, transport),
ck_
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
index b780a01e072..f149913d034 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
index 660c2df1895..6aa639ccf1d 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
@@ -55,10 +55,11 @@ Smagorinsky::Smagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
ck_
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
index 2be97332569..469c49f2476 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
@@ -96,7 +96,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index ee1391dc83a..ba03035bdf8 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -46,10 +46,11 @@ Smagorinsky2::Smagorinsky2
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
Smagorinsky(U, phi, transport),
cD2_
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
index 1cbc1067ba4..1bb1e16e027 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
@@ -93,7 +93,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 8f0885139e4..b4e2ca3da89 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -149,10 +149,11 @@ SpalartAllmaras::SpalartAllmaras
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName,
const word& modelName
)
:
- LESModel(modelName, U, phi, transport),
+ LESModel(modelName, U, phi, transport, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index c7b93f95152..d2861d3a4c5 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -138,6 +138,7 @@ public:
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index 9d448f777ef..414ce5558b0 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -93,10 +93,11 @@ SpalartAllmarasDDES::SpalartAllmarasDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- SpalartAllmaras(U, phi, transport, typeName)
+ SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName)
{}
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index 7ae6df7ba42..77cdc5e95d1 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -95,7 +95,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 884fcc96d5f..a6a9d326581 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -143,10 +143,11 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- SpalartAllmaras(U, phi, transport, typeName),
+ SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName),
fwStar_
(
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index a241d2a05c3..9225f4791c8 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -104,7 +104,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
index a98b4be0550..4e1e4094352 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
@@ -46,10 +46,11 @@ dynMixedSmagorinsky::dynMixedSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
scaleSimilarity(U, phi, transport),
dynSmagorinsky(U, phi, transport)
{
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 0ae54425e03..be742b8bde7 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 2c78f83eeeb..89849140ae5 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -104,10 +104,11 @@ dynOneEqEddy::dynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
k_
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 6aec69cd557..2504778f13d 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -110,7 +110,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
index 9e1a260d4ee..1832b461a38 100644
--- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
@@ -95,10 +95,11 @@ dynSmagorinsky::dynSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
k_
diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
index 33eebd6d129..d7c0356aee6 100644
--- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
@@ -119,7 +119,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index 36e3605c923..25aaf37ef40 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -121,10 +121,11 @@ kOmegaSSTSAS::kOmegaSSTSAS
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName,
const word& modelName
)
:
- LESModel(modelName, U, phi, transport),
+ LESModel(modelName, U, phi, transport, turbulenceModelName),
alphaK1_
(
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index 31e454145bd..8a27d515a22 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -183,6 +183,7 @@ public:
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
index ae8bc9ddc4c..a7e54b14af9 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
@@ -47,10 +47,11 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport)
+ LESModel(typeName, U, phi, transport, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
index addec386a3b..cdc2e00c88f 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
@@ -76,7 +76,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
index 0d0e52524ee..ab1d090a772 100644
--- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
@@ -95,10 +95,11 @@ locDynOneEqEddy::locDynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
k_
diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
index fe5ae52ddac..3dbfa514d22 100644
--- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
@@ -132,7 +132,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
index 15de0f53ad9..a2b40f0722f 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
@@ -46,10 +46,11 @@ mixedSmagorinsky::mixedSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
scaleSimilarity(U, phi, transport),
Smagorinsky(U, phi, transport)
{
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
index da6506d2b09..ffb54f3e778 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index 4d360140f74..235a48f1d29 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
@@ -56,10 +56,11 @@ oneEqEddy::oneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
k_
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
index cdb58e8bff5..71e389a99e7 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
index 4e406cfbf7d..6b1526d0ece 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
@@ -44,10 +44,11 @@ scaleSimilarity::scaleSimilarity
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
filter_(filterPtr_())
{
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
index 7911d7b237d..95aa681ab32 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
@@ -84,7 +84,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index 3369845aa13..694b93f57f7 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -65,10 +65,11 @@ spectEddyVisc::spectEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
cB_
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
index 615abaa6e50..d8bfdd9b0cd 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
@@ -104,7 +104,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 1463556ca27..32733b9a2d1 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -49,10 +49,11 @@ LRR::LRR
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index 2b916f182a0..f359fd0f2eb 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -109,7 +109,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 90f9d3dc3d6..4670e24b7a0 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -48,10 +48,11 @@ LamBremhorstKE::LamBremhorstKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index c246518cab9..673c1db7c68 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -86,7 +86,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index b42d67284cb..b8fdf50165a 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -49,10 +49,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 7df7624f820..f6f1153c1d8 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -120,7 +120,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 38c789d3223..f7b50029863 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -64,10 +64,11 @@ LaunderSharmaKE::LaunderSharmaKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 05cfafa5c80..e20f9aaf592 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index eac566e5e52..bc501c1334e 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -48,10 +48,11 @@ LienCubicKE::LienCubicKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index d7c616d50b1..ae6fc56bb20 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 264293e0fad..dd2954d96f9 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -49,10 +49,11 @@ LienCubicKELowRe::LienCubicKELowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index 39420789162..975f2670ccd 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -126,7 +126,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index ba2483529cf..413203d87c2 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -49,10 +49,11 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 0cd19ca629f..096f92a442b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -95,7 +95,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index f5ece338cfe..9424f3fb122 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -47,10 +47,11 @@ NonlinearKEShih::NonlinearKEShih
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index 1ca72f44f43..dc3b31f1d87 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 27e465720fa..2b93114c49f 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -58,10 +58,11 @@ RASModel::RASModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- turbulenceModel(U, phi, transport),
+ turbulenceModel(U, phi, transport, turbulenceModelName),
IOdictionary
(
@@ -101,7 +102,8 @@ autoPtr<RASModel> RASModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -135,7 +137,8 @@ autoPtr<RASModel> RASModel::New
"("
"const volVectorField&, "
"const surfaceScalarField&, "
- "transportModel&"
+ "transportModel&, "
+ "const word&"
")"
) << "Unknown RASModel type "
<< modelType << nl << nl
@@ -144,7 +147,10 @@ autoPtr<RASModel> RASModel::New
<< exit(FatalError);
}
- return autoPtr<RASModel>(cstrIter()(U, phi, transport));
+ return autoPtr<RASModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
@@ -206,7 +212,22 @@ void RASModel::correct()
bool RASModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
lookup("turbulence") >> turbulence_;
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 3fb426e4a20..1485f9516c7 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -131,9 +131,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -145,7 +146,8 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -156,7 +158,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 8ee789e9bdf..e927f484214 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -48,10 +48,11 @@ RNGkEpsilon::RNGkEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index be56746b162..e0d55e02e89 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 3d3b3dd1ee3..1c894f26792 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -106,10 +106,11 @@ SpalartAllmaras::SpalartAllmaras
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 6763149306b..65bae4e6c68 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -144,7 +144,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index b6c407d44d4..0bd74b65caa 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -48,10 +48,11 @@ kEpsilon::kEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index b13666dacfa..0c5139fae0e 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -94,7 +94,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index e4e8b9b0218..c9611790eb9 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -48,10 +48,11 @@ kOmega::kOmega
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index 1027e5eec58..c53dfcb3963 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -108,7 +108,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index d841dd69114..5c502cc1b5d 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -91,10 +91,11 @@ kOmegaSST::kOmegaSST
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
alphaK1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index c233a52e6c6..e03442523ec 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -178,7 +178,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
index ddd04612417..066a68ffa81 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
@@ -46,10 +46,11 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport)
+ RASModel(typeName, U, phi, transport, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
index 8217044927f..34c5120b74d 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
@@ -67,7 +67,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 206db4fdec9..b72ea68054c 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -74,10 +74,11 @@ qZeta::qZeta
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
index c8961d52288..0369f9256c8 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 53b19dd899f..432c74f1435 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -89,10 +89,11 @@ realizableKE::realizableKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index b1495aa6e87..447f022e42a 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -119,7 +119,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
index 01d50d4b220..b36ce1da1e5 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
@@ -50,10 +50,12 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
+
)
:
- turbulenceModel(U, phi, transport)
+ turbulenceModel(U, phi, transport, turbulenceModelName)
{}
@@ -63,10 +65,14 @@ autoPtr<laminar> laminar::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
- return autoPtr<laminar>(new laminar(U, phi, transport));
+ return autoPtr<laminar>
+ (
+ new laminar(U, phi, transport, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
index 6c59eb30e96..affe6165fc0 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
@@ -65,7 +65,9 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
+
);
@@ -76,7 +78,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 79e94c07415..39ee72bf2c4 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -45,9 +45,21 @@ turbulenceModel::turbulenceModel
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
+ regIOobject
+ (
+ IOobject
+ (
+ turbulenceModelName,
+ U.time().constant(),
+ U.db(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ )
+ ),
runTime_(U.time()),
mesh_(U.mesh()),
@@ -63,7 +75,8 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -94,7 +107,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
FatalErrorIn
(
"turbulenceModel::New(const volVectorField&, "
- "const surfaceScalarField&, transportModel&)"
+ "const surfaceScalarField&, transportModel&, const word&)"
) << "Unknown turbulenceModel type "
<< modelType << nl << nl
<< "Valid turbulenceModel types:" << endl
@@ -102,7 +115,10 @@ autoPtr<turbulenceModel> turbulenceModel::New
<< exit(FatalError);
}
- return autoPtr<turbulenceModel>(cstrIter()(U, phi, transport));
+ return autoPtr<turbulenceModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
index c970a650192..40f9321b803 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -67,6 +67,8 @@ namespace incompressible
\*---------------------------------------------------------------------------*/
class turbulenceModel
+:
+ public regIOobject
{
protected:
@@ -109,9 +111,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -122,7 +125,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = typeName
);
@@ -133,7 +137,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = typeName
);
@@ -194,6 +199,12 @@ public:
//- Read LESProperties or RASProperties dictionary
virtual bool read() = 0;
+
+ //- Default dummy write function
+ virtual bool writeData(Ostream&) const
+ {
+ return true;
+ }
};
--
GitLab
From 8b46d0cc680c57a39cb71ca6007cbdb120e4e79d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:55:32 +0100
Subject: [PATCH 70/77] BUG: chtMultiRegionFoam : adapt for basicSolidThermo
---
.../multiRegionHeater/Allrun | 2 +-
.../multiRegionHeater/system/controlDict | 2 +-
.../system/controlDict | 2 +-
.../multiRegionHeater/0/K | 29 -------
.../multiRegionHeater/0/cp | 29 -------
.../multiRegionHeater/0/rho | 29 -------
.../multiRegionHeater/Allrun | 18 ++---
.../heater/solidThermophysicalProperties | 76 +++++++++++++++++++
.../leftSolid/solidThermophysicalProperties | 76 +++++++++++++++++++
.../constant/polyMesh/boundary | 2 +-
.../rightSolid/solidThermophysicalProperties | 76 +++++++++++++++++++
.../multiRegionHeater/makeCellSets.setSet | 5 ++
.../system/bottomAir/changeDictionaryDict | 5 +-
.../multiRegionHeater/system/controlDict | 4 +-
.../system/heater/changeDictionaryDict | 46 +----------
.../system/leftSolid/changeDictionaryDict | 47 +-----------
.../system/rightSolid/changeDictionaryDict | 47 +-----------
.../system/topAir/changeDictionaryDict | 5 +-
18 files changed, 261 insertions(+), 239 deletions(-)
delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 4a0f42fbe46..da52a21b6f4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -12,7 +12,7 @@ runApplication splitMeshRegions -cellZones -overwrite
# remove fluid fields from solid regions (important for post-processing)
for i in heater leftSolid rightSolid
do
- rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U}
+ rm -f 0*/$i/{mut,alphat,epsilon,k,p,U}
done
## remove solid fields from fluid regions (important for post-processing)
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 846a89461bb..f8844db5ce8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
+libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionFoam;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index cc915cf3252..0751139283d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
+libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
application chtMultiRegionFoam;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
deleted file mode 100644
index 4d9246ebcba..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object K;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 1 -3 -1 0 0 0];
-
-internalField uniform 80;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
deleted file mode 100644
index 853fd78eebb..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object cp;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 -1 0 0 0];
-
-internalField uniform 450;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
deleted file mode 100644
index 8a0910516d8..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object rho;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -3 0 0 0 0 0];
-
-internalField uniform 8000;
-
-boundaryField
-{
- ".*"
- {
- type calculated;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun
index 78bae403a80..0ba7339dbc2 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun
@@ -5,27 +5,21 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-rm -rf constant/polyMesh/sets
-
runApplication blockMesh
runApplication setSet -batch makeCellSets.setSet
-
-rm -f constant/polyMesh/sets/*_old
-
-runApplication setsToZones -noFlipMap
runApplication splitMeshRegions -cellZones -overwrite
# remove fluid fields from solid regions (important for post-processing)
for i in heater leftSolid rightSolid
do
- rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U}
+ rm -f 0*/$i/{mut,alphat,epsilon,k,p,U}
done
-# remove solid fields from fluid regions (important for post-processing)
-for i in bottomAir topAir
-do
- rm -f 0*/$i/{cp,K,rho}
-done
+## remove solid fields from fluid regions (important for post-processing)
+#for i in bottomAir topAir
+#do
+# rm -f 0*/$i/{cp,K,rho}
+#done
for i in bottomAir topAir heater leftSolid rightSolid
do
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
index 0ffd003789c..73459cea072 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6.x |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
new file mode 100644
index 00000000000..c27f08c9f16
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.6 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object solidThermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType constSolidThermo;
+//thermoType interpolatedSolidThermo;
+//thermoType directionalSolidThermo;
+
+constSolidThermoCoeffs
+{
+ //- constant properties
+
+ rho rho [1 -3 0 0 0 0 0] 8000;
+ cp cp [0 2 -2 -1 0 0 0] 450;
+ K K [1 1 -3 -1 0 0 0] 80;
+
+ // N/A
+ Hf Hf [0 2 -2 0 0 0 0] 1;
+ emissivity emissivity [0 0 0 0 0 0 0] 1;
+}
+
+
+interpolatedSolidThermoCoeffs
+{
+ //- interpolated properties
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+ KValues (80 40);
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+
+directionalSolidThermoCoeffs
+{
+ //- does interpolation and directional K in coordinate system.
+ // Specify multiple values, one for each temperature. Properties are
+ // interpolated according to the local temperature.
+
+
+ TValues (100 1000);
+ rhoValues (1700 1700);
+ cpValues (1700 1700);
+
+ KValues ((40 40 40) (40 40 40));
+
+ coordinateSystem
+ {
+ origin (-0.000062 0.000019 0.000039);
+ coordinateRotation
+ {
+ type axes;
+ e1 (1 0 0);
+ e3 (-3.1807824E-6 -0.99813473 0.0610505);
+ }
+ }
+
+ HfValues (1 1);
+ emissivityValues (1 1);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/makeCellSets.setSet
index 84c52f85b36..7e0c2bd5227 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/makeCellSets.setSet
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/makeCellSets.setSet
@@ -1,11 +1,16 @@
cellSet heater new boxToCell (-0.01 0 -100 )(0.01 0.01 100)
cellSet heater add boxToCell (-0.01 -100 -0.01)(0.01 0.01 0.01)
+cellZoneSet heater new setToCellZone heater
cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01 0.01 100)
+cellZoneSet leftSolid new setToCellZone leftSolid
cellSet rightSolid new boxToCell (0.01 0 -100 )(100 0.01 100)
+cellZoneSet rightSolid new setToCellZone rightSolid
cellSet topAir new boxToCell (-100 0.01 -100 )(100 100 100)
+cellZoneSet topAir new setToCellZone topAir
cellSet bottomAir clear
cellSet bottomAir add cellToCell heater
cellSet bottomAir add cellToCell leftSolid
cellSet bottomAir add cellToCell rightSolid
cellSet bottomAir add cellToCell topAir
cellSet bottomAir invert
+cellZoneSet bottomAir new setToCellZone bottomAir
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 949d7d15215..d3fa852bd9b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -55,9 +55,10 @@ dictionaryReplacement
"bottomAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
index 9c7f38afcf0..6d3568bdf45 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
@@ -15,7 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application chtMultiRegionSimpleFoam;
+libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
+
+application chtMultiRegionFoam;
startFrom startTime;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
index 20dac9a399e..ac0d8cdbd41 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -45,9 +45,10 @@ dictionaryReplacement
}
"heater_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
minY
@@ -58,47 +59,6 @@ dictionaryReplacement
}
}
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index a9c6ea7f0bc..b3453c48f5c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -41,55 +41,14 @@ dictionaryReplacement
}
"leftSolid_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
}
}
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 5fa61a7f8f9..f6822937d8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -41,55 +41,14 @@ dictionaryReplacement
}
"rightSolid_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K solidThermo;
+ KName none;
value uniform 300;
}
}
}
-
- rho
- {
- internalField uniform 8000;
-
- boundaryField
- {
- ".*"
- {
- type calculated;
- value uniform 8000;
- }
- }
- }
-
- K
- {
- internalField uniform 80;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 80;
- }
- }
- }
-
- cp
- {
- internalField uniform 450;
-
- boundaryField
- {
- ".*"
- {
- type zeroGradient;
- value uniform 450;
- }
- }
- }
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 2b1dbdcf90d..3d573494065 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -66,9 +66,10 @@ dictionaryReplacement
"topAir_to_.*"
{
- type compressible::turbulentTemperatureCoupledBaffle;
+ type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K;
+ K basicThermo;
+ KName none;
value uniform 300;
}
}
--
GitLab
From 6c64f2780a9987551e32d7520c9559c8b5ce4c60 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:56:08 +0100
Subject: [PATCH 71/77] COMP: finiteVolume/Make/options : have explicit
dependency on OpenFOAM
---
src/finiteVolume/Make/options | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options
index b8402e2b986..b91061399ee 100644
--- a/src/finiteVolume/Make/options
+++ b/src/finiteVolume/Make/options
@@ -3,5 +3,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lOpenFOAM \
-ltriSurface \
-lmeshTools
--
GitLab
From fe43a598125ae5530b8cf06f603953b40786753f Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 14 Jun 2010 18:36:38 +0100
Subject: [PATCH 72/77] STYLE: Fixing gibberish description.
---
.../sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
index 6a17da99c92..c068bea3005 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
@@ -25,8 +25,8 @@ Class
Foam::sixDoFRigidBodyMotionConstraints::fixedAxis
Description
- sixDoFRigidBodyMotionConstraint. Axis of body fixed global
- space.
+ sixDoFRigidBodyMotionConstraint. Body may only rotate around
+ an axis fixed in global space.
SourceFiles
fixedAxis.C
--
GitLab
From eba7058067c5371620851098c49e2374be66e9a0 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 15 Jun 2010 13:07:51 +0100
Subject: [PATCH 73/77] Wall-functions: Removed the spurious y+ filter on the
generation term.
---
.../epsilonWallFunctionFvPatchScalarField.C | 21 ++++-------------
.../omegaWallFunctionFvPatchScalarField.C | 23 ++++---------------
.../epsilonWallFunctionFvPatchScalarField.C | 19 ++++-----------
.../omegaWallFunctionFvPatchScalarField.C | 19 ++++-----------
4 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index b0c1390c4b9..5cce898e22b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -221,24 +221,13 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
{
label faceCellI = patch().faceCells()[faceI];
- scalar yPlus =
- Cmu25*y[faceI]*sqrt(k[faceCellI])
- /(muw[faceI]/rhow[faceI]);
-
epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
- if (yPlus > yPlusLam_)
- {
- G[faceCellI] =
- (mutw[faceI] + muw[faceI])
- *magGradUw[faceI]
- *Cmu25*sqrt(k[faceCellI])
- /(kappa_*y[faceI]);
- }
- else
- {
- G[faceCellI] = 0.0;
- }
+ G[faceCellI] =
+ (mutw[faceI] + muw[faceI])
+ *magGradUw[faceI]
+ *Cmu25*sqrt(k[faceCellI])
+ /(kappa_*y[faceI]);
}
fixedInternalValueFvPatchField<scalar>::updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index d8437b07c54..1ab15d336fb 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -223,28 +223,15 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
{
label faceCellI = patch().faceCells()[faceI];
- scalar yPlus =
- Cmu25*y[faceI]*sqrt(k[faceCellI])
- /(muw[faceI]/rhow[faceI]);
-
scalar omegaVis = 6.0*muw[faceI]/(rhow[faceI]*beta1_*sqr(y[faceI]));
-
scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
-
omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
- if (yPlus > yPlusLam_)
- {
- G[faceCellI] =
- (mutw[faceI] + muw[faceI])
- *magGradUw[faceI]
- *Cmu25*sqrt(k[faceCellI])
- /(kappa_*y[faceI]);
- }
- else
- {
- G[faceCellI] = 0.0;
- }
+ G[faceCellI] =
+ (mutw[faceI] + muw[faceI])
+ *magGradUw[faceI]
+ *Cmu25*sqrt(k[faceCellI])
+ /(kappa_*y[faceI]);
}
fixedInternalValueFvPatchField<scalar>::updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index e90118f7998..55a309f8abf 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -214,22 +214,13 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
{
label faceCellI = patch().faceCells()[faceI];
- scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
-
epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
- if (yPlus > yPlusLam_)
- {
- G[faceCellI] =
- (nutw[faceI] + nuw[faceI])
- *magGradUw[faceI]
- *Cmu25*sqrt(k[faceCellI])
- /(kappa_*y[faceI]);
- }
- else
- {
- G[faceCellI] = 0.0;
- }
+ G[faceCellI] =
+ (nutw[faceI] + nuw[faceI])
+ *magGradUw[faceI]
+ *Cmu25*sqrt(k[faceCellI])
+ /(kappa_*y[faceI]);
}
fixedInternalValueFvPatchField<scalar>::updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 51622da14c9..5bd1ab97b10 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -219,26 +219,17 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
{
label faceCellI = patch().faceCells()[faceI];
- scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
-
scalar omegaVis = 6.0*nuw[faceI]/(beta1_*sqr(y[faceI]));
scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
- if (yPlus > yPlusLam_)
- {
- G[faceCellI] =
- (nutw[faceI] + nuw[faceI])
- *magGradUw[faceI]
- *Cmu25*sqrt(k[faceCellI])
- /(kappa_*y[faceI]);
- }
- else
- {
- G[faceCellI] = 0.0;
- }
+ G[faceCellI] =
+ (nutw[faceI] + nuw[faceI])
+ *magGradUw[faceI]
+ *Cmu25*sqrt(k[faceCellI])
+ /(kappa_*y[faceI]);
}
fixedInternalValueFvPatchField<scalar>::updateCoeffs();
--
GitLab
From 399486e9a6f1d681e89fef0f7d7eed3666a44979 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 17 Jun 2010 11:35:14 +0100
Subject: [PATCH 74/77] ENH: Giving sigmaTcRMax field zeroGradient type and
calling correctBOundaryConditions on it and dsmcRhoN.
---
.../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C | 8 +++++++-
.../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H | 14 +++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index e748f72077f..80e0dea37d5 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -28,6 +28,7 @@ License
#include "WallInteractionModel.H"
#include "InflowBoundaryModel.H"
#include "constants.H"
+#include "zeroGradientFvPatchFields.H"
using namespace Foam::constant;
@@ -459,6 +460,8 @@ void Foam::DsmcCloud<ParcelType>::collisions()
reduce(collisionCandidates, sumOp<label>());
+ sigmaTcRMax_.correctBoundaryConditions();
+
if (collisionCandidates)
{
Info<< " Collisions = "
@@ -550,6 +553,8 @@ void Foam::DsmcCloud<ParcelType>::calculateFields()
rhoM *= nParticle_/mesh().cellVolumes();
rhoM_.correctBoundaryConditions();
+ dsmcRhoN_.correctBoundaryConditions();
+
linearKE *= nParticle_/mesh().cellVolumes();
linearKE_.correctBoundaryConditions();
@@ -851,7 +856,8 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
IOobject::AUTO_WRITE
),
mesh_,
- dimensionedScalar("zero", dimensionSet(0, 3, -1, 0, 0), 0.0)
+ dimensionedScalar("zero", dimensionSet(0, 3, -1, 0, 0), 0.0),
+ zeroGradientFvPatchScalarField::typeName
),
collisionSelectionRemainder_(),
q_
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 1df4935f685..aba26e7bf83 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -83,10 +83,10 @@ class DsmcCloud
//- Dictionary of particle properties
IOdictionary particleProperties_;
- //- A list of unique instances of molecule types in the simulation.
- // The position of an entry in the list maps to the label identifying
- // the typeId, i.e. where typeIdList_ = (N2 O2 CO2)
- // N2 has typeId label = 0, O2 = 1, CO2 = 2.
+ //- A list of unique instances of molecule types in the
+ // simulation. The position of an entry in the list maps to
+ // the label identifying the typeId, i.e. where typeIdList_ =
+ // (N2 O2 CO2) N2 has typeId label = 0, O2 = 1, CO2 = 2.
List<word> typeIdList_;
//- Number of real atoms/molecules represented by a parcel
@@ -95,9 +95,9 @@ class DsmcCloud
//- A data structure holding which particles are in which cell
List<DynamicList<ParcelType*> > cellOccupancy_;
- //- An IOField holding the value of (sigmaT * cR)max for each cell (see
- // Bird p220). Initialised with the parcels, updated as required, and
- // read in on start/restart.
+ //- A field holding the value of (sigmaT * cR)max for each
+ // cell (see Bird p220). Initialised with the parcels,
+ // updated as required, and read in on start/restart.
volScalarField sigmaTcRMax_;
//- A field holding the remainder from the previous collision selections
--
GitLab
From d4d7611c9fcc4de4bd161aa7be51d7d7e63c89a8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 18 Jun 2010 11:41:08 +0100
Subject: [PATCH 75/77] ENH: handle msh2.2 format
---
.../mesh/conversion/gmshToFoam/gmshToFoam.C | 85 ++++++++++++-------
1 file changed, 56 insertions(+), 29 deletions(-)
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index a3f607ba0b0..fa1fe3b0410 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -233,6 +233,44 @@ void storeCellInZone
}
+// Reads mesh format
+scalar readMeshFormat(IFstream& inFile)
+{
+ Info<< "Starting to read mesh format at line " << inFile.lineNumber() << endl;
+
+ string line;
+ inFile.getLine(line);
+ IStringStream lineStr(line);
+
+ scalar version;
+ label asciiFlag, nBytes;
+ lineStr >> version >> asciiFlag >> nBytes;
+
+ Info<< "Read format version " << version << " ascii " << asciiFlag << endl;
+
+ if (asciiFlag != 0)
+ {
+ FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
+ << "Can only read ascii msh files."
+ << exit(FatalIOError);
+ }
+
+ inFile.getLine(line);
+ IStringStream tagStr(line);
+ word tag(tagStr);
+
+ if (tag != "$EndMeshFormat")
+ {
+ FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
+ << "Did not find $ENDNOD tag on line "
+ << inFile.lineNumber() << exit(FatalIOError);
+ }
+ Info<< endl;
+
+ return version;
+}
+
+
// Reads points and map
void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
{
@@ -278,9 +316,9 @@ void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
if (tag != "$ENDNOD" && tag != "$EndNodes")
{
- FatalErrorIn("readPoints(..)")
+ FatalIOErrorIn("readPoints(..)", inFile)
<< "Did not find $ENDNOD tag on line "
- << inFile.lineNumber() << exit(FatalError);
+ << inFile.lineNumber() << exit(FatalIOError);
}
Info<< endl;
}
@@ -351,9 +389,9 @@ void readPhysNames(IFstream& inFile, Map<word>& physicalNames)
if (tag != "$EndPhysicalNames")
{
- FatalErrorIn("readPhysicalNames(..)")
+ FatalIOErrorIn("readPhysicalNames(..)", inFile)
<< "Did not find $EndPhysicalNames tag on line "
- << inFile.lineNumber() << exit(FatalError);
+ << inFile.lineNumber() << exit(FatalIOError);
}
Info<< endl;
}
@@ -362,7 +400,7 @@ void readPhysNames(IFstream& inFile, Map<word>& physicalNames)
// Reads cells and patch faces
void readCells
(
- const bool version2Format,
+ const scalar versionFormat,
const bool keepOrientation,
const pointField& points,
const Map<label>& mshToFoam,
@@ -426,23 +464,18 @@ void readCells
label elmNumber, elmType, regPhys;
- if (version2Format)
+ if (versionFormat >= 2)
{
lineStr >> elmNumber >> elmType;
label nTags;
lineStr>> nTags;
- label regElem, partition;
-
- if (nTags == 3)
+ if (nTags > 0)
{
- lineStr >> regPhys >> regElem >> partition;
- }
- else
- {
- regPhys = 0;
- for (label i = 0; i < nTags; i++)
+ // Assume the first tag is the physical surface
+ lineStr >> regPhys;
+ for (label i = 1; i < nTags; i++)
{
label dummy;
lineStr>> dummy;
@@ -659,9 +692,9 @@ void readCells
if (tag != "$ENDELM" && tag != "$EndElements")
{
- FatalErrorIn("readCells(..)")
+ FatalIOErrorIn("readCells(..)", inFile)
<< "Did not find $ENDELM tag on line "
- << inFile.lineNumber() << exit(FatalError);
+ << inFile.lineNumber() << exit(FatalIOError);
}
@@ -683,13 +716,13 @@ void readCells
if (cells.size() == 0)
{
- FatalErrorIn("readCells(..)")
+ FatalIOErrorIn("readCells(..)", inFile)
<< "No cells read from file " << inFile.name() << nl
<< "Does your file specify any 3D elements (hex=" << MSHHEX
<< ", prism=" << MSHPRISM << ", pyramid=" << MSHPYR
<< ", tet=" << MSHTET << ")?" << nl
<< "Perhaps you have not exported the 3D elements?"
- << exit(FatalError);
+ << exit(FatalIOError);
}
Info<< "CellZones:" << nl
@@ -749,7 +782,8 @@ int main(int argc, char *argv[])
Map<word> physicalNames;
// Version 1 or 2 format
- bool version2Format = false;
+ scalar versionFormat = 1;
+
while (inFile.good())
{
@@ -761,14 +795,7 @@ int main(int argc, char *argv[])
if (tag == "$MeshFormat")
{
- Info<< "Found $MeshFormat tag; assuming version 2 file format."
- << endl;
- version2Format = true;
-
- if (!skipSection(inFile))
- {
- break;
- }
+ versionFormat = readMeshFormat(inFile);
}
else if (tag == "$PhysicalNames")
{
@@ -782,7 +809,7 @@ int main(int argc, char *argv[])
{
readCells
(
- version2Format,
+ versionFormat,
keepOrientation,
points,
mshToFoam,
--
GitLab
From ddcf2ee99735607ee55638af3682873ae7578c01 Mon Sep 17 00:00:00 2001
From: sergio <s.ferraris@opencfd.co.uk>
Date: Tue, 22 Jun 2010 15:21:12 +0100
Subject: [PATCH 76/77] ENH: Adding: 1) basicSource for explicit
sources(ActuationDisk and explicit source so far) 2)
cylindricalInlet BC 3) swirlMassFlowRate BC 4) dynamicLagrangian
LES incompressible turbulence model 5) atmospheric boundary layer inlet BC
for velocity and epsilon
---
src/finiteVolume/Make/files | 10 +
.../actuationDiskSource/actuationDiskSource.C | 196 +++++++++
.../actuationDiskSource/actuationDiskSource.H | 213 ++++++++++
.../actuationDiskSourceTemplates.C | 64 +++
.../basicSource/IObasicSourceList.C | 65 +++
.../basicSource/IObasicSourceList.H | 99 +++++
.../basicSource/basicSource/basicSource.C | 292 +++++++++++++
.../basicSource/basicSource/basicSource.H | 384 ++++++++++++++++++
.../basicSource/basicSource/basicSourceI.H | 147 +++++++
.../basicSource/basicSource/basicSourceIO.C | 83 ++++
.../basicSource/basicSource/basicSourceList.C | 180 ++++++++
.../basicSource/basicSource/basicSourceList.H | 137 +++++++
.../explicitSource/explicitSource.C | 321 +++++++++++++++
.../explicitSource/explicitSource.H | 289 +++++++++++++
.../explicitSource/explicitSourceI.H | 49 +++
.../explicitSource/explicitSourceIO.C | 83 ++++
...lindricalInletVelocityFvPatchVectorField.C | 173 ++++++++
...lindricalInletVelocityFvPatchVectorField.H | 175 ++++++++
...sFlowRateInletVelocityFvPatchVectorField.H | 2 +-
.../incompressible/LES/Make/files | 1 +
.../LES/dynLagrangian/dynLagrangian.C | 194 +++++++++
.../LES/dynLagrangian/dynLagrangian.H | 184 +++++++++
.../incompressible/RAS/Make/files | 4 +-
...daryLayerInletEpsilonFvPatchScalarField.C} | 46 ++-
...daryLayerInletEpsilonFvPatchScalarField.H} | 42 +-
...aryLayerInletVelocityFvPatchVectorField.C} | 86 +++-
...aryLayerInletVelocityFvPatchVectorField.H} | 50 ++-
27 files changed, 3489 insertions(+), 80 deletions(-)
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
create mode 100644 src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
create mode 100644 src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
create mode 100644 src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/{ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C => atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C} (72%)
rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/{ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H => atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H} (78%)
rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/{ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C => atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C} (60%)
rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/{ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H => atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H} (77%)
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index c7e13255f6f..74a7a60433e 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -157,6 +157,7 @@ $(derivedFvPatchFields)/uniformFixedValue/uniformFixedValueFvPatchFields.C
$(derivedFvPatchFields)/waveTransmissive/waveTransmissiveFvPatchFields.C
$(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
$(derivedFvPatchFields)/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
+$(derivedFvPatchFields)/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
fvsPatchFields = fields/fvsPatchFields
$(fvsPatchFields)/fvsPatchField/fvsPatchFields.C
@@ -355,4 +356,13 @@ fieldSources = $(general)/fieldSources
$(fieldSources)/pressureGradientExplicitSource/pressureGradientExplicitSource.C
$(fieldSources)/timeActivatedExplicitSource/timeActivatedExplicitSource.C
+basicSource = $(general)/fieldSources/basicSource
+$(basicSource)/basicSource/basicSource.C
+$(basicSource)/basicSource/basicSourceIO.C
+$(basicSource)/basicSource/basicSourceList.C
+$(basicSource)/basicSource/IObasicSourceList.C
+$(basicSource)/actuationDiskSource/actuationDiskSource.C
+$(basicSource)/explicitSource/explicitSource.C
+
+
LIB = $(FOAM_LIBBIN)/libfiniteVolume
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
new file mode 100644
index 00000000000..44f46f9de32
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "actuationDiskSource.H"
+#include "fvMesh.H"
+#include "fvMatrices.H"
+#include "geometricOneField.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(actuationDiskSource, 0);
+addToRunTimeSelectionTable(basicSource, actuationDiskSource, dictionary);
+
+}
+
+
+// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void Foam::actuationDiskSource::checkData()
+{
+ if
+ (
+ magSqr(diskArea_) <= VSMALL
+ || Cp_ <= VSMALL
+ || Ct_ <= VSMALL
+ || diskDir_ == vector::zero
+ )
+ {
+ FatalIOErrorIn
+ (
+ "Foam::actuationDiskSource::checkData()",
+ dict_
+ ) << "diskArea, Cp or Ct is small "
+ << "or disk direction not specified"
+ << exit(FatalIOError);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::actuationDiskSource::actuationDiskSource
+(
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+)
+:
+ basicSource(name, dict, mesh),
+ cellZoneID_(mesh.cellZones().findZoneID(this->cellSetName())),
+ diskDir_(vector::zero),
+ Cp_(0),
+ Ct_(0),
+ diskArea_(0),
+ dict_(dict.subDict(typeName + "Coeffs"))
+{
+ Info<< " - creating actuation disk zone: "
+ << this->name() << endl;
+
+ bool foundZone = (cellZoneID_ != -1);
+
+ reduce(foundZone, orOp<bool>());
+
+ if (!foundZone && Pstream::master())
+ {
+ FatalErrorIn
+ (
+ "Foam::actuationDiskSource::actuationDiskSource"
+ "(const word&, const dictionary&, const fvMesh&)"
+ ) << "cannot find porous cellZone " << this->name()
+ << exit(FatalError);
+ }
+
+ dict_.readIfPresent("diskDir", diskDir_);
+ dict_.readIfPresent("Cp", Cp_);
+ dict_.readIfPresent("Ct", Ct_);
+ dict_.readIfPresent("diskArea", diskArea_);
+
+ checkData();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
+{
+ if (cellZoneID_ == -1)
+ {
+ return;
+ }
+
+ bool compressible = false;
+ if (UEqn.dimensions() == dimensionSet(1, 1, -2, 0, 0))
+ {
+ compressible = true;
+ }
+
+ const labelList& cells = mesh_.cellZones()[cellZoneID_];
+ const scalarField& V = this->mesh().V();
+ vectorField& Usource = UEqn.source();
+ const vectorField& U = UEqn.psi();
+
+ if (compressible)
+ {
+ addActuationDiskAxialInertialResistance
+ (
+ Usource,
+ cells,//this->cells(),
+ V,
+ this->mesh().lookupObject<volScalarField>("rho"),
+ U
+ );
+ }
+ else
+ {
+ addActuationDiskAxialInertialResistance
+ (
+ Usource,
+ cells,//this->cells(),
+ V,
+ geometricOneField(),
+ U
+ );
+ }
+}
+
+
+void Foam::actuationDiskSource::writeData(Ostream& os) const
+{
+
+ os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.writeKeyword("name") << this->name() << token::END_STATEMENT << nl;
+
+ if (dict_.found("note"))
+ {
+ os.writeKeyword("note") << string(dict_.lookup("note"))
+ << token::END_STATEMENT << nl;
+ }
+
+ os << indent << "actuationDisk";
+
+ dict_.write(os);
+
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+bool Foam::actuationDiskSource::read(const dictionary& dict)
+{
+ if (basicSource::read(dict))
+ {
+ const dictionary& sourceDict = dict.subDict(name());
+ const dictionary& subDictCoeffs =
+ sourceDict.subDict(typeName + "Coeffs");
+ subDictCoeffs.readIfPresent("diskDir", diskDir_);
+ subDictCoeffs.readIfPresent("Cp", Cp_);
+ subDictCoeffs.readIfPresent("Ct", Ct_);
+ subDictCoeffs.readIfPresent("diskArea", diskArea_);
+
+ checkData();
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
new file mode 100644
index 00000000000..661fc99a547
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::actuationDiskSource
+
+Description
+ Actuation disk zone definition.
+ Constant values for momentum source for actuation disk
+
+ T = 2*rho*A*sqr(Uo)*a*(1-a)
+ U1 = (1 -a)Uo
+ where:
+ A: disk area
+ Uo: upstream velocity
+ a: 1 - Cp/Ct
+ U1: velocity at the disk
+
+SourceFiles
+ actuationDiskSource.C
+ actuationDiskSourceTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef actuationDiskSource_H
+#define actuationDiskSource_H
+
+#include "IOdictionary.H"
+#include "coordinateSystem.H"
+#include "coordinateSystems.H"
+#include "wordList.H"
+#include "labelList.H"
+#include "DimensionedField.H"
+#include "volFieldsFwd.H"
+#include "fvMatricesFwd.H"
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class actuationDiskSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class actuationDiskSource
+:
+ public basicSource
+{
+ // Private data
+
+ //- Cell zone ID
+ label cellZoneID_;
+
+ //- Disk area normal
+ vector diskDir_;
+
+ //- Power coefficient
+ scalar Cp_;
+
+ //- Thrust coefficient
+ scalar Ct_;
+
+ //- Disk area
+ scalar diskArea_;
+
+ //- Sub dictionary with actuationDisk information
+ const dictionary& dict_;
+
+
+ // Private Member Functions
+
+ //- Check data
+ void checkData();
+
+ //- Add resistance to the UEqn
+ template<class RhoFieldType>
+ void addActuationDiskAxialInertialResistance
+ (
+ vectorField& Usource,
+ const labelList& cells,
+ const scalarField& V,
+ const RhoFieldType& rho,
+ const vectorField& U
+ ) const;
+
+ //- Disallow default bitwise copy construct
+ actuationDiskSource(const actuationDiskSource&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const actuationDiskSource&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("actuationDiskSource");
+
+
+ // Constructors
+
+ //- Construct from components
+ actuationDiskSource
+ (
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+ );
+
+
+ //- Destructor
+ virtual ~actuationDiskSource()
+ {}
+
+
+ // Member Functions
+
+ // Access
+
+ //- cellZone number
+ label zoneId() const
+ {
+ return cellZoneID_;
+ }
+
+ //- Return Cp
+ scalar Cp() const
+ {
+ return Cp_;
+ }
+
+ //- Return Ct
+ scalar Ct() const
+ {
+ return Ct_;
+ }
+
+ //- Normal disk direction
+ const vector& diskDir() const
+ {
+ return diskDir_;
+ }
+
+ //- Disk area
+ scalar diskArea() const
+ {
+ return diskArea_;
+ }
+
+
+ // Public Functions
+
+ //-Source term to fvMatrix<vector>
+ virtual void addSu(fvMatrix<vector>& UEqn);
+
+ //-Source term to fvMatrix<scalar>
+ virtual void addSu(fvMatrix<scalar>& UEqn){}
+
+ //- Add all explicit source
+ virtual void addExplicitSources(){}
+
+ //- Add source to scalar field
+ virtual void addSu(DimensionedField<scalar, volMesh>& field){}
+
+ //- Add source to vector field
+ virtual void addSu(DimensionedField<vector, volMesh>& field){}
+
+
+ // I-O
+
+ //- Write data
+ virtual void writeData(Ostream&) const;
+
+ //- Read dictionary
+ virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+# include "actuationDiskSourceTemplates.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
new file mode 100644
index 00000000000..17fcbf6fd07
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "actuationDiskSource.H"
+#include "volFields.H"
+#include "fvMatrix.H"
+#include "fvm.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class RhoFieldType>
+void Foam::actuationDiskSource::addActuationDiskAxialInertialResistance
+(
+ vectorField& Usource,
+ const labelList& cells,
+ const scalarField& V,
+ const RhoFieldType& rho,
+ const vectorField& U
+) const
+{
+ scalar a = 1.0 - Cp_/Ct_;
+ scalar totVol = 0.0;
+ scalarField T(cells.size());
+ vector uniDiskDir = diskDir_/mag(diskDir_);
+ tensor E(tensor::zero);
+ E.xx() = uniDiskDir.x();
+ E.yy() = uniDiskDir.y();
+ E.zz() = uniDiskDir.z();
+ vectorField U1 = (1.0 - a)*U;
+ forAll(cells, i)
+ {
+ totVol += V[cells[i]];
+ T[i] = 2.0*rho[cells[i]]*diskArea_*mag(U1[cells[i]])*a/(1.0 - a);
+ }
+ forAll(cells, i)
+ {
+ Usource[cells[i]] += ((V[cells[i]]/totVol)*T[i]*E) & U1[cells[i]];
+ }
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
new file mode 100644
index 00000000000..8ce372e8ff4
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IObasicSourceList.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::IObasicSourceList::IObasicSourceList
+(
+ const fvMesh& mesh
+)
+:
+ IOdictionary
+ (
+ IOobject
+ (
+ "sourcesProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+ ),
+ basicSourceList(mesh, *this)
+{}
+
+
+bool Foam::IObasicSourceList::read()
+{
+ if (regIOobject::read())
+ {
+ basicSourceList::read(*this);
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.H
new file mode 100644
index 00000000000..c291c373565
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::IObasicSourceList
+
+Description
+ IObasicSourceList
+
+SourceFiles
+ IObasicSourceList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IObasicSourceList_H
+#define IObasicSourceList_H
+
+#include "basicSourceList.H"
+#include "IOdictionary.H"
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class IObasicSourceList Declaration
+\*---------------------------------------------------------------------------*/
+
+class IObasicSourceList
+:
+ public IOdictionary,
+ public basicSourceList
+{
+private:
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ IObasicSourceList
+ (
+ const IObasicSourceList&
+ );
+
+ //- Disallow default bitwise assignment
+ void operator=(const IObasicSourceList&);
+
+
+public:
+
+ // Constructors
+
+ //- Construct from components with list of field names
+ IObasicSourceList
+ (
+ const fvMesh& mesh
+ );
+
+
+ // Destructor
+ virtual ~IObasicSourceList()
+ {}
+
+
+ //- Read dictionary
+ virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
new file mode 100644
index 00000000000..d74ce2b3522
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
@@ -0,0 +1,292 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSource.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(basicSource, 0);
+ defineRunTimeSelectionTable(basicSource, dictionary);
+}
+
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+const Foam::wordList Foam::basicSource::
+selectionModeTypeNames_
+(
+ IStringStream("(points cellSet cellZone all)")()
+);
+
+
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+Foam::basicSource::selectionModeType
+Foam::basicSource::wordToSelectionModeType
+(
+ const word& smtName
+) const
+{
+ forAll(selectionModeTypeNames_, i)
+ {
+ if (smtName == selectionModeTypeNames_[i])
+ {
+ return selectionModeType(i);
+ }
+ }
+
+ FatalErrorIn
+ (
+ "basicSource::selectionModeType"
+ "basicSource::wordToSelectionModeType"
+ "("
+ "const word&"
+ ")"
+ ) << "Unknown selectionMode type " << smtName
+ << ". Valid selectionMode types are:" << nl << selectionModeTypeNames_
+ << exit(FatalError);
+
+ return selectionModeType(0);
+}
+
+
+Foam::word Foam::basicSource::selectionModeTypeToWord
+(
+ const selectionModeType& smtType
+) const
+{
+ if (smtType > selectionModeTypeNames_.size())
+ {
+ return "UNKNOWN";
+ }
+ else
+ {
+ return selectionModeTypeNames_[smtType];
+ }
+}
+
+
+void Foam::basicSource::setSelection
+(
+ const dictionary& dict
+)
+{
+ switch (selectionMode_)
+ {
+ case smPoints:
+ {
+ //Do nothing. It should be sorted out by derived class//
+ break;
+ }
+ case smCellSet:
+ {
+ dict.lookup("cellSet") >> cellSetName_;
+ break;
+ }
+ case smCellZone:
+ {
+ dict.lookup("cellZone") >> cellSetName_;
+ break;
+ }
+ case smAll:
+ {
+ break;
+ }
+ default:
+ {
+ FatalErrorIn
+ (
+ "basicSource::setSelection(const dictionary&)"
+ ) << "Unknown selectionMode "
+ << selectionModeTypeNames_[selectionMode_]
+ << ". Valid selectionMode types are" << selectionModeTypeNames_
+ << exit(FatalError);
+ }
+ }
+}
+
+
+void Foam::basicSource::setCellSet()
+{
+ Info<< incrIndent << indent << "Source: " << name_ << endl;
+ switch (selectionMode_)
+ {
+ case smPoints:
+ {
+ break;
+ }
+ case smCellSet:
+ {
+ Info<< indent << "- selecting cells using cellSet "
+ << cellSetName_ << endl;
+
+ cellSet selectedCells(mesh_, cellSetName_);
+ cells_ = selectedCells.toc();
+
+ break;
+ }
+ case smCellZone:
+ {
+ Info<< indent << "- selecting cells using cellZone "
+ << cellSetName_ << endl;
+ label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
+ if (zoneID == -1)
+ {
+ FatalErrorIn("basicSource<Type>::setCellIds()")
+ << "Cannot find cellZone " << cellSetName_ << endl
+ << "Valid cellZones are " << mesh_.cellZones().names()
+ << exit(FatalError);
+ }
+ cells_ = mesh_.cellZones()[zoneID];
+
+ break;
+ }
+ case smAll:
+ {
+ Info<< indent << "- selecting all cells" << endl;
+ cells_ = identity(mesh_.nCells());
+
+ break;
+ }
+ default:
+ {
+ FatalErrorIn("basicSource<Type>::setCellIds()")
+ << "Unknown selectionMode "
+ << selectionModeTypeNames_[selectionMode_]
+ << ". Valid selectionMode types are" << selectionModeTypeNames_
+ << exit(FatalError);
+ }
+ }
+
+ // Set volume information
+ if (selectionMode_ != smPoints)
+ {
+ V_ = 0.0;
+ forAll(cells_, i)
+ {
+ V_ += mesh_.V()[cells_[i]];
+ }
+ reduce(V_, sumOp<scalar>());
+
+ Info<< indent << "- selected "
+ << returnReduce(cells_.size(), sumOp<label>())
+ << " cell(s) with volume " << V_ << nl << decrIndent << endl;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::basicSource::basicSource
+(
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+)
+:
+ name_(name),
+ mesh_(mesh),
+ dict_(dict),
+ active_(readBool(dict_.lookup("active"))),
+ timeStart_(readScalar(dict_.lookup("timeStart"))),
+ duration_(readScalar(dict_.lookup("duration"))),
+ selectionMode_(wordToSelectionModeType(dict_.lookup("selectionMode"))),
+ cellSetName_("none"),
+ V_(1.0)
+{
+ setSelection(dict_);
+
+ setCellSet();
+}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::basicSource> Foam::basicSource::New
+(
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+)
+{
+ word typeModel;
+
+ {
+ dict.lookup("typeModel") >> typeModel;
+ }
+
+ Info<< "Selecting model type " << typeModel << endl;
+
+ dictionaryConstructorTable::iterator cstrIter =
+ dictionaryConstructorTablePtr_->find(typeModel);
+
+ if (cstrIter == dictionaryConstructorTablePtr_->end())
+ {
+ FatalErrorIn
+ (
+ "basicSource::New(const volVectorField&, "
+ "const surfaceScalarField&, transportModel&)"
+ ) << "Unknown Model type " << typeModel
+ << endl << endl
+ << "Valid model types are :" << endl
+ << dictionaryConstructorTablePtr_->toc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<basicSource>(cstrIter()(name, dict, mesh));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+bool Foam::basicSource::isActive()
+{
+ if
+ (
+ active_
+ && (mesh_.time().value() >= timeStart_)
+ && (mesh_.time().value() <= timeEnd())
+ )
+ {
+ // Update the cell set if the mesh is changing
+ if (mesh_.changing())
+ {
+ setCellSet();
+ }
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
new file mode 100644
index 00000000000..39f4377adb2
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
@@ -0,0 +1,384 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::basicSource
+
+Description
+ Basic source abtract class
+
+ Sources described by:
+
+ source1
+ {
+ typeModel actuationDiskSource; // explicitSource
+ active on; // on/off switch
+ timeStart 0.0; // start time
+ duration 1000.0; // duration
+ selectionMode cellSet; // cellSet // points //cellZone
+ cellSet c0; // cellSet name
+
+ actuationDiskSourceCoeffs
+ {
+ diskDir (-1 0 0); // orientation of the disk
+ Cp 0.53; // Cp
+ Ct 0.58; // Ct
+ diskArea 40; // disk area
+ }
+ }
+
+ source2
+ {
+ typeModel explicitSource;
+ active on;
+ timeStart 0.0;
+ duration 1000.0;
+ selectionMode points;
+ cellSet c0;
+
+ explicitSourceCoeffs
+ {
+ points // list of points when selectionMode = points
+ (
+ (-0.088 0.007 -0.02)
+ (-0.028 0.007 -0.02)
+ );
+ volumeMode specific; //absolute
+ fieldData //field data
+ {
+ k 30.7;
+ epsilon 1.5;
+ }
+ }
+ }
+
+SourceFiles
+ basicSource.C
+ basicSourceIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicSource_H
+#define basicSource_H
+
+#include "fvMatrices.H"
+#include "cellSet.H"
+#include "volFieldsFwd.H"
+#include "DimensionedField.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+ Class basicSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicSource
+{
+public:
+
+ // Public data
+
+ //- Enumeration for selection mode types
+ enum selectionModeType
+ {
+ smPoints,
+ smCellSet,
+ smCellZone,
+ smAll
+ };
+
+ //- Word list of selection mode type names
+ static const wordList selectionModeTypeNames_;
+
+
+protected:
+
+ // Protected data
+
+ //- Source name
+ word name_;
+
+ //- Reference to the mesh database
+ const fvMesh& mesh_;
+
+ //- Dictionary containing the data of the source
+ const dictionary& dict_;
+
+ //- Source active flag
+ bool active_;
+
+ //- Time start
+ scalar timeStart_;
+
+ //- Duration
+ scalar duration_;
+
+ //- Cell selection mode
+ selectionModeType selectionMode_;
+
+ //- Name of cell set for "cellSet" and "cellZone" selectionMode
+ word cellSetName_;
+
+ //- Set of cells to apply source to
+ labelList cells_;
+
+ //- Sum of cell volumes
+ scalar V_;
+
+
+ // Protected functions
+
+ //- Helper function to convert from a word to a selectionModeType
+ selectionModeType wordToSelectionModeType(const word& smtName) const;
+
+ //- Helper function to convert from a selectionModeType to a word
+ word selectionModeTypeToWord(const selectionModeType& smtType) const;
+
+ //- Set the cellSet or points selection
+ void setSelection(const dictionary& dict);
+
+ //- Set the cell set based on the user input selection mode
+ void setCellSet();
+
+
+public:
+
+ //- Runtime type information
+ TypeName("basicSource");
+
+
+ // Declare run-time constructor selection table
+
+ declareRunTimeSelectionTable
+ (
+ autoPtr,
+ basicSource,
+ dictionary,
+ (
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+ ),
+ (name, dict, mesh)
+ );
+
+
+ // Constructors
+
+ //- Construct from components
+ basicSource
+ (
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+ );
+
+ //- Return clone
+ autoPtr<basicSource> clone() const
+ {
+ notImplemented
+ (
+ "autoPtr<basicSource> clone() const"
+ );
+ return autoPtr<basicSource>(NULL);
+ }
+
+ //- Return pointer to new basicSource object created
+ // on the freestore from an Istream
+ class iNew
+ {
+ //- Reference to the mesh database
+ const fvMesh& mesh_;
+ const word& name_;
+
+ public:
+
+ iNew
+ (
+ const fvMesh& mesh,
+ const word& name
+ )
+ :
+ mesh_(mesh),
+ name_(name)
+ {}
+
+ autoPtr<basicSource> operator()(Istream& is) const
+ {
+ //const word name(is);
+ const dictionary dict(is);
+
+ return autoPtr<basicSource>
+ (
+ basicSource::New
+ (
+ name_,
+ dict,
+ mesh_
+ )
+ );
+ }
+ };
+
+
+ // Selectors
+
+ //- Return a reference to the selected basicSource model
+ static autoPtr<basicSource> New
+ (
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+ );
+
+
+ //- Destructor
+ virtual ~basicSource()
+ {}
+
+
+ // Member Functions
+
+ // Access
+
+ //- Return const access to the source name
+ inline const word& name() const;
+
+ //- Return const access to the mesh database
+ inline const fvMesh& mesh() const;
+
+ //- Return dictionay
+ inline const dictionary& dictCoeffs() const;
+
+ //- Return const access to the source active flag
+ inline bool active() const;
+
+ //- Return const access to the time start
+ inline scalar timeStart() const;
+
+ //- Return const access to the duration
+ inline scalar duration() const;
+
+ //- Return const access to the time end
+ inline scalar timeEnd() const;
+
+ //- Return const access to the cell selection mode
+ inline const selectionModeType& selectionMode() const;
+
+ //- Return const access to the name of cell set for "cellSet"
+ // selectionMode
+ inline const word& cellSetName() const;
+
+ //- Return const access to the total cell volume
+ inline scalar V() const;
+
+ //- Return const access to the cell set
+ inline const labelList& cells() const;
+
+
+ // Edit
+
+ //- Return access to the source name
+ inline word& name();
+
+ //- Return access to the source active flag
+ inline bool& active();
+
+ //- Return access to the time start
+ inline scalar& timeStart();
+
+ //- Return access to the duration
+ inline scalar& duration();
+
+ //- Return access to the cell selection mode
+ inline selectionModeType& selectionMode();
+
+ //- Return access to the list of points for "points" selectionMode
+ inline List<point>& points();
+
+ //- Return access to the name of cell set for "cellSet"
+ // selectionMode
+ inline word& cellSetName();
+
+ //- Return access to the total cell volume
+ inline scalar& V();
+
+ //- Return access to the cell set
+ inline labelList& cells();
+
+
+ // Checks
+
+ //- Is the source active?
+ bool isActive();
+
+
+ // Evaluation
+
+ //- Add all explicit sources
+ virtual void addExplicitSources() = 0;
+
+ //- Add source to scalar field
+ virtual void addSu(DimensionedField<scalar, volMesh>& field) = 0;
+
+ //- Add source to vector field
+ virtual void addSu(DimensionedField<vector, volMesh>& field) = 0;
+
+ //- Add source term to vector fvMatrix
+ virtual void addSu(fvMatrix<vector>& Eqn) = 0;
+
+ //- Add source term to scalar fvMatrix
+ virtual void addSu(fvMatrix<scalar>& Eqn) = 0;
+
+
+ // I-O
+
+ //- Write the source properties
+ virtual void writeData(Ostream&) const = 0;
+
+ //- Read source dictionary
+ virtual bool read(const dictionary& dict) = 0;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "basicSourceI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
new file mode 100644
index 00000000000..89e68a7df8d
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+
+inline const Foam::word& Foam::basicSource::name() const
+{
+ return name_;
+}
+
+
+inline const Foam::fvMesh& Foam::basicSource::mesh() const
+{
+ return mesh_;
+}
+
+inline const Foam::dictionary& Foam::basicSource::dictCoeffs() const
+{
+ return dict_;
+}
+
+inline bool Foam::basicSource::active() const
+{
+ return active_;
+}
+
+
+inline Foam::scalar Foam::basicSource::timeStart() const
+{
+ return timeStart_;
+}
+
+
+inline Foam::scalar Foam::basicSource::duration() const
+{
+ return duration_;
+}
+
+
+inline Foam::scalar Foam::basicSource::timeEnd() const
+{
+ return timeStart_ + duration_;
+}
+
+
+inline const Foam::basicSource::selectionModeType&
+Foam::basicSource::selectionMode() const
+{
+ return selectionMode_;
+}
+
+
+inline const Foam::word&
+Foam::basicSource::cellSetName() const
+{
+ return cellSetName_;
+}
+
+
+inline Foam::scalar Foam::basicSource::V() const
+{
+ return V_;
+}
+
+
+inline const Foam::labelList&
+Foam::basicSource::cells() const
+{
+ return cells_;
+}
+
+
+inline Foam::word& Foam::basicSource::name()
+{
+ return name_;
+}
+
+
+inline bool& Foam::basicSource::active()
+{
+ return active_;
+}
+
+
+inline Foam::scalar& Foam::basicSource::timeStart()
+{
+ return timeStart_;
+}
+
+
+inline Foam::scalar& Foam::basicSource::duration()
+{
+ return duration_;
+}
+
+
+inline Foam::word& Foam::basicSource::cellSetName()
+{
+ return cellSetName_;
+}
+
+
+inline Foam::basicSource::selectionModeType&
+Foam::basicSource::selectionMode()
+{
+ return selectionMode_;
+}
+
+
+inline Foam::scalar& Foam::basicSource::V()
+{
+ return V_;
+}
+
+
+inline Foam::labelList& Foam::basicSource::cells()
+{
+ return cells_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
new file mode 100644
index 00000000000..88966fdd6b1
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+
+void Foam::basicSource::writeData(Ostream& os) const
+{
+ os << indent << name_ << nl
+ << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+ os.writeKeyword("active") << active_ << token::END_STATEMENT << nl;
+ os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
+ os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
+ os.writeKeyword("selectionMode")
+ << selectionModeTypeToWord(selectionMode_) << nl;
+
+ switch (selectionMode_)
+ {
+ case smPoints:
+ {
+ break;
+ }
+ case smCellSet:
+ {
+ os.writeKeyword("cellSet") << cellSetName_
+ << token::END_STATEMENT << nl;
+ break;
+ }
+ default:
+ {
+ FatalErrorIn
+ (
+ "basicSource::writeData"
+ "("
+ "Ostream&, "
+ "bool"
+ ") const"
+ ) << "Unknown selectionMode "
+ << selectionModeTypeToWord(selectionMode_)
+ << abort(FatalError);
+ }
+ }
+
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+bool Foam::basicSource::read(const dictionary& dict)
+{
+ const dictionary& sourceDict = dict.subDict(name_);
+ active_ = readBool(sourceDict.lookup("active"));
+ timeStart_ = readScalar(sourceDict.lookup("timeStart"));
+ duration_ = readScalar(sourceDict.lookup("duration"));
+ return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
new file mode 100644
index 00000000000..8329a6f03d9
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicSourceList.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::basicSourceList::basicSourceList
+(
+ const fvMesh& mesh,
+ const dictionary& dict
+)
+:
+ PtrList<basicSource>(),
+ mesh_(mesh)
+{
+ label count = 0;
+ forAllConstIter(dictionary, dict, iter)
+ {
+ // safety:
+ if (iter().isDict())
+ {
+ count ++;
+ }
+ }
+
+ this->setSize(count);
+ label i = 0;
+ forAllConstIter(dictionary, dict, iter)
+ {
+ const word& name = iter().keyword();
+ const dictionary& dict = iter().dict();
+
+ this->set
+ (
+ i++,
+ basicSource::New(name, dict, mesh)
+ );
+ }
+}
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+
+void Foam::basicSourceList::addSu(fvMatrix<scalar>& Eqn)
+{
+ forAll(*this, i)
+ {
+ if (this->operator[](i).isActive())
+ {
+ this->operator[](i).addSu(Eqn);
+ }
+ }
+}
+
+
+void Foam::basicSourceList::addSu(fvMatrix<vector>& Eqn)
+{
+
+ forAll(*this, i)
+ {
+ if (this->operator[](i).isActive())
+ {
+ this->operator[](i).addSu(Eqn);
+ }
+ }
+}
+
+
+void Foam::basicSourceList::addExplicitSources()
+{
+
+ forAll(*this, i)
+ {
+ if (this->operator[](i).isActive())
+ {
+ this->operator[](i).addExplicitSources();
+ }
+ }
+}
+
+
+void Foam::basicSourceList::addSu
+(
+ DimensionedField<scalar, volMesh>& field
+)
+{
+ forAll(*this, i)
+ {
+ if (this->operator[](i).isActive())
+ {
+ this->operator[](i).addSu(field);
+ }
+ }
+}
+
+
+void Foam::basicSourceList::addSu
+(
+ DimensionedField<vector, volMesh>& field
+)
+{
+ forAll(*this, i)
+ {
+ if (this->operator[](i).isActive())
+ {
+ this->operator[](i).addSu(field);
+ }
+ }
+}
+
+
+bool Foam::basicSourceList::read(const dictionary& dict)
+{
+ forAll(*this, i)
+ {
+ this->operator[](i).read(dict);
+ }
+ return true;
+}
+
+
+bool Foam::basicSourceList::writeData(Ostream& os) const
+{
+ // Write size of list
+ os << nl << this->size();
+
+ // Write beginning of contents
+ os << nl << token::BEGIN_LIST;
+
+ // Write list contents
+ forAll(*this, i)
+ {
+ os << nl;
+ this->operator[](i).writeData(os);
+ }
+
+ // Write end of contents
+ os << token::END_LIST << token::END_STATEMENT << nl;
+
+ // Check state of IOstream
+ return os.good();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const basicSourceList& sources
+)
+{
+ sources.writeData(os);
+ return os;
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
new file mode 100644
index 00000000000..96490f94ef9
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::basicsourceList
+
+Description
+ List of explict sources
+
+SourceFile
+ basicSourceList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicSourceList_H
+#define basicSourceList_H
+
+#include "PtrList.H"
+#include "DimensionedField.H"
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class basicSourceList Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicSourceList
+:
+ public PtrList<basicSource>
+{
+private:
+
+ // Private data
+
+ //- Reference to the mesh database
+ const fvMesh& mesh_;
+
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ basicSourceList
+ (
+ const basicSourceList&
+ );
+
+ //- Disallow default bitwise assignment
+ void operator=(const basicSourceList&);
+
+
+public:
+
+ // Constructors
+
+ //- Construct from components with list of field names
+ basicSourceList
+ (
+ const fvMesh& mesh,
+ const dictionary& dict
+ );
+
+
+ // Destructor
+ virtual ~basicSourceList()
+ {}
+
+
+ // Member Functions
+
+ // Evaluation
+
+ //- Add all explicit sources
+ void addExplicitSources();
+
+ //- Add source to scalar field
+ void addSu(DimensionedField<scalar, volMesh>& field);
+
+ //- Add source to vector field
+ void addSu(DimensionedField<vector, volMesh>& field);
+
+ //- Add source terms to scalar fvMatrix
+ void addSu(fvMatrix<scalar>& Eq);
+
+ //- Add source terms to vector fvMatrix
+ void addSu(fvMatrix<vector>& Eq);
+
+
+ // I-O
+
+ //- Read dictionary
+ virtual bool read(const dictionary& dict);
+
+ //- Write data to Istream
+ virtual bool writeData(Ostream& os) const;
+
+ //- Ostream operator
+ friend Ostream& operator<<
+ (
+ Ostream& os,
+ const basicSourceList& sources
+ );
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
new file mode 100644
index 00000000000..9798d82ce85
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "explicitSource.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "HashSet.H"
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(explicitSource, 0);
+ addToRunTimeSelectionTable
+ (
+ basicSource,
+ explicitSource,
+ dictionary
+ );
+}
+
+const Foam::wordList Foam::explicitSource::volumeModeTypeNames_
+(
+ IStringStream("(absolute specific)")()
+);
+
+
+// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void Foam::explicitSource::setSelectedCellsFromPoints()
+{
+ labelHashSet selectedCells;
+
+ forAll(points_, i)
+ {
+ label cellI = this->mesh().findCell(points_[i]);
+ if (cellI >= 0)
+ {
+ selectedCells.insert(cellI);
+ }
+
+ label globalCellI = returnReduce(cellI, maxOp<label>());
+
+ if (globalCellI < 0)
+ {
+ WarningIn
+ (
+ "explicitSource::setSelectedCellsFromPoints()"
+ )
+ << "Unable to find owner cell for point " << points_[i]
+ << endl;
+ }
+ }
+
+ this->cells() = selectedCells.toc();
+}
+
+
+template<class Type>
+void Foam::explicitSource::addSources
+(
+ Field<Type>& fieldSource,
+ Type& data
+) const
+{
+ forAll(this->cells(), i)
+ {
+ fieldSource[this->cells()[i]] = data/volSource_[i];
+ }
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+Foam::explicitSource::volumeModeType
+Foam::explicitSource::wordToVolumeModeType
+(
+ const word& vmtName
+) const
+{
+ forAll(volumeModeTypeNames_, i)
+ {
+ if (vmtName == volumeModeTypeNames_[i])
+ {
+ return volumeModeType(i);
+ }
+ }
+
+ FatalErrorIn
+ (
+ "explicitSource<Type>::volumeModeType"
+ "explicitSource<Type>::wordToVolumeModeType(const word&)"
+ ) << "Unknown volumeMode type " << vmtName
+ << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
+ << exit(FatalError);
+
+ return volumeModeType(0);
+}
+
+
+Foam::word Foam::explicitSource::volumeModeTypeToWord
+(
+ const volumeModeType& vmtType
+) const
+{
+ if (vmtType > volumeModeTypeNames_.size())
+ {
+ return "UNKNOWN";
+ }
+ else
+ {
+ return volumeModeTypeNames_[vmtType];
+ }
+}
+
+template <class Type>
+void Foam::explicitSource::addField
+(
+ HashTable<Type>& fields,
+ const wordList& fieldTypes,
+ const wordList& fieldNames,
+ const dictionary& fieldDataDict
+)
+{
+ forAll (fieldTypes, fieldI)
+ {
+ word fieldName = fieldNames[fieldI];
+ word fieldType = fieldTypes[fieldI];
+
+ typedef GeometricField<Type, fvPatchField, volMesh> geometricField;
+
+ if
+ (
+ (
+ fieldType
+ == GeometricField<Type, fvPatchField, volMesh>::typeName
+ ) &&
+ (
+ this->mesh().foundObject<geometricField>(fieldName)
+ )
+ )
+ {
+ Type fieldValue = fieldDataDict.lookupOrDefault<Type>
+ (
+ fieldName,
+ pTraits<Type>::zero
+ );
+
+ fields.insert(fieldName, fieldValue);
+ }
+ }
+}
+
+
+void Foam::explicitSource::setFieldData
+(
+ const dictionary& dict
+)
+{
+ scalarFields_.clear();
+ vectorFields_.clear();
+
+ wordList fieldTypes(dict.toc().size());
+ wordList fieldNames(dict.toc().size());
+
+ forAll(dict.toc(), i)
+ {
+ const word& fieldName = dict.toc()[i];
+ IOobject io
+ (
+ fieldName,
+ this->mesh().time().timeName(0),
+ this->mesh(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+ if (io.headerOk())
+ {
+ fieldTypes[i] = io.headerClassName();
+ fieldNames[i] = dict.toc()[i];
+ }
+ else
+ {
+ FatalErrorIn
+ (
+ "explicitSource::setFieldData"
+ ) << "header not OK " << io.name()
+ << exit(FatalError);
+ }
+ }
+
+ addField(scalarFields_, fieldTypes, fieldNames, dict);
+ addField(vectorFields_, fieldTypes, fieldNames, dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::explicitSource::explicitSource
+(
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+)
+:
+ basicSource(name, dict, mesh),
+ scalarFields_(0, *this),
+ vectorFields_(0, *this),
+ dict_(dict.subDict(typeName + "Coeffs")),
+ volumeMode_(wordToVolumeModeType(dict_.lookup("volumeMode"))),
+ points_(),
+ volSource_(this->cells().size(), 1.0)
+{
+ setFieldData(dict_.subDict("fieldData"));
+
+ // Set points if selectionMode is smPoints
+ if (this->selectionMode() == smPoints)
+ {
+ dict_.lookup("points") >> points_;
+ setSelectedCellsFromPoints();
+ volSource_.setSize(points_.size(), 1.0);
+ }
+
+ const labelList& cellList = this->cells();
+ scalar V = 0.0;
+ if (volumeMode_ == vmAbsolute)
+ {
+ forAll(cellList, cellI)
+ {
+ volSource_[cellI] = mesh.V()[cellList[cellI]];
+ V += volSource_[cellI];
+ }
+ }
+ else
+ {
+ forAll(cellList, cellI)
+ {
+ V += mesh.V()[cellList[cellI]];
+ }
+ }
+
+ reduce(V, sumOp<scalar>());
+
+ Info<< "- selected " << returnReduce(cellList.size(), sumOp<label>())
+ << " cell(s) with Volume: " << V << " in time activated sources "
+ << endl;
+}
+
+
+void Foam::explicitSource::addSu
+(
+ fvMatrix<scalar>& Eqn
+)
+{
+ Field<scalar>& source = Eqn.source();
+ scalar data = scalarFields_[Eqn.psi().name()];
+ addSources<scalar>(source, data);
+}
+
+
+void Foam::explicitSource::addSu
+(
+ fvMatrix<vector>& Eqn
+)
+{
+ Field<vector>& source = Eqn.source();
+ vector data = vectorFields_[Eqn.psi().name()];
+ addSources<vector>(source, data);
+}
+
+
+void Foam::explicitSource::addSu
+(
+ DimensionedField<scalar, volMesh>& field
+)
+{
+ scalar data = scalarFields_[field.name()];
+ addSources<scalar>(field, data);
+}
+
+
+void Foam::explicitSource::addSu
+(
+ DimensionedField<vector, volMesh>& field
+)
+{
+ vector data = vectorFields_[field.name()];
+ addSources<vector>(field, data);
+}
+
+void Foam::explicitSource::addExplicitSources()
+{
+ scalarFields_.applySources();
+ vectorFields_.applySources();
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
new file mode 100644
index 00000000000..8aba2a2dca7
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
@@ -0,0 +1,289 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::explicitSource
+
+Description
+ Explicit source.
+
+ Sources described by:
+
+ explicitSourceCoeffs
+ {
+ points // list of points when selectionMode = points
+ (
+ (-0.088 0.007 -0.02)
+ (-0.028 0.007 -0.02)
+ );
+ volumeMode specific; //absolute
+ fieldData // field data - usage for multiple fields
+ {
+ k 30.7;
+ epsilon 1.5;
+ }
+ }
+
+SourceFiles
+ explicitSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef explicitSource_H
+#define explicitSource_H
+
+#include "cellSet.H"
+#include "volFieldsFwd.H"
+#include "DimensionedField.H"
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class explicitSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class explicitSource
+:
+ public basicSource
+{
+ // Private classes
+
+ template<class Type>
+ class fieldList
+ :
+ public HashTable<Type>
+ {
+
+ explicitSource& OwnerPtr_;
+
+ public:
+
+ //- null Constructor
+ fieldList()
+ :
+ HashTable<Type>(0),
+ OwnerPtr_()
+ {}
+
+
+ //- Constructor
+ fieldList(label size, explicitSource& ownerPtr)
+ :
+ HashTable<Type>(size),
+ OwnerPtr_(ownerPtr)
+ {}
+
+
+ void applySources()
+ {
+ typedef GeometricField<Type, fvPatchField, volMesh>
+ geometricField;
+
+ forAll(this->toc(), i)
+ {
+ geometricField& field = const_cast<geometricField&>
+ (
+ OwnerPtr_.mesh().lookupObject<geometricField>
+ (this->toc()[i])
+ );
+
+ Type data = this->operator[](field.name());
+ OwnerPtr_.addSources<Type>(field.internalField(), data);
+ }
+ }
+ };
+
+private:
+
+ // Private cdata
+
+ //- List of field types
+ fieldList<scalar> scalarFields_;
+ fieldList<vector> vectorFields_;
+
+ //- Add field names and values to field table for types.
+ template<class Type>
+ void addField
+ (
+ HashTable<Type>& fields,
+ const wordList& fieldTypes,
+ const wordList& fieldNames,
+ const dictionary& dict_
+ );
+
+
+ //- Add data to field source
+ template<class Type>
+ void addSources
+ (
+ Field<Type>& fieldSource,
+ Type& data
+ ) const;
+
+
+public:
+
+
+ // Public data
+
+ //- Enumeration for volume types
+ enum volumeModeType
+ {
+ vmAbsolute,
+ vmSpecific
+ };
+
+ //- Word list of volume mode type names
+ static const wordList volumeModeTypeNames_;
+
+
+protected:
+
+ // Protected data
+
+ //- Sub dictionary for time activated explicit sources
+ const dictionary& dict_;
+
+ //- Volume mode
+ volumeModeType volumeMode_;
+
+ //- List of points for "points" selectionMode
+ List<point> points_;
+
+ //- Volume of the explicit source
+ scalarList volSource_;
+
+
+ // Protected functions
+
+ //- Helper function to convert from a word to a volumeModeType
+ volumeModeType wordToVolumeModeType(const word& vtName) const;
+
+ //- Helper function to convert from a volumeModeType to a word
+ word volumeModeTypeToWord(const volumeModeType& vtType) const;
+
+ //- Set the local field data
+ void setFieldData(const dictionary& dict);
+
+ //- Set selected cells when smPoint is used
+ void setSelectedCellsFromPoints();
+
+
+public:
+
+ //- Runtime type information
+ TypeName("explicitSource");
+
+
+ // Constructors
+
+ //- Construct from components
+ explicitSource
+ (
+ const word& name,
+ const dictionary& dict,
+ const fvMesh& mesh
+ );
+
+ //- Return clone
+ autoPtr<explicitSource> clone() const
+ {
+ notImplemented
+ (
+ "autoPtr<explicitSource> clone() const"
+ );
+ return autoPtr<explicitSource>(NULL);
+ }
+
+
+
+ // Member Functions
+
+ // Access
+
+ //- Return const access to the volume mode
+ inline const volumeModeType& volumeMode() const;
+
+
+ // Edit
+
+ //- Return access to the volume mode
+ inline volumeModeType& volumeMode();
+
+ //- Return points
+ inline const List<point>& points() const;
+
+
+ // Evaluation
+
+ //-Source term to fvMatrix<vector>
+ virtual void addSu(fvMatrix<vector>& UEqn);
+
+ //-Source term to fvMatrix<scalar>
+ virtual void addSu(fvMatrix<scalar>& UEqn);
+
+ //- Add all explicit source
+ virtual void addExplicitSources();
+
+ //- Add source to scalar field
+ virtual void addSu(DimensionedField<vector, volMesh>& field);
+
+ //- Add source to vector field
+ virtual void addSu(DimensionedField<scalar, volMesh>& field);
+
+
+ // I-O
+
+ //- Write the source properties
+ virtual void writeData(Ostream&) const;
+
+ //- Read fieldData in sub-dictionary
+ virtual bool read(const dictionary& dict);
+
+ //- Ostream operator
+ friend Ostream& operator<<
+ (
+ Ostream& os,
+ const explicitSource& source
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "explicitSourceIO.C"
+#include "explicitSourceI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
new file mode 100644
index 00000000000..6ba8c3571fb
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "explicitSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+inline const Foam::explicitSource::volumeModeType&
+Foam::explicitSource::volumeMode() const
+{
+ return volumeMode_;
+}
+
+
+inline Foam::explicitSource::volumeModeType&
+Foam::explicitSource::volumeMode()
+{
+ return volumeMode_;
+}
+
+
+inline const Foam::List<Foam::point>&
+Foam::explicitSource::points() const
+{
+ return points_;
+}
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
new file mode 100644
index 00000000000..b9e3c827079
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "explicitSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::explicitSource::writeData(Ostream& os) const
+{
+ os << indent << name_ << nl
+ << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+ os.writeKeyword("volumeMode") << volumeModeTypeToWord(volumeMode_)
+ << token::END_STATEMENT << nl;
+
+ if (scalarFields_.size() > 0)
+ {
+ os.writeKeyword("scalarFields") << scalarFields_
+ << token::END_STATEMENT << nl;
+ }
+
+ if (vectorFields_.size() > 0)
+ {
+ os.writeKeyword("vectorFields") << vectorFields_
+ << token::END_STATEMENT << nl;
+ }
+
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+bool Foam::explicitSource::read(const dictionary& dict)
+{
+ if (basicSource::read(dict))
+ {
+ const dictionary& sourceDict = dict.subDict(name());
+ const dictionary& subDictCoeffs = sourceDict.subDict(typeName + "Coeffs");
+ setFieldData(subDictCoeffs.subDict("fieldData"));
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const explicitSource& source
+)
+{
+ source.writeData(os);
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
new file mode 100644
index 00000000000..64282fde04c
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "cylindricalInletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::
+cylindricalInletVelocityFvPatchVectorField::
+cylindricalInletVelocityFvPatchVectorField
+(
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF
+)
+:
+ fixedValueFvPatchField<vector>(p, iF),
+ axialVelocity_(0),
+ centre_(pTraits<vector>::zero),
+ axis_(pTraits<vector>::zero),
+ rpm_(0),
+ radialVelocity_(0)
+{}
+
+
+Foam::
+cylindricalInletVelocityFvPatchVectorField::
+cylindricalInletVelocityFvPatchVectorField
+(
+ const cylindricalInletVelocityFvPatchVectorField& ptf,
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+ axialVelocity_(ptf.axialVelocity_),
+ centre_(ptf.centre_),
+ axis_(ptf.axis_),
+ rpm_(ptf.rpm_),
+ radialVelocity_(ptf.radialVelocity_)
+{}
+
+
+Foam::
+cylindricalInletVelocityFvPatchVectorField::
+cylindricalInletVelocityFvPatchVectorField
+(
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchField<vector>(p, iF, dict),
+ axialVelocity_(readScalar(dict.lookup("axialVelocity"))),
+ centre_(dict.lookup("centre")),
+ axis_(dict.lookup("axis")),
+ rpm_(readScalar(dict.lookup("rpm"))),
+ radialVelocity_(readScalar(dict.lookup("radialVelocity")))
+{}
+
+
+Foam::
+cylindricalInletVelocityFvPatchVectorField::
+cylindricalInletVelocityFvPatchVectorField
+(
+ const cylindricalInletVelocityFvPatchVectorField& ptf
+)
+:
+ fixedValueFvPatchField<vector>(ptf),
+ axialVelocity_(ptf.axialVelocity_),
+ centre_(ptf.centre_),
+ axis_(ptf.axis_),
+ rpm_(ptf.rpm_),
+ radialVelocity_(ptf.radialVelocity_)
+{}
+
+
+Foam::
+cylindricalInletVelocityFvPatchVectorField::
+cylindricalInletVelocityFvPatchVectorField
+(
+ const cylindricalInletVelocityFvPatchVectorField& ptf,
+ const DimensionedField<vector, volMesh>& iF
+)
+:
+ fixedValueFvPatchField<vector>(ptf, iF),
+ axialVelocity_(ptf.axialVelocity_),
+ centre_(ptf.centre_),
+ axis_(ptf.axis_),
+ rpm_(ptf.rpm_),
+ radialVelocity_(ptf.radialVelocity_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::cylindricalInletVelocityFvPatchVectorField::updateCoeffs()
+{
+ if (updated())
+ {
+ return;
+ }
+
+ vector hatAxis = axis_/mag(axis_);
+
+ vectorField r = (patch().Cf() - centre_);
+
+ vectorField d = r - (hatAxis & r)*hatAxis;
+
+ vectorField tangVelo =
+ (rpm_*constant::mathematical::pi/30.0)*(hatAxis)^d;
+
+ operator==(tangVelo + axis_*axialVelocity_ + radialVelocity_*d);
+
+ fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::cylindricalInletVelocityFvPatchVectorField::write(Ostream& os) const
+{
+ fvPatchField<vector>::write(os);
+ os.writeKeyword("axialVelocity") << axialVelocity_ <<
+ token::END_STATEMENT << nl;
+ os.writeKeyword("centre") << centre_ << token::END_STATEMENT << nl;
+ os.writeKeyword("axis") << axis_ << token::END_STATEMENT << nl;
+ os.writeKeyword("rpm") << rpm_ << token::END_STATEMENT << nl;
+ os.writeKeyword("radialVelocity") << radialVelocity_ <<
+ token::END_STATEMENT << nl;
+ writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ makePatchTypeField
+ (
+ fvPatchVectorField,
+ cylindricalInletVelocityFvPatchVectorField
+ );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
new file mode 100644
index 00000000000..a08d6801dc7
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::cylindricalInletVelocityFvPatchVectorField
+
+Description
+ Describes an inlet vector boundary condition in cylindrical coordinates
+ given a central axis, central point, rpm, axial and radial velocity.
+
+ Example of the boundary condition specification:
+ @verbatim
+ inlet
+ {
+ type cylindricalInletVelocity;
+ axis (0 0 1);
+ centre (0 0 0);
+ axialVelocity 30;
+ rpm 100;
+ radialVelocity -10;
+ }
+ @endverbatim
+
+
+SourceFiles
+ cylindricalInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cylindricalInletVelocityFvPatchVectorField_H
+#define cylindricalInletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+ Class cylindricalInletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class cylindricalInletVelocityFvPatchVectorField
+:
+ public fixedValueFvPatchVectorField
+{
+ // Private data
+
+ //- Axial velocity
+ scalar axialVelocity_;
+
+ //- Central point
+ vector centre_;
+
+ //- Axis
+ vector axis_;
+
+ //- RPM
+ scalar rpm_;
+
+ //- Radial velocity
+ scalar radialVelocity_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("cylindricalInletVelocity");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ cylindricalInletVelocityFvPatchVectorField
+ (
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ cylindricalInletVelocityFvPatchVectorField
+ (
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given
+ // flowRateInletVelocityFvPatchVectorField
+ // onto a new patch
+ cylindricalInletVelocityFvPatchVectorField
+ (
+ const cylindricalInletVelocityFvPatchVectorField&,
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ cylindricalInletVelocityFvPatchVectorField
+ (
+ const cylindricalInletVelocityFvPatchVectorField&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchVectorField> clone() const
+ {
+ return tmp<fvPatchVectorField>
+ (
+ new cylindricalInletVelocityFvPatchVectorField(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ cylindricalInletVelocityFvPatchVectorField
+ (
+ const cylindricalInletVelocityFvPatchVectorField&,
+ const DimensionedField<vector, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchVectorField> clone
+ (
+ const DimensionedField<vector, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchVectorField>
+ (
+ new cylindricalInletVelocityFvPatchVectorField(*this, iF)
+ );
+ }
+
+
+ // Member functions
+
+
+ //- Update the coefficients associated with the patch field
+ virtual void updateCoeffs();
+
+ //- Write
+ virtual void write(Ostream&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
index bef41d4655c..01e8420fabd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
@@ -10,7 +10,7 @@ License
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
diff --git a/src/turbulenceModels/incompressible/LES/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
index dae51c090a2..70c95e3b59c 100644
--- a/src/turbulenceModels/incompressible/LES/Make/files
+++ b/src/turbulenceModels/incompressible/LES/Make/files
@@ -19,6 +19,7 @@ dynSmagorinsky/dynSmagorinsky.C
LRRDiffStress/LRRDiffStress.C
DeardorffDiffStress/DeardorffDiffStress.C
spectEddyVisc/spectEddyVisc.C
+dynLagrangian/dynLagrangian.C
scaleSimilarity/scaleSimilarity.C
mixedSmagorinsky/mixedSmagorinsky.C
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
new file mode 100644
index 00000000000..f51c2fbb46d
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "dynLagrangian.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(dynLagrangian, 0);
+addToRunTimeSelectionTable(LESModel, dynLagrangian, dictionary);
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void dynLagrangian::updateSubGridScaleFields
+(
+ const tmp<volTensorField>& gradU
+)
+{
+ nuSgs_ = (flm_/fmm_)*delta()*sqrt(k(gradU));
+ nuSgs_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+dynLagrangian::dynLagrangian
+(
+ const volVectorField& U,
+ const surfaceScalarField& phi,
+ transportModel& transport
+)
+:
+ LESModel(typeName, U, phi, transport),
+ GenEddyVisc(U, phi, transport),
+
+ flm_
+ (
+ IOobject
+ (
+ "flm",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh_
+ ),
+ fmm_
+ (
+ IOobject
+ (
+ "fmm",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh_
+ ),
+ theta_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "theta",
+ coeffDict_,
+ 1.5
+ )
+ ),
+ simpleFilter_(U.mesh()),
+ filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
+ filter_(filterPtr_()),
+ flm0_("flm0", flm_.dimensions(), 0.0),
+ fmm0_("fmm0", fmm_.dimensions(), VSMALL)
+{
+ updateSubGridScaleFields(fvc::grad(U));
+
+ printCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void dynLagrangian::correct(const tmp<volTensorField>& gradU)
+{
+ LESModel::correct(gradU);
+
+ volSymmTensorField S = dev(symm(gradU()));
+
+ volScalarField magS = mag(S);
+
+ volVectorField Uf = filter_(U());
+
+ volSymmTensorField Sf = dev(symm(fvc::grad(Uf)));
+
+ volScalarField magSf = mag(Sf);
+
+ volSymmTensorField L = dev(filter_(sqr(U())) - (sqr(filter_(U()))));
+
+ volSymmTensorField M = 2.0*sqr(delta())*(filter_(magS*S) - 4.0*magSf*Sf);
+
+ volScalarField invT =
+ (1.0/(theta_.value()*delta()))*pow(flm_*fmm_, 1.0/8.0);
+
+ volScalarField LM = L && M;
+
+ fvScalarMatrix flmEqn
+ (
+ fvm::ddt(flm_)
+ + fvm::div(phi(), flm_)
+ ==
+ invT*LM
+ - fvm::Sp(invT, flm_)
+ );
+
+ flmEqn.relax();
+ flmEqn.solve();
+
+ bound(flm_, flm0_);
+
+ volScalarField MM = M && M;
+
+ fvScalarMatrix fmmEqn
+ (
+ fvm::ddt(fmm_)
+ + fvm::div(phi(), fmm_)
+ ==
+ invT*MM
+ - fvm::Sp(invT, fmm_)
+ );
+
+ fmmEqn.relax();
+ fmmEqn.solve();
+
+ bound(fmm_, fmm0_);
+
+ updateSubGridScaleFields(gradU);
+}
+
+
+bool dynLagrangian::read()
+{
+ if (GenEddyVisc::read())
+ {
+ filter_.read(coeffDict());
+ theta_.readIfPresent(coeffDict());
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
new file mode 100644
index 00000000000..15efe126559
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::incompressible::LESModels::dynLagrangian
+
+Description
+ Lagrangian Two Equations Eddy Viscosity Model for incompressible
+ flows
+
+ @verbatim
+ B = 2/3*k*I - 2*nuSgs*dev(D)
+ Beff = 2/3*k*I - 2*nuEff*dev(D)
+
+ where
+
+ D = symm(grad(U))
+ nuSgs = (flm/fmm)*delta^2*sqrt(2)*|D|
+ nuEff = nuSgs + nu
+
+ Two relaxation equations are used to evaluate flm and fmm:
+
+ d/dt(flm) + div(U*flm)
+ =
+ (1/T)*(L && M - flm)
+
+ d/dt(fmm) + div(U*fmm)
+ =
+ (1/T)*(M && M - flm)
+
+ where
+
+ L = F(U.U) - F(U).F(U)
+ M = 2.0 delta^2 (F(|D|.D) - 4 F(|D|).F(D))
+ T = 1.5*delta*(flm.fmm)^(-1.0/8.0)
+
+ @endverbatim
+
+ Reference:
+ 1. Charles Meneveau, Thomas Lund and William Cabot
+ "A Lagrangian dynamic subgrid-scale model of turbulence"
+ J. Fluid Mech (1996), vol 319, pp. 353-385
+
+SourceFiles
+ dynLagrangian.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dynLagrangian_H
+#define dynLagrangian_H
+
+#include "GenEddyVisc.H"
+#include "simpleFilter.H"
+#include "LESfilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+ Class dynLagrangian Declaration
+\*---------------------------------------------------------------------------*/
+
+class dynLagrangian
+:
+ public GenEddyVisc
+{
+ // Private data
+
+ volScalarField flm_;
+ volScalarField fmm_;
+
+ dimensionedScalar theta_;
+
+ simpleFilter simpleFilter_;
+ autoPtr<LESfilter> filterPtr_;
+ LESfilter& filter_;
+
+ dimensionedScalar flm0_;
+ dimensionedScalar fmm0_;
+ // Private Member Functions
+
+ //- Update sub-grid scale fields
+ void updateSubGridScaleFields
+ (
+ const tmp<volTensorField>& gradU
+ );
+
+ // Disallow default bitwise copy construct and assignment
+ dynLagrangian(const dynLagrangian&);
+ dynLagrangian& operator=(const dynLagrangian&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("dynLagrangian");
+
+ // Constructors
+
+ //- Construct from components
+ dynLagrangian
+ (
+ const volVectorField& U,
+ const surfaceScalarField& phi,
+ transportModel& transport
+ );
+
+
+ //- Destructor
+ virtual ~dynLagrangian()
+ {}
+
+
+ // Member Functions
+
+ //- Return SGS kinetic energy
+
+ tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
+ {
+ return 2.0*sqr(delta())*magSqr(dev(symm(gradU)));
+ }
+
+ //- Return SGS kinetic energy
+ virtual tmp<volScalarField> k() const
+ {
+ return k(fvc::grad(U()));
+ }
+
+ //- Return the effective diffusivity for k
+ tmp<volScalarField> DkEff() const
+ {
+ return tmp<volScalarField>
+ (
+ new volScalarField("DkEff", nuSgs_ + nu())
+ );
+ }
+
+ //- Correct Eddy-Viscosity and related properties
+ virtual void correct(const tmp<volTensorField>& gradU);
+
+
+ //- Read LESProperties dictionary
+ virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
index 9b95469a648..3712d227bd8 100644
--- a/src/turbulenceModels/incompressible/RAS/Make/files
+++ b/src/turbulenceModels/incompressible/RAS/Make/files
@@ -44,8 +44,8 @@ derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFv
derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
-derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C
-derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C
+derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
similarity index 72%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index a69a36f140c..58a5df9cec4 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "ABLInletEpsilonFvPatchScalarField.H"
+#include "atmBoundaryLayerInletEpsilonFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@@ -39,7 +39,8 @@ namespace incompressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+atmBoundaryLayerInletEpsilonFvPatchScalarField::
+atmBoundaryLayerInletEpsilonFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -49,13 +50,15 @@ ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
Ustar_(0),
z_(pTraits<vector>::zero),
z0_(0),
- kappa_(0.41)
+ kappa_(0.41),
+ zGround_(0)
{}
-ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+atmBoundaryLayerInletEpsilonFvPatchScalarField::
+atmBoundaryLayerInletEpsilonFvPatchScalarField
(
- const ABLInletEpsilonFvPatchScalarField& ptf,
+ const atmBoundaryLayerInletEpsilonFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -65,11 +68,13 @@ ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
Ustar_(ptf.Ustar_),
z_(ptf.z_),
z0_(ptf.z0_),
- kappa_(ptf.kappa_)
+ kappa_(ptf.kappa_),
+ zGround_(ptf.zGround_)
{}
-ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+atmBoundaryLayerInletEpsilonFvPatchScalarField::
+atmBoundaryLayerInletEpsilonFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -80,11 +85,12 @@ ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
Ustar_(readScalar(dict.lookup("Ustar"))),
z_(dict.lookup("z")),
z0_(readScalar(dict.lookup("z0"))),
- kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41))
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ zGround_(readScalar(dict.lookup("zGround")))
{
if (mag(z_) < SMALL)
{
- FatalErrorIn("ABLInletEpsilonFvPatchScalarField(dict)")
+ FatalErrorIn("atmBoundaryLayerInletEpsilonFvPatchScalarField(dict)")
<< "z is not correct"
<< abort(FatalError);
}
@@ -95,9 +101,10 @@ ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
}
-ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+atmBoundaryLayerInletEpsilonFvPatchScalarField::
+atmBoundaryLayerInletEpsilonFvPatchScalarField
(
- const ABLInletEpsilonFvPatchScalarField& fcvpvf,
+ const atmBoundaryLayerInletEpsilonFvPatchScalarField& fcvpvf,
const DimensionedField<scalar, volMesh>& iF
)
:
@@ -105,22 +112,23 @@ ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
Ustar_(fcvpvf.Ustar_),
z_(fcvpvf.z_),
z0_(fcvpvf.z0_),
- kappa_(fcvpvf.kappa_)
+ kappa_(fcvpvf.kappa_),
+ zGround_(fcvpvf.zGround_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void ABLInletEpsilonFvPatchScalarField::updateCoeffs()
+void atmBoundaryLayerInletEpsilonFvPatchScalarField::updateCoeffs()
{
const vectorField& c = patch().Cf();
scalarField coord = (c & z_);
- scalarField::operator=(pow(Ustar_, 3.0)/(kappa_*(coord + z0_)));
+ scalarField::operator=(pow(Ustar_, 3.0)/(kappa_*(coord - zGround_ + z0_)));
}
// Write
-void ABLInletEpsilonFvPatchScalarField::write(Ostream& os) const
+void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
os.writeKeyword("Ustar")
@@ -131,13 +139,19 @@ void ABLInletEpsilonFvPatchScalarField::write(Ostream& os) const
<< z0_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa")
<< kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("zGround")
+ << zGround_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makePatchTypeField(fvPatchScalarField, ABLInletEpsilonFvPatchScalarField);
+makePatchTypeField
+(
+ fvPatchScalarField,
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
similarity index 78%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
index 39560879aa9..89a3cb213bb 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- ABLInletEpsilonFvPatchScalarField
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
Description
Boundary condition specifies a epsilon inlet for the atmospheric boundary
@@ -31,7 +31,7 @@ Description
ABLInletVelocity.
@verbatim
- epsilon = Ustar^3 / (K(z + z0))
+ epsilon = Ustar^3 / (K(z - zGround + z0))
where:
@@ -39,6 +39,7 @@ Description
K is karman's constant
z is the verical coordinate
z0 is the surface roughness lenght
+ zGround minium vlaue in z direction
@endverbatim
@@ -49,12 +50,12 @@ Description
Journal of Wind Engineering and Industrial Aerodynamics 95(2007) 355-369.
SourceFiles
- ABLInletEpsilonFvPatchScalarField.C
+ atmBoundaryLayerInletEpsilonFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
-#ifndef ABLInletEpsilonFvPatchScalarField_H
-#define ABLInletEpsilonFvPatchScalarField_H
+#ifndef atmBoundaryLayerInletEpsilonFvPatchScalarField_H
+#define atmBoundaryLayerInletEpsilonFvPatchScalarField_H
#include "fvPatchFields.H"
#include "fixedValueFvPatchFields.H"
@@ -67,16 +68,16 @@ namespace incompressible
{
/*---------------------------------------------------------------------------*\
- Class ABLInletEpsilonFvPatchScalarField Declaration
+ Class atmBoundaryLayerInletEpsilonFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
-class ABLInletEpsilonFvPatchScalarField
+class atmBoundaryLayerInletEpsilonFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
// Private data
- //- Peak velocity magnitude
+ //- Frictional velocity
scalar Ustar_;
//- Direction of the z-coordinate
@@ -88,34 +89,37 @@ class ABLInletEpsilonFvPatchScalarField
//- Von Karman constant
scalar kappa_;
+ //- Minimum corrdinate value in z direction
+ scalar zGround_;
+
public:
//- Runtime type information
- TypeName("ABLInletEpsilon");
+ TypeName("atmBoundaryLayerInletEpsilon");
// Constructors
//- Construct from patch and internal field
- ABLInletEpsilonFvPatchScalarField
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- ABLInletEpsilonFvPatchScalarField
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const dictionary&
);
- //- Construct by mapping given ABLInletEpsilonFvPatchScalarField
- // onto a new patch
- ABLInletEpsilonFvPatchScalarField
+ //- Construct by mapping given
+ // atmBoundaryLayerInletEpsilonFvPatchScalarField onto a new patch
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
(
- const ABLInletEpsilonFvPatchScalarField&,
+ const atmBoundaryLayerInletEpsilonFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
@@ -126,14 +130,14 @@ public:
{
return tmp<fvPatchScalarField>
(
- new ABLInletEpsilonFvPatchScalarField(*this)
+ new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
- ABLInletEpsilonFvPatchScalarField
+ atmBoundaryLayerInletEpsilonFvPatchScalarField
(
- const ABLInletEpsilonFvPatchScalarField&,
+ const atmBoundaryLayerInletEpsilonFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@@ -145,7 +149,7 @@ public:
{
return tmp<fvPatchScalarField>
(
- new ABLInletEpsilonFvPatchScalarField(*this, iF)
+ new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this, iF)
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
similarity index 60%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index d8e7ae4639b..ad712145fc4 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "ABLInletVelocityFvPatchVectorField.H"
+#include "atmBoundaryLayerInletVelocityFvPatchVectorField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@@ -39,7 +39,8 @@ namespace incompressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+atmBoundaryLayerInletVelocityFvPatchVectorField::
+atmBoundaryLayerInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF
@@ -50,13 +51,17 @@ ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
n_(pTraits<vector>::zero),
z_(pTraits<vector>::zero),
z0_(0),
- kappa_(0.41)
+ kappa_(0.41),
+ Uref_(0),
+ Href_(0),
+ zGround_(0)
{}
-ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+atmBoundaryLayerInletVelocityFvPatchVectorField::
+atmBoundaryLayerInletVelocityFvPatchVectorField
(
- const ABLInletVelocityFvPatchVectorField& ptf,
+ const atmBoundaryLayerInletVelocityFvPatchVectorField& ptf,
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -67,11 +72,15 @@ ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
n_(ptf.n_),
z_(ptf.z_),
z0_(ptf.z0_),
- kappa_(ptf.kappa_)
+ kappa_(ptf.kappa_),
+ Uref_(ptf.Uref_),
+ Href_(ptf.Href_),
+ zGround_(ptf.zGround_)
{}
-ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+atmBoundaryLayerInletVelocityFvPatchVectorField::
+atmBoundaryLayerInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
@@ -79,29 +88,35 @@ ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF),
- Ustar_(readScalar(dict.lookup("Ustar"))),
+ Ustar_(0),
n_(dict.lookup("n")),
z_(dict.lookup("z")),
z0_(readScalar(dict.lookup("z0"))),
- kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41))
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ Uref_(readScalar(dict.lookup("Uref"))),
+ Href_(readScalar(dict.lookup("Href"))),
+ zGround_(readScalar(dict.lookup("zGround")))
{
- if (mag(n_) < SMALL || mag(z_) < SMALL)
+ if (mag(n_) < SMALL || mag(z_) < SMALL || mag(z0_) < SMALL)
{
- FatalErrorIn("ABLInletVelocityFvPatchVectorField(dict)")
- << "n or z given with zero size not correct"
+ FatalErrorIn("atmBoundaryLayerInletVelocityFvPatchVectorField(dict)")
+ << "n, z or z0 given are close to zero is not correct"
<< abort(FatalError);
}
n_ /= mag(n_);
z_ /= mag(z_);
+ Ustar_ = kappa_*Uref_/(log((Href_ + z0_)/min(z0_ , 0.001)));
+
evaluate();
}
-ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+atmBoundaryLayerInletVelocityFvPatchVectorField::
+atmBoundaryLayerInletVelocityFvPatchVectorField
(
- const ABLInletVelocityFvPatchVectorField& fcvpvf,
+ const atmBoundaryLayerInletVelocityFvPatchVectorField& fcvpvf,
const DimensionedField<vector, volMesh>& iF
)
:
@@ -110,41 +125,68 @@ ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
n_(fcvpvf.n_),
z_(fcvpvf.z_),
z0_(fcvpvf.z0_),
- kappa_(fcvpvf.kappa_)
+ kappa_(fcvpvf.kappa_),
+ Uref_(fcvpvf.Uref_),
+ Href_(fcvpvf.Href_),
+ zGround_(fcvpvf.zGround_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void ABLInletVelocityFvPatchVectorField::updateCoeffs()
+void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
{
const vectorField& c = patch().Cf();
scalarField coord = (c & z_);
- vectorField::operator=(n_*(Ustar_/kappa_)*log((coord + z0_)/z0_));
+ scalarField Un(coord.size());
+
+ forAll(coord, i)
+ {
+ if((coord[i] - zGround_) < Href_)
+ {
+ Un[i] = (Ustar_/kappa_)*log((coord[i] - zGround_ + z0_)/z0_);
+ }
+ else
+ {
+ Un[i] = (Uref_);
+ }
+ }
+
+ vectorField::operator=(n_*Un);
+
+ fixedValueFvPatchVectorField::updateCoeffs();
}
// Write
-void ABLInletVelocityFvPatchVectorField::write(Ostream& os) const
+void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
- os.writeKeyword("Ustar")
- << Ustar_ << token::END_STATEMENT << nl;
os.writeKeyword("z0")
<< z0_ << token::END_STATEMENT << nl;
os.writeKeyword("n")
<< n_ << token::END_STATEMENT << nl;
os.writeKeyword("z")
<< z_ << token::END_STATEMENT << nl;
- os.writeKeyword("kappa")
+ os.writeKeyword("kappa")
<< kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("Uref")
+ << Uref_ << token::END_STATEMENT << nl;
+ os.writeKeyword("Href")
+ << Href_ << token::END_STATEMENT << nl;
+ os.writeKeyword("zGround")
+ << zGround_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-makePatchTypeField(fvPatchVectorField, ABLInletVelocityFvPatchVectorField);
+makePatchTypeField
+(
+ fvPatchVectorField,
+ atmBoundaryLayerInletVelocityFvPatchVectorField
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
similarity index 77%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
index 0e7a9167cdb..4f5783bb0fb 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- ABLInletVelocityFvPatchVectorField
+ atmBoundaryLayerInletVelocityFvPatchVectorField
Description
Boundary condition specifies a atmospheric boundary layer (ABL)
@@ -31,7 +31,7 @@ Description
flow direction n and direction of the parabolic coordinate z.
@verbatim
- U = (Ustar/K) ln((z + z0)/z0)
+ U = (Ustar/K) ln((z - zGround + z0)/z0)
where:
@@ -39,6 +39,7 @@ Description
K is karman's constant
z0 is the surface roughness lenght
z is the verical coordinate
+ zGround is the minumum coordinate value in z direction.
and:
@@ -63,12 +64,12 @@ NOTE: D.M. Hargreaves and N.G. Wright recommend Gamma epsilon in the k-epsilon
reference
SourceFiles
- ABLInletVelocityFvPatchVectorField.C
+ atmBoundaryLayerInletVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/
-#ifndef ABLInletVelocityFvPatchVectorField_H
-#define ABLInletVelocityFvPatchVectorField_H
+#ifndef atmBoundaryLayerInletVelocityFvPatchVectorField_H
+#define atmBoundaryLayerInletVelocityFvPatchVectorField_H
#include "fvPatchFields.H"
#include "fixedValueFvPatchFields.H"
@@ -81,16 +82,16 @@ namespace incompressible
{
/*---------------------------------------------------------------------------*\
- Class ABLInletVelocityFvPatchVectorField Declaration
+ Class atmBoundaryLayerInletVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
-class ABLInletVelocityFvPatchVectorField
+class atmBoundaryLayerInletVelocityFvPatchVectorField
:
public fixedValueFvPatchVectorField
{
// Private data
- //- Friction velocity
+ //- Frictional velocity
scalar Ustar_;
//- Flow direction
@@ -105,34 +106,43 @@ class ABLInletVelocityFvPatchVectorField
//- Von Karman constant
scalar kappa_;
+ //- Reference velocity
+ scalar Uref_;
+
+ //- Reference hight
+ scalar Href_;
+
+ //- Minimum corrdinate value in z direction
+ scalar zGround_;
+
public:
//- Runtime type information
- TypeName("ABLInletVelocity");
+ TypeName("atmBoundaryLayerInletVelocity");
// Constructors
//- Construct from patch and internal field
- ABLInletVelocityFvPatchVectorField
+ atmBoundaryLayerInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&
);
//- Construct from patch, internal field and dictionary
- ABLInletVelocityFvPatchVectorField
+ atmBoundaryLayerInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const dictionary&
);
- //- Construct by mapping given ABLInletVelocityFvPatchVectorField
+ //- Construct by mapping given atmBoundaryLayerInletVelocityFvPatchVectorField
// onto a new patch
- ABLInletVelocityFvPatchVectorField
+ atmBoundaryLayerInletVelocityFvPatchVectorField
(
- const ABLInletVelocityFvPatchVectorField&,
+ const atmBoundaryLayerInletVelocityFvPatchVectorField&,
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper&
@@ -143,14 +153,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new ABLInletVelocityFvPatchVectorField(*this)
+ new atmBoundaryLayerInletVelocityFvPatchVectorField(*this)
);
}
//- Construct as copy setting internal field reference
- ABLInletVelocityFvPatchVectorField
+ atmBoundaryLayerInletVelocityFvPatchVectorField
(
- const ABLInletVelocityFvPatchVectorField&,
+ const atmBoundaryLayerInletVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>&
);
@@ -162,14 +172,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new ABLInletVelocityFvPatchVectorField(*this, iF)
+ new atmBoundaryLayerInletVelocityFvPatchVectorField(*this, iF)
);
}
// Member functions
- //- Return max value
+ //- Return Ustar
scalar& Ustar()
{
return Ustar_;
@@ -181,7 +191,7 @@ public:
return n_;
}
- //- Return y direction
+ //- Return z direction
vector& z()
{
return z_;
--
GitLab
From 0b03e7e08cc41f2ba607bb3a4e6a6a2ad8a8145c Mon Sep 17 00:00:00 2001
From: sergio <s.ferraris@opencfd.co.uk>
Date: Tue, 22 Jun 2010 18:17:00 +0100
Subject: [PATCH 77/77] BUG: Change of name for swirlFlowRateInlet and change
in the constructor of dynLagrangian
---
...lFlowRateInletVelocityFvPatchVectorField.H | 36 +++++++++----------
.../LES/dynLagrangian/dynLagrangian.C | 5 +--
.../LES/dynLagrangian/dynLagrangian.H | 5 +--
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
index bef41d4655c..199a9957804 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::swirlMassFlowRateInletVelocityFvPatchVectorField
+ Foam::swirlFlowRateInletVelocityFvPatchVectorField
Description
Describes a volumetric/mass flow normal vector boundary condition by its
@@ -39,7 +39,7 @@ Description
@verbatim
inlet
{
- type swirlMassFlowRateInletVelocity;
+ type swirlFlowRateInletVelocity;
flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
rpm 100;
}
@@ -49,12 +49,12 @@ Note
- The value is positive inwards
SourceFiles
- swirlMassFlowRateInletVelocityFvPatchVectorField.C
+ swirlFlowRateInletVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/
-#ifndef swirlMassFlowRateInletVelocityFvPatchVectorField_H
-#define swirlMassFlowRateInletVelocityFvPatchVectorField_H
+#ifndef swirlFlowRateInletVelocityFvPatchVectorField_H
+#define swirlFlowRateInletVelocityFvPatchVectorField_H
#include "fixedValueFvPatchFields.H"
@@ -63,10 +63,10 @@ SourceFiles
namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class swirlMassFlowRateInletVelocityFvPatchVectorField Declaration
+ Class swirlFlowRateInletVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
-class swirlMassFlowRateInletVelocityFvPatchVectorField
+class swirlFlowRateInletVelocityFvPatchVectorField
:
public fixedValueFvPatchVectorField
{
@@ -88,20 +88,20 @@ class swirlMassFlowRateInletVelocityFvPatchVectorField
public:
//- Runtime type information
- TypeName("swirlMassFlowRateInletVelocity");
+ TypeName("swirlFlowRateInletVelocity");
// Constructors
//- Construct from patch and internal field
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&
);
//- Construct from patch, internal field and dictionary
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&,
@@ -111,18 +111,18 @@ public:
//- Construct by mapping given
// flowRateInletVelocityFvPatchVectorField
// onto a new patch
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&,
+ const swirlFlowRateInletVelocityFvPatchVectorField&,
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&
+ const swirlFlowRateInletVelocityFvPatchVectorField&
);
//- Construct and return a clone
@@ -130,14 +130,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlMassFlowRateInletVelocityFvPatchVectorField(*this)
+ new swirlFlowRateInletVelocityFvPatchVectorField(*this)
);
}
//- Construct as copy setting internal field reference
- swirlMassFlowRateInletVelocityFvPatchVectorField
+ swirlFlowRateInletVelocityFvPatchVectorField
(
- const swirlMassFlowRateInletVelocityFvPatchVectorField&,
+ const swirlFlowRateInletVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>&
);
@@ -149,7 +149,7 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlMassFlowRateInletVelocityFvPatchVectorField(*this, iF)
+ new swirlFlowRateInletVelocityFvPatchVectorField(*this, iF)
);
}
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
index f51c2fbb46d..505aeeabbad 100644
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
@@ -59,10 +59,11 @@ dynLagrangian::dynLagrangian
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, U, phi, transport, turbulenceModelName),
GenEddyVisc(U, phi, transport),
flm_
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
index 15efe126559..0d82201d722 100644
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
@@ -58,7 +58,7 @@ Description
@endverbatim
Reference:
- 1. Charles Meneveau, Thomas Lund and William Cabot
+ 1. Charles Meneveau, Thomas Lund and William Cabot
"A Lagrangian dynamic subgrid-scale model of turbulence"
J. Fluid Mech (1996), vol 319, pp. 353-385
@@ -129,7 +129,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
--
GitLab