diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H
index 3b61f2c7b95cfd705eb219d208fcd55f5dc02185..4a2d03490db107c7ed502fa4dfa772afb109308c 100644
--- a/applications/solvers/combustion/fireFoam/UEqn.H
+++ b/applications/solvers/combustion/fireFoam/UEqn.H
@@ -7,30 +7,13 @@ fvVectorMatrix UEqn
UEqn.relax();
-if (oCorr == nOuterCorr - 1)
-{
- solve
- (
- UEqn
- ==
- fvc::reconstruct
- (
- fvc::interpolate(rho)*(g & mesh.Sf())
- - fvc::snGrad(p)*mesh.magSf()
- ),
- mesh.solver("UFinal")
- );
-}
-else
-{
- solve
+solve
+(
+ UEqn
+ ==
+ fvc::reconstruct
(
- UEqn
- ==
- fvc::reconstruct
- (
- fvc::interpolate(rho)*(g & mesh.Sf())
- - fvc::snGrad(p)*mesh.magSf()
- )
- );
-}
+ fvc::interpolate(rho)*(g & mesh.Sf())
+ - fvc::snGrad(p)*mesh.magSf()
+ )
+);
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 20f418e0359d0cfd5776ad19f56303118bafcf59..cff27389d057244a6b488fe0fc8211793bc7db4f 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -70,6 +70,12 @@ int main(int argc, char *argv[])
// --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
#include "UEqn.H"
#include "ftEqn.H"
@@ -80,6 +86,11 @@ int main(int argc, char *argv[])
{
#include "pEqn.H"
}
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
turbulence->correct();
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 907398581f2db2bc49275614b726c2ca2aeedabe..8d1ed0d9f8e488135aeeeb3cff8ee731b82fc362 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -30,14 +30,20 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
closedVolume = p.needReference();
- if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve(mesh.solver(p.name()));
- }
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
index a58cd28decb0cf466b393e4dda16144fd2664c54..c76ab5110b5464560323974fb1583eded02baa48 100644
--- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
@@ -31,14 +31,20 @@
- fvm::laplacian(rho*rUA, p)
);
- if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve();
- }
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
@@ -64,14 +70,20 @@
- fvm::laplacian(rho*rUA, p)
);
- if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve();
- }
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 3a5bb614fe59093e6e5f0f0f0e90c85d9b990458..e361d5f0ccf0cce639c9e8298dd8f67e0e9f0864 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -69,8 +69,14 @@ int main(int argc, char *argv[])
#include "chemistry.H"
#include "rhoEqn.H"
- for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
+ for (label oCorr=1; oCorr <= nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
@@ -80,6 +86,11 @@ int main(int argc, char *argv[])
{
#include "pEqn.H"
}
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
turbulence->correct();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 9c12cf95853dc73df86a65969425653ed98ff701..954907d2039d4d5c8d555c506db2196939a6275b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -7,27 +7,13 @@ tmp<fvVectorMatrix> UEqn
+ turbulence->divDevRhoReff(U)
);
-if (oCorr == nOuterCorr-1)
-{
- UEqn().relax(1);
-}
-else
-{
- UEqn().relax();
-}
+UEqn().relax();
volScalarField rUA = 1.0/UEqn().A();
if (momentumPredictor)
{
- if (oCorr == nOuterCorr-1)
- {
- solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
- }
- else
- {
- solve(UEqn() == -fvc::grad(p));
- }
+ solve(UEqn() == -fvc::grad(p));
}
else
{
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 1433ea5cc3d7180c4310f7b0710b913025030977..4642e10ef8aa6f20ae17e49072bf9021a0f0d33f 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -37,12 +37,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
-
- dimensionedScalar pMin
- (
- mesh.solutionDict().subDict("PIMPLE").lookup("pMin")
- );
+ #include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::turbulenceModel> turbulence
@@ -56,9 +51,6 @@
)
);
- //dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-
Info<< "Creating field DpDt\n" << endl;
volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index e66b99442b87bd6e3a4fdeb4025e94f5f88e09c3..3125cc3ffa86ce120e7dbbf774c9b46941105418 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
@@ -8,16 +8,8 @@
DpDt
);
- if (oCorr == nOuterCorr-1)
- {
- hEqn.relax();
- hEqn.solve(mesh.solver("hFinal"));
- }
- else
- {
- hEqn.relax();
- hEqn.solve();
- }
+ hEqn.relax();
+ hEqn.solve();
thermo.correct();
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 0f3dfe450bccd217fa4e12925d8a5f082ce31b02..c0dba194e759138d977b5e2caed68470a668f805 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -1,6 +1,5 @@
rho = thermo.rho();
-volScalarField rUA = 1.0/UEqn().A();
U = rUA*UEqn().H();
if (nCorr <= 1)
@@ -29,19 +28,20 @@ if (transonic)
- fvm::laplacian(rho*rUA, p)
);
- if
+ pEqn.solve
(
- oCorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver("pFinal"));
- }
- else
- {
- pEqn.solve();
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
@@ -55,7 +55,7 @@ else
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
- //+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ + fvc::ddtPhiCorr(rUA, rho, U, phi)
);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@@ -68,19 +68,20 @@ else
- fvm::laplacian(rho*rUA, p)
);
- if
+ pEqn.solve
(
- oCorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver("pFinal"));
- }
- else
- {
- pEqn.solve();
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
@@ -92,30 +93,15 @@ else
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
-//if (oCorr != nOuterCorr-1)
-{
- // Explicitly relax pressure for momentum corrector
- p.relax();
+// Explicitly relax pressure for momentum corrector
+p.relax();
- rho = thermo.rho();
- rho.relax();
- Info<< "rho max/min : " << max(rho).value()
- << " " << min(rho).value() << endl;
-}
+// Recalculate density from the relaxed pressure
+rho = thermo.rho();
+Info<< "rho max/min : " << max(rho).value()
+ << " " << min(rho).value() << endl;
U -= rUA*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
-bound(p, pMin);
-
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-/*
-if (closedVolume)
-{
- p += (initialMass - fvc::domainIntegrate(psi*p))
- /fvc::domainIntegrate(psi);
-}
-*/
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index d4055f658d8d9ce7465d20f93b111504baa16d4b..5d21da05b691bdd1115122a1f4d68f96cceaf00d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -61,15 +61,22 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- if (nOuterCorr != 1)
- {
- p.storePrevIter();
- rho.storePrevIter();
- }
+ #include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
+ if (nOuterCorr != 1)
+ {
+ p.storePrevIter();
+ }
+
#include "UEqn.H"
#include "hEqn.H"
@@ -80,6 +87,11 @@ int main(int argc, char *argv[])
}
turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
runTime.write();
diff --git a/applications/solvers/compressible/rhoPisoFoam/Make/files b/applications/solvers/compressible/rhoPisoFoam/Make/files
deleted file mode 100644
index 3c89295014693585df9676cb3f038822e60890b6..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rhoPisoFoam.C
-
-EXE = $(FOAM_APPBIN)/rhoPisoFoam
diff --git a/applications/solvers/compressible/rhoPisoFoam/Make/options b/applications/solvers/compressible/rhoPisoFoam/Make/options
deleted file mode 100644
index 5c62488b65de9f1b72867d7c57c0dd9ba15413fb..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/Make/options
+++ /dev/null
@@ -1,13 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
- -lfiniteVolume \
- -lmeshTools \
- -lbasicThermophysicalModels \
- -lspecie \
- -lcompressibleRASModels \
- -lcompressibleLESModels
diff --git a/applications/solvers/compressible/rhoPisoFoam/UEqn.H b/applications/solvers/compressible/rhoPisoFoam/UEqn.H
deleted file mode 100644
index 64dd52b1b0afbbf85882edd8431528f6b17c7a36..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/UEqn.H
+++ /dev/null
@@ -1,11 +0,0 @@
- fvVectorMatrix UEqn
- (
- fvm::ddt(rho, U)
- + fvm::div(phi, U)
- + turbulence->divDevRhoReff(U)
- );
-
- if (momentumPredictor)
- {
- solve(UEqn == -fvc::grad(p));
- }
diff --git a/applications/solvers/compressible/rhoPisoFoam/createFields.H b/applications/solvers/compressible/rhoPisoFoam/createFields.H
deleted file mode 100644
index fdb706a14ce0651bf3722244ea51dae8c0df2d6b..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/createFields.H
+++ /dev/null
@@ -1,58 +0,0 @@
- Info<< "Reading thermophysical properties\n" << endl;
-
- autoPtr<basicPsiThermo> pThermo
- (
- basicPsiThermo::New(mesh)
- );
- basicPsiThermo& thermo = pThermo();
-
- volScalarField& p = thermo.p();
- volScalarField& h = thermo.h();
- const volScalarField& psi = thermo.psi();
-
- volScalarField rho
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- thermo.rho()
- );
-
- Info<< "\nReading field U\n" << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
-# include "compressibleCreatePhi.H"
-
-
- Info<< "Creating turbulence model\n" << endl;
- autoPtr<compressible::turbulenceModel> turbulence
- (
- compressible::turbulenceModel::New
- (
- rho,
- U,
- phi,
- thermo
- )
- );
-
-
- Info<< "Creating field DpDt\n" << endl;
- volScalarField DpDt =
- fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
diff --git a/applications/solvers/compressible/rhoPisoFoam/hEqn.H b/applications/solvers/compressible/rhoPisoFoam/hEqn.H
deleted file mode 100644
index ae60d3316ec77061804e629360ed13f6cd891f68..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/hEqn.H
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- solve
- (
- fvm::ddt(rho, h)
- + fvm::div(phi, h)
- - fvm::laplacian(turbulence->alphaEff(), h)
- ==
- DpDt
- );
-
- thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoPisoFoam/pEqn.H b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
deleted file mode 100644
index 280842ecc3874e9ba634fd997b194fd940635a57..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H
+++ /dev/null
@@ -1,68 +0,0 @@
-rho = thermo.rho();
-
-volScalarField rUA = 1.0/UEqn.A();
-U = rUA*UEqn.H();
-
-if (transonic)
-{
- surfaceScalarField phid
- (
- "phid",
- fvc::interpolate(psi)
- *(
- (fvc::interpolate(U) & mesh.Sf())
- + fvc::ddtPhiCorr(rUA, rho, U, phi)
- )
- );
-
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::ddt(psi, p)
- + fvm::div(phid, p)
- - fvm::laplacian(rho*rUA, p)
- );
-
- pEqn.solve();
-
- if (nonOrth == nNonOrthCorr)
- {
- phi == pEqn.flux();
- }
- }
-}
-else
-{
- phi =
- fvc::interpolate(rho)*
- (
- (fvc::interpolate(U) & mesh.Sf())
- + fvc::ddtPhiCorr(rUA, rho, U, phi)
- );
-
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::ddt(psi, p)
- + fvc::div(phi)
- - fvm::laplacian(rho*rUA, p)
- );
-
- pEqn.solve();
-
- if (nonOrth == nNonOrthCorr)
- {
- phi += pEqn.flux();
- }
- }
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-U -= rUA*fvc::grad(p);
-U.correctBoundaryConditions();
-
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
deleted file mode 100644
index 105717378e0db4b4dee80e6c1125a43bb997e853..0000000000000000000000000000000000000000
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ /dev/null
@@ -1,93 +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/>.
-
-Application
- rhoPisoFoam
-
-Description
- Transient PISO solver for compressible, laminar or turbulent flow.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "basicPsiThermo.H"
-#include "turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
- #include "setRootCase.H"
-
- #include "createTime.H"
- #include "createMesh.H"
- #include "createFields.H"
- #include "initContinuityErrs.H"
- #include "readTimeControls.H"
- #include "compressibleCourantNo.H"
- #include "setInitialDeltaT.H"
-
-
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
- Info<< "\nStarting time loop\n" << endl;
-
- while (runTime.run())
- {
- #include "readTimeControls.H"
- #include "readPISOControls.H"
- #include "compressibleCourantNo.H"
- #include "setDeltaT.H"
-
- runTime++;
-
- Info<< "Time = " << runTime.timeName() << nl << endl;
-
- #include "rhoEqn.H"
- #include "UEqn.H"
-
- // --- PISO loop
- for (int corr=1; corr<=nCorr; corr++)
- {
- #include "hEqn.H"
- #include "pEqn.H"
- }
-
- turbulence->correct();
-
- rho = thermo.rho();
-
- runTime.write();
-
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
- }
-
- Info<< "End\n" << endl;
-
- return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
index 3b4ead17e7cdfc69b84a104453844ae5daac3478..a331d7dbb8413ef3d8a246d50fbce8650316ab22 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
@@ -7,14 +7,7 @@ tmp<fvVectorMatrix> UEqn
+ turbulence->divDevRhoReff(U)
);
-if (oCorr == nOuterCorr-1)
-{
- UEqn().relax(1);
-}
-else
-{
- UEqn().relax();
-}
+UEqn().relax();
mrfZones.addCoriolis(rho, UEqn());
pZones.addResistance(UEqn());
@@ -23,14 +16,7 @@ volScalarField rUA = 1.0/UEqn().A();
if (momentumPredictor)
{
- if (oCorr == nOuterCorr-1)
- {
- solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
- }
- else
- {
- solve(UEqn() == -fvc::grad(p));
- }
+ solve(UEqn() == -fvc::grad(p));
}
else
{
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
index c74fb4d84b93c29385d419d6b858c234742e3a9d..56f8e9f3b5e986bb90fb0f162d00dcfcf6e8d38b 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
@@ -30,19 +30,20 @@ if (transonic)
- fvm::laplacian(rho*rUA, p)
);
- if
+ pEqn.solve
(
- oCorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver("pFinal"));
- }
- else
- {
- pEqn.solve();
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
@@ -70,19 +71,20 @@ else
- fvm::laplacian(rho*rUA, p)
);
- if
+ pEqn.solve
(
- oCorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver("pFinal"));
- }
- else
- {
- pEqn.solve();
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 4bae5c1e7bcd8b0363dc660e52697983221db003..7f93493f3b981022909f9a4bea2bacf14129983d 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -65,17 +65,23 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- if (nOuterCorr != 1)
- {
- p.storePrevIter();
- rho.storePrevIter();
- }
-
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
+ if (nOuterCorr != 1)
+ {
+ p.storePrevIter();
+ rho.storePrevIter();
+ }
+
#include "UEqn.H"
#include "hEqn.H"
@@ -86,6 +92,11 @@ int main(int argc, char *argv[])
}
turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
runTime.write();
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index faa6108fb4d9b95f67fc9ff0d1e7a3294e846585..efad823a91243bbe1d3583fa1fee3a3b22553081 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -45,9 +45,14 @@
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
- dimensionedScalar pMin
+ dimensionedScalar rhoMax
(
- mesh.solutionDict().subDict("SIMPLE").lookup("pMin")
+ mesh.solutionDict().subDict("SIMPLE").lookup("rhoMax")
+ );
+
+ dimensionedScalar rhoMin
+ (
+ mesh.solutionDict().subDict("SIMPLE").lookup("rhoMin")
);
Info<< "Creating turbulence model\n" << endl;
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
index 9e5138de8ad858455caa6a8d165a6b281ce6f8cc..ff0b91bcb7aa71baafec4132306043b07b6ffd04 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
@@ -5,8 +5,8 @@
- fvm::Sp(fvc::div(phi), h)
- fvm::laplacian(turbulence->alphaEff(), h)
==
- fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p, "div(U,p)"))
- - p*fvc::div(phi/fvc::interpolate(rho))
+ fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)")
+ - (rho/psi)*fvc::div(phi/fvc::interpolate(rho))
);
pZones.addEnthalpySource(thermo, rho, hEqn);
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
index 40b7cb3969356394cfc83697a8b31444d402df30..0386899612bc2aeaae763494139ed996d79acf4f 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
@@ -1,3 +1,8 @@
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+
if (pressureImplicitPorosity)
{
U = trTU()&UEqn().H();
@@ -58,8 +63,6 @@ else
U.correctBoundaryConditions();
-bound(p, pMin);
-
// For closed-volume cases adjust the pressure and density levels
// to obey overall mass continuity
if (closedVolume)
@@ -69,5 +72,7 @@ if (closedVolume)
}
rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
rho.relax();
Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 122280cfac48ecd0264c6463fa711928868d7c52..aa3de6d6fbfd9c462d57057451c9f723cede8221 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -37,7 +37,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
label pRefCell = 0;
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..19c4661a3c1187bcdbe14e8cffa1bc54f54ca5b8
--- /dev/null
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files
@@ -0,0 +1,3 @@
+buoyantBoussinesqPimpleFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantBoussinesqPimpleFoam
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/options
rename to applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
similarity index 99%
rename from applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/TEqn.H
rename to applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
index ece4b8ffe5c70d80f68e7093baffe960d5e76433..a7a019a2103bbbb61a7591ae88ef2df2b9d69ad1 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/TEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
@@ -13,7 +13,6 @@
);
TEqn.relax();
-
TEqn.solve();
rhok = 1.0 - beta*(T - TRef);
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H
rename to applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
similarity index 77%
rename from applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
rename to applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index 0269b95c900303a564f74eeed508598ec6a10f88..a035a20febe2af52d6cd021432b58dc810837764 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
- buoyantBoussinesqPisoFoam
+ buoyantBoussinesqPimpleFoam
Description
Transient solver for buoyant, turbulent flow of incompressible fluids
@@ -72,21 +72,41 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readTimeControls.H"
- #include "readPISOControls.H"
+ #include "readPIMPLEControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"
- #include "UEqn.H"
- #include "TEqn.H"
-
- // --- PISO loop
- for (int corr=0; corr<nCorr; corr++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
- #include "pEqn.H"
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
+ if (nOuterCorr != 1)
+ {
+ p.storePrevIter();
+ }
+
+ #include "UEqn.H"
+ #include "TEqn.H"
+
+ // --- PISO loop
+ for (int corr=0; corr<nCorr; corr++)
+ {
+ #include "pEqn.H"
+ }
+
+ turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
- turbulence->correct();
-
runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
similarity index 92%
rename from applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H
rename to applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
index dde0e38b339348ac1693d4bfdf3da9889610a354..704918bb0958698acbefd505b91e4bbe821c9720 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
@@ -42,9 +42,9 @@
mesh
);
-# include "createPhi.H"
+ #include "createPhi.H"
-# include "readTransportProperties.H"
+ #include "readTransportProperties.H"
Info<< "Creating turbulence model\n" << endl;
autoPtr<incompressible::RASModel> turbulence
@@ -57,7 +57,7 @@
setRefCell
(
p,
- mesh.solutionDict().subDict("PISO"),
+ mesh.solutionDict().subDict("PIMPLE"),
pRefCell,
pRefValue
);
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..21be033f9bc5a209848fb1198fddfd4f8cbf9cfa
--- /dev/null
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -0,0 +1,52 @@
+{
+ volScalarField rUA("rUA", 1.0/UEqn.A());
+ surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA));
+
+ U = rUA*UEqn.H();
+
+ phi = (fvc::interpolate(U) & mesh.Sf())
+ + fvc::ddtPhiCorr(rUA, U, phi);
+
+ surfaceScalarField buoyancyPhi =
+ rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
+ phi += buoyancyPhi;
+
+ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+ {
+ fvScalarMatrix pEqn
+ (
+ fvm::laplacian(rUAf, p) == fvc::div(phi)
+ );
+
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
+
+ if (nonOrth == nNonOrthCorr)
+ {
+ // Calculate the conservative fluxes
+ phi -= pEqn.flux();
+
+ // Explicitly relax pressure for momentum corrector
+ p.relax();
+
+ // Correct the momentum source with the pressure gradient flux
+ // calculated from the relaxed pressure
+ U += rUA*fvc::reconstruct((buoyancyPhi - pEqn.flux())/rUAf);
+ U.correctBoundaryConditions();
+ }
+ }
+
+ #include "continuityErrs.H"
+}
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files
deleted file mode 100644
index d7b85221d8cc06678b43d79372979e01f5606600..0000000000000000000000000000000000000000
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-buoyantBoussinesqPisoFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantBoussinesqPisoFoam
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H
deleted file mode 100644
index ff0c26f05893f6e625e7a8a5193c2f6a08882bc5..0000000000000000000000000000000000000000
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- volScalarField rUA("rUA", 1.0/UEqn.A());
- surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA));
-
- U = rUA*UEqn.H();
-
- surfaceScalarField phiU
- (
- (fvc::interpolate(U) & mesh.Sf())
- + fvc::ddtPhiCorr(rUA, U, phi)
- );
-
- phi = phiU + rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
-
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::laplacian(rUAf, p) == fvc::div(phi)
- );
-
- if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve(mesh.solver(p.name()));
- }
-
- if (nonOrth == nNonOrthCorr)
- {
- phi -= pEqn.flux();
- }
- }
-
- U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
- U.correctBoundaryConditions();
-
- #include "continuityErrs.H"
-}
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..f4053436b5fd0f2f6b85604b905f5b40e52b2bc7
--- /dev/null
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files
@@ -0,0 +1,3 @@
+buoyantPimpleFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantPimpleFoam
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/Make/options
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
similarity index 76%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index cc649d221dca77c54830a752380f7e6076e056cd..c4ac77758e84d330cf24563591abed35b8430b36 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
- buoyantPisoFoam
+ buoyantPimpleFoam
Description
Transient solver for buoyant, turbulent flow of compressible fluids for
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
- #include "readPISOControls.H"
+ #include "readPIMPLEControls.H"
#include "compressibleCourantNo.H"
#include "setDeltaT.H"
@@ -69,21 +69,39 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
- #include "UEqn.H"
-
- #include "hEqn.H"
-
- // --- PISO loop
-
- for (int corr=0; corr<nCorr; corr++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
- #include "pEqn.H"
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
+ if (nOuterCorr != 1)
+ {
+ p.storePrevIter();
+ }
+
+ #include "UEqn.H"
+ #include "hEqn.H"
+
+ // --- PISO loop
+ for (int corr=0; corr<nCorr; corr++)
+ {
+ #include "pEqn.H"
+ }
+
+ turbulence->correct();
+
+ rho = thermo.rho();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
- turbulence->correct();
-
- rho = thermo.rho();
-
runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
similarity index 58%
rename from applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
rename to applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index c954c0ecb193a86033981bc7123725bc9335a9cc..a1c3dbfed59fb52e459c460e2c439290499f5300 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -12,16 +12,15 @@
U = rUA*UEqn.H();
- surfaceScalarField phiU
+ phi = fvc::interpolate(rho)*
(
- fvc::interpolate(rho)
- *(
- (fvc::interpolate(U) & mesh.Sf())
- + fvc::ddtPhiCorr(rUA, rho, U, phi)
- )
+ (fvc::interpolate(U) & mesh.Sf())
+ + fvc::ddtPhiCorr(rUA, rho, U, phi)
);
- phi = phiU + rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
+ surfaceScalarField buoyancyPhi =
+ rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
+ phi += buoyancyPhi;
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
@@ -32,27 +31,39 @@
- fvm::laplacian(rhorUAf, p)
);
- if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve(mesh.solver(p.name()));
- }
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
+ // Calculate the conservative fluxes
phi += pEqn.flux();
+
+ // Explicitly relax pressure for momentum corrector
+ p.relax();
+
+ // Correct the momentum source with the pressure gradient flux
+ // calculated from the relaxed pressure
+ U += rUA*fvc::reconstruct((buoyancyPhi + pEqn.flux())/rhorUAf);
+ U.correctBoundaryConditions();
}
}
// Second part of thermodynamic density update
thermo.rho() += psi*p;
- U += rUA*fvc::reconstruct((phi - phiU)/rhorUAf);
- U.correctBoundaryConditions();
-
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
#include "rhoEqn.H"
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files b/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files
deleted file mode 100644
index 65e5d52305884cf1ae68525236f7aee9537a4528..0000000000000000000000000000000000000000
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-buoyantPisoFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantPisoFoam
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index b0aa0852b2e9b30eb0dcb33d9191bca176ab6bcd..de368a646ef4fc6dd565150fdcda0d5c2a78789b 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -22,16 +22,7 @@
);
pEqn.setReference(pRefCell, pRefValue);
-
- // retain the residual from the first iteration
- if (nonOrth == 0)
- {
- pEqn.solve();
- }
- else
- {
- pEqn.solve();
- }
+ pEqn.solve();
if (nonOrth == nNonOrthCorr)
{
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H b/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
deleted file mode 100644
index 2876a48b524bd687c99ae34b3a6a786e5cb4d4fe..0000000000000000000000000000000000000000
--- a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
+++ /dev/null
@@ -1,16 +0,0 @@
- fvVectorMatrix UEqn
- (
- fvm::ddt(U)
- + fvm::div(phi, U)
- + turbulence->divDevReff(U)
- );
-
- if (ocorr != nOuterCorr-1)
- {
- UEqn.relax();
- }
-
- if (momentumPredictor)
- {
- solve(UEqn == -fvc::grad(p));
- }
diff --git a/applications/solvers/incompressible/pimpleFoam/Allwmake b/applications/solvers/incompressible/pimpleFoam/Allwmake
new file mode 100755
index 0000000000000000000000000000000000000000..71517c7319a3a4cba1294240e9303dcdd8339fb0
--- /dev/null
+++ b/applications/solvers/incompressible/pimpleFoam/Allwmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+set -x
+
+wmake
+wmake pimpleDyMFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index 12b4260e5df4e598ec73ff095a8aef7b2cc9bb37..3574c6553a57a632d982afa53c3be42de27a62d4 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -7,27 +7,13 @@ tmp<fvVectorMatrix> UEqn
+ turbulence->divDevReff(U)
);
-if (oCorr == nOuterCorr-1)
-{
- UEqn().relax(1);
-}
-else
-{
- UEqn().relax();
-}
+UEqn().relax();
volScalarField rUA = 1.0/UEqn().A();
if (momentumPredictor)
{
- if (oCorr == nOuterCorr-1)
- {
- solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
- }
- else
- {
- solve(UEqn() == -fvc::grad(p));
- }
+ solve(UEqn() == -fvc::grad(p));
}
else
{
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index 41f99bb542daa9807fe751646c95dba5cfc4458c..b5dc23a58cf17caa05252a4470fe174f07cacc27 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -21,19 +21,20 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
pEqn.setReference(pRefCell, pRefValue);
- if
+ pEqn.solve
(
- oCorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver("pFinal"));
- }
- else
- {
- pEqn.solve();
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
@@ -43,11 +44,8 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
#include "continuityErrs.H"
-// Explicitly relax pressure for momentum corrector except for last corrector
-if (oCorr != nOuterCorr-1)
-{
- p.relax();
-}
+// Explicitly relax pressure for momentum corrector
+p.relax();
U -= rUA*fvc::grad(p);
U.correctBoundaryConditions();
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/Make/files b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files
similarity index 100%
rename from applications/solvers/incompressible/pimpleDyMFoam/Make/files
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/files
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
similarity index 98%
rename from applications/solvers/incompressible/pimpleDyMFoam/Make/options
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
index 40023adad7a3b150ea40976aca75dd5b8d86b4df..6af3735d637198e7992f1c8d678211d8c42a94b4 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I.. \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
similarity index 100%
rename from applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
similarity index 100%
rename from applications/solvers/incompressible/pimpleDyMFoam/createFields.H
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..155f43a6328d8acaf6aac801960f909d31784d4b
--- /dev/null
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -0,0 +1,55 @@
+U = rAU*UEqn().H();
+
+if (nCorr <= 1)
+{
+ UEqn.clear();
+}
+
+phi = (fvc::interpolate(U) & mesh.Sf());
+
+if (p.needReference())
+{
+ fvc::makeRelative(phi, U);
+ adjustPhi(phi, U, p);
+ fvc::makeAbsolute(phi, U);
+}
+
+for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+{
+ fvScalarMatrix pEqn
+ (
+ fvm::laplacian(rAU, p) == fvc::div(phi)
+ );
+
+ pEqn.setReference(pRefCell, pRefValue);
+
+ pEqn.solve
+ (
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
+
+ if (nonOrth == nNonOrthCorr)
+ {
+ phi -= pEqn.flux();
+ }
+}
+
+#include "continuityErrs.H"
+
+p.relax();
+
+// Make the fluxes relative to the mesh motion
+fvc::makeRelative(phi, U);
+
+U -= rAU*fvc::grad(p);
+U.correctBoundaryConditions();
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
similarity index 65%
rename from applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index ccb209b61ac838c97d5909fa6cf4ae9ed08d38da..0ec3c5b0aaca02af488ba38022e999db8d0db1c1 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -84,8 +84,14 @@ int main(int argc, char *argv[])
}
// --- PIMPLE loop
- for (int ocorr=0; ocorr<nOuterCorr; ocorr++)
+ for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
if (nOuterCorr != 1)
{
p.storePrevIter();
@@ -96,62 +102,15 @@ int main(int argc, char *argv[])
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
- rAU = 1.0/UEqn.A();
-
- U = rAU*UEqn.H();
- phi = (fvc::interpolate(U) & mesh.Sf());
-
- if (p.needReference())
- {
- fvc::makeRelative(phi, U);
- adjustPhi(phi, U, p);
- fvc::makeAbsolute(phi, U);
- }
-
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::laplacian(rAU, p) == fvc::div(phi)
- );
-
- pEqn.setReference(pRefCell, pRefValue);
-
- if
- (
- ocorr == nOuterCorr-1
- && corr == nCorr-1
- && nonOrth == nNonOrthCorr)
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve(mesh.solver(p.name()));
- }
-
- if (nonOrth == nNonOrthCorr)
- {
- phi -= pEqn.flux();
- }
- }
-
- #include "continuityErrs.H"
-
- // Explicitly relax pressure for momentum corrector
- if (ocorr != nOuterCorr-1)
- {
- p.relax();
- }
-
- // Make the fluxes relative to the mesh motion
- fvc::makeRelative(phi, U);
-
- U -= rAU*fvc::grad(p);
- U.correctBoundaryConditions();
+ #include "pEqn.H"
}
turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
runTime.write();
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
similarity index 100%
rename from applications/solvers/incompressible/pimpleDyMFoam/readControls.H
rename to applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 5fb87ef128eaf452c8e014588e7600f084751838..780c51e7f3c73a4b5b2075a09799871f222d4d8b 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -62,6 +62,12 @@ int main(int argc, char *argv[])
// --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
if (nOuterCorr != 1)
{
p.storePrevIter();
@@ -76,6 +82,11 @@ int main(int argc, char *argv[])
}
turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
runTime.write();
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
index d98e9369b8a87828a16dc020e59c12be469ba769..179ac149badfef1c97ec876a581d746f4195ce69 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
@@ -1,4 +1,4 @@
- Info<< "Reading transportProperties\n" << endl;
+ Info<< "\nReading transportProperties\n" << endl;
IOdictionary transportProperties
(
@@ -31,7 +31,7 @@
rhoInfValue
);
- Info<< "\nReading field U\n" << endl;
+ Info<< "Reading field U\n" << endl;
volVectorField U
(
IOobject
@@ -127,7 +127,7 @@
if (HdotGradHheader.headerOk())
{
- Info<< "\nReading field HdotGradH\n" << endl;
+ Info<< "Reading field HdotGradH" << endl;
HdotGradHPtr_.reset
(
diff --git a/applications/solvers/multiphase/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interMixingFoam/alphaEqns.H
index 972d1d71218fba615638aedc827c701a7496e854..d302ff5147da8837458f0bdd6f2f2455a53b2995 100644
--- a/applications/solvers/multiphase/interMixingFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/interMixingFoam/alphaEqns.H
@@ -34,7 +34,8 @@
),
mesh,
dimless,
- allLambda
+ allLambda,
+ false // Use slices for the couples
);
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index c0daa0e7ca4aaca234c295dc95f4eb326fad0b37..ed0fbf776cd224705c9085ea503f1fe2a9fa5383 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -15,14 +15,7 @@
//- fvc::div(rho*turbulence->nuEff()*dev(fvc::grad(U)().T()))
);
- if (oCorr == nOuterCorr-1)
- {
- UEqn.relax(1);
- }
- else
- {
- UEqn.relax();
- }
+ UEqn.relax();
if (momentumPredictor)
{
@@ -34,7 +27,6 @@
(
fvc::interpolate(rho)*(g & mesh.Sf())
- mesh.magSf()*fvc::snGrad(p)
- ),
- mesh.solver(oCorr == nOuterCorr-1 ? "UFinal" : "U")
+ )
);
}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
index f1e07558cb36728e6310b4808ff3b2476455548a..25003e1b25330346e33dad7d98da2790e88b4eda 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
@@ -22,18 +22,20 @@
pEqn.setReference(pRefCell, pRefValue);
- if
+ pEqn.solve
(
- corr == nCorr-1
- && nonOrth == nNonOrthCorr
- )
- {
- pEqn.solve(mesh.solver(p.name() + "Final"));
- }
- else
- {
- pEqn.solve(mesh.solver(p.name()));
- }
+ mesh.solver
+ (
+ p.select
+ (
+ (
+ finalIter
+ && corr == nCorr-1
+ && nonOrth == nNonOrthCorr
+ )
+ )
+ )
+ );
if (nonOrth == nNonOrthCorr)
{
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index f3b98ba8fe3ec7b7769638a5a14c7bff8554727f..cf6fc95a9cded1726b109cf2c2887a638c6f1a61 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -68,6 +68,12 @@ int main(int argc, char *argv[])
// --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ bool finalIter = oCorr == nOuterCorr-1;
+ if (finalIter)
+ {
+ mesh.data::add("finalIteration", true);
+ }
+
twoPhaseProperties.correct();
#include "alphaEqn.H"
@@ -83,6 +89,11 @@ int main(int argc, char *argv[])
#include "continuityErrs.H"
turbulence->correct();
+
+ if (finalIter)
+ {
+ mesh.data::remove("finalIteration");
+ }
}
runTime.write();
diff --git a/applications/test/Hashing/hashingTests b/applications/test/Hashing/hashingTests
index 2ccc793e748cfe7f53c94cf530b0b167c89587fd..162854bbefcedf30038a7bb7ef5c35149ad6d3e8 100644
--- a/applications/test/Hashing/hashingTests
+++ b/applications/test/Hashing/hashingTests
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index e1833efb3f688e485bc9c80504daf947fd9b10a6..01d4274ba8dad8147a4b62e254317b0ae1cd7f38 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/applications/test/regex/testRegexps b/applications/test/regex/testRegexps
index fca98249c6084d310762cb15c01bcf0f4a03ac8b..72287eea4344e36c0b9e9ca5ac50005a684ddc2a 100644
--- a/applications/test/regex/testRegexps
+++ b/applications/test/regex/testRegexps
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
index 310c2653e3e54c550e9aa9744d33351ae76441e4..b21e5544fef1f40899ad547f356ee81f0a32c5db 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/test/spline/test-splines b/applications/test/spline/test-splines
index 05ab2185cdd40126d81181dadd09523e1e2e12a7..63f7bd17dd1cf34c86d3f7ad039fe36ec0dc9cfa 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
(
diff --git a/applications/test/wordRe/testRegexps b/applications/test/wordRe/testRegexps
index 0eefa0f781a91d08388ace58001d9dfe1d139fbb..c18cac80287d8a3294a676aaf683651cccc7e826 100644
--- a/applications/test/wordRe/testRegexps
+++ b/applications/test/wordRe/testRegexps
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
index 334ea8cd308d530320940a9469e19c66b6353819..9c57e17dbf70a84b8d7155cf2b96babd832612cb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 56ea5e124f47d1d4ea52c414e2ad93e76c357e33..0b09b7859d730cb90cbb079deaef88d690eee64b 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -295,8 +295,7 @@ label mergePatchFaces
const faceZone& fZone = mesh.faceZones()[zoneID];
zoneFlip = fZone.flipMap()[fZone.whichFace(newMasterI)];
}
- label patchI = mesh.boundaryMesh().whichPatch(newMasterI);
-
+ label patchID = mesh.boundaryMesh().whichPatch(newMasterI);
Pout<< "Restoring new master face " << newMasterI
<< " to vertices " << setFaceVerts[0] << endl;
@@ -311,7 +310,7 @@ label mergePatchFaces
own, // owner
-1, // neighbour
false, // face flip
- patchI, // patch for face
+ patchID, // patch for face
false, // remove from zone
zoneID, // zone for face
zoneFlip // face flip in zone
@@ -336,7 +335,7 @@ label mergePatchFaces
-1, // masterEdgeID,
newMasterI, // masterFaceID,
false, // flipFaceFlux,
- patchI, // patchID,
+ patchID, // patchID,
zoneID, // zoneID,
zoneFlip // zoneFlip
)
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
index b656cbffcad1120021862b7a2a0ef7264bbc25d0..f2cf26169293c0ec4e8bff832f82720ae594dc13 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
index 10b73f34b5376768b4988342208041d39841c7b9..87f91eafb40ef9afbbfbeeb0bee439cee8a13a31 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index decabfeae0107b3508b8aca691bd2b7e059d6a46..58070fc473cc4010d0d9f07a5cb499ea303946ec 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -579,17 +579,12 @@ 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("ccmFile");
+ argList::validArgs.append("ccm26 file");
+
+# include "setRootCase.H"
+# include "createTime.H"
- #include "setRootCase.H"
- #include "createTime.H"
// Foam mesh data
// ~~~~~~~~~~~~~~
@@ -620,7 +615,6 @@ int main(int argc, char *argv[])
{
const fileName ccmFile = args[1];
- const word ccmExt = ccmFile.ext();
if (!isFile(ccmFile))
{
@@ -629,6 +623,8 @@ 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 2587a5d4571e5c071511d1528a4903bdf415e2f4..09e34235e5fda8fcb6820b6a4f0cdbf8b31ed0f3 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -62,10 +62,6 @@ 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();
@@ -78,7 +74,7 @@ int main(int argc, char *argv[])
argList::addBoolOption
(
"noBnd",
- "suppress writing a boundary (.bnd) file"
+ "suppress writing the .bnd file"
);
# include "setRootCase.H"
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/Make/files b/applications/utilities/mesh/conversion/polyDualMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/manipulation/polyDualMesh/Make/files
rename to applications/utilities/mesh/conversion/polyDualMesh/Make/files
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options b/applications/utilities/mesh/conversion/polyDualMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/manipulation/polyDualMesh/Make/options
rename to applications/utilities/mesh/conversion/polyDualMesh/Make/options
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
similarity index 99%
rename from applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
rename to applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index bdfb35bd504f2125576a8b0d85305963fda46248..74a89fdc5e360043b0953024b81084c224033fb3 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -881,6 +881,9 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh)
{}
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::meshDualiser::setRefinement
@@ -1466,4 +1469,14 @@ void Foam::meshDualiser::setRefinement
}
+
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+
+
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
similarity index 100%
rename from applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
rename to applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
similarity index 100%
rename from applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
rename to applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index 8d8c565387dc912953b0eea630314b4a18f6be36..de32c0f5b3daecc5e08e86de08a041266e86dd8e 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -38,13 +38,8 @@ Description
int main(int argc, char *argv[])
{
- argList::addNote
- (
- "convert pro-STAR (v3) mesh to OpenFOAM"
- );
-
argList::noParallel();
- argList::validArgs.append("pro-STAR prefix");
+ argList::validArgs.append("STAR mesh file prefix");
argList::addOption
(
"scale",
@@ -61,7 +56,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 53dd66c234ac48fe91e05a469f767c3361b0f2a9..fc956582b3e0ca50d99b6f8fcbd591fa8c9ec329 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -59,11 +59,6 @@ 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/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index b896cb30335bab051d94cf45343c7a1013794ca5..3f8086bb8038dd03236912dec6721cd43e19c73b 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -206,25 +206,8 @@ int main(int argc, char *argv[])
Info<< nl << "Creating polyMesh from blockMesh" << endl;
- wordList patchNames = blocks.patchNames();
- wordList patchTypes = blocks.patchTypes();
word defaultFacesName = "defaultFaces";
word defaultFacesType = emptyPolyPatch::typeName;
- wordList patchPhysicalTypes = blocks.patchPhysicalTypes();
-
-
- preservePatchTypes
- (
- runTime,
- runTime.constant(),
- polyMeshDir,
- patchNames,
- patchTypes,
- defaultFacesName,
- defaultFacesType,
- patchPhysicalTypes
- );
-
polyMesh mesh
(
IOobject
@@ -236,11 +219,9 @@ int main(int argc, char *argv[])
xferCopy(blocks.points()), // could we re-use space?
blocks.cells(),
blocks.patches(),
- patchNames,
- patchTypes,
+ blocks.patchDicts(),
defaultFacesName,
- defaultFacesType,
- patchPhysicalTypes
+ defaultFacesType
);
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties b/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
index 4fe5c4321d11cfc29ae7d78539ceebae13da6f0c..9a047e7822948eaf9012ccffaf12e0418d577e84 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Allwmake b/applications/utilities/mesh/generation/extrudeToRegionMesh/Allwmake
new file mode 100755
index 0000000000000000000000000000000000000000..c19360ac269aaf394ebadbd49b104a0e2a833da9
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+set -x
+
+wmake libso nonuniformTransformCyclic
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
index dbf50a9b09364ebf6daa89da3c51951fc2823159..c00ca0534ba6f322b228b628f8e4395cdec1b45e 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
@@ -1,14 +1,12 @@
EXE_INC = \
+ -InonuniformTransformCyclic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- /* -I$(LIB_SRC)/surfMesh/lnInclude */ \
- /* -I$(LIB_SRC)/lagrangian/basic/lnInclude */ \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
+ -lnonuniformTransformCyclic \
-lfiniteVolume \
- /* -lsurfMesh */ \
- /* -llagrangian */ \
-lmeshTools \
-ldynamicMesh
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index 4cf3c67ff998f2f1f6b9f8146ef03dc0c59f6242..bd7e61eff840278eaa0518c208d331c0ea752dc7 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -31,7 +31,8 @@ Description
- if extruding boundary faces:
- convert boundary faces to directMappedWall patches
- extrude edges of faceZone as a <zone>_sidePatch
- - extrude edges inbetween different faceZones as a cyclic <zoneA>_<zoneB>
+ - extrude edges inbetween different faceZones as a
+ (nonuniformTransform)cyclic <zoneA>_<zoneB>
- extrudes into master direction (i.e. away from the owner cell
if flipMap is false)
- not parallel
@@ -129,8 +130,9 @@ Usage
#include "createShellMesh.H"
#include "volFields.H"
#include "surfaceFields.H"
-#include "cyclicPolyPatch.H"
#include "syncTools.H"
+#include "cyclicPolyPatch.H"
+#include "nonuniformTransformCyclicPolyPatch.H"
using namespace Foam;
@@ -596,7 +598,7 @@ void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
}
-//XXXXXXXXX
+// Find a patch face that is not extruded. Return -1 if not found.
label findUncoveredPatchFace
(
const fvMesh& mesh,
@@ -611,20 +613,19 @@ label findUncoveredPatchFace
extrudeFaceSet.insert(extrudeMeshFaces[i]);
}
- label patchI = -1;
-
const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
forAll(eFaces, i)
{
label faceI = eFaces[i];
if (!mesh.isInternalFace(faceI) && !extrudeFaceSet.found(faceI))
{
- patchI = mesh.boundaryMesh().whichPatch(faceI);
- break;
+ return faceI;
}
}
- return patchI;
+ return -1;
}
+
+
// Count the number of faces in patches that need to be created
void countExtrudePatches
(
@@ -662,14 +663,14 @@ void countExtrudePatches
// so choose any uncovered one. If none found put face in
// undetermined zone 'side' patch
- label patchI = findUncoveredPatchFace
+ label faceI = findUncoveredPatchFace
(
mesh,
UIndirectList<label>(extrudeMeshFaces, eFaces),
extrudeMeshEdges[edgeI]
);
- if (patchI == -1)
+ if (faceI == -1)
{
// Determine the min zone of all connected zones.
label minZone = zoneID[eFaces[0]];
@@ -686,6 +687,9 @@ void countExtrudePatches
Pstream::listCombineGather(zoneZonePatch, plusEqOp<label>());
Pstream::listCombineScatter(zoneZonePatch);
}
+
+
+// Lexical ordering for vectors.
bool lessThan(const point& x, const point& y)
{
for (direction dir = 0; dir < point::nComponents; dir++)
@@ -696,86 +700,137 @@ bool lessThan(const point& x, const point& y)
return false;
}
-class minEqVectorListOp
+
+// Combine vectors
+class minEqVectorOp
{
public:
- void operator()(List<vector>& x, const List<vector>& y) const
+ void operator()(vector& x, const vector& y) const
{
- if (y.size())
+ if (y != vector::zero)
{
- if (x.size())
+ if (x == vector::zero)
{
- forAll(x, i)
- {
- if (lessThan(y[i], x[i]))
- {
- x[i] = y[i];
- }
- }
+ x = y;
}
- else
+ else if (lessThan(y, x))
{
x = y;
}
}
}
};
-// Constrain&sync normals on points that are on coupled patches.
+
+
+// Constrain&sync normals on points that are on coupled patches to make sure
+// the face extruded from the edge has a valid normal with its coupled
+// equivalent.
+// Note that only points on cyclic edges need to be constrained and not
+// all points touching cyclics since only edges become faces.
void constrainCoupledNormals
(
const fvMesh& mesh,
const primitiveFacePatch& extrudePatch,
- const labelList& regionToPoint,
+ const labelList& meshEdges,
+ const faceList& pointRegions, // per face, per index the region
vectorField& regionNormals
)
{
- // Invert regionToPoint to create pointToRegions.
- labelListList pointToRegions
+ const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+ // Mark edges that are on boundary of extrusion.
+ Map<label> meshToExtrudEdge
(
- invertOneToMany
- (
- extrudePatch.nPoints(),
- regionToPoint
- )
+ 2*(extrudePatch.nEdges()-extrudePatch.nInternalEdges())
);
- // Sort acc. to region so (hopefully) coupled points will do the same.
- forAll(pointToRegions, pointI)
+ for
+ (
+ label extrudeEdgeI = extrudePatch.nInternalEdges();
+ extrudeEdgeI < extrudePatch.nEdges();
+ extrudeEdgeI++
+ )
{
- sort(pointToRegions[pointI]);
+ meshToExtrudEdge.insert(meshEdges[extrudeEdgeI], extrudeEdgeI);
}
- const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
- // Constrain displacement on cyclic patches
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- // Note: bit contentious to always do this on cyclic - should user use
- // different patch type, e.g. 'cyclicSlip' instead?
+ // For owner: normal at first point of edge when walking through faces
+ // in order.
+ vectorField edgeNormals0(mesh.nEdges(), vector::zero);
+ vectorField edgeNormals1(mesh.nEdges(), vector::zero);
+ // Loop through all edges of patch. If they are to be extruded mark the
+ // point normals in order.
forAll(patches, patchI)
{
const polyPatch& pp = patches[patchI];
if (isA<cyclicPolyPatch>(pp))
{
- forAll(pp.meshPoints(), pointI)
+ bool isOwner = refCast<const cyclicPolyPatch>(pp).owner();
+
+ forAll(pp.faceEdges(), faceI)
{
- Map<label>::const_iterator fnd =
- extrudePatch.meshPointMap().find
- (
- pp.meshPoints()[pointI]
- );
- if (fnd != extrudePatch.meshPointMap().end())
+ const labelList& fEdges = pp.faceEdges()[faceI];
+ forAll(fEdges, fp)
{
- // fnd() is a point on this cyclic.
- const vector& cycNormal = pp.pointNormals()[pointI];
- const labelList& pRegions = pointToRegions[fnd()];
- forAll(pRegions, i)
+ label meshEdgeI = pp.meshEdges()[fEdges[fp]];
+ if (meshToExtrudEdge.found(meshEdgeI))
{
- // Remove cyclic normal component.
- vector& regionNormal = regionNormals[pRegions[i]];
- regionNormal -= (regionNormal&cycNormal)*cycNormal;
+ // Edge corresponds to a extrusion edge. Store extrusion
+ // normals on edge so we can syncTools it.
+
+ //const edge& ppE = pp.edges()[fEdges[fp]];
+ //Pout<< "ppedge:" << pp.localPoints()[ppE[0]]
+ // << pp.localPoints()[ppE[1]]
+ // << endl;
+
+ const face& f = pp.localFaces()[faceI];
+ label fp0 = fp;
+ label fp1 = f.fcIndex(fp0);
+ label mp0 = pp[faceI][fp0];
+ label mp1 = pp[faceI][fp1];
+
+ // Find corresponding face and indices.
+ vector regionN0;
+ vector regionN1;
+ {
+ label exEdgeI = meshToExtrudEdge[meshEdgeI];
+ const labelList& eFaces =
+ extrudePatch.edgeFaces()[exEdgeI];
+ // Use 0th face.
+ label exFaceI = eFaces[0];
+ const face& exF = extrudePatch[exFaceI];
+ const face& exRegions = pointRegions[exFaceI];
+ // Find points
+ label r0 = exRegions[findIndex(exF, mp0)];
+ regionN0 = regionNormals[r0];
+ label r1 = exRegions[findIndex(exF, mp1)];
+ regionN1 = regionNormals[r1];
+ }
+
+ vector& nA =
+ (
+ isOwner
+ ? edgeNormals0[meshEdgeI]
+ : edgeNormals1[meshEdgeI]
+ );
+
+ nA = regionN0;
+ const vector& cyc0 = pp.pointNormals()[f[fp0]];
+ nA -= (nA&cyc0)*cyc0;
+
+ vector& nB =
+ (
+ isOwner
+ ? edgeNormals1[meshEdgeI]
+ : edgeNormals0[meshEdgeI]
+ );
+
+ nB = regionN1;
+ const vector& cyc1 = pp.pointNormals()[f[fp1]];
+ nB -= (nB&cyc1)*cyc1;
}
}
}
@@ -786,45 +841,82 @@ void constrainCoupledNormals
// Synchronise regionNormals
// ~~~~~~~~~~~~~~~~~~~~~~~~~
- // Re-work regionNormals into multiple normals per point
- List<List<vector> > pointNormals(mesh.nPoints());
- forAll(pointToRegions, pointI)
- {
- const labelList& pRegions = pointToRegions[pointI];
-
- label meshPointI = extrudePatch.meshPoints()[pointI];
- List<vector>& pNormals = pointNormals[meshPointI];
- pNormals.setSize(pRegions.size());
- forAll(pRegions, i)
- {
- pNormals[i] = regionNormals[pRegions[i]];
- }
- }
-
// Synchronise
- syncTools::syncPointList
+ syncTools::syncEdgeList
+ (
+ mesh,
+ edgeNormals0,
+ minEqVectorOp(),
+ vector::zero // nullValue
+ );
+ syncTools::syncEdgeList
(
mesh,
- pointNormals,
- minEqVectorListOp(),
- List<vector>(), // nullValue
- false // applySeparation
+ edgeNormals1,
+ minEqVectorOp(),
+ vector::zero // nullValue
);
+
// Re-work back into regionNormals
- forAll(pointToRegions, pointI)
+ forAll(patches, patchI)
{
- const labelList& pRegions = pointToRegions[pointI];
+ const polyPatch& pp = patches[patchI];
- label meshPointI = extrudePatch.meshPoints()[pointI];
- const List<vector>& pNormals = pointNormals[meshPointI];
- forAll(pRegions, i)
+ if (isA<cyclicPolyPatch>(pp))
{
- regionNormals[pRegions[i]] = pNormals[i];
+ bool isOwner = refCast<const cyclicPolyPatch>(pp).owner();
+
+ forAll(pp.faceEdges(), faceI)
+ {
+ const labelList& fEdges = pp.faceEdges()[faceI];
+ forAll(fEdges, fp)
+ {
+ label meshEdgeI = pp.meshEdges()[fEdges[fp]];
+ if (meshToExtrudEdge.found(meshEdgeI))
+ {
+ const face& f = pp.localFaces()[faceI];
+ label fp0 = fp;
+ label fp1 = f.fcIndex(fp0);
+ label mp0 = pp[faceI][fp0];
+ label mp1 = pp[faceI][fp1];
+
+
+ const vector& nA =
+ (
+ isOwner
+ ? edgeNormals0[meshEdgeI]
+ : edgeNormals1[meshEdgeI]
+ );
+
+ const vector& nB =
+ (
+ isOwner
+ ? edgeNormals1[meshEdgeI]
+ : edgeNormals0[meshEdgeI]
+ );
+
+ // Find corresponding face and indices.
+ {
+ label exEdgeI = meshToExtrudEdge[meshEdgeI];
+ const labelList& eFaces =
+ extrudePatch.edgeFaces()[exEdgeI];
+ // Use 0th face.
+ label exFaceI = eFaces[0];
+ const face& exF = extrudePatch[exFaceI];
+ const face& exRegions = pointRegions[exFaceI];
+ // Find points
+ label r0 = exRegions[findIndex(exF, mp0)];
+ regionNormals[r0] = nA;
+ label r1 = exRegions[findIndex(exF, mp1)];
+ regionNormals[r1] = nB;
+ }
+ }
+ }
+ }
}
}
}
-//XXXXXXXXX
tmp<pointField> calcOffset
@@ -1106,7 +1198,10 @@ int main(int argc, char *argv[])
// - zoneXXX_sides
// - zoneXXX_zoneYYY
labelList zoneSidePatch(faceZones.size(), 0);
- labelList zoneZonePatch(faceZones.size()*faceZones.size(), 0);
+ // Patch to use for minZone
+ labelList zoneZonePatch_min(faceZones.size()*faceZones.size(), 0);
+ // Patch to use for maxZone
+ labelList zoneZonePatch_max(faceZones.size()*faceZones.size(), 0);
countExtrudePatches
(
@@ -1117,8 +1212,8 @@ int main(int argc, char *argv[])
extrudeMeshFaces,
extrudeMeshEdges,
- zoneSidePatch,
- zoneZonePatch
+ zoneSidePatch, // reuse for counting
+ zoneZonePatch_min // reuse for counting
);
// Now check which patches to add.
@@ -1162,30 +1257,47 @@ int main(int argc, char *argv[])
);
label nInter = 0;
- forAll(zoneZonePatch, minZone)
+ forAll(zoneZonePatch_min, minZone)
{
for (label maxZone = minZone; maxZone < faceZones.size(); maxZone++)
{
label index = minZone*faceZones.size()+maxZone;
- if (zoneZonePatch[index] > 0)
+ if (zoneZonePatch_min[index] > 0)
{
- word patchName =
+ word minToMax =
faceZones[minZone].name()
- + "_"
+ + "_to_"
+ faceZones[maxZone].name();
+ word maxToMin =
+ faceZones[maxZone].name()
+ + "_to_"
+ + faceZones[minZone].name();
+ {
+ transformDict.set("neighbourPatch", maxToMin);
+ zoneZonePatch_min[index] =
+ addPatch<nonuniformTransformCyclicPolyPatch>
+ (
+ mesh,
+ minToMax,
+ transformDict
+ );
+ Info<< zoneZonePatch_min[index] << '\t' << minToMax << nl;
+ nInter++;
+ }
+ {
+ transformDict.set("neighbourPatch", minToMax);
+ zoneZonePatch_max[index] =
+ addPatch<nonuniformTransformCyclicPolyPatch>
+ (
+ mesh,
+ maxToMin,
+ transformDict
+ );
+ Info<< zoneZonePatch_max[index] << '\t' << maxToMin << nl;
+ nInter++;
+ }
- zoneZonePatch[index] = addPatch<cyclicPolyPatch>
- (
- mesh,
- patchName,
- transformDict
- );
-
- Info<< zoneZonePatch[index]
- << '\t' << patchName << nl;
-
- nInter++;
}
}
}
@@ -1220,24 +1332,36 @@ int main(int argc, char *argv[])
{
label minZone = min(zone0,zone1);
label maxZone = max(zone0,zone1);
- label patchI = zoneZonePatch[minZone*faceZones.size()+maxZone];
+ label index = minZone*faceZones.size()+maxZone;
+
ePatches.setSize(eFaces.size());
- ePatches = patchI;
+
+ if (zone0 == minZone)
+ {
+ ePatches[0] = zoneZonePatch_min[index];
+ ePatches[1] = zoneZonePatch_max[index];
+ }
+ else
+ {
+ ePatches[0] = zoneZonePatch_max[index];
+ ePatches[1] = zoneZonePatch_min[index];
+ }
nonManifoldEdge[edgeI] = 1;
}
}
else
{
- label patchI = findUncoveredPatchFace
+ label faceI = findUncoveredPatchFace
(
mesh,
UIndirectList<label>(extrudeMeshFaces, eFaces),
extrudeMeshEdges[edgeI]
);
- if (patchI != -1)
+ if (faceI != -1)
{
+ label patchI = mesh.boundaryMesh().whichPatch(faceI);
ePatches.setSize(eFaces.size(), patchI);
}
else
@@ -1294,12 +1418,12 @@ int main(int argc, char *argv[])
(
mesh,
extrudePatch,
- regionPoints,
+ extrudeMeshEdges,
+ pointRegions,
regionNormals
);
-
// For debugging: dump hedgehog plot of normals
{
OFstream str(runTime.path()/"regionNormals.obj");
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/files b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..ffacacb4dace2e28ff0d0f2d60c43ca60d43f7e7
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/files
@@ -0,0 +1,8 @@
+fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C
+pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
+polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C
+pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C
+fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C
+fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C
+
+LIB = $(FOAM_LIBBIN)/libnonuniformTransformCyclic
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/options b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..71b7873964d544eddf96d22aa40f4c3372c23c9c
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..3de2331de3627c7131253ef720375c09c6ca98e8
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ cyclicFvPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField
+(
+ const nonuniformTransformCyclicFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ cyclicFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ cyclicFvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField
+(
+ const nonuniformTransformCyclicFvPatchField<Type>& ptf
+)
+:
+ cyclicFvPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField
+(
+ const nonuniformTransformCyclicFvPatchField<Type>& ptf,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ cyclicFvPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..e609935b0921cb9022cbd9199b442d5bbcb4d386
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicFvPatchField
+
+Description
+ Foam::nonuniformTransformCyclicFvPatchField
+
+SourceFiles
+ nonuniformTransformCyclicFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvPatchField_H
+#define nonuniformTransformCyclicFvPatchField_H
+
+#include "cyclicFvPatchField.H"
+#include "nonuniformTransformCyclicFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class nonuniformTransformCyclicFvPatchField
+:
+ public cyclicFvPatchField<Type>
+{
+ // Private data
+
+public:
+
+ //- Runtime type information
+ TypeName(nonuniformTransformCyclicFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ nonuniformTransformCyclicFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ nonuniformTransformCyclicFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given nonuniformTransformCyclicFvPatchField onto a new patch
+ nonuniformTransformCyclicFvPatchField
+ (
+ const nonuniformTransformCyclicFvPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ nonuniformTransformCyclicFvPatchField
+ (
+ const nonuniformTransformCyclicFvPatchField<Type>&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchField<Type> > clone() const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new nonuniformTransformCyclicFvPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ nonuniformTransformCyclicFvPatchField
+ (
+ const nonuniformTransformCyclicFvPatchField<Type>&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchField<Type> > clone
+ (
+ const DimensionedField<Type, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new nonuniformTransformCyclicFvPatchField<Type>(*this, iF)
+ );
+ }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "nonuniformTransformCyclicFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..47f2e1d7e8d1ab1156a874a8f0f3723430ac378d
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(nonuniformTransformCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..3019604256452d4769c3bb957be8305fe3bf43eb
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvPatchFields_H
+#define nonuniformTransformCyclicFvPatchFields_H
+
+#include "nonuniformTransformCyclicFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(nonuniformTransformCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..ea3d13608e120a3df43805bb54035a48a24813b5
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvPatchFieldsFwd_H
+#define nonuniformTransformCyclicFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class nonuniformTransformCyclicFvPatchField;
+
+makePatchTypeFieldTypedefs(nonuniformTransformCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..d8f83fd610eb065f966b03f1cfe252e2d52064d8
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(nonuniformTransformCyclicFvPatch, 0);
+addToRunTimeSelectionTable(fvPatch, nonuniformTransformCyclicFvPatch, polyPatch);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..52cf154f115b20c37ef5b128cf9f5ede9b3455da
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicFvPatch
+
+Description
+ Cyclic-plane patch.
+
+SourceFiles
+ nonuniformTransformCyclicFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvPatch_H
+#define nonuniformTransformCyclicFvPatch_H
+
+#include "cyclicFvPatch.H"
+#include "nonuniformTransformCyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class nonuniformTransformCyclicFvPatch
+:
+ public cyclicFvPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(nonuniformTransformCyclicPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from polyPatch
+ nonuniformTransformCyclicFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
+ :
+ cyclicFvPatch(patch, bm)
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..c5feba62a7aec2b50f92b953f8964e69beff2621
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicFvsPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ cyclicFvsPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField
+(
+ const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const dictionary& dict
+)
+:
+ cyclicFvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField
+(
+ const nonuniformTransformCyclicFvsPatchField<Type>& ptf
+)
+:
+ cyclicFvsPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField
+(
+ const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ cyclicFvsPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..30ee254b09135d2be4ace16ce66f286d9a31a1c1
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicFvsPatchField
+
+Description
+ Foam::nonuniformTransformCyclicFvsPatchField
+
+SourceFiles
+ nonuniformTransformCyclicFvsPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvsPatchField_H
+#define nonuniformTransformCyclicFvsPatchField_H
+
+#include "cyclicFvsPatchField.H"
+#include "nonuniformTransformCyclicFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicFvsPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class nonuniformTransformCyclicFvsPatchField
+:
+ public cyclicFvsPatchField<Type>
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(nonuniformTransformCyclicFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ nonuniformTransformCyclicFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ nonuniformTransformCyclicFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given nonuniformTransformCyclicFvsPatchField onto a new patch
+ nonuniformTransformCyclicFvsPatchField
+ (
+ const nonuniformTransformCyclicFvsPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ nonuniformTransformCyclicFvsPatchField
+ (
+ const nonuniformTransformCyclicFvsPatchField<Type>&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvsPatchField<Type> > clone() const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new nonuniformTransformCyclicFvsPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ nonuniformTransformCyclicFvsPatchField
+ (
+ const nonuniformTransformCyclicFvsPatchField<Type>&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvsPatchField<Type> > clone
+ (
+ const DimensionedField<Type, surfaceMesh>& iF
+ ) const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new nonuniformTransformCyclicFvsPatchField<Type>(*this, iF)
+ );
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "nonuniformTransformCyclicFvsPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..ab836bed9715265fef3c21c5ca92fa63d77be632
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicFvsPatchFields.H"
+#include "fvsPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFvsPatchFields(nonuniformTransformCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..11e2aca8eb07fee1ec42c7824f7ea31f5c03c358
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvsPatchFields_H
+#define nonuniformTransformCyclicFvsPatchFields_H
+
+#include "nonuniformTransformCyclicFvsPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFvsPatchTypeFieldTypedefs(nonuniformTransformCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..d4fbd4da677c012dfeef51cdcf7681da50b24d64
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicFvsPatchFieldsFwd_H
+#define nonuniformTransformCyclicFvsPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class nonuniformTransformCyclicFvsPatchField;
+
+makeFvsPatchTypeFieldTypedefs(nonuniformTransformCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..088fffdd5c0365ff192a06643af33327d85409ef
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicPointPatchField.H"
+#include "transformField.H"
+#include "symmTransformField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField
+(
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF
+)
+:
+ cyclicPointPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField
+(
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF,
+ const dictionary& dict
+)
+:
+ cyclicPointPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField
+(
+ const nonuniformTransformCyclicPointPatchField<Type>& ptf,
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF,
+ const pointPatchFieldMapper& mapper
+)
+:
+ cyclicPointPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField
+(
+ const nonuniformTransformCyclicPointPatchField<Type>& ptf,
+ const DimensionedField<Type, pointMesh>& iF
+)
+:
+ cyclicPointPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+void nonuniformTransformCyclicPointPatchField<Type>::evaluate(const Pstream::commsTypes)
+{
+ const vectorField& nHat = this->patch().pointNormals();
+
+ tmp<Field<Type> > tvalues =
+ (
+ (
+ this->patchInternalField()
+ + transform(I - 2.0*sqr(nHat), this->patchInternalField())
+ )/2.0
+ );
+
+ // Get internal field to insert values into
+ Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
+
+ setInInternalField(iF, tvalues());
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..1d47803dc761f03a3eec639b647b710f8bac6fb8
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicPointPatchField
+
+Description
+ Cyclic + slip constraints
+
+SourceFiles
+ nonuniformTransformCyclicPointPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicPointPatchField_H
+#define nonuniformTransformCyclicPointPatchField_H
+
+#include "cyclicPointPatchField.H"
+#include "nonuniformTransformCyclicPointPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicPointPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class nonuniformTransformCyclicPointPatchField
+:
+ public cyclicPointPatchField<Type>
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(nonuniformTransformCyclicPointPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ nonuniformTransformCyclicPointPatchField
+ (
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ nonuniformTransformCyclicPointPatchField
+ (
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given patchField<Type> onto a new patch
+ nonuniformTransformCyclicPointPatchField
+ (
+ const nonuniformTransformCyclicPointPatchField<Type>&,
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&,
+ const pointPatchFieldMapper&
+ );
+
+ //- Construct and return a clone
+ virtual autoPtr<pointPatchField<Type> > clone() const
+ {
+ return autoPtr<pointPatchField<Type> >
+ (
+ new nonuniformTransformCyclicPointPatchField<Type>
+ (
+ *this
+ )
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ nonuniformTransformCyclicPointPatchField
+ (
+ const nonuniformTransformCyclicPointPatchField<Type>&,
+ const DimensionedField<Type, pointMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual autoPtr<pointPatchField<Type> > clone
+ (
+ const DimensionedField<Type, pointMesh>& iF
+ ) const
+ {
+ return autoPtr<pointPatchField<Type> >
+ (
+ new nonuniformTransformCyclicPointPatchField<Type>
+ (
+ *this, iF
+ )
+ );
+ }
+
+
+ // Member functions
+
+ // Evaluation functions
+
+ //- Evaluate the patch field
+ virtual void evaluate
+ (
+ const Pstream::commsTypes commsType=Pstream::blocking
+ );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "nonuniformTransformCyclicPointPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..8975ea18458e536a8ae0294dce7a9ec10db3ada6
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicPointPatchFields.H"
+#include "pointPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(nonuniformTransformCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..a707bc092fbc7db72059ff07f0333d9141414f61
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicPointPatchFields_H
+#define nonuniformTransformCyclicPointPatchFields_H
+
+#include "nonuniformTransformCyclicPointPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePointPatchFieldTypedefs(nonuniformTransformCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..ec05da5f9c97fbd6261131c0822fb20ed5daf887
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicPointPatch.H"
+#include "pointConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(nonuniformTransformCyclicPointPatch, 0);
+
+// Add the patch constructor functions to the hash tables
+addToRunTimeSelectionTable
+(
+ facePointPatch,
+ nonuniformTransformCyclicPointPatch,
+ polyPatch
+);
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+const vectorField& nonuniformTransformCyclicPointPatch::pointNormals() const
+{
+ // Use underlying patch normals
+ return refCast<const facePointPatch>
+ (
+ *this
+ ).facePointPatch::pointNormals();
+}
+
+
+void nonuniformTransformCyclicPointPatch::applyConstraint
+(
+ const label pointi,
+ pointConstraint& pc
+) const
+{
+ pc.applyConstraint(pointNormals()[pointi]);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..95207c96224fd6c426b1b5ead7879e76152ae997
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicPointPatch
+
+Description
+ Cyclic patch with slip constraint
+
+SourceFiles
+ nonuniformTransformCyclicPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicPointPatch_H
+#define nonuniformTransformCyclicPointPatch_H
+
+#include "cyclicPointPatch.H"
+#include "nonuniformTransformCyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class nonuniformTransformCyclicPointPatch
+:
+ public cyclicPointPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(nonuniformTransformCyclicPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from components
+ nonuniformTransformCyclicPointPatch
+ (
+ const polyPatch& patch,
+ const pointBoundaryMesh& bm
+ )
+ :
+ cyclicPointPatch(patch, bm)
+ {}
+
+
+ // Destructor
+
+ virtual ~nonuniformTransformCyclicPointPatch()
+ {}
+
+
+ // Member Functions
+
+ //- Return point unit normals.
+ virtual const vectorField& pointNormals() const;
+
+ //- Accumulate the effect of constraint direction of this patch
+ virtual void applyConstraint
+ (
+ const label pointi,
+ pointConstraint&
+ ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..80255faa9374f8730887f6600798d6caa433bf58
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "nonuniformTransformCyclicPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(nonuniformTransformCyclicPolyPatch, 0);
+
+ addToRunTimeSelectionTable(polyPatch, nonuniformTransformCyclicPolyPatch, word);
+ addToRunTimeSelectionTable(polyPatch, nonuniformTransformCyclicPolyPatch, dictionary);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..db79adc4f7a34be4656075eb3ea926245b5888bc
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::nonuniformTransformCyclicPolyPatch
+
+Description
+ Transform boundary used in extruded regions. Allows non-uniform transforms.
+ Wip.
+
+SourceFiles
+ nonuniformTransformCyclicPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonuniformTransformCyclicPolyPatch_H
+#define nonuniformTransformCyclicPolyPatch_H
+
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class nonuniformTransformCyclicPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class nonuniformTransformCyclicPolyPatch
+:
+ public cyclicPolyPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName("nonuniformTransformCyclic");
+
+
+ // Constructors
+
+ //- Construct from components
+ nonuniformTransformCyclicPolyPatch
+ (
+ const word& name,
+ const label size,
+ const label start,
+ const label index,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(name, size, start, index, bm)
+ {}
+
+ //- Construct from dictionary
+ nonuniformTransformCyclicPolyPatch
+ (
+ const word& name,
+ const dictionary& dict,
+ const label index,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(name, dict, index, bm)
+ {}
+
+ //- Construct as copy, resetting the boundary mesh
+ nonuniformTransformCyclicPolyPatch
+ (
+ const nonuniformTransformCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(pp, bm)
+ {}
+
+ //- Construct given the original patch and resetting the
+ // face list and boundary mesh information
+ nonuniformTransformCyclicPolyPatch
+ (
+ const nonuniformTransformCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart,
+ const word& neighbPatchName
+ )
+ :
+ cyclicPolyPatch(pp, bm, index, newSize, newStart, neighbPatchName)
+ {}
+
+ //- Construct given the original patch and a map
+ nonuniformTransformCyclicPolyPatch
+ (
+ const nonuniformTransformCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+ )
+ :
+ cyclicPolyPatch(pp, bm, index, mapAddressing, newStart)
+ {}
+
+ //- Construct and return a clone, resetting the boundary mesh
+ virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new nonuniformTransformCyclicPolyPatch(*this, bm)
+ );
+ }
+
+ //- Construct and return a clone, resetting the face list
+ // and boundary mesh
+ virtual autoPtr<polyPatch> clone
+ (
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart
+ ) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new nonuniformTransformCyclicPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ newSize,
+ newStart,
+ neighbPatchName()
+ )
+ );
+ }
+
+
+ // Destructor
+
+ virtual ~nonuniformTransformCyclicPolyPatch()
+ {}
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index f83ccc48546d06f9cb8ee675dbeb67eb1b076aee..788b154a6e977549523ea8ba179779f791f8cd3c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 22720cbf65a0b20b8e71c7edc43f89ab7a84ac34..b3c4ca35e764f61faa606dbab7c3b6c1c5b005ff 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -134,7 +134,13 @@ int main(int argc, char *argv[])
#include "addRegionOption.H"
argList::validArgs.append("faceZone");
- argList::validArgs.append("patch");
+ argList::validArgs.append("(masterPatch slavePatch)");
+ argList::addOption
+ (
+ "additionalPatches",
+ "((master2 slave2) .. (masterN slaveN))"
+ );
+ argList::addBoolOption("internalFacesOnly");
argList::addOption
(
@@ -159,7 +165,7 @@ int main(int argc, char *argv[])
const faceZoneMesh& faceZones = mesh.faceZones();
// Faces to baffle
- faceZoneID zoneID(args[1], faceZones);
+ faceZoneID zoneID(args.additionalArgs()[0], faceZones);
Info<< "Converting faces on zone " << zoneID.name()
<< " into baffles." << nl << endl;
@@ -182,28 +188,36 @@ int main(int argc, char *argv[])
fZone.checkParallelSync(true);
// Patches to put baffles into
- DynamicList<label> newPatches(1);
+ DynamicList<label> newMasterPatches(1);
+ DynamicList<label> newSlavePatches(1);
- const word patchName = args[2];
- newPatches.append(findPatchID(mesh, patchName));
- Info<< "Using patch " << patchName
- << " at index " << newPatches[0] << endl;
+ const Pair<word> patchNames(IStringStream(args.additionalArgs()[1])());
+ newMasterPatches.append(findPatchID(mesh, patchNames[0]));
+ newSlavePatches.append(findPatchID(mesh, patchNames[1]));
+ Info<< "Using master patch " << patchNames[0]
+ << " at index " << newMasterPatches[0] << endl;
+ Info<< "Using slave patch " << patchNames[1]
+ << " at index " << newSlavePatches[0] << endl;
// Additional patches
if (args.optionFound("additionalPatches"))
{
- const wordList patchNames
+ const List<Pair<word> > patchNames
(
args.optionLookup("additionalPatches")()
);
- newPatches.reserve(patchNames.size() + 1);
+ newMasterPatches.reserve(patchNames.size() + 1);
+ newSlavePatches.reserve(patchNames.size() + 1);
forAll(patchNames, i)
{
- newPatches.append(findPatchID(mesh, patchNames[i]));
- Info<< "Using additional patch " << patchNames[i]
- << " at index " << newPatches.last() << endl;
+ newMasterPatches.append(findPatchID(mesh, patchNames[i][0]));
+ newSlavePatches.append(findPatchID(mesh, patchNames[i][1]));
+ Info<< "Using additional patches " << patchNames[i]
+ << " at indices " << newMasterPatches.last()
+ << " and " << newSlavePatches.last()
+ << endl;
}
}
@@ -282,10 +296,8 @@ int main(int argc, char *argv[])
}
label nModified = 0;
- forAll(newPatches, i)
+ forAll(newMasterPatches, i)
{
- label newPatchI = newPatches[i];
-
// Pass 1. Do selected side of zone
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -305,7 +317,7 @@ int main(int argc, char *argv[])
faceI, // label of face
mesh.faceOwner()[faceI],// owner
false, // face flip
- newPatchI, // patch for face
+ newMasterPatches[i], // patch for face
zoneID.index(), // zone for face
false, // face flip in zone
modifiedFace // modify or add status
@@ -321,7 +333,7 @@ int main(int argc, char *argv[])
faceI, // label of face
mesh.faceNeighbour()[faceI],// owner
true, // face flip
- newPatchI, // patch for face
+ newMasterPatches[i], // patch for face
zoneID.index(), // zone for face
true, // face flip in zone
modifiedFace // modify or add status
@@ -352,7 +364,7 @@ int main(int argc, char *argv[])
faceI, // label of face
mesh.faceNeighbour()[faceI], // owner
true, // face flip
- newPatchI, // patch for face
+ newSlavePatches[i], // patch for face
zoneID.index(), // zone for face
true, // face flip in zone
modifiedFace // modify or add
@@ -368,7 +380,7 @@ int main(int argc, char *argv[])
faceI, // label of face
mesh.faceOwner()[faceI],// owner
false, // face flip
- newPatchI, // patch for face
+ newSlavePatches[i], // patch for face
zoneID.index(), // zone for face
false, // face flip in zone
modifiedFace // modify or add status
@@ -396,6 +408,8 @@ int main(int argc, char *argv[])
{
const polyPatch& pp = patches[patchI];
+ label newPatchI = newMasterPatches[i];
+
if (pp.coupled() && patches[newPatchI].coupled())
{
// Do not allow coupled faces to be moved to different coupled
@@ -445,7 +459,7 @@ int main(int argc, char *argv[])
Info<< "Converted " << returnReduce(nModified, sumOp<label>())
- << " faces into boundary faces on patch " << patchName << nl << endl;
+ << " faces into boundary faces on patches " << patchNames << nl << endl;
if (!overwrite)
{
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 8ec77b011125354929c2a85703a10450b581f95b..43652bbbeaeac27c05de5134a3dc84811e6558ad 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -197,69 +197,55 @@ void dumpCyclicMatch(const fileName& prefix, const polyMesh& mesh)
forAll(patches, patchI)
{
- if (isA<cyclicPolyPatch>(patches[patchI]))
+ if
+ (
+ isA<cyclicPolyPatch>(patches[patchI])
+ && refCast<const cyclicPolyPatch>(patches[patchI]).owner()
+ )
{
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- label halfSize = cycPatch.size()/2;
-
- // Dump halves
+ // Dump patches
{
- OFstream str(prefix+cycPatch.name()+"_half0.obj");
+ OFstream str(prefix+cycPatch.name()+".obj");
Pout<< "Dumping " << cycPatch.name()
- << " half0 faces to " << str.name() << endl;
+ << " faces to " << str.name() << endl;
meshTools::writeOBJ
(
str,
- static_cast<faceList>
- (
- SubList<face>
- (
- cycPatch,
- halfSize
- )
- ),
+ cycPatch,
cycPatch.points()
);
}
+
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
{
- OFstream str(prefix+cycPatch.name()+"_half1.obj");
- Pout<< "Dumping " << cycPatch.name()
- << " half1 faces to " << str.name() << endl;
+ OFstream str(prefix+nbrPatch.name()+".obj");
+ Pout<< "Dumping " << nbrPatch.name()
+ << " faces to " << str.name() << endl;
meshTools::writeOBJ
(
str,
- static_cast<faceList>
- (
- SubList<face>
- (
- cycPatch,
- halfSize,
- halfSize
- )
- ),
- cycPatch.points()
+ nbrPatch,
+ nbrPatch.points()
);
}
// Lines between corresponding face centres
- OFstream str(prefix+cycPatch.name()+"_match.obj");
+ OFstream str(prefix+cycPatch.name()+nbrPatch.name()+"_match.obj");
label vertI = 0;
Pout<< "Dumping cyclic match as lines between face centres to "
<< str.name() << endl;
- for (label faceI = 0; faceI < halfSize; faceI++)
+ forAll(cycPatch, faceI)
{
const point& fc0 = mesh.faceCentres()[cycPatch.start()+faceI];
meshTools::writeOBJ(str, fc0);
vertI++;
-
- label nbrFaceI = halfSize + faceI;
- const point& fc1 =
- mesh.faceCentres()[cycPatch.start()+nbrFaceI];
+ const point& fc1 = mesh.faceCentres()[nbrPatch.start()+faceI];
meshTools::writeOBJ(str, fc1);
vertI++;
@@ -426,13 +412,19 @@ void syncPoints
{
const polyPatch& pp = patches[patchI];
- if (isA<cyclicPolyPatch>(pp))
+ if
+ (
+ isA<cyclicPolyPatch>(pp)
+ && refCast<const cyclicPolyPatch>(pp).owner()
+ )
{
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(pp);
const edgeList& coupledPoints = cycPatch.coupledPoints();
const labelList& meshPts = cycPatch.meshPoints();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshPts = nbrPatch.meshPoints();
pointField half0Values(coupledPoints.size());
@@ -451,14 +443,13 @@ void syncPoints
else if (cycPatch.separated())
{
hasTransformation = true;
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
+ separateList(cycPatch.separation(), half0Values);
}
forAll(coupledPoints, i)
{
const edge& e = coupledPoints[i];
- label point1 = meshPts[e[1]];
+ label point1 = nbrMeshPts[e[1]];
points[point1] = half0Values[i];
}
}
@@ -785,13 +776,8 @@ int main(int argc, char *argv[])
// current separation also includes the normal
// ( separation_ = (nf&(Cr - Cf))*nf ).
- // For processor patches:
- // - disallow multiple separation/transformation. This basically
- // excludes decomposed cyclics. Use the (probably 0) separation
- // to align the points.
// For cyclic patches:
- // - for separated ones use our own recalculated offset vector
- // - for rotational ones use current one.
+ // - for separated ones use user specified offset vector
forAll(mesh.boundaryMesh(), patchI)
{
@@ -808,13 +794,14 @@ int main(int argc, char *argv[])
<< " separation[0] was "
<< cpp.separation()[0] << endl;
- if (isA<cyclicPolyPatch>(pp))
+ if (isA<cyclicPolyPatch>(pp) && pp.size())
{
const cyclicPolyPatch& cycpp =
refCast<const cyclicPolyPatch>(pp);
if (cycpp.transform() == cyclicPolyPatch::TRANSLATIONAL)
{
+ // Force to wanted separation
Info<< "On cyclic translation patch " << pp.name()
<< " forcing uniform separation of "
<< cycpp.separationVector() << endl;
@@ -823,20 +810,16 @@ int main(int argc, char *argv[])
}
else
{
+ const cyclicPolyPatch& nbr = cycpp.neighbPatch();
const_cast<vectorField&>(cpp.separation()) =
pointField
(
1,
- pp[pp.size()/2].centre(mesh.points())
- - pp[0].centre(mesh.points())
+ nbr[0].centre(mesh.points())
+ - cycpp[0].centre(mesh.points())
);
}
}
- else
- {
- const_cast<vectorField&>(cpp.separation())
- .setSize(1);
- }
Info<< "On coupled patch " << pp.name()
<< " forcing uniform separation of "
<< cpp.separation() << endl;
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index fae13ed51b552b0aee47f96f997a4630c498f2d5..10fd55e5a17585e62eab7742bfac74ba4b280744 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
index a891f605d2f052323d5c78df70ec1b26aba450fe..0405c7cfedec65777353544f2ed86e60c7fd3617 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
index c8b6a44f48bb7f7ca4e3b650de9b60800080692b..5a460c5d2ee1dd3f562200eb0a442bb04562f327 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 80f9b6f93a5c40352f20ad8e058ed9e73413bce9..495e07f2901be7a3aa329a2b83021b7a3cf2cfea 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -305,6 +305,7 @@ autoPtr<mapPolyMesh> reorderMesh
labelList patchStarts(patches.size());
labelList oldPatchNMeshPoints(patches.size());
labelListList patchPointMap(patches.size());
+
forAll(patches, patchI)
{
patchSizes[patchI] = patches[patchI].size();
@@ -320,7 +321,8 @@ autoPtr<mapPolyMesh> reorderMesh
xferMove(newOwner),
xferMove(newNeighbour),
patchSizes,
- patchStarts
+ patchStarts,
+ true
);
return autoPtr<mapPolyMesh>
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 1b38f6b23973cb9db83a65aa9367d496831b4037..e9c20f1afbf34e6d1c31b84f02616e63a69e7727 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -560,7 +560,7 @@ void getInterfaceSizes
label cellI = mesh.faceOwner()[i+mesh.nInternalFaces()];
coupledRegion[i] = cellRegion[cellI];
}
- syncTools::swapBoundaryFaceList(mesh, coupledRegion, false);
+ syncTools::swapBoundaryFaceList(mesh, coupledRegion);
forAll(coupledRegion, i)
{
@@ -730,7 +730,7 @@ autoPtr<mapPolyMesh> createRegionMesh
label cellI = mesh.faceOwner()[i+mesh.nInternalFaces()];
coupledRegion[i] = cellRegion[cellI];
}
- syncTools::swapBoundaryFaceList(mesh, coupledRegion, false);
+ syncTools::swapBoundaryFaceList(mesh, coupledRegion);
// Topology change container. Start off from existing mesh.
@@ -1300,7 +1300,7 @@ void getZoneID
{
neiZoneID[i] = zoneID[mesh.faceOwner()[i+mesh.nInternalFaces()]];
}
- syncTools::swapBoundaryFaceList(mesh, neiZoneID, false);
+ syncTools::swapBoundaryFaceList(mesh, neiZoneID);
}
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 334a12b2ce3214e5bcb8b46a03b3b778dc5b41eb..40afc5ecb92b10cb5cf5d37db2f0efa459cfe420 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
index 86b1caec440e2548f14983883bbfb971a93ff616..08e8f29f24d37f67fc95fafbf35a289266341a42 100644
--- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
+++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
@@ -42,12 +42,6 @@ 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");
@@ -55,10 +49,9 @@ int main(int argc, char *argv[])
const string dictName = args[1];
- IOobject::writeBanner(Info)
- <<"//\n// " << dictName << "\n//\n";
+ Info<<"//\n// expansion of dictionary " << dictName << "\n//\n";
- dictionary(IFstream(dictName)(), true).write(Info, false);
+ dictionary(IFstream(dictName)()).write(Info, false);
IOobject::writeDivider(Info);
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index c465aa3c3befb513ed63f035b90c817a04840425..b50db4a76ccccb0191a0b4f42898bd6f57d0080d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -62,7 +62,6 @@ Usage
#include "OSspecific.H"
#include "fvCFD.H"
#include "IOobjectList.H"
-#include "processorFvPatchFields.H"
#include "domainDecomposition.H"
#include "labelIOField.H"
#include "scalarIOField.H"
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index 95140309f7a449441cd8def65d2d4d963e2bf9e2..a183ebd0cb405f1a2af5ec8ae1cbe66366cc4dc1 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
@@ -25,7 +25,7 @@ numberOfSubdomains 4;
//- Keep owner and neighbour on same processor for faces in patches:
// (makes sense only for cyclic patches)
-//preservePatches (cyclic_left_right);
+//preservePatches (cyclic_half0 cyclic_half1);
method scotch;
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 0d90c2ab086a2baebd88a920eb1ddc1cd1109ad6..96446c656a313d4f2f50f51d13a16d693d035dda 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -28,6 +28,7 @@ License
#include "dictionary.H"
#include "labelIOList.H"
#include "processorPolyPatch.H"
+#include "processorCyclicPolyPatch.H"
#include "fvMesh.H"
#include "OSspecific.H"
#include "Map.H"
@@ -108,7 +109,8 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
procNeighbourProcessors_(nProcs_),
procProcessorPatchSize_(nProcs_),
procProcessorPatchStartIndex_(nProcs_),
- cyclicParallel_(false)
+ procProcessorPatchSubPatchIDs_(nProcs_),
+ procProcessorPatchSubPatchStarts_(nProcs_)
{
decompositionDict_.readIfPresent("distributed", distributed_);
}
@@ -339,12 +341,42 @@ bool Foam::domainDecomposition::writeDecomposition()
const labelList& curProcessorPatchStarts =
procProcessorPatchStartIndex_[procI];
+ const labelListList& curSubPatchIDs =
+ procProcessorPatchSubPatchIDs_[procI];
+
+ const labelListList& curSubStarts =
+ procProcessorPatchSubPatchStarts_[procI];
+
const polyPatchList& meshPatches = boundaryMesh();
+
+ // Count the number of inter-proc patches
+ label nInterProcPatches = 0;
+ forAll(curSubPatchIDs, procPatchI)
+ {
+ //Info<< "For processor " << procI
+ // << " have to destination processor "
+ // << curNeighbourProcessors[procPatchI] << endl;
+ //
+ //forAll(curSubPatchIDs[procPatchI], i)
+ //{
+ // Info<< " from patch:" << curSubPatchIDs[procPatchI][i]
+ // << " starting at:" << curSubStarts[procPatchI][i]
+ // << endl;
+ //}
+
+ nInterProcPatches += curSubPatchIDs[procPatchI].size();
+ }
+
+ //Info<< "For processor " << procI
+ // << " have " << nInterProcPatches
+ // << " patches to neighbouring processors" << endl;
+
+
List<polyPatch*> procPatches
(
curPatchSizes.size()
- + curProcessorPatchSizes.size(),
+ + nInterProcPatches, //curProcessorPatchSizes.size(),
reinterpret_cast<polyPatch*>(0)
);
@@ -381,23 +413,84 @@ bool Foam::domainDecomposition::writeDecomposition()
forAll(curProcessorPatchSizes, procPatchI)
{
- procPatches[nPatches] =
- new processorPolyPatch
+ const labelList& subPatchID = curSubPatchIDs[procPatchI];
+ const labelList& subStarts = curSubStarts[procPatchI];
+
+ label curStart = curProcessorPatchStarts[procPatchI];
+
+ forAll(subPatchID, i)
+ {
+ label size =
(
- word("procBoundary") + Foam::name(procI)
- + word("to")
- + Foam::name(curNeighbourProcessors[procPatchI]),
- curProcessorPatchSizes[procPatchI],
- curProcessorPatchStarts[procPatchI],
- nPatches,
- procMesh.boundaryMesh(),
- procI,
- curNeighbourProcessors[procPatchI]
- );
+ i < subPatchID.size()-1
+ ? subStarts[i+1] - subStarts[i]
+ : curProcessorPatchSizes[procPatchI] - subStarts[i]
+ );
- nPatches++;
+ //Info<< "From processor:" << procI << endl
+ // << " to processor:" << curNeighbourProcessors[procPatchI]
+ // << endl
+ // << " via patch:" << subPatchID[i] << endl
+ // << " start :" << curStart << endl
+ // << " size :" << size << endl;
+
+ if (subPatchID[i] == -1)
+ {
+ // From internal faces
+ procPatches[nPatches] =
+ new processorPolyPatch
+ (
+ word("procBoundary") + Foam::name(procI)
+ + "to"
+ + Foam::name(curNeighbourProcessors[procPatchI]),
+ size,
+ curStart,
+ nPatches,
+ procMesh.boundaryMesh(),
+ procI,
+ curNeighbourProcessors[procPatchI]
+ );
+ }
+ else
+ {
+ // From cyclic
+ const word& referPatch =
+ boundaryMesh()[subPatchID[i]].name();
+
+ procPatches[nPatches] =
+ new processorCyclicPolyPatch
+ (
+ word("procBoundary") + Foam::name(procI)
+ + "to"
+ + Foam::name(curNeighbourProcessors[procPatchI])
+ + "through"
+ + referPatch,
+ size,
+ curStart,
+ nPatches,
+ procMesh.boundaryMesh(),
+ procI,
+ curNeighbourProcessors[procPatchI],
+ referPatch
+ );
+ }
+
+ curStart += size;
+
+ nPatches++;
+ }
}
+
+ //forAll(procPatches, patchI)
+ //{
+ // Pout<< " " << patchI
+ // << '\t' << "name:" << procPatches[patchI]->name()
+ // << '\t' << "type:" << procPatches[patchI]->type()
+ // << '\t' << "size:" << procPatches[patchI]->size()
+ // << endl;
+ //}
+
// Add boundary patches
procMesh.addPatches(procPatches);
@@ -663,11 +756,7 @@ bool Foam::domainDecomposition::writeDecomposition()
forAll(procMesh.boundaryMesh(), patchi)
{
- if
- (
- procMesh.boundaryMesh()[patchi].type()
- == processorPolyPatch::typeName
- )
+ if (isA<processorPolyPatch>(procMesh.boundaryMesh()[patchi]))
{
const processorPolyPatch& ppp =
refCast<const processorPolyPatch>
@@ -745,11 +834,7 @@ bool Foam::domainDecomposition::writeDecomposition()
// (= identity map for original patches, -1 for processor patches)
label nMeshPatches = curPatchSizes.size();
labelList procBoundaryAddressing(identity(nMeshPatches));
- procBoundaryAddressing.setSize
- (
- nMeshPatches+curProcessorPatchSizes.size(),
- -1
- );
+ procBoundaryAddressing.setSize(nMeshPatches+nProcPatches, -1);
labelIOList boundaryProcAddressing
(
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index b9dbb74c6fbff5deac8ec0e07fd837c140c22148..d662db75a5096e5fa570f433c964fc0bbeea92b4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -29,6 +29,7 @@ Description
SourceFiles
domainDecomposition.C
+ decomposeMesh.C
\*---------------------------------------------------------------------------*/
@@ -78,9 +79,9 @@ class domainDecomposition
// index is negative, the processor face is the reverse of the
// original face. In order to do this properly, all face
// indices will be incremented by 1 and the decremented as
- // necessary t avoid the problem of face number zero having no
- // sign.
- labelListList procFaceAddressing_;
+ // necessary to avoid the problem of face number zero having no
+ // sign.
+ List<DynamicList<label> > procFaceAddressing_;
//- Labels of cells for each processor
labelListList procCellAddressing_;
@@ -93,18 +94,23 @@ class domainDecomposition
// Excludes inter-processor boundaries
labelListList procPatchStartIndex_;
+
+ // Per inter-processor patch information
+
//- Neighbour processor ID for inter-processor boundaries
labelListList procNeighbourProcessors_;
//- Sizes for inter-processor patches
labelListList procProcessorPatchSize_;
- //- Start indices for inter-processor patches
+ //- Start indices (in procFaceAddressing_) for inter-processor patches
labelListList procProcessorPatchStartIndex_;
- //- Are there cyclic-parallel faces
- bool cyclicParallel_;
+ //- Sub patch IDs for inter-processor patches
+ List<labelListList> procProcessorPatchSubPatchIDs_;
+ //- Sub patch sizes for inter-processor patches
+ List<labelListList> procProcessorPatchSubPatchStarts_;
// Private Member Functions
@@ -118,6 +124,21 @@ class domainDecomposition
labelList& elementToZone
);
+ //- Append single element to list
+ static void append(labelList&, const label);
+
+ //- Add face to interProcessor patch.
+ void addInterProcFace
+ (
+ const label facei,
+ const label ownerProc,
+ const label nbrProc,
+
+ List<Map<label> >&,
+ List<DynamicList<DynamicList<label> > >&
+ ) const;
+
+
public:
// Constructors
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
index 36ce46e454db12d95b1d108269d1d931b6d4f23b..6adf0639626bd08a62370060d192ae6e33a1de0d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
@@ -26,7 +26,6 @@ License
#include "domainDecomposition.H"
#include "decompositionMethod.H"
#include "cpuTime.H"
-#include "cyclicPolyPatch.H"
#include "cellSet.H"
#include "regionSplit.H"
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index d7487dc58e6ee6cb3b94091a88577638f3aba1fc..46febf2b44defbf5bddadfe25864065554106bc8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -39,6 +39,63 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+void Foam::domainDecomposition::append(labelList& lst, const label elem)
+{
+ label sz = lst.size();
+ lst.setSize(sz+1);
+ lst[sz] = elem;
+}
+
+
+void Foam::domainDecomposition::addInterProcFace
+(
+ const label facei,
+ const label ownerProc,
+ const label nbrProc,
+
+ List<Map<label> >& nbrToInterPatch,
+ List<DynamicList<DynamicList<label> > >& interPatchFaces
+) const
+{
+ Map<label>::iterator patchIter = nbrToInterPatch[ownerProc].find(nbrProc);
+
+ // Introduce turning index only for internal faces (are duplicated).
+ label ownerIndex = facei+1;
+ label nbrIndex = -(facei+1);
+
+ if (patchIter != nbrToInterPatch[ownerProc].end())
+ {
+ // Existing interproc patch. Add to both sides.
+ label toNbrProcPatchI = patchIter();
+ interPatchFaces[ownerProc][toNbrProcPatchI].append(ownerIndex);
+
+ if (isInternalFace(facei))
+ {
+ label toOwnerProcPatchI = nbrToInterPatch[nbrProc][ownerProc];
+ interPatchFaces[nbrProc][toOwnerProcPatchI].append(nbrIndex);
+ }
+ }
+ else
+ {
+ // Create new interproc patches.
+ label toNbrProcPatchI = nbrToInterPatch[ownerProc].size();
+ nbrToInterPatch[ownerProc].insert(nbrProc, toNbrProcPatchI);
+ DynamicList<label> oneFace;
+ oneFace.append(ownerIndex);
+ interPatchFaces[ownerProc].append(oneFace);
+
+ if (isInternalFace(facei))
+ {
+ label toOwnerProcPatchI = nbrToInterPatch[nbrProc].size();
+ nbrToInterPatch[nbrProc].insert(ownerProc, toOwnerProcPatchI);
+ oneFace.clear();
+ oneFace.append(nbrIndex);
+ interPatchFaces[nbrProc].append(oneFace);
+ }
+ }
+}
+
+
void Foam::domainDecomposition::decomposeMesh()
{
// Decide which cell goes to which processor
@@ -60,31 +117,8 @@ void Foam::domainDecomposition::decomposeMesh()
Info<< "\nDistributing cells to processors" << endl;
- // Memory management
- {
- List<SLList<label> > procCellList(nProcs_);
-
- forAll(cellToProc_, celli)
- {
- if (cellToProc_[celli] >= nProcs_)
- {
- FatalErrorIn("domainDecomposition::decomposeMesh()")
- << "Impossible processor label " << cellToProc_[celli]
- << "for cell " << celli
- << abort(FatalError);
- }
- else
- {
- procCellList[cellToProc_[celli]].append(celli);
- }
- }
-
- // Convert linked lists into normal lists
- forAll(procCellList, procI)
- {
- procCellAddressing_[procI] = procCellList[procI];
- }
- }
+ // Cells per processor
+ procCellAddressing_ = invertOneToMany(nProcs_, cellToProc_);
Info<< "\nDistributing faces to processors" << endl;
@@ -93,503 +127,335 @@ void Foam::domainDecomposition::decomposeMesh()
// same processor, the face is an internal face. If they are different,
// it belongs to both processors.
- // Memory management
- {
- List<SLList<label> > procFaceList(nProcs_);
+ procFaceAddressing_.setSize(nProcs_);
- forAll(neighbour, facei)
+ // Internal faces
+ forAll (neighbour, facei)
+ {
+ if (cellToProc_[owner[facei]] == cellToProc_[neighbour[facei]])
{
- if (cellToProc_[owner[facei]] == cellToProc_[neighbour[facei]])
- {
- // Face internal to processor
- procFaceList[cellToProc_[owner[facei]]].append(facei);
- }
+ // Face internal to processor. Notice no turning index.
+ procFaceAddressing_[cellToProc_[owner[facei]]].append(facei+1);
}
+ }
- // Detect inter-processor boundaries
-
- // Neighbour processor for each subdomain
- List<SLList<label> > interProcBoundaries(nProcs_);
+ // for all processors, set the size of start index and patch size
+ // lists to the number of patches in the mesh
+ forAll (procPatchSize_, procI)
+ {
+ procPatchSize_[procI].setSize(patches.size());
+ procPatchStartIndex_[procI].setSize(patches.size());
+ }
- // Face labels belonging to each inter-processor boundary
- List<SLList<SLList<label> > > interProcBFaces(nProcs_);
+ forAll (patches, patchi)
+ {
+ // Reset size and start index for all processors
+ forAll (procPatchSize_, procI)
+ {
+ procPatchSize_[procI][patchi] = 0;
+ procPatchStartIndex_[procI][patchi] =
+ procFaceAddressing_[procI].size();
+ }
- List<SLList<label> > procPatchIndex(nProcs_);
+ const label patchStart = patches[patchi].start();
- forAll(neighbour, facei)
+ if (!isA<cyclicPolyPatch>(patches[patchi]))
{
- if (cellToProc_[owner[facei]] != cellToProc_[neighbour[facei]])
- {
- // inter - processor patch face found. Go through the list of
- // inside boundaries for the owner processor and try to find
- // this inter-processor patch.
+ // Normal patch. Add faces to processor where the cell
+ // next to the face lives
- label ownerProc = cellToProc_[owner[facei]];
- label neighbourProc = cellToProc_[neighbour[facei]];
+ const unallocLabelList& patchFaceCells =
+ patches[patchi].faceCells();
- SLList<label>::iterator curInterProcBdrsOwnIter =
- interProcBoundaries[ownerProc].begin();
+ forAll (patchFaceCells, facei)
+ {
+ const label curProc = cellToProc_[patchFaceCells[facei]];
- SLList<SLList<label> >::iterator curInterProcBFacesOwnIter =
- interProcBFaces[ownerProc].begin();
+ // add the face without turning index
+ procFaceAddressing_[curProc].append(patchStart+facei+1);
- bool interProcBouFound = false;
+ // increment the number of faces for this patch
+ procPatchSize_[curProc][patchi]++;
+ }
+ }
+ else
+ {
+ const cyclicPolyPatch& pp = refCast<const cyclicPolyPatch>
+ (
+ patches[patchi]
+ );
+ // cyclic: check opposite side on this processor
+ const unallocLabelList& patchFaceCells = pp.faceCells();
- // WARNING: Synchronous SLList iterators
+ const unallocLabelList& nbrPatchFaceCells =
+ pp.neighbPatch().faceCells();
- for
- (
- ;
- curInterProcBdrsOwnIter
- != interProcBoundaries[ownerProc].end()
- && curInterProcBFacesOwnIter
- != interProcBFaces[ownerProc].end();
- ++curInterProcBdrsOwnIter, ++curInterProcBFacesOwnIter
- )
+ forAll (patchFaceCells, facei)
+ {
+ const label curProc = cellToProc_[patchFaceCells[facei]];
+ const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
+ if (curProc == nbrProc)
{
- if (curInterProcBdrsOwnIter() == neighbourProc)
- {
- // the inter - processor boundary exists. Add the face
- interProcBouFound = true;
-
- curInterProcBFacesOwnIter().append(facei);
-
- SLList<label>::iterator curInterProcBdrsNeiIter =
- interProcBoundaries[neighbourProc].begin();
-
- SLList<SLList<label> >::iterator
- curInterProcBFacesNeiIter =
- interProcBFaces[neighbourProc].begin();
-
- bool neighbourFound = false;
-
- // WARNING: Synchronous SLList iterators
-
- for
- (
- ;
- curInterProcBdrsNeiIter !=
- interProcBoundaries[neighbourProc].end()
- && curInterProcBFacesNeiIter !=
- interProcBFaces[neighbourProc].end();
- ++curInterProcBdrsNeiIter,
- ++curInterProcBFacesNeiIter
- )
- {
- if (curInterProcBdrsNeiIter() == ownerProc)
- {
- // boundary found. Add the face
- neighbourFound = true;
-
- curInterProcBFacesNeiIter().append(facei);
- }
-
- if (neighbourFound) break;
- }
-
- if (interProcBouFound && !neighbourFound)
- {
- FatalErrorIn("domainDecomposition::decomposeMesh()")
- << "Inconsistency in inter - "
- << "processor boundary lists for processors "
- << ownerProc << " and " << neighbourProc
- << abort(FatalError);
- }
- }
-
- if (interProcBouFound) break;
+ // add the face without turning index
+ procFaceAddressing_[curProc].append(patchStart+facei+1);
+ // increment the number of faces for this patch
+ procPatchSize_[curProc][patchi]++;
}
+ }
+ }
+ }
- if (!interProcBouFound)
- {
- // inter - processor boundaries do not exist and need to
- // be created
- // set the new addressing information
+ // Done internal bits of the new mesh and the ordinary patches.
- // owner
- interProcBoundaries[ownerProc].append(neighbourProc);
- interProcBFaces[ownerProc].append(SLList<label>(facei));
- // neighbour
- interProcBoundaries[neighbourProc].append(ownerProc);
- interProcBFaces[neighbourProc].append(SLList<label>(facei));
- }
- }
- }
+ // Per processor, from neighbour processor to the interprocessorpatch that
+ // communicates with that neighbour.
+ List<Map<label> > procNbrToInterPatch(nProcs_);
+ // Per processor the faces per interprocessorpatch.
+ List<DynamicList<DynamicList<label> > > interPatchFaces(nProcs_);
- // Loop through patches. For cyclic boundaries detect inter-processor
- // faces; for all other, add faces to the face list and remember start
- // and size of all patches.
+ // Processor boundaries from internal faces
+ forAll (neighbour, facei)
+ {
+ label ownerProc = cellToProc_[owner[facei]];
+ label nbrProc = cellToProc_[neighbour[facei]];
- // for all processors, set the size of start index and patch size
- // lists to the number of patches in the mesh
- forAll(procPatchSize_, procI)
+ if (ownerProc != nbrProc)
{
- procPatchSize_[procI].setSize(patches.size());
- procPatchStartIndex_[procI].setSize(patches.size());
+ // inter - processor patch face found.
+ addInterProcFace
+ (
+ facei,
+ ownerProc,
+ nbrProc,
+
+ procNbrToInterPatch,
+ interPatchFaces
+ );
}
+ }
+
+ // Add the proper processor faces to the sub information. For faces
+ // originating from internal faces this is always -1.
+ List<labelListList> subPatchIDs(nProcs_);
+ List<labelListList> subPatchStarts(nProcs_);
+ forAll(interPatchFaces, procI)
+ {
+ label nInterfaces = interPatchFaces[procI].size();
+
+ subPatchIDs[procI].setSize(nInterfaces, labelList(1, -1));
+ subPatchStarts[procI].setSize(nInterfaces, labelList(1, 0));
+ }
- forAll(patches, patchi)
+ // Processor boundaries from split cyclics
+ forAll (patches, patchi)
+ {
+ if (isA<cyclicPolyPatch>(patches[patchi]))
{
- // Reset size and start index for all processors
- forAll(procPatchSize_, procI)
- {
- procPatchSize_[procI][patchi] = 0;
- procPatchStartIndex_[procI][patchi] =
- procFaceList[procI].size();
- }
+ const cyclicPolyPatch& pp = refCast<const cyclicPolyPatch>
+ (
+ patches[patchi]
+ );
- const label patchStart = patches[patchi].start();
+ // cyclic: check opposite side on this processor
+ const unallocLabelList& patchFaceCells = pp.faceCells();
+ const unallocLabelList& nbrPatchFaceCells =
+ pp.neighbPatch().faceCells();
- if (!isA<cyclicPolyPatch>(patches[patchi]))
+ // Store old sizes. Used to detect which inter-proc patches
+ // have been added to.
+ labelListList oldInterfaceSizes(nProcs_);
+ forAll(oldInterfaceSizes, procI)
{
- // Normal patch. Add faces to processor where the cell
- // next to the face lives
+ labelList& curOldSizes = oldInterfaceSizes[procI];
- const unallocLabelList& patchFaceCells =
- patches[patchi].faceCells();
-
- forAll(patchFaceCells, facei)
+ curOldSizes.setSize(interPatchFaces[procI].size());
+ forAll(curOldSizes, interI)
{
- const label curProc = cellToProc_[patchFaceCells[facei]];
-
- // add the face
- procFaceList[curProc].append(patchStart + facei);
-
- // increment the number of faces for this patch
- procPatchSize_[curProc][patchi]++;
+ curOldSizes[interI] =
+ interPatchFaces[procI][interI].size();
}
}
- else
- {
- // Cyclic patch special treatment
-
- const polyPatch& cPatch = patches[patchi];
-
- const label cycOffset = cPatch.size()/2;
-
- // Set reference to faceCells for both patches
- const labelList::subList firstFaceCells
- (
- cPatch.faceCells(),
- cycOffset
- );
- const labelList::subList secondFaceCells
- (
- cPatch.faceCells(),
- cycOffset,
- cycOffset
- );
-
- forAll(firstFaceCells, facei)
+ // Add faces with different owner and neighbour processors
+ forAll (patchFaceCells, facei)
+ {
+ const label ownerProc = cellToProc_[patchFaceCells[facei]];
+ const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
+ if (ownerProc != nbrProc)
{
- if
+ // inter - processor patch face found.
+ addInterProcFace
(
- cellToProc_[firstFaceCells[facei]]
- != cellToProc_[secondFaceCells[facei]]
- )
- {
- // This face becomes an inter-processor boundary face
- // inter - processor patch face found. Go through
- // the list of inside boundaries for the owner
- // processor and try to find this inter-processor
- // patch.
-
- cyclicParallel_ = true;
-
- label ownerProc = cellToProc_[firstFaceCells[facei]];
- label neighbourProc =
- cellToProc_[secondFaceCells[facei]];
-
- SLList<label>::iterator curInterProcBdrsOwnIter =
- interProcBoundaries[ownerProc].begin();
-
- SLList<SLList<label> >::iterator
- curInterProcBFacesOwnIter =
- interProcBFaces[ownerProc].begin();
-
- bool interProcBouFound = false;
-
- // WARNING: Synchronous SLList iterators
-
- for
- (
- ;
- curInterProcBdrsOwnIter !=
- interProcBoundaries[ownerProc].end()
- && curInterProcBFacesOwnIter !=
- interProcBFaces[ownerProc].end();
- ++curInterProcBdrsOwnIter,
- ++curInterProcBFacesOwnIter
- )
- {
- if (curInterProcBdrsOwnIter() == neighbourProc)
- {
- // the inter - processor boundary exists.
- // Add the face
- interProcBouFound = true;
-
- curInterProcBFacesOwnIter().append
- (patchStart + facei);
-
- SLList<label>::iterator curInterProcBdrsNeiIter
- = interProcBoundaries[neighbourProc].begin();
-
- SLList<SLList<label> >::iterator
- curInterProcBFacesNeiIter =
- interProcBFaces[neighbourProc].begin();
-
- bool neighbourFound = false;
-
- // WARNING: Synchronous SLList iterators
-
- for
- (
- ;
- curInterProcBdrsNeiIter
- != interProcBoundaries[neighbourProc].end()
- && curInterProcBFacesNeiIter
- != interProcBFaces[neighbourProc].end();
- ++curInterProcBdrsNeiIter,
- ++curInterProcBFacesNeiIter
- )
- {
- if (curInterProcBdrsNeiIter() == ownerProc)
- {
- // boundary found. Add the face
- neighbourFound = true;
-
- curInterProcBFacesNeiIter()
- .append
- (
- patchStart
- + cycOffset
- + facei
- );
- }
-
- if (neighbourFound) break;
- }
-
- if (interProcBouFound && !neighbourFound)
- {
- FatalErrorIn
- (
- "domainDecomposition::decomposeMesh()"
- ) << "Inconsistency in inter-processor "
- << "boundary lists for processors "
- << ownerProc << " and " << neighbourProc
- << " in cyclic boundary matching"
- << abort(FatalError);
- }
- }
-
- if (interProcBouFound) break;
- }
-
- if (!interProcBouFound)
- {
- // inter - processor boundaries do not exist
- // and need to be created
-
- // set the new addressing information
-
- // owner
- interProcBoundaries[ownerProc]
- .append(neighbourProc);
- interProcBFaces[ownerProc]
- .append(SLList<label>(patchStart + facei));
-
- // neighbour
- interProcBoundaries[neighbourProc]
- .append(ownerProc);
- interProcBFaces[neighbourProc]
- .append
- (
- SLList<label>
- (
- patchStart
- + cycOffset
- + facei
- )
- );
- }
- }
- else
- {
- // This cyclic face remains on the processor
- label ownerProc = cellToProc_[firstFaceCells[facei]];
-
- // add the face
- procFaceList[ownerProc].append(patchStart + facei);
-
- // increment the number of faces for this patch
- procPatchSize_[ownerProc][patchi]++;
-
- // Note: I cannot add the other side of the cyclic
- // boundary here because this would violate the order.
- // They will be added in a separate loop below
- //
- }
+ pp.start()+facei,
+ ownerProc,
+ nbrProc,
+ procNbrToInterPatch,
+ interPatchFaces
+ );
}
+ }
+
+ // 1. Check if any faces added to existing interfaces
+ forAll(oldInterfaceSizes, procI)
+ {
+ const labelList& curOldSizes = oldInterfaceSizes[procI];
- // Ordering in cyclic boundaries is important.
- // Add the other half of cyclic faces for cyclic boundaries
- // that remain on the processor
- forAll(secondFaceCells, facei)
+ forAll(curOldSizes, interI)
{
- if
- (
- cellToProc_[firstFaceCells[facei]]
- == cellToProc_[secondFaceCells[facei]]
- )
+ label oldSz = curOldSizes[interI];
+ if (interPatchFaces[procI][interI].size() > oldSz)
{
- // This cyclic face remains on the processor
- label ownerProc = cellToProc_[firstFaceCells[facei]];
-
- // add the second face
- procFaceList[ownerProc].append
- (patchStart + cycOffset + facei);
-
- // increment the number of faces for this patch
- procPatchSize_[ownerProc][patchi]++;
+ // Added faces to this interface. Add an entry
+ append(subPatchIDs[procI][interI], patchi);
+ append(subPatchStarts[procI][interI], oldSz);
}
}
}
- }
-
- // Convert linked lists into normal lists
- // Add inter-processor boundaries and remember start indices
- forAll(procFaceList, procI)
- {
- // Get internal and regular boundary processor faces
- SLList<label>& curProcFaces = procFaceList[procI];
- // Get reference to processor face addressing
- labelList& curProcFaceAddressing = procFaceAddressing_[procI];
-
- labelList& curProcNeighbourProcessors =
- procNeighbourProcessors_[procI];
+ // 2. Any new interfaces
+ forAll(subPatchIDs, procI)
+ {
+ label nIntfcs = interPatchFaces[procI].size();
+ subPatchIDs[procI].setSize(nIntfcs, labelList(1, patchi));
+ subPatchStarts[procI].setSize(nIntfcs, labelList(1, 0));
+ }
+ }
+ }
- labelList& curProcProcessorPatchSize =
- procProcessorPatchSize_[procI];
- labelList& curProcProcessorPatchStartIndex =
- procProcessorPatchStartIndex_[procI];
+ // Shrink processor patch face addressing
+ forAll(interPatchFaces, procI)
+ {
+ DynamicList<DynamicList<label> >& curInterPatchFaces =
+ interPatchFaces[procI];
- // calculate the size
- label nFacesOnProcessor = curProcFaces.size();
+ forAll(curInterPatchFaces, i)
+ {
+ curInterPatchFaces[i].shrink();
+ }
+ curInterPatchFaces.shrink();
+ }
- for
- (
- SLList<SLList<label> >::iterator curInterProcBFacesIter =
- interProcBFaces[procI].begin();
- curInterProcBFacesIter != interProcBFaces[procI].end();
- ++curInterProcBFacesIter
- )
- {
- nFacesOnProcessor += curInterProcBFacesIter().size();
- }
- curProcFaceAddressing.setSize(nFacesOnProcessor);
+ // Sort inter-proc patch by neighbour
+ labelList order;
+ forAll(procNbrToInterPatch, procI)
+ {
+ label nInterfaces = procNbrToInterPatch[procI].size();
- // Fill in the list. Calculate turning index.
- // Turning index will be -1 only for some faces on processor
- // boundaries, i.e. the ones where the current processor ID
- // is in the cell which is a face neighbour.
- // Turning index is stored as the sign of the face addressing list
+ procNeighbourProcessors_[procI].setSize(nInterfaces);
+ procProcessorPatchSize_[procI].setSize(nInterfaces);
+ procProcessorPatchStartIndex_[procI].setSize(nInterfaces);
+ procProcessorPatchSubPatchIDs_[procI].setSize(nInterfaces);
+ procProcessorPatchSubPatchStarts_[procI].setSize(nInterfaces);
- label nFaces = 0;
+ //Info<< "Processor " << procI << endl;
- // Add internal and boundary faces
- // Remember to increment the index by one such that the
- // turning index works properly.
- forAllConstIter(SLList<label>, curProcFaces, curProcFacesIter)
- {
- curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
- nFaces++;
- }
+ // Get sorted neighbour processors
+ const Map<label>& curNbrToInterPatch = procNbrToInterPatch[procI];
+ labelList nbrs = curNbrToInterPatch.toc();
+ sortedOrder(nbrs, order);
- // Add inter-processor boundary faces. At the beginning of each
- // patch, grab the patch start index and size
+ DynamicList<DynamicList<label> >& curInterPatchFaces =
+ interPatchFaces[procI];
- curProcNeighbourProcessors.setSize
+ forAll(order, i)
+ {
+ const label nbrProc = nbrs[i];
+ const label interPatch = curNbrToInterPatch[nbrProc];
+
+ procNeighbourProcessors_[procI][i] =
+ nbrProc;
+ procProcessorPatchSize_[procI][i] =
+ curInterPatchFaces[interPatch].size();
+ procProcessorPatchStartIndex_[procI][i] =
+ procFaceAddressing_[procI].size();
+
+ // Add size as last element to substarts and transfer
+ append
(
- interProcBoundaries[procI].size()
+ subPatchStarts[procI][interPatch],
+ curInterPatchFaces[interPatch].size()
);
-
- curProcProcessorPatchSize.setSize
+ procProcessorPatchSubPatchIDs_[procI][i].transfer
(
- interProcBoundaries[procI].size()
+ subPatchIDs[procI][interPatch]
);
-
- curProcProcessorPatchStartIndex.setSize
+ procProcessorPatchSubPatchStarts_[procI][i].transfer
(
- interProcBoundaries[procI].size()
+ subPatchStarts[procI][interPatch]
);
- label nProcPatches = 0;
-
- SLList<label>::iterator curInterProcBdrsIter =
- interProcBoundaries[procI].begin();
-
- SLList<SLList<label> >::iterator curInterProcBFacesIter =
- interProcBFaces[procI].begin();
-
- for
- (
- ;
- curInterProcBdrsIter != interProcBoundaries[procI].end()
- && curInterProcBFacesIter != interProcBFaces[procI].end();
- ++curInterProcBdrsIter, ++curInterProcBFacesIter
- )
+ //Info<< " nbr:" << nbrProc << endl;
+ //Info<< " interpatch:" << interPatch << endl;
+ //Info<< " size:" << procProcessorPatchSize_[procI][i] << endl;
+ //Info<< " start:" << procProcessorPatchStartIndex_[procI][i]
+ // << endl;
+ //Info<< " subPatches:" << procProcessorPatchSubPatchIDs_[procI][i]
+ // << endl;
+ //Info<< " subStarts:"
+ // << procProcessorPatchSubPatchStarts_[procI][i] << endl;
+
+ // And add all the face labels for interPatch
+ DynamicList<label>& interPatchFaces =
+ curInterPatchFaces[interPatch];
+
+ forAll(interPatchFaces, j)
{
- curProcNeighbourProcessors[nProcPatches] =
- curInterProcBdrsIter();
-
- // Get start index for processor patch
- curProcProcessorPatchStartIndex[nProcPatches] = nFaces;
+ procFaceAddressing_[procI].append(interPatchFaces[j]);
+ }
+ interPatchFaces.clearStorage();
+ }
+ curInterPatchFaces.clearStorage();
+ procFaceAddressing_[procI].shrink();
+ }
- label& curSize =
- curProcProcessorPatchSize[nProcPatches];
- curSize = 0;
+////XXXXXXX
+//// Print a bit
+// forAll(procPatchStartIndex_, procI)
+// {
+// Info<< "Processor:" << procI << endl;
+//
+// Info<< " total faces:" << procFaceAddressing_[procI].size()
+// << endl;
+//
+// const labelList& curProcPatchStartIndex = procPatchStartIndex_[procI];
+//
+// forAll(curProcPatchStartIndex, patchI)
+// {
+// Info<< " patch:" << patchI
+// << "\tstart:" << curProcPatchStartIndex[patchI]
+// << "\tsize:" << procPatchSize_[procI][patchI]
+// << endl;
+// }
+// }
+// Info<< endl;
+//
+// forAll(procNeighbourProcessors_, procI)
+// {
+// Info<< "Processor " << procI << endl;
+//
+// forAll(procNeighbourProcessors_[procI], i)
+// {
+// Info<< " nbr:" << procNeighbourProcessors_[procI][i] << endl;
+// Info<< " size:" << procProcessorPatchSize_[procI][i] << endl;
+// Info<< " start:" << procProcessorPatchStartIndex_[procI][i]
+// << endl;
+// }
+// }
+// Info<< endl;
+//
+// forAll(procFaceAddressing_, procI)
+// {
+// Info<< "Processor:" << procI << endl;
+//
+// Info<< " faces:" << procFaceAddressing_[procI] << endl;
+// }
- // add faces for this processor boundary
- forAllConstIter
- (
- SLList<label>,
- curInterProcBFacesIter(),
- curFacesIter
- )
- {
- // add the face
-
- // Remember to increment the index by one such that the
- // turning index works properly.
- if (cellToProc_[owner[curFacesIter()]] == procI)
- {
- curProcFaceAddressing[nFaces] = curFacesIter() + 1;
- }
- else
- {
- // turning face
- curProcFaceAddressing[nFaces] = -(curFacesIter() + 1);
- }
-
- // increment the size
- curSize++;
-
- nFaces++;
- }
-
- nProcPatches++;
- }
- }
- }
Info<< "\nDistributing points to processors" << endl;
// For every processor, loop through the list of faces for the processor.
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
index 25bcd3495fe38be562d223dd3c2f5a29a1cdbe7c..52582832cf650f76fc44469ca9f18671a0edf678 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
@@ -144,7 +144,11 @@ Foam::fvFieldDecomposer::fvFieldDecomposer
{
forAll(boundaryAddressing_, patchi)
{
- if (boundaryAddressing_[patchi] >= 0)
+ if
+ (
+ boundaryAddressing_[patchi] >= 0
+ && !isA<processorLduInterface>(procMesh.boundary()[patchi])
+ )
{
patchFieldDecomposerPtrs_[patchi] = new patchFieldDecomposer
(
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
index c70f724221ecaebbefb64bf19054426f68831b07..190e7f8e1cf35a1d81f1a60cc52b7a57dc976cc9 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
@@ -26,6 +26,8 @@ License
#include "fvFieldDecomposer.H"
#include "processorFvPatchField.H"
#include "processorFvsPatchField.H"
+#include "processorCyclicFvPatchField.H"
+#include "processorCyclicFvsPatchField.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -44,7 +46,7 @@ Foam::fvFieldDecomposer::decomposeField
forAll(boundaryAddressing_, patchi)
{
- if (boundaryAddressing_[patchi] >= 0)
+ if (patchFieldDecomposerPtrs_[patchi])
{
patchFields.set
(
@@ -58,7 +60,24 @@ Foam::fvFieldDecomposer::decomposeField
)
);
}
- else
+ else if (isA<processorCyclicFvPatch>(procMesh_.boundary()[patchi]))
+ {
+ patchFields.set
+ (
+ patchi,
+ new processorCyclicFvPatchField<Type>
+ (
+ procMesh_.boundary()[patchi],
+ DimensionedField<Type, volMesh>::null(),
+ Field<Type>
+ (
+ field.internalField(),
+ *processorVolPatchFieldDecomposerPtrs_[patchi]
+ )
+ )
+ );
+ }
+ else if (isA<processorFvPatch>(procMesh_.boundary()[patchi]))
{
patchFields.set
(
@@ -75,6 +94,11 @@ Foam::fvFieldDecomposer::decomposeField
)
);
}
+ else
+ {
+ FatalErrorIn("fvFieldDecomposer::decomposeField()")
+ << "Unknown type." << abort(FatalError);
+ }
}
// Create the field for the processor
@@ -155,7 +179,7 @@ Foam::fvFieldDecomposer::decomposeField
forAll(boundaryAddressing_, patchi)
{
- if (boundaryAddressing_[patchi] >= 0)
+ if (patchFieldDecomposerPtrs_[patchi])
{
patchFields.set
(
@@ -169,7 +193,24 @@ Foam::fvFieldDecomposer::decomposeField
)
);
}
- else
+ else if (isA<processorCyclicFvPatch>(procMesh_.boundary()[patchi]))
+ {
+ patchFields.set
+ (
+ patchi,
+ new processorCyclicFvsPatchField<Type>
+ (
+ procMesh_.boundary()[patchi],
+ DimensionedField<Type, surfaceMesh>::null(),
+ Field<Type>
+ (
+ allFaceField,
+ *processorSurfacePatchFieldDecomposerPtrs_[patchi]
+ )
+ )
+ );
+ }
+ else if (isA<processorFvPatch>(procMesh_.boundary()[patchi]))
{
patchFields.set
(
@@ -186,6 +227,11 @@ Foam::fvFieldDecomposer::decomposeField
)
);
}
+ else
+ {
+ FatalErrorIn("fvFieldDecomposer::decomposeField()")
+ << "Unknown type." << abort(FatalError);
+ }
}
// Create the field for the processor
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
index 455a58afcbd6027612a0d89a2f9de263b614ae05..da3b4fef6efe82239976713692a2404ec9464362 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 1a01cb6564099d38da952036d7a7e1816cc01452..a73b46621edc7ef4000d50df881d03f2e4a22d99 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -651,7 +651,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
labelList nZones(pbMesh.size(), 0);
// Per global zone number the average face centre position
- DynamicList<point> zoneCentre(pbMesh.size());
+ List<DynamicList<point> > zoneCentre(pbMesh.size());
// Loop through all patches to determine zones, and centre of each zone
@@ -693,31 +693,28 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
labelList zoneNFaces(pZones.nZones(), 0);
- // Save start of information for current patch
- label patchStart = zoneCentre.size();
-
// Create storage for additional zone centres
forAll(zoneNFaces, zoneI)
{
- zoneCentre.append(vector::zero);
+ zoneCentre[patchI].append(vector::zero);
}
// Do averaging per individual zone
forAll(pp, faceI)
{
label zoneI = pZones[faceI];
- zoneCentre[patchStart+zoneI] += pp[faceI].centre(pp.points());
+ zoneCentre[patchI][zoneI] += pp[faceI].centre(pp.points());
zoneNFaces[zoneI]++;
}
- for (label i=0; i<nZones[patchI]; i++)
+ forAll(zoneCentre[patchI], zoneI)
{
- zoneCentre[patchStart + i] /= zoneNFaces[i];
+ zoneCentre[patchI][zoneI] /= zoneNFaces[zoneI];
}
}
- // Count number of zones we're actually going to display. This is truncated
- // to a max per patch
+ // Count number of zones we're actually going to display.
+ // This is truncated to a max per patch
const label MAXPATCHZONES = 20;
@@ -728,13 +725,9 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
displayZoneI += min(MAXPATCHZONES, nZones[patchI]);
}
-
- zoneCentre.shrink();
-
if (debug)
{
- Info<< "patch zone centres = " << zoneCentre << nl
- << "displayed zone centres = " << displayZoneI << nl
+ Info<< "displayed zone centres = " << displayZoneI << nl
<< "zones per patch = " << nZones << endl;
}
@@ -749,13 +742,12 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
// Actor index
displayZoneI = 0;
- // Index in zone centres
- label globalZoneI = 0;
-
forAll(pbMesh, patchI)
{
const polyPatch& pp = pbMesh[patchI];
+ label globalZoneI = 0;
+
// Only selected patches will have a non-zero number of zones
label nDisplayZones = min(MAXPATCHZONES, nZones[patchI]);
label increment = 1;
@@ -769,7 +761,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
if (debug)
{
Info<< "patch name = " << pp.name() << nl
- << "anchor = " << zoneCentre[globalZoneI] << nl
+ << "anchor = " << zoneCentre[patchI][globalZoneI] << nl
<< "globalZoneI = " << globalZoneI << endl;
}
@@ -792,9 +784,9 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
txt->GetPositionCoordinate()->SetValue
(
- zoneCentre[globalZoneI].x(),
- zoneCentre[globalZoneI].y(),
- zoneCentre[globalZoneI].z()
+ zoneCentre[patchI][globalZoneI].x(),
+ zoneCentre[patchI][globalZoneI].y(),
+ zoneCentre[patchI][globalZoneI].z()
);
// Add text to each renderer
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
index a6df8ead18c764461d3c5c9e303ecd9496c48c1e..d236d5ea8b32b3db2fa87e4dab7ad15fbcb1749c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index 009e28329e39fb75517a2ba1c204285b44955904..26c8f4ed8af3922404b542abc9ca7d6e7910b862 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -79,7 +79,7 @@ void Foam::channelIndex::walkOppositeFaces
isFrontBndFace[faceI-mesh.nInternalFaces()] = true;
}
}
- syncTools::swapBoundaryFaceList(mesh, isFrontBndFace, false);
+ syncTools::swapBoundaryFaceList(mesh, isFrontBndFace);
// Add
forAll(isFrontBndFace, i)
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
index c19349de64c2e7cafc4579e44a03c7c6214ab8f3..37739bb8590ad181f83f6d7e9b40a4e24681d2ef 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
index 9dbe43a8b3ec07e5069e92c26776908fa74a1081..5c735492c7aec989602d2e2bbd6844e91ebbcb6b 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "cyclicPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
@@ -76,35 +75,12 @@ int main(int argc, char *argv[])
}
// Give patch area
- if (isA<cyclicPolyPatch>(mesh.boundaryMesh()[patchI]))
- {
- Info<< " Cyclic patch vector area: " << nl;
- label nFaces = mesh.boundaryMesh()[patchI].size();
- vector sum1 = vector::zero;
- vector sum2 = vector::zero;
- for (label i=0; i<nFaces/2; i++)
- {
- sum1 += mesh.Sf().boundaryField()[patchI][i];
- sum2 += mesh.Sf().boundaryField()[patchI][i+nFaces/2];
- }
- reduce(sum1, sumOp<vector>());
- reduce(sum2, sumOp<vector>());
- Info<< " - half 1 = " << sum1 << ", " << mag(sum1) << nl
- << " - half 2 = " << sum2 << ", " << mag(sum2) << nl
- << " - total = " << (sum1 + sum2) << ", "
- << mag(sum1 + sum2) << endl;
- Info<< " Cyclic patch area magnitude = "
- << gSum(mesh.magSf().boundaryField()[patchI])/2.0 << endl;
- }
- else
- {
- Info<< " Area vector of patch "
- << patchName << '[' << patchI << ']' << " = "
- << gSum(mesh.Sf().boundaryField()[patchI]) << endl;
- Info<< " Area magnitude of patch "
- << patchName << '[' << patchI << ']' << " = "
- << gSum(mesh.magSf().boundaryField()[patchI]) << endl;
- }
+ Info<< " Area vector of patch "
+ << patchName << '[' << patchI << ']' << " = "
+ << gSum(mesh.Sf().boundaryField()[patchI]) << endl;
+ Info<< " Area magnitude of patch "
+ << patchName << '[' << patchI << ']' << " = "
+ << gSum(mesh.magSf().boundaryField()[patchI]) << endl;
// Read field and calc integral
if (fieldHeader.headerClassName() == volScalarField::typeName)
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probesDict b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
index 835ca7a2fb5ea7800322bf06df53bc7d6b859658..3f7679f0dedd0316db3bb3d610209b06bc77370f 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/probesDict
+++ b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM 1.4.1 |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 8584bdec9523c5e3005b7161c1b58535d07eca80..e892508a92d779fc78865584a83f1049c4b02cbb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
index 20b92e066d0270bfdbff0dd9842abb2d04872324..164641cc1d02cdf1615128cc8feea6f0fc4223bb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/Make/files b/applications/utilities/preProcessing/foamUpgradeCyclics/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..9b58821d1704ff46dbe851360bbafb8840ef068c
--- /dev/null
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/Make/files
@@ -0,0 +1,3 @@
+foamUpgradeCyclics.C
+
+EXE = $(FOAM_APPBIN)/foamUpgradeCyclics
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/Make/options b/applications/utilities/preProcessing/foamUpgradeCyclics/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..93ae287538b0547faa2570f8f832561d6e06c149
--- /dev/null
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/Make/options
@@ -0,0 +1,6 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+ -lfiniteVolume \
+ -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
new file mode 100644
index 0000000000000000000000000000000000000000..f499ab5030ad431cd2fb96746f8c15fc0279ca3b
--- /dev/null
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -0,0 +1,619 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+Application
+ foamUpgradeCyclics
+
+Description
+ Tool to upgrade mesh and fields for split cyclics
+
+Usage
+
+ - foamUpgradeCyclics [OPTION]
+
+ @param -test \n
+ Suppress writing the updated files with split cyclics
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "timeSelector.H"
+#include "IOdictionary.H"
+#include "polyMesh.H"
+#include "entry.H"
+#include "IOPtrList.H"
+#include "cyclicPolyPatch.H"
+#include "dictionaryEntry.H"
+#include "IOobjectList.H"
+#include "volFields.H"
+#include "pointFields.H"
+#include "surfaceFields.H"
+#include "string.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebug(IOPtrList<entry>, 0);
+}
+
+
+// Read boundary file without reading mesh
+void rewriteBoundary
+(
+ const bool isTestRun,
+ const IOobject& io,
+ const fileName& regionPrefix,
+ HashTable<word>& thisNames,
+ HashTable<word>& nbrNames
+)
+{
+ Info<< "Reading boundary from " << io.filePath() << endl;
+
+ // Read PtrList of dictionary.
+ const word oldTypeName = IOPtrList<entry>::typeName;
+ const_cast<word&>(IOPtrList<entry>::typeName) = word::null;
+ IOPtrList<entry> patches(io);
+ const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
+ // Fake type back to what was in field
+ const_cast<word&>(patches.type()) = patches.headerClassName();
+
+
+ // Replace any 'cyclic'
+ label nOldCyclics = 0;
+ forAll(patches, patchI)
+ {
+ const dictionary& patchDict = patches[patchI].dict();
+
+ if (word(patchDict["type"]) == cyclicPolyPatch::typeName)
+ {
+ if (!patchDict.found("neighbourPatch"))
+ {
+ Info<< "Patch " << patches[patchI].keyword()
+ << " does not have 'neighbourPatch' entry; assuming it"
+ << " is of the old type." << endl;
+ nOldCyclics++;
+ }
+ }
+ }
+
+ Info<< "Detected " << nOldCyclics << " old cyclics." << nl << endl;
+
+
+ // Save old patches.
+ PtrList<entry> oldPatches(patches);
+
+ // Extend
+ label nOldPatches = patches.size();
+ patches.setSize(nOldPatches+nOldCyclics);
+
+ // Create reordering map
+ labelList oldToNew(patches.size());
+
+
+ // Add new entries
+ label addedPatchI = nOldPatches;
+ label newPatchI = 0;
+ forAll(oldPatches, patchI)
+ {
+ const dictionary& patchDict = oldPatches[patchI].dict();
+
+ if
+ (
+ word(patchDict["type"]) == cyclicPolyPatch::typeName
+ )
+ {
+ const word& name = oldPatches[patchI].keyword();
+
+ if (patchDict.found("neighbourPatch"))
+ {
+ patches.set(patchI, oldPatches.set(patchI, NULL));
+ oldToNew[patchI] = newPatchI++;
+
+ // Check if patches come from automatic conversion
+ word oldName;
+
+ string::size_type i = name.rfind("_half0");
+ if (i != string::npos)
+ {
+ oldName = name.substr(0, i);
+ thisNames.insert(oldName, name);
+ Info<< "Detected converted cyclic patch " << name
+ << " ; assuming it originates from " << oldName
+ << endl;
+ }
+ else
+ {
+ i = name.rfind("_half1");
+ if (i != string::npos)
+ {
+ oldName = name.substr(0, i);
+ nbrNames.insert(oldName, name);
+ Info<< "Detected converted cyclic patch " << name
+ << " ; assuming it originates from " << oldName
+ << endl;
+ }
+ }
+ }
+ else
+ {
+ label nFaces = readLabel(patchDict["nFaces"]);
+ label startFace = readLabel(patchDict["startFace"]);
+
+ Info<< "Detected old style " << word(patchDict["type"])
+ << " patch " << name << " with" << nl
+ << " nFaces : " << nFaces << nl
+ << " startFace : " << startFace << endl;
+
+ word thisName = name + "_half0";
+ word nbrName = name + "_half1";
+
+ thisNames.insert(name, thisName);
+ nbrNames.insert(name, nbrName);
+
+ // Save current dictionary
+ const dictionary patchDict(patches[patchI].dict());
+
+ // Change entry on this side
+ patches.set(patchI, oldPatches.set(patchI, NULL));
+ oldToNew[patchI] = newPatchI++;
+ dictionary& thisPatchDict = patches[patchI].dict();
+ thisPatchDict.add("neighbourPatch", nbrName);
+ thisPatchDict.set("nFaces", nFaces/2);
+ patches[patchI].keyword() = thisName;
+
+ // Add entry on other side
+ patches.set
+ (
+ addedPatchI,
+ new dictionaryEntry
+ (
+ nbrName,
+ dictionary::null,
+ patchDict
+ )
+ );
+ oldToNew[addedPatchI] = newPatchI++;
+ dictionary& nbrPatchDict = patches[addedPatchI].dict();
+ nbrPatchDict.set("neighbourPatch", thisName);
+ nbrPatchDict.set("nFaces", nFaces/2);
+ nbrPatchDict.set("startFace", startFace+nFaces/2);
+ patches[addedPatchI].keyword() = nbrName;
+
+ Info<< "Replaced with patches" << nl
+ << patches[patchI].keyword() << " with" << nl
+ << " nFaces : "
+ << readLabel(thisPatchDict.lookup("nFaces"))
+ << nl
+ << " startFace : "
+ << readLabel(thisPatchDict.lookup("startFace")) << nl
+ << patches[addedPatchI].keyword() << " with" << nl
+ << " nFaces : "
+ << readLabel(nbrPatchDict.lookup("nFaces"))
+ << nl
+ << " startFace : "
+ << readLabel(nbrPatchDict.lookup("startFace"))
+ << nl << endl;
+
+ addedPatchI++;
+ }
+ }
+ else
+ {
+ patches.set(patchI, oldPatches.set(patchI, NULL));
+ oldToNew[patchI] = newPatchI++;
+ }
+ }
+
+ patches.reorder(oldToNew);
+
+ if (returnReduce(nOldCyclics, sumOp<label>()) > 0)
+ {
+ if (isTestRun)
+ {
+ //Info<< "-test option: no changes made" << nl << endl;
+ }
+ else
+ {
+ if (mvBak(patches.objectPath(), "old"))
+ {
+ Info<< "Backup to "
+ << (patches.objectPath() + ".old") << nl;
+ }
+
+ Info<< "Write to "
+ << patches.objectPath() << nl << endl;
+ patches.write();
+ }
+ }
+ else
+ {
+ Info<< "No changes made to boundary file." << nl << endl;
+ }
+}
+
+
+void rewriteField
+(
+ const bool isTestRun,
+ const Time& runTime,
+ const word& fieldName,
+ const HashTable<word>& thisNames,
+ const HashTable<word>& nbrNames
+)
+{
+ // Read dictionary. (disable class type checking so we can load
+ // field)
+ Info<< "Loading field " << fieldName << endl;
+ const word oldTypeName = IOdictionary::typeName;
+ const_cast<word&>(IOdictionary::typeName) = word::null;
+
+ IOdictionary fieldDict
+ (
+ IOobject
+ (
+ fieldName,
+ runTime.timeName(),
+ runTime,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ )
+ );
+ const_cast<word&>(IOdictionary::typeName) = oldTypeName;
+ // Fake type back to what was in field
+ const_cast<word&>(fieldDict.type()) = fieldDict.headerClassName();
+
+
+
+ dictionary& boundaryField = fieldDict.subDict("boundaryField");
+
+ label nChanged = 0;
+
+ forAllConstIter(HashTable<word>, thisNames, iter)
+ {
+ const word& patchName = iter.key();
+ const word& newName = iter();
+
+ Info<< "Looking for entry for patch " << patchName << endl;
+
+ if (boundaryField.found(patchName) && !boundaryField.found(newName))
+ {
+ Info<< " Changing entry " << patchName << " to " << newName
+ << endl;
+
+ dictionary patchDict(boundaryField.subDict(patchName));
+
+ if (patchDict.found("value"))
+ {
+ IOWarningIn("rewriteField(..)", patchDict)
+ << "Cyclic patch " << patchName
+ << " has value entry. Please removed this and rerun."
+ << endl;
+ }
+
+
+ boundaryField.changeKeyword(patchName, newName);
+ boundaryField.add
+ (
+ nbrNames[patchName],
+ patchDict
+ );
+ Info<< " Adding entry " << nbrNames[patchName] << endl;
+
+ nChanged++;
+ }
+ }
+
+ //Info<< "New boundaryField:" << boundaryField << endl;
+
+ if (returnReduce(nChanged, sumOp<label>()) > 0)
+ {
+ if (isTestRun)
+ {
+ //Info<< "-test option: no changes made" << endl;
+ }
+ else
+ {
+ if (mvBak(fieldDict.objectPath(), "old"))
+ {
+ Info<< "Backup to "
+ << (fieldDict.objectPath() + ".old") << nl;
+ }
+
+ Info<< "Write to "
+ << fieldDict.objectPath() << endl;
+ fieldDict.regIOobject::write();
+ }
+ }
+ else
+ {
+ Info<< "No changes made to field " << fieldName << endl;
+ }
+ Info<< endl;
+}
+
+
+void rewriteFields
+(
+ const bool isTestRun,
+ const Time& runTime,
+ const wordList& fieldNames,
+ const HashTable<word>& thisNames,
+ const HashTable<word>& nbrNames
+)
+{
+ forAll(fieldNames, i)
+ {
+ rewriteField
+ (
+ isTestRun,
+ runTime,
+ fieldNames[i],
+ thisNames,
+ nbrNames
+ );
+ }
+}
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+ timeSelector::addOptions();
+
+ argList::addBoolOption("test");
+# include "addRegionOption.H"
+
+# include "setRootCase.H"
+# include "createTime.H"
+
+ instantList timeDirs = timeSelector::select0(runTime, args);
+
+ const bool isTestRun = args.optionFound("test");
+ if (isTestRun)
+ {
+ Info<< "-test option: no changes made" << nl << endl;
+ }
+
+
+ Foam::word regionName = polyMesh::defaultRegion;
+ args.optionReadIfPresent("region", regionName);
+
+ fileName regionPrefix = "";
+ if (regionName != polyMesh::defaultRegion)
+ {
+ regionPrefix = regionName;
+ }
+
+
+ // Per cyclic patch the new name for this side and the other side
+ HashTable<word> thisNames;
+ HashTable<word> nbrNames;
+
+ // Rewrite constant boundary file. Return any patches that have been split.
+ IOobject io
+ (
+ "boundary",
+ runTime.constant(),
+ polyMesh::meshSubDir,
+ runTime,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+
+ if (io.headerOk())
+ {
+ rewriteBoundary
+ (
+ isTestRun,
+ io,
+ regionPrefix,
+ thisNames,
+ nbrNames
+ );
+ }
+
+
+
+ // Convert any fields
+
+ forAll(timeDirs, timeI)
+ {
+ runTime.setTime(timeDirs[timeI], timeI);
+
+ Info<< "Time: " << runTime.timeName() << endl;
+
+ // See if mesh in time directory
+ IOobject io
+ (
+ "boundary",
+ runTime.timeName(),
+ polyMesh::meshSubDir,
+ runTime,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+
+ if (io.headerOk())
+ {
+ rewriteBoundary
+ (
+ isTestRun,
+ io,
+ regionPrefix,
+ thisNames,
+ nbrNames
+ );
+ }
+
+
+ IOobjectList objects(runTime, runTime.timeName());
+
+
+ // volFields
+ // ~~~~~~~~~
+
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(volScalarField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(volVectorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(volSphericalTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(volSymmTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(volTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+
+
+ // pointFields
+ // ~~~~~~~~~~~
+
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(pointScalarField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(pointVectorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(pointSphericalTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(pointSymmTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(pointTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+
+
+ // surfaceFields
+ // ~~~~~~~~~~~
+
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(surfaceScalarField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(surfaceVectorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(surfaceSphericalTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(surfaceSymmTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ rewriteFields
+ (
+ isTestRun,
+ runTime,
+ objects.names(surfaceTensorField::typeName),
+ thisNames,
+ nbrNames
+ );
+ }
+
+ return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index af5db49b83250ad9373b0375f3301081307814b8..f2d360247219e6a3b57cc85b5f45e814e0fcbda1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict
index 58a745dac155a0deefb0f6da5f5a5523e7ce50a4..af1bf618453e976f68b0350c8ede723810b0f7e1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
index 7ea094c1f4071b5eca64b10bcf01520ee84c8faf..0ce72e67bc2cf6af42ce1b67b52355378225f733 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index ede8e0658dcb344aaacc3f036c004baa0e2f2403..f956a24789a05df748677a39fdac889ef1a603ad 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
index 2e4d05dd35104e07e8aa7b9f295d65b4b4bb4a5c..cd2ea615d4d6bbd72e7fe4ad197708e6792f164d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 93a5fb01eb0879acc4fd03027427cce539f55147..1e65197392d1240bd5030b4aa93ba353812f118e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a4fdd46fa169be876e9e9efd85efec42835aca81..45e2b912f619fb7698fdb2fc07935360cd2d0e32 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : adiabaticFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
index 8663ce69f539325225f3fb0e9d942153702af049..289c9733818956fd9793529facf9751c4f153199 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
index 32c6070c77f1db36093ce115dacbbe7ac9d5db8d..20f74642e85b2bcc56017f880446fadd37d51c4b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
Exec : equilibriumFlameT -case . controlDict
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
index 88ddd86d3ae0db17d1dcc908bcc6756665b59848..666313208bb1819313bf18c973303d71e246920e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/bin/foamPackSource b/bin/foamPackSource
index 4cac7b666c1a6abf4d240d8631017c10e0af11fd..e48d415b68debd5f9cd12b87b97ede790615cede 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -74,7 +74,6 @@ find -H $packDir \
-a ! -name "*.tgz" \
-a ! -name "core" \
-a ! -name "core.[1-9]*" \
- -a ! -name "log[0-9]*" \
-a ! -name "libccmio*" \
| sed \
-e "\@$packDir/lib/@d" \
diff --git a/doc/GUIDELINES b/doc/GUIDELINES
deleted file mode 100644
index 5603ca3f657c13001b1e584452c3592d0be93360..0000000000000000000000000000000000000000
--- a/doc/GUIDELINES
+++ /dev/null
@@ -1,225 +0,0 @@
-The guidelines document the current style or a recommended style for
-documenting OpenFOAM source code (.C and .H) files.
-
-
-General
-~~~~~~~
-
-- For readability in the comment blocks, certain tags are used that are
- translated by pre-filtering the file before sending it to doxygen.
-
-- The tags start in column 1, the contents follow on the next lines and
- indented by 4 spaces. The filter removes the leading 4 spaces from the
- following lines until the next tag that starts in column 1.
-
-- The 'Class' and 'Description' tags are the most important ones.
-
-- The first paragraph following the 'Description' will be used for the brief
- description, the remaining paragraphs become the detailed description.
-
-
-eg,
- |-------------------------
- |
- |Class
- | Foam::myClass
- |
- |Description
- | A class for specifying the documentation style.
- |
- | The class is implemented as a set of recommendations that may
- | sometimes be useful.
- |
- |-------------------------
-
-
-- The class name must be qualified by its namespace, otherwise doxygen
- will think you are documenting some other class.
-
-- If you don't have anything to say about the class (at the moment),
- use the namespace-qualified class name for the description.
- This aids with finding these under-documented classes later.
-
-
-eg,
- |-------------------------
- |
- |Class
- | Foam::myUnderDocumentedClass
- |
- |Description
- | Foam::myUnderDocumentedClass
- |
- |-------------------------
-
-
-- Use 'Class' and 'Namespace' tags in the header files.
- The Description block then applies to documenting the class.
-
-- Use 'InClass' and 'InNamespace' in the source files.
- The Description block then applies to documenting the file itself.
-
-eg,
- |-------------------------
- |
- |InClass
- | Foam::myClass
- |
- |Description
- | Implements the read and writing of files.
- |
- |-------------------------
-
-
-Doxygen Special Commands
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Doxygen has a large number of special commands with a '\' prefix or
-a (alternatively) an '@' prefix.
-
-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.
-
-
-Since the filtering removes the leading 4 spaces within the blocks,
-the doxygen commmands can be inserted within the block without problems.
-
-eg,
- |-------------------------
- |
- |InClass
- | Foam::myClass
- |
- |Description
- | Implements the read and writing of files.
- |
- | An example input file:
- | @verbatim
- | patchName
- | {
- | type myPatchType;
- | refValue 100;
- | value uniform 1;
- | }
- | @endverbatim
- |
- | Within the implementation, a loop over all patches is done:
- | @code
- | forAll(patches, patchI)
- | {
- | ... // some operation
- | }
- | @endcode
- |
- |-------------------------
-
-
-HTML Special Commands
-~~~~~~~~~~~~~~~~~~~~~
-
-Since Doxygen also handles HTML tags to a certain extent, the angle brackets
-need quoting in the documentation blocks. Non-HTML tags cause doxygen to
-complain, but seem to work anyhow.
-
-eg,
- The template with type <HR> is a bad example.
-
- The template with type \<HR\> is a better example.
-
- The template with type <Type> causes doxygen to complain about
- an unknown html type, but it seems to work okay anyhow.
-
-
-
-Documenting Namespaces
-~~~~~~~~~~~~~~~~~~~~~~
-
-- If namespaces are explictly declared with the Namespace() macro,
- they should be documented there.
-
-- If the namespaces is used to hold sub-models, the namespace can be
- documented in the same file as the class with the model selector.
- eg,
- documented namespace 'Foam::functionEntries' within the
- class 'Foam::functionEntry'
-
-- If nothing else helps, find some sensible header.
- eg,
- namespace 'Foam' is documented in the foamVersion.H file
-
-
-Documenting Typedefs and classes defined via macros
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-... not yet properly resolved
-
-
-
-Documenting Applications
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Any number of classes might be defined by a particular application, but
-these classes will not, however, be available to other parts of OpenFOAM. At
-the moment, the sole purpuse for running doxygen on the applications is to
-extract program usage information for the '-doc' option.
-
-The documentation for a particular application is normally contained within
-the first comment block in a .C source file. The solution is this to invoke
-a special filter for the "applications/{solver,utilities}" directories that
-only allows the initial comment block for the .C files through.
-
-The layout of the application documentation has not yet been finalized, but
-foamToVTK shows an initial attempt.
-
-
-Ignored files and directories
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Ignore directories of linked files
- - */lnInclude/*
-
-Ignore test directories
- - */t/*
-
-Ignore applications that clutter everything
-
-Ignore application-specific classes
- - */applications/utilities/*.H
- - */applications/solvers/*.H
-
-
-Orthography (always good for a flame-war)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Given the origins of OpenFOAM, the British spellings (eg, neighbour and not
-neighbor) are generally favoured. For code sections that interact with
-external libraries, it can be useful to adopt American spellings, especially
-for names that constitute a significant part of the external library - eg,
-'color' within graphics sub-systems.
-
-Both '-ize' and the '-ise' variant are found in the code comments.
-If used as a variable or class method name, it is probably better to use '-ize',
-which is considered the main form by the Oxford University Press.
- Eg,
- myClass.initialize()
-
-
-The word "its" (possesive) vs. "it's" (colloquial for "it is" or "it has")
-seems to confuse non-native (and some native) English speakers.
-It is better to donate the extra keystrokes and write "it is" or "it has".
-Any remaining "it's" are likely an incorrect spelling of "its".
-
-
-
-Housekeeping
-~~~~~~~~~~~~
-
-The doc/Doxygen/tools directory contains miscellaneous scripts for finding
-and possibly repairing documentation issues.
-
-
-Updated: 2009-11-27
diff --git a/doc/changes/splitCyclic.txt b/doc/changes/splitCyclic.txt
new file mode 100644
index 0000000000000000000000000000000000000000..814dfe0850cd3c4afe0857cbf24c7d1a34f687cc
--- /dev/null
+++ b/doc/changes/splitCyclic.txt
@@ -0,0 +1,121 @@
+Short overview of the changes to have cyclics split into two halves.
+
+Cyclics
+-------
+The two cyclic halves are now split like processor patches. There should be no
+difference in running.
+
+Advantages:
+- decomposed cyclics can now be handled properly. It just needs to preserve
+the cyclic patch it originates from.
+- We can now construct a table of global transformations and handle
+points/edges/cells with transformations.
+- face ordering after topological changes becomes much easier since we
+now preserve what half the face comes from.
+- cyclic handling becomes more consistent with processor handling and can
+quite often be handled in the same condition.
+- transformation tensors now become single entry.
+
+The disadvantages:
+- a patch-wise loop now might need to store data to go to the neighbour half
+since it is no longer handled in a single patch.
+- decomposed cyclics now require overlapping communications so will
+only work in non-blocking mode. Hence the underlying message passing library
+will require overlapping communications with message tags.
+- it is quite a code-change and there might be some oversights.
+- once converted (see foamUpgradeCyclics below) cases are not backwards
+compatible with previous versions.
+
+
+blockMesh
+---------
+blockMeshDict now allows patch definition using the construct-from-dictionary
+constructor. This helps defining patches that require additional input e.g.
+directMapped and now cyclic:
+
+boundary
+(
+ sides2_half0
+ {
+ type cyclic;
+ neighbourPatch sides2_half1;
+ faces ((2 4 5 3));
+ }
+
+The syntax is - like the polyMesh/boundary file - a list of dictionaries with
+one additional entry 'faces' for the block faces. Above shows the new
+required entry 'neighbourPatch' for cyclic.
+
+blockMesh still reads the old format. For a cyclic it will automatically
+introduce two patches for the halves, with names xxx_half0 and xxx_half1.
+
+
+foamUpgradeCyclics
+------------------
+This is a tool which reads the polyMesh/boundary file and any vol/surface/point
+fields and converts them.
+It will check if anything needs to be converted, backup the current file to .old
+and split any cyclic patchFields into two entries.
+
+
+decomposePar
+------------
+Decomposes cyclics into processorCyclic:
+
+ procBoundary0to1throughsides1_half0
+ {
+ type processorCyclic;
+ nFaces 1000;
+ startFace 91350;
+ myProcNo 0;
+ neighbProcNo 1;
+ referPatch sides1_half0;
+ }
+
+They have an additional 'referPatch' entry which gives the (cyclic) patch
+to use for any transformation.
+
+
+Details
+-------
+- the cyclic patch dictionary has an entry neighbourPatch. The
+patch has new member functions:
+
+ //- Get neighbouring patchID
+ label neighbPatchID() const
+
+ //- Get neighbouring patch
+ const cyclicPolyPatch& neighbPatch()
+
+ //- Am I the owner half
+ bool owner()
+
+The cyclic still has forward() and reverse() transformations (with
+the reverse() equal to the neighbPatch().forward()).
+
+There is no transformLocalFace anymore - the ordering is the same for
+both halves.
+
+
+- 'pure' processor patches now are always coincident - they (should) have no
+transformation. As said above cyclics are decomposed into a derived
+type 'processorCyclic'.
+
+
+- processor patches use overlapping communication using a different message
+tag. This maps straight through into the MPI message tag.
+See processorCyclicPolyPatch::tag(). This needs to be calculated the
+same on both sides so is calculated as
+ Pstream::nProcs()*max(myProcNo, neighbProcNo)
+ + min(myProcNo, neighbProcNo)
+which is
+- unique
+- commutative
+- does not interfere with the default tag (= 1)
+
+
+- when constructing a GeometricField from a dictionary it will explicitly
+check for non-existing entries for cyclic patches and exit with an error message
+warning to run foamUpgradeCyclics.
+
+
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index abd7bd1a0095736f204b12b7a484a80aca165d20..94a1b51536e368c407fa98b764a6afab38931de8 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -2,7 +2,7 @@
#
#+TITLE: OpenFOAM C++ style guide
#+AUTHOR: OpenCFD Ltd.
-#+DATE: April 2010
+#+DATE: May 2010
#+LINK: http://www.opencfd.co.uk
#+OPTIONS: author:nil ^:{}
@@ -13,9 +13,9 @@
+ 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).
always delineated with brace brackets. A possible exception can be
- made with 'break' or 'continue' as part of a control structure.
+ made with =break= or =continue= as part of a control structure.
+ stream output
+ =<<= is always four characters after the start of the stream,
@@ -72,16 +72,16 @@
\*---------------------------------------------------------------------------*/
#+END_EXAMPLE
-*** The =.H= Files
+*** The /.H/ Files
+ header file spacing
+ Leave two empty lines between sections
- (as per functions in the =.C= file etc)
+ (as per functions in the /.C/ file etc)
- + use "//- Comment" comments in header file
+ + use =//- Comment= comments in header file
+ add descriptions to class data and functions
+ destructor
+ If adding a comment to the destructor -
- use //- and code as a normal function:
+ use =//-= and code as a normal function:
#+BEGIN_EXAMPLE
//- Destructor
@@ -89,11 +89,11 @@
#+END_EXAMPLE
+ inline functions
- + Use inline functions where appropriate in a separate classNameI.H file.
+ + Use inline functions where appropriate in a separate /classNameI.H/ file.
Avoid cluttering the header file with function bodies.
-*** The =.C= Files
- + Do not open/close namespaces in a =.C= file
+*** The /.C/ Files
+ + Do not open/close namespaces in a /.C/ file
+ Fully scope the function name, i.e.
#+BEGIN_EXAMPLE
@@ -113,7 +113,7 @@
EXCEPTION
- When there are multiple levels of namespace, they may be used in the =.C=
+ When there are multiple levels of namespace, they may be used in the /.C/
file, i.e.
#+BEGIN_EXAMPLE
@@ -138,7 +138,7 @@
+ const
Use everywhere it is applicable.
- + variable initialisation using "="
+ + variable initialisation using =
: const className& variableName = otherClass.data();
@@ -169,7 +169,7 @@
}
#+END_EXAMPLE
- NOT (no space between "if" and "(")
+ NOT (no space between =if= and =(=)
#+BEGIN_EXAMPLE
if(condition)
@@ -201,7 +201,7 @@
}
#+END_EXAMPLE
- NOT (no space between "for" and "(")
+ NOT (no space between =for= and =(=)
#+BEGIN_EXAMPLE
for(i = 0; i < maxI; i++)
@@ -245,7 +245,7 @@
**** Splitting return type and function name
+ split initially after the function return type and left align
- + do not put "const" onto its own line - use a split to keep it with
+ + do not put =const= onto its own line - use a split to keep it with
the function name and arguments.
so
@@ -277,7 +277,7 @@
#+END_EXAMPLE
+ if it needs to be split again, split at the function name (leaving
- behind the preceding scoping "::"s), and again, left align, i.e.
+ behind the preceding scoping =::=s), and again, left align, i.e.
For example,
@@ -326,16 +326,19 @@
*** Maths and Logic
+ operator spacing
- + a + b, a - b
- + a*b, a/b
- + a & b, a ^ b
- + a = b, a != b
- + a < b, a > b, a >= b, a <= b
- + a || b, a && b
+
+#+BEGIN_EXAMPLE
+ a + b, a - b
+ a*b, a/b
+ a & b, a ^ b
+ a = b, a != b
+ a < b, a > b, a >= b, a <= b
+ a || b, a && b
+#+END_EXAMPLE
+ splitting formulae over several lines
- Split and indent as per "splitting long lines at an "=""
+ Split and indent as per "splitting long lines at an ="
with the operator on the lower line. Align operator so that first
variable, function or bracket on the next line is 4 spaces indented i.e.
@@ -525,9 +528,9 @@
option.
The documentation for a particular application is normally contained
- within the first comment block in a =.C= source file. The solution is this
- to invoke a special filter for the "applications/{solver,utilities}"
- directories that only allows the initial comment block for the =.C= files
+ within the first comment block in a /.C/ source file. The solution is this
+ to invoke a special filter for the "/applications/{solver,utilities}/"
+ directories that only allows the initial comment block for the /.C/ files
through.
The layout of the application documentation has not yet been finalized,
@@ -551,10 +554,7 @@
myClass.initialize()
#+END_EXAMPLE
-
The word "its" (possesive) vs. "it's" (colloquial for "it is" or "it has")
seems to confuse non-native (and some native) English speakers.
It is better to donate the extra keystrokes and write "it is" or "it has".
Any remaining "it's" are likely an incorrect spelling of "its".
-
-
diff --git a/doc/codingStyleGuide.pdf b/doc/codingStyleGuide.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e7119e7fdcbeef1263bfaeabe05adfc15edf5ce7
Binary files /dev/null and b/doc/codingStyleGuide.pdf differ
diff --git a/etc/cellModels b/etc/cellModels
index b4aa84f39b6ce66c3047f30c5cf920575c74adfc..ca710a777bf85f736a6ffe22d55b46becfcf860e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/controlDict b/etc/controlDict
index ea497f7f0792210bf4ac76c9464f218d86a9c7b3..891e010e0ccc54b7b1a263297fc2133918d54965 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index aebfd27178b3199e1320a10f0d7cd815c5aa7457..2ea9004636affee867e205188696938d3facb0d6 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -74,9 +74,13 @@ containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
primitiveLists = primitives/Lists
$(primitiveLists)/boolList.C
$(primitiveLists)/labelIOList.C
+$(primitiveLists)/labelListIOList.C
$(primitiveLists)/scalarList.C
$(primitiveLists)/scalarIOList.C
+$(primitiveLists)/scalarListIOList.C
$(primitiveLists)/vectorList.C
+$(primitiveLists)/vectorIOList.C
+$(primitiveLists)/vectorListIOList.C
$(primitiveLists)/sphericalTensorList.C
$(primitiveLists)/symmTensorList.C
$(primitiveLists)/tensorList.C
@@ -260,12 +264,14 @@ GAMGInterfaces = $(GAMG)/interfaces
$(GAMGInterfaces)/GAMGInterface/GAMGInterface.C
$(GAMGInterfaces)/GAMGInterface/GAMGInterfaceNew.C
$(GAMGInterfaces)/processorGAMGInterface/processorGAMGInterface.C
+$(GAMGInterfaces)/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
$(GAMGInterfaces)/cyclicGAMGInterface/cyclicGAMGInterface.C
GAMGInterfaceFields = $(GAMG)/interfaceFields
$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceField.C
$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceFieldNew.C
$(GAMGInterfaceFields)/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+$(GAMGInterfaceFields)/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
$(GAMGInterfaceFields)/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
GAMGAgglomerations = $(GAMG)/GAMGAgglomerations
@@ -339,6 +345,8 @@ $(constraintPolyPatches)/empty/emptyPolyPatch.C
$(constraintPolyPatches)/symmetry/symmetryPolyPatch.C
$(constraintPolyPatches)/wedge/wedgePolyPatch.C
$(constraintPolyPatches)/cyclic/cyclicPolyPatch.C
+$(constraintPolyPatches)/cyclicSlip/cyclicSlipPolyPatch.C
+$(constraintPolyPatches)/processorCyclic/processorCyclicPolyPatch.C
$(constraintPolyPatches)/processor/processorPolyPatch.C
derivedPolyPatches = $(polyPatches)/derived
@@ -449,7 +457,9 @@ $(constraintPointPatches)/empty/emptyPointPatch.C
$(constraintPointPatches)/symmetry/symmetryPointPatch.C
$(constraintPointPatches)/wedge/wedgePointPatch.C
$(constraintPointPatches)/cyclic/cyclicPointPatch.C
+$(constraintPointPatches)/cyclicSlip/cyclicSlipPointPatch.C
$(constraintPointPatches)/processor/processorPointPatch.C
+$(constraintPointPatches)/processorCyclic/processorCyclicPointPatch.C
derivedPointPatches = $(pointPatches)/derived
$(derivedPointPatches)/coupled/coupledFacePointPatch.C
@@ -480,9 +490,12 @@ $(Fields)/symmTensorField/symmTensorField.C
$(Fields)/tensorField/tensorField.C
$(Fields)/complexFields/complexFields.C
-$(Fields)/labelField/labelIOField.C
+$(Fields)/labelField/labelIOField.
+$(Fields)/labelField/labelFieldIOField.C
$(Fields)/scalarField/scalarIOField.C
+$(Fields)/scalarField/scalarFieldIOField.C
$(Fields)/vectorField/vectorIOField.C
+$(Fields)/vectorField/vectorFieldIOField.C
$(Fields)/vector2DField/vector2DIOField.C
$(Fields)/sphericalTensorField/sphericalTensorIOField.C
$(Fields)/diagTensorField/diagTensorIOField.C
@@ -508,6 +521,7 @@ $(constraintPointPatchFields)/wedge/wedgePointPatchFields.C
$(constraintPointPatchFields)/cyclic/cyclicPointPatchFields.C
$(constraintPointPatchFields)/cyclicSlip/cyclicSlipPointPatchFields.C
$(constraintPointPatchFields)/processor/processorPointPatchFields.C
+$(constraintPointPatchFields)/processorCyclic/processorCyclicPointPatchFields.C
derivedPointPatchFields = $(pointPatchFields)/derived
$(derivedPointPatchFields)/slip/slipPointPatchFields.C
@@ -538,4 +552,6 @@ $(writers)/gnuplotGraph/gnuplotGraph.C
$(writers)/xmgrGraph/xmgrGraph.C
$(writers)/jplotGraph/jplotGraph.C
+meshes/data/data.C
+
LIB = $(FOAM_LIBBIN)/libOpenFOAM
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
index 1d1ff5eec85dd741938c1f5f52e7b1752efe0cd2..a6a6afd430ea818e3d005c7bfd939d09e7640669 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
@@ -251,12 +251,13 @@ bool Foam::FaceCellWave<Type>::updateFace
template <class Type>
void Foam::FaceCellWave<Type>::checkCyclic(const polyPatch& patch) const
{
- label cycOffset = patch.size()/2;
+ const cyclicPolyPatch& nbrPatch =
+ refCast<const cyclicPolyPatch>(patch).neighbPatch();
- for (label patchFaceI = 0; patchFaceI < cycOffset; patchFaceI++)
+ forAll(patch, patchFaceI)
{
label i1 = patch.start() + patchFaceI;
- label i2 = i1 + cycOffset;
+ label i2 = nbrPatch.start() + patchFaceI;
if (!allFaceInfo_[i1].sameGeometry(mesh_, allFaceInfo_[i2], geomTol_))
{
@@ -334,8 +335,7 @@ void Foam::FaceCellWave<Type>::mergeFaceInfo
const polyPatch& patch,
const label nFaces,
const labelList& changedFaces,
- const List<Type>& changedFacesInfo,
- const bool
+ const List<Type>& changedFacesInfo
)
{
for (label changedFaceI = 0; changedFaceI < nFaces; changedFaceI++)
@@ -599,8 +599,7 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
patch,
nReceiveFaces,
receiveFaces,
- receiveFacesInfo,
- procPatch.parallel()
+ receiveFacesInfo
);
}
}
@@ -619,87 +618,42 @@ void Foam::FaceCellWave<Type>::handleCyclicPatches()
if (isA<cyclicPolyPatch>(patch))
{
- label halfSize = patch.size()/2;
+ const cyclicPolyPatch& nbrPatch =
+ refCast<const cyclicPolyPatch>(patch).neighbPatch();
// Allocate buffers
- label nSendFaces;
- labelList sendFaces(halfSize);
- List<Type> sendFacesInfo(halfSize);
-
label nReceiveFaces;
- labelList receiveFaces(halfSize);
- List<Type> receiveFacesInfo(halfSize);
-
- // Half1: Determine which faces changed. Use sendFaces for storage
- nSendFaces = getChangedPatchFaces
- (
- patch,
- 0,
- halfSize,
- sendFaces,
- sendFacesInfo
- );
+ labelList receiveFaces(patch.size());
+ List<Type> receiveFacesInfo(patch.size());
- // Half2: Determine which faces changed. Use receiveFaces_ ,,
+ // Determine which faces changed
nReceiveFaces = getChangedPatchFaces
(
- patch,
- halfSize,
- halfSize,
+ nbrPatch,
+ 0,
+ nbrPatch.size(),
receiveFaces,
receiveFacesInfo
);
- //Info<< "Half1:" << endl;
- //writeFaces(nSendFaces, sendFaces, sendFacesInfo, Info);
- //Info<< endl;
- //
- //Info<< "Half2:" << endl;
- //writeFaces(nReceiveFaces, receiveFaces, receiveFacesInfo, Info);
- //Info<< endl;
-
-
- // Half1: Adapt wallInfo for leaving domain
- leaveDomain
- (
- patch,
- nSendFaces,
- sendFaces,
- sendFacesInfo
- );
- // Half2: Adapt wallInfo for leaving domain
+ // Adapt wallInfo for leaving domain
leaveDomain
(
- patch,
+ nbrPatch,
nReceiveFaces,
receiveFaces,
receiveFacesInfo
);
- // Half1: 'transfer' to other side by offsetting patchFaceI
- offset(patch, halfSize, nSendFaces, sendFaces);
-
- // Half2: 'transfer' to other side
- offset(patch, -halfSize, nReceiveFaces, receiveFaces);
-
- // Apply rotation for non-parallel planes
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patch);
if (!cycPatch.parallel())
{
- // sendFaces = received data from half1
+ // received data from other half
transform
(
cycPatch.forwardT(),
- nSendFaces,
- sendFacesInfo
- );
-
- // receiveFaces = received data from half2
- transform
- (
- cycPatch.reverseT(),
nReceiveFaces,
receiveFacesInfo
);
@@ -707,25 +661,15 @@ void Foam::FaceCellWave<Type>::handleCyclicPatches()
if (debug)
{
- Pout<< " Cyclic patch " << patchI << ' ' << patch.name()
- << " Changed on first half : " << nSendFaces
- << " Changed on second half : " << nReceiveFaces
+ Pout<< " Cyclic patch " << patchI << ' ' << cycPatch.name()
+ << " Changed : " << nReceiveFaces
<< endl;
}
- // Half1: Adapt wallInfo for entering domain
- enterDomain
- (
- patch,
- nSendFaces,
- sendFaces,
- sendFacesInfo
- );
-
// Half2: Adapt wallInfo for entering domain
enterDomain
(
- patch,
+ cycPatch,
nReceiveFaces,
receiveFaces,
receiveFacesInfo
@@ -734,25 +678,15 @@ void Foam::FaceCellWave<Type>::handleCyclicPatches()
// Merge into global storage
mergeFaceInfo
(
- patch,
- nSendFaces,
- sendFaces,
- sendFacesInfo,
- cycPatch.parallel()
- );
- // Merge into global storage
- mergeFaceInfo
- (
- patch,
+ cycPatch,
nReceiveFaces,
receiveFaces,
- receiveFacesInfo,
- cycPatch.parallel()
+ receiveFacesInfo
);
if (debug)
{
- checkCyclic(patch);
+ checkCyclic(cycPatch);
}
}
}
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
index 9361c10f23f6f3f681908593b9c7084d2c852dd7..149f0badc4214bcfeb100e4fc8237d1eca3677e8 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
@@ -192,8 +192,7 @@ class FaceCellWave
const polyPatch& patch,
const label nFaces,
const labelList&,
- const List<Type>&,
- const bool isParallel
+ const List<Type>&
);
//- Extract info for single patch only
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index b39664af247c5e97b30e2ab0710b206e316c8d54..76b8c58765ba63051d97f629a02cf971fab11e82 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 enumI = 0; enumI < nEnum; ++enumI)
+ for (int i=0; i<nEnum; i++)
{
- if (!names[enumI] || names[enumI][0] == '\0')
+ if (!names[i] || names[i][0] == '\0')
{
- stringList goodNames(enumI);
+ stringList goodNames(i);
- for (int i = 0; i < enumI; ++i)
+ for (int j = 0; j < i; j++)
{
- goodNames[i] = names[i];
+ goodNames[j] = names[j];
}
FatalErrorIn("NamedEnum<Enum, nEnum>::NamedEnum()")
- << "Illegal enumeration name at position " << enumI << endl
+ << "Illegal enumeration name at position " << i << endl
<< "after entries " << goodNames << ".\n"
<< "Possibly your NamedEnum<Enum, nEnum>::names array"
<< " is not of size " << nEnum << endl
<< abort(FatalError);
}
- insert(names[enumI], enumI);
+ insert(names[i], i);
}
}
@@ -61,7 +61,7 @@ Foam::NamedEnum<Enum, nEnum>::NamedEnum()
template<class Enum, int nEnum>
Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
{
- const word name(is);
+ 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: "
- << sortedToc() << exit(FatalIOError);
+ << toc() << exit(FatalIOError);
}
return Enum(iter());
diff --git a/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.C b/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.C
new file mode 100644
index 0000000000000000000000000000000000000000..db16414701634b3d004f3821cfe1acac050e5bb1
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.C
@@ -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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOFieldField.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+template<class T, class BaseType>
+void Foam::IOFieldField<T, BaseType>::readFromStream()
+{
+ Istream& is = readStream(word::null);
+
+ if (headerClassName() == IOField<T>::typeName)
+ {
+ is >> static_cast<Field<T>&>(*this);
+ close();
+ }
+ else if (headerClassName() == typeName)
+ {
+ is >> *this;
+ close();
+ }
+ else
+ {
+ FatalIOErrorIn
+ (
+ "IOFieldField<T, BaseType>::readFromStream()",
+ is
+ ) << "unexpected class name " << headerClassName()
+ << " expected " << typeName << " or " << IOField<T>::typeName
+ << endl
+ << " while reading object " << name()
+ << exit(FatalIOError);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::IOFieldField<T, BaseType>::IOFieldField(const IOobject& io)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOFieldField<T, BaseType>::IOFieldField
+(
+ const IOobject& io,
+ const label size
+)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+ else
+ {
+ Field<T>::setSize(size);
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOFieldField<T, BaseType>::IOFieldField
+(
+ const IOobject& io,
+ const Field<T>& list
+)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+ else
+ {
+ Field<T>::operator=(list);
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOFieldField<T, BaseType>::IOFieldField
+(
+ const IOobject& io,
+ const Xfer<Field<T> >& list
+)
+:
+ regIOobject(io)
+{
+ Field<T>::transfer(list());
+
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::IOFieldField<T, BaseType>::~IOFieldField()
+{}
+
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+bool Foam::IOFieldField<T, BaseType>::writeObject
+(
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+) const
+{
+ if (fmt == IOstream::ASCII)
+ {
+ // Change type to be non-compact format type
+ const word oldTypeName = typeName;
+
+ const_cast<word&>(typeName) = IOField<T>::typeName;
+
+ bool good = regIOobject::writeObject(fmt, ver, cmp);
+
+ // Change type back
+ const_cast<word&>(typeName) = oldTypeName;
+
+ return good;
+ }
+ else
+ {
+ return regIOobject::writeObject(fmt, ver, cmp);
+ }
+}
+
+
+template<class T, class BaseType>
+bool Foam::IOFieldField<T, BaseType>::writeData(Ostream& os) const
+{
+ return (os << *this).good();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+void Foam::IOFieldField<T, BaseType>::operator=
+(
+ const IOFieldField<T, BaseType>& rhs
+)
+{
+ Field<T>::operator=(rhs);
+}
+
+
+template<class T, class BaseType>
+void Foam::IOFieldField<T, BaseType>::operator=(const Field<T>& rhs)
+{
+ Field<T>::operator=(rhs);
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::Istream& Foam::operator>>
+(
+ Foam::Istream& is,
+ Foam::IOFieldField<T, BaseType>& L
+)
+{
+ // Read compact
+ const labelList start(is);
+ const Field<BaseType> elems(is);
+
+ // Convert
+ L.setSize(start.size()-1);
+
+ forAll(L, i)
+ {
+ T& subField = L[i];
+
+ label index = start[i];
+ subField.setSize(start[i+1] - index);
+
+ forAll(subField, j)
+ {
+ subField[j] = elems[index++];
+ }
+ }
+
+ return is;
+}
+
+
+template<class T, class BaseType>
+Foam::Ostream& Foam::operator<<
+(
+ Foam::Ostream& os,
+ const Foam::IOFieldField<T, BaseType>& L
+)
+{
+ // Keep ascii writing same.
+ if (os.format() == IOstream::ASCII)
+ {
+ os << static_cast<const Field<T>&>(L);
+ }
+ else
+ {
+ // Convert to compact format
+ labelList start(L.size()+1);
+
+ start[0] = 0;
+ for (label i = 1; i < start.size(); i++)
+ {
+ start[i] = start[i-1]+L[i-1].size();
+ }
+
+ Field<BaseType> elems(start[start.size()-1]);
+
+ label elemI = 0;
+ forAll(L, i)
+ {
+ const T& subField = L[i];
+
+ forAll(subField, j)
+ {
+ elems[elemI++] = subField[j];
+ }
+ }
+ os << start << elems;
+ }
+
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.H b/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.H
new file mode 100644
index 0000000000000000000000000000000000000000..2174d2d469879957a82b44d7cc61e5a42eba24a4
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOFieldField/IOFieldField.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::IOFieldField
+
+Description
+ A Field of objects of type \<T\> with automated input and output.
+
+SourceFiles
+ IOFieldField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOFieldField_H
+#define IOFieldField_H
+
+#include "IOField.H"
+#include "regIOobject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+template<class T, class BaseType> class IOFieldField;
+
+template<class T, class BaseType> Istream& operator>>
+(
+ Istream&,
+ IOFieldField<T, BaseType>&
+);
+template<class T, class BaseType> Ostream& operator<<
+(
+ Ostream&,
+ const IOFieldField<T, BaseType>&
+);
+
+/*---------------------------------------------------------------------------*\
+ Class IOFieldField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T, class BaseType>
+class IOFieldField
+:
+ public regIOobject,
+ public Field<T>
+{
+ // Private Member Functions
+
+ //- Read according to header type
+ void readFromStream();
+
+public:
+
+ //- Runtime type information
+ TypeName("FieldField");
+
+
+ // Constructors
+
+ //- Construct from IOobject
+ IOFieldField(const IOobject&);
+
+ //- Construct from IOobject and size of IOFieldField
+ IOFieldField(const IOobject&, const label);
+
+ //- Construct from IOobject and a Field
+ IOFieldField(const IOobject&, const Field<T>&);
+
+ //- Construct by transferring the Field contents
+ IOFieldField(const IOobject&, const Xfer<Field<T> >&);
+
+
+ // Destructor
+
+ virtual ~IOFieldField();
+
+
+ // Member functions
+
+ virtual bool writeObject
+ (
+ IOstream::streamFormat,
+ IOstream::versionNumber,
+ IOstream::compressionType
+ ) const;
+
+ virtual bool writeData(Ostream&) const;
+
+
+ // Member operators
+
+ void operator=(const IOFieldField<T, BaseType>&);
+
+ void operator=(const Field<T>&);
+
+
+ // IOstream operators
+
+ //- Read Field from Istream, discarding contents of existing Field.
+ friend Istream& operator>> <T, BaseType>
+ (
+ Istream&,
+ IOFieldField<T, BaseType>&
+ );
+
+ // Write Field to Ostream.
+ friend Ostream& operator<< <T, BaseType>
+ (
+ Ostream&,
+ const IOFieldField<T, BaseType>&
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "IOFieldField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.C b/src/OpenFOAM/db/IOobjects/IOListList/IOListList.C
new file mode 100644
index 0000000000000000000000000000000000000000..0f1b320195dfc3171c9ca6ba05e5ade6647371f0
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOListList/IOListList.C
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "IOListList.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+template<class T, class BaseType>
+void Foam::IOListList<T, BaseType>::readFromStream()
+{
+ Istream& is = readStream(word::null);
+
+ if (headerClassName() == IOList<T>::typeName)
+ {
+ is >> static_cast<List<T>&>(*this);
+ close();
+ }
+ else if (headerClassName() == typeName)
+ {
+ is >> *this;
+ close();
+ }
+ else
+ {
+ FatalIOErrorIn
+ (
+ "IOListList<T, BaseType>::readFromStream()",
+ is
+ ) << "unexpected class name " << headerClassName()
+ << " expected " << typeName << " or " << IOList<T>::typeName
+ << endl
+ << " while reading object " << name()
+ << exit(FatalIOError);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::IOListList<T, BaseType>::IOListList(const IOobject& io)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOListList<T, BaseType>::IOListList(const IOobject& io, const label size)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+ else
+ {
+ List<T>::setSize(size);
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOListList<T, BaseType>::IOListList
+(
+ const IOobject& io,
+ const List<T>& list
+)
+:
+ regIOobject(io)
+{
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+ else
+ {
+ List<T>::operator=(list);
+ }
+}
+
+
+template<class T, class BaseType>
+Foam::IOListList<T, BaseType>::IOListList
+(
+ const IOobject& io,
+ const Xfer<List<T> >& list
+)
+:
+ regIOobject(io)
+{
+ List<T>::transfer(list());
+
+ if
+ (
+ io.readOpt() == IOobject::MUST_READ
+ || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+ )
+ {
+ readFromStream();
+ }
+}
+
+
+// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::IOListList<T, BaseType>::~IOListList()
+{}
+
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+bool Foam::IOListList<T, BaseType>::writeObject
+(
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+) const
+{
+ if (fmt == IOstream::ASCII)
+ {
+ // Change type to be non-compact format type
+ const word oldTypeName = typeName;
+
+ const_cast<word&>(typeName) = IOList<T>::typeName;
+
+ bool good = regIOobject::writeObject(fmt, ver, cmp);
+
+ // Change type back
+ const_cast<word&>(typeName) = oldTypeName;
+
+ return good;
+ }
+ else
+ {
+ return regIOobject::writeObject(fmt, ver, cmp);
+ }
+}
+
+
+template<class T, class BaseType>
+bool Foam::IOListList<T, BaseType>::writeData(Ostream& os) const
+{
+ return (os << *this).good();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+void Foam::IOListList<T, BaseType>::operator=
+(
+ const IOListList<T, BaseType>& rhs
+)
+{
+ List<T>::operator=(rhs);
+}
+
+
+template<class T, class BaseType>
+void Foam::IOListList<T, BaseType>::operator=(const List<T>& rhs)
+{
+ List<T>::operator=(rhs);
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+
+template<class T, class BaseType>
+Foam::Istream& Foam::operator>>
+(
+ Foam::Istream& is,
+ Foam::IOListList<T, BaseType>& L
+)
+{
+ // Read compact
+ const labelList start(is);
+ const List<BaseType> elems(is);
+
+ // Convert
+ L.setSize(start.size()-1);
+
+ forAll(L, i)
+ {
+ T& subList = L[i];
+
+ label index = start[i];
+ subList.setSize(start[i+1] - index);
+
+ forAll(subList, j)
+ {
+ subList[j] = elems[index++];
+ }
+ }
+
+ return is;
+}
+
+
+template<class T, class BaseType>
+Foam::Ostream& Foam::operator<<
+(
+ Foam::Ostream& os,
+ const Foam::IOListList<T, BaseType>& L
+)
+{
+ // Keep ascii writing same.
+ if (os.format() == IOstream::ASCII)
+ {
+ os << static_cast<const List<T>&>(L);
+ }
+ else
+ {
+ // Convert to compact format
+ labelList start(L.size()+1);
+
+ start[0] = 0;
+ for (label i = 1; i < start.size(); i++)
+ {
+ start[i] = start[i-1]+L[i-1].size();
+ }
+
+ List<BaseType> elems(start[start.size()-1]);
+
+ label elemI = 0;
+ forAll(L, i)
+ {
+ const T& subList = L[i];
+
+ forAll(subList, j)
+ {
+ elems[elemI++] = subList[j];
+ }
+ }
+ os << start << elems;
+ }
+
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOListList/IOListList.H b/src/OpenFOAM/db/IOobjects/IOListList/IOListList.H
new file mode 100644
index 0000000000000000000000000000000000000000..b5bd10318395cd00da89bff852073eb69debe5fa
--- /dev/null
+++ b/src/OpenFOAM/db/IOobjects/IOListList/IOListList.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::IOListList
+
+Description
+ A List of objects of type \<T\> with automated input and output.
+
+SourceFiles
+ IOListList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOListList_H
+#define IOListList_H
+
+#include "IOList.H"
+#include "regIOobject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+template<class T, class BaseType> class IOListList;
+
+template<class T, class BaseType> Istream& operator>>
+(
+ Istream&,
+ IOListList<T, BaseType>&
+);
+template<class T, class BaseType> Ostream& operator<<
+(
+ Ostream&,
+ const IOListList<T, BaseType>&
+);
+
+/*---------------------------------------------------------------------------*\
+ Class IOListList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T, class BaseType>
+class IOListList
+:
+ public regIOobject,
+ public List<T>
+{
+ // Private Member Functions
+
+ //- Read according to header type
+ void readFromStream();
+
+public:
+
+ //- Runtime type information
+ TypeName("ListList");
+
+
+ // Constructors
+
+ //- Construct from IOobject
+ IOListList(const IOobject&);
+
+ //- Construct from IOobject and size of IOListList
+ IOListList(const IOobject&, const label);
+
+ //- Construct from IOobject and a List
+ IOListList(const IOobject&, const List<T>&);
+
+ //- Construct by transferring the List contents
+ IOListList(const IOobject&, const Xfer<List<T> >&);
+
+
+ // Destructor
+
+ virtual ~IOListList();
+
+
+ // Member functions
+
+ virtual bool writeObject
+ (
+ IOstream::streamFormat,
+ IOstream::versionNumber,
+ IOstream::compressionType
+ ) const;
+
+ virtual bool writeData(Ostream&) const;
+
+
+ // Member operators
+
+ void operator=(const IOListList<T, BaseType>&);
+
+ void operator=(const List<T>&);
+
+
+ // IOstream operators
+
+ //- Read List from Istream, discarding contents of existing List.
+ friend Istream& operator>> <T, BaseType>
+ (
+ Istream&,
+ IOListList<T, BaseType>&
+ );
+
+ // Write List to Ostream.
+ friend Ostream& operator<< <T, BaseType>
+ (
+ Ostream&,
+ const IOListList<T, BaseType>&
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "IOListList.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index b9eebc0d7f1604afc2442673f3e17c61e9d9c281..0afa8d69b34d9b66c5b6c16add13ef60312902ca 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -552,9 +552,8 @@ bool Foam::Time::end() const
}
-bool Foam::Time::stopAt(const stopAtControls sa) const
+void Foam::Time::stopAt(const stopAtControls sa) const
{
- const bool changed = (stopAt_ != sa);
stopAt_ = sa;
// adjust endTime
@@ -566,7 +565,6 @@ bool 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 55b02813c998cfe80ee65da2a2a2af601ba03d39..7596fee0c9bee183effc5dedabc18855be1f6ff0 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -406,8 +406,7 @@ public:
//- Adjust the current stopAtControl. Note that this value
// only persists until the next time the dictionary is read.
- // Return true if the stopAtControl changed.
- virtual bool stopAt(const stopAtControls) const;
+ virtual void stopAt(const stopAtControls) const;
//- Reset the time and time-index to those of the given time
virtual void setTime(const Time&);
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 3c3d50435398517cfb01247342dec4347bf4aaac..c483aed55709ce442f65f56a3ff9a953a8e3c61d 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -191,14 +191,10 @@ 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&);
@@ -445,9 +441,6 @@ 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 e27371a288b0c3a4defc606952153b5db5195b2c..1c452bafaf3c9dc1728f5fdd058012e8a8a04b41 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -28,61 +28,13 @@ License
#include "inputModeEntry.H"
#include "regExp.H"
-// * * * * * * * * * * * * * * * * 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::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));
-}
-
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
-bool Foam::dictionary::read(Istream& is, const bool keepHeader)
+bool Foam::dictionary::read(Istream& is)
{
if (!is.good())
{
- FatalIOErrorIn("dictionary::read(Istream&, const bool)", is)
+ FatalIOErrorIn("dictionary::read(Istream&, const word&)", is)
<< "Istream not OK for reading dictionary "
<< exit(FatalIOError);
@@ -98,15 +50,12 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
while (!is.eof() && entry::New(*this, is))
{}
- // normally remove the FoamFile header entry if it exists
- if (!keepHeader)
- {
- remove("FoamFile");
- }
+ // Remove the FoamFile header entry if it exists
+ remove("FoamFile");
if (is.bad())
{
- Info<< "dictionary::read(Istream&, bool) : "
+ Info<< "dictionary::read(Istream&, const word&) : "
<< "Istream not OK after reading dictionary " << name()
<< endl;
@@ -117,12 +66,6 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
}
-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);
@@ -147,6 +90,40 @@ 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)
@@ -168,7 +145,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)
@@ -176,12 +153,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.
@@ -196,7 +173,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;
}
}
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index fe395bdf402bdcc377ff488fc4f1f5cf8d64a6e7..2644b0d00094d862f54e0bd68d23b9510b9ead3e 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-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,25 +68,17 @@ Foam::outputFilterOutputControl::~outputFilterOutputControl()
void Foam::outputFilterOutputControl::read(const dictionary& dict)
{
- if (dict.found("outputControl"))
- {
- outputControl_ = outputControlNames_.read(dict.lookup("outputControl"));
- }
- else
- {
- outputControl_ = ocTimeStep;
- }
+ outputControl_ = outputControlNames_.read(dict.lookup("outputControl"));
switch (outputControl_)
{
case ocTimeStep:
{
- outputInterval_ = dict.lookupOrDefault<label>("outputInterval", 0);
- break;
+ dict.lookup("outputInterval") >> outputInterval_;
}
default:
{
- break;
+ // do nothing
}
}
}
@@ -112,12 +104,10 @@ bool Foam::outputFilterOutputControl::output() const
}
default:
{
- // this error should not actually be possible
FatalErrorIn("bool Foam::outputFilterOutputControl::output()")
- << "Undefined output control: "
+ << "Unknown 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 3e6412f4656f4e89aad6774c9f5b4465d90896c3..865e4cb2c4d265c62933b13737f76147c1c135fd 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -25,8 +25,6 @@ Class
Foam::outputFilterOutputControl
Description
- An output control for function objects.
- The default is time-step execution at every interval.
SourceFiles
outputFilterOutputControl.C
@@ -53,11 +51,10 @@ class outputFilterOutputControl
{
public:
- //- The output control options
enum outputControls
{
- ocTimeStep, /*!< execution is coupled to the time-step */
- ocOutputTime /*!< execution is coupled to the output-time */
+ ocTimeStep,
+ ocOutputTime
};
@@ -74,7 +71,7 @@ private:
//- Type of output
outputControls outputControl_;
- //- The execution interval (in time steps) when using @c timeStep mode,
+ //- The execution interval (in time steps) when using TIMESTEP mode
// a value <= 1 means execute at every time step
label outputInterval_;
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C
new file mode 100644
index 0000000000000000000000000000000000000000..fe464093d72aa245fca64ed589cf734f2dbf2bf0
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.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
+ labelField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "labelFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ labelFieldIOField,
+ "labelFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ labelIOFieldField,
+ "labelCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
new file mode 100644
index 0000000000000000000000000000000000000000..76dda2c2f1bf36074d4947c91fca056ccebb6908
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.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::labelFieldIOField
+
+Description
+ labelFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef labelFieldIOField_H
+#define labelFieldIOField_H
+
+#include "labelField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<labelField> labelFieldIOField;
+ typedef IOFieldField<labelField, label> labelIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C
new file mode 100644
index 0000000000000000000000000000000000000000..4c724f2b60ad56e7734d6233d7fe6a7ea7ed72e0
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.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
+ scalarField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "scalarFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ scalarFieldIOField,
+ "scalarFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ scalarIOFieldField,
+ "scalarCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
new file mode 100644
index 0000000000000000000000000000000000000000..ad0ade1446941b27f35778c7b505ccf3ed220619
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.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::scalarFieldIOField
+
+Description
+ scalarFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef scalarFieldIOField_H
+#define scalarFieldIOField_H
+
+#include "scalarField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<scalarField> scalarFieldIOField;
+ typedef IOFieldField<scalarField, scalar> scalarIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.C b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.C
new file mode 100644
index 0000000000000000000000000000000000000000..b28fa1eefb2fadc08363a42bb02d75daf76c86b0
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.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
+ vectorField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vectorFieldIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vectorFieldIOField,
+ "vectorFieldField",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vectorIOFieldField,
+ "vectorCompactFieldField",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H
new file mode 100644
index 0000000000000000000000000000000000000000..a029e33fd76c71ea940061004eb008fa7813696a
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.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::vectorFieldIOField
+
+Description
+ vectorFieldField with IO.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vectorFieldIOField_H
+#define vectorFieldIOField_H
+
+#include "vectorField.H"
+#include "IOField.H"
+#include "IOFieldField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOField<vectorField> vectorFieldIOField;
+ typedef IOFieldField<vectorField, vector> vectorIOFieldField;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 7fa8d4b8bc19ed7586dcbaae22ea111cfaf075ff..ea652841b00090da0c126b69913a49f506390058 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -26,6 +26,7 @@ License
#include "emptyPolyPatch.H"
#include "commSchedule.H"
#include "globalMeshData.H"
+#include "cyclicPolyPatch.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -251,6 +252,29 @@ GeometricBoundaryField
{
if (bmesh_[patchi].type() != emptyPolyPatch::typeName)
{
+ if
+ (
+ bmesh_[patchi].type() == cyclicPolyPatch::typeName
+ && !dict.found(bmesh_[patchi].name())
+ )
+ {
+ FatalIOErrorIn
+ (
+ "GeometricField<Type, PatchField, GeoMesh>::\n"
+ "GeometricBoundaryField::GeometricBoundaryField\n"
+ "(\n"
+ " const BoundaryMesh&,\n"
+ " const DimensionedField<Type, GeoMesh>&,\n"
+ " const dictionary&\n"
+ ")",
+ dict
+ ) << "Cannot find patchField entry for cyclic "
+ << bmesh_[patchi].name() << endl
+ << "Is your field uptodate with split cyclics?" << endl
+ << "Run foamUpgradeCyclics to convert mesh and fields"
+ << " to split cyclics." << exit(FatalIOError);
+ }
+
set
(
patchi,
@@ -322,7 +346,11 @@ evaluate()
}
// Block for any outstanding requests
- if (Pstream::defaultCommsType == Pstream::nonBlocking)
+ if
+ (
+ Pstream::parRun()
+ && Pstream::defaultCommsType == Pstream::nonBlocking
+ )
{
Pstream::waitRequests();
}
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index b4960c341d2f37c5f25e399c2e236915a0b81433..f420291fd6bcc08adb2285b125fade918f5bb0ac 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -27,6 +27,7 @@ License
#include "Time.H"
#include "demandDrivenData.H"
#include "dictionary.H"
+#include "data.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -918,6 +919,15 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::needReference() const
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::relax(const scalar alpha)
{
+ if (debug)
+ {
+ InfoIn
+ (
+ "GeometricField<Type, PatchField, GeoMesh>::relax"
+ "(const scalar alpha)"
+ ) << "Relaxing" << endl << this->info() << " by " << alpha << endl;
+ }
+
operator==(prevIter() + alpha*(*this - prevIter()));
}
@@ -925,16 +935,33 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax(const scalar alpha)
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
{
- scalar alpha = 0;
+ word name = this->name();
- if (this->mesh().relax(this->name()))
+ if (this->mesh().data::lookupOrDefault<bool>("finalIteration", false))
{
- alpha = this->mesh().relaxationFactor(this->name());
+ name += "Final";
}
- if (alpha > 0)
+ if (this->mesh().relax(name))
+ {
+ relax(this->mesh().relaxationFactor(name));
+ }
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::word Foam::GeometricField<Type, PatchField, GeoMesh>::select
+(
+ bool final
+) const
+{
+ if (final)
+ {
+ return this->name() + "Final";
+ }
+ else
{
- relax(alpha);
+ return this->name();
}
}
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index fa8ec179e41cdedddb2e107691b0794a55cca0c4..992b4a5c8363063fa6621c68b131edf92012b270 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -476,6 +476,11 @@ public:
// alpha is read from controlDict
void relax();
+ //- Select the final iteration parameters if `final' is true
+ // by returning the field name + "Final"
+ // otherwise the standard parameters by returning the field name
+ word select(bool final) const;
+
// Member function *this operators
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index a5f1b4a761b049b1e75dd7c539734fb9f8837f09..e23e5a8948b5362c01f9ec98dc70647b03ef4b22 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
@@ -25,6 +25,8 @@ License
#include "cyclicPointPatchField.H"
#include "Swap.H"
+#include "transformField.H"
+#include "pointFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -127,28 +129,57 @@ void cyclicPointPatchField<Type>::swapAddSeparated
Field<Type>& pField
) const
{
- Field<Type> pf(this->patchInternalField(pField));
+ // Get neighbouring pointPatch
+ const cyclicPointPatch& nbrPatch = cyclicPatch_.neighbPatch();
- const edgeList& pairs = cyclicPatch_.transformPairs();
-
- if (doTransform())
+ if (cyclicPatch_.cyclicPatch().owner())
{
- forAll(pairs, pairi)
+ // We inplace modify pField. To prevent the other side (which gets
+ // evaluated at a later date) using already changed values we do
+ // all swaps on the side that gets evaluated first.
+
+ // Get neighbouring pointPatchField
+ const GeometricField<Type, pointPatchField, pointMesh>& fld =
+ refCast<const GeometricField<Type, pointPatchField, pointMesh> >
+ (
+ this->dimensionedInternalField()
+ );
+
+ const cyclicPointPatchField<Type>& nbr =
+ refCast<const cyclicPointPatchField<Type> >
+ (
+ fld.boundaryField()[nbrPatch.index()]
+ );
+
+
+ Field<Type> pf(this->patchInternalField(pField));
+ Field<Type> nbrPf(nbr.patchInternalField(pField));
+
+ const edgeList& pairs = cyclicPatch_.transformPairs();
+
+ if (doTransform())
{
- Type tmp = pf[pairs[pairi][0]];
- pf[pairs[pairi][0]] = transform(forwardT()[0], pf[pairs[pairi][1]]);
- pf[pairs[pairi][1]] = transform(reverseT()[0], tmp);
+ // Transform both sides.
+ forAll(pairs, pairi)
+ {
+ label pointi = pairs[pairi][0];
+ label nbrPointi = pairs[pairi][1];
+
+ Type tmp = pf[pointi];
+ pf[pointi] = transform(forwardT()[0], nbrPf[nbrPointi]);
+ nbrPf[nbrPointi] = transform(reverseT()[0], tmp);
+ }
}
- }
- else
- {
- forAll(pairs, pairi)
+ else
{
- Swap(pf[pairs[pairi][0]], pf[pairs[pairi][1]]);
+ forAll(pairs, pairi)
+ {
+ Swap(pf[pairs[pairi][0]], nbrPf[pairs[pairi][1]]);
+ }
}
+ addToInternalField(pField, pf);
+ nbr.addToInternalField(pField, nbrPf);
}
-
- addToInternalField(pField, pf, cyclicPatch_.separatedPoints());
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
index 7db347c5a6a041fdcd04ed5a8a35df5a3317519a..25bafe394fbc3ca0c6d915e3976cde723bfa00bb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.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
@@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "cyclicSlipPointPatchField.H"
-#include "pointConstraint.H"
#include "transformField.H"
#include "symmTransformField.H"
@@ -104,17 +103,6 @@ void cyclicSlipPointPatchField<Type>::evaluate(const Pstream::commsTypes)
}
-template<class Type>
-void cyclicSlipPointPatchField<Type>::applyConstraint
-(
- const label pointi,
- pointConstraint& pc
-) const
-{
- pc.applyConstraint(this->patch().pointNormals()[pointi]);
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index 52c59ab1b632fc0c1ac86d8cd64d0f6ecef5853a..33dbbbd86764c4973291ccc4469b8df943c0f096 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.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
@@ -25,7 +25,7 @@ Class
Foam::cyclicSlipPointPatchField
Description
- Specialisation of cyclic that constrains to the patch
+ Cyclic + slip constraints
SourceFiles
cyclicSlipPointPatchField.C
@@ -36,6 +36,7 @@ SourceFiles
#define cyclicSlipPointPatchField_H
#include "cyclicPointPatchField.H"
+#include "cyclicSlipPointPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +56,7 @@ class cyclicSlipPointPatchField
public:
//- Runtime type information
- TypeName("cyclicSlip");
+ TypeName(cyclicSlipPointPatch::typeName_());
// Constructors
@@ -121,18 +122,13 @@ public:
// Member functions
- //- Update the patch field
- virtual void evaluate
- (
- const Pstream::commsTypes commsType=Pstream::blocking
- );
+ // Evaluation functions
- //- Accumulate the effect of constraint direction of this patch
- virtual void applyConstraint
- (
- const label pointi,
- pointConstraint&
- ) const;
+ //- Evaluate the patch field
+ virtual void evaluate
+ (
+ const Pstream::commsTypes commsType=Pstream::blocking
+ );
};
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C
index 71e09f575fa47fae3a2795055481ef9268e49de3..52db2b0f4d2cf0dfc93310827389c65e35036434 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.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
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.H
index da2196d9be549eb9ed34c27f68f2d80526b196fc..701fd0adc9662fbfb37eb892572f45efb11250a1 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.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
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
index 876c27723f53f6501ba3a100cd28429604c87285..11753c397e012a88aed360ebec64ac5a761784d3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "processorPointPatchField.H"
-#include "transformField.H"
+//#include "transformField.H"
#include "processorPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -102,26 +102,27 @@ void processorPointPatchField<Type>::initSwapAddSeparated
)
const
{
- if (Pstream::parRun())
- {
- // Get internal field into correct order for opposite side
- Field<Type> pf
- (
- this->patchInternalField
- (
- pField,
- procPatch_.reverseMeshPoints()
- )
- );
-
- OPstream::write
- (
- commsType,
- procPatch_.neighbProcNo(),
- reinterpret_cast<const char*>(pf.begin()),
- pf.byteSize()
- );
- }
+// if (Pstream::parRun())
+// {
+// // Get internal field into correct order for opposite side
+// Field<Type> pf
+// (
+// this->patchInternalField
+// (
+// pField,
+// procPatch_.reverseMeshPoints()
+// )
+// );
+//
+// OPstream::write
+// (
+// commsType,
+// procPatch_.neighbProcNo(),
+// reinterpret_cast<const char*>(pf.begin()),
+// pf.byteSize(),
+// procPatch_.tag()
+// );
+// }
}
@@ -132,44 +133,29 @@ void processorPointPatchField<Type>::swapAddSeparated
Field<Type>& pField
) const
{
- if (Pstream::parRun())
- {
- Field<Type> pnf(this->size());
-
- IPstream::read
- (
- commsType,
- procPatch_.neighbProcNo(),
- reinterpret_cast<char*>(pnf.begin()),
- pnf.byteSize()
- );
-
- if (doTransform())
- {
- const processorPolyPatch& ppp = procPatch_.procPolyPatch();
- const tensorField& forwardT = ppp.forwardT();
-
- if (forwardT.size() == 1)
- {
- transform(pnf, forwardT[0], pnf);
- }
- else
- {
- const labelListList& pointFaces = ppp.pointFaces();
-
- forAll(pointFaces, pfi)
- {
- pnf[pfi] = transform
- (
- forwardT[pointFaces[pfi][0]],
- pnf[pfi]
- );
- }
- }
- }
-
- addToInternalField(pField, pnf, procPatch_.separatedPoints());
- }
+// if (Pstream::parRun())
+// {
+// Field<Type> pnf(this->size());
+//
+// IPstream::read
+// (
+// commsType,
+// procPatch_.neighbProcNo(),
+// reinterpret_cast<char*>(pnf.begin()),
+// pnf.byteSize(),
+// procPatch_.tag()
+// );
+//
+// if (doTransform())
+// {
+// const processorPolyPatch& ppp = procPatch_.procPolyPatch();
+// const tensor& forwardT = ppp.forwardT();
+//
+// transform(pnf, forwardT, pnf);
+// }
+//
+// addToInternalField(pField, pnf, procPatch_.separatedPoints());
+// }
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index cc1760a7b2b1d3c2cd1540670d796e48425b2a8b..4aeda6700b4ccb2fbe66a5f7c5931657512b5488 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -147,7 +147,7 @@ public:
}
}
- //- Does the patch field perform the transfromation
+ //- Does the patch field perform the transformation
virtual bool doTransform() const
{
return
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..68a64544d7bd9cba5a7903400761cf46bfc94203
--- /dev/null
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicPointPatchField.H"
+#include "transformField.H"
+#include "processorPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
+(
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF
+)
+:
+ coupledPointPatchField<Type>(p, iF),
+ procPatch_(refCast<const processorCyclicPointPatch>(p))
+{}
+
+
+template<class Type>
+processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
+(
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF,
+ const dictionary& dict
+)
+:
+ coupledPointPatchField<Type>(p, iF, dict),
+ procPatch_(refCast<const processorCyclicPointPatch>(p))
+{}
+
+
+template<class Type>
+processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
+(
+ const processorCyclicPointPatchField<Type>& ptf,
+ const pointPatch& p,
+ const DimensionedField<Type, pointMesh>& iF,
+ const pointPatchFieldMapper& mapper
+)
+:
+ coupledPointPatchField<Type>(ptf, p, iF, mapper),
+ procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch()))
+{}
+
+
+template<class Type>
+processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
+(
+ const processorCyclicPointPatchField<Type>& ptf,
+ const DimensionedField<Type, pointMesh>& iF
+)
+:
+ coupledPointPatchField<Type>(ptf, iF),
+ procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch()))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicPointPatchField<Type>::~processorCyclicPointPatchField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+void processorCyclicPointPatchField<Type>::initSwapAddSeparated
+(
+ const Pstream::commsTypes commsType,
+ Field<Type>& pField
+) const
+{
+ if (Pstream::parRun())
+ {
+ // Get internal field into correct order for opposite side
+ Field<Type> pf
+ (
+ this->patchInternalField
+ (
+ pField,
+ procPatch_.reverseMeshPoints()
+ )
+ );
+
+ OPstream::write
+ (
+ commsType,
+ procPatch_.neighbProcNo(),
+ reinterpret_cast<const char*>(pf.begin()),
+ pf.byteSize(),
+ procPatch_.tag()
+ );
+ }
+}
+
+
+template<class Type>
+void processorCyclicPointPatchField<Type>::swapAddSeparated
+(
+ const Pstream::commsTypes commsType,
+ Field<Type>& pField
+) const
+{
+ if (Pstream::parRun())
+ {
+ Field<Type> pnf(this->size());
+
+ IPstream::read
+ (
+ commsType,
+ procPatch_.neighbProcNo(),
+ reinterpret_cast<char*>(pnf.begin()),
+ pnf.byteSize(),
+ procPatch_.tag()
+ );
+
+ if (doTransform())
+ {
+ const processorCyclicPolyPatch& ppp =
+ procPatch_.procCyclicPolyPatch();
+ const tensor& forwardT = ppp.forwardT()[0];
+
+ transform(pnf, forwardT, pnf);
+ }
+
+ // All points are separated
+ addToInternalField(pField, pnf);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..263f004af7b94d3afa167206f8e978714b0b14e5
--- /dev/null
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -0,0 +1,201 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicPointPatchField
+
+Description
+ Foam::processorCyclicPointPatchField
+
+SourceFiles
+ processorCyclicPointPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicPointPatchField_H
+#define processorCyclicPointPatchField_H
+
+#include "coupledPointPatchField.H"
+#include "processorCyclicPointPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicPointPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class processorCyclicPointPatchField
+:
+ public coupledPointPatchField<Type>
+{
+ // Private data
+
+ //- Local reference to processor patch
+ const processorCyclicPointPatch& procPatch_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName(processorCyclicPointPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ processorCyclicPointPatchField
+ (
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ processorCyclicPointPatchField
+ (
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given patchField<Type> onto a new patch
+ processorCyclicPointPatchField
+ (
+ const processorCyclicPointPatchField<Type>&,
+ const pointPatch&,
+ const DimensionedField<Type, pointMesh>&,
+ const pointPatchFieldMapper&
+ );
+
+ //- Construct and return a clone
+ virtual autoPtr<pointPatchField<Type> > clone() const
+ {
+ return autoPtr<pointPatchField<Type> >
+ (
+ new processorCyclicPointPatchField<Type>
+ (
+ *this
+ )
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ processorCyclicPointPatchField
+ (
+ const processorCyclicPointPatchField<Type>&,
+ const DimensionedField<Type, pointMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual autoPtr<pointPatchField<Type> > clone
+ (
+ const DimensionedField<Type, pointMesh>& iF
+ ) const
+ {
+ return autoPtr<pointPatchField<Type> >
+ (
+ new processorCyclicPointPatchField<Type>
+ (
+ *this,
+ iF
+ )
+ );
+ }
+
+
+ // Destructor
+
+ ~processorCyclicPointPatchField();
+
+
+ // Member functions
+
+ // Access
+
+ //- Return true if running parallel
+ virtual bool coupled() const
+ {
+ if (Pstream::parRun())
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ //- Does the patch field perform the transfromation
+ virtual bool doTransform() const
+ {
+ return
+ !(
+ pTraits<Type>::rank == 0
+ || procPatch_.procPolyPatch().parallel()
+ );
+ }
+
+
+ // Evaluation functions
+
+ //- Evaluate the patch field
+ virtual void evaluate
+ (
+ const Pstream::commsTypes commsType=Pstream::blocking
+ )
+ {}
+
+ //- Initialise swap of non-collocated patch point values
+ virtual void initSwapAddSeparated
+ (
+ const Pstream::commsTypes commsType,
+ Field<Type>&
+ ) const;
+
+ //- Complete swap of patch point values and add to local values
+ virtual void swapAddSeparated
+ (
+ const Pstream::commsTypes commsType,
+ Field<Type>&
+ ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "processorCyclicPointPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..dfe9054bcbbd5d2825ef91594a3c089eb697dcfa
--- /dev/null
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicPointPatchFields.H"
+#include "pointPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(processorCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..a61afcd27827d8e15760d0e84a06b6c13619ad3f
--- /dev/null
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicPointPatchFields_H
+#define processorCyclicPointPatchFields_H
+
+#include "processorCyclicPointPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePointPatchFieldTypedefs(processorCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 764fa5b31b319c84bec901167bcda4037bd0171d..03dbf43fd431628d7f9541236e2f7ed20de6148d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -141,15 +141,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
<< abort(FatalError);
}
- tmp<Field<Type1> > tvalues(new Field<Type1>(meshPoints.size()));
- Field<Type1>& values = tvalues();
-
- forAll(meshPoints, pointI)
- {
- values[pointI] = iF[meshPoints[pointI]];
- }
-
- return tvalues;
+ return tmp<Field<Type1> >(new Field<Type1>(iF, meshPoints));
}
diff --git a/src/OpenFOAM/global/argList/parRun.H b/src/OpenFOAM/global/argList/parRun.H
index 6ec30f2249c3813ce8c976dae3b04a05d79ecc94..23db4ee9bc4d5ccfd03392a27f38749af66f9197 100644
--- a/src/OpenFOAM/global/argList/parRun.H
+++ b/src/OpenFOAM/global/argList/parRun.H
@@ -32,8 +32,7 @@ Description
#ifndef parRun_H
#define parRun_H
-#include "OPstream.H"
-#include "IPstream.H"
+#include "Pstream.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 05b26179b47d405b084d1047e45b14cfbec81c2b..30a632ae36c967e41edf47c14922a96f11eac661 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -27,6 +27,7 @@ License
#include "lduMatrix.H"
#include "procLduMatrix.H"
#include "procLduInterface.H"
+#include "cyclicLduInterface.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -160,19 +161,27 @@ void Foam::LUscalarMatrix::convert
{
const lduInterface& interface = interfaces[inti].interface();
- const label* __restrict__ ulPtr = interface.faceCells().begin();
- const scalar* __restrict__ upperLowerPtr =
- interfaceCoeffs[inti].begin();
+ // Assume any interfaces are cyclic ones
- register label inFaces = interface.faceCells().size()/2;
+ const label* __restrict__ lPtr = interface.faceCells().begin();
+
+ const cyclicLduInterface& cycInterface =
+ refCast<const cyclicLduInterface>(interface);
+ label nbrInt = cycInterface.neighbPatchID();
+ const label* __restrict__ uPtr =
+ interfaces[nbrInt].interface().faceCells().begin();
+
+ const scalar* __restrict__ nbrUpperLowerPtr =
+ interfaceCoeffs[nbrInt].begin();
+
+ register label inFaces = interface.faceCells().size();
for (register label face=0; face<inFaces; face++)
{
- label uCell = ulPtr[face];
- label lCell = ulPtr[face + inFaces];
+ label uCell = lPtr[face];
+ label lCell = uPtr[face];
- operator[](uCell)[lCell] -= upperLowerPtr[face + inFaces];
- operator[](lCell)[uCell] -= upperLowerPtr[face];
+ operator[](uCell)[lCell] -= nbrUpperLowerPtr[face];
}
}
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
index 1010c17f9822d969fdd3b0844d3f8f19f6a152f2..7d7cbff30954edc721b9a18abaf1a93ed4f4bc44 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
@@ -65,6 +65,14 @@ public:
// Access
+ //- Return neighbour
+ virtual label neighbPatchID() const = 0;
+
+ virtual bool owner() const = 0;
+
+ //- Return processor number
+ virtual const cyclicLduInterface& neighbPatch() const = 0;
+
//- Return face transformation tensor
virtual const tensorField& forwardT() const = 0;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 2b65bedf8d772e52191c55293a6895aa69f385fc..60ca7372d01aeb3abd7aaecaf3323cc3e0d6b52a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -96,21 +96,6 @@ public:
const unallocLabelList& internalData
) const = 0;
- //- Initialise interface data transfer
- virtual void initTransfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const
- {}
-
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const = 0;
-
//- Initialise transfer of internal field adjacent to the interface
virtual void initInternalFieldTransfer
(
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index be3d050d7ada66367b2f24a85d2834ca13e215e2..324ccc1ad4cff433ee288b48f2a4c8d0b2f2581b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -93,6 +93,8 @@ public:
//- Return face transformation tensor
virtual const tensorField& forwardT() const = 0;
+ //- Return message tag used for sending
+ virtual int tag() const = 0;
// Transfer functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index cd42ba976722b9355436c98d8ddcd303746bcc0e..450c30f884693e02e8c8461bd9d7e171aebeef3f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -43,7 +43,8 @@ void Foam::processorLduInterface::send
commsType,
neighbProcNo(),
reinterpret_cast<const char*>(f.begin()),
- f.byteSize()
+ f.byteSize(),
+ tag()
);
}
else if (commsType == Pstream::nonBlocking)
@@ -55,7 +56,8 @@ void Foam::processorLduInterface::send
commsType,
neighbProcNo(),
receiveBuf_.begin(),
- receiveBuf_.size()
+ receiveBuf_.size(),
+ tag()
);
resizeBuf(sendBuf_, f.byteSize());
@@ -66,7 +68,8 @@ void Foam::processorLduInterface::send
commsType,
neighbProcNo(),
sendBuf_.begin(),
- f.byteSize()
+ f.byteSize(),
+ tag()
);
}
else
@@ -92,7 +95,8 @@ void Foam::processorLduInterface::receive
commsType,
neighbProcNo(),
reinterpret_cast<char*>(f.begin()),
- f.byteSize()
+ f.byteSize(),
+ tag()
);
}
else if (commsType == Pstream::nonBlocking)
@@ -155,7 +159,8 @@ void Foam::processorLduInterface::compressedSend
commsType,
neighbProcNo(),
sendBuf_.begin(),
- nBytes
+ nBytes,
+ tag()
);
}
else if (commsType == Pstream::nonBlocking)
@@ -167,7 +172,8 @@ void Foam::processorLduInterface::compressedSend
commsType,
neighbProcNo(),
receiveBuf_.begin(),
- receiveBuf_.size()
+ receiveBuf_.size(),
+ tag()
);
OPstream::write
@@ -175,7 +181,8 @@ void Foam::processorLduInterface::compressedSend
commsType,
neighbProcNo(),
sendBuf_.begin(),
- nBytes
+ nBytes,
+ tag()
);
}
else
@@ -215,7 +222,8 @@ void Foam::processorLduInterface::compressedReceive
commsType,
neighbProcNo(),
receiveBuf_.begin(),
- nBytes
+ nBytes,
+ tag()
);
}
else if (commsType != Pstream::nonBlocking)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
index 472cec83f231156373e7073ec82e2e947632dbfd..460a9fa06d2619e7dae25e1891729d9f9cab6397 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
@@ -47,19 +47,10 @@ void Foam::cyclicLduInterfaceField::transformCoupleField
{
if (doTransform())
{
- label sizeby2 = pnf.size()/2;
-
scalar forwardScale =
pow(diag(forwardT()[0]).component(cmpt), rank());
- scalar reverseScale =
- pow(diag(reverseT()[0]).component(cmpt), rank());
-
- for (label facei=0; facei<sizeby2; facei++)
- {
- pnf[facei] *= forwardScale;
- pnf[facei + sizeby2] *= reverseScale;
- }
+ pnf *= forwardScale;
}
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 2d1ff23a596ac7b91e9a52a57ee1e885bc022537..2e7ebe16f179f8c02c929af42c3b46506cf59156 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -111,10 +111,13 @@ void Foam::lduMatrix::updateMatrixInterfaces
)
{
// Block until all sends/receives have been finished
- if (Pstream::defaultCommsType == Pstream::nonBlocking)
+ if
+ (
+ Pstream::parRun()
+ && Pstream::defaultCommsType == Pstream::nonBlocking
+ )
{
- IPstream::waitRequests();
- OPstream::waitRequests();
+ UPstream::waitRequests();
}
forAll(interfaces, interfaceI)
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index e39bb19b5a23edd683d1c77be2f44f3f3fd727b7..a71bb298f5ee343a74cee3eda014afda8d839ebc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -229,12 +229,17 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
{
fineInterfaces[inti].initInternalFieldTransfer
(
- Pstream::blocking,
+ Pstream::nonBlocking,
restrictMap
);
}
}
+ if (Pstream::parRun())
+ {
+ Pstream::waitRequests();
+ }
+
// Add the coarse level
forAll(fineInterfaces, inti)
{
@@ -245,11 +250,13 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
inti,
GAMGInterface::New
(
+ inti,
+ coarseInterfaces,
fineInterfaces[inti],
fineInterfaces[inti].interfaceInternalField(restrictMap),
fineInterfaces[inti].internalFieldTransfer
(
- Pstream::blocking,
+ Pstream::nonBlocking,
restrictMap
)
).ptr()
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
index 4d67b7fa60a9ffed9d3a8a0d65abad642c1bbe17..45b5ce97bbba521f4bafb0952563ceb10a0a932e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -80,20 +80,16 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
const Pstream::commsTypes
) const
{
- scalarField pnf(size());
+ // Get neighbouring field
+ scalarField pnf
+ (
+ cyclicInterface_.neighbPatch().interfaceInternalField(psiInternal)
+ );
- label sizeby2 = size()/2;
+ transformCoupleField(pnf, cmpt);
const unallocLabelList& faceCells = cyclicInterface_.faceCells();
- for (label facei=0; facei<sizeby2; facei++)
- {
- pnf[facei] = psiInternal[faceCells[facei + sizeby2]];
- pnf[facei + sizeby2] = psiInternal[faceCells[facei]];
- }
-
- transformCoupleField(pnf, cmpt);
-
forAll(faceCells, elemI)
{
result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
new file mode 100644
index 0000000000000000000000000000000000000000..22e1f95fded190a1216837ae50f851ccb8388ef3
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicGAMGInterfaceField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(processorCyclicGAMGInterfaceField, 0);
+ addToRunTimeSelectionTable
+ (
+ GAMGInterfaceField,
+ processorCyclicGAMGInterfaceField,
+ lduInterface
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::processorCyclicGAMGInterfaceField::processorCyclicGAMGInterfaceField
+(
+ const GAMGInterface& GAMGCp,
+ const lduInterfaceField& fineInterface
+)
+:
+ processorGAMGInterfaceField(GAMGCp, fineInterface)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+//void Foam::processorCyclicGAMGInterfaceField::initInterfaceMatrixUpdate
+//(
+// const scalarField& psiInternal,
+// scalarField&,
+// const lduMatrix&,
+// const scalarField&,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// procInterface_.compressedSend
+// (
+// commsType,
+// procInterface_.interfaceInternalField(psiInternal)()
+// );
+//}
+//
+//
+//void Foam::processorCyclicGAMGInterfaceField::updateInterfaceMatrix
+//(
+// const scalarField&,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// scalarField pnf
+// (
+// procInterface_.compressedReceive<scalar>(commsType, coeffs.size())
+// );
+// transformCoupleField(pnf, cmpt);
+//
+// const unallocLabelList& faceCells = procInterface_.faceCells();
+//
+// forAll(faceCells, elemI)
+// {
+// result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+// }
+//}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
new file mode 100644
index 0000000000000000000000000000000000000000..9c3360fc7f6683e92dabfe4f0c0f4196b1fe0e77
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
@@ -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, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::processorCyclicGAMGInterfaceField
+
+Description
+ GAMG agglomerated processor interface field.
+
+SourceFiles
+ processorCyclicGAMGInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicGAMGInterfaceField_H
+#define processorCyclicGAMGInterfaceField_H
+
+#include "processorGAMGInterfaceField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicGAMGInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorCyclicGAMGInterfaceField
+:
+ public processorGAMGInterfaceField
+{
+ // Private data
+
+// //- Local reference cast into the processor interface
+// const processorCyclicGAMGInterface& procInterface_;
+//
+// //- Is the transform required
+// bool doTransform_;
+//
+// //- Rank of component for transformation
+// int rank_;
+//
+
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ processorCyclicGAMGInterfaceField(const processorCyclicGAMGInterfaceField&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const processorCyclicGAMGInterfaceField&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("processorCyclic");
+
+
+ // Constructors
+
+ //- Construct from GAMG interface and fine level interface field
+ processorCyclicGAMGInterfaceField
+ (
+ const GAMGInterface& GAMGCp,
+ const lduInterfaceField& fineInterface
+ );
+
+
+ // Destructor
+
+ virtual ~processorCyclicGAMGInterfaceField();
+
+
+ // Member Functions
+
+// // Access
+//
+// //- Return size
+// label size() const
+// {
+// return procInterface_.size();
+// }
+//
+//
+// // Interface matrix update
+//
+// //- Initialise neighbour matrix update
+// virtual void initInterfaceMatrixUpdate
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix& m,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+// ) const;
+//
+// //- Update result field based on interface functionality
+// virtual void updateInterfaceMatrix
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+// ) const;
+//
+//
+// //- Processor interface functions
+//
+// //- Return processor number
+// virtual int myProcNo() const
+// {
+// return procInterface_.myProcNo();
+// }
+//
+// //- Return neigbour processor number
+// virtual int neighbProcNo() const
+// {
+// return procInterface_.neighbProcNo();
+// }
+//
+// //- Does the interface field perform the transfromation
+// virtual bool doTransform() const
+// {
+// return doTransform_;
+// }
+//
+// //- Return face transformation tensor
+// virtual const tensorField& forwardT() const
+// {
+// return procInterface_.forwardT();
+// }
+//
+// //- Return rank of component for transform
+// virtual int rank() const
+// {
+// return rank_;
+// }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index 7a156edc383fdb6d39d34654b5641bf7aa64ed73..baad87d6d83eb9fd3c46e6ae3858c83abe3810da 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -36,8 +36,8 @@ SourceFiles
#ifndef GAMGInterface_H
#define GAMGInterface_H
-#include "lduInterface.H"
#include "autoPtr.H"
+#include "lduInterfacePtrsList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,6 +57,12 @@ protected:
// Protected data
+ //- My index in coarseInterfaces
+ const label index_;
+
+ //- All interfaces
+ const lduInterfacePtrsList& coarseInterfaces_;
+
//- Face-cell addressing
labelField faceCells_;
@@ -89,11 +95,15 @@ public:
GAMGInterface,
lduInterface,
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& localRestrictAddressing,
const labelField& neighbourRestrictAddressing
),
(
+ index,
+ coarseInterfaces,
fineInterface,
localRestrictAddressing,
neighbourRestrictAddressing
@@ -107,6 +117,8 @@ public:
// the fine interface
static autoPtr<GAMGInterface> New
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& localRestrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -119,10 +131,15 @@ public:
// local and neighbour restrict addressing
GAMGInterface
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface&,
const labelField&,
const labelField&
)
+ :
+ index_(index),
+ coarseInterfaces_(coarseInterfaces)
{}
@@ -136,6 +153,16 @@ public:
return faceCells_.size();
}
+ virtual label index() const
+ {
+ return index_;
+ }
+
+ virtual const lduInterfacePtrsList& coarseInterfaces() const
+ {
+ return coarseInterfaces_;
+ }
+
//- Return faceCell addressing
virtual const unallocLabelList& faceCells() const
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
index 6c4bed75238f752851edfd53bfee87d1d867dd8a..28f6e0481afbfa8be14fc085fc1160df63204822 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
@@ -31,6 +31,8 @@ License
Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& localRestrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -59,6 +61,8 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
(
cstrIter()
(
+ index,
+ coarseInterfaces,
fineInterface,
localRestrictAddressing,
neighbourRestrictAddressing
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 fa55f71e7289a85dcd4fa40f4f0df065dc345c9f..2aac532ce1665084f5c9d0d44a9a28447874ce7c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -25,6 +25,7 @@ License
#include "cyclicGAMGInterface.H"
#include "addToRunTimeSelectionTable.H"
+#include "Map.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -44,6 +45,8 @@ namespace Foam
Foam::cyclicGAMGInterface::cyclicGAMGInterface
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& localRestrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -51,6 +54,8 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
:
GAMGInterface
(
+ index,
+ coarseInterfaces,
fineInterface,
localRestrictAddressing,
neighbourRestrictAddressing
@@ -58,33 +63,45 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
fineCyclicInterface_(refCast<const cyclicLduInterface>(fineInterface))
{
// Make a lookup table of entries for owner/neighbour
- HashTable<SLList<label>, label, Hash<label> > neighboursTable
+ Map<SLList<label> > neighboursTable
(
localRestrictAddressing.size()
);
// Table of face-sets to be agglomerated
- HashTable<SLList<SLList<label> >, label, Hash<label> > faceFaceTable
+ Map<SLList<SLList<label> > > faceFaceTable
(
localRestrictAddressing.size()
);
label nCoarseFaces = 0;
- label sizeBy2 = localRestrictAddressing.size()/2;
-
- for (label ffi=0; ffi<sizeBy2; ffi++)
+ forAll (localRestrictAddressing, ffi)
{
- label curMaster = localRestrictAddressing[ffi];
- label curSlave = localRestrictAddressing[ffi + sizeBy2];
+ label curMaster = -1;
+ label curSlave = -1;
+
+ // Do switching on master/slave indexes based on the owner/neighbour of
+ // the processor index such that both sides get the same answer.
+ if (owner())
+ {
+ // Master side
+ curMaster = localRestrictAddressing[ffi];
+ curSlave = neighbourRestrictAddressing[ffi];
+ }
+ else
+ {
+ // Slave side
+ curMaster = neighbourRestrictAddressing[ffi];
+ curSlave = localRestrictAddressing[ffi];
+ }
// Look for the master cell. If it has already got a face,
- // add the coefficient to the face. If not, create a new
- // face.
+ // add the coefficient to the face. If not, create a new face.
if (neighboursTable.found(curMaster))
{
- // Check all current neighbours to see if the current
- // slave already exists. If so, add the coefficient.
+ // Check all current neighbours to see if the current slave already
+ // exists and if so, add the fine face to the agglomeration.
SLList<label>& curNbrs = neighboursTable.find(curMaster)();
@@ -135,69 +152,86 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
} // end for all fine faces
- faceCells_.setSize(2*nCoarseFaces, -1);
- faceRestrictAddressing_.setSize(localRestrictAddressing.size(), -1);
+
+ faceCells_.setSize(nCoarseFaces, -1);
+ faceRestrictAddressing_.setSize(localRestrictAddressing.size());
labelList contents = neighboursTable.toc();
// Reset face counter for re-use
nCoarseFaces = 0;
- // On master side, the owner addressing is stored in table of contents
- forAll(contents, masterI)
+ if (owner())
{
- SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
-
- SLList<SLList<label> >& curFaceFaces =
- faceFaceTable.find(contents[masterI])();
+ // On master side, the owner addressing is stored in table of contents
+ forAll (contents, masterI)
+ {
+ SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
- SLList<label>::iterator nbrsIter = curNbrs.begin();
- SLList<SLList<label> >::iterator faceFacesIter = curFaceFaces.begin();
+ SLList<SLList<label> >& curFaceFaces =
+ faceFaceTable.find(contents[masterI])();
- for
- (
- ;
- nbrsIter != curNbrs.end(), faceFacesIter != curFaceFaces.end();
- ++nbrsIter, ++faceFacesIter
- )
- {
- faceCells_[nCoarseFaces] = contents[masterI];
+ SLList<label>::iterator nbrsIter = curNbrs.begin();
+ SLList<SLList<label> >::iterator faceFacesIter = curFaceFaces.begin();
- forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
+ for
+ (
+ ;
+ nbrsIter != curNbrs.end(), faceFacesIter != curFaceFaces.end();
+ ++nbrsIter, ++faceFacesIter
+ )
{
- faceRestrictAddressing_[facesIter()] = nCoarseFaces;
- }
+ faceCells_[nCoarseFaces] = contents[masterI];
+
+ for
+ (
+ SLList<label>::iterator facesIter = faceFacesIter().begin();
+ facesIter != faceFacesIter().end();
+ ++facesIter
+ )
+ {
+ faceRestrictAddressing_[facesIter()] = nCoarseFaces;
+ }
- nCoarseFaces++;
+ nCoarseFaces++;
+ }
}
}
-
- // On slave side, the owner addressing is stored in linked lists
- forAll(contents, masterI)
+ else
{
- SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
+ // On slave side, the owner addressing is stored in linked lists
+ forAll (contents, masterI)
+ {
+ SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
- SLList<SLList<label> >& curFaceFaces =
- faceFaceTable.find(contents[masterI])();
+ SLList<SLList<label> >& curFaceFaces =
+ faceFaceTable.find(contents[masterI])();
- SLList<label>::iterator nbrsIter = curNbrs.begin();
- SLList<SLList<label> >::iterator faceFacesIter = curFaceFaces.begin();
+ SLList<label>::iterator nbrsIter = curNbrs.begin();
- for
- (
- ;
- nbrsIter != curNbrs.end(), faceFacesIter != curFaceFaces.end();
- ++nbrsIter, ++faceFacesIter
- )
- {
- faceCells_[nCoarseFaces] = nbrsIter();
+ SLList<SLList<label> >::iterator faceFacesIter = curFaceFaces.begin();
- forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
+ for
+ (
+ ;
+ nbrsIter != curNbrs.end(), faceFacesIter != curFaceFaces.end();
+ ++nbrsIter, ++faceFacesIter
+ )
{
- faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces;
- }
+ faceCells_[nCoarseFaces] = nbrsIter();
+
+ for
+ (
+ SLList<label>::iterator facesIter = faceFacesIter().begin();
+ facesIter != faceFacesIter().end();
+ ++facesIter
+ )
+ {
+ faceRestrictAddressing_[facesIter()] = nCoarseFaces;
+ }
- nCoarseFaces++;
+ nCoarseFaces++;
+ }
}
}
}
@@ -211,42 +245,24 @@ Foam::cyclicGAMGInterface::~cyclicGAMGInterface()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::transfer
-(
- const Pstream::commsTypes,
- const unallocLabelList& interfaceData
-) const
-{
- tmp<labelField> tpnf(new labelField(size()));
- labelField& pnf = tpnf();
-
- label sizeby2 = size()/2;
-
- for (label facei=0; facei<sizeby2; facei++)
- {
- pnf[facei] = interfaceData[facei + sizeby2];
- pnf[facei + sizeby2] = interfaceData[facei];
- }
-
- return tpnf;
-}
-
-
Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::internalFieldTransfer
(
const Pstream::commsTypes,
const unallocLabelList& iF
) const
{
+ const cyclicGAMGInterface& nbr = dynamic_cast<const cyclicGAMGInterface&>
+ (
+ neighbPatch()
+ );
+ const unallocLabelList& nbrFaceCells = nbr.faceCells();
+
tmp<labelField> tpnf(new labelField(size()));
labelField& pnf = tpnf();
- label sizeby2 = size()/2;
-
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(pnf, facei)
{
- pnf[facei] = iF[faceCells_[facei + sizeby2]];
- pnf[facei + sizeby2] = iF[faceCells_[facei]];
+ pnf[facei] = iF[nbrFaceCells[facei]];
}
return tpnf;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index d912cb313cf5591d3d417b59de77511b015a77c7..c24d5fdca70360b24a2001e8c526a8e63e799023 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -80,6 +80,8 @@ public:
// local and neighbour restrict addressing
cyclicGAMGInterface
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& restrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -94,13 +96,6 @@ public:
// Interface transfer functions
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
//- Transfer and return internal field adjacent to the interface
virtual tmp<labelField> internalFieldTransfer
(
@@ -111,6 +106,25 @@ public:
//- Cyclic interface functions
+ //- Return neigbour processor number
+ virtual label neighbPatchID() const
+ {
+ return fineCyclicInterface_.neighbPatchID();
+ }
+
+ virtual bool owner() const
+ {
+ return fineCyclicInterface_.owner();
+ }
+
+ virtual const cyclicGAMGInterface& neighbPatch() const
+ {
+ return dynamic_cast<const cyclicGAMGInterface&>
+ (
+ coarseInterfaces_[neighbPatchID()]
+ );
+ }
+
//- Return face transformation tensor
virtual const tensorField& forwardT() const
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
new file mode 100644
index 0000000000000000000000000000000000000000..8d23ef8c2d0331a60443da0158a7059b8ee7a8c8
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.C
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicGAMGInterface.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Map.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(processorCyclicGAMGInterface, 0);
+ addToRunTimeSelectionTable
+ (
+ GAMGInterface,
+ processorCyclicGAMGInterface,
+ lduInterface
+ );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::processorCyclicGAMGInterface::processorCyclicGAMGInterface
+(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
+ const lduInterface& fineInterface,
+ const labelField& localRestrictAddressing,
+ const labelField& neighbourRestrictAddressing
+)
+:
+ processorGAMGInterface
+ (
+ index,
+ coarseInterfaces,
+ fineInterface,
+ localRestrictAddressing,
+ neighbourRestrictAddressing
+ )
+{}
+
+
+// * * * * * * * * * * * * * * * * Desstructor * * * * * * * * * * * * * * * //
+
+Foam::processorCyclicGAMGInterface::~processorCyclicGAMGInterface()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
new file mode 100644
index 0000000000000000000000000000000000000000..f2aa0a68d0d2000dfdf0604e5bab9739e7ad01df
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicGAMGInterface
+
+Description
+ GAMG agglomerated processor interface.
+
+SourceFiles
+ processorCyclicGAMGInterface.C
+ processorCyclicGAMGInterfaceTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicGAMGInterface_H
+#define processorCyclicGAMGInterface_H
+
+#include "processorGAMGInterface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicGAMGInterface Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorCyclicGAMGInterface
+:
+ public processorGAMGInterface
+{
+ // Private Member Functions
+
+ //- Disallow default bitwise copy construct
+ processorCyclicGAMGInterface(const processorCyclicGAMGInterface&);
+
+ //- Disallow default bitwise assignment
+ void operator=(const processorCyclicGAMGInterface&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("processorCyclic");
+
+ // Constructors
+
+ //- Construct from fine-level interface,
+ // local and neighbour restrict addressing
+ processorCyclicGAMGInterface
+ (
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
+ const lduInterface& fineInterface,
+ const labelField& restrictAddressing,
+ const labelField& neighbourRestrictAddressing
+ );
+
+
+ // Destructor
+
+ virtual ~processorCyclicGAMGInterface();
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index 1d79ac018efaabb66ca822a1135cbe91b95da472..dc6aaed58920c15d18c6469a15f8b5ec8aa40996 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -25,6 +25,7 @@ License
#include "processorGAMGInterface.H"
#include "addToRunTimeSelectionTable.H"
+#include "Map.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -44,6 +45,8 @@ namespace Foam
Foam::processorGAMGInterface::processorGAMGInterface
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& localRestrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -51,6 +54,8 @@ Foam::processorGAMGInterface::processorGAMGInterface
:
GAMGInterface
(
+ index,
+ coarseInterfaces,
fineInterface,
localRestrictAddressing,
neighbourRestrictAddressing
@@ -58,13 +63,13 @@ Foam::processorGAMGInterface::processorGAMGInterface
fineProcInterface_(refCast<const processorLduInterface>(fineInterface))
{
// Make a lookup table of entries for owner/neighbour
- HashTable<SLList<label>, label, Hash<label> > neighboursTable
+ Map<SLList<label> > neighboursTable
(
localRestrictAddressing.size()
);
// Table of face-sets to be agglomerated
- HashTable<SLList<SLList<label> >, label, Hash<label> > faceFaceTable
+ Map<SLList<SLList<label> > > faceFaceTable
(
localRestrictAddressing.size()
);
@@ -233,26 +238,6 @@ Foam::processorGAMGInterface::~processorGAMGInterface()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::processorGAMGInterface::initTransfer
-(
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
-) const
-{
- send(commsType, interfaceData);
-}
-
-
-Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::transfer
-(
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
-) const
-{
- return receive<label>(commsType, this->size());
-}
-
-
void Foam::processorGAMGInterface::initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 6d24e82db0da11d57d8438ae5cd345fd7a7aa1ae..be738700e6ea89bdce98d5548ba1e898ffb9f9e5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -80,6 +80,8 @@ public:
// local and neighbour restrict addressing
processorGAMGInterface
(
+ const label index,
+ const lduInterfacePtrsList& coarseInterfaces,
const lduInterface& fineInterface,
const labelField& restrictAddressing,
const labelField& neighbourRestrictAddressing
@@ -94,20 +96,6 @@ public:
// Interface transfer functions
- //- Initialise interface data transfer
- virtual void initTransfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
@@ -142,6 +130,12 @@ public:
{
return fineProcInterface_.forwardT();
}
+
+ //- Return message tag used for sending
+ virtual int tag() const
+ {
+ return fineProcInterface_.tag();
+ }
};
diff --git a/src/finiteVolume/finiteVolume/fvData/fvData.C b/src/OpenFOAM/meshes/data/data.C
similarity index 87%
rename from src/finiteVolume/finiteVolume/fvData/fvData.C
rename to src/OpenFOAM/meshes/data/data.C
index e662c3d3940b9d84b2f5d552ade056d46c88ad59..6e8813f7792557f04e3e6c2ebb8a9d07b10fe196 100644
--- a/src/finiteVolume/finiteVolume/fvData/fvData.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -23,23 +23,23 @@ License
\*---------------------------------------------------------------------------*/
-#include "fvData.H"
+#include "data.H"
#include "Time.H"
#include "lduMatrix.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-int Foam::fvData::debug(Foam::debug::debugSwitch("fvData", false));
+int Foam::data::debug(Foam::debug::debugSwitch("data", false));
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::fvData::fvData(const objectRegistry& obr)
+Foam::data::data(const objectRegistry& obr)
:
IOdictionary
(
IOobject
(
- "fvData",
+ "data",
obr.time().system(),
obr,
IOobject::NO_READ,
@@ -53,13 +53,13 @@ Foam::fvData::fvData(const objectRegistry& obr)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const Foam::dictionary& Foam::fvData::solverPerformanceDict() const
+const Foam::dictionary& Foam::data::solverPerformanceDict() const
{
return subDict("solverPerformance");
}
-void Foam::fvData::setSolverPerformance
+void Foam::data::setSolverPerformance
(
const word& name,
const lduMatrix::solverPerformance& sp
diff --git a/src/finiteVolume/finiteVolume/fvData/fvData.H b/src/OpenFOAM/meshes/data/data.H
similarity index 85%
rename from src/finiteVolume/finiteVolume/fvData/fvData.H
rename to src/OpenFOAM/meshes/data/data.H
index ab6c27e33b4490c5183194dca6913b9860fd9148..c8e6f98421c5f2cc5d772b79179e017aa9055be0 100644
--- a/src/finiteVolume/finiteVolume/fvData/fvData.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -22,20 +22,21 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::fvData
+ Foam::data
Description
- Database for finite volume solution data, solver performance and
- other reduced data. fvMesh is derived from fvData so that all fields have
- access to the fvData from the mesh reference they hold.
+ Database for solution data, solver performance and other reduced data.
+
+ fvMesh is derived from data so that all fields have access to the data from
+ the mesh reference they hold.
SourceFiles
- fvData.C
+ data.C
\*---------------------------------------------------------------------------*/
-#ifndef fvData_H
-#define fvData_H
+#ifndef data_H
+#define data_H
#include "IOdictionary.H"
#include "lduMatrix.H"
@@ -46,20 +47,20 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class fvData Declaration
+ Class data Declaration
\*---------------------------------------------------------------------------*/
-class fvData
+class data
:
public IOdictionary
{
// Private Member Functions
//- Disallow default bitwise copy construct
- fvData(const fvData&);
+ data(const data&);
//- Disallow default bitwise assignment
- void operator=(const fvData&);
+ void operator=(const data&);
public:
@@ -71,7 +72,7 @@ public:
// Constructors
//- Construct for objectRegistry
- fvData(const objectRegistry& obr);
+ data(const objectRegistry& obr);
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
index 58078a615ca0c4ebf5720d415b085f34691d2de0..7a703c260762ff5cce205998023b835b92b89396 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
@@ -51,28 +51,7 @@ void Foam::cyclicPointPatch::initGeometry(PstreamBuffers&)
void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&)
-{
- const edgeList& cp = cyclicPolyPatch_.coupledPoints();
- const labelList& mp = cyclicPolyPatch_.meshPoints();
-
- DynamicList<label> separated;
- forAll(cp, i)
- {
- const edge& coupledSet = cp[i];
-
- // Assume all points are separated.
- separated.append(coupledSet[0]);
- separated.append(coupledSet[1]);
- }
- separatedPoints_.transfer(separated);
-
- if (debug)
- {
- Pout<< "cyclic:" << cyclicPolyPatch_.name()
- << " separated:" << separatedPoints_.size()
- << " out of points:" << mp.size() << endl;
- }
-}
+{}
void Foam::cyclicPointPatch::initMovePoints(PstreamBuffers&, const pointField&)
@@ -124,10 +103,4 @@ const Foam::edgeList& Foam::cyclicPointPatch::transformPairs() const
}
-const Foam::labelList& Foam::cyclicPointPatch::separatedPoints() const
-{
- return separatedPoints_;
-}
-
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
index 2682c194c8ecb921db0ba971ba5e97025435b74c..8e1849a52c01aea614a820c439f92774490aecd2 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
@@ -37,6 +37,7 @@ SourceFiles
#include "coupledFacePointPatch.H"
#include "cyclicPolyPatch.H"
+#include "pointBoundaryMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,8 +57,6 @@ class cyclicPointPatch
//- Local reference cast into the cyclic patch
const cyclicPolyPatch& cyclicPolyPatch_;
- //- List of local points that are not collocated
- mutable labelList separatedPoints_;
// Private Member Functions
@@ -125,6 +124,14 @@ public:
return cyclicPolyPatch_;
}
+ //- Return neighbour point patch
+ const cyclicPointPatch& neighbPatch() const
+ {
+ label patchI = cyclicPolyPatch_.neighbPatchID();
+ const pointPatch& pp = this->boundaryMesh()[patchI];
+ return refCast<const cyclicPointPatch>(pp);
+ }
+
//- Are the cyclic planes parallel
bool parallel() const
{
@@ -147,11 +154,10 @@ public:
// Access functions for demand driven data
//- Return the set of pairs of points that require transformation
- // and/or mapping
+ // and/or mapping. First index is on this patch, second on the
+ // neighbour patch.
virtual const edgeList& transformPairs() const;
- //- List of separated coupled points
- virtual const labelList& separatedPoints() const;
};
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..6b5a56abd02fe3a7d7de28bfdf6cb00023ab549d
--- /dev/null
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipPointPatch.H"
+#include "pointConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(cyclicSlipPointPatch, 0);
+
+// Add the patch constructor functions to the hash tables
+addToRunTimeSelectionTable
+(
+ facePointPatch,
+ cyclicSlipPointPatch,
+ polyPatch
+);
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+const vectorField& cyclicSlipPointPatch::pointNormals() const
+{
+ // Use underlying patch normals
+ return refCast<const facePointPatch>
+ (
+ *this
+ ).facePointPatch::pointNormals();
+}
+
+
+void cyclicSlipPointPatch::applyConstraint
+(
+ const label pointi,
+ pointConstraint& pc
+) const
+{
+ pc.applyConstraint(pointNormals()[pointi]);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..4f366acc4608105ca1c059937884de0015595278
--- /dev/null
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclicSlip/cyclicSlipPointPatch.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::cyclicSlipPointPatch
+
+Description
+ Cyclic patch with slip constraint
+
+SourceFiles
+ cyclicSlipPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipPointPatch_H
+#define cyclicSlipPointPatch_H
+
+#include "cyclicPointPatch.H"
+#include "cyclicSlipPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cyclicSlipPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class cyclicSlipPointPatch
+:
+ public cyclicPointPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(cyclicSlipPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from components
+ cyclicSlipPointPatch
+ (
+ const polyPatch& patch,
+ const pointBoundaryMesh& bm
+ )
+ :
+ cyclicPointPatch(patch, bm)
+ {}
+
+
+ // Destructor
+
+ virtual ~cyclicSlipPointPatch()
+ {}
+
+
+ // Member Functions
+
+ //- Return point unit normals.
+ virtual const vectorField& pointNormals() const;
+
+ //- Accumulate the effect of constraint direction of this patch
+ virtual void applyConstraint
+ (
+ const label pointi,
+ pointConstraint&
+ ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
index 79faa898cb5dea58bd12aed855b035782486ca89..da6fa3822fcfbdca1025533fb23321ae25ae6939 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
@@ -73,51 +73,7 @@ void Foam::processorPointPatch::initGeometry(PstreamBuffers& pBufs)
void Foam::processorPointPatch::calcGeometry(PstreamBuffers& pBufs)
-{
- if (Pstream::parRun())
- {
- const boolList& collocated = procPolyPatch_.collocated();
-
- if (collocated.size() == 0)
- {
- separatedPoints_.setSize(0);
- }
- else if (collocated.size() == 1)
- {
- // Uniformly
- if (collocated[0])
- {
- separatedPoints_.setSize(0);
- }
- else
- {
- separatedPoints_ = identity(size());
- }
- }
- else
- {
- // Per face collocated or not.
- const labelListList& pointFaces = procPolyPatch_.pointFaces();
-
- DynamicList<label> separated;
- forAll(pointFaces, pfi)
- {
- if (!collocated[pointFaces[pfi][0]])
- {
- separated.append(pfi);
- }
- }
- separatedPoints_.transfer(separated);
- }
- }
-
- if (debug)
- {
- Pout<< "processor:" << name()
- << " separated:" << separatedPoints_.size()
- << " out of points:" << size() << endl;
- }
-}
+{}
void Foam::processorPointPatch::initMovePoints
@@ -173,10 +129,4 @@ const Foam::labelList& Foam::processorPointPatch::reverseMeshPoints() const
}
-const Foam::labelList& Foam::processorPointPatch::separatedPoints() const
-{
- return separatedPoints_;
-}
-
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
index 1654b58d4bf03582abfbaad1bd47aaa9cf0408a8..97faee107b18eb96787641dcc2866f2893beb227 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
@@ -65,7 +65,6 @@ class processorPointPatch
mutable labelList reverseMeshPoints_;
- mutable labelList separatedPoints_;
// Private Member Functions
@@ -129,6 +128,12 @@ public:
}
}
+ //- Return message tag to use for communication
+ virtual int tag() const
+ {
+ return procPolyPatch_.tag();
+ }
+
//- Return the constraint type this pointPatch implements.
virtual const word& constraintType() const
{
@@ -168,9 +173,6 @@ public:
//- Return mesh points in the correct order for the receiving side
const labelList& reverseMeshPoints() const;
- //- List of separated coupled points
- virtual const labelList& separatedPoints() const;
-
};
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..363ae015dca105ad388857eaa8e658d860ddab70
--- /dev/null
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C
@@ -0,0 +1,399 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicPointPatch.H"
+#include "pointBoundaryMesh.H"
+#include "addToRunTimeSelectionTable.H"
+//#include "pointMesh.H"
+//#include "globalPointPatch.H"
+//#include "faceList.H"
+//#include "primitiveFacePatch.H"
+//#include "emptyPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(processorCyclicPointPatch, 0);
+
+addToRunTimeSelectionTable
+(
+ facePointPatch,
+ processorCyclicPointPatch,
+ polyPatch
+);
+
+
+// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
+
+//void Foam::processorCyclicPointPatch::initGeometry(PstreamBuffers& pBufs)
+//{
+// // Algorithm:
+// // Depending on whether the patch is a master or a slave, get the primitive
+// // patch points and filter away the points from the global patch.
+//
+// if (isMaster())
+// {
+// meshPoints_ = procPolyPatch_.meshPoints();
+// }
+// else
+// {
+// // Slave side. Create the reversed patch and pick up its points
+// // so that the order is correct
+// const polyPatch& pp = patch();
+//
+// faceList masterFaces(pp.size());
+//
+// forAll (pp, faceI)
+// {
+// masterFaces[faceI] = pp[faceI].reverseFace();
+// }
+//
+// meshPoints_ = primitiveFacePatch
+// (
+// masterFaces,
+// pp.points()
+// ).meshPoints();
+// }
+//
+// if (Pstream::parRun())
+// {
+// initPatchPatchPoints(pBufs);
+// }
+//}
+//
+//
+//void Foam::processorCyclicPointPatch::calcGeometry(PstreamBuffers& pBufs)
+//{
+// if (Pstream::parRun())
+// {
+// calcPatchPatchPoints(pBufs);
+// }
+//
+// // If it is not runing parallel or there are no global points
+// // create a 1->1 map
+// if
+// (
+// !Pstream::parRun()
+// || !boundaryMesh().mesh().globalData().nGlobalPoints()
+// )
+// {
+// nonGlobalPatchPoints_.setSize(meshPoints_.size());
+// forAll(nonGlobalPatchPoints_, i)
+// {
+// nonGlobalPatchPoints_[i] = i;
+// }
+// }
+// else
+// {
+// // Get reference to shared points
+// const labelList& sharedPoints =
+// boundaryMesh().globalPatch().meshPoints();
+//
+// nonGlobalPatchPoints_.setSize(meshPoints_.size());
+//
+// label noFiltPoints = 0;
+//
+// forAll (meshPoints_, pointI)
+// {
+// label curP = meshPoints_[pointI];
+//
+// bool found = false;
+//
+// forAll (sharedPoints, sharedI)
+// {
+// if (sharedPoints[sharedI] == curP)
+// {
+// found = true;
+// break;
+// }
+// }
+//
+// if (!found)
+// {
+// nonGlobalPatchPoints_[noFiltPoints] = pointI;
+// meshPoints_[noFiltPoints] = curP;
+// noFiltPoints++;
+// }
+// }
+//
+// nonGlobalPatchPoints_.setSize(noFiltPoints);
+// meshPoints_.setSize(noFiltPoints);
+// }
+//}
+//
+//
+//void processorCyclicPointPatch::initPatchPatchPoints(PstreamBuffers& pBufs)
+//{
+// if (debug)
+// {
+// Info<< "processorCyclicPointPatch::initPatchPatchPoints(PstreamBuffers&) : "
+// << "constructing patch-patch points"
+// << endl;
+// }
+//
+// const polyBoundaryMesh& bm = boundaryMesh().mesh()().boundaryMesh();
+//
+// // Get the mesh points for this patch corresponding to the faces
+// const labelList& ppmp = meshPoints();
+//
+// // Create a HashSet of the point labels for this patch
+// Map<label> patchPointSet(2*ppmp.size());
+//
+// forAll (ppmp, ppi)
+// {
+// patchPointSet.insert(ppmp[ppi], ppi);
+// }
+//
+//
+// // Create the lists of patch-patch points
+// labelListList patchPatchPoints(bm.size());
+//
+// // Create the lists of patch-patch point normals
+// List<List<vector> > patchPatchPointNormals(bm.size());
+//
+// // Loop over all patches looking for other patches that share points
+// forAll(bm, patchi)
+// {
+// if
+// (
+// patchi != index() // Ignore self-self
+// && !isA<emptyPolyPatch>(bm[patchi]) // Ignore empty
+// && !bm[patchi].coupled() // Ignore other couples
+// )
+// {
+// // Get the meshPoints for the other patch
+// const labelList& meshPoints = bm[patchi].meshPoints();
+//
+// // Get the normals for the other patch
+// const vectorField& normals = bm[patchi].pointNormals();
+//
+// label pppi = 0;
+// forAll(meshPoints, pointi)
+// {
+// label ppp = meshPoints[pointi];
+//
+// // Check to see if the point of the other patch is shared with
+// // this patch
+// Map<label>::iterator iter = patchPointSet.find(ppp);
+//
+// if (iter != patchPointSet.end())
+// {
+// // If it is shared initialise the patchPatchPoints for this
+// // patch
+// if (!patchPatchPoints[patchi].size())
+// {
+// patchPatchPoints[patchi].setSize(ppmp.size());
+// patchPatchPointNormals[patchi].setSize(ppmp.size());
+// }
+//
+// // and add the entry
+// patchPatchPoints[patchi][pppi] = iter();
+// patchPatchPointNormals[patchi][pppi] = normals[pointi];
+// pppi++;
+// }
+// }
+//
+// // Resise the list of shared points and normals for the patch
+// // being considerd
+// patchPatchPoints[patchi].setSize(pppi);
+// patchPatchPointNormals[patchi].setSize(pppi);
+// }
+// }
+//
+// // Send the patchPatchPoints to the neighbouring processor
+//
+// UOPstream toNeighbProc(neighbProcNo(), pBufs);
+//
+// toNeighbProc
+// << ppmp.size() // number of points for checking
+// << patchPatchPoints
+// << patchPatchPointNormals;
+//
+// if (debug)
+// {
+// Info<< "processorCyclicPointPatch::initPatchPatchPoints() : "
+// << "constructed patch-patch points"
+// << endl;
+// }
+//}
+//
+//
+//void Foam::processorCyclicPointPatch::calcPatchPatchPoints(PstreamBuffers& pBufs)
+//{
+// // Get the patchPatchPoints from the neighbouring processor
+// UIPstream fromNeighbProc(neighbProcNo(), pBufs);
+//
+// label nbrNPoints(readLabel(fromNeighbProc));
+// labelListList patchPatchPoints(fromNeighbProc);
+// List<List<vector> > patchPatchPointNormals(fromNeighbProc);
+//
+// pointBoundaryMesh& pbm = const_cast<pointBoundaryMesh&>(boundaryMesh());
+// const labelList& ppmp = meshPoints();
+//
+// // Simple check for the very rare situation when not the same number
+// // of points on both sides. This can happen with decomposed cyclics.
+// // If on one side the cyclic shares a point with proc faces coming from
+// // internal faces it will have a different number of points from
+// // the situation where the cyclic and the 'normal' proc faces are fully
+// // separate.
+// if (nbrNPoints != ppmp.size())
+// {
+// WarningIn("processorCyclicPointPatch::calcPatchPatchPoints(PstreamBuffers&)")
+// << "Processor patch " << name()
+// << " has " << ppmp.size() << " points; coupled patch has "
+// << nbrNPoints << " points." << endl
+// << " (usually due to decomposed cyclics)."
+// << " This might give problems" << endl
+// << " when using point fields (interpolation, mesh motion)."
+// << endl;
+// }
+//
+//
+//
+// // Loop over the patches looking for other patches that share points
+// forAll(patchPatchPoints, patchi)
+// {
+// const labelList& patchPoints = patchPatchPoints[patchi];
+// const List<vector>& patchPointNormals = patchPatchPointNormals[patchi];
+//
+// // If there are potentially shared points for the patch being considered
+// if (patchPoints.size())
+// {
+// // Get the current meshPoints list for the patch
+// facePointPatch& fpp = refCast<facePointPatch>(pbm[patchi]);
+// const labelList& fmp = fpp.meshPoints();
+// labelList& mp = fpp.meshPoints_;
+//
+// const vectorField& fnormals = fpp.pointNormals();
+// vectorField& normals = fpp.pointNormals_;
+//
+// // Create a HashSet of the point labels for the patch
+// Map<label> patchPointSet(2*fmp.size());
+//
+// forAll (fmp, ppi)
+// {
+// patchPointSet.insert(fmp[ppi], ppi);
+// }
+//
+// label nPoints = mp.size();
+// label lpi = 0;
+// bool resized = false;
+//
+// // For each potentially shared point...
+// forAll(patchPoints, ppi)
+// {
+// // Check if it is not already in the patch,
+// // i.e. not part of a face of the patch
+// if (!patchPointSet.found(ppmp[patchPoints[ppi]]))
+// {
+// // If it isn't already in the patch check if the local
+// // meshPoints is already set and if not initialise the
+// // meshPoints_ and pointNormals_
+// if (!resized)
+// {
+// if (!mp.size() && fmp.size())
+// {
+// mp = fmp;
+// normals = fnormals;
+//
+// nPoints = mp.size();
+// }
+//
+// mp.setSize(nPoints + patchPoints.size());
+// loneMeshPoints_.setSize(patchPoints.size());
+// normals.setSize(nPoints + patchPoints.size());
+// resized = true;
+// }
+//
+// // Add the new point to the patch
+// mp[nPoints] = ppmp[patchPoints[ppi]];
+// loneMeshPoints_[lpi++] = ppmp[patchPoints[ppi]];
+// normals[nPoints++] = patchPointNormals[ppi];
+// }
+// }
+//
+// // If the lists have been resized points have been added.
+// // Shrink the lists to the current size.
+// if (resized)
+// {
+// mp.setSize(nPoints);
+// loneMeshPoints_.setSize(lpi);
+// normals.setSize(nPoints);
+// }
+// }
+// }
+//}
+
+
+//void processorCyclicPointPatch::initMovePoints(PstreamBuffers&, const pointField&)
+//{}
+//
+//
+//void processorCyclicPointPatch::movePoints(PstreamBuffers&, const pointField&)
+//{}
+//
+//
+//void processorCyclicPointPatch::initUpdateMesh(PstreamBuffers& pBufs)
+//{
+// facePointPatch::initUpdateMesh(pBufs);
+// processorCyclicPointPatch::initGeometry(pBufs);
+//}
+//
+//
+//void processorCyclicPointPatch::updateMesh(PstreamBuffers& pBufs)
+//{
+// facePointPatch::updateMesh(pBufs);
+// processorCyclicPointPatch::calcGeometry(pBufs);
+//}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+processorCyclicPointPatch::processorCyclicPointPatch
+(
+ const polyPatch& patch,
+ const pointBoundaryMesh& bm
+)
+:
+ processorPointPatch(patch, bm),
+ procCycPolyPatch_(refCast<const processorCyclicPolyPatch>(patch))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+processorCyclicPointPatch::~processorCyclicPointPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..a89102fbb292089db13f20dd5c0bdaff4756507a
--- /dev/null
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicPointPatch
+
+Description
+ Processor patch boundary needs to be such that the ordering of
+ points in the patch is the same on both sides.
+
+ Looking at the creation of the faces on both sides of the processor
+ patch they need to be identical on both sides with the normals pointing
+ in opposite directions. This is achieved by calling the reverseFace
+ function in the decomposition. It is therefore possible to re-create
+ the ordering of patch points on the slave side by reversing all the
+ patch faces of the owner.
+
+SourceFiles
+ processorCyclicPointPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicPointPatch_H
+#define processorCyclicPointPatch_H
+
+#include "processorPointPatch.H"
+#include "processorCyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicPointPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorCyclicPointPatch
+:
+ public processorPointPatch
+{
+ // Private data
+
+ const processorCyclicPolyPatch& procCycPolyPatch_;
+
+ //- Disallow default construct as copy
+ processorCyclicPointPatch(const processorCyclicPointPatch&);
+
+ //- Disallow default assignment
+ void operator=(const processorCyclicPointPatch&);
+
+public:
+
+ //- Runtime type information
+ TypeName(processorCyclicPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from components
+ processorCyclicPointPatch
+ (
+ const polyPatch& patch,
+ const pointBoundaryMesh& bm
+ );
+
+
+ // Destructor
+
+ virtual ~processorCyclicPointPatch();
+
+
+ // Member functions
+
+
+ //- Return message tag to use for communication
+ virtual int tag() const
+ {
+ return procCycPolyPatch_.tag();
+ }
+
+// //- Return true if running parallel
+// virtual bool coupled() const
+// {
+// if (Pstream::parRun())
+// {
+// return true;
+// }
+// else
+// {
+// return false;
+// }
+// }
+//
+// //- Return processor number
+// int myProcNo() const
+// {
+// return procPolyPatch_.myProcNo();
+// }
+//
+// //- Return neigbour processor number
+// int neighbProcNo() const
+// {
+// return procPolyPatch_.neighbProcNo();
+// }
+//
+// //- Is this a master patch
+// bool isMaster() const
+// {
+// return myProcNo() < neighbProcNo();
+// }
+//
+// //- Is this a slave patch
+// bool isSlave() const
+// {
+// return !isMaster();
+// }
+//
+ //- Return the underlying processorCyclicPolyPatch
+ const processorCyclicPolyPatch& procCyclicPolyPatch() const
+ {
+ return procCycPolyPatch_;
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
index 7237290e0409fec51dfb40d8f71aac9ed14b5a21..278b56c07711431ed24ee680f13dc75da72633b7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
@@ -108,8 +108,6 @@ public:
return true;
}
- //- List of separated coupled points
- virtual const labelList& separatedPoints() const = 0;
};
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 3931db5b6a9ce0b2619f6041271cb539df069ddb..3daa288e74cf70b59c2117373b5cec2d6e5a20e0 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -77,34 +77,38 @@ void Foam::globalMeshData::initProcAddr()
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send indices of my processor patches to my neighbours
forAll(processorPatches_, i)
{
label patchi = processorPatches_[i];
- OPstream toNeighbour
+ UOPstream toNeighbour
(
- Pstream::blocking,
refCast<const processorPolyPatch>
(
mesh_.boundaryMesh()[patchi]
- ).neighbProcNo()
+ ).neighbProcNo(),
+ pBufs
);
toNeighbour << processorPatchIndices_[patchi];
}
+ pBufs.finishedSends();
+
forAll(processorPatches_, i)
{
label patchi = processorPatches_[i];
- IPstream fromNeighbour
+ UIPstream fromNeighbour
(
- Pstream::blocking,
refCast<const processorPolyPatch>
(
mesh_.boundaryMesh()[patchi]
- ).neighbProcNo()
+ ).neighbProcNo(),
+ pBufs
);
fromNeighbour >> processorPatchNeighbours_[patchi];
@@ -2000,24 +2004,10 @@ void Foam::globalMeshData::updateMesh()
{
label patchI = processorPatches_[i];
- const processorPolyPatch& procPatch =
- refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
-
- if (Pstream::myProcNo() > procPatch.neighbProcNo())
+ if (isType<processorPolyPatch>(mesh_.boundaryMesh()[patchI]))
{
- // Uncount my faces. Handle cyclics separately.
-
- if (procPatch.separated())
- {
- const vectorField& separationDist = procPatch.separation();
-
- nTotalFaces_ -= countCoincidentFaces(tolDim, separationDist);
- }
- else
- {
- // Normal, unseparated processor patch. Remove duplicates.
- nTotalFaces_ -= procPatch.size();
- }
+ // Normal, unseparated processor patch. Remove duplicates.
+ nTotalFaces_ -= mesh_.boundaryMesh()[patchI].size();
}
}
reduce(nTotalFaces_, sumOp<label>());
@@ -2060,6 +2050,8 @@ void Foam::globalMeshData::updateMesh()
pointStatus.set(meshPointI, SHARED);
}
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send patch local points
forAll(processorPatches_, i)
{
@@ -2068,11 +2060,13 @@ void Foam::globalMeshData::updateMesh()
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
- OPstream toNeighbour(Pstream::blocking, procPatch.neighbProcNo());
+ UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
toNeighbour << procPatch.localPoints();
}
+ pBufs.finishedSends();
+
// Receive patch local points and uncount if coincident (and not shared)
forAll(processorPatches_, i)
{
@@ -2081,7 +2075,7 @@ void Foam::globalMeshData::updateMesh()
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
- IPstream fromNeighbour(Pstream::blocking, procPatch.neighbProcNo());
+ UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
pointField nbrPoints(fromNeighbour);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 270be1dd77db4eee18ea8181061d1656602ac185..03070256454ae90fbeb3ae719b399b3ddb3e166e 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -25,6 +25,7 @@ License
#include "globalPoints.H"
#include "processorPolyPatch.H"
+#include "processorCyclicPolyPatch.H"
#include "cyclicPolyPatch.H"
#include "polyMesh.H"
@@ -40,45 +41,6 @@ const Foam::label Foam::globalPoints::fromCollocated = labelMax/2;
// Routines to handle global indices
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Foam::PackedBoolList Foam::globalPoints::collocatedPoints
-(
- const coupledPolyPatch& pp
-)
-{
- // Initialise to false
- PackedBoolList isCollocated(pp.nPoints());
-
- const boolList& collocated = pp.collocated();
-
- if (collocated.size() == 0)
- {
- isCollocated = 1;
- }
- else if (collocated.size() == 1)
- {
- // Uniform.
- if (collocated[0])
- {
- isCollocated = 1;
- }
- }
- else
- {
- // Per face collocated or not.
- const labelListList& pointFaces = pp.pointFaces();
-
- forAll(pointFaces, pfi)
- {
- if (collocated[pointFaces[pfi][0]])
- {
- isCollocated[pfi] = 1;
- }
- }
- }
- return isCollocated;
-}
-
-
Foam::label Foam::globalPoints::toGlobal
(
const label localPointI,
@@ -369,16 +331,9 @@ void Foam::globalPoints::initOwnPoints
|| isA<cyclicPolyPatch>(pp)
)
{
- // Find points with transforms
-
- PackedBoolList isCollocatedPoint
- (
- collocatedPoints
- (
- refCast<const coupledPolyPatch>(pp)
- )
- );
-
+ // Assume all processor points are collocated and all
+ // processorCyclic and cyclic are separated.
+ bool isCollocatedPoint = isType<processorPolyPatch>(pp);
const labelList& meshPoints = pp.meshPoints();
@@ -396,7 +351,7 @@ void Foam::globalPoints::initOwnPoints
labelList knownInfo
(
1,
- toGlobal(localPointI, isCollocatedPoint[patchPointI])
+ toGlobal(localPointI, isCollocatedPoint)
);
// Update addressing from point to index in procPoints
@@ -425,11 +380,7 @@ void Foam::globalPoints::initOwnPoints
labelList knownInfo
(
1,
- toGlobal
- (
- localPointI,
- isCollocatedPoint[boundaryPoints[i]]
- )
+ toGlobal(localPointI, isCollocatedPoint)
);
// Update addressing from point to index in procPoints
@@ -461,20 +412,21 @@ void Foam::globalPoints::sendPatchPoints
{
const polyPatch& pp = patches[patchI];
- if (Pstream::parRun() && isA<processorPolyPatch>(pp))
+ if
+ (
+ Pstream::parRun()
+ && (
+ isType<processorPolyPatch>(pp)
+ || (mergeSeparated && isA<processorCyclicPolyPatch>(pp))
+ )
+ )
{
+ // processor cyclics are considered separated, pure processor
+ // always collocated.
+
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
- PackedBoolList isCollocatedPoint
- (
- collocatedPoints
- (
- procPatch
- )
- );
-
-
// Information to send:
// patch face
DynamicList<label> patchFaces(pp.nPoints());
@@ -492,34 +444,31 @@ void Foam::globalPoints::sendPatchPoints
forAll(meshPoints, patchPointI)
{
- if (mergeSeparated || isCollocatedPoint[patchPointI])
+ label meshPointI = meshPoints[patchPointI];
+ label localPointI = meshToLocalPoint
+ (
+ meshToPatchPoint,
+ meshPointI
+ );
+
+ if (changedPoints.found(localPointI))
{
- label meshPointI = meshPoints[patchPointI];
- label localPointI = meshToLocalPoint
- (
- meshToPatchPoint,
- meshPointI
- );
+ label index = meshToProcPoint_[localPointI];
- if (changedPoints.found(localPointI))
- {
- label index = meshToProcPoint_[localPointI];
+ const labelList& knownInfo = procPoints_[index];
- const labelList& knownInfo = procPoints_[index];
+ // Add my information about localPointI to the
+ // send buffers
+ addToSend
+ (
+ pp,
+ patchPointI,
+ knownInfo,
- // Add my information about localPointI to the
- // send buffers
- addToSend
- (
- pp,
- patchPointI,
- knownInfo,
-
- patchFaces,
- indexInFace,
- allInfo
- );
- }
+ patchFaces,
+ indexInFace,
+ allInfo
+ );
}
}
@@ -560,18 +509,20 @@ void Foam::globalPoints::receivePatchPoints
{
const polyPatch& pp = patches[patchI];
- if (Pstream::parRun() && isA<processorPolyPatch>(pp))
+ if
+ (
+ Pstream::parRun()
+ && (
+ isType<processorPolyPatch>(pp)
+ || (mergeSeparated && isA<processorCyclicPolyPatch>(pp))
+ )
+ )
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
- PackedBoolList isCollocatedPoint
- (
- collocatedPoints
- (
- procPatch
- )
- );
+ // Processor patch is always collocated, processorCyclic is not.
+ bool isCollocatedPoint = isType<processorPolyPatch>(pp);
labelList patchFaces;
labelList indexInFace;
@@ -605,21 +556,13 @@ void Foam::globalPoints::receivePatchPoints
meshPointI
);
- if
- (
- storeInfo
- (
- nbrInfo[i],
- localPointI,
- isCollocatedPoint[pp.meshPointMap()[meshPointI]]
- )
- )
+ if (storeInfo(nbrInfo[i], localPointI, isCollocatedPoint))
{
changedPoints.insert(localPointI);
}
}
}
- else if (isA<cyclicPolyPatch>(pp))
+ else if (mergeSeparated && isA<cyclicPolyPatch>(pp))
{
// Handle cyclics: send lower half to upper half and vice versa.
// Or since they both are in memory just do it point by point.
@@ -627,80 +570,49 @@ void Foam::globalPoints::receivePatchPoints
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(pp);
- PackedBoolList isCollocatedPoint
- (
- collocatedPoints
- (
- cycPatch
- )
- );
-
const labelList& meshPoints = pp.meshPoints();
+ const labelList coupledMeshPoints(reverseMeshPoints(cycPatch));
- //const edgeList& connections = cycPatch.coupledPoints();
- const edgeList connections(coupledPoints(cycPatch));
-
- forAll(connections, i)
+ forAll(meshPoints, i)
{
- const edge& e = connections[i];
+ label meshPointA = meshPoints[i];
+ label meshPointB = coupledMeshPoints[i];
- if (mergeSeparated || isCollocatedPoint[e[0]])
- {
- label meshPointA = meshPoints[e[0]];
- label meshPointB = meshPoints[e[1]];
-
- label localA = meshToLocalPoint
- (
- meshToPatchPoint,
- meshPointA
- );
- label localB = meshToLocalPoint
- (
- meshToPatchPoint,
- meshPointB
- );
+ label localA = meshToLocalPoint
+ (
+ meshToPatchPoint,
+ meshPointA
+ );
+ label localB = meshToLocalPoint
+ (
+ meshToPatchPoint,
+ meshPointB
+ );
- // Do we have information on pointA?
- Map<label>::iterator procPointA =
- meshToProcPoint_.find(localA);
+ // Do we have information on pointA?
+ Map<label>::iterator procPointA =
+ meshToProcPoint_.find(localA);
- if (procPointA != meshToProcPoint_.end())
+ if (procPointA != meshToProcPoint_.end())
+ {
+ // Store A info onto pointB
+ if (storeInfo(procPoints_[procPointA()], localB, false))
{
- // Store A info onto pointB
- if
- (
- storeInfo
- (
- procPoints_[procPointA()],
- localB,
- isCollocatedPoint[e[1]]
- )
- )
- {
- changedPoints.insert(localB);
- }
+ changedPoints.insert(localB);
}
+ }
- // Same for info on pointB
- Map<label>::iterator procPointB =
- meshToProcPoint_.find(localB);
+ // Same for info on pointB
+ Map<label>::iterator procPointB =
+ meshToProcPoint_.find(localB);
- if (procPointB != meshToProcPoint_.end())
+ if (procPointB != meshToProcPoint_.end())
+ {
+ // Store B info onto pointA
+ if (storeInfo(procPoints_[procPointB()], localA, false))
{
- // Store B info onto pointA
- if
- (
- storeInfo
- (
- procPoints_[procPointB()],
- localA,
- isCollocatedPoint[e[0]]
- )
- )
- {
- changedPoints.insert(localA);
- }
+ changedPoints.insert(localA);
}
}
}
@@ -970,7 +882,14 @@ void Foam::globalPoints::sendSharedPoints
{
const polyPatch& pp = patches[patchI];
- if (Pstream::parRun() && isA<processorPolyPatch>(pp))
+ if
+ (
+ Pstream::parRun()
+ && (
+ isType<processorPolyPatch>(pp)
+ || (mergeSeparated && isA<processorCyclicPolyPatch>(pp))
+ )
+ )
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
@@ -1057,7 +976,14 @@ void Foam::globalPoints::receiveSharedPoints
{
const polyPatch& pp = patches[patchI];
- if (Pstream::parRun() && isA<processorPolyPatch>(pp))
+ if
+ (
+ Pstream::parRun()
+ && (
+ isType<processorPolyPatch>(pp)
+ || (mergeSeparated && isA<processorCyclicPolyPatch>(pp))
+ )
+ )
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
@@ -1128,19 +1054,11 @@ void Foam::globalPoints::receiveSharedPoints
}
}
}
- else if (isA<cyclicPolyPatch>(pp))
+ else if (mergeSeparated && isA<cyclicPolyPatch>(pp))
{
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(pp);
- PackedBoolList isCollocatedPoint
- (
- collocatedPoints
- (
- cycPatch
- )
- );
-
// Build map from mesh or patch point to sharedPoint.
Map<label> localToSharedPoint(sharedPointAddr_.size());
forAll(sharedPointLabels_, i)
@@ -1156,80 +1074,76 @@ void Foam::globalPoints::receiveSharedPoints
}
// Sync all info.
- //const edgeList& connections = cycPatch.coupledPoints();
- const edgeList connections(coupledPoints(cycPatch));
- forAll(connections, i)
- {
- const edge& e = connections[i];
+ const labelList& meshPoints = cycPatch.meshPoints();
+ const labelList coupledMeshPoints(reverseMeshPoints(cycPatch));
- if (mergeSeparated || isCollocatedPoint[e[0]])
- {
- label meshPointA = pp.meshPoints()[e[0]];
- label meshPointB = pp.meshPoints()[e[1]];
+ forAll(meshPoints, i)
+ {
+ label meshPointA = meshPoints[i];
+ label meshPointB = coupledMeshPoints[i];
- label localA = meshToLocalPoint
- (
- meshToPatchPoint,
- meshPointA
- );
- label localB = meshToLocalPoint
- (
- meshToPatchPoint,
- meshPointB
- );
+ label localA = meshToLocalPoint
+ (
+ meshToPatchPoint,
+ meshPointA
+ );
+ label localB = meshToLocalPoint
+ (
+ meshToPatchPoint,
+ meshPointB
+ );
- // Do we already have shared point for pointA?
- Map<label>::iterator fndA = localToSharedPoint.find(localA);
- Map<label>::iterator fndB = localToSharedPoint.find(localB);
+ // Do we already have shared point for pointA?
+ Map<label>::iterator fndA = localToSharedPoint.find(localA);
+ Map<label>::iterator fndB = localToSharedPoint.find(localB);
- if (fndA != localToSharedPoint.end())
+ if (fndA != localToSharedPoint.end())
+ {
+ if (fndB != localToSharedPoint.end())
{
- if (fndB != localToSharedPoint.end())
+ if (fndA() != fndB())
{
- if (fndA() != fndB())
- {
- FatalErrorIn
- (
- "globalPoints::receiveSharedPoints(..)"
- ) << "On patch " << pp.name()
- << " connected points " << meshPointA
- << ' ' << mesh_.points()[meshPointA]
- << " and " << meshPointB
- << ' ' << mesh_.points()[meshPointB]
- << " are mapped to different shared"
- << " points: "
- << fndA() << " and " << fndB()
- << abort(FatalError);
- }
+ FatalErrorIn
+ (
+ "globalPoints::receiveSharedPoints(..)"
+ ) << "On patch " << pp.name()
+ << " connected points " << meshPointA
+ << ' ' << mesh_.points()[meshPointA]
+ << " and " << meshPointB
+ << ' ' << mesh_.points()[meshPointB]
+ << " are mapped to different shared"
+ << " points: "
+ << fndA() << " and " << fndB()
+ << abort(FatalError);
}
- else
- {
- // No shared point yet for B.
- label sharedPointI = fndA();
+ }
+ else
+ {
+ // No shared point yet for B.
+ label sharedPointI = fndA();
- // Store shared point for pointB
- label sharedI = meshToShared[localB];
+ // Store shared point for pointB
+ label sharedI = meshToShared[localB];
- sharedPointAddr_[sharedI] = sharedPointI;
- sharedPointLabels_[sharedI] = localB;
- changedIndices.append(sharedI);
- }
+ sharedPointAddr_[sharedI] = sharedPointI;
+ sharedPointLabels_[sharedI] = localB;
+ changedIndices.append(sharedI);
}
- else
+ }
+ else
+ {
+ // No shared point yet for A.
+ if (fndB != localToSharedPoint.end())
{
- // No shared point yet for A.
- if (fndB != localToSharedPoint.end())
- {
- label sharedPointI = fndB();
+ label sharedPointI = fndB();
- // Store shared point for pointA
- label sharedI = meshToShared[localA];
+ // Store shared point for pointA
+ label sharedI = meshToShared[localA];
- sharedPointAddr_[sharedI] = sharedPointI;
- sharedPointLabels_[sharedI] = localA;
- changedIndices.append(sharedI);
- }
+ sharedPointAddr_[sharedI] = sharedPointI;
+ sharedPointLabels_[sharedI] = localA;
+ changedIndices.append(sharedI);
}
}
}
@@ -1241,51 +1155,25 @@ void Foam::globalPoints::receiveSharedPoints
}
-Foam::edgeList Foam::globalPoints::coupledPoints(const cyclicPolyPatch& pp)
+Foam::labelList Foam::globalPoints::reverseMeshPoints
+(
+ const cyclicPolyPatch& pp
+)
{
- // Look at cyclic patch as two halves, A and B.
- // Now all we know is that relative face index in halfA is same
- // as coupled face in halfB and also that the 0th vertex
- // corresponds.
+ const cyclicPolyPatch& nbrPatch = pp.neighbPatch();
- // From halfA point to halfB or -1.
- labelList coupledPoint(pp.nPoints(), -1);
+ faceList masterFaces(nbrPatch.size());
- for (label patchFaceA = 0; patchFaceA < pp.size()/2; patchFaceA++)
+ forAll (nbrPatch, faceI)
{
- const face& fA = pp.localFaces()[patchFaceA];
-
- forAll(fA, indexA)
- {
- label patchPointA = fA[indexA];
-
- if (coupledPoint[patchPointA] == -1)
- {
- const face& fB = pp.localFaces()[patchFaceA + pp.size()/2];
-
- label indexB = (fB.size() - indexA) % fB.size();
-
- coupledPoint[patchPointA] = fB[indexB];
- }
- }
- }
-
- edgeList connected(pp.nPoints());
-
- // Extract coupled points.
- label connectedI = 0;
-
- forAll(coupledPoint, i)
- {
- if (coupledPoint[i] != -1)
- {
- connected[connectedI++] = edge(i, coupledPoint[i]);
- }
+ masterFaces[faceI] = nbrPatch[faceI].reverseFace();
}
- connected.setSize(connectedI);
-
- return connected;
+ return primitiveFacePatch
+ (
+ masterFaces,
+ nbrPatch.points()
+ ).meshPoints();
}
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index fcf7144a90ee7512b0a9de0495798833badaaafd..32012334b77c3398b6706c4da3d73425f4db0b0d 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -158,10 +158,6 @@ class globalPoints
// Private Member Functions
- //- Return per point collocated status
- static PackedBoolList collocatedPoints(const coupledPolyPatch&);
-
-
// Wrappers around global point numbering to add collocated bit
//- Convert into globalIndices and add collocated bit
@@ -300,9 +296,8 @@ class globalPoints
DynamicList<label>&
);
- //- Should move into cyclicPolyPatch ordering problem
- // keeps on giving problems.
- static edgeList coupledPoints(const cyclicPolyPatch&);
+ //- Return mesh points of other side in same order as my meshPoints.
+ static labelList reverseMeshPoints(const cyclicPolyPatch&);
//- Do all calculations.
void calculateSharedPoints
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index b0ecac822b56ebbab5e0e8601fcfe43104b6542e..fa9ad13f930806b602b22eff0bbfcfb47c000874 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -74,7 +74,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
slave++
)
{
- IPstream fromSlave(Pstream::blocking, slave);
+ IPstream fromSlave(Pstream::scheduled, slave);
List<labelPair> nbrData(fromSlave);
forAll(nbrData, i)
@@ -95,18 +95,18 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
slave++
)
{
- OPstream toSlave(Pstream::blocking, slave);
+ OPstream toSlave(Pstream::scheduled, slave);
toSlave << allComms;
}
}
else
{
{
- OPstream toMaster(Pstream::blocking, Pstream::masterNo());
+ OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster << allComms;
}
{
- IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
+ IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
fromMaster >> allComms;
}
}
@@ -595,6 +595,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed)
// Send elemIsUsed field to neighbour. Use nonblocking code from
// mapDistribute but in reverse order.
+ if (Pstream::parRun())
{
List<boolList> sendFields(Pstream::nProcs());
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 8797519d4dfc239511dd3b5c5351d86e0071e543..8fb074488de78a922d4735e8f4e79ad8ffaa75ac 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -41,6 +41,30 @@ void Foam::mapDistribute::distribute
List<T>& field
)
{
+ if (!Pstream::parRun())
+ {
+ // Do only me to me.
+
+ const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+ List<T> subField(mySubMap.size());
+ forAll(mySubMap, i)
+ {
+ subField[i] = field[mySubMap[i]];
+ }
+
+ // Receive sub field from myself (subField)
+ const labelList& map = constructMap[Pstream::myProcNo()];
+
+ field.setSize(constructSize);
+
+ forAll(map, i)
+ {
+ field[map[i]] = subField[i];
+ }
+ return;
+ }
+
if (commsType == Pstream::blocking)
{
// Since buffered sending can reuse the field to collect the
@@ -406,6 +430,30 @@ void Foam::mapDistribute::distribute
const T& nullValue
)
{
+ if (!Pstream::parRun())
+ {
+ // Do only me to me.
+
+ const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+ List<T> subField(mySubMap.size());
+ forAll(mySubMap, i)
+ {
+ subField[i] = field[mySubMap[i]];
+ }
+
+ // Receive sub field from myself (subField)
+ const labelList& map = constructMap[Pstream::myProcNo()];
+
+ field.setSize(constructSize);
+
+ forAll(map, i)
+ {
+ field[map[i]] = subField[i];
+ }
+ return;
+ }
+
if (commsType == Pstream::blocking)
{
// Since buffered sending can reuse the field to collect the
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 9bb7f27fa5ceda97a012d7189d58c39a02a10903..d0b3a7fa6642fcbc1f765ec90814e79c56ee659e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -717,6 +717,7 @@ void Foam::polyMesh::resetPrimitives
" const Xfer<labelList>& neighbour,\n"
" const labelList& patchSizes,\n"
" const labelList& patchStarts\n"
+ " const bool validBoundary\n"
")\n"
) << "Face " << faceI << " contains vertex labels out of range: "
<< curFace << " Max point index = " << points_.size()
@@ -759,9 +760,9 @@ void Foam::polyMesh::resetPrimitives
" const Xfer<labelList>& neighbour,\n"
" const labelList& patchSizes,\n"
" const labelList& patchStarts\n"
+ " const bool validBoundary\n"
")\n"
- )
- << "no points or no cells in mesh" << endl;
+ ) << "no points or no cells in mesh" << endl;
}
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index ce82d36de7487d904b5bf46a87d9f4cfc4c9336c..d82006b2df3ef42f12f63f252010c674a44c7d4b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -193,6 +193,19 @@ private:
const label patchID
) const;
+ void setTopology
+ (
+ const cellShapeList& cellsAsShapes,
+ const faceListList& boundaryFaces,
+ const wordList& boundaryPatchNames,
+ labelList& patchSizes,
+ labelList& patchStarts,
+ label& defaultPatchStart,
+ label& nFaces,
+ cellList& cells
+ );
+
+
public:
@@ -255,6 +268,20 @@ public:
const bool syncPar = true
);
+ //- Construct from cell shapes with patch information in dictionary
+ // format.
+ polyMesh
+ (
+ const IOobject& io,
+ const Xfer<pointField>& points,
+ const cellShapeList& shapes,
+ const faceListList& boundaryFaces,
+ const PtrList<dictionary>& boundaryDicts,
+ const word& defaultBoundaryPatchName,
+ const word& defaultBoundaryPatchType,
+ const bool syncPar = true
+ );
+
//- Destructor
virtual ~polyMesh();
@@ -442,8 +469,6 @@ public:
//- Reset mesh primitive data. Assumes all patch info correct
// (so does e.g. parallel communication). If not use
// validBoundary=false
- // (still assumes patchStarts[0] = nInternalFaces and last
- // patch ends at nActiveFaces) and change patches with addPatches.
void resetPrimitives
(
const Xfer<pointField>& points,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index fe9b8e45a4b92e789c70ffd37aef24e0eee9f18c..3898cd43f094e243c74db795c6536c172f5f5461 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -132,154 +132,26 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
}
-Foam::polyMesh::polyMesh
+//- Set faces_, calculate cells and patchStarts.
+void Foam::polyMesh::setTopology
(
- const IOobject& io,
- const Xfer<pointField>& points,
const cellShapeList& cellsAsShapes,
const faceListList& boundaryFaces,
const wordList& boundaryPatchNames,
- const wordList& boundaryPatchTypes,
- const word& defaultBoundaryPatchName,
- const word& defaultBoundaryPatchType,
- const wordList& boundaryPatchPhysicalTypes,
- const bool syncPar
+ labelList& patchSizes,
+ labelList& patchStarts,
+ label& defaultPatchStart,
+ label& nFaces,
+ cellList& cells
)
-:
- objectRegistry(io),
- primitiveMesh(),
- points_
- (
- IOobject
- (
- "points",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- points
- ),
- faces_
- (
- IOobject
- (
- "faces",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- 0
- ),
- owner_
- (
- IOobject
- (
- "owner",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- 0
- ),
- neighbour_
- (
- IOobject
- (
- "neighbour",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- 0
- ),
- clearedPrimitives_(false),
- boundary_
- (
- IOobject
- (
- "boundary",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- *this,
- boundaryFaces.size() + 1 // add room for a default patch
- ),
- bounds_(points_, syncPar),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
- pointZones_
- (
- IOobject
- (
- "pointZones",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- *this,
- 0
- ),
- faceZones_
- (
- IOobject
- (
- "faceZones",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- *this,
- 0
- ),
- cellZones_
- (
- IOobject
- (
- "cellZones",
- instance(),
- meshSubDir,
- *this,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- *this,
- 0
- ),
- globalMeshDataPtr_(NULL),
- moving_(false),
- curMotionTimeIndex_(time().timeIndex()),
- oldPointsPtr_(NULL)
{
- if (debug)
- {
- Info<<"Constructing polyMesh from cell and boundary shapes." << endl;
- }
-
- // Remove all of the old mesh files if they exist
- removeFiles(instance());
-
// Calculate the faces of all cells
// Initialise maximum possible numer of mesh faces to 0
label maxFaces = 0;
// Set up a list of face shapes for each cell
faceListList cellsFaceShapes(cellsAsShapes.size());
- cellList cells(cellsAsShapes.size());
+ cells.setSize(cellsAsShapes.size());
forAll(cellsFaceShapes, cellI)
{
@@ -298,7 +170,7 @@ Foam::polyMesh::polyMesh
faces_.setSize(maxFaces);
// Initialise number of faces to 0
- label nFaces = 0;
+ nFaces = 0;
// set reference to point-cell addressing
labelListList PointCells = cellShapePointCells(cellsAsShapes);
@@ -412,15 +284,16 @@ Foam::polyMesh::polyMesh
{
FatalErrorIn
(
- "polyMesh::polyMesh\n"
+ "polyMesh::setTopology\n"
"(\n"
- " const IOobject&,\n"
- " const Xfer<pointField>&,\n"
" const cellShapeList& cellsAsShapes,\n"
" const faceListList& boundaryFaces,\n"
- " const wordList& boundaryPatchTypes,\n"
" const wordList& boundaryPatchNames,\n"
- " const word& defaultBoundaryPatchType\n"
+ " labelList& patchSizes,\n"
+ " labelList& patchStarts,\n"
+ " label& defaultPatchStart,\n"
+ " label& nFaces,\n"
+ " cellList& cells\n"
")"
) << "Error in internal face insertion"
<< abort(FatalError);
@@ -430,8 +303,8 @@ Foam::polyMesh::polyMesh
// Do boundary faces
- labelList patchSizes(boundaryFaces.size(), -1);
- labelList patchStarts(boundaryFaces.size(), -1);
+ patchSizes.setSize(boundaryFaces.size(), -1);
+ patchStarts.setSize(boundaryFaces.size(), -1);
forAll(boundaryFaces, patchI)
{
@@ -470,15 +343,16 @@ Foam::polyMesh::polyMesh
{
FatalErrorIn
(
- "polyMesh::polyMesh\n"
+ "polyMesh::setTopology\n"
"(\n"
- " const IOobject&,\n"
- " const Xfer<pointField>&,\n"
" const cellShapeList& cellsAsShapes,\n"
" const faceListList& boundaryFaces,\n"
- " const wordList& boundaryPatchTypes,\n"
" const wordList& boundaryPatchNames,\n"
- " const word& defaultBoundaryPatchType\n"
+ " labelList& patchSizes,\n"
+ " labelList& patchStarts,\n"
+ " label& defaultPatchStart,\n"
+ " label& nFaces,\n"
+ " cellList& cells\n"
")"
) << "Trying to specify a boundary face " << curFace
<< " on the face on cell " << cellInside
@@ -518,7 +392,7 @@ Foam::polyMesh::polyMesh
// Grab "non-existing" faces and put them into a default patch
- label defaultPatchStart = nFaces;
+ defaultPatchStart = nFaces;
forAll(cells, cellI)
{
@@ -539,116 +413,550 @@ Foam::polyMesh::polyMesh
// Reset the size of the face list
faces_.setSize(nFaces);
- // Warning: Patches can only be added once the face list is
- // completed, as they hold a subList of the face list
- forAll(boundaryFaces, patchI)
- {
- // add the patch to the list
- boundary_.set
- (
- patchI,
- polyPatch::New
- (
- boundaryPatchTypes[patchI],
- boundaryPatchNames[patchI],
- patchSizes[patchI],
- patchStarts[patchI],
- patchI,
- boundary_
- )
- );
-
- if
- (
- boundaryPatchPhysicalTypes.size()
- && boundaryPatchPhysicalTypes[patchI].size()
- )
- {
- boundary_[patchI].physicalType() =
- boundaryPatchPhysicalTypes[patchI];
- }
- }
-
- label nAllPatches = boundaryFaces.size();
-
- if (nFaces > defaultPatchStart)
- {
- WarningIn("polyMesh::polyMesh(... construct from shapes...)")
- << "Found " << nFaces - defaultPatchStart
- << " undefined faces in mesh; adding to default patch." << endl;
-
- // Check if there already exists a defaultFaces patch as last patch
- // and reuse it.
- label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
-
- if (patchI != -1)
- {
- if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
- {
- FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
- << "Default patch " << boundary_[patchI].name()
- << " already has faces in it or is not"
- << " last in list of patches." << exit(FatalError);
- }
-
- WarningIn("polyMesh::polyMesh(... construct from shapes...)")
- << "Reusing existing patch " << patchI
- << " for undefined faces." << endl;
-
- boundary_.set
- (
- patchI,
- polyPatch::New
- (
- boundaryPatchTypes[patchI],
- boundaryPatchNames[patchI],
- nFaces - defaultPatchStart,
- defaultPatchStart,
- patchI,
- boundary_
- )
- );
- }
- else
- {
- boundary_.set
- (
- nAllPatches,
- polyPatch::New
- (
- defaultBoundaryPatchType,
- defaultBoundaryPatchName,
- nFaces - defaultPatchStart,
- defaultPatchStart,
- boundary_.size() - 1,
- boundary_
- )
- );
-
- nAllPatches++;
- }
- }
-
- // Reset the size of the boundary
- boundary_.setSize(nAllPatches);
-
- // Set the primitive mesh
- initMesh(cells);
-
- if (syncPar)
- {
- // Calculate topology for the patches (processor-processor comms etc.)
- boundary_.updateMesh();
+ return ;
+}
- // Calculate the geometry for the patches (transformation tensors etc.)
- boundary_.calcGeometry();
- }
- if (debug)
- {
- if (checkMesh())
- {
- Info<< "Mesh OK" << endl;
+Foam::polyMesh::polyMesh
+(
+ const IOobject& io,
+ const Xfer<pointField>& points,
+ const cellShapeList& cellsAsShapes,
+ const faceListList& boundaryFaces,
+ const wordList& boundaryPatchNames,
+ const wordList& boundaryPatchTypes,
+ const word& defaultBoundaryPatchName,
+ const word& defaultBoundaryPatchType,
+ const wordList& boundaryPatchPhysicalTypes,
+ const bool syncPar
+)
+:
+ objectRegistry(io),
+ primitiveMesh(),
+ points_
+ (
+ IOobject
+ (
+ "points",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ points
+ ),
+ faces_
+ (
+ IOobject
+ (
+ "faces",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ owner_
+ (
+ IOobject
+ (
+ "owner",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ neighbour_
+ (
+ IOobject
+ (
+ "neighbour",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ clearedPrimitives_(false),
+ boundary_
+ (
+ IOobject
+ (
+ "boundary",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ *this,
+ boundaryFaces.size() + 1 // add room for a default patch
+ ),
+ bounds_(points_, syncPar),
+ geometricD_(Vector<label>::zero),
+ solutionD_(Vector<label>::zero),
+ pointZones_
+ (
+ IOobject
+ (
+ "pointZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ faceZones_
+ (
+ IOobject
+ (
+ "faceZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ cellZones_
+ (
+ IOobject
+ (
+ "cellZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ globalMeshDataPtr_(NULL),
+ moving_(false),
+ curMotionTimeIndex_(time().timeIndex()),
+ oldPointsPtr_(NULL)
+{
+ if (debug)
+ {
+ Info<<"Constructing polyMesh from cell and boundary shapes." << endl;
+ }
+
+ // Remove all of the old mesh files if they exist
+ removeFiles(instance());
+
+ // Calculate faces and cells
+ labelList patchSizes;
+ labelList patchStarts;
+ label defaultPatchStart;
+ label nFaces;
+ cellList cells;
+ setTopology
+ (
+ cellsAsShapes,
+ boundaryFaces,
+ boundaryPatchNames,
+ patchSizes,
+ patchStarts,
+ defaultPatchStart,
+ nFaces,
+ cells
+ );
+
+ // Warning: Patches can only be added once the face list is
+ // completed, as they hold a subList of the face list
+ forAll(boundaryFaces, patchI)
+ {
+ // add the patch to the list
+ boundary_.set
+ (
+ patchI,
+ polyPatch::New
+ (
+ boundaryPatchTypes[patchI],
+ boundaryPatchNames[patchI],
+ patchSizes[patchI],
+ patchStarts[patchI],
+ patchI,
+ boundary_
+ )
+ );
+
+ if
+ (
+ boundaryPatchPhysicalTypes.size()
+ && boundaryPatchPhysicalTypes[patchI].size()
+ )
+ {
+ boundary_[patchI].physicalType() =
+ boundaryPatchPhysicalTypes[patchI];
+ }
+ }
+
+ label nAllPatches = boundaryFaces.size();
+
+ if (nFaces > defaultPatchStart)
+ {
+ WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Found " << nFaces - defaultPatchStart
+ << " undefined faces in mesh; adding to default patch." << endl;
+
+ // Check if there already exists a defaultFaces patch as last patch
+ // and reuse it.
+ label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
+
+ if (patchI != -1)
+ {
+ if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
+ {
+ FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Default patch " << boundary_[patchI].name()
+ << " already has faces in it or is not"
+ << " last in list of patches." << exit(FatalError);
+ }
+
+ WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Reusing existing patch " << patchI
+ << " for undefined faces." << endl;
+
+ boundary_.set
+ (
+ patchI,
+ polyPatch::New
+ (
+ boundaryPatchTypes[patchI],
+ boundaryPatchNames[patchI],
+ nFaces - defaultPatchStart,
+ defaultPatchStart,
+ patchI,
+ boundary_
+ )
+ );
+ }
+ else
+ {
+ boundary_.set
+ (
+ nAllPatches,
+ polyPatch::New
+ (
+ defaultBoundaryPatchType,
+ defaultBoundaryPatchName,
+ nFaces - defaultPatchStart,
+ defaultPatchStart,
+ boundary_.size() - 1,
+ boundary_
+ )
+ );
+
+ nAllPatches++;
+ }
+ }
+
+ // Reset the size of the boundary
+ boundary_.setSize(nAllPatches);
+
+ // Set the primitive mesh
+ initMesh(cells);
+
+ if (syncPar)
+ {
+ // Calculate topology for the patches (processor-processor comms etc.)
+ boundary_.updateMesh();
+
+ // Calculate the geometry for the patches (transformation tensors etc.)
+ boundary_.calcGeometry();
+ }
+
+ if (debug)
+ {
+ if (checkMesh())
+ {
+ Info<< "Mesh OK" << endl;
+ }
+ }
+}
+
+
+Foam::polyMesh::polyMesh
+(
+ const IOobject& io,
+ const Xfer<pointField>& points,
+ const cellShapeList& cellsAsShapes,
+ const faceListList& boundaryFaces,
+ const PtrList<dictionary>& boundaryDicts,
+ const word& defaultBoundaryPatchName,
+ const word& defaultBoundaryPatchType,
+ const bool syncPar
+)
+:
+ objectRegistry(io),
+ primitiveMesh(),
+ points_
+ (
+ IOobject
+ (
+ "points",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ points
+ ),
+ faces_
+ (
+ IOobject
+ (
+ "faces",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ owner_
+ (
+ IOobject
+ (
+ "owner",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ neighbour_
+ (
+ IOobject
+ (
+ "neighbour",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ 0
+ ),
+ clearedPrimitives_(false),
+ boundary_
+ (
+ IOobject
+ (
+ "boundary",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ *this,
+ boundaryFaces.size() + 1 // add room for a default patch
+ ),
+ bounds_(points_, syncPar),
+ geometricD_(Vector<label>::zero),
+ solutionD_(Vector<label>::zero),
+ pointZones_
+ (
+ IOobject
+ (
+ "pointZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ faceZones_
+ (
+ IOobject
+ (
+ "faceZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ cellZones_
+ (
+ IOobject
+ (
+ "cellZones",
+ instance(),
+ meshSubDir,
+ *this,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ ),
+ *this,
+ 0
+ ),
+ globalMeshDataPtr_(NULL),
+ moving_(false),
+ curMotionTimeIndex_(time().timeIndex()),
+ oldPointsPtr_(NULL)
+{
+ if (debug)
+ {
+ Info<<"Constructing polyMesh from cell and boundary shapes." << endl;
+ }
+
+ // Remove all of the old mesh files if they exist
+ removeFiles(instance());
+
+ wordList boundaryPatchNames(boundaryDicts.size());
+ forAll(boundaryDicts, patchI)
+ {
+ boundaryDicts[patchI].lookup("name") >> boundaryPatchNames[patchI];
+ }
+
+ // Calculate faces and cells
+ labelList patchSizes;
+ labelList patchStarts;
+ label defaultPatchStart;
+ label nFaces;
+ cellList cells;
+ setTopology
+ (
+ cellsAsShapes,
+ boundaryFaces,
+ boundaryPatchNames,
+ patchSizes,
+ patchStarts,
+ defaultPatchStart,
+ nFaces,
+ cells
+ );
+
+ // Warning: Patches can only be added once the face list is
+ // completed, as they hold a subList of the face list
+ forAll (boundaryFaces, patchI)
+ {
+ dictionary patchDict(boundaryDicts[patchI]);
+
+ patchDict.set("nFaces", patchSizes[patchI]);
+ patchDict.set("startFace", patchStarts[patchI]);
+
+ // add the patch to the list
+ boundary_.set
+ (
+ patchI,
+ polyPatch::New
+ (
+ boundaryPatchNames[patchI],
+ patchDict,
+ patchI,
+ boundary_
+ )
+ );
+ }
+
+ label nAllPatches = boundaryFaces.size();
+
+ if (nFaces > defaultPatchStart)
+ {
+ WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Found " << nFaces - defaultPatchStart
+ << " undefined faces in mesh; adding to default patch." << endl;
+
+ // Check if there already exists a defaultFaces patch as last patch
+ // and reuse it.
+ label patchI = findIndex(boundaryPatchNames, defaultBoundaryPatchName);
+
+ if (patchI != -1)
+ {
+ if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
+ {
+ FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Default patch " << boundary_[patchI].name()
+ << " already has faces in it or is not"
+ << " last in list of patches." << exit(FatalError);
+ }
+
+ WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+ << "Reusing existing patch " << patchI
+ << " for undefined faces." << endl;
+
+ boundary_.set
+ (
+ patchI,
+ polyPatch::New
+ (
+ boundary_[patchI].type(),
+ boundary_[patchI].name(),
+ nFaces - defaultPatchStart,
+ defaultPatchStart,
+ patchI,
+ boundary_
+ )
+ );
+ }
+ else
+ {
+ boundary_.set
+ (
+ nAllPatches,
+ polyPatch::New
+ (
+ defaultBoundaryPatchType,
+ defaultBoundaryPatchName,
+ nFaces - defaultPatchStart,
+ defaultPatchStart,
+ boundary_.size() - 1,
+ boundary_
+ )
+ );
+
+ nAllPatches++;
+ }
+ }
+
+ // Reset the size of the boundary
+ boundary_.setSize(nAllPatches);
+
+ // Set the primitive mesh
+ initMesh(cells);
+
+ if (syncPar)
+ {
+ // Calculate topology for the patches (processor-processor comms etc.)
+ boundary_.updateMesh();
+
+ // Calculate the geometry for the patches (transformation tensors etc.)
+ boundary_.calcGeometry();
+ }
+
+ if (debug)
+ {
+ if (checkMesh())
+ {
+ Info << "Mesh OK" << endl;
}
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index a18ec94f5cac5398c4dfe43d392eb753f97543ec..ea44ec07d1a20ac73c62647318ec67799ce2ee8e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -111,23 +111,6 @@ void Foam::coupledPolyPatch::writeOBJ
}
-Foam::pointField Foam::coupledPolyPatch::calcFaceCentres
-(
- const UList<face>& faces,
- const pointField& points
-)
-{
- pointField ctrs(faces.size());
-
- forAll(faces, faceI)
- {
- ctrs[faceI] = faces[faceI].centre(points);
- }
-
- return ctrs;
-}
-
-
Foam::pointField Foam::coupledPolyPatch::getAnchorPoints
(
const UList<face>& faces,
@@ -145,43 +128,6 @@ Foam::pointField Foam::coupledPolyPatch::getAnchorPoints
}
-bool Foam::coupledPolyPatch::inPatch
-(
- const labelList& oldToNew,
- const label oldFaceI
-) const
-{
- label faceI = oldToNew[oldFaceI];
-
- return faceI >= start() && faceI < start()+size();
-}
-
-
-Foam::label Foam::coupledPolyPatch::whichPatch
-(
- const labelList& patchStarts,
- const label faceI
-)
-{
- forAll(patchStarts, patchI)
- {
- if (patchStarts[patchI] <= faceI)
- {
- if (patchI == patchStarts.size()-1)
- {
- return patchI;
- }
- else if (patchStarts[patchI+1] > faceI)
- {
- return patchI;
- }
- }
- }
-
- return -1;
-}
-
-
Foam::scalarField Foam::coupledPolyPatch::calcFaceTol
(
const UList<face>& faces,
@@ -266,7 +212,8 @@ void Foam::coupledPolyPatch::calcTransformTensors
Pout<< "coupledPolyPatch::calcTransformTensors : " << name() << endl
<< " (half)size:" << Cf.size() << nl
<< " absTol:" << absTol << nl
- //<< " smallDist:" << smallDist << nl
+ << " smallDist min:" << min(smallDist) << nl
+ << " smallDist max:" << max(smallDist) << nl
<< " sum(mag(nf & nr)):" << sum(mag(nf & nr)) << endl;
}
@@ -278,7 +225,7 @@ void Foam::coupledPolyPatch::calcTransformTensors
// Then the overall error of summing the normals is sqrt(size())*absTol
// - separation calculation: pass in from the outside an allowable error.
- if (size() == 0)
+ if (Cf.size() == 0)
{
// Dummy geometry.
separation_.setSize(0);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 423a94ccb7dbc6276120039c036ece0e938a7f4c..92fcdc821cf64655141edb6e2c15454bcfb8e1b1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -38,6 +38,7 @@ SourceFiles
#define coupledPolyPatch_H
#include "polyPatch.H"
+#include "diagTensorField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -133,13 +134,6 @@ protected:
label& vertI
);
- //- Calculate face centres
- static pointField calcFaceCentres
- (
- const UList<face>&,
- const pointField&
- );
-
//- Get f[0] for all faces
static pointField getAnchorPoints
(
@@ -147,21 +141,6 @@ protected:
const pointField&
);
- //- Is face (in old face labels) in current patch?
- bool inPatch
- (
- const labelList& oldToNew,
- const label oldFaceI
- ) const;
-
- //- Given list of starts of patches and a face label determine
- // the patch.
- static label whichPatch
- (
- const labelList& patchStarts,
- const label faceI
- );
-
//- Calculate typical tolerance per face. Is currently max distance
// from face centre to any of the face vertices.
static scalarField calcFaceTol
@@ -248,45 +227,67 @@ public:
return true;
}
+ //- Does this side own the patch ?
+ virtual bool owner() const = 0;
- //- Are the coupled planes separated
- bool separated() const
+ //- Does the coupled side own the patch ?
+ virtual bool neighbour() const
+ {
+ return !owner();
+ }
+
+ //- Transform a patch-based position from other side to this side
+ virtual void transformPosition(pointField& l) const = 0;
+
+ //- Are the planes separated.
+ virtual bool separated() const
{
return separation_.size();
}
- //- Return the offset (distance) vector from one side of the couple
- // to the other
- const vectorField& separation() const
+ //- If the planes are separated the separation vector.
+ virtual const vectorField& separation() const
{
return separation_;
}
- //- Are the cyclic planes parallel
- bool parallel() const
+ //- Are the cyclic planes parallel.
+ virtual bool parallel() const
{
return forwardT_.empty();
}
- //- Return face transformation tensor
- const tensorField& forwardT() const
+ //- Return face transformation tensor.
+ virtual const tensorField& forwardT() const
{
return forwardT_;
}
- //- Return neighbour-cell transformation tensor
- const tensorField& reverseT() const
+ //- Return neighbour-cell transformation tensor.
+ virtual const tensorField& reverseT() const
{
return reverseT_;
}
//- Are faces collocated. Either size 0,1 or length of patch
- const boolList& collocated() const
+ virtual const boolList& collocated() const
{
return collocated_;
}
+ //- Calculate the patch geometry
+ virtual void calcGeometry
+ (
+ const primitivePatch& referPatch,
+ const UList<point>& thisCtrs,
+ const UList<point>& thisAreas,
+ const UList<point>& thisCc,
+ const UList<point>& nbrCtrs,
+ const UList<point>& nbrAreas,
+ const UList<point>& nbrCc
+ ) = 0;
+
//- Initialize ordering for primitivePatch. Does not
// refer to *this (except for name() and type() etc.)
virtual void initOrder
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index d77552cf0ce9eb5e625e59c7fcd474800cd7b2a9..963c5f9a0ce5be4987980230f765d79f651c1e69 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -33,7 +33,8 @@ License
#include "matchPoints.H"
#include "EdgeMap.H"
#include "Time.H"
-#include "transformList.H"
+#include "diagTensor.H"
+#include "transformField.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -87,53 +88,48 @@ void Foam::cyclicPolyPatch::calcTransforms()
{
if (size())
{
- const pointField& points = this->points();
+ // Half0
- // Determine geometric quantities on the two halves
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ const cyclicPolyPatch& half0 = *this;
- primitivePatch half0
- (
- SubList<face>
- (
- *this,
- size()/2
- ),
- points
- );
+ const pointField& half0Ctrs = half0.faceCentres();
- pointField half0Ctrs(calcFaceCentres(half0, half0.points()));
+ if (debug)
+ {
+ fileName casePath(boundaryMesh().mesh().time().path());
- scalarField half0Tols(calcFaceTol(half0, half0.points(), half0Ctrs));
+ fileName nm0(casePath/name()+"_faces.obj");
+ Pout<< "cyclicPolyPatch::calcTransforms : Writing " << name()
+ << " faces to OBJ file " << nm0 << endl;
+ writeOBJ(nm0, half0, half0.points());
+ }
- primitivePatch half1
- (
- SubList<face>
- (
- *this,
- size()/2,
- size()/2
- ),
- points
- );
- pointField half1Ctrs(calcFaceCentres(half1, half1.points()));
+ vectorField half0Areas(half0.size());
+
+ forAll(half0, facei)
+ {
+ half0Areas[facei] = half0[facei].normal(half0.points());
+ }
+
+
+
+ // Half1
+
+ const cyclicPolyPatch& half1 = neighbPatch();
+
+ const pointField& half1Ctrs = half1.faceCentres();
// Dump halves
if (debug)
{
fileName casePath(boundaryMesh().mesh().time().path());
- fileName nm0(casePath/name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::calcTransforms : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0, half0.points());
-
- fileName nm1(casePath/name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::calcTransforms : Writing half1"
+ fileName nm1(casePath/half1.name()+"_faces.obj");
+ Pout<< "cyclicPolyPatch::calcTransforms : Writing " << half1.name()
<< " faces to OBJ file " << nm1 << endl;
writeOBJ(nm1, half1, half1.points());
- OFstream str(casePath/name()+"_half0_to_half1.obj");
+ OFstream str(casePath/name()+"_to_" + half1.name() + ".obj");
label vertI = 0;
Pout<< "cyclicPolyPatch::calcTransforms :"
<< " Writing coupled face centres as lines to " << str.name()
@@ -150,17 +146,65 @@ void Foam::cyclicPolyPatch::calcTransforms()
}
}
- vectorField half0Normals(half0.size());
- vectorField half1Normals(half1.size());
+ vectorField half1Areas(half1.size());
- for (label facei = 0; facei < size()/2; facei++)
+ forAll(half1, facei)
{
- half0Normals[facei] = operator[](facei).normal(points);
- label nbrFacei = facei+size()/2;
- half1Normals[facei] = operator[](nbrFacei).normal(points);
+ half1Areas[facei] = half1[facei].normal(half1.points());
+ }
+
+ calcTransforms
+ (
+ half0,
+ half0Ctrs,
+ half0Areas,
+ half1Ctrs,
+ half1Areas
+ );
+ }
+}
+
+
+void Foam::cyclicPolyPatch::calcTransforms
+(
+ const primitivePatch& half0,
+ const UList<point>& half0Ctrs,
+ const UList<point>& half0Areas,
+ const UList<point>& half1Ctrs,
+ const UList<point>& half1Areas
+)
+{
+ if (half0Ctrs.size() != half1Ctrs.size())
+ {
+ FatalErrorIn
+ (
+ "cyclicPolyPatch::calcTransforms()"
+ ) << "For patch " << name()
+ << " there are " << half0Ctrs.size()
+ << " face centres, for the neighbour patch " << neighbPatch().name()
+ << " there are " << half1Ctrs.size()
+ << exit(FatalError);
+ }
+
+ if (half0Ctrs.size() > 0)
+ {
+ scalarField half0Tols
+ (
+ calcFaceTol
+ (
+ half0,
+ half0.points(),
+ static_cast<const pointField&>(half0Ctrs)
+ )
+ );
- scalar magSf = mag(half0Normals[facei]);
- scalar nbrMagSf = mag(half1Normals[facei]);
+ vectorField half0Normals(half0Areas.size());
+ vectorField half1Normals(half1Areas.size());
+
+ forAll(half0, facei)
+ {
+ scalar magSf = mag(half0Areas[facei]);
+ scalar nbrMagSf = mag(half1Areas[facei]);
scalar avSf = (magSf + nbrMagSf)/2.0;
if (magSf < ROOTVSMALL && nbrMagSf < ROOTVSMALL)
@@ -176,8 +220,7 @@ void Foam::cyclicPolyPatch::calcTransforms()
FatalErrorIn
(
"cyclicPolyPatch::calcTransforms()"
- ) << "face " << facei << " area does not match neighbour "
- << nbrFacei << " by "
+ ) << "face " << facei << " area does not match neighbour by "
<< 100*mag(magSf - nbrMagSf)/avSf
<< "% -- possible face ordering problem." << endl
<< "patch:" << name()
@@ -186,268 +229,29 @@ void Foam::cyclicPolyPatch::calcTransforms()
<< " matching tolerance:" << coupledPolyPatch::matchTol
<< endl
<< "Mesh face:" << start()+facei
- << " vertices:"
- << UIndirectList<point>(points, operator[](facei))()
+ << " fc:" << half0Ctrs[facei]
<< endl
- << "Neighbour face:" << start()+nbrFacei
- << " vertices:"
- << UIndirectList<point>(points, operator[](nbrFacei))()
+ << "Neighbour fc:" << half1Ctrs[facei]
<< endl
<< "Rerun with cyclic debug flag set"
<< " for more information." << exit(FatalError);
}
else
{
- half0Normals[facei] /= magSf;
- half1Normals[facei] /= nbrMagSf;
- }
- }
-
-
- // See if transformation is prescribed
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- switch (transform_)
- {
- case ROTATIONAL:
- {
- // Specified single rotation tensor.
-
- // Get best fitting face and its opposite number
- label face0 = getConsistentRotationFace(half0Ctrs);
- label face1 = face0;
-
- vector n0 =
- (
- (half0Ctrs[face0] - rotationCentre_)
- ^ rotationAxis_
- );
- vector n1 =
- (
- (half1Ctrs[face1] - rotationCentre_)
- ^ -rotationAxis_
- );
- n0 /= mag(n0) + VSMALL;
- n1 /= mag(n1) + VSMALL;
-
- if (debug)
- {
- Pout<< "cyclicPolyPatch::calcTransforms :"
- << " Specified rotation :"
- << " n0:" << n0 << " n1:" << n1 << endl;
- }
-
- // Calculate transformation tensors from face0,1 only.
- // Note: can use tight tolerance now.
- calcTransformTensors
- (
- pointField(1, half0Ctrs[face0]),
- pointField(1, half1Ctrs[face1]),
- vectorField(1, n0),
- vectorField(1, n1),
- scalarField(1, half0Tols[face0]),
- 1E-4
- );
-
- break;
- }
-
- default:
- {
- // Calculate transformation tensors from all faces.
- calcTransformTensors
- (
- half0Ctrs,
- half1Ctrs,
- half0Normals,
- half1Normals,
- half0Tols
- );
-
- break;
- }
- }
- }
-}
-
-
-// Get geometric zones of patch by looking at normals.
-// Method 1: any edge with sharpish angle is edge between two halves.
-// (this will handle e.g. wedge geometries).
-// Also two fully disconnected regions will be handled this way.
-// Method 2: sort faces into two halves based on face normal.
-bool Foam::cyclicPolyPatch::getGeometricHalves
-(
- const primitivePatch& pp,
- labelList& half0ToPatch,
- labelList& half1ToPatch
-) const
-{
- // Calculate normals
- const vectorField& faceNormals = pp.faceNormals();
-
- // Find edges with sharp angles.
- boolList regionEdge(pp.nEdges(), false);
-
- const labelListList& edgeFaces = pp.edgeFaces();
-
- label nRegionEdges = 0;
-
- forAll(edgeFaces, edgeI)
- {
- const labelList& eFaces = edgeFaces[edgeI];
-
- // Check manifold edges for sharp angle.
- // (Non-manifold already handled by patchZones)
- if (eFaces.size() == 2)
- {
- if ((faceNormals[eFaces[0]] & faceNormals[eFaces[1]])< featureCos_)
- {
- regionEdge[edgeI] = true;
-
- nRegionEdges++;
- }
- }
- }
-
-
- // For every face determine zone it is connected to (without crossing
- // any regionEdge)
- patchZones ppZones(pp, regionEdge);
-
- if (debug)
- {
- Pout<< "cyclicPolyPatch::getGeometricHalves : "
- << "Found " << nRegionEdges << " edges on patch " << name()
- << " where the cos of the angle between two connected faces"
- << " was less than " << featureCos_ << nl
- << "Patch divided by these and by single sides edges into "
- << ppZones.nZones() << " parts." << endl;
-
-
- // Dumping zones to obj files.
-
- labelList nZoneFaces(ppZones.nZones());
-
- for (label zoneI = 0; zoneI < ppZones.nZones(); zoneI++)
- {
- OFstream stream
- (
- boundaryMesh().mesh().time().path()
- /name()+"_zone_"+Foam::name(zoneI)+".obj"
- );
- Pout<< "cyclicPolyPatch::getGeometricHalves : Writing zone "
- << zoneI << " face centres to OBJ file " << stream.name()
- << endl;
-
- labelList zoneFaces(findIndices(ppZones, zoneI));
-
- forAll(zoneFaces, i)
- {
- writeOBJ(stream, pp[zoneFaces[i]].centre(pp.points()));
- }
-
- nZoneFaces[zoneI] = zoneFaces.size();
- }
- }
-
-
- if (ppZones.nZones() == 2)
- {
- half0ToPatch = findIndices(ppZones, 0);
- half1ToPatch = findIndices(ppZones, 1);
- }
- else
- {
- if (debug)
- {
- Pout<< "cyclicPolyPatch::getGeometricHalves :"
- << " falling back to face-normal comparison" << endl;
- }
- label n0Faces = 0;
- half0ToPatch.setSize(pp.size());
-
- label n1Faces = 0;
- half1ToPatch.setSize(pp.size());
-
- // Compare to face 0 normal.
- forAll(faceNormals, faceI)
- {
- if ((faceNormals[faceI] & faceNormals[0]) > 0)
- {
- half0ToPatch[n0Faces++] = faceI;
- }
- else
- {
- half1ToPatch[n1Faces++] = faceI;
- }
- }
- half0ToPatch.setSize(n0Faces);
- half1ToPatch.setSize(n1Faces);
-
- if (debug)
- {
- Pout<< "cyclicPolyPatch::getGeometricHalves :"
- << " Number of faces per zone:("
- << n0Faces << ' ' << n1Faces << ')' << endl;
- }
- }
-
- if (half0ToPatch.size() != half1ToPatch.size())
- {
- fileName casePath(boundaryMesh().mesh().time().path());
-
- // Dump halves
- {
- fileName nm0(casePath/name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::getGeometricHalves : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, UIndirectList<face>(pp, half0ToPatch)(), pp.points());
-
- fileName nm1(casePath/name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::getGeometricHalves : Writing half1"
- << " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, UIndirectList<face>(pp, half1ToPatch)(), pp.points());
- }
-
- // Dump face centres
- {
- OFstream str0(casePath/name()+"_half0.obj");
- Pout<< "cyclicPolyPatch::getGeometricHalves : Writing half0"
- << " face centres to OBJ file " << str0.name() << endl;
-
- forAll(half0ToPatch, i)
- {
- writeOBJ(str0, pp[half0ToPatch[i]].centre(pp.points()));
- }
-
- OFstream str1(casePath/name()+"_half1.obj");
- Pout<< "cyclicPolyPatch::getGeometricHalves : Writing half1"
- << " face centres to OBJ file " << str1.name() << endl;
- forAll(half1ToPatch, i)
- {
- writeOBJ(str1, pp[half1ToPatch[i]].centre(pp.points()));
+ half0Normals[facei] = half0Areas[facei] / magSf;
+ half1Normals[facei] = half1Areas[facei] / nbrMagSf;
}
}
- SeriousErrorIn
+ // Calculate transformation tensors
+ calcTransformTensors
(
- "cyclicPolyPatch::getGeometricHalves"
- "(const primitivePatch&, labelList&, labelList&) const"
- ) << "Patch " << name() << " gets decomposed in two zones of"
- << "inequal size: " << half0ToPatch.size()
- << " and " << half1ToPatch.size() << endl
- << "This means that the patch is either not two separate regions"
- << " or one region where the angle between the different regions"
- << " is not sufficiently sharp." << endl
- << "Please adapt the featureCos setting." << endl
- << "Continuing with incorrect face ordering from now on!" << endl;
-
- return false;
- }
- else
- {
- return true;
+ static_cast<const pointField&>(half0Ctrs),
+ static_cast<const pointField&>(half1Ctrs),
+ half0Normals,
+ half1Normals,
+ half0Tols
+ );
}
}
@@ -457,11 +261,9 @@ bool Foam::cyclicPolyPatch::getGeometricHalves
// right ones.
void Foam::cyclicPolyPatch::getCentresAndAnchors
(
- const primitivePatch& pp,
- const faceList& half0Faces,
- const faceList& half1Faces,
+ const primitivePatch& pp0,
+ const primitivePatch& pp1,
- pointField& ppPoints,
pointField& half0Ctrs,
pointField& half1Ctrs,
pointField& anchors0,
@@ -469,9 +271,9 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
) const
{
// Get geometric data on both halves.
- half0Ctrs = calcFaceCentres(half0Faces, pp.points());
- anchors0 = getAnchorPoints(half0Faces, pp.points());
- half1Ctrs = calcFaceCentres(half1Faces, pp.points());
+ half0Ctrs = pp0.faceCentres();
+ anchors0 = getAnchorPoints(pp0, pp0.points());
+ half1Ctrs = pp1.faceCentres();
switch (transform_)
{
@@ -502,8 +304,6 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
anchors0[faceI] = Foam::transform(reverseT, anchors0[faceI]);
}
- ppPoints = Foam::transform(reverseT, pp.points());
-
break;
}
//- Problem: usually specified translation is not accurate enough
@@ -530,12 +330,12 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
// Determine the face with max area on both halves. These
// two faces are used to determine the transformation tensors
- label max0I = findMaxArea(pp.points(), half0Faces);
- vector n0 = half0Faces[max0I].normal(pp.points());
+ label max0I = findMaxArea(pp0.points(), pp0);
+ vector n0 = pp0[max0I].normal(pp0.points());
n0 /= mag(n0) + VSMALL;
- label max1I = findMaxArea(pp.points(), half1Faces);
- vector n1 = half1Faces[max1I].normal(pp.points());
+ label max1I = findMaxArea(pp1.points(), pp1);
+ vector n1 = pp1[max1I].normal(pp1.points());
n1 /= mag(n1) + VSMALL;
if (mag(n0 & n1) < 1-coupledPolyPatch::matchTol)
@@ -564,19 +364,13 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
anchors0[faceI]
);
}
- ppPoints = Foam::transform(reverseT, pp.points());
}
else
{
// Parallel translation. Get average of all used points.
- primitiveFacePatch half0(half0Faces, pp.points());
- const pointField& half0Pts = half0.localPoints();
- const point ctr0(sum(half0Pts)/half0Pts.size());
-
- primitiveFacePatch half1(half1Faces, pp.points());
- const pointField& half1Pts = half1.localPoints();
- const point ctr1(sum(half1Pts)/half1Pts.size());
+ const point ctr0(sum(pp0.localPoints())/pp0.nPoints());
+ const point ctr1(sum(pp1.localPoints())/pp1.nPoints());
if (debug)
{
@@ -588,7 +382,6 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
half0Ctrs += ctr1 - ctr0;
anchors0 += ctr1 - ctr0;
- ppPoints = pp.points() + ctr1 - ctr0;
}
break;
}
@@ -596,92 +389,7 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors
// Calculate typical distance per face
- tols = calcFaceTol(half1Faces, pp.points(), half1Ctrs);
-}
-
-
-// Calculates faceMap and rotation. Returns true if all ok.
-bool Foam::cyclicPolyPatch::matchAnchors
-(
- const bool report,
- const primitivePatch& pp,
- const labelList& half0ToPatch,
- const pointField& anchors0,
-
- const labelList& half1ToPatch,
- const faceList& half1Faces,
- const labelList& from1To0,
-
- const scalarField& tols,
-
- labelList& faceMap,
- labelList& rotation
-) const
-{
- // Set faceMap such that half0 faces get first and corresponding half1
- // faces last.
-
- forAll(half0ToPatch, half0FaceI)
- {
- // Label in original patch
- label patchFaceI = half0ToPatch[half0FaceI];
-
- faceMap[patchFaceI] = half0FaceI;
-
- // No rotation
- rotation[patchFaceI] = 0;
- }
-
- bool fullMatch = true;
-
- forAll(from1To0, half1FaceI)
- {
- label patchFaceI = half1ToPatch[half1FaceI];
-
- // This face has to match the corresponding one on half0.
- label half0FaceI = from1To0[half1FaceI];
-
- label newFaceI = half0FaceI + pp.size()/2;
-
- faceMap[patchFaceI] = newFaceI;
-
- // Rotate patchFaceI such that its f[0] aligns with that of
- // the corresponding face
- // (which after shuffling will be at position half0FaceI)
-
- const point& wantedAnchor = anchors0[half0FaceI];
-
- rotation[newFaceI] = getRotation
- (
- pp.points(),
- half1Faces[half1FaceI],
- wantedAnchor,
- tols[half1FaceI]
- );
-
- if (rotation[newFaceI] == -1)
- {
- fullMatch = false;
-
- if (report)
- {
- const face& f = half1Faces[half1FaceI];
- SeriousErrorIn
- (
- "cyclicPolyPatch::matchAnchors(..)"
- ) << "Patch:" << name() << " : "
- << "Cannot find point on face " << f
- << " with vertices:"
- << UIndirectList<point>(pp.points(), f)()
- << " that matches point " << wantedAnchor
- << " when matching the halves of cyclic patch " << name()
- << endl
- << "Continuing with incorrect face ordering from now on!"
- << endl;
- }
- }
- }
- return fullMatch;
+ tols = calcFaceTol(pp1, pp1.points(), half1Ctrs);
}
@@ -714,7 +422,7 @@ Foam::label Foam::cyclicPolyPatch::getConsistentRotationFace
if (debug)
{
- Info<< "getConsistentRotationFace(const pointField&)" << nl
+ Pout<< "getConsistentRotationFace(const pointField&)" << nl
<< " rotFace = " << rotFace << nl
<< " point = " << faceCentres[rotFace] << endl;
}
@@ -735,14 +443,18 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
)
:
coupledPolyPatch(name, size, start, index, bm),
- coupledPointsPtr_(NULL),
- coupledEdgesPtr_(NULL),
- featureCos_(0.9),
+ neighbPatchName_(word::null),
+ neighbPatchID_(-1),
transform_(UNKNOWN),
rotationAxis_(vector::zero),
rotationCentre_(point::zero),
- separationVector_(vector::zero)
-{}
+ separationVector_(vector::zero),
+ coupledPointsPtr_(NULL),
+ coupledEdgesPtr_(NULL)
+{
+ // Neighbour patch might not be valid yet so no transformation
+ // calculation possible.
+}
Foam::cyclicPolyPatch::cyclicPolyPatch
@@ -754,15 +466,40 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
)
:
coupledPolyPatch(name, dict, index, bm),
- coupledPointsPtr_(NULL),
- coupledEdgesPtr_(NULL),
- featureCos_(0.9),
+ neighbPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)),
+ neighbPatchID_(-1),
transform_(UNKNOWN),
rotationAxis_(vector::zero),
rotationCentre_(point::zero),
- separationVector_(vector::zero)
+ separationVector_(vector::zero),
+ coupledPointsPtr_(NULL),
+ coupledEdgesPtr_(NULL)
{
- dict.readIfPresent("featureCos", featureCos_);
+ if (neighbPatchName_ == word::null)
+ {
+ FatalIOErrorIn
+ (
+ "cyclicPolyPatch::cyclicPolyPatch\n"
+ "(\n"
+ " const word& name,\n"
+ " const dictionary& dict,\n"
+ " const label index,\n"
+ " const polyBoundaryMesh& bm\n"
+ ")",
+ dict
+ ) << "No \"neighbourPatch\" provided." << endl
+ << "Is your mesh uptodate with split cyclics?" << endl
+ << "Run foamUpgradeCyclics to convert mesh and fields"
+ << " to split cyclics." << exit(FatalIOError);
+ }
+
+ if (neighbPatchName_ == name)
+ {
+ FatalIOErrorIn("cyclicPolyPatch::cyclicPolyPatch(..)", dict)
+ << "Neighbour patch name " << neighbPatchName_
+ << " cannot be the same as this patch " << name
+ << exit(FatalIOError);
+ }
if (dict.found("transform"))
{
@@ -786,6 +523,9 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
}
}
}
+
+ // Neighbour patch might not be valid yet so no transformation
+ // calculation possible.
}
@@ -796,14 +536,18 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
)
:
coupledPolyPatch(pp, bm),
- coupledPointsPtr_(NULL),
- coupledEdgesPtr_(NULL),
- featureCos_(pp.featureCos_),
+ neighbPatchName_(pp.neighbPatchName()),
+ neighbPatchID_(-1),
transform_(pp.transform_),
rotationAxis_(pp.rotationAxis_),
rotationCentre_(pp.rotationCentre_),
- separationVector_(pp.separationVector_)
-{}
+ separationVector_(pp.separationVector_),
+ coupledPointsPtr_(NULL),
+ coupledEdgesPtr_(NULL)
+{
+ // Neighbour patch might not be valid yet so no transformation
+ // calculation possible.
+}
Foam::cyclicPolyPatch::cyclicPolyPatch
@@ -812,18 +556,31 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
const polyBoundaryMesh& bm,
const label index,
const label newSize,
- const label newStart
+ const label newStart,
+ const word& neighbPatchName
)
:
coupledPolyPatch(pp, bm, index, newSize, newStart),
- coupledPointsPtr_(NULL),
- coupledEdgesPtr_(NULL),
- featureCos_(pp.featureCos_),
+ neighbPatchName_(neighbPatchName),
+ neighbPatchID_(-1),
transform_(pp.transform_),
rotationAxis_(pp.rotationAxis_),
rotationCentre_(pp.rotationCentre_),
- separationVector_(pp.separationVector_)
-{}
+ separationVector_(pp.separationVector_),
+ coupledPointsPtr_(NULL),
+ coupledEdgesPtr_(NULL)
+{
+ if (neighbPatchName_ == name())
+ {
+ FatalErrorIn("cyclicPolyPatch::cyclicPolyPatch(..)")
+ << "Neighbour patch name " << neighbPatchName_
+ << " cannot be the same as this patch " << name()
+ << exit(FatalError);
+ }
+
+ // Neighbour patch might not be valid yet so no transformation
+ // calculation possible.
+}
Foam::cyclicPolyPatch::cyclicPolyPatch
@@ -836,13 +593,14 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
)
:
coupledPolyPatch(pp, bm, index, mapAddressing, newStart),
- coupledPointsPtr_(NULL),
- coupledEdgesPtr_(NULL),
- featureCos_(pp.featureCos_),
+ neighbPatchName_(pp.neighbPatchName_),
+ neighbPatchID_(-1),
transform_(pp.transform_),
rotationAxis_(pp.rotationAxis_),
rotationCentre_(pp.rotationCentre_),
- separationVector_(pp.separationVector_)
+ separationVector_(pp.separationVector_),
+ coupledPointsPtr_(NULL),
+ coupledEdgesPtr_(NULL)
{}
@@ -858,17 +616,72 @@ Foam::cyclicPolyPatch::~cyclicPolyPatch()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+void Foam::cyclicPolyPatch::transformPosition(pointField& l) const
+{
+ if (!parallel())
+ {
+ Foam::transform(forwardT(), l);
+ }
+ else if (separated())
+ {
+ l -= separation();
+ }
+}
+
+
void Foam::cyclicPolyPatch::initGeometry(PstreamBuffers& pBufs)
{
polyPatch::initGeometry(pBufs);
}
+
+void Foam::cyclicPolyPatch::initGeometry
+(
+ const primitivePatch& referPatch,
+ UList<point>& nbrCtrs,
+ UList<point>& nbrAreas,
+ UList<point>& nbrCc
+)
+{}
+
+
+void Foam::cyclicPolyPatch::calcGeometry
+(
+ const primitivePatch& referPatch,
+ const UList<point>& thisCtrs,
+ const UList<point>& thisAreas,
+ const UList<point>& thisCc,
+ const UList<point>& nbrCtrs,
+ const UList<point>& nbrAreas,
+ const UList<point>& nbrCc
+)
+{
+ calcTransforms
+ (
+ referPatch,
+ thisCtrs,
+ thisAreas,
+ nbrCtrs,
+ nbrAreas
+ );
+}
+
+
void Foam::cyclicPolyPatch::calcGeometry(PstreamBuffers& pBufs)
{
- polyPatch::calcGeometry(pBufs);
- calcTransforms();
+ calcGeometry
+ (
+ *this,
+ faceCentres(),
+ faceAreas(),
+ faceCellCentres(),
+ neighbPatch().faceCentres(),
+ neighbPatch().faceAreas(),
+ neighbPatch().faceCellCentres()
+ );
}
+
void Foam::cyclicPolyPatch::initMovePoints
(
PstreamBuffers& pBufs,
@@ -905,17 +718,20 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
{
if (!coupledPointsPtr_)
{
- // Look at cyclic patch as two halves, A and B.
- // Now all we know is that relative face index in halfA is same
- // as coupled face in halfB and also that the 0th vertex
+ const faceList& nbrLocalFaces = neighbPatch().localFaces();
+ const labelList& nbrMeshPoints = neighbPatch().meshPoints();
+
+ // Now all we know is that relative face index in *this is same
+ // as coupled face in nbrPatch and also that the 0th vertex
// corresponds.
- // From halfA point to halfB or -1.
+ // From local point to nbrPatch or -1.
labelList coupledPoint(nPoints(), -1);
- for (label patchFaceA = 0; patchFaceA < size()/2; patchFaceA++)
+ forAll(*this, patchFaceI)
{
- const face& fA = localFaces()[patchFaceA];
+ const face& fA = localFaces()[patchFaceI];
+ const face& fB = nbrLocalFaces[patchFaceI];
forAll(fA, indexA)
{
@@ -923,12 +739,10 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
if (coupledPoint[patchPointA] == -1)
{
- const face& fB = localFaces()[patchFaceA + size()/2];
-
label indexB = (fB.size() - indexA) % fB.size();
// Filter out points on wedge axis
- if (patchPointA != fB[indexB])
+ if (meshPoints()[patchPointA] != nbrMeshPoints[fB[indexB]])
{
coupledPoint[patchPointA] = fB[indexB];
}
@@ -957,7 +771,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
OFstream str
(
boundaryMesh().mesh().time().path()
- /"coupledPoints.obj"
+ /name() + "_coupledPoints.obj"
);
label vertI = 0;
@@ -967,7 +781,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
forAll(connected, i)
{
const point& a = points()[meshPoints()[connected[i][0]]];
- const point& b = points()[meshPoints()[connected[i][1]]];
+ const point& b = points()[nbrMeshPoints[connected[i][1]]];
str<< "v " << a.x() << ' ' << a.y() << ' ' << a.z() << nl;
str<< "v " << b.x() << ' ' << b.y() << ' ' << b.z() << nl;
@@ -978,8 +792,20 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
}
// Remove any addressing calculated for the coupled edges calculation
- const_cast<primitivePatch&>(static_cast<const primitivePatch&>(*this))
- .clearOut();
+ const_cast<primitivePatch&>
+ (
+ static_cast<const primitivePatch&>
+ (
+ *this
+ )
+ ).clearOut();
+ const_cast<primitivePatch&>
+ (
+ static_cast<const primitivePatch&>
+ (
+ neighbPatch()
+ )
+ ).clearOut();
}
return *coupledPointsPtr_;
}
@@ -989,9 +815,9 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
{
if (!coupledEdgesPtr_)
{
- // Build map from points on halfA to points on halfB.
const edgeList& pointCouples = coupledPoints();
+ // Build map from points on *this (A) to points on neighbourpatch (B)
Map<label> aToB(2*pointCouples.size());
forAll(pointCouples, i)
@@ -1001,12 +827,12 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
aToB.insert(e[0], e[1]);
}
- // Map from edge on half A to points (in halfB indices)
+ // Map from edge on A to points (in B indices)
EdgeMap<label> edgeMap(nEdges());
- for (label patchFaceA = 0; patchFaceA < size()/2; patchFaceA++)
+ forAll(*this, patchFaceI)
{
- const labelList& fEdges = faceEdges()[patchFaceA];
+ const labelList& fEdges = faceEdges()[patchFaceI];
forAll(fEdges, i)
{
@@ -1014,8 +840,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
const edge& e = edges()[edgeI];
- // Convert edge end points to corresponding points on halfB
- // side.
+ // Convert edge end points to corresponding points on B side.
Map<label>::const_iterator fnd0 = aToB.find(e[0]);
if (fnd0 != aToB.end())
{
@@ -1028,31 +853,44 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
}
}
- coupledEdgesPtr_ = new edgeList(nEdges()/2);
+ // Use the edgeMap to get the edges on the B side.
+
+ const cyclicPolyPatch& neighbPatch = this->neighbPatch();
+ const labelList& nbrMp = neighbPatch.meshPoints();
+ const labelList& mp = meshPoints();
+
+
+
+ coupledEdgesPtr_ = new edgeList(edgeMap.size());
edgeList& coupledEdges = *coupledEdgesPtr_;
label coupleI = 0;
- for (label patchFaceB = size()/2; patchFaceB < size(); patchFaceB++)
+ forAll(neighbPatch, patchFaceI)
{
- const labelList& fEdges = faceEdges()[patchFaceB];
+ const labelList& fEdges = neighbPatch.faceEdges()[patchFaceI];
forAll(fEdges, i)
{
label edgeI = fEdges[i];
- const edge& e = edges()[edgeI];
+ const edge& e = neighbPatch.edges()[edgeI];
- // Look up halfA edge from HashTable.
+ // Look up A edge from HashTable.
EdgeMap<label>::iterator iter = edgeMap.find(e);
if (iter != edgeMap.end())
{
- label halfAEdgeI = iter();
+ label edgeA = iter();
+ const edge& eA = edges()[edgeA];
// Store correspondence. Filter out edges on wedge axis.
- if (halfAEdgeI != edgeI)
+ if
+ (
+ edge(mp[eA[0]], mp[eA[1]])
+ != edge(nbrMp[e[0]], nbrMp[e[1]])
+ )
{
- coupledEdges[coupleI++] = edge(halfAEdgeI, edgeI);
+ coupledEdges[coupleI++] = edge(edgeA, edgeI);
}
// Remove so we build unique list
@@ -1069,7 +907,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
{
const edge& e = coupledEdges[i];
- if (e[0] == e[1] || e[0] < 0 || e[1] < 0)
+ if (e[0] < 0 || e[1] < 0)
{
FatalErrorIn("cyclicPolyPatch::coupledEdges() const")
<< "Problem : at position " << i
@@ -1083,7 +921,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
OFstream str
(
boundaryMesh().mesh().time().path()
- /"coupledEdges.obj"
+ /name() + "_coupledEdges.obj"
);
label vertI = 0;
@@ -1095,7 +933,10 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
const edge& e = coupledEdges[i];
const point& a = edges()[e[0]].centre(localPoints());
- const point& b = edges()[e[1]].centre(localPoints());
+ const point& b = neighbPatch.edges()[e[1]].centre
+ (
+ neighbPatch.localPoints()
+ );
str<< "v " << a.x() << ' ' << a.y() << ' ' << a.z() << nl;
str<< "v " << b.x() << ' ' << b.y() << ' ' << b.z() << nl;
@@ -1106,8 +947,20 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
}
// Remove any addressing calculated for the coupled edges calculation
- const_cast<primitivePatch&>(static_cast<const primitivePatch&>(*this))
- .clearOut();
+ const_cast<primitivePatch&>
+ (
+ static_cast<const primitivePatch&>
+ (
+ *this
+ )
+ ).clearOut();
+ const_cast<primitivePatch&>
+ (
+ static_cast<const primitivePatch&>
+ (
+ neighbPatch
+ )
+ ).clearOut();
}
return *coupledEdgesPtr_;
}
@@ -1118,7 +971,21 @@ void Foam::cyclicPolyPatch::initOrder
PstreamBuffers&,
const primitivePatch& pp
) const
-{}
+{
+ if (owner())
+ {
+ // Save patch for use in non-owner side ordering. Equivalent to
+ // processorPolyPatch using OPstream.
+ ownerPatchPtr_.reset
+ (
+ new primitivePatch
+ (
+ pp,
+ pp.points()
+ )
+ );
+ }
+}
// Return new ordering. Ordering is -faceMap: for every face index
@@ -1139,148 +1006,36 @@ bool Foam::cyclicPolyPatch::order
rotation.setSize(pp.size());
rotation = 0;
- if (pp.empty())
+ if (pp.empty() || transform_ == NOORDERING)
{
// No faces, nothing to change.
return false;
}
- if (pp.size()&1)
+ if (owner())
{
- FatalErrorIn("cyclicPolyPatch::order(..)")
- << "Size of cyclic " << name() << " should be a multiple of 2"
- << ". It is " << pp.size() << abort(FatalError);
- }
-
- if (transform_ == NOORDERING)
- {
- if (debug)
+ // Do nothing (i.e. identical mapping, zero rotation).
+ // See comment at top.
+ forAll(faceMap, patchFaceI)
{
- Pout<< "cyclicPolyPatch::order : noOrdering mode." << endl;
+ faceMap[patchFaceI] = patchFaceI;
}
- return false;
- }
-
-
- label halfSize = pp.size()/2;
-
- // Supplied primitivePatch already with new points.
- // Cyclics are limited to one transformation tensor
- // currently anyway (i.e. straight plane) so should not be too big a
- // problem.
-
- // Indices of faces on half0
- labelList half0ToPatch;
- // Indices of faces on half1
- labelList half1ToPatch;
-
-
- // 1. Test if already correctly oriented by starting from trivial ordering.
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- half0ToPatch = identity(halfSize);
- half1ToPatch = half0ToPatch + halfSize;
-
- // Get faces
- faceList half0Faces(UIndirectList<face>(pp, half0ToPatch));
- faceList half1Faces(UIndirectList<face>(pp, half1ToPatch));
-
- // Get geometric quantities
- pointField half0Ctrs, half1Ctrs, anchors0, ppPoints;
- scalarField tols;
- getCentresAndAnchors
- (
- pp,
- half0Faces,
- half1Faces,
-
- ppPoints,
- half0Ctrs,
- half1Ctrs,
- anchors0,
- tols
- );
-
- // Geometric match of face centre vectors
- labelList from1To0;
- bool matchedAll = matchPoints
- (
- half1Ctrs,
- half0Ctrs,
- tols,
- false,
- from1To0
- );
-
- if (debug)
- {
- Pout<< "cyclicPolyPatch::order : test if already ordered:"
- << matchedAll << endl;
-
- // Dump halves
- fileName nm0("match1_"+name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0Faces, ppPoints);
-
- fileName nm1("match1_"+name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half1"
- << " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, half1Faces, pp.points());
-
- OFstream ccStr
- (
- boundaryMesh().mesh().time().path()
- /"match1_"+ name() + "_faceCentres.obj"
- );
- Pout<< "cyclicPolyPatch::order : "
- << "Dumping currently found cyclic match as lines between"
- << " corresponding face centres to file " << ccStr.name()
- << endl;
-
- // Recalculate untransformed face centres
- //pointField rawHalf0Ctrs = calcFaceCentres(half0Faces, pp.points());
- label vertI = 0;
-
- forAll(half1Ctrs, i)
- {
- //if (from1To0[i] != -1)
- {
- // Write edge between c1 and c0
- //const point& c0 = rawHalf0Ctrs[from1To0[i]];
- //const point& c0 = half0Ctrs[from1To0[i]];
- const point& c0 = half0Ctrs[i];
- const point& c1 = half1Ctrs[i];
- writeOBJ(ccStr, c0, c1, vertI);
- }
- }
+ return false;
}
-
-
- // 2. Ordered in pairs (so 0,1 coupled and 2,3 etc.)
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- if (!matchedAll)
+ else
{
- label faceI = 0;
- for (label i = 0; i < halfSize; i++)
- {
- half0ToPatch[i] = faceI++;
- half1ToPatch[i] = faceI++;
- }
-
- // And redo all matching
- half0Faces = UIndirectList<face>(pp, half0ToPatch);
- half1Faces = UIndirectList<face>(pp, half1ToPatch);
+ // Get stored geometry from initOrder invocation of owner.
+ const primitivePatch& pp0 = neighbPatch().ownerPatchPtr_();
+ // Get geometric quantities
+ pointField half0Ctrs, half1Ctrs, anchors0;
+ scalarField tols;
getCentresAndAnchors
(
+ pp0,
pp,
- half0Faces,
- half1Faces,
- ppPoints,
half0Ctrs,
half1Ctrs,
anchors0,
@@ -1288,34 +1043,40 @@ bool Foam::cyclicPolyPatch::order
);
// Geometric match of face centre vectors
- matchedAll = matchPoints
+ bool matchedAll = matchPoints
(
half1Ctrs,
half0Ctrs,
tols,
- false,
- from1To0
+ true,
+ faceMap
);
- if (debug)
+ if (!matchedAll || debug)
{
- Pout<< "cyclicPolyPatch::order : test if pairwise ordered:"
- << matchedAll << endl;
// Dump halves
- fileName nm0("match2_"+name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half0"
+ fileName nm0
+ (
+ boundaryMesh().mesh().time().path()
+ /neighbPatch().name()+"_faces.obj"
+ );
+ Pout<< "cyclicPolyPatch::order : Writing neighbour"
<< " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0Faces, ppPoints);
+ writeOBJ(nm0, pp0, pp0.points());
- fileName nm1("match2_"+name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half1"
+ fileName nm1
+ (
+ boundaryMesh().mesh().time().path()
+ /name()+"_faces.obj"
+ );
+ Pout<< "cyclicPolyPatch::order : Writing my"
<< " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, half1Faces, pp.points());
+ writeOBJ(nm1, pp, pp.points());
OFstream ccStr
(
boundaryMesh().mesh().time().path()
- /"match2_"+name()+"_faceCentres.obj"
+ /name() + "_faceCentres.obj"
);
Pout<< "cyclicPolyPatch::order : "
<< "Dumping currently found cyclic match as lines between"
@@ -1329,312 +1090,95 @@ bool Foam::cyclicPolyPatch::order
forAll(half1Ctrs, i)
{
- if (from1To0[i] != -1)
+ if (faceMap[i] != -1)
{
// Write edge between c1 and c0
- //const point& c0 = rawHalf0Ctrs[from1To0[i]];
- const point& c0 = half0Ctrs[from1To0[i]];
+ const point& c0 = half0Ctrs[faceMap[i]];
const point& c1 = half1Ctrs[i];
writeOBJ(ccStr, c0, c1, vertI);
}
}
}
- }
-
- // 3. Baffles(coincident faces) converted into cyclics (e.g. jump)
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- if (!matchedAll)
- {
- label baffleI = 0;
-
- forAll(pp, faceI)
+ if (!matchedAll)
{
- const face& f = pp.localFaces()[faceI];
- const labelList& pFaces = pp.pointFaces()[f[0]];
-
- label matchedFaceI = -1;
-
- forAll(pFaces, i)
- {
- label otherFaceI = pFaces[i];
-
- if (otherFaceI > faceI)
- {
- const face& otherF = pp.localFaces()[otherFaceI];
-
- // Note: might pick up two similar oriented faces
- // (but that is illegal anyway)
- if (f == otherF)
- {
- matchedFaceI = otherFaceI;
- break;
- }
- }
- }
-
- if (matchedFaceI != -1)
- {
- half0ToPatch[baffleI] = faceI;
- half1ToPatch[baffleI] = matchedFaceI;
- baffleI++;
- }
- }
-
- if (baffleI == halfSize)
- {
- // And redo all matching
- half0Faces = UIndirectList<face>(pp, half0ToPatch);
- half1Faces = UIndirectList<face>(pp, half1ToPatch);
-
- getCentresAndAnchors
- (
- pp,
- half0Faces,
- half1Faces,
-
- ppPoints,
- half0Ctrs,
- half1Ctrs,
- anchors0,
- tols
- );
-
- // Geometric match of face centre vectors
- matchedAll = matchPoints
+ SeriousErrorIn
(
- half1Ctrs,
- half0Ctrs,
- tols,
- false,
- from1To0
- );
-
- if (debug)
- {
- Pout<< "cyclicPolyPatch::order : test if baffles:"
- << matchedAll << endl;
- // Dump halves
- fileName nm0("match3_"+name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0Faces, ppPoints);
-
- fileName nm1("match3_"+name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half1"
- << " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, half1Faces, pp.points());
-
- OFstream ccStr
- (
- boundaryMesh().mesh().time().path()
- /"match3_"+ name() + "_faceCentres.obj"
- );
- Pout<< "cyclicPolyPatch::order : "
- << "Dumping currently found cyclic match as lines between"
- << " corresponding face centres to file " << ccStr.name()
- << endl;
-
- // Recalculate untransformed face centres
- //pointField rawHalf0Ctrs =
- // calcFaceCentres(half0Faces, pp.points());
- label vertI = 0;
+ "cyclicPolyPatch::order"
+ "(const primitivePatch&, labelList&, labelList&) const"
+ ) << "Patch:" << name() << " : "
+ << "Cannot match vectors to faces on both sides of patch"
+ << endl
+ << " Perhaps your faces do not match?"
+ << " The obj files written contain the current match." << endl
+ << " Continuing with incorrect face ordering from now on!"
+ << endl;
- forAll(half1Ctrs, i)
- {
- if (from1To0[i] != -1)
- {
- // Write edge between c1 and c0
- //const point& c0 = rawHalf0Ctrs[from1To0[i]];
- const point& c0 = half0Ctrs[from1To0[i]];
- const point& c1 = half1Ctrs[i];
- writeOBJ(ccStr, c0, c1, vertI);
- }
- }
- }
+ return false;
}
- }
- // 4. Automatic geometric ordering
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- if (!matchedAll)
- {
- // Split faces according to feature angle or topology
- bool okSplit = getGeometricHalves(pp, half0ToPatch, half1ToPatch);
-
- if (!okSplit)
+ // Set rotation.
+ forAll(faceMap, oldFaceI)
{
- // Did not split into two equal parts.
- return false;
- }
-
- // And redo all matching
- half0Faces = UIndirectList<face>(pp, half0ToPatch);
- half1Faces = UIndirectList<face>(pp, half1ToPatch);
-
- getCentresAndAnchors
- (
- pp,
- half0Faces,
- half1Faces,
-
- ppPoints,
- half0Ctrs,
- half1Ctrs,
- anchors0,
- tols
- );
-
- // Geometric match of face centre vectors
- matchedAll = matchPoints
- (
- half1Ctrs,
- half0Ctrs,
- tols,
- false,
- from1To0
- );
+ // The face f will be at newFaceI (after morphing) and we want its
+ // anchorPoint (= f[0]) to align with the anchorpoint for the
+ // corresponding face on the other side.
- if (debug)
- {
- Pout<< "cyclicPolyPatch::order : automatic ordering result:"
- << matchedAll << endl;
- // Dump halves
- fileName nm0("match4_"+name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0Faces, ppPoints);
+ label newFaceI = faceMap[oldFaceI];
- fileName nm1("match4_"+name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half1"
- << " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, half1Faces, pp.points());
+ const point& wantedAnchor = anchors0[newFaceI];
- OFstream ccStr
+ rotation[newFaceI] = getRotation
(
- boundaryMesh().mesh().time().path()
- /"match4_"+ name() + "_faceCentres.obj"
+ pp.points(),
+ pp[oldFaceI],
+ wantedAnchor,
+ tols[oldFaceI]
);
- Pout<< "cyclicPolyPatch::order : "
- << "Dumping currently found cyclic match as lines between"
- << " corresponding face centres to file " << ccStr.name()
- << endl;
- // Recalculate untransformed face centres
- //pointField rawHalf0Ctrs =
- // calcFaceCentres(half0Faces, pp.points());
- label vertI = 0;
-
- forAll(half1Ctrs, i)
+ if (rotation[newFaceI] == -1)
{
- if (from1To0[i] != -1)
- {
- // Write edge between c1 and c0
- //const point& c0 = rawHalf0Ctrs[from1To0[i]];
- const point& c0 = half0Ctrs[from1To0[i]];
- const point& c1 = half1Ctrs[i];
- writeOBJ(ccStr, c0, c1, vertI);
- }
+ SeriousErrorIn
+ (
+ "cyclicPolyPatch::order(const primitivePatch&"
+ ", labelList&, labelList&) const"
+ ) << "in patch " << name()
+ << " : "
+ << "Cannot find point on face " << pp[oldFaceI]
+ << " with vertices "
+ << IndirectList<point>(pp.points(), pp[oldFaceI])()
+ << " that matches point " << wantedAnchor
+ << " when matching the halves of processor patch " << name()
+ << "Continuing with incorrect face ordering from now on!"
+ << endl;
+
+ return false;
}
}
- }
-
-
- if (!matchedAll || debug)
- {
- // Dump halves
- fileName nm0(name()+"_half0_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half0"
- << " faces to OBJ file " << nm0 << endl;
- writeOBJ(nm0, half0Faces, pp.points());
- fileName nm1(name()+"_half1_faces.obj");
- Pout<< "cyclicPolyPatch::order : Writing half1"
- << " faces to OBJ file " << nm1 << endl;
- writeOBJ(nm1, half1Faces, pp.points());
+ ownerPatchPtr_.clear();
- OFstream ccStr
- (
- boundaryMesh().mesh().time().path()
- /name() + "_faceCentres.obj"
- );
- Pout<< "cyclicPolyPatch::order : "
- << "Dumping currently found cyclic match as lines between"
- << " corresponding face centres to file " << ccStr.name()
- << endl;
+ // Return false if no change neccesary, true otherwise.
- // Recalculate untransformed face centres
- //pointField rawHalf0Ctrs = calcFaceCentres(half0Faces, pp.points());
- label vertI = 0;
-
- forAll(half1Ctrs, i)
+ forAll(faceMap, faceI)
{
- if (from1To0[i] != -1)
+ if (faceMap[faceI] != faceI || rotation[faceI] != 0)
{
- // Write edge between c1 and c0
- //const point& c0 = rawHalf0Ctrs[from1To0[i]];
- const point& c0 = half0Ctrs[from1To0[i]];
- const point& c1 = half1Ctrs[i];
- writeOBJ(ccStr, c0, c1, vertI);
+ return true;
}
}
- }
-
- if (!matchedAll)
- {
- SeriousErrorIn
- (
- "cyclicPolyPatch::order"
- "(const primitivePatch&, labelList&, labelList&) const"
- ) << "Patch:" << name() << " : "
- << "Cannot match vectors to faces on both sides of patch" << endl
- << " Perhaps your faces do not match?"
- << " The obj files written contain the current match." << endl
- << " Continuing with incorrect face ordering from now on!"
- << endl;
-
- return false;
- }
-
-
- // Set faceMap such that half0 faces get first and corresponding half1
- // faces last.
- matchAnchors
- (
- true, // report if anchor matching error
- pp,
- half0ToPatch,
- anchors0,
- half1ToPatch,
- half1Faces,
- from1To0,
- tols,
- faceMap,
- rotation
- );
-
- // Return false if no change neccesary, true otherwise.
-
- forAll(faceMap, faceI)
- {
- if (faceMap[faceI] != faceI || rotation[faceI] != 0)
- {
- return true;
- }
+ return false;
}
-
- return false;
}
void Foam::cyclicPolyPatch::write(Ostream& os) const
{
polyPatch::write(os);
- os.writeKeyword("featureCos") << featureCos_ << token::END_STATEMENT << nl;
+ os.writeKeyword("neighbourPatch") << neighbPatchName_
+ << token::END_STATEMENT << nl;
switch (transform_)
{
case ROTATIONAL:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index f8ae312f20e08a1373c2d76a6b3922ea1ea0822f..324a9f90d6e0d3ef5171bda279179655b601bfef 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -29,11 +29,10 @@ Description
Note: morph patch face ordering uses geometric matching so with the
following restrictions:
- -halves should be flat planes.
+ -coupled patches should be flat planes.
-no rotation in patch plane
- Uses a featureCos to find the two halves (or should be fully
- disconnected). Uses coupledPolyPatch::calcFaceTol to calculate
+ Uses coupledPolyPatch::calcFaceTol to calculate
tolerance per face which might need tweaking.
Switch on 'cyclicPolyPatch' debug flag to write .obj files to show
@@ -48,10 +47,9 @@ SourceFiles
#define cyclicPolyPatch_H
#include "coupledPolyPatch.H"
-#include "SubField.H"
-#include "FixedList.H"
#include "edgeList.H"
-#include "transform.H"
+#include "polyBoundaryMesh.H"
+#include "diagTensorField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,18 +80,11 @@ private:
// Private data
- //- List of edges formed from connected points. e[0] is the point on
- // the first half of the patch, e[1] the corresponding point on the
- // second half.
- mutable edgeList* coupledPointsPtr_;
-
- //- List of connected edges. e[0] is the edge on the first half of the
- // patch, e[1] the corresponding edge on the second half.
- mutable edgeList* coupledEdgesPtr_;
+ //- Name of other half
+ const word neighbPatchName_;
- //- Morph:angle between normals of neighbouring faces.
- // Used to split cyclic into halves.
- scalar featureCos_;
+ //- Index of other half
+ mutable label neighbPatchID_;
//- Type of transformation - rotational or translational
transformType transform_;
@@ -112,60 +103,50 @@ private:
vector separationVector_;
+ //- List of edges formed from connected points. e[0] is the point on
+ // the first half of the patch, e[1] the corresponding point on the
+ // second half.
+ mutable edgeList* coupledPointsPtr_;
+
+ //- List of connected edges. e[0] is the edge on the first half of the
+ // patch, e[1] the corresponding edge on the second half.
+ mutable edgeList* coupledEdgesPtr_;
+
+ //- Temporary storage of owner side patch during ordering.
+ mutable autoPtr<primitivePatch> ownerPatchPtr_;
+
+
// Private Member Functions
//- Find amongst selected faces the one with the largest area
static label findMaxArea(const pointField&, const faceList&);
+ void calcTransforms
+ (
+ const primitivePatch& half0,
+ const UList<point>& half0Ctrs,
+ const UList<point>& half0Areas,
+ const UList<point>& half1Ctrs,
+ const UList<point>& half1Areas
+ );
// Face ordering
- //- Find the two parts of the faces of pp using feature edges.
- // Returns true if successfull.
- bool getGeometricHalves
- (
- const primitivePatch&,
- labelList&,
- labelList&
- ) const;
-
//- Calculate geometric factors of the two halves.
void getCentresAndAnchors
(
- const primitivePatch&,
- const faceList& half0Faces,
- const faceList& half1Faces,
+ const primitivePatch& pp0,
+ const primitivePatch& pp1,
- pointField& ppPoints,
pointField& half0Ctrs,
pointField& half1Ctrs,
pointField& anchors0,
scalarField& tols
) const;
- //- Given matched faces matches the anchor point. Sets faceMap,
- // rotation. Returns true if all matched.
- bool matchAnchors
- (
- const bool report,
- const primitivePatch&,
- const labelList&,
- const pointField&,
- const labelList&,
- const faceList&,
- const labelList&,
- const scalarField&,
-
- labelList& faceMap,
- labelList& rotation
- ) const;
-
//- For rotational cases, try to find a unique face on each side
// of the cyclic.
- label getConsistentRotationFace
- (
- const pointField& faceCentres
- ) const;
+ label getConsistentRotationFace(const pointField&) const;
protected:
@@ -178,9 +159,30 @@ protected:
//- Initialise the calculation of the patch geometry
virtual void initGeometry(PstreamBuffers&);
+ //- Initialise the calculation of the patch geometry
+ virtual void initGeometry
+ (
+ const primitivePatch& referPatch,
+ UList<point>& nbrCtrs,
+ UList<point>& nbrAreas,
+ UList<point>& nbrCc
+ );
+
//- Calculate the patch geometry
virtual void calcGeometry(PstreamBuffers&);
+ //- Calculate the patch geometry
+ virtual void calcGeometry
+ (
+ const primitivePatch& referPatch,
+ const UList<point>& thisCtrs,
+ const UList<point>& thisAreas,
+ const UList<point>& thisCc,
+ const UList<point>& nbrCtrs,
+ const UList<point>& nbrAreas,
+ const UList<point>& nbrCc
+ );
+
//- Initialise the patches for moving points
virtual void initMovePoints(PstreamBuffers&, const pointField&);
@@ -231,7 +233,8 @@ public:
const polyBoundaryMesh& bm,
const label index,
const label newSize,
- const label newStart
+ const label newStart,
+ const word& neighbPatchName
);
//- Construct given the original patch and a map
@@ -262,7 +265,15 @@ public:
{
return autoPtr<polyPatch>
(
- new cyclicPolyPatch(*this, bm, index, newSize, newStart)
+ new cyclicPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ newSize,
+ newStart,
+ neighbPatchName_
+ )
);
}
@@ -289,103 +300,107 @@ public:
// Member Functions
- //- Return connected points (in patch local point indexing). Demand
- // driven calculation. Does primitivePatch::clearOut after calculation!
- const edgeList& coupledPoints() const;
-
- //- Return connected edges (in patch local edge indexing). Demand
- // driven calculation. Does primitivePatch::clearOut after calculation!
- const edgeList& coupledEdges() const;
-
-
-
- // Transformation
+ const word& neighbPatchName() const
+ {
+ return neighbPatchName_;
+ }
- vector separation(const label facei) const
+ //- Neighbour patchID.
+ virtual label neighbPatchID() const
+ {
+ if (neighbPatchID_ == -1)
{
- if (facei < size()/2)
+ neighbPatchID_ = this->boundaryMesh().findPatchID
+ (
+ neighbPatchName_
+ );
+ if (neighbPatchID_ == -1)
{
- return coupledPolyPatch::separation()[0];
- }
- else
- {
- return -coupledPolyPatch::separation()[0];
+ FatalErrorIn("cyclicPolyPatch::neighbPatchID() const")
+ << "Illegal neighbourPatch name " << neighbPatchName_
+ << endl << "Valid patch names are "
+ << this->boundaryMesh().names()
+ << exit(FatalError);
}
}
+ return neighbPatchID_;
+ }
- const tensor& transformT(const label facei) const
- {
- if (facei < size()/2)
- {
- return reverseT()[0];
- }
- else
- {
- return forwardT()[0];
- }
- }
+ virtual bool owner() const
+ {
+ return index() < neighbPatchID();
+ }
- template<class T>
- T transform(const T& t, const label facei) const
- {
- if (parallel())
- {
- return t;
- }
- else
- {
- return Foam::transform(transformT(facei), t);
- }
- }
+ virtual bool neighbour() const
+ {
+ return !owner();
+ }
- label transformLocalFace(const label facei) const
- {
- if (facei < size()/2)
- {
- return facei + size()/2;
- }
- else
- {
- return facei - size()/2;
- }
- }
+ const cyclicPolyPatch& neighbPatch() const
+ {
+ const polyPatch& pp = this->boundaryMesh()[neighbPatchID()];
+ return refCast<const cyclicPolyPatch>(pp);
+ }
- label transformGlobalFace(const label facei) const
- {
- if (facei - start() < size()/2)
- {
- return facei + size()/2;
- }
- else
- {
- return facei - size()/2;
- }
- }
+ //- Return connected points (from patch local to neighbour patch local)
+ // Demand driven calculation. Does primitivePatch::clearOut after
+ // calculation!
+ const edgeList& coupledPoints() const;
- //- Type of transform
- transformType transform() const
- {
- return transform_;
- }
+ //- Return connected edges (from patch local to neighbour patch local).
+ // Demand driven calculation. Does primitivePatch::clearOut after
+ // calculation!
+ const edgeList& coupledEdges() const;
- //- Axis of rotation for rotational cyclics
- const vector& rotationAxis() const
- {
- return rotationAxis_;
- }
+ //- Transform a patch-based position from other side to this side
+ virtual void transformPosition(pointField& l) const;
- //- point on axis of rotation for rotational cyclics
- const point& rotationCentre() const
+
+ // Transformation
+
+ label transformGlobalFace(const label facei) const
+ {
+ label offset = facei-start();
+ label neighbStart = neighbPatch().start();
+
+ if (offset >= 0 && offset < size())
{
- return rotationCentre_;
+ return neighbStart+offset;
}
-
- //- Translation vector for translational cyclics
- const vector& separationVector() const
+ else
{
- return separationVector_;
+ FatalErrorIn
+ (
+ "cyclicPolyPatch::transformGlobalFace(const label) const"
+ ) << "Face " << facei << " not in patch " << name()
+ << exit(FatalError);
+ return -1;
}
+ }
+ //- Type of transform
+ transformType transform() const
+ {
+ return transform_;
+ }
+
+ //- Axis of rotation for rotational cyclics
+ const vector& rotationAxis() const
+ {
+ return rotationAxis_;
+ }
+
+ //- point on axis of rotation for rotational cyclics
+ const point& rotationCentre() const
+ {
+ return rotationCentre_;
+ }
+
+ //- Translation vector for translational cyclics
+ const vector& separationVector() const
+ {
+ return separationVector_;
+ }
//- Initialize ordering for primitivePatch. Does not
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..e9095162d0d4199ff57db0834691fed7f28bb3fd
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(cyclicSlipPolyPatch, 0);
+
+ addToRunTimeSelectionTable(polyPatch, cyclicSlipPolyPatch, word);
+ addToRunTimeSelectionTable(polyPatch, cyclicSlipPolyPatch, dictionary);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..f44540f2a3f713edc058ebc3b5923695e32a41d8
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::cyclicSlipPolyPatch
+
+Description
+ Copy of cyclicSlip - used to be able to instantiate cyclicSlip pointPatch
+ which is cyclicSlip with slip constraints
+
+SourceFiles
+ cyclicSlipPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipPolyPatch_H
+#define cyclicSlipPolyPatch_H
+
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cyclicSlipPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class cyclicSlipPolyPatch
+:
+ public cyclicPolyPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName("cyclicSlip");
+
+
+ // Constructors
+
+ //- Construct from components
+ cyclicSlipPolyPatch
+ (
+ const word& name,
+ const label size,
+ const label start,
+ const label index,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(name, size, start, index, bm)
+ {}
+
+ //- Construct from dictionary
+ cyclicSlipPolyPatch
+ (
+ const word& name,
+ const dictionary& dict,
+ const label index,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(name, dict, index, bm)
+ {}
+
+ //- Construct as copy, resetting the boundary mesh
+ cyclicSlipPolyPatch
+ (
+ const cyclicSlipPolyPatch& pp,
+ const polyBoundaryMesh& bm
+ )
+ :
+ cyclicPolyPatch(pp, bm)
+ {}
+
+ //- Construct given the original patch and resetting the
+ // face list and boundary mesh information
+ cyclicSlipPolyPatch
+ (
+ const cyclicSlipPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart,
+ const word& neighbPatchName
+ )
+ :
+ cyclicPolyPatch(pp, bm, index, newSize, newStart, neighbPatchName)
+ {}
+
+
+ //- Construct given the original patch and a map
+ cyclicSlipPolyPatch
+ (
+ const cyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+ )
+ :
+ cyclicPolyPatch(pp, bm, index, mapAddressing, newStart)
+ {}
+
+
+ //- Construct and return a clone, resetting the boundary mesh
+ virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+ {
+ return autoPtr<polyPatch>(new cyclicSlipPolyPatch(*this, bm));
+ }
+
+ //- Construct and return a clone, resetting the face list
+ // and boundary mesh
+ virtual autoPtr<polyPatch> clone
+ (
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart
+ ) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new cyclicSlipPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ newSize,
+ newStart,
+ neighbPatchName()
+ )
+ );
+ }
+
+ //- Construct and return a clone, resetting the face list
+ // and boundary mesh
+ virtual autoPtr<polyPatch> clone
+ (
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+ ) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new cyclicSlipPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ mapAddressing,
+ newStart
+ )
+ );
+ }
+
+
+ // Destructor
+
+ virtual ~cyclicSlipPolyPatch()
+ {}
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index f2b5c4b09525433c1e425f740033c61598866147..277a274b91087d2396e4f2d5033571d6c707e569 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -62,9 +62,9 @@ Foam::processorPolyPatch::processorPolyPatch
neighbProcNo_(neighbProcNo),
neighbFaceCentres_(),
neighbFaceAreas_(),
- neighbFaceCellCentres_(),
- neighbPointsPtr_(NULL),
- neighbEdgesPtr_(NULL)
+ neighbFaceCellCentres_()
+// neighbPointsPtr_(NULL),
+// neighbEdgesPtr_(NULL)
{}
@@ -81,9 +81,9 @@ Foam::processorPolyPatch::processorPolyPatch
neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
neighbFaceCentres_(),
neighbFaceAreas_(),
- neighbFaceCellCentres_(),
- neighbPointsPtr_(NULL),
- neighbEdgesPtr_(NULL)
+ neighbFaceCellCentres_()
+// neighbPointsPtr_(NULL),
+// neighbEdgesPtr_(NULL)
{}
@@ -98,9 +98,9 @@ Foam::processorPolyPatch::processorPolyPatch
neighbProcNo_(pp.neighbProcNo_),
neighbFaceCentres_(),
neighbFaceAreas_(),
- neighbFaceCellCentres_(),
- neighbPointsPtr_(NULL),
- neighbEdgesPtr_(NULL)
+ neighbFaceCellCentres_()
+// neighbPointsPtr_(NULL),
+// neighbEdgesPtr_(NULL)
{}
@@ -118,9 +118,9 @@ Foam::processorPolyPatch::processorPolyPatch
neighbProcNo_(pp.neighbProcNo_),
neighbFaceCentres_(),
neighbFaceAreas_(),
- neighbFaceCellCentres_(),
- neighbPointsPtr_(NULL),
- neighbEdgesPtr_(NULL)
+ neighbFaceCellCentres_()
+// neighbPointsPtr_(NULL),
+// neighbEdgesPtr_(NULL)
{}
@@ -129,7 +129,7 @@ Foam::processorPolyPatch::processorPolyPatch
const processorPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const unallocLabelList& mapAddressing,
const label newStart
)
:
@@ -138,9 +138,9 @@ Foam::processorPolyPatch::processorPolyPatch
neighbProcNo_(pp.neighbProcNo_),
neighbFaceCentres_(),
neighbFaceAreas_(),
- neighbFaceCellCentres_(),
- neighbPointsPtr_(NULL),
- neighbEdgesPtr_(NULL)
+ neighbFaceCellCentres_()
+// neighbPointsPtr_(NULL),
+// neighbEdgesPtr_(NULL)
{}
@@ -148,8 +148,8 @@ Foam::processorPolyPatch::processorPolyPatch
Foam::processorPolyPatch::~processorPolyPatch()
{
- deleteDemandDrivenData(neighbPointsPtr_);
- deleteDemandDrivenData(neighbEdgesPtr_);
+ neighbPointsPtr_.clear();
+ neighbEdgesPtr_.clear();
}
@@ -157,6 +157,7 @@ Foam::processorPolyPatch::~processorPolyPatch()
void Foam::processorPolyPatch::initGeometry(PstreamBuffers& pBufs)
{
+//Pout<< "**processorPolyPatch::initGeometry()" << endl;
if (Pstream::parRun())
{
UOPstream toNeighbProc(neighbProcNo(), pBufs);
@@ -171,6 +172,7 @@ void Foam::processorPolyPatch::initGeometry(PstreamBuffers& pBufs)
void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
{
+//Pout<< "processorPolyPatch::calcGeometry() for " << name() << endl;
if (Pstream::parRun())
{
{
@@ -182,6 +184,9 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
>> neighbFaceCellCentres_;
}
+//Pout<< "processorPolyPatch::calcGeometry() : received data for "
+// << neighbFaceCentres_.size() << " faces." << endl;
+
// My normals
vectorField faceNormals(size());
@@ -247,6 +252,9 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
nbrFaceNormals,
calcFaceTol(*this, points(), faceCentres())
);
+//Pout<< "**neighbFaceCentres_:" << neighbFaceCentres_ << endl;
+//Pout<< "**neighbFaceAreas_:" << neighbFaceAreas_ << endl;
+//Pout<< "**neighbFaceCellCentres_:" << neighbFaceCellCentres_ << endl;
}
}
@@ -276,9 +284,6 @@ void Foam::processorPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
{
polyPatch::initUpdateMesh(pBufs);
- deleteDemandDrivenData(neighbPointsPtr_);
- deleteDemandDrivenData(neighbEdgesPtr_);
-
if (Pstream::parRun())
{
// Express all points as patch face and index in face.
@@ -327,6 +332,9 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
// For completeness
polyPatch::updateMesh(pBufs);
+ neighbPointsPtr_.clear();
+ neighbEdgesPtr_.clear();
+
if (Pstream::parRun())
{
labelList nbrPointFace;
@@ -352,8 +360,8 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
// Convert points.
// ~~~~~~~~~~~~~~~
- neighbPointsPtr_ = new labelList(nPoints(), -1);
- labelList& neighbPoints = *neighbPointsPtr_;
+ neighbPointsPtr_.reset(new labelList(nPoints(), -1));
+ labelList& neighbPoints = neighbPointsPtr_();
forAll(nbrPointFace, nbrPointI)
{
@@ -386,8 +394,8 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
// Convert edges.
// ~~~~~~~~~~~~~~
- neighbEdgesPtr_ = new labelList(nEdges(), -1);
- labelList& neighbEdges = *neighbEdgesPtr_;
+ neighbEdgesPtr_.reset(new labelList(nEdges(), -1));
+ labelList& neighbEdges = neighbEdgesPtr_();
forAll(nbrEdgeFace, nbrEdgeI)
{
@@ -425,25 +433,25 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
const Foam::labelList& Foam::processorPolyPatch::neighbPoints() const
{
- if (!neighbPointsPtr_)
+ if (!neighbPointsPtr_.valid())
{
FatalErrorIn("processorPolyPatch::neighbPoints() const")
<< "No extended addressing calculated for patch " << name()
<< abort(FatalError);
}
- return *neighbPointsPtr_;
+ return neighbPointsPtr_();
}
const Foam::labelList& Foam::processorPolyPatch::neighbEdges() const
{
- if (!neighbEdgesPtr_)
+ if (!neighbEdgesPtr_.valid())
{
FatalErrorIn("processorPolyPatch::neighbEdges() const")
<< "No extended addressing calculated for patch " << name()
<< abort(FatalError);
}
- return *neighbEdgesPtr_;
+ return neighbEdgesPtr_();
}
@@ -470,7 +478,7 @@ void Foam::processorPolyPatch::initOrder
writeOBJ(nm, pp, pp.points());
// Calculate my face centres
- pointField ctrs(calcFaceCentres(pp, pp.points()));
+ const pointField& fc = pp.faceCentres();
OFstream localStr
(
@@ -478,26 +486,22 @@ void Foam::processorPolyPatch::initOrder
/name() + "_localFaceCentres.obj"
);
Pout<< "processorPolyPatch::order : "
- << "Dumping " << ctrs.size()
+ << "Dumping " << fc.size()
<< " local faceCentres to " << localStr.name() << endl;
- forAll(ctrs, faceI)
+ forAll(fc, faceI)
{
- writeOBJ(localStr, ctrs[faceI]);
+ writeOBJ(localStr, fc[faceI]);
}
}
- const bool isMaster = Pstream::myProcNo() < neighbProcNo();
-
- if (isMaster)
+ if (owner())
{
- pointField ctrs(calcFaceCentres(pp, pp.points()));
-
pointField anchors(getAnchorPoints(pp, pp.points()));
// Now send all info over to the neighbour
UOPstream toNeighbour(neighbProcNo(), pBufs);
- toNeighbour << ctrs << anchors;
+ toNeighbour << pp.faceCentres() << anchors;
}
}
@@ -514,6 +518,8 @@ bool Foam::processorPolyPatch::order
labelList& rotation
) const
{
+ // Note: we only get the faces that originate from internal faces.
+
if (!Pstream::parRun())
{
return false;
@@ -525,9 +531,7 @@ bool Foam::processorPolyPatch::order
rotation.setSize(pp.size());
rotation = 0;
- const bool isMaster = Pstream::myProcNo() < neighbProcNo();
-
- if (isMaster)
+ if (owner())
{
// Do nothing (i.e. identical mapping, zero rotation).
// See comment at top.
@@ -549,11 +553,8 @@ bool Foam::processorPolyPatch::order
fromNeighbour >> masterCtrs >> masterAnchors;
}
- // Calculate my face centres
- pointField ctrs(calcFaceCentres(pp, pp.points()));
-
// Calculate typical distance from face centre
- scalarField tols(calcFaceTol(pp, pp.points(), ctrs));
+ scalarField tols(calcFaceTol(pp, pp.points(), pp.faceCentres()));
if (debug || masterCtrs.size() != pp.size())
{
@@ -591,84 +592,14 @@ bool Foam::processorPolyPatch::order
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// 1. Try existing ordering and transformation
- bool matchedAll = false;
-
- if
- (
- separated()
- && (separation().size() == 1 || separation().size() == pp.size())
- )
- {
- vectorField transformedCtrs;
-
- const vectorField& v = separation();
-
- if (v.size() == 1)
- {
- transformedCtrs = masterCtrs-v[0];
- }
- else
- {
- transformedCtrs = masterCtrs-v;
- }
- matchedAll = matchPoints
- (
- ctrs,
- transformedCtrs,
- tols,
- true,
- faceMap
- );
-
- if (matchedAll)
- {
- // Use transformed centers from now on
- masterCtrs = transformedCtrs;
-
- // Transform anchors
- if (v.size() == 1)
- {
- masterAnchors -= v[0];
- }
- else
- {
- masterAnchors -= v;
- }
- }
- }
- else if
+ bool matchedAll = matchPoints
(
- !parallel()
- && (forwardT().size() == 1 || forwardT().size() == pp.size())
- )
- {
- vectorField transformedCtrs = masterCtrs;
- transformList(forwardT(), transformedCtrs);
- matchedAll = matchPoints
- (
- ctrs,
- transformedCtrs,
- tols,
- true,
- faceMap
- );
-
- if (matchedAll)
- {
- // Use transformed centers from now on
- masterCtrs = transformedCtrs;
-
- // Transform anchors
- transformList(forwardT(), masterAnchors);
- }
- }
-
-
- // 2. Try zero separation automatic matching
- if (!matchedAll)
- {
- matchedAll = matchPoints(ctrs, masterCtrs, tols, true, faceMap);
- }
+ pp.faceCentres(),
+ masterCtrs,
+ tols,
+ true,
+ faceMap
+ );
if (!matchedAll || debug)
{
@@ -695,14 +626,14 @@ bool Foam::processorPolyPatch::order
label vertI = 0;
- forAll(ctrs, faceI)
+ forAll(pp.faceCentres(), faceI)
{
label masterFaceI = faceMap[faceI];
if (masterFaceI != -1)
{
const point& c0 = masterCtrs[masterFaceI];
- const point& c1 = ctrs[faceI];
+ const point& c1 = pp.faceCentres()[faceI];
writeOBJ(ccStr, c0, c1, vertI);
}
}
@@ -718,7 +649,7 @@ bool Foam::processorPolyPatch::order
<< "Cannot match vectors to faces on both sides of patch"
<< endl
<< " masterCtrs[0]:" << masterCtrs[0] << endl
- << " ctrs[0]:" << ctrs[0] << endl
+ << " ctrs[0]:" << pp.faceCentres()[0] << endl
<< " Please check your topology changes or maybe you have"
<< " multiple separated (from cyclics) processor patches"
<< endl
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index 8b168b9806ae23444d3c907afea901c30ac7cd86..0af1cfaa17f334f28006754162207e7449cb7ede 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -40,6 +40,8 @@ SourceFiles
#define processorPolyPatch_H
#include "coupledPolyPatch.H"
+#include "polyBoundaryMesh.H"
+#include "faceListFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -70,23 +72,11 @@ class processorPolyPatch
//- Corresponding neighbouring local point label for every local point
// (so localPoints()[i] == neighb.localPoints()[neighbPoints_[i]])
- mutable labelList* neighbPointsPtr_;
+ mutable autoPtr<labelList> neighbPointsPtr_;
//- Corresponding neighbouring local edge label for every local edge
// (so edges()[i] == neighb.edges()[neighbEdges_[i]])
- mutable labelList* neighbEdgesPtr_;
-
-
-
- // Private static data
-
- //- Whether to use geometric or topological matching
- static bool geometricMatch_;
-
- //- Relative tolerance (for geometric matching only). Is factor of
- // maximum edge length per face.
- static scalar matchTol_;
-
+ mutable autoPtr<labelList> neighbEdgesPtr_;
protected:
@@ -98,6 +88,22 @@ protected:
//- Calculate the patch geometry
void calcGeometry(PstreamBuffers&);
+ //- Calculate the patch geometry with externally
+ // provided geometry
+ virtual void calcGeometry
+ (
+ const primitivePatch& referPatch,
+ const UList<point>& thisCtrs,
+ const UList<point>& thisAreas,
+ const UList<point>& thisCc,
+ const UList<point>& nbrCtrs,
+ const UList<point>& nbrAreas,
+ const UList<point>& nbrCc
+ )
+ {
+ notImplemented("processorPolyPatch::calcGeometry(..)");
+ }
+
//- Initialise the patches for moving points
void initMovePoints(PstreamBuffers&, const pointField&);
@@ -236,7 +242,7 @@ public:
}
//- Does the processor own the patch ?
- bool owner() const
+ virtual bool owner() const
{
return (myProcNo_ < neighbProcNo_);
}
@@ -265,16 +271,21 @@ public:
return neighbFaceCellCentres_;
}
- //- Return neighbour point labels. This is for my local point (-1 or)
- // the corresponding local point on the other side. It is -1 if
- // there are multiple corresponding points on this or the other side
- // (can happen for cyclics being converted into proc patches)
+ //- Return neighbour point labels. WIP.
const labelList& neighbPoints() const;
- //- Return neighbour edge labels. This is for my local edge (-1 or) the
- // corresponding local edge on the other side. See above for -1 cause.
+ //- Return neighbour edge labels. WIP.
const labelList& neighbEdges() const;
+ //- Return message tag to use for communication
+ virtual int tag() const
+ {
+ return Pstream::msgType();
+ }
+
+ //- Transform a patch-based position from other side to this side
+ virtual void transformPosition(pointField& l) const
+ {}
//- Initialize ordering for primitivePatch. Does not
// refer to *this (except for name() and type() etc.)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..351ff780fb78fb6ceb99d7906f2beb0ae2951d98
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -0,0 +1,263 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "SubField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(processorCyclicPolyPatch, 0);
+ addToRunTimeSelectionTable(polyPatch, processorCyclicPolyPatch, dictionary);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
+(
+ const word& name,
+ const label size,
+ const label start,
+ const label index,
+ const polyBoundaryMesh& bm,
+ const int myProcNo,
+ const int neighbProcNo,
+ const word& referPatchName
+)
+:
+ processorPolyPatch(name, size, start, index, bm, myProcNo, neighbProcNo),
+ tag_
+ (
+ Pstream::nProcs()*max(myProcNo, neighbProcNo)
+ + min(myProcNo, neighbProcNo)
+ ),
+ referPatchName_(referPatchName),
+ referPatchID_(-1)
+{
+ if (debug)
+ {
+ Pout<< "processorCyclicPolyPatch " << name << " uses tag " << tag_
+ << endl;
+ }
+}
+
+
+Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
+(
+ const word& name,
+ const dictionary& dict,
+ const label index,
+ const polyBoundaryMesh& bm
+)
+:
+ processorPolyPatch(name, dict, index, bm),
+ tag_
+ (
+ Pstream::nProcs()*max(myProcNo(), neighbProcNo())
+ + min(myProcNo(), neighbProcNo())
+ ),
+ referPatchName_(dict.lookup("referPatch")),
+ referPatchID_(-1)
+{
+ if (debug)
+ {
+ Pout<< "processorCyclicPolyPatch " << name << " uses tag " << tag_
+ << endl;
+ }
+}
+
+
+Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
+(
+ const processorCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm
+)
+:
+ processorPolyPatch(pp, bm),
+ tag_(pp.tag_),
+ referPatchName_(pp.referPatchName()),
+ referPatchID_(-1)
+{}
+
+
+Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
+(
+ const processorCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart,
+ const word& referPatchName
+)
+:
+ processorPolyPatch(pp, bm, index, newSize, newStart),
+ tag_(pp.tag_),
+ referPatchName_(referPatchName),
+ referPatchID_(-1)
+{}
+
+
+Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
+(
+ const processorCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+)
+:
+ processorPolyPatch(pp, bm, index, mapAddressing, newStart),
+ tag_(pp.tag_),
+ referPatchName_(pp.referPatchName()),
+ referPatchID_(-1)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::processorCyclicPolyPatch::~processorCyclicPolyPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+
+void Foam::processorCyclicPolyPatch::initGeometry(PstreamBuffers& pBufs)
+{
+ // Send over processorPolyPatch data
+ processorPolyPatch::initGeometry(pBufs);
+}
+
+
+void Foam::processorCyclicPolyPatch::calcGeometry(PstreamBuffers& pBufs)
+{
+ // Receive and initialise processorPolyPatch data
+ processorPolyPatch::calcGeometry(pBufs);
+
+ if (Pstream::parRun())
+ {
+
+ // Where do we store the calculated transformation?
+ // - on the processor patch?
+ // - on the underlying cyclic patch?
+ // - or do we not auto-calculate the transformation but
+ // have option of reading it.
+
+ // Update underlying cyclic
+ coupledPolyPatch& pp = const_cast<coupledPolyPatch&>(referPatch());
+
+ Pout<< "updating geometry on refered patch:" << pp.name() << endl;
+
+ pp.calcGeometry
+ (
+ *this,
+ faceCentres(),
+ faceAreas(),
+ faceCellCentres(),
+ neighbFaceCentres(),
+ neighbFaceAreas(),
+ neighbFaceCellCentres()
+ );
+ }
+}
+
+
+void Foam::processorCyclicPolyPatch::initMovePoints
+(
+ PstreamBuffers& pBufs,
+ const pointField& p
+)
+{
+ // Recalculate geometry
+ initGeometry(pBufs);
+}
+
+
+void Foam::processorCyclicPolyPatch::movePoints
+(
+ PstreamBuffers& pBufs,
+ const pointField&
+)
+{
+ calcGeometry(pBufs);
+}
+
+
+void Foam::processorCyclicPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
+{
+ processorPolyPatch::initUpdateMesh(pBufs);
+}
+
+
+void Foam::processorCyclicPolyPatch::updateMesh(PstreamBuffers& pBufs)
+{
+ referPatchID_ = -1;
+ processorPolyPatch::updateMesh(pBufs);
+}
+
+
+void Foam::processorCyclicPolyPatch::initOrder
+(
+ PstreamBuffers& pBufs,
+ const primitivePatch& pp
+) const
+{
+ // For now use the same algorithm as processorPolyPatch
+ processorPolyPatch::initOrder(pBufs, pp);
+}
+
+
+// Return new ordering. Ordering is -faceMap: for every face index
+// the new face -rotation:for every new face the clockwise shift
+// of the original face. Return false if nothing changes (faceMap
+// is identity, rotation is 0)
+bool Foam::processorCyclicPolyPatch::order
+(
+ PstreamBuffers& pBufs,
+ const primitivePatch& pp,
+ labelList& faceMap,
+ labelList& rotation
+) const
+{
+ // For now use the same algorithm as processorPolyPatch
+ return processorPolyPatch::order(pBufs, pp, faceMap, rotation);
+}
+
+
+void Foam::processorCyclicPolyPatch::write(Ostream& os) const
+{
+ processorPolyPatch::write(os);
+ os.writeKeyword("referPatch") << referPatchName_
+ << token::END_STATEMENT << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..3206469d8ecf903bf4eb6d271d42ff0eea5ceef4
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -0,0 +1,393 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicPolyPatch
+
+Description
+ Neighbour processor patch.
+
+ Note: morph patch face ordering is geometric.
+
+SourceFiles
+ processorCyclicPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicPolyPatch_H
+#define processorCyclicPolyPatch_H
+
+#include "processorPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorCyclicPolyPatch
+:
+ public processorPolyPatch
+{
+ // Private data
+
+ //- Message tag to use for communication
+ const int tag_;
+
+ //- Name of originating patch
+ const word referPatchName_;
+
+ //- Index of originating patch
+ mutable label referPatchID_;
+
+ // Private member functions
+
+
+protected:
+
+ // Protected Member functions
+
+ //- Initialise the calculation of the patch geometry
+ void initGeometry(PstreamBuffers&);
+
+// //- Initialise the calculation of the patch geometry with externally
+// // provided geometry
+// virtual void initGeometry
+// (
+// const primitivePatch& referPatch,
+// UList<point>&,
+// UList<point>&,
+// UList<point>&
+// )
+// {
+// notImplemented("processorCyclicPolyPatch::initGeometry(..)");
+// }
+
+ //- Calculate the patch geometry
+ void calcGeometry(PstreamBuffers&);
+
+ //- Calculate the patch geometry with externally
+ // provided geometry
+ virtual void calcGeometry
+ (
+ const primitivePatch& referPatch,
+ const UList<point>& thisCtrs,
+ const UList<point>& thisAreas,
+ const UList<point>& thisCc,
+ const UList<point>& nbrCtrs,
+ const UList<point>& nbrAreas,
+ const UList<point>& nbrCc
+ )
+ {
+ notImplemented("processorCyclicPolyPatch::calcGeometry(..)");
+ }
+
+ //- Initialise the patches for moving points
+ void initMovePoints(PstreamBuffers&, const pointField&);
+
+ //- Correct patches after moving points
+ void movePoints(PstreamBuffers&, const pointField&);
+
+ //- Initialise the update of the patch topology
+ virtual void initUpdateMesh(PstreamBuffers&);
+
+ //- Update of the patch topology
+ virtual void updateMesh(PstreamBuffers&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("processorCyclic");
+
+
+ // Constructors
+
+ //- Construct from components
+ processorCyclicPolyPatch
+ (
+ const word& name,
+ const label size,
+ const label start,
+ const label index,
+ const polyBoundaryMesh& bm,
+ const int myProcNo,
+ const int neighbProcNo,
+ const word& referPatchName
+ );
+
+ //- Construct from dictionary
+ processorCyclicPolyPatch
+ (
+ const word& name,
+ const dictionary& dict,
+ const label index,
+ const polyBoundaryMesh&
+ );
+
+ //- Construct as copy, resetting the boundary mesh
+ processorCyclicPolyPatch
+ (
+ const processorCyclicPolyPatch&,
+ const polyBoundaryMesh&
+ );
+
+ //- Construct as given the original patch and resetting the
+ // face list and boundary mesh information
+ processorCyclicPolyPatch
+ (
+ const processorCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart,
+ const word& referPatchName
+ );
+
+ //- Construct given the original patch and a map
+ processorCyclicPolyPatch
+ (
+ const processorCyclicPolyPatch& pp,
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+ );
+
+
+ //- Construct and return a clone, resetting the boundary mesh
+ virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+ {
+ return autoPtr<polyPatch>(new processorCyclicPolyPatch(*this, bm));
+ }
+
+ //- Construct and return a clone, resetting the face list
+ // and boundary mesh
+ virtual autoPtr<polyPatch> clone
+ (
+ const polyBoundaryMesh& bm,
+ const label index,
+ const label newSize,
+ const label newStart,
+ const word& referPatchName
+ ) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new processorCyclicPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ newSize,
+ newStart,
+ referPatchName
+ )
+ );
+ }
+
+ //- Construct and return a clone, resetting the face list
+ // and boundary mesh
+ virtual autoPtr<polyPatch> clone
+ (
+ const polyBoundaryMesh& bm,
+ const label index,
+ const unallocLabelList& mapAddressing,
+ const label newStart
+ ) const
+ {
+ return autoPtr<polyPatch>
+ (
+ new processorCyclicPolyPatch
+ (
+ *this,
+ bm,
+ index,
+ mapAddressing,
+ newStart
+ )
+ );
+ }
+
+
+ // Destructor
+
+ virtual ~processorCyclicPolyPatch();
+
+
+ // Member functions
+
+ const word& referPatchName() const
+ {
+ return referPatchName_;
+ }
+
+ //- Referring patchID.
+ label referPatchID() const
+ {
+ if (referPatchID_ == -1)
+ {
+ referPatchID_ = this->boundaryMesh().findPatchID
+ (
+ referPatchName_
+ );
+ if (referPatchID_ == -1)
+ {
+ FatalErrorIn
+ (
+ "processorCyclicPolyPatch::referPatchID() const"
+ ) << "Illegal referPatch name " << referPatchName_
+ << endl << "Valid patch names are "
+ << this->boundaryMesh().names()
+ << exit(FatalError);
+ }
+ }
+ return referPatchID_;
+ }
+
+ const coupledPolyPatch& referPatch() const
+ {
+ const polyPatch& pp = this->boundaryMesh()[referPatchID()];
+ return refCast<const coupledPolyPatch>(pp);
+ }
+
+ //- Return message tag to use for communication
+ virtual int tag() const
+ {
+ return tag_;
+ }
+
+ //- Does this side own the patch ?
+ virtual bool owner() const
+ {
+ return referPatch().owner();
+ }
+
+// //- Transform a patch-based field from other side to this side.
+// virtual bool doTransform() const
+// {
+// return referPatch().doTransform();
+// }
+// virtual void transform(scalarField& l) const
+// {
+// referPatch().transform(l);
+// }
+// virtual void transform(vectorField& l) const
+// {
+// referPatch().transform(l);
+// }
+// virtual void transform(sphericalTensorField& l) const
+// {
+// referPatch().transform(l);
+// }
+// virtual void transform(diagTensorField& l) const
+// {
+// referPatch().transform(l);
+// }
+// virtual void transform(symmTensorField& l) const
+// {
+// referPatch().transform(l);
+// }
+// virtual void transform(tensorField& l) const
+// {
+// referPatch().transform(l);
+// }
+
+ //- Transform a patch-based position from other side to this side
+ virtual void transformPosition(pointField& l) const
+ {
+ referPatch().transformPosition(l);
+ }
+
+ //- Are the planes separated.
+ virtual bool separated() const
+ {
+ return referPatch().separated();
+ }
+
+ //- If the planes are separated the separation vector.
+ virtual const vectorField& separation() const
+ {
+ return referPatch().separation();
+ }
+
+ //- Are the cyclic planes parallel.
+ virtual bool parallel() const
+ {
+ return referPatch().parallel();
+ }
+
+ //- Return face transformation tensor.
+ virtual const tensorField& forwardT() const
+ {
+ return referPatch().forwardT();
+ }
+
+ //- Return neighbour-cell transformation tensor.
+ virtual const tensorField& reverseT() const
+ {
+ return referPatch().reverseT();
+ }
+
+ //- Are faces collocated. Either size 0,1 or length of patch
+ virtual const boolList& collocated() const
+ {
+ return referPatch().collocated();
+ }
+
+
+ //- Initialize ordering for primitivePatch. Does not
+ // refer to *this (except for name() and type() etc.)
+ virtual void initOrder(PstreamBuffers&, const primitivePatch&) const;
+
+ //- Return new ordering for primitivePatch.
+ // Ordering is -faceMap: for every face
+ // index of the new face -rotation:for every new face the clockwise
+ // shift of the original face. Return false if nothing changes
+ // (faceMap is identity, rotation is 0), true otherwise.
+ virtual bool order
+ (
+ PstreamBuffers&,
+ const primitivePatch&,
+ labelList& faceMap,
+ labelList& rotation
+ ) const;
+
+
+ //- Write the polyPatch data as a dictionary
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index c9e5a8c8530d42ca7f53a4d8acc33f418749ff61..66daf6793bd9a499db9c8ba5d4177bffe7c1b2a6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -87,12 +87,6 @@ class polyPatch
mutable labelList* mePtr_;
- // Private Member Functions
-
- //- Calculate labels of mesh edges
- void calcMeshEdges() const;
-
-
protected:
// Protected Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
new file mode 100644
index 0000000000000000000000000000000000000000..34b54b176e0773fea51b3d404c4f602b9e29db71
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+InClass
+ Foam::dummyTransform
+
+Description
+ Dummy transform to be used with syncTools.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dummyTransform_H
+#define dummyTransform_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class dummyTransform Declaration
+\*---------------------------------------------------------------------------*/
+
+class dummyTransform
+{
+public:
+ template<class T>
+ void operator()(const coupledPolyPatch& cpp, Field<T>& fld) const
+ {}
+ template<class T, template<class> class Container>
+ void operator()(const coupledPolyPatch& cpp, Container<T>& map) const
+ {}
+};
+
+
+template<class T>
+class pTraits<List<T> >
+:
+ public List<T>
+{
+public:
+ typedef label cmptType;
+
+ pTraits(Istream& is)
+ :
+ List<T>(is)
+ {}
+};
+
+template<class T>
+class pTraits<UList<T> >
+:
+ public UList<T>
+{
+public:
+ typedef label cmptType;
+
+ pTraits(Istream& is)
+ :
+ UList<T>(is)
+ {}
+};
+
+template<class T>
+class pTraits<Field<T> >
+:
+ public Field<T>
+{
+public:
+ typedef label cmptType;
+
+ pTraits(Istream& is)
+ :
+ Field<T>(is)
+ {}
+};
+
+template<>
+class pTraits<face>
+:
+ public face
+{
+public:
+ typedef label cmptType;
+
+ pTraits(Istream& is)
+ :
+ face(is)
+ {}
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index 8bf68ba40b0527cafd5a67eceb0f398cfc31a56e..843e84908c1017fcfd59a1c732e4cdba89acc6da 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -28,6 +28,77 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Field<label>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<label>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<label>&
+) const
+{}
+
+
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Field<scalar>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<scalar>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<scalar>&
+) const
+{}
+
+
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Field<bool>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<bool>&
+) const
+{}
+template<>
+void Foam::syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<bool>&
+) const
+{}
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
// Does anyone have couples? Since meshes might have 0 cells and 0 proc
// boundaries need to reduce this info.
bool Foam::syncTools::hasCouples(const polyBoundaryMesh& patches)
@@ -46,31 +117,6 @@ bool Foam::syncTools::hasCouples(const polyBoundaryMesh& patches)
}
-void Foam::syncTools::checkTransform
-(
- const coupledPolyPatch& pp,
- const bool applySeparation
-)
-{
- if (!pp.parallel() && pp.forwardT().size() > 1)
- {
- FatalErrorIn("syncTools::checkTransform(const coupledPolyPatch&)")
- << "Non-uniform transformation not supported for point or edge"
- << " fields." << endl
- << "Patch:" << pp.name()
- << abort(FatalError);
- }
- if (applySeparation && pp.separated() && pp.separation().size() > 1)
- {
- FatalErrorIn("syncTools::checkTransform(const coupledPolyPatch&)")
- << "Non-uniform separation vector not supported for point or edge"
- << " fields." << endl
- << "Patch:" << pp.name()
- << abort(FatalError);
- }
-}
-
-
// Determines for every point whether it is coupled and if so sets only one.
Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
{
@@ -154,36 +200,16 @@ Foam::PackedBoolList Foam::syncTools::getMasterFaces(const polyMesh& mesh)
{
if (patches[patchI].coupled())
{
- if (Pstream::parRun() && isA<processorPolyPatch>(patches[patchI]))
- {
- const processorPolyPatch& pp =
- refCast<const processorPolyPatch>(patches[patchI]);
+ const coupledPolyPatch& pp =
+ refCast<const coupledPolyPatch>(patches[patchI]);
- if (!pp.owner())
- {
- forAll(pp, i)
- {
- isMasterFace.unset(pp.start()+i);
- }
- }
- }
- else if (isA<cyclicPolyPatch>(patches[patchI]))
+ if (!pp.owner())
{
- const cyclicPolyPatch& pp =
- refCast<const cyclicPolyPatch>(patches[patchI]);
-
- for (label i = pp.size()/2; i < pp.size(); i++)
+ forAll(pp, i)
{
isMasterFace.unset(pp.start()+i);
}
}
- else
- {
- FatalErrorIn("syncTools::getMasterFaces(const polyMesh&)")
- << "Cannot handle coupled patch " << patches[patchI].name()
- << " of type " << patches[patchI].type()
- << abort(FatalError);
- }
}
}
@@ -191,100 +217,4 @@ Foam::PackedBoolList Foam::syncTools::getMasterFaces(const polyMesh& mesh)
}
-template <>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- UList<vector>& field
-)
-{
- if (separation.size() == 1)
- {
- // Single value for all.
-
- forAll(field, i)
- {
- field[i] += separation[0];
- }
- }
- else if (separation.size() == field.size())
- {
- forAll(field, i)
- {
- field[i] += separation[i];
- }
- }
- else
- {
- FatalErrorIn
- (
- "syncTools::separateList(const vectorField&, UList<vector>&)"
- ) << "Sizes of field and transformation not equal. field:"
- << field.size() << " transformation:" << separation.size()
- << abort(FatalError);
- }
-}
-
-
-template <>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- Map<vector>& field
-)
-{
- if (separation.size() == 1)
- {
- // Single value for all.
- forAllIter(Map<vector>, field, iter)
- {
- iter() += separation[0];
- }
- }
- else if (separation.size() == field.size())
- {
- forAllIter(Map<vector>, field, iter)
- {
- iter() += separation[iter.key()];
- }
- }
- else
- {
- FatalErrorIn
- (
- "syncTools::separateList(const vectorField&, Map<vector>&)"
- ) << "Sizes of field and transformation not equal. field:"
- << field.size() << " transformation:" << separation.size()
- << abort(FatalError);
- }
-}
-
-
-template <>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- EdgeMap<vector>& field
-)
-{
- if (separation.size() == 1)
- {
- // Single value for all.
- forAllIter(EdgeMap<vector>, field, iter)
- {
- iter() += separation[0];
- }
- }
- else
- {
- FatalErrorIn
- (
- "syncTools::separateList(const vectorField&, EdgeMap<vector>&)"
- ) << "Multiple separation vectors not supported. field:"
- << field.size() << " transformation:" << separation.size()
- << abort(FatalError);
- }
-}
-
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index 04ca6121cdc5149c2348100ee6281a681f876c67..725270a489536543116ef2e17d1469893b5bad61 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -50,10 +50,12 @@ SourceFiles
#include "UList.H"
#include "Pstream.H"
-#include "transformList.H"
#include "Map.H"
#include "EdgeMap.H"
#include "PackedBoolList.H"
+#include "polyMesh.H"
+#include "coupledPolyPatch.H"
+#include "transformList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,8 +63,6 @@ namespace Foam
{
class polyBoundaryMesh;
-class polyMesh;
-class coupledPolyPatch;
/*---------------------------------------------------------------------------*\
Class syncTools Declaration
@@ -75,20 +75,6 @@ class syncTools
//- Check whether uses couples.
static bool hasCouples(const polyBoundaryMesh&);
- //- Check for single transformation tensor only.
- static void checkTransform(const coupledPolyPatch&, const bool);
-
- //- Apply separation to list. Either single vector or one vector
- // per element.
- template <class T>
- static void separateList(const vectorField&, UList<T>&);
-
- template <class T>
- static void separateList(const vectorField&, Map<T>&);
-
- template <class T>
- static void separateList(const vectorField&, EdgeMap<T>&);
-
//- Combine value with existing value in map.
template <class T, class CombineOp>
static void combine
@@ -112,116 +98,383 @@ class syncTools
public:
- // Static data members
+ // Public classes
+
+ class transform
+ {
+ public:
+ //- Transform patch-based field
+ template<class T>
+ void operator()(const coupledPolyPatch& cpp, Field<T>& fld) const
+ {
+ if (!cpp.parallel())
+ {
+ transformList(cpp.forwardT(), fld);
+ }
+ }
+
+ //- Transform sparse field
+ template<class T, template<class> class Container>
+ void operator()(const coupledPolyPatch& cpp, Container<T>& map)
+ const
+ {
+ if (!cpp.parallel())
+ {
+ transformList(cpp.forwardT(), map);
+ }
+ }
+ };
+
+ class transformPosition
+ {
+ public:
+ void operator()(const coupledPolyPatch& cpp, pointField& fld) const
+ {
+ cpp.transformPosition(fld);
+ }
+ template<template<class> class Container>
+ void operator()(const coupledPolyPatch& cpp, Container<point>& map)
+ const
+ {
+ Field<point> fld(map.size());
+ label i = 0;
+ forAllConstIter(typename Container<point>, map, iter)
+ {
+ fld[i++] = iter();
+ }
+ cpp.transformPosition(fld);
+ i = 0;
+ forAllIter(typename Container<point>, map, iter)
+ {
+ iter() = fld[i++];
+ }
+ }
+ };
+
+
+ // Basic routines with user-supplied transformation. Preferably
+ // use specialisations below.
- //- Synchronize values on all mesh points.
- // Applies rotation and optionally separation for parallel cyclics
- template <class T, class CombineOp>
- static void syncPointList
- (
- const polyMesh&,
- UList<T>&,
- const CombineOp& cop,
- const T& nullValue,
- const bool applySeparation
- );
+ //- Synchronize values on selected points.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncPointMap
+ (
+ const polyMesh&,
+ Map<T>& pointValues,
+ const CombineOp& cop,
+ const TransformOp& top
+ );
- //- Synchronize values on selected mesh points.
- // Applies rotation and optionally separation for parallel cyclics
- template <class T, class CombineOp>
- static void syncPointList
- (
- const polyMesh&,
- const labelList& meshPoints,
- UList<T>&,
- const CombineOp& bop,
- const T& nullValue,
- const bool applySeparation
- );
+ //- Synchronize values on selected edges.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncEdgeMap
+ (
+ const polyMesh&,
+ EdgeMap<T>& edgeValues,
+ const CombineOp& cop,
+ const TransformOp& top
+ );
- //- Synchronize values on all mesh edges.
- // Applies rotation and optionally separation for parallel cyclics
- template <class T, class CombineOp>
- static void syncEdgeList
- (
- const polyMesh&,
- UList<T>&,
- const CombineOp& cop,
- const T& nullValue,
- const bool applySeparation
- );
+ //- Synchronize values on all mesh points.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncPointList
+ (
+ const polyMesh&,
+ UList<T>&,
+ const CombineOp& cop,
+ const T& nullValue,
+ const TransformOp& top
+ );
- //- Synchronize values on boundary faces only.
- // Optionally applies rotation tensor for non-parallel cyclics
- // (but not separation!)
- template <class T, class CombineOp>
- static void syncBoundaryFaceList
- (
- const polyMesh&,
- UList<T>&,
- const CombineOp& cop,
- const bool applySeparation
- );
+ //- Synchronize values on selected mesh points.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncPointList
+ (
+ const polyMesh&,
+ const labelList& meshPoints,
+ UList<T>&,
+ const CombineOp& cop,
+ const T& nullValue,
+ const TransformOp& top
+ );
- //- Synchronize values on all mesh faces.
- // Optionally applies rotation tensor for non-parallel cyclics
- // (but not separation!)
- template <class T, class CombineOp>
- static void syncFaceList
- (
- const polyMesh&,
- UList<T>&,
- const CombineOp& cop,
- const bool applySeparation
- );
+ //- Synchronize values on all mesh edges.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncEdgeList
+ (
+ const polyMesh&,
+ UList<T>&,
+ const CombineOp& cop,
+ const T& nullValue,
+ const TransformOp& top
+ );
- //- Swap coupled face values.
- // Applies rotation and optionally separation for parallel cyclics
- template <class T>
- static void swapBoundaryFaceList
- (
- const polyMesh&,
- UList<T>&,
- const bool applySeparation
- );
+ //- Synchronize values on boundary faces only.
+ template <class T, class CombineOp, class TransformOp>
+ static void syncBoundaryFaceList
+ (
+ const polyMesh&,
+ UList<T>&,
+ const CombineOp& cop,
+ const TransformOp& top
+ );
- //- Swap coupled face values.
- // Applies rotation and optionally separation for parallel cyclics
- template <class T>
- static void swapFaceList
- (
- const polyMesh&,
- UList<T>&,
- const bool applySeparation
- );
+
+ // Synchronise point-wise data
+
+ //- Synchronize values on all mesh points.
+ template <class T, class CombineOp>
+ static void syncPointList
+ (
+ const polyMesh& mesh,
+ UList<T>& l,
+ const CombineOp& cop,
+ const T& nullValue
+ )
+ {
+ syncPointList(mesh, l, cop, nullValue, transform());
+ }
+
+ //- Synchronize locations on all mesh points.
+ template <class CombineOp>
+ static void syncPointPositions
+ (
+ const polyMesh& mesh,
+ UList<point>& l,
+ const CombineOp& cop,
+ const point& nullValue
+ )
+ {
+ syncPointList(mesh, l, cop, nullValue, transformPosition());
+ }
+
+ //- Synchronize values on selected mesh points.
+ template <class T, class CombineOp>
+ static void syncPointList
+ (
+ const polyMesh& mesh,
+ const labelList& meshPoints,
+ UList<T>& l,
+ const CombineOp& cop,
+ const T& nullValue
+ )
+ {
+ syncPointList
+ (
+ mesh,
+ meshPoints,
+ l,
+ cop,
+ nullValue,
+ transform()
+ );
+ }
+
+ //- Synchronize locations on selected mesh points.
+ template <class CombineOp>
+ static void syncPointPositions
+ (
+ const polyMesh& mesh,
+ const labelList& meshPoints,
+ UList<point>& l,
+ const CombineOp& cop,
+ const point& nullValue
+ )
+ {
+ syncPointList
+ (
+ mesh,
+ meshPoints,
+ l,
+ cop,
+ nullValue,
+ transformPosition()
+ );
+ }
+
+
+ // Synchronise edge-wise data
+
+ //- Synchronize values on all mesh edges.
+ template <class T, class CombineOp>
+ static void syncEdgeList
+ (
+ const polyMesh& mesh,
+ UList<T>& l,
+ const CombineOp& cop,
+ const T& nullValue
+ )
+ {
+ syncEdgeList(mesh, l, cop, nullValue, transform());
+ }
+
+ //- Synchronize values on all mesh edges.
+ template <class CombineOp>
+ static void syncEdgePositions
+ (
+ const polyMesh& mesh,
+ UList<point>& l,
+ const CombineOp& cop,
+ const point& nullValue
+ )
+ {
+ syncEdgeList(mesh, l, cop, nullValue, transformPosition());
+ }
+
+
+ // Synchronise face-wise data
+
+ //- Synchronize values on boundary faces only.
+ template <class T, class CombineOp>
+ static void syncBoundaryFaceList
+ (
+ const polyMesh& mesh,
+ UList<T>& l,
+ const CombineOp& cop
+ )
+ {
+ syncBoundaryFaceList(mesh, l, cop, transform());
+ }
+
+ //- Synchronize locations on boundary faces only.
+ template <class CombineOp>
+ static void syncBoundaryFacePositions
+ (
+ const polyMesh& mesh,
+ UList<point>& l,
+ const CombineOp& cop
+ )
+ {
+ syncBoundaryFaceList(mesh, l, cop, transformPosition());
+ }
+
+ //- Synchronize values on all mesh faces.
+ template <class T, class CombineOp>
+ static void syncFaceList
+ (
+ const polyMesh& mesh,
+ UList<T>& l,
+ const CombineOp& cop
+ )
+ {
+ SubList<T> bndValues
+ (
+ l,
+ mesh.nFaces()-mesh.nInternalFaces(),
+ mesh.nInternalFaces()
+ );
+
+ syncBoundaryFaceList(mesh, bndValues, cop, transform());
+ }
+
+ //- Synchronize locations on all mesh faces.
+ template <class CombineOp>
+ static void syncFacePositions
+ (
+ const polyMesh& mesh,
+ UList<point>& l,
+ const CombineOp& cop
+ )
+ {
+ SubList<point> bndValues
+ (
+ l,
+ mesh.nFaces()-mesh.nInternalFaces(),
+ mesh.nInternalFaces()
+ );
+ syncBoundaryFaceList(mesh, bndValues, cop, transformPosition());
+ }
+
+ //- Swap coupled boundary face values.
+ template <class T>
+ static void swapBoundaryFaceList
+ (
+ const polyMesh& mesh,
+ UList<T>& l
+ )
+ {
+ syncBoundaryFaceList(mesh, l, eqOp<T>(), transform());
+ }
+
+ //- Swap coupled positions.
+ template <class T>
+ static void swapBoundaryFacePositions
+ (
+ const polyMesh& mesh,
+ UList<T>& l
+ )
+ {
+ syncBoundaryFaceList(mesh, l, eqOp<T>(), transformPosition());
+ }
+
+ //- Swap coupled face values.
+ template <class T>
+ static void swapFaceList
+ (
+ const polyMesh& mesh,
+ UList<T>& l
+ )
+ {
+ SubList<T> bndValues
+ (
+ l,
+ mesh.nFaces()-mesh.nInternalFaces(),
+ mesh.nInternalFaces()
+ );
+ syncBoundaryFaceList(mesh, bndValues, eqOp<T>(), transform());
+ }
// Sparse versions
//- Synchronize values on selected points.
- // Applies rotation and optionally separation for parallel
- // cyclics.
template <class T, class CombineOp>
static void syncPointMap
(
- const polyMesh&,
- Map<T>& pointValues,
- const CombineOp& cop,
- const bool applySeparation
- );
+ const polyMesh& mesh,
+ Map<T>& l,
+ const CombineOp& cop
+ )
+ {
+ syncPointMap(mesh, l, cop, transform());
+ }
+
+ //- Synchronize locations on selected points.
+ template <class CombineOp>
+ static void syncPointPositions
+ (
+ const polyMesh& mesh,
+ Map<point>& l,
+ const CombineOp& cop
+ )
+ {
+ syncPointMap(mesh, l, cop, transformPosition());
+ }
//- Synchronize values on selected edges. Edges are represented
// by the two vertices that make it up so global edges never get
// constructed.
- // Applies rotation and optionally separation for parallel
- // cyclics.
template <class T, class CombineOp>
static void syncEdgeMap
(
- const polyMesh&,
- EdgeMap<T>& edgeValues,
- const CombineOp& cop,
- const bool applySeparation
- );
+ const polyMesh& mesh,
+ EdgeMap<T>& l,
+ const CombineOp& cop
+ )
+ {
+ syncEdgeMap(mesh, l, cop, transform());
+ }
+
+ //- Synchronize locations on selected edges.
+ template <class T, class CombineOp>
+ static void syncEdgePositions
+ (
+ const polyMesh& mesh,
+ EdgeMap<T>& l,
+ const CombineOp& cop
+ )
+ {
+ syncEdgeMap(mesh, l, cop, transformPosition());
+ }
// PackedList versions
@@ -273,13 +526,62 @@ public:
template<>
-void syncTools::separateList(const vectorField&, UList<vector>&);
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Field<label>&
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<label>&
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<label>&
+) const;
+
template<>
-void syncTools::separateList(const vectorField&, Map<vector>&);
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Field<scalar>&
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<scalar>&
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<scalar>&
+) const;
template<>
-void syncTools::separateList(const vectorField&, EdgeMap<vector>&);
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch& cpp,
+ Field<bool>& fld
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ Map<bool>&
+) const;
+template<>
+void syncTools::transform::operator()
+(
+ const coupledPolyPatch&,
+ EdgeMap<bool>&
+) const;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 3591eac7562b6f39225b12d543a06f6d0893a52e..9675d29bb71f29c7c81b3adffe7a26834ce6ce75 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -30,35 +30,11 @@ License
#include "globalMeshData.H"
#include "contiguous.H"
#include "transform.H"
+#include "transformList.H"
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template <class T>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- UList<T>& field
-)
-{}
-
-
-template <class T>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- Map<T>& field
-)
-{}
-
-
-template <class T>
-void Foam::syncTools::separateList
-(
- const vectorField& separation,
- EdgeMap<T>& field
-)
-{}
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Combine val with existing value at index
template <class T, class CombineOp>
@@ -106,13 +82,13 @@ void Foam::syncTools::combine
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointMap
(
const polyMesh& mesh,
Map<T>& pointValues, // from mesh point label to value
const CombineOp& cop,
- const bool applySeparation
+ const TransformOp& top
)
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
@@ -122,11 +98,10 @@ void Foam::syncTools::syncPointMap
return;
}
- // Is there any coupled patch with transformation?
- bool hasTransformation = false;
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -156,18 +131,16 @@ void Foam::syncTools::syncPointMap
if (iter != pointValues.end())
{
- if (nbrPts[i] >= 0)
- {
- patchInfo.insert(nbrPts[i], iter());
- }
+ patchInfo.insert(nbrPts[i], iter());
}
}
- OPstream toNeighb(Pstream::blocking, procPatch.neighbProcNo());
+ UOPstream toNeighb(procPatch.neighbProcNo(), pBufs);
toNeighb << patchInfo;
}
}
+ pBufs.finishedSends();
// Receive and combine.
@@ -181,26 +154,16 @@ void Foam::syncTools::syncPointMap
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- checkTransform(procPatch, applySeparation);
- IPstream fromNb(Pstream::blocking, procPatch.neighbProcNo());
+ UIPstream fromNb(procPatch.neighbProcNo(), pBufs);
Map<T> nbrPatchInfo(fromNb);
- if (!procPatch.parallel())
- {
- hasTransformation = true;
- transformList(procPatch.forwardT(), nbrPatchInfo);
- }
- else if (applySeparation && procPatch.separated())
- {
- hasTransformation = true;
- separateList(-procPatch.separation(), nbrPatchInfo);
- }
+ // Transform
+ top(procPatch, nbrPatchInfo);
const labelList& meshPts = procPatch.meshPoints();
// Only update those values which come from neighbour
-
forAllConstIter(typename Map<T>, nbrPatchInfo, nbrIter)
{
combine
@@ -222,105 +185,86 @@ void Foam::syncTools::syncPointMap
{
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- checkTransform(cycPatch, applySeparation);
-
- const edgeList& coupledPoints = cycPatch.coupledPoints();
- const labelList& meshPts = cycPatch.meshPoints();
-
- // Extract local values. Create map from nbrPoint to value.
- Map<T> half0Values(meshPts.size() / 20);
- Map<T> half1Values(meshPts.size() / 20);
- forAll(coupledPoints, i)
+ if (cycPatch.owner())
{
- const edge& e = coupledPoints[i];
+ // Owner does all.
- typename Map<T>::const_iterator point0Fnd =
- pointValues.find(meshPts[e[0]]);
-
- if (point0Fnd != pointValues.end())
- {
- half0Values.insert(i, point0Fnd());
- }
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const edgeList& coupledPoints = cycPatch.coupledPoints();
+ const labelList& meshPtsA = cycPatch.meshPoints();
+ const labelList& meshPtsB = nbrPatch.meshPoints();
- typename Map<T>::const_iterator point1Fnd =
- pointValues.find(meshPts[e[1]]);
+ // Extract local values. Create map from coupled-edge to value.
+ Map<T> half0Values(meshPtsA.size() / 20);
+ Map<T> half1Values(half0Values.size());
- if (point1Fnd != pointValues.end())
+ forAll(coupledPoints, i)
{
- half1Values.insert(i, point1Fnd());
- }
- }
+ const edge& e = coupledPoints[i];
- if (!cycPatch.parallel())
- {
- hasTransformation = true;
- transformList(cycPatch.reverseT(), half0Values);
- transformList(cycPatch.forwardT(), half1Values);
- }
- else if (applySeparation && cycPatch.separated())
- {
- hasTransformation = true;
+ typename Map<T>::const_iterator point0Fnd =
+ pointValues.find(meshPtsA[e[0]]);
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
- separateList(-v, half1Values);
- }
-
- forAll(coupledPoints, i)
- {
- const edge& e = coupledPoints[i];
+ if (point0Fnd != pointValues.end())
+ {
+ half0Values.insert(i, point0Fnd());
+ }
- typename Map<T>::const_iterator half1Fnd = half1Values.find(i);
+ typename Map<T>::const_iterator point1Fnd =
+ pointValues.find(meshPtsB[e[1]]);
- if (half1Fnd != half1Values.end())
- {
- combine
- (
- pointValues,
- cop,
- meshPts[e[0]],
- half1Fnd()
- );
+ if (point1Fnd != pointValues.end())
+ {
+ half1Values.insert(i, point1Fnd());
+ }
}
- typename Map<T>::const_iterator half0Fnd = half0Values.find(i);
+ // Transform to receiving side
+ top(cycPatch, half1Values);
+ top(nbrPatch, half0Values);
- if (half0Fnd != half0Values.end())
+ forAll(coupledPoints, i)
{
- combine
- (
- pointValues,
- cop,
- meshPts[e[1]],
- half0Fnd()
- );
+ const edge& e = coupledPoints[i];
+
+ typename Map<T>::const_iterator half0Fnd =
+ half0Values.find(i);
+
+ if (half0Fnd != half0Values.end())
+ {
+ combine
+ (
+ pointValues,
+ cop,
+ meshPtsB[e[1]],
+ half0Fnd()
+ );
+ }
+
+ typename Map<T>::const_iterator half1Fnd =
+ half1Values.find(i);
+
+ if (half1Fnd != half1Values.end())
+ {
+ combine
+ (
+ pointValues,
+ cop,
+ meshPtsA[e[0]],
+ half1Fnd()
+ );
+ }
}
}
}
}
- //- Note: hasTransformation is only used for warning messages so
- // reduction not strictly nessecary.
- //reduce(hasTransformation, orOp<bool>());
-
// Synchronize multiple shared points.
const globalMeshData& pd = mesh.globalData();
if (pd.nGlobalPoints() > 0)
{
- if (hasTransformation)
- {
- WarningIn
- (
- "syncTools<class T, class CombineOp>::syncPointMap"
- "(const polyMesh&, Map<T>&, const CombineOp&"
- ", const bool)"
- ) << "There are decomposed cyclics in this mesh with"
- << " transformations." << endl
- << "This is not supported. The result will be incorrect"
- << endl;
- }
// meshPoint per local index
const labelList& sharedPtLabels = pd.sharedPointLabels();
// global shared index per local index
@@ -364,7 +308,7 @@ void Foam::syncTools::syncPointMap
slave++
)
{
- IPstream fromSlave(Pstream::blocking, slave);
+ IPstream fromSlave(Pstream::scheduled, slave);
Map<T> nbrValues(fromSlave);
// Merge neighbouring values with my values
@@ -388,22 +332,22 @@ void Foam::syncTools::syncPointMap
slave++
)
{
- OPstream toSlave(Pstream::blocking, slave);
+ OPstream toSlave(Pstream::scheduled, slave);
toSlave << sharedPointValues;
}
}
else
{
- // Send to master
+ // Slave: send to master
{
- OPstream toMaster(Pstream::blocking, Pstream::masterNo());
+ OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster << sharedPointValues;
}
// Receive merged values
{
IPstream fromMaster
(
- Pstream::blocking,
+ Pstream::scheduled,
Pstream::masterNo()
);
fromMaster >> sharedPointValues;
@@ -443,13 +387,13 @@ void Foam::syncTools::syncPointMap
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncEdgeMap
(
const polyMesh& mesh,
EdgeMap<T>& edgeValues,
const CombineOp& cop,
- const bool applySeparation
+ const TransformOp& top
)
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
@@ -469,6 +413,8 @@ void Foam::syncTools::syncEdgeMap
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -482,6 +428,7 @@ void Foam::syncTools::syncEdgeMap
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
+
// Get data per patch edge in neighbouring edge.
const edgeList& edges = procPatch.edges();
@@ -501,19 +448,16 @@ void Foam::syncTools::syncEdgeMap
if (iter != edgeValues.end())
{
const edge nbrEdge(nbrPts[e[0]], nbrPts[e[1]]);
-
- if (nbrEdge[0] >= 0 && nbrEdge[1] >= 0)
- {
- patchInfo.insert(nbrEdge, iter());
- }
+ patchInfo.insert(nbrEdge, iter());
}
}
- OPstream toNeighb(Pstream::blocking, procPatch.neighbProcNo());
+ UOPstream toNeighb(procPatch.neighbProcNo(), pBufs);
toNeighb << patchInfo;
}
}
+ pBufs.finishedSends();
// Receive and combine.
@@ -527,23 +471,19 @@ void Foam::syncTools::syncEdgeMap
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- checkTransform(procPatch, applySeparation);
-
- const labelList& meshPts = procPatch.meshPoints();
- IPstream fromNbr(Pstream::blocking, procPatch.neighbProcNo());
- EdgeMap<T> nbrPatchInfo(fromNbr);
-
- if (!procPatch.parallel())
+ EdgeMap<T> nbrPatchInfo;
{
- transformList(procPatch.forwardT(), nbrPatchInfo);
- }
- else if (applySeparation && procPatch.separated())
- {
- separateList(-procPatch.separation(), nbrPatchInfo);
+ UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
+ fromNbr >> nbrPatchInfo;
}
+ // Apply transform to convert to this side properties.
+ top(procPatch, nbrPatchInfo);
+
+
// Only update those values which come from neighbour
+ const labelList& meshPts = procPatch.meshPoints();
forAllConstIter(typename EdgeMap<T>, nbrPatchInfo, nbrIter)
{
@@ -572,99 +512,95 @@ void Foam::syncTools::syncEdgeMap
{
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- checkTransform(cycPatch, applySeparation);
- const edgeList& coupledEdges = cycPatch.coupledEdges();
- const labelList& meshPts = cycPatch.meshPoints();
- const edgeList& edges = cycPatch.edges();
+ if (cycPatch.owner())
+ {
+ // Owner does all.
- // Extract local values. Create map from nbrPoint to value.
- Map<T> half0Values(meshPts.size() / 20);
- Map<T> half1Values(meshPts.size() / 20);
+ const edgeList& coupledEdges = cycPatch.coupledEdges();
+ const labelList& meshPtsA = cycPatch.meshPoints();
+ const edgeList& edgesA = cycPatch.edges();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& meshPtsB = nbrPatch.meshPoints();
+ const edgeList& edgesB = nbrPatch.edges();
- forAll(coupledEdges, i)
- {
- const edge& twoEdges = coupledEdges[i];
+ // Extract local values. Create map from edge to value.
+ Map<T> half0Values(edgesA.size() / 20);
+ Map<T> half1Values(half0Values.size());
+ forAll(coupledEdges, i)
{
- const edge& e0 = edges[twoEdges[0]];
- const edge meshEdge0(meshPts[e0[0]], meshPts[e0[1]]);
-
- typename EdgeMap<T>::const_iterator iter =
- edgeValues.find(meshEdge0);
+ const edge& twoEdges = coupledEdges[i];
- if (iter != edgeValues.end())
{
- half0Values.insert(i, iter());
- }
- }
- {
- const edge& e1 = edges[twoEdges[1]];
- const edge meshEdge1(meshPts[e1[0]], meshPts[e1[1]]);
+ const edge& e0 = edgesA[twoEdges[0]];
+ const edge meshEdge0(meshPtsA[e0[0]], meshPtsA[e0[1]]);
- typename EdgeMap<T>::const_iterator iter =
- edgeValues.find(meshEdge1);
+ typename EdgeMap<T>::const_iterator iter =
+ edgeValues.find(meshEdge0);
- if (iter != edgeValues.end())
- {
- half1Values.insert(i, iter());
+ if (iter != edgeValues.end())
+ {
+ half0Values.insert(i, iter());
+ }
}
- }
- }
+ {
+ const edge& e1 = edgesB[twoEdges[1]];
+ const edge meshEdge1(meshPtsB[e1[0]], meshPtsB[e1[1]]);
+ typename EdgeMap<T>::const_iterator iter =
+ edgeValues.find(meshEdge1);
- // Transform
+ if (iter != edgeValues.end())
+ {
+ half1Values.insert(i, iter());
+ }
+ }
+ }
- if (!cycPatch.parallel())
- {
- transformList(cycPatch.reverseT(), half0Values);
- transformList(cycPatch.forwardT(), half1Values);
- }
- else if (applySeparation && cycPatch.separated())
- {
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
- separateList(-v, half1Values);
- }
+ // Transform to this side
+ top(cycPatch, half1Values);
+ top(nbrPatch, half0Values);
- // Extract and combine information
+ // Extract and combine information
- forAll(coupledEdges, i)
- {
- const edge& twoEdges = coupledEdges[i];
+ forAll(coupledEdges, i)
+ {
+ const edge& twoEdges = coupledEdges[i];
- typename Map<T>::const_iterator half1Fnd =
- half1Values.find(i);
+ typename Map<T>::const_iterator half1Fnd =
+ half1Values.find(i);
- if (half1Fnd != half1Values.end())
- {
- const edge& e0 = edges[twoEdges[0]];
- const edge meshEdge0(meshPts[e0[0]], meshPts[e0[1]]);
+ if (half1Fnd != half1Values.end())
+ {
+ const edge& e0 = edgesA[twoEdges[0]];
+ const edge meshEdge0(meshPtsA[e0[0]], meshPtsA[e0[1]]);
- combine
- (
- edgeValues,
- cop,
- meshEdge0, // edge
- half1Fnd() // value
- );
- }
+ combine
+ (
+ edgeValues,
+ cop,
+ meshEdge0, // edge
+ half1Fnd() // value
+ );
+ }
- typename Map<T>::const_iterator half0Fnd =
- half0Values.find(i);
- if (half0Fnd != half0Values.end())
- {
- const edge& e1 = edges[twoEdges[1]];
- const edge meshEdge1(meshPts[e1[0]], meshPts[e1[1]]);
+ typename Map<T>::const_iterator half0Fnd =
+ half0Values.find(i);
+ if (half0Fnd != half0Values.end())
+ {
+ const edge& e1 = edgesB[twoEdges[1]];
+ const edge meshEdge1(meshPtsB[e1[0]], meshPtsB[e1[1]]);
- combine
- (
- edgeValues,
- cop,
- meshEdge1, // edge
- half0Fnd() // value
- );
+ combine
+ (
+ edgeValues,
+ cop,
+ meshEdge1, // edge
+ half0Fnd() // value
+ );
+ }
}
}
}
@@ -759,7 +695,7 @@ void Foam::syncTools::syncEdgeMap
slave++
)
{
- IPstream fromSlave(Pstream::blocking, slave);
+ IPstream fromSlave(Pstream::scheduled, slave);
EdgeMap<T> nbrValues(fromSlave);
// Merge neighbouring values with my values
@@ -784,7 +720,7 @@ void Foam::syncTools::syncEdgeMap
)
{
- OPstream toSlave(Pstream::blocking, slave);
+ OPstream toSlave(Pstream::scheduled, slave);
toSlave << sharedEdgeValues;
}
}
@@ -792,12 +728,12 @@ void Foam::syncTools::syncEdgeMap
{
// Send to master
{
- OPstream toMaster(Pstream::blocking, Pstream::masterNo());
+ OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster << sharedEdgeValues;
}
// Receive merged values
{
- IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
+ IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
fromMaster >> sharedEdgeValues;
}
}
@@ -831,14 +767,14 @@ void Foam::syncTools::syncEdgeMap
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointList
(
const polyMesh& mesh,
UList<T>& pointValues,
const CombineOp& cop,
const T& nullValue,
- const bool applySeparation
+ const TransformOp& top
)
{
if (pointValues.size() != mesh.nPoints())
@@ -860,11 +796,10 @@ void Foam::syncTools::syncPointList
return;
}
- // Is there any coupled patch with transformation?
- bool hasTransformation = false;
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -879,7 +814,7 @@ void Foam::syncTools::syncPointList
refCast<const processorPolyPatch>(patches[patchI]);
// Get data per patchPoint in neighbouring point numbers.
- List<T> patchInfo(procPatch.nPoints(), nullValue);
+ Field<T> patchInfo(procPatch.nPoints());
const labelList& meshPts = procPatch.meshPoints();
const labelList& nbrPts = procPatch.neighbPoints();
@@ -887,17 +822,15 @@ void Foam::syncTools::syncPointList
forAll(nbrPts, pointI)
{
label nbrPointI = nbrPts[pointI];
- if (nbrPointI >= 0 && nbrPointI < patchInfo.size())
- {
- patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
- }
+ patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
}
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
toNbr << patchInfo;
}
}
+ pBufs.finishedSends();
// Receive and combine.
@@ -911,32 +844,15 @@ void Foam::syncTools::syncPointList
{
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- checkTransform(procPatch, applySeparation);
- List<T> nbrPatchInfo(procPatch.nPoints());
+ Field<T> nbrPatchInfo(procPatch.nPoints());
{
- // We do not know the number of points on the other side
- // so cannot use Pstream::read.
- IPstream fromNbr
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
+ UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
fromNbr >> nbrPatchInfo;
}
- // Null any value which is not on neighbouring processor
- nbrPatchInfo.setSize(procPatch.nPoints(), nullValue);
- if (!procPatch.parallel())
- {
- hasTransformation = true;
- transformList(procPatch.forwardT(), nbrPatchInfo);
- }
- else if (applySeparation && procPatch.separated())
- {
- hasTransformation = true;
- separateList(-procPatch.separation(), nbrPatchInfo);
- }
+ // Transform to this side
+ top(procPatch, nbrPatchInfo);
const labelList& meshPts = procPatch.meshPoints();
@@ -957,77 +873,50 @@ void Foam::syncTools::syncPointList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- checkTransform(cycPatch, applySeparation);
-
- const edgeList& coupledPoints = cycPatch.coupledPoints();
- const labelList& meshPts = cycPatch.meshPoints();
-
- List<T> half0Values(coupledPoints.size());
- List<T> half1Values(coupledPoints.size());
-
- forAll(coupledPoints, i)
+ if (cycPatch.owner())
{
- const edge& e = coupledPoints[i];
+ // Owner does all.
- label point0 = meshPts[e[0]];
- label point1 = meshPts[e[1]];
+ const edgeList& coupledPoints = cycPatch.coupledPoints();
+ const labelList& meshPts = cycPatch.meshPoints();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshPoints = nbrPatch.meshPoints();
- half0Values[i] = pointValues[point0];
- half1Values[i] = pointValues[point1];
- }
+ Field<T> half0Values(coupledPoints.size());
+ Field<T> half1Values(coupledPoints.size());
- if (!cycPatch.parallel())
- {
- hasTransformation = true;
- transformList(cycPatch.reverseT(), half0Values);
- transformList(cycPatch.forwardT(), half1Values);
- }
- else if (applySeparation && cycPatch.separated())
- {
- hasTransformation = true;
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
- separateList(-v, half1Values);
- }
+ forAll(coupledPoints, i)
+ {
+ const edge& e = coupledPoints[i];
+ half0Values[i] = pointValues[meshPts[e[0]]];
+ half1Values[i] = pointValues[nbrMeshPoints[e[1]]];
+ }
- forAll(coupledPoints, i)
- {
- const edge& e = coupledPoints[i];
+ //SubField<T> slice0(half0Values, half0Values.size());
+ //SubField<T> slice1(half1Values, half1Values.size());
+ //top(cycPatch, reinterpret_cast<Field<T>&>(slice1));
+ //top(nbrPatch, reinterpret_cast<Field<T>&>(slice0));
- label point0 = meshPts[e[0]];
- label point1 = meshPts[e[1]];
+ top(cycPatch, half1Values);
+ top(nbrPatch, half0Values);
- cop(pointValues[point0], half1Values[i]);
- cop(pointValues[point1], half0Values[i]);
+ forAll(coupledPoints, i)
+ {
+ const edge& e = coupledPoints[i];
+ cop(pointValues[meshPts[e[0]]], half1Values[i]);
+ cop(pointValues[nbrMeshPoints[e[1]]], half0Values[i]);
+ }
}
}
}
- //- Note: hasTransformation is only used for warning messages so
- // reduction not strictly nessecary.
- //reduce(hasTransformation, orOp<bool>());
-
// Synchronize multiple shared points.
const globalMeshData& pd = mesh.globalData();
if (pd.nGlobalPoints() > 0)
{
- if (hasTransformation)
- {
- WarningIn
- (
- "syncTools<class T, class CombineOp>::syncPointList"
- "(const polyMesh&, UList<T>&, const CombineOp&, const T&"
- ", const bool)"
- ) << "There are decomposed cyclics in this mesh with"
- << " transformations." << endl
- << "This is not supported. The result will be incorrect"
- << endl;
- }
-
-
// Values on shared points.
- List<T> sharedPts(pd.nGlobalPoints(), nullValue);
+ Field<T> sharedPts(pd.nGlobalPoints(), nullValue);
forAll(pd.sharedPointLabels(), i)
{
@@ -1051,7 +940,7 @@ void Foam::syncTools::syncPointList
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointList
(
const polyMesh& mesh,
@@ -1059,7 +948,7 @@ void Foam::syncTools::syncPointList
UList<T>& pointValues,
const CombineOp& cop,
const T& nullValue,
- const bool applySeparation
+ const TransformOp& top
)
{
if (pointValues.size() != meshPoints.size())
@@ -1079,7 +968,7 @@ void Foam::syncTools::syncPointList
return;
}
- List<T> meshValues(mesh.nPoints(), nullValue);
+ Field<T> meshValues(mesh.nPoints(), nullValue);
forAll(meshPoints, i)
{
@@ -1092,7 +981,7 @@ void Foam::syncTools::syncPointList
meshValues,
cop, // combine op
nullValue, // null value
- applySeparation // separation
+ top // position or field
);
forAll(meshPoints, i)
@@ -1102,14 +991,14 @@ void Foam::syncTools::syncPointList
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncEdgeList
(
const polyMesh& mesh,
UList<T>& edgeValues,
const CombineOp& cop,
const T& nullValue,
- const bool applySeparation
+ const TransformOp& top
)
{
if (edgeValues.size() != mesh.nEdges())
@@ -1131,11 +1020,10 @@ void Foam::syncTools::syncEdgeList
return;
}
- // Is there any coupled patch with transformation?
- bool hasTransformation = false;
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -1153,23 +1041,22 @@ void Foam::syncTools::syncEdgeList
const labelList& neighbEdges = procPatch.neighbEdges();
// Get region per patch edge in neighbouring edge numbers.
- List<T> patchInfo(procPatch.nEdges(), nullValue);
+ Field<T> patchInfo(procPatch.nEdges(), nullValue);
forAll(neighbEdges, edgeI)
{
label nbrEdgeI = neighbEdges[edgeI];
- if (nbrEdgeI >= 0 && nbrEdgeI < patchInfo.size())
- {
- patchInfo[nbrEdgeI] = edgeValues[meshEdges[edgeI]];
- }
+ patchInfo[nbrEdgeI] = edgeValues[meshEdges[edgeI]];
}
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
toNbr << patchInfo;
- }
+ }
}
+ pBufs.finishedSends();
+
// Receive and combine.
forAll(patches, patchI)
@@ -1183,40 +1070,23 @@ void Foam::syncTools::syncEdgeList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- checkTransform(procPatch, applySeparation);
-
const labelList& meshEdges = procPatch.meshEdges();
// Receive from neighbour. Is per patch edge the region of the
// neighbouring patch edge.
- List<T> nbrPatchInfo(procPatch.nEdges());
+ Field<T> nbrPatchInfo(procPatch.nEdges());
{
- IPstream fromNeighb
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
+ UIPstream fromNeighb(procPatch.neighbProcNo(), pBufs);
fromNeighb >> nbrPatchInfo;
}
- // Null any value which is not on neighbouring processor
- nbrPatchInfo.setSize(procPatch.nEdges(), nullValue);
- if (!procPatch.parallel())
- {
- hasTransformation = true;
- transformList(procPatch.forwardT(), nbrPatchInfo);
- }
- else if (applySeparation && procPatch.separated())
- {
- hasTransformation = true;
- separateList(-procPatch.separation(), nbrPatchInfo);
- }
+ // Transform to this side
+ top(procPatch, nbrPatchInfo);
forAll(meshEdges, edgeI)
{
label meshEdgeI = meshEdges[edgeI];
-
cop(edgeValues[meshEdgeI], nbrPatchInfo[edgeI]);
}
}
@@ -1231,49 +1101,38 @@ void Foam::syncTools::syncEdgeList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- checkTransform(cycPatch, applySeparation);
-
- const edgeList& coupledEdges = cycPatch.coupledEdges();
- const labelList& meshEdges = cycPatch.meshEdges();
-
- List<T> half0Values(coupledEdges.size());
- List<T> half1Values(coupledEdges.size());
-
- forAll(coupledEdges, i)
+ if (cycPatch.owner())
{
- const edge& e = coupledEdges[i];
-
- label meshEdge0 = meshEdges[e[0]];
- label meshEdge1 = meshEdges[e[1]];
+ // Owner does all.
+ const edgeList& coupledEdges = cycPatch.coupledEdges();
+ const labelList& meshEdges = cycPatch.meshEdges();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshEdges = nbrPatch.meshEdges();
- half0Values[i] = edgeValues[meshEdge0];
- half1Values[i] = edgeValues[meshEdge1];
- }
+ Field<T> half0Values(coupledEdges.size());
+ Field<T> half1Values(coupledEdges.size());
- if (!cycPatch.parallel())
- {
- hasTransformation = true;
- transformList(cycPatch.reverseT(), half0Values);
- transformList(cycPatch.forwardT(), half1Values);
- }
- else if (applySeparation && cycPatch.separated())
- {
- hasTransformation = true;
-
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
- separateList(-v, half1Values);
- }
+ forAll(coupledEdges, i)
+ {
+ const edge& e = coupledEdges[i];
+ half0Values[i] = edgeValues[meshEdges[e[0]]];
+ half1Values[i] = edgeValues[nbrMeshEdges[e[1]]];
+ }
- forAll(coupledEdges, i)
- {
- const edge& e = coupledEdges[i];
+ //SubField<T> slice0(half0Values, half0Values.size());
+ //SubField<T> slice1(half1Values, half1Values.size());
+ //top(cycPatch, reinterpret_cast<Field<T>&>(slice1));
+ //top(nbrPatch, reinterpret_cast<Field<T>&>(slice0));
- label meshEdge0 = meshEdges[e[0]];
- label meshEdge1 = meshEdges[e[1]];
+ top(cycPatch, half1Values);
+ top(nbrPatch, half0Values);
- cop(edgeValues[meshEdge0], half1Values[i]);
- cop(edgeValues[meshEdge1], half0Values[i]);
+ forAll(coupledEdges, i)
+ {
+ const edge& e = coupledEdges[i];
+ cop(edgeValues[meshEdges[e[0]]], half1Values[i]);
+ cop(edgeValues[nbrMeshEdges[e[1]]], half0Values[i]);
+ }
}
}
}
@@ -1287,21 +1146,8 @@ void Foam::syncTools::syncEdgeList
if (pd.nGlobalEdges() > 0)
{
- if (hasTransformation)
- {
- WarningIn
- (
- "syncTools<class T, class CombineOp>::syncEdgeList"
- "(const polyMesh&, UList<T>&, const CombineOp&, const T&"
- ", const bool)"
- ) << "There are decomposed cyclics in this mesh with"
- << " transformations." << endl
- << "This is not supported. The result will be incorrect"
- << endl;
- }
-
// Values on shared edges.
- List<T> sharedPts(pd.nGlobalEdges(), nullValue);
+ Field<T> sharedPts(pd.nGlobalEdges(), nullValue);
forAll(pd.sharedEdgeLabels(), i)
{
@@ -1326,13 +1172,13 @@ void Foam::syncTools::syncEdgeList
}
-template <class T, class CombineOp>
+template <class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncBoundaryFaceList
(
const polyMesh& mesh,
UList<T>& faceValues,
const CombineOp& cop,
- const bool applySeparation
+ const TransformOp& top
)
{
const label nBFaces = mesh.nFaces() - mesh.nInternalFaces();
@@ -1359,6 +1205,8 @@ void Foam::syncTools::syncBoundaryFaceList
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -1374,26 +1222,21 @@ void Foam::syncTools::syncBoundaryFaceList
label patchStart = procPatch.start()-mesh.nInternalFaces();
- if (contiguous<T>())
- {
- OPstream::write
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
+ toNbr <<
+ SubField<T>
(
- Pstream::blocking,
- procPatch.neighbProcNo(),
- reinterpret_cast<const char*>(&faceValues[patchStart]),
- procPatch.size()*sizeof(T)
+ faceValues,
+ procPatch.size(),
+ patchStart
);
- }
- else
- {
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
- toNbr <<
- SubList<T>(faceValues, procPatch.size(), patchStart);
- }
}
}
+ pBufs.finishedSends();
+
+
// Receive and combine.
forAll(patches, patchI)
@@ -1407,37 +1250,12 @@ void Foam::syncTools::syncBoundaryFaceList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- List<T> nbrPatchInfo(procPatch.size());
+ Field<T> nbrPatchInfo(procPatch.size());
- if (contiguous<T>())
- {
- IPstream::read
- (
- Pstream::blocking,
- procPatch.neighbProcNo(),
- reinterpret_cast<char*>(nbrPatchInfo.begin()),
- nbrPatchInfo.byteSize()
- );
- }
- else
- {
- IPstream fromNeighb
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
- fromNeighb >> nbrPatchInfo;
- }
-
- if (!procPatch.parallel())
- {
- transformList(procPatch.forwardT(), nbrPatchInfo);
- }
- else if (applySeparation && procPatch.separated())
- {
- separateList(-procPatch.separation(), nbrPatchInfo);
- }
+ UIPstream fromNeighb(procPatch.neighbProcNo(), pBufs);
+ fromNeighb >> nbrPatchInfo;
+ top(procPatch, nbrPatchInfo);
label bFaceI = procPatch.start()-mesh.nInternalFaces();
@@ -1457,103 +1275,40 @@ void Foam::syncTools::syncBoundaryFaceList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- label patchStart = cycPatch.start()-mesh.nInternalFaces();
+ if (cycPatch.owner())
+ {
+ // Owner does all.
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ label ownStart = cycPatch.start()-mesh.nInternalFaces();
+ label nbrStart = nbrPatch.start()-mesh.nInternalFaces();
- label half = cycPatch.size()/2;
- label half1Start = patchStart+half;
+ label sz = cycPatch.size();
- List<T> half0Values(SubList<T>(faceValues, half, patchStart));
- List<T> half1Values(SubList<T>(faceValues, half, half1Start));
+ // Transform (copy of) data on both sides
+ Field<T> ownVals(SubField<T>(faceValues, sz, ownStart));
+ top(nbrPatch, ownVals);
- if (!cycPatch.parallel())
- {
- transformList(cycPatch.reverseT(), half0Values);
- transformList(cycPatch.forwardT(), half1Values);
- }
- else if (applySeparation && cycPatch.separated())
- {
- const vectorField& v = cycPatch.coupledPolyPatch::separation();
- separateList(v, half0Values);
- separateList(-v, half1Values);
- }
+ Field<T> nbrVals(SubField<T>(faceValues, sz, nbrStart));
+ top(cycPatch, nbrVals);
- label i0 = patchStart;
- forAll(half1Values, i)
- {
- cop(faceValues[i0++], half1Values[i]);
- }
+ label i0 = ownStart;
+ forAll(nbrVals, i)
+ {
+ cop(faceValues[i0++], nbrVals[i]);
+ }
- label i1 = half1Start;
- forAll(half0Values, i)
- {
- cop(faceValues[i1++], half0Values[i]);
+ label i1 = nbrStart;
+ forAll(ownVals, i)
+ {
+ cop(faceValues[i1++], ownVals[i]);
+ }
}
}
}
}
-template <class T, class CombineOp>
-void Foam::syncTools::syncFaceList
-(
- const polyMesh& mesh,
- UList<T>& faceValues,
- const CombineOp& cop,
- const bool applySeparation
-)
-{
- if (faceValues.size() != mesh.nFaces())
- {
- FatalErrorIn
- (
- "syncTools<class T, class CombineOp>::syncFaceList"
- "(const polyMesh&, UList<T>&, const CombineOp&"
- ", const bool)"
- ) << "Number of values " << faceValues.size()
- << " is not equal to the number of faces in the mesh "
- << mesh.nFaces() << abort(FatalError);
- }
-
- SubList<T> bndValues
- (
- faceValues,
- mesh.nFaces()-mesh.nInternalFaces(),
- mesh.nInternalFaces()
- );
-
- syncBoundaryFaceList
- (
- mesh,
- bndValues,
- cop,
- applySeparation
- );
-}
-
-
-template <class T>
-void Foam::syncTools::swapBoundaryFaceList
-(
- const polyMesh& mesh,
- UList<T>& faceValues,
- const bool applySeparation
-)
-{
- syncBoundaryFaceList(mesh, faceValues, eqOp<T>(), applySeparation);
-}
-
-
-template <class T>
-void Foam::syncTools::swapFaceList
-(
- const polyMesh& mesh,
- UList<T>& faceValues,
- const bool applySeparation
-)
-{
- syncFaceList(mesh, faceValues, eqOp<T>(), applySeparation);
-}
-
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <unsigned nBits, class CombineOp>
void Foam::syncTools::syncFaceList
@@ -1581,11 +1336,10 @@ void Foam::syncTools::syncFaceList
return;
}
- // Patch data (proc patches only).
- List<List<unsigned int> > patchValues(patches.size());
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -1599,19 +1353,20 @@ void Foam::syncTools::syncFaceList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- patchValues[patchI].setSize(procPatch.size());
+ List<unsigned int> patchInfo(procPatch.size());
forAll(procPatch, i)
{
- patchValues[patchI][i] =
- faceValues.get(procPatch.start()+i);
+ patchInfo[i] = faceValues[procPatch.start()+i];
}
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
- toNbr << patchValues[patchI];
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
+ toNbr << patchInfo;
}
}
+ pBufs.finishedSends();
+
// Receive and combine.
forAll(patches, patchI)
@@ -1625,23 +1380,20 @@ void Foam::syncTools::syncFaceList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
+ List<unsigned int> patchInfo(procPatch.size());
{
- IPstream fromNbr
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
- fromNbr >> patchValues[patchI];
+ UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
+ fromNbr >> patchInfo;
}
// Combine (bitwise)
forAll(procPatch, i)
{
- unsigned int patchVal = patchValues[patchI][i];
+ unsigned int patchVal = patchInfo[i];
label meshFaceI = procPatch.start()+i;
- unsigned int faceVal = faceValues.get(meshFaceI);
+ unsigned int faceVal = faceValues[meshFaceI];
cop(faceVal, patchVal);
- faceValues.set(meshFaceI, faceVal);
+ faceValues[meshFaceI] = faceVal;
}
}
}
@@ -1655,21 +1407,25 @@ void Foam::syncTools::syncFaceList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- label half = cycPatch.size()/2;
-
- for (label i = 0; i < half; i++)
+ if (cycPatch.owner())
{
- label meshFace0 = cycPatch.start()+i;
- unsigned int val0 = faceValues.get(meshFace0);
- label meshFace1 = meshFace0 + half;
- unsigned int val1 = faceValues.get(meshFace1);
+ // Owner does all.
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
- unsigned int t = val0;
- cop(t, val1);
- faceValues.set(meshFace0, t);
+ for (label i = 0; i < cycPatch.size(); i++)
+ {
+ label meshFace0 = cycPatch.start()+i;
+ unsigned int val0 = faceValues[meshFace0];
+ label meshFace1 = nbrPatch.start()+i;
+ unsigned int val1 = faceValues[meshFace1];
+
+ unsigned int t = val0;
+ cop(t, val1);
+ faceValues[meshFace0] = t;
- cop(val1, val0);
- faceValues.set(meshFace1, val1);
+ cop(val1, val0);
+ faceValues[meshFace1] = val1;
+ }
}
}
}
@@ -1702,7 +1458,7 @@ void Foam::syncTools::syncPointList
(
"syncTools<unsigned nBits, class CombineOp>::syncPointList"
"(const polyMesh&, PackedList<nBits>&, const CombineOp&"
- ", const unsigned int&)"
+ ", const unsigned int)"
) << "Number of values " << pointValues.size()
<< " is not equal to the number of points in the mesh "
<< mesh.nPoints() << abort(FatalError);
@@ -1715,11 +1471,10 @@ void Foam::syncTools::syncPointList
return;
}
- // Patch data (proc patches only).
- List<List<unsigned int> > patchValues(patches.size());
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -1733,8 +1488,7 @@ void Foam::syncTools::syncPointList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- patchValues[patchI].setSize(procPatch.nPoints());
- patchValues[patchI] = nullValue;
+ List<unsigned int> patchInfo(procPatch.nPoints());
const labelList& meshPts = procPatch.meshPoints();
const labelList& nbrPts = procPatch.neighbPoints();
@@ -1742,19 +1496,17 @@ void Foam::syncTools::syncPointList
forAll(nbrPts, pointI)
{
label nbrPointI = nbrPts[pointI];
- if (nbrPointI >= 0 && nbrPointI < procPatch.nPoints())
- {
- patchValues[patchI][nbrPointI] =
- pointValues.get(meshPts[pointI]);
- }
+ patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
}
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
- toNbr << patchValues[patchI];
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
+ toNbr << patchInfo;
}
}
+ pBufs.finishedSends();
+
// Receive and combine.
forAll(patches, patchI)
@@ -1768,28 +1520,22 @@ void Foam::syncTools::syncPointList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
+ List<unsigned int> nbrPatchInfo(procPatch.nPoints());
{
// We do not know the number of points on the other side
// so cannot use Pstream::read.
- IPstream fromNbr
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
- fromNbr >> patchValues[patchI];
+ UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
+ fromNbr >> nbrPatchInfo;
}
- // Null any value which is not on neighbouring processor
- patchValues[patchI].setSize(procPatch.nPoints(), nullValue);
-
const labelList& meshPts = procPatch.meshPoints();
forAll(meshPts, pointI)
{
label meshPointI = meshPts[pointI];
- unsigned int pointVal = pointValues.get(meshPointI);
- cop(pointVal, patchValues[patchI][pointI]);
- pointValues.set(meshPointI, pointVal);
+ unsigned int pointVal = pointValues[meshPointI];
+ cop(pointVal, nbrPatchInfo[pointI]);
+ pointValues[meshPointI] = pointVal;
}
}
}
@@ -1803,24 +1549,30 @@ void Foam::syncTools::syncPointList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- const edgeList& coupledPoints = cycPatch.coupledPoints();
- const labelList& meshPts = cycPatch.meshPoints();
-
- forAll(coupledPoints, i)
+ if (cycPatch.owner())
{
- const edge& e = coupledPoints[i];
-
- label point0 = meshPts[e[0]];
- label point1 = meshPts[e[1]];
+ // Owner does all.
- unsigned int val0 = pointValues.get(point0);
- unsigned int t = val0;
- unsigned int val1 = pointValues.get(point1);
+ const edgeList& coupledPoints = cycPatch.coupledPoints();
+ const labelList& meshPts = cycPatch.meshPoints();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshPts = nbrPatch.meshPoints();
- cop(t, val1);
- pointValues.set(point0, t);
- cop(val1, val0);
- pointValues.set(point1, val1);
+ forAll(coupledPoints, i)
+ {
+ const edge& e = coupledPoints[i];
+ label meshPoint0 = meshPts[e[0]];
+ label meshPoint1 = nbrMeshPts[e[1]];
+
+ unsigned int val0 = pointValues[meshPoint0];
+ unsigned int val1 = pointValues[meshPoint1];
+ unsigned int t = val0;
+
+ cop(val0, val1);
+ pointValues[meshPoint0] = val0;
+ cop(val1, t);
+ pointValues[meshPoint1] = val1;
+ }
}
}
}
@@ -1837,7 +1589,7 @@ void Foam::syncTools::syncPointList
{
label meshPointI = pd.sharedPointLabels()[i];
// Fill my entries in the shared points
- sharedPts[pd.sharedPointAddr()[i]] = pointValues.get(meshPointI);
+ sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointI];
}
// Combine on master.
@@ -1849,7 +1601,7 @@ void Foam::syncTools::syncPointList
forAll(pd.sharedPointLabels(), i)
{
label meshPointI = pd.sharedPointLabels()[i];
- pointValues.set(meshPointI, sharedPts[pd.sharedPointAddr()[i]]);
+ pointValues[meshPointI] = sharedPts[pd.sharedPointAddr()[i]];
}
}
}
@@ -1870,7 +1622,7 @@ void Foam::syncTools::syncEdgeList
(
"syncTools<unsigned nBits, class CombineOp>::syncEdgeList"
"(const polyMesh&, PackedList<nBits>&, const CombineOp&"
- ", const unsigned int&)"
+ ", const unsigned int)"
) << "Number of values " << edgeValues.size()
<< " is not equal to the number of edges in the mesh "
<< mesh.nEdges() << abort(FatalError);
@@ -1883,11 +1635,10 @@ void Foam::syncTools::syncEdgeList
return;
}
- // Patch data (proc patches only).
- List<List<unsigned int> > patchValues(patches.size());
-
if (Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send
forAll(patches, patchI)
@@ -1901,7 +1652,7 @@ void Foam::syncTools::syncEdgeList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
- patchValues[patchI].setSize(procPatch.nEdges(), nullValue);
+ List<unsigned int> patchInfo(procPatch.nEdges());
const labelList& meshEdges = procPatch.meshEdges();
const labelList& neighbEdges = procPatch.neighbEdges();
@@ -1909,18 +1660,15 @@ void Foam::syncTools::syncEdgeList
forAll(neighbEdges, edgeI)
{
label nbrEdgeI = neighbEdges[edgeI];
- if (nbrEdgeI >= 0 && nbrEdgeI < procPatch.nEdges())
- {
- patchValues[patchI][nbrEdgeI] =
- edgeValues.get(meshEdges[edgeI]);
- }
+ patchInfo[nbrEdgeI] = edgeValues[meshEdges[edgeI]];
}
- OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
- toNbr << patchValues[patchI];
+ UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
+ toNbr << patchInfo;
}
}
+ pBufs.finishedSends();
// Receive and combine.
@@ -1935,26 +1683,23 @@ void Foam::syncTools::syncEdgeList
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patches[patchI]);
+ // Receive from neighbour.
+ List<unsigned int> nbrPatchInfo(procPatch.nEdges());
+
{
- IPstream fromNeighb
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
- fromNeighb >> patchValues[patchI];
+ UIPstream fromNeighb(procPatch.neighbProcNo(), pBufs);
+ fromNeighb >> nbrPatchInfo;
}
- patchValues[patchI].setSize(procPatch.nEdges(), nullValue);
-
const labelList& meshEdges = procPatch.meshEdges();
forAll(meshEdges, edgeI)
{
- unsigned int patchVal = patchValues[patchI][edgeI];
+ unsigned int patchVal = nbrPatchInfo[edgeI];
label meshEdgeI = meshEdges[edgeI];
- unsigned int edgeVal = edgeValues.get(meshEdgeI);
+ unsigned int edgeVal = edgeValues[meshEdgeI];
cop(edgeVal, patchVal);
- edgeValues.set(meshEdgeI, edgeVal);
+ edgeValues[meshEdgeI] = edgeVal;
}
}
}
@@ -1968,24 +1713,30 @@ void Foam::syncTools::syncEdgeList
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patches[patchI]);
- const edgeList& coupledEdges = cycPatch.coupledEdges();
- const labelList& meshEdges = cycPatch.meshEdges();
-
- forAll(coupledEdges, i)
+ if (cycPatch.owner())
{
- const edge& e = coupledEdges[i];
+ // Owner does all.
+ const edgeList& coupledEdges = cycPatch.coupledEdges();
+ const labelList& meshEdges = cycPatch.meshEdges();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshEdges = nbrPatch.meshEdges();
- label edge0 = meshEdges[e[0]];
- label edge1 = meshEdges[e[1]];
+ forAll(coupledEdges, i)
+ {
+ const edge& e = coupledEdges[i];
+
+ label edge0 = meshEdges[e[0]];
+ label edge1 = nbrMeshEdges[e[1]];
- unsigned int val0 = edgeValues.get(edge0);
- unsigned int t = val0;
- unsigned int val1 = edgeValues.get(edge1);
+ unsigned int val0 = edgeValues[edge0];
+ unsigned int t = val0;
+ unsigned int val1 = edgeValues[edge1];
- cop(t, val1);
- edgeValues.set(edge0, t);
- cop(val1, val0);
- edgeValues.set(edge1, val1);
+ cop(t, val1);
+ edgeValues[edge0] = t;
+ cop(val1, val0);
+ edgeValues[edge1] = val1;
+ }
}
}
}
@@ -2002,7 +1753,7 @@ void Foam::syncTools::syncEdgeList
{
label meshEdgeI = pd.sharedEdgeLabels()[i];
// Fill my entries in the shared edges
- sharedPts[pd.sharedEdgeAddr()[i]] = edgeValues.get(meshEdgeI);
+ sharedPts[pd.sharedEdgeAddr()[i]] = edgeValues[meshEdgeI];
}
// Combine on master.
@@ -2014,7 +1765,7 @@ void Foam::syncTools::syncEdgeList
forAll(pd.sharedEdgeLabels(), i)
{
label meshEdgeI = pd.sharedEdgeLabels()[i];
- edgeValues.set(meshEdgeI, sharedPts[pd.sharedEdgeAddr()[i]]);
+ edgeValues[meshEdgeI] = sharedPts[pd.sharedEdgeAddr()[i]];
}
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 8c5b79e80a25f8b8b931795dc6b205e74336e1fb..ddda6efaf96248e2496a015db334b128fa3a4e6e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -463,9 +463,9 @@ bool Foam::faceZone::checkParallelSync(const bool report) const
}
}
boolList myZoneFace(neiZoneFace);
- syncTools::swapBoundaryFaceList(mesh, neiZoneFace, false);
+ syncTools::swapBoundaryFaceList(mesh, neiZoneFace);
boolList myZoneFlip(neiZoneFlip);
- syncTools::swapBoundaryFaceList(mesh, neiZoneFlip, false);
+ syncTools::swapBoundaryFaceList(mesh, neiZoneFlip);
forAll(*this, i)
{
diff --git a/src/OpenFOAM/primitives/Lists/labelIOList.C b/src/OpenFOAM/primitives/Lists/labelIOList.C
index 0d91c9947c22d63b2b38aa8c35e72f843849f095..6fd10f9ef9b1345db13a1c2eb46cf667ee98a5fd 100644
--- a/src/OpenFOAM/primitives/Lists/labelIOList.C
+++ b/src/OpenFOAM/primitives/Lists/labelIOList.C
@@ -37,7 +37,6 @@ namespace Foam
addCompoundToRunTimeSelectionTable(List<label>, labelList);
defineTemplateTypeNameAndDebugWithName(labelIOList, "labelList", 0);
- defineTemplateTypeNameAndDebugWithName(labelListIOList, "labelListList", 0);
}
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/labelIOList.H b/src/OpenFOAM/primitives/Lists/labelIOList.H
index 73517c9d1affbb6237d4d03291fea39db131be0e..31cd120f6cd6d181c0ec58100058b32dd8d21d95 100644
--- a/src/OpenFOAM/primitives/Lists/labelIOList.H
+++ b/src/OpenFOAM/primitives/Lists/labelIOList.H
@@ -32,7 +32,7 @@ Description
#ifndef labelIOList_H
#define labelIOList_H
-#include "labelList.H"
+#include "label.H"
#include "IOList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,7 +40,6 @@ Description
namespace Foam
{
typedef IOList<label> labelIOList;
- typedef IOList<labelList> labelListIOList;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.C b/src/OpenFOAM/primitives/Lists/labelListIOList.C
new file mode 100644
index 0000000000000000000000000000000000000000..4d4b072f37fca2eac11b6620a6c28be2ab02123f
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/labelListIOList.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ Declaration of IOList and IOListList ClassNames for IOListLists that
+ do not have .C files.
+
+\*---------------------------------------------------------------------------*/
+
+#include "labelListIOList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName(labelListIOList, "labelListList", 0);
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ labelIOListList,
+ "labelCompactListList",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.H b/src/OpenFOAM/primitives/Lists/labelListIOList.H
new file mode 100644
index 0000000000000000000000000000000000000000..58aeca9d755bff86de41c81929315e94d9bb372b
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/labelListIOList.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::labelListIOList
+
+Description
+ Label container classes
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef labelListIOList_H
+#define labelListIOList_H
+
+#include "labelList.H"
+#include "IOList.H"
+#include "IOListList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOList<labelList> labelListIOList;
+ typedef IOListList<labelList, label> labelIOListList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/scalarIOList.C b/src/OpenFOAM/primitives/Lists/scalarIOList.C
index 4552aac1f011f500290d2e7a2df12e1e2579e6cb..e49b2bbe25fb0985db46ba155b0e9913af9bfd5b 100644
--- a/src/OpenFOAM/primitives/Lists/scalarIOList.C
+++ b/src/OpenFOAM/primitives/Lists/scalarIOList.C
@@ -34,12 +34,6 @@ Description
namespace Foam
{
defineTemplateTypeNameAndDebugWithName(scalarIOList, "scalarList", 0);
- defineTemplateTypeNameAndDebugWithName
- (
- scalarListIOList,
- "scalarListList",
- 0
- );
}
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/scalarIOList.H b/src/OpenFOAM/primitives/Lists/scalarIOList.H
index ad5c000c37e16e1e71273684f900c9907b6f60b6..8414af3b7845a0876577a6cb93dcbeda2e06b138 100644
--- a/src/OpenFOAM/primitives/Lists/scalarIOList.H
+++ b/src/OpenFOAM/primitives/Lists/scalarIOList.H
@@ -32,7 +32,7 @@ Description
#ifndef scalarIOList_H
#define scalarIOList_H
-#include "scalarList.H"
+#include "scalar.H"
#include "IOList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,7 +40,6 @@ Description
namespace Foam
{
typedef IOList<scalar> scalarIOList;
- typedef IOList<scalarList> scalarListIOList;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.C b/src/OpenFOAM/primitives/Lists/scalarListIOList.C
new file mode 100644
index 0000000000000000000000000000000000000000..7d148001c50c4172d752a970bd7342b6b639f451
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/scalarListIOList.C
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ Declaration of IOList and IOListList ClassNames for IOListLists that
+ do not have .C files.
+
+\*---------------------------------------------------------------------------*/
+
+#include "scalarListIOList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ scalarListIOList,
+ "scalarListList",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ scalarIOListList,
+ "scalarCompactListList",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.H b/src/OpenFOAM/primitives/Lists/scalarListIOList.H
new file mode 100644
index 0000000000000000000000000000000000000000..ececf895642eab3ab48fa78ac229a3b71ebfd43e
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/scalarListIOList.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::scalarListIOList
+
+Description
+ Scalar container classes
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef scalarListIOList_H
+#define scalarListIOList_H
+
+#include "scalarList.H"
+#include "IOList.H"
+#include "IOListList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOList<scalarList> scalarListIOList;
+ typedef IOListList<scalarList, scalar> scalarIOListList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/vectorIOList.C b/src/OpenFOAM/primitives/Lists/vectorIOList.C
new file mode 100644
index 0000000000000000000000000000000000000000..31004a207df28bd64ab1f5b4acdfe3c33629f6a8
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/vectorIOList.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ Declaration of vector IOList containers
+
+\*---------------------------------------------------------------------------*/
+
+#include "vectorIOList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName(vectorIOList, "vectorList", 0);
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/vectorIOList.H b/src/OpenFOAM/primitives/Lists/vectorIOList.H
new file mode 100644
index 0000000000000000000000000000000000000000..9789e83a388c0471e64e6ff3d6ec1581a0f0cc38
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/vectorIOList.H
@@ -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/>.
+
+Typedef
+ Foam::vectorIOList
+
+Description
+ Vector container classes
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vectorIOList_H
+#define vectorIOList_H
+
+#include "vector.H"
+#include "IOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOList<vector> vectorIOList;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.C b/src/OpenFOAM/primitives/Lists/vectorListIOList.C
new file mode 100644
index 0000000000000000000000000000000000000000..92ca0cedc31d9bdfd1603208f5367dbc1fe32b5c
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/vectorListIOList.C
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ Declaration of IOList and IOListList ClassNames for IOListLists that
+ do not have .C files.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vectorListIOList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vectorListIOList,
+ "vectorListList",
+ 0
+ );
+
+ defineTemplateTypeNameAndDebugWithName
+ (
+ vectorIOListList,
+ "vectorCompactListList",
+ 0
+ );
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.H b/src/OpenFOAM/primitives/Lists/vectorListIOList.H
new file mode 100644
index 0000000000000000000000000000000000000000..39a96a075e4bf2ae3501e4deb80c0ee2f713bd3f
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/vectorListIOList.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::vectorListIOList
+
+Description
+ Scalar container classes
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vectorListIOList_H
+#define vectorListIOList_H
+
+#include "vectorList.H"
+#include "IOList.H"
+#include "IOListList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ typedef IOList<vectorList> vectorListIOList;
+ typedef IOListList<vectorList, vector> vectorIOListList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 50f34957aa63741fbae4db6628151e09f8e09504..6502bb5d9674b664d63633e81f0cc86b6de9c2c4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index a8b9ec79878a31c5b47a63b74aecd1690ba01b3d..5ecd3efdb9f28220ca7aa12b46ea7a021982ddf4 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -84,7 +84,7 @@ void Foam::dynamicRefineFvMesh::calculateProtectedCells
{
neiLevel[faceI-nInternalFaces()] = cellLevel[faceOwner()[faceI]];
}
- syncTools::swapBoundaryFaceList(*this, neiLevel, false);
+ syncTools::swapBoundaryFaceList(*this, neiLevel);
while (true)
@@ -122,7 +122,7 @@ void Foam::dynamicRefineFvMesh::calculateProtectedCells
}
}
- syncTools::syncFaceList(*this, seedFace, orEqOp<bool>(), false);
+ syncTools::syncFaceList(*this, seedFace, orEqOp<bool>());
// Extend unrefineableCell
@@ -846,7 +846,7 @@ void Foam::dynamicRefineFvMesh::extendMarkedCells
}
}
- syncTools::syncFaceList(*this, markedFace, orEqOp<bool>(), false);
+ syncTools::syncFaceList(*this, markedFace, orEqOp<bool>());
// Update cells using any markedFace
for (label faceI = 0; faceI < nInternalFaces(); faceI++)
@@ -933,7 +933,7 @@ Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
{
neiLevel[faceI] = cellLevel[faceOwner()[faceI]];
}
- syncTools::swapFaceList(*this, neiLevel, false);
+ syncTools::swapFaceList(*this, neiLevel);
boolList protectedFace(nFaces(), false);
@@ -965,13 +965,7 @@ Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
}
}
- syncTools::syncFaceList
- (
- *this,
- protectedFace,
- orEqOp<bool>(),
- false
- );
+ syncTools::syncFaceList(*this, protectedFace, orEqOp<bool>());
for (label faceI = 0; faceI < nInternalFaces(); faceI++)
{
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 889f15c5f23633b45d0a32a1083855aab09fae73..7524a0723f47b55974130d83e02616c9e8720cfb 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -29,6 +29,9 @@ License
#include "faceCoupleInfo.H"
#include "processorFvPatchField.H"
#include "processorFvsPatchField.H"
+#include "processorCyclicPolyPatch.H"
+#include "processorCyclicFvPatchField.H"
+#include "processorCyclicFvsPatchField.H"
#include "polyTopoChange.H"
#include "removeCells.H"
#include "polyModifyFace.H"
@@ -128,6 +131,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
{
Pout<< "Primitives:" << nl
<< " points :" << mesh.nPoints() << nl
+ << " bb :" << boundBox(mesh.points(), false) << nl
<< " internalFaces:" << mesh.nInternalFaces() << nl
<< " faces :" << mesh.nFaces() << nl
<< " cells :" << mesh.nCells() << nl;
@@ -187,7 +191,8 @@ void Foam::fvMeshDistribute::printCoupleInfo
const primitiveMesh& mesh,
const labelList& sourceFace,
const labelList& sourceProc,
- const labelList& sourceNewProc
+ const labelList& sourcePatch,
+ const labelList& sourceNewNbrProc
)
{
Pout<< nl
@@ -202,7 +207,7 @@ void Foam::fvMeshDistribute::printCoupleInfo
<< " fc:" << mesh.faceCentres()[meshFaceI]
<< " connects to proc:" << sourceProc[bFaceI]
<< "/face:" << sourceFace[bFaceI]
- << " which will move to proc:" << sourceNewProc[bFaceI]
+ << " which will move to proc:" << sourceNewNbrProc[bFaceI]
<< endl;
}
}
@@ -270,32 +275,87 @@ Foam::label Foam::fvMeshDistribute::findNonEmptyPatch() const
}
-// Appends processorPolyPatch. Returns patchID.
-Foam::label Foam::fvMeshDistribute::addProcPatch
-(
- const word& patchName,
- const label nbrProc
-)
+//// Appends processorPolyPatch. Returns patchID.
+//Foam::label Foam::fvMeshDistribute::addProcPatch
+//(
+// const word& patchName,
+// const label nbrProc
+//)
+//{
+// // Clear local fields and e.g. polyMesh globalMeshData.
+// mesh_.clearOut();
+//
+//
+// polyBoundaryMesh& polyPatches =
+// const_cast<polyBoundaryMesh&>(mesh_.boundaryMesh());
+// fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh_.boundary());
+//
+// if (polyPatches.findPatchID(patchName) != -1)
+// {
+// FatalErrorIn("fvMeshDistribute::addProcPatch(const word&, const label)")
+// << "Cannot create patch " << patchName << " since already exists."
+// << nl
+// << "Current patch names:" << polyPatches.names()
+// << exit(FatalError);
+// }
+//
+//
+//
+// // Add the patch
+// // ~~~~~~~~~~~~~
+//
+// label sz = polyPatches.size();
+//
+// // Add polyPatch
+// polyPatches.setSize(sz+1);
+// polyPatches.set
+// (
+// sz,
+// new processorPolyPatch
+// (
+// patchName,
+// 0, // size
+// mesh_.nFaces(),
+// sz,
+// mesh_.boundaryMesh(),
+// Pstream::myProcNo(),
+// nbrProc
+// )
+// );
+// fvPatches.setSize(sz+1);
+// fvPatches.set
+// (
+// sz,
+// fvPatch::New
+// (
+// polyPatches[sz], // point to newly added polyPatch
+// mesh_.boundary()
+// )
+// );
+//
+// return sz;
+//}
+
+
+// Appends polyPatch. Returns patchID.
+Foam::label Foam::fvMeshDistribute::addPatch(polyPatch* patchPtr)
{
// Clear local fields and e.g. polyMesh globalMeshData.
mesh_.clearOut();
-
polyBoundaryMesh& polyPatches =
const_cast<polyBoundaryMesh&>(mesh_.boundaryMesh());
fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh_.boundary());
- if (polyPatches.findPatchID(patchName) != -1)
+ if (polyPatches.findPatchID(patchPtr->name()) != -1)
{
- FatalErrorIn("fvMeshDistribute::addProcPatch(const word&, const label)")
- << "Cannot create patch " << patchName << " since already exists."
- << nl
- << "Current patch names:" << polyPatches.names()
- << exit(FatalError);
+ FatalErrorIn("fvMeshDistribute::addPatch(polyPatch*)")
+ << "Cannot create patch " << patchPtr->name()
+ << " since already exists." << nl
+ << "Current patch names:" << polyPatches.names() << exit(FatalError);
}
-
// Add the patch
// ~~~~~~~~~~~~~
@@ -303,20 +363,7 @@ Foam::label Foam::fvMeshDistribute::addProcPatch
// Add polyPatch
polyPatches.setSize(sz+1);
- polyPatches.set
- (
- sz,
- new processorPolyPatch
- (
- patchName,
- 0, // size
- mesh_.nFaces(),
- sz,
- mesh_.boundaryMesh(),
- Pstream::myProcNo(),
- nbrProc
- )
- );
+ polyPatches.set(sz, patchPtr);
fvPatches.setSize(sz+1);
fvPatches.set
(
@@ -624,25 +671,27 @@ void Foam::fvMeshDistribute::getNeighbourData
const labelList& distribution,
labelList& sourceFace,
labelList& sourceProc,
- labelList& sourceNewProc
+ labelList& sourcePatch,
+ labelList& sourceNewNbrProc
) const
{
label nBnd = mesh_.nFaces() - mesh_.nInternalFaces();
sourceFace.setSize(nBnd);
sourceProc.setSize(nBnd);
- sourceNewProc.setSize(nBnd);
+ sourcePatch.setSize(nBnd);
+ sourceNewNbrProc.setSize(nBnd);
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
// Get neighbouring meshFace labels and new processor of coupled boundaries.
labelList nbrFaces(nBnd, -1);
- labelList nbrNewProc(nBnd, -1);
+ labelList nbrNewNbrProc(nBnd, -1);
forAll(patches, patchI)
{
const polyPatch& pp = patches[patchI];
- if (isA<processorPolyPatch>(pp))
+ if (pp.coupled())
{
label offset = pp.start() - mesh_.nInternalFaces();
@@ -654,7 +703,7 @@ void Foam::fvMeshDistribute::getNeighbourData
}
// Which processor they will end up on
- SubList<label>(nbrNewProc, pp.size(), offset).assign
+ SubList<label>(nbrNewNbrProc, pp.size(), offset).assign
(
UIndirectList<label>(distribution, pp.faceCells())()
);
@@ -663,8 +712,8 @@ void Foam::fvMeshDistribute::getNeighbourData
// Exchange the boundary data
- syncTools::swapBoundaryFaceList(mesh_, nbrFaces, false);
- syncTools::swapBoundaryFaceList(mesh_, nbrNewProc, false);
+ syncTools::swapBoundaryFaceList(mesh_, nbrFaces);
+ syncTools::swapBoundaryFaceList(mesh_, nbrNewNbrProc);
forAll(patches, patchI)
@@ -679,7 +728,7 @@ void Foam::fvMeshDistribute::getNeighbourData
// Check which of the two faces we store.
- if (Pstream::myProcNo() < procPatch.neighbProcNo())
+ if (procPatch.owner())
{
// Use my local face labels
forAll(pp, i)
@@ -687,7 +736,7 @@ void Foam::fvMeshDistribute::getNeighbourData
label bndI = offset + i;
sourceFace[bndI] = pp.start()+i;
sourceProc[bndI] = Pstream::myProcNo();
- sourceNewProc[bndI] = nbrNewProc[bndI];
+ sourceNewNbrProc[bndI] = nbrNewNbrProc[bndI];
}
}
else
@@ -698,7 +747,50 @@ void Foam::fvMeshDistribute::getNeighbourData
label bndI = offset + i;
sourceFace[bndI] = nbrFaces[bndI];
sourceProc[bndI] = procPatch.neighbProcNo();
- sourceNewProc[bndI] = nbrNewProc[bndI];
+ sourceNewNbrProc[bndI] = nbrNewNbrProc[bndI];
+ }
+ }
+
+
+ label patchI = -1;
+ if (isA<processorCyclicPolyPatch>(pp))
+ {
+ patchI = refCast<const processorCyclicPolyPatch>
+ (
+ pp
+ ).referPatchID();
+ }
+
+ forAll(pp, i)
+ {
+ label bndI = offset + i;
+ sourcePatch[bndI] = patchI;
+ }
+ }
+ else if (isA<cyclicPolyPatch>(pp))
+ {
+ const cyclicPolyPatch& cpp = refCast<const cyclicPolyPatch>(pp);
+
+ if (cpp.owner())
+ {
+ forAll(pp, i)
+ {
+ label bndI = offset + i;
+ sourceFace[bndI] = pp.start()+i;
+ sourceProc[bndI] = Pstream::myProcNo();
+ sourcePatch[bndI] = patchI;
+ sourceNewNbrProc[bndI] = nbrNewNbrProc[bndI];
+ }
+ }
+ else
+ {
+ forAll(pp, i)
+ {
+ label bndI = offset + i;
+ sourceFace[bndI] = nbrFaces[bndI];
+ sourceProc[bndI] = Pstream::myProcNo();
+ sourcePatch[bndI] = patchI;
+ sourceNewNbrProc[bndI] = nbrNewNbrProc[bndI];
}
}
}
@@ -708,9 +800,10 @@ void Foam::fvMeshDistribute::getNeighbourData
forAll(pp, i)
{
label bndI = offset + i;
- sourceFace[bndI] = patchI;
+ sourceFace[bndI] = -1;
sourceProc[bndI] = -1;
- sourceNewProc[bndI] = -1;
+ sourcePatch[bndI] = patchI;
+ sourceNewNbrProc[bndI] = -1;
}
}
}
@@ -731,16 +824,19 @@ void Foam::fvMeshDistribute::subsetBoundaryData
const labelList& sourceFace,
const labelList& sourceProc,
- const labelList& sourceNewProc,
+ const labelList& sourcePatch,
+ const labelList& sourceNewNbrProc,
labelList& subFace,
labelList& subProc,
- labelList& subNewProc
+ labelList& subPatch,
+ labelList& subNewNbrProc
)
{
subFace.setSize(mesh.nFaces() - mesh.nInternalFaces());
subProc.setSize(mesh.nFaces() - mesh.nInternalFaces());
- subNewProc.setSize(mesh.nFaces() - mesh.nInternalFaces());
+ subPatch.setSize(mesh.nFaces() - mesh.nInternalFaces());
+ subNewNbrProc.setSize(mesh.nFaces() - mesh.nInternalFaces());
forAll(subFace, newBFaceI)
{
@@ -753,6 +849,7 @@ void Foam::fvMeshDistribute::subsetBoundaryData
{
subFace[newBFaceI] = oldFaceI;
subProc[newBFaceI] = Pstream::myProcNo();
+ subPatch[newBFaceI] = -1;
label oldOwn = oldFaceOwner[oldFaceI];
label oldNei = oldFaceNeighbour[oldFaceI];
@@ -760,12 +857,12 @@ void Foam::fvMeshDistribute::subsetBoundaryData
if (oldOwn == cellMap[mesh.faceOwner()[newFaceI]])
{
// We kept the owner side. Where does the neighbour move to?
- subNewProc[newBFaceI] = oldDistribution[oldNei];
+ subNewNbrProc[newBFaceI] = oldDistribution[oldNei];
}
else
{
// We kept the neighbour side.
- subNewProc[newBFaceI] = oldDistribution[oldOwn];
+ subNewNbrProc[newBFaceI] = oldDistribution[oldOwn];
}
}
else
@@ -775,7 +872,8 @@ void Foam::fvMeshDistribute::subsetBoundaryData
subFace[newBFaceI] = sourceFace[oldBFaceI];
subProc[newBFaceI] = sourceProc[oldBFaceI];
- subNewProc[newBFaceI] = sourceNewProc[oldBFaceI];
+ subPatch[newBFaceI] = sourcePatch[oldBFaceI];
+ subNewNbrProc[newBFaceI] = sourceNewNbrProc[oldBFaceI];
}
}
}
@@ -788,11 +886,13 @@ void Foam::fvMeshDistribute::findCouples
const primitiveMesh& mesh,
const labelList& sourceFace,
const labelList& sourceProc,
+ const labelList& sourcePatch,
const label domain,
const primitiveMesh& domainMesh,
const labelList& domainFace,
const labelList& domainProc,
+ const labelList& domainPatch,
labelList& masterCoupledFaces,
labelList& slaveCoupledFaces
@@ -802,9 +902,16 @@ void Foam::fvMeshDistribute::findCouples
// with same face+proc.
HashTable<label, labelPair, labelPair::Hash<> > map(domainFace.size());
- forAll(domainFace, bFaceI)
+ forAll(domainProc, bFaceI)
{
- map.insert(labelPair(domainFace[bFaceI], domainProc[bFaceI]), bFaceI);
+ if (domainProc[bFaceI] != -1 && domainPatch[bFaceI] == -1)
+ {
+ map.insert
+ (
+ labelPair(domainFace[bFaceI], domainProc[bFaceI]),
+ bFaceI
+ );
+ }
}
@@ -816,7 +923,7 @@ void Foam::fvMeshDistribute::findCouples
forAll(sourceFace, bFaceI)
{
- if (sourceProc[bFaceI] != -1)
+ if (sourceProc[bFaceI] != -1 && sourcePatch[bFaceI] == -1)
{
labelPair myData(sourceFace[bFaceI], sourceProc[bFaceI]);
@@ -934,105 +1041,202 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::doRemoveCells
// the processor patchID.
void Foam::fvMeshDistribute::addProcPatches
(
- const labelList& neighbourNewProc, // processor that neighbour is on
- labelList& procPatchID
+ const labelList& nbrProc, // processor that neighbour is now on
+ const labelList& referPatchID, // patchID (or -1) I originated from
+ List<Map<label> >& procPatchID
)
{
- // Now use the neighbourFace/Proc to repatch the mesh. These two lists
+ // Now use the neighbourFace/Proc to repatch the mesh. These lists
// contain for all current boundary faces the global patchID (for non-proc
// patch) or the processor.
- labelList procPatchSizes(Pstream::nProcs(), 0);
-
- forAll(neighbourNewProc, bFaceI)
- {
- if (neighbourNewProc[bFaceI] != -1)
- {
- procPatchSizes[neighbourNewProc[bFaceI]]++;
- }
- }
-
- // Per neighbour processor the label of the processor patch
procPatchID.setSize(Pstream::nProcs());
- forAll(procPatchSizes, procI)
+ forAll(nbrProc, bFaceI)
{
- if (procPatchSizes[procI] > 0)
- {
- const word patchName =
- "procBoundary"
- + name(Pstream::myProcNo())
- + "to"
- + name(procI);
+ label procI = nbrProc[bFaceI];
-
- procPatchID[procI] = addProcPatch(patchName, procI);
- addPatchFields<volScalarField>
- (
- processorFvPatchField<scalar>::typeName
- );
- addPatchFields<volVectorField>
- (
- processorFvPatchField<vector>::typeName
- );
- addPatchFields<volSphericalTensorField>
- (
- processorFvPatchField<sphericalTensor>::typeName
- );
- addPatchFields<volSymmTensorField>
- (
- processorFvPatchField<symmTensor>::typeName
- );
- addPatchFields<volTensorField>
- (
- processorFvPatchField<tensor>::typeName
- );
-
- addPatchFields<surfaceScalarField>
- (
- processorFvPatchField<scalar>::typeName
- );
- addPatchFields<surfaceVectorField>
- (
- processorFvPatchField<vector>::typeName
- );
- addPatchFields<surfaceSphericalTensorField>
- (
- processorFvPatchField<sphericalTensor>::typeName
- );
- addPatchFields<surfaceSymmTensorField>
- (
- processorFvPatchField<symmTensor>::typeName
- );
- addPatchFields<surfaceTensorField>
- (
- processorFvPatchField<tensor>::typeName
- );
- }
- else
+ if (procI != -1 && procI != Pstream::myProcNo())
{
- procPatchID[procI] = -1;
+ if (!procPatchID[procI].found(referPatchID[bFaceI]))
+ {
+ // No patch for neighbour yet. Is either a normal processor
+ // patch or a processorCyclic patch.
+
+ if (referPatchID[bFaceI] == -1)
+ {
+ // Ordinary processor boundary
+
+ const word patchName =
+ "procBoundary"
+ + name(Pstream::myProcNo())
+ + "to"
+ + name(procI);
+
+ procPatchID[procI].insert
+ (
+ referPatchID[bFaceI],
+ addPatch
+ (
+ new processorPolyPatch
+ (
+ patchName,
+ 0, // size
+ mesh_.nFaces(),
+ mesh_.boundaryMesh().size(),
+ mesh_.boundaryMesh(),
+ Pstream::myProcNo(),
+ nbrProc[bFaceI]
+ )
+ )
+ );
+
+ addPatchFields<volScalarField>
+ (
+ processorFvPatchField<scalar>::typeName
+ );
+ addPatchFields<volVectorField>
+ (
+ processorFvPatchField<vector>::typeName
+ );
+ addPatchFields<volSphericalTensorField>
+ (
+ processorFvPatchField<sphericalTensor>::typeName
+ );
+ addPatchFields<volSymmTensorField>
+ (
+ processorFvPatchField<symmTensor>::typeName
+ );
+ addPatchFields<volTensorField>
+ (
+ processorFvPatchField<tensor>::typeName
+ );
+
+ addPatchFields<surfaceScalarField>
+ (
+ processorFvPatchField<scalar>::typeName
+ );
+ addPatchFields<surfaceVectorField>
+ (
+ processorFvPatchField<vector>::typeName
+ );
+ addPatchFields<surfaceSphericalTensorField>
+ (
+ processorFvPatchField<sphericalTensor>::typeName
+ );
+ addPatchFields<surfaceSymmTensorField>
+ (
+ processorFvPatchField<symmTensor>::typeName
+ );
+ addPatchFields<surfaceTensorField>
+ (
+ processorFvPatchField<tensor>::typeName
+ );
+ }
+ else
+ {
+ // Processor boundary originating from cyclic
+ const word& cycName = mesh_.boundaryMesh()
+ [
+ referPatchID[bFaceI]
+ ].name();
+
+ const word patchName =
+ "procBoundary"
+ + name(Pstream::myProcNo())
+ + "to"
+ + name(procI)
+ + "through"
+ + cycName;
+
+ procPatchID[procI].insert
+ (
+ referPatchID[bFaceI],
+ addPatch
+ (
+ new processorCyclicPolyPatch
+ (
+ patchName,
+ 0, // size
+ mesh_.nFaces(),
+ mesh_.boundaryMesh().size(),
+ mesh_.boundaryMesh(),
+ Pstream::myProcNo(),
+ nbrProc[bFaceI],
+ cycName
+ )
+ )
+ );
+
+ addPatchFields<volScalarField>
+ (
+ processorCyclicFvPatchField<scalar>::typeName
+ );
+ addPatchFields<volVectorField>
+ (
+ processorCyclicFvPatchField<vector>::typeName
+ );
+ addPatchFields<volSphericalTensorField>
+ (
+ processorCyclicFvPatchField<sphericalTensor>::typeName
+ );
+ addPatchFields<volSymmTensorField>
+ (
+ processorCyclicFvPatchField<symmTensor>::typeName
+ );
+ addPatchFields<volTensorField>
+ (
+ processorCyclicFvPatchField<tensor>::typeName
+ );
+
+ addPatchFields<surfaceScalarField>
+ (
+ processorCyclicFvPatchField<scalar>::typeName
+ );
+ addPatchFields<surfaceVectorField>
+ (
+ processorCyclicFvPatchField<vector>::typeName
+ );
+ addPatchFields<surfaceSphericalTensorField>
+ (
+ processorCyclicFvPatchField<sphericalTensor>::typeName
+ );
+ addPatchFields<surfaceSymmTensorField>
+ (
+ processorCyclicFvPatchField<symmTensor>::typeName
+ );
+ addPatchFields<surfaceTensorField>
+ (
+ processorCyclicFvPatchField<tensor>::typeName
+ );
+ }
+ }
}
}
}
// Get boundary faces to be repatched. Is -1 or new patchID
-Foam::labelList Foam::fvMeshDistribute::getProcBoundaryPatch
+Foam::labelList Foam::fvMeshDistribute::getBoundaryPatch
(
- const labelList& neighbourNewProc, // new processor per boundary face
- const labelList& procPatchID // patchID
+ const labelList& nbrProc, // new processor per boundary face
+ const labelList& referPatchID, // patchID (or -1) I originated from
+ const List<Map<label> >& procPatchID // per proc the new procPatches
)
{
- labelList patchIDs(neighbourNewProc);
+ labelList patchIDs(nbrProc);
- forAll(neighbourNewProc, bFaceI)
+ forAll(nbrProc, bFaceI)
{
- if (neighbourNewProc[bFaceI] != -1)
+ if (nbrProc[bFaceI] == Pstream::myProcNo())
{
- label nbrProc = neighbourNewProc[bFaceI];
-
- patchIDs[bFaceI] = procPatchID[nbrProc];
+ label origPatchI = referPatchID[bFaceI];
+ patchIDs[bFaceI] = origPatchI;
+ }
+ else if (nbrProc[bFaceI] != -1)
+ {
+ label origPatchI = referPatchID[bFaceI];
+ patchIDs[bFaceI] = procPatchID[nbrProc[bFaceI]][origPatchI];
}
else
{
@@ -1055,7 +1259,8 @@ void Foam::fvMeshDistribute::sendMesh
const labelList& sourceFace,
const labelList& sourceProc,
- const labelList& sourceNewProc,
+ const labelList& sourcePatch,
+ const labelList& sourceNewNbrProc,
UOPstream& toDomain
)
{
@@ -1191,7 +1396,8 @@ void Foam::fvMeshDistribute::sendMesh
<< sourceFace
<< sourceProc
- << sourceNewProc;
+ << sourcePatch
+ << sourceNewNbrProc;
if (debug)
@@ -1212,7 +1418,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshDistribute::receiveMesh
const Time& runTime,
labelList& domainSourceFace,
labelList& domainSourceProc,
- labelList& domainSourceNewProc,
+ labelList& domainSourcePatch,
+ labelList& domainSourceNewNbrProc,
UIPstream& fromNbr
)
{
@@ -1230,7 +1437,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshDistribute::receiveMesh
fromNbr
>> domainSourceFace
>> domainSourceProc
- >> domainSourceNewProc;
+ >> domainSourcePatch
+ >> domainSourceNewNbrProc;
// Construct fvMesh
autoPtr<fvMesh> domainMeshPtr
@@ -1448,16 +1656,37 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// physical boundary:
// sourceProc = -1
- // sourceNewProc = -1
- // sourceFace = patchID
- // coupled boundary:
- // sourceProc = proc
- // sourceNewProc = distribution[cell on proc]
- // sourceFace = face
+ // sourceNewNbrProc = -1
+ // sourceFace = -1
+ // sourcePatch = patchID
+ // processor boundary:
+ // sourceProc = proc (on owner side)
+ // sourceNewNbrProc = distribution of coupled cell
+ // sourceFace = face (on owner side)
+ // sourcePatch = -1
+ // ?cyclic:
+ // ? sourceProc = proc
+ // ? sourceNewNbrProc = distribution of coupled cell
+ // ? sourceFace = face (on owner side)
+ // ? sourcePatch = patchID
+ // processor-cyclic boundary:
+ // sourceProc = proc (on owner side)
+ // sourceNewNbrProc = distribution of coupled cell
+ // sourceFace = face (on owner side)
+ // sourcePatch = patchID
+
+ labelList sourcePatch;
labelList sourceFace;
labelList sourceProc;
- labelList sourceNewProc;
- getNeighbourData(distribution, sourceFace, sourceProc, sourceNewProc);
+ labelList sourceNewNbrProc;
+ getNeighbourData
+ (
+ distribution,
+ sourceFace,
+ sourceProc,
+ sourcePatch,
+ sourceNewNbrProc
+ );
// Remove meshPhi. Since this would otherwise disappear anyway
@@ -1529,7 +1758,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
inplaceReorder(bFaceMap, sourceFace);
inplaceReorder(bFaceMap, sourceProc);
- inplaceReorder(bFaceMap, sourceNewProc);
+ inplaceReorder(bFaceMap, sourcePatch);
+ inplaceReorder(bFaceMap, sourceNewNbrProc);
}
@@ -1632,7 +1862,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Subset the boundary fields (owner/neighbour/processor)
labelList procSourceFace;
labelList procSourceProc;
- labelList procSourceNewProc;
+ labelList procSourcePatch;
+ labelList procSourceNewNbrProc;
subsetBoundaryData
(
@@ -1647,11 +1878,13 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
sourceFace,
sourceProc,
- sourceNewProc,
+ sourcePatch,
+ sourceNewNbrProc,
procSourceFace,
procSourceProc,
- procSourceNewProc
+ procSourcePatch,
+ procSourceNewNbrProc
);
@@ -1668,7 +1901,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
procSourceFace,
procSourceProc,
- procSourceNewProc,
+ procSourcePatch,
+ procSourceNewNbrProc,
str
);
sendFields<volScalarField>(recvProc, volScalars, subsetter, str);
@@ -1771,7 +2005,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// fields
labelList domainSourceFace;
labelList domainSourceProc;
- labelList domainSourceNewProc;
+ labelList domainSourcePatch;
+ labelList domainSourceNewNbrProc;
subsetBoundaryData
(
@@ -1786,16 +2021,19 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
sourceFace,
sourceProc,
- sourceNewProc,
+ sourcePatch,
+ sourceNewNbrProc,
domainSourceFace,
domainSourceProc,
- domainSourceNewProc
+ domainSourcePatch,
+ domainSourceNewNbrProc
);
sourceFace.transfer(domainSourceFace);
sourceProc.transfer(domainSourceProc);
- sourceNewProc.transfer(domainSourceNewProc);
+ sourcePatch.transfer(domainSourcePatch);
+ sourceNewNbrProc.transfer(domainSourceNewNbrProc);
}
@@ -1848,7 +2086,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Receive from sendProc
labelList domainSourceFace;
labelList domainSourceProc;
- labelList domainSourceNewProc;
+ labelList domainSourcePatch;
+ labelList domainSourceNewNbrProc;
autoPtr<fvMesh> domainMeshPtr;
PtrList<volScalarField> vsf;
@@ -1874,10 +2113,14 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
const_cast<Time&>(mesh_.time()),
domainSourceFace,
domainSourceProc,
- domainSourceNewProc,
+ domainSourcePatch,
+ domainSourceNewNbrProc,
str
);
fvMesh& domainMesh = domainMeshPtr();
+ // Force construction of various on mesh.
+ //(void)domainMesh.globalData();
+
// Receive fields. Read as single dictionary because
// of problems reading consecutive fields from single stream.
@@ -2006,11 +2249,13 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
sourceFace,
sourceProc,
+ sourcePatch,
sendProc,
domainMesh,
domainSourceFace,
domainSourceProc,
+ domainSourcePatch,
masterCoupledFaces,
slaveCoupledFaces
@@ -2045,33 +2290,38 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Update mesh data: sourceFace,sourceProc for added
// mesh.
- sourceFace =
- mapBoundaryData
- (
- mesh_,
- map(),
- sourceFace,
- domainMesh.nInternalFaces(),
- domainSourceFace
- );
- sourceProc =
- mapBoundaryData
- (
- mesh_,
- map(),
- sourceProc,
- domainMesh.nInternalFaces(),
- domainSourceProc
- );
- sourceNewProc =
- mapBoundaryData
- (
- mesh_,
- map(),
- sourceNewProc,
- domainMesh.nInternalFaces(),
- domainSourceNewProc
- );
+ sourceFace = mapBoundaryData
+ (
+ mesh_,
+ map(),
+ sourceFace,
+ domainMesh.nInternalFaces(),
+ domainSourceFace
+ );
+ sourceProc = mapBoundaryData
+ (
+ mesh_,
+ map(),
+ sourceProc,
+ domainMesh.nInternalFaces(),
+ domainSourceProc
+ );
+ sourcePatch = mapBoundaryData
+ (
+ mesh_,
+ map(),
+ sourcePatch,
+ domainMesh.nInternalFaces(),
+ domainSourcePatch
+ );
+ sourceNewNbrProc = mapBoundaryData
+ (
+ mesh_,
+ map(),
+ sourceNewNbrProc,
+ domainMesh.nInternalFaces(),
+ domainSourceNewNbrProc
+ );
// Update all addressing so xxProcAddressing points to correct item
// in masterMesh.
@@ -2141,11 +2391,13 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Add processorPatches
// ~~~~~~~~~~~~~~~~~~~~
- // Per neighbour processor the patchID to it (or -1).
- labelList procPatchID;
+ // Per neighbour processor, per originating patch, the patchID
+ // For faces resulting from internal faces or normal processor patches
+ // the originating patch is -1. For cyclics this is the cyclic patchID.
+ List<Map<label> > procPatchID;
- // Add processor patches.
- addProcPatches(sourceNewProc, procPatchID);
+ // Add processor and processorCyclic patches.
+ addProcPatches(sourceNewNbrProc, sourcePatch, procPatchID);
// Put faces into correct patch. Note that we now have proper
// processorPolyPatches again so repatching will take care of coupled face
@@ -2154,9 +2406,10 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Get boundary faces to be repatched. Is -1 or new patchID
labelList newPatchID
(
- getProcBoundaryPatch
+ getBoundaryPatch
(
- sourceNewProc,
+ sourceNewNbrProc,
+ sourcePatch,
procPatchID
)
);
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index 5af95fb1076fd2d8bc791a95c80cb3a9f8e66058..f85e1b53acd501a06bdcb72e48cf90287fc90bab 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -102,8 +102,8 @@ class fvMeshDistribute
//- Find patch to put exposed faces into.
label findNonEmptyPatch() const;
- //- Appends processorPolyPatch. Returns patchID.
- label addProcPatch(const word& patchName, const label nbrProc);
+ //- Appends polyPatch. Returns patchID.
+ label addPatch(polyPatch*);
//- Add patch field
template<class GeoField>
@@ -169,6 +169,7 @@ class fvMeshDistribute
const labelList& distribution,
labelList& sourceFace,
labelList& sourceProc,
+ labelList& sourcePatch,
labelList& sourceNewProc
) const;
@@ -186,10 +187,12 @@ class fvMeshDistribute
const labelList& sourceFace,
const labelList& sourceProc,
+ const labelList& sourcePatch,
const labelList& sourceNewProc,
labelList& subFace,
labelList& subProc,
+ labelList& subPatch,
labelList& subNewProc
);
@@ -200,11 +203,13 @@ class fvMeshDistribute
const primitiveMesh&,
const labelList& sourceFace,
const labelList& sourceProc,
+ const labelList& sourcePatch,
const label domain,
const primitiveMesh& domainMesh,
const labelList& domainFace,
const labelList& domainProc,
+ const labelList& domainPatch,
labelList& masterCoupledFaces,
labelList& slaveCoupledFaces
@@ -235,15 +240,17 @@ class fvMeshDistribute
// proc the processor patchID.
void addProcPatches
(
- const labelList&, // processor that neighbour is on
- labelList& procPatchID
+ const labelList&, // processor that neighbour is now on
+ const labelList&, // -1 or patch that face originated from
+ List<Map<label> >& procPatchID
);
//- Get boundary faces to be repatched. Is -1 or new patchID
- static labelList getProcBoundaryPatch
+ static labelList getBoundaryPatch
(
- const labelList& neighbourNewProc,// new processor per b. face
- const labelList& procPatchID // patchID
+ const labelList& neighbourNewProc, // new processor per b. face
+ const labelList& referPatchID, // -1 or original patch
+ const List<Map<label> >& procPatchID// patchID
);
//- Send mesh and coupling data.
@@ -256,6 +263,7 @@ class fvMeshDistribute
const wordList& cellZoneNames,
const labelList& sourceFace,
const labelList& sourceProc,
+ const labelList& sourcePatch,
const labelList& sourceNewProc,
UOPstream& toDomain
);
@@ -279,6 +287,7 @@ class fvMeshDistribute
const Time& runTime,
labelList& domainSourceFace,
labelList& domainSourceProc,
+ labelList& domainSourcePatch,
labelList& domainSourceNewProc,
UIPstream& fromNbr
);
@@ -328,6 +337,7 @@ public:
const primitiveMesh&,
const labelList&,
const labelList&,
+ const labelList&,
const labelList&
);
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 5c3d79a97856578e87810318dd51ab95edf347f5..9cb0eff0754e184dc3e0b3aa3bad90b0aedeecb2 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -40,6 +40,80 @@ defineTypeNameAndDebug(Foam::motionSmoother, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+void Foam::motionSmoother::testSyncPositions
+(
+ const pointField& fld,
+ const scalar maxMag
+) const
+{
+ pointField syncedFld(fld);
+
+ syncTools::syncPointPositions
+ (
+ mesh_,
+ syncedFld,
+ minEqOp<point>(), // combine op
+ point(GREAT,GREAT,GREAT) // null
+ );
+
+ forAll(syncedFld, i)
+ {
+ if (mag(syncedFld[i] - fld[i]) > maxMag)
+ {
+ FatalErrorIn
+ (
+ "motionSmoother::testSyncPositions(const pointField&)"
+ ) << "On point " << i << " point:" << fld[i]
+ << " synchronised point:" << syncedFld[i]
+ << abort(FatalError);
+ }
+ }
+}
+
+
+//Foam::tmp<Foam::scalarField> Foam::motionSmoother::sumWeights
+//(
+// const scalarField& edgeWeight
+//) const
+//{
+// tmp<scalarField> tsumWeight
+// (
+// new scalarField
+// (
+// mesh_.nPoints(),
+// 0.0
+// )
+// );
+// scalarField& sumWeight = tsumWeight();
+//
+// const edgeList& edges = mesh_.edges();
+//
+// forAll(edges, edgeI)
+// {
+// if (isMasterEdge_.get(edgeI) == 1)
+// {
+// const edge& e = edges[edgeI];
+// const scalar w = edgeWeight[edgeI];
+// sumWeight[e[0]] += w;
+// sumWeight[e[1]] += w;
+// }
+// }
+//
+//
+// // Add coupled contributions
+// // ~~~~~~~~~~~~~~~~~~~~~~~~~
+// syncTools::syncPointList
+// (
+// mesh,
+// sumWeight,
+// plusEqOp<scalar>(),
+// scalar(0) // null value
+// );
+//
+// return tsumWeight;
+//}
+
+
// From pointPatchInterpolation
void Foam::motionSmoother::makePatchPatchAddressing()
{
@@ -209,8 +283,7 @@ void Foam::motionSmoother::minSmooth
tmp<pointScalarField> tavgFld = avg
(
fld,
- scalarField(mesh_.nEdges(), 1.0), // uniform weighting
- false // fld is not position.
+ scalarField(mesh_.nEdges(), 1.0) // uniform weighting
);
const pointScalarField& avgFld = tavgFld();
@@ -243,8 +316,7 @@ void Foam::motionSmoother::minSmooth
tmp<pointScalarField> tavgFld = avg
(
fld,
- scalarField(mesh_.nEdges(), 1.0), // uniform weighting
- false // fld is not position.
+ scalarField(mesh_.nEdges(), 1.0) // uniform weighting
);
const pointScalarField& avgFld = tavgFld();
@@ -612,8 +684,7 @@ void Foam::motionSmoother::setDisplacement(pointField& patchDisp)
mesh_,
displacement_,
maxMagEqOp(), // combine op
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
// Adapt the fixedValue bc's (i.e. copy internal point data to
@@ -718,8 +789,7 @@ void Foam::motionSmoother::correctBoundaryConditions
mesh_,
displacement,
maxMagEqOp(), // combine op
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
}
@@ -769,14 +839,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
{
Pout<< "motionSmoother::movePoints : testing sync of newPoints."
<< endl;
- testSyncField
- (
- newPoints,
- minEqOp<point>(), // combine op
- vector(GREAT,GREAT,GREAT), // null
- true, // separation
- 1E-6*mesh_.bounds().mag()
- );
+ testSyncPositions(newPoints, 1E-6*mesh_.bounds().mag());
}
tmp<scalarField> tsweptVol = mesh_.movePoints(newPoints);
@@ -894,8 +957,7 @@ bool Foam::motionSmoother::scaleMesh
mesh_,
displacement_,
maxMagEqOp(),
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
// Set newPoints as old + scale*displacement
@@ -926,7 +988,6 @@ bool Foam::motionSmoother::scaleMesh
totalDisplacement,
maxMagEqOp(),
vector::zero, // null value
- false, // separation
1E-6*mesh_.bounds().mag()
);
}
@@ -1056,8 +1117,7 @@ bool Foam::motionSmoother::scaleMesh
mesh_,
scale_,
maxEqOp<scalar>(),
- -GREAT, // null value
- false // no separation
+ -GREAT // null value
);
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index ee306dd3c9a2eed2ba5dd137897ff9a7a38c370a..729cbb28a558890cbfd4d50547c7be6019ac1b56 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -183,8 +183,15 @@ class motionSmoother
tmp<GeometricField<Type, pointPatchField, pointMesh> > avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
- const scalarField& edgeWeight,
- const bool separation
+ const scalarField& edgeWeight
+ ) const;
+
+ //- Average postion of connected points.
+ template <class Type>
+ tmp<GeometricField<Type, pointPatchField, pointMesh> > avgPositions
+ (
+ const GeometricField<Type, pointPatchField, pointMesh>& fld,
+ const scalarField& edgeWeight
) const;
//- Check constraints
@@ -201,17 +208,19 @@ class motionSmoother
GeometricField<Type, pointPatchField, pointMesh>&
) const;
- //- Test synchronisation of pointField
+ //- Test synchronisation of generic field (not positions!) on points
template<class Type, class CombineOp>
void testSyncField
(
const Field<Type>&,
const CombineOp& cop,
const Type& zero,
- const bool separation,
const scalar maxMag
) const;
+ //- Test synchronisation of points
+ void testSyncPositions(const pointField&, const scalar maxMag) const;
+
//- Assemble tensors for multi-patch constraints
void makePatchPatchAddressing();
@@ -476,14 +485,13 @@ public:
// Helper functions to manipulate displacement vector.
- //- Fully explicit smoothing of internal points with varying
- // diffusivity.
+ //- Fully explicit smoothing of fields (not positions)
+ // of internal points with varying diffusivity.
template <class Type>
void smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
const scalarField& edgeWeight,
- const bool separation,
GeometricField<Type, pointPatchField, pointMesh>& newFld
) const;
};
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
index 1660a29e18decf00024f479d9a6a8bf5f50c700f..a444276c195136a0cf2883e493dfd7b8a7ca2464 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
@@ -155,11 +155,10 @@ void Foam::motionSmoother::applyCornerConstraints
// Average of connected points.
template <class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
- Foam::motionSmoother::avg
+Foam::motionSmoother::avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
- const scalarField& edgeWeight,
- const bool separation
+ const scalarField& edgeWeight
) const
{
tmp<GeometricField<Type, pointPatchField, pointMesh> > tres
@@ -172,7 +171,8 @@ Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
fld.time().timeName(),
fld.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
fld.mesh(),
dimensioned<Type>("zero", fld.dimensions(), pTraits<Type>::zero)
@@ -217,17 +217,14 @@ Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
mesh,
res,
plusEqOp<Type>(),
- pTraits<Type>::zero, // null value
- separation // separation
+ pTraits<Type>::zero // null value
);
-
syncTools::syncPointList
(
mesh,
sumWeight,
plusEqOp<scalar>(),
- scalar(0), // null value
- false // separation
+ scalar(0) // null value
);
@@ -260,16 +257,10 @@ void Foam::motionSmoother::smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
const scalarField& edgeWeight,
- const bool separation,
GeometricField<Type, pointPatchField, pointMesh>& newFld
) const
{
- tmp<pointVectorField> tavgFld = avg
- (
- fld,
- edgeWeight, // weighting
- separation // whether to apply separation vector
- );
+ tmp<pointVectorField> tavgFld = avg(fld, edgeWeight);
const pointVectorField& avgFld = tavgFld();
forAll(fld, pointI)
@@ -285,14 +276,13 @@ void Foam::motionSmoother::smooth
}
-//- Test synchronisation of pointField
+//- Test synchronisation of generic field (not positions!) on points
template<class Type, class CombineOp>
void Foam::motionSmoother::testSyncField
(
const Field<Type>& fld,
const CombineOp& cop,
const Type& zero,
- const bool separation,
const scalar maxMag
) const
{
@@ -309,13 +299,11 @@ void Foam::motionSmoother::testSyncField
mesh_,
syncedFld,
cop,
- zero, // null value
- separation // separation
+ zero
);
forAll(syncedFld, i)
{
- if (syncedFld[i] != fld[i])
if (mag(syncedFld[i] - fld[i]) > maxMag)
{
FatalErrorIn
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index a4c05fe4126d17e91ed75ae242aa65cfa34c5155..b79089bf044879ac87613037f6485e3d6d746e72 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -425,13 +425,13 @@ bool Foam::polyMeshGeometry::checkFaceDotProduct
// Calculate coupled cell centre
- vectorField neiCc(mesh.nFaces()-mesh.nInternalFaces());
+ pointField neiCc(mesh.nFaces()-mesh.nInternalFaces());
for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
{
neiCc[faceI-mesh.nInternalFaces()] = cellCentres[own[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh, neiCc, true);
+ syncTools::swapBoundaryFacePositions(mesh, neiCc);
scalar minDDotS = GREAT;
@@ -927,13 +927,13 @@ bool Foam::polyMeshGeometry::checkFaceSkewness
const polyBoundaryMesh& patches = mesh.boundaryMesh();
// Calculate coupled cell centre
- vectorField neiCc(mesh.nFaces()-mesh.nInternalFaces());
+ pointField neiCc(mesh.nFaces()-mesh.nInternalFaces());
for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
{
neiCc[faceI-mesh.nInternalFaces()] = cellCentres[own[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh, neiCc, true);
+ syncTools::swapBoundaryFacePositions(mesh, neiCc);
scalar maxSkew = 0;
@@ -1135,13 +1135,13 @@ bool Foam::polyMeshGeometry::checkFaceWeights
const polyBoundaryMesh& patches = mesh.boundaryMesh();
// Calculate coupled cell centre
- vectorField neiCc(mesh.nFaces()-mesh.nInternalFaces());
+ pointField neiCc(mesh.nFaces()-mesh.nInternalFaces());
for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
{
neiCc[faceI-mesh.nInternalFaces()] = cellCentres[own[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh, neiCc, true);
+ syncTools::swapBoundaryFacePositions(mesh, neiCc);
scalar minWeight = GREAT;
@@ -1298,7 +1298,7 @@ bool Foam::polyMeshGeometry::checkVolRatio
{
neiVols[faceI-mesh.nInternalFaces()] = cellVolumes[own[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh, neiVols, true);
+ syncTools::swapBoundaryFaceList(mesh, neiVols);
scalar minRatio = GREAT;
@@ -1641,13 +1641,13 @@ bool Foam::polyMeshGeometry::checkFaceTwist
const polyBoundaryMesh& patches = mesh.boundaryMesh();
// Calculate coupled cell centre
- vectorField neiCc(mesh.nFaces()-mesh.nInternalFaces());
+ pointField neiCc(mesh.nFaces()-mesh.nInternalFaces());
for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
{
neiCc[faceI-mesh.nInternalFaces()] = cellCentres[own[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh, neiCc, true);
+ syncTools::swapBoundaryFacePositions(mesh, neiCc);
forAll(checkFaces, i)
{
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 9105db90237a277097b97aeccc2f756c138f2621..170052341d98007089273d72455e50e3d3d707c6 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -34,6 +34,7 @@ License
#include "polyModifyFace.H"
#include "polyAddCell.H"
#include "globalIndex.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -103,8 +104,8 @@ Foam::labelListList Foam::addPatchCellLayer::calcGlobalEdgeFaces
mesh,
globalEdgeFaces,
uniqueEqOp(),
- labelList(), // null value
- false // no separation
+ labelList(), // null value
+ Foam::dummyTransform() // dummy transform
);
// Extract pp part
@@ -636,7 +637,7 @@ void Foam::addPatchCellLayer::setRefinement
{
labelList n(mesh_.nPoints(), 0);
UIndirectList<label>(n, meshPoints) = nPointLayers;
- syncTools::syncPointList(mesh_, n, maxEqOp<label>(), 0, false);
+ syncTools::syncPointList(mesh_, n, maxEqOp<label>(), 0);
// Non-synced
forAll(meshPoints, i)
@@ -680,8 +681,7 @@ void Foam::addPatchCellLayer::setRefinement
mesh_,
nFromFace,
maxEqOp<label>(),
- 0,
- false
+ 0
);
forAll(nPointLayers, i)
@@ -718,8 +718,7 @@ void Foam::addPatchCellLayer::setRefinement
mesh_,
d,
minEqOp<vector>(),
- vector::max,
- false
+ vector::max
);
forAll(meshPoints, i)
@@ -1190,8 +1189,7 @@ void Foam::addPatchCellLayer::setRefinement
mesh_,
meshEdgeLayers,
maxEqOp<label>(),
- 0, // initial value
- false // no separation
+ 0 // initial value
);
forAll(meshEdges, edgeI)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 5dc59ad815b8ff84bfb64c6f72d18cad81a90377..83414d1c98c0d16290c3e8d218290642346b576f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -708,8 +708,7 @@ void Foam::combineFaces::setRefinement
mesh_,
nPointFaces,
plusEqOp<label>(),
- 0, // null value
- false // no separation
+ 0 // null value
);
// Remove all unused points. Store position if undoable.
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 5a5e108134e953f6564de1328637da534cbe471d..ea2479c07edb42dac165c64dbe1f385b0f6626c0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -412,8 +412,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
mesh_,
edgeLevel,
ifEqEqOp<labelMax>(),
- labelMin,
- false // no separation
+ labelMin
);
// Now use the edgeLevel with a valid value to determine the
@@ -1618,7 +1617,7 @@ Foam::label Foam::hexRef8::faceConsistentRefinement
}
// Swap to neighbour
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
// Now we have neighbour value see which cells need refinement
forAll(neiLevel, i)
@@ -1700,7 +1699,7 @@ void Foam::hexRef8::checkWantedRefinementLevels
}
// Swap to neighbour
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
// Now we have neighbour value see which cells need refinement
forAll(neiLevel, i)
@@ -2369,8 +2368,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
mesh_,
maxPointCount,
maxEqOp<label>(),
- labelMin, // null value
- false // no separation
+ labelMin // null value
);
// Update allFaceInfo from maxPointCount for all points to check
@@ -2509,9 +2507,9 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
}
// Swap to neighbour
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
- syncTools::swapBoundaryFaceList(mesh_, neiCount, false);
- syncTools::swapBoundaryFaceList(mesh_, neiRefCount, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
+ syncTools::swapBoundaryFaceList(mesh_, neiCount);
+ syncTools::swapBoundaryFaceList(mesh_, neiRefCount);
// Now we have neighbour value see which cells need refinement
forAll(neiLevel, i)
@@ -3156,8 +3154,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
mesh_,
edgeMidPoint,
maxEqOp<label>(),
- labelMin,
- false // no separation
+ labelMin
);
@@ -3179,13 +3176,12 @@ Foam::labelListList Foam::hexRef8::setRefinement
edgeMids[edgeI] = mesh_.edges()[edgeI].centre(mesh_.points());
}
}
- syncTools::syncEdgeList
+ syncTools::syncEdgePositions
(
mesh_,
edgeMids,
maxEqOp<vector>(),
- point(-GREAT, -GREAT, -GREAT),
- true // apply separation
+ point(-GREAT, -GREAT, -GREAT)
);
@@ -3310,7 +3306,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
}
// Swap.
- syncTools::swapBoundaryFaceList(mesh_, newNeiLevel, false);
+ syncTools::swapBoundaryFaceList(mesh_, newNeiLevel);
// So now we have information on the neighbour.
@@ -3342,8 +3338,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
(
mesh_,
faceMidPoint,
- maxEqOp<label>(),
- false
+ maxEqOp<label>()
);
@@ -3369,12 +3364,11 @@ Foam::labelListList Foam::hexRef8::setRefinement
bFaceMids[i] = mesh_.faceCentres()[faceI];
}
}
- syncTools::syncBoundaryFaceList
+ syncTools::syncBoundaryFacePositions
(
mesh_,
bFaceMids,
- maxEqOp<vector>(),
- true // apply separation
+ maxEqOp<vector>()
);
forAll(faceMidPoint, faceI)
@@ -4404,7 +4398,7 @@ void Foam::hexRef8::checkMesh() const
}
// Replace data on coupled patches with their neighbour ones.
- syncTools::swapBoundaryFaceList(mesh_, nei, false);
+ syncTools::swapBoundaryFaceList(mesh_, nei);
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
@@ -4459,7 +4453,7 @@ void Foam::hexRef8::checkMesh() const
}
// Replace data on coupled patches with their neighbour ones.
- syncTools::swapBoundaryFaceList(mesh_, neiFaceAreas, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiFaceAreas);
forAll(neiFaceAreas, i)
{
@@ -4502,7 +4496,7 @@ void Foam::hexRef8::checkMesh() const
}
// Replace data on coupled patches with their neighbour ones.
- syncTools::swapBoundaryFaceList(mesh_, nVerts, false);
+ syncTools::swapBoundaryFaceList(mesh_, nVerts);
forAll(nVerts, i)
{
@@ -4551,7 +4545,7 @@ void Foam::hexRef8::checkMesh() const
// Replace data on coupled patches with their neighbour ones. Apply
// rotation transformation (but not separation since is relative vector
// to point on same face.
- syncTools::swapBoundaryFaceList(mesh_, anchorPoints, false);
+ syncTools::swapBoundaryFaceList(mesh_, anchorPoints);
forAll(anchorPoints, i)
{
@@ -4656,7 +4650,7 @@ void Foam::hexRef8::checkRefinementLevels
}
// No separation
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
forAll(neiLevel, i)
{
@@ -4698,8 +4692,7 @@ void Foam::hexRef8::checkRefinementLevels
mesh_,
syncPointLevel,
minEqOp<label>(),
- labelMax,
- false // no separation
+ labelMax
);
@@ -4746,8 +4739,7 @@ void Foam::hexRef8::checkRefinementLevels
mesh_,
maxPointLevel,
maxEqOp<label>(),
- labelMin, // null value
- false // no separation
+ labelMin // null value
);
// Check 2:1 across boundary points
@@ -5197,7 +5189,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
}
// Swap to neighbour
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
forAll(neiLevel, i)
{
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
index ab83b55415688f9c757244feea1d83aaefad583e..e7028e6424054c5fa04e5be905c32bd1780c007d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
@@ -29,6 +29,7 @@ License
#include "mapPolyMesh.H"
#include "globalIndex.H"
#include "indirectPrimitivePatch.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -57,15 +58,6 @@ public:
};
};
-
-// Dummy transform for faces. Used in synchronisation
-void transformList
-(
- const tensorField& rotTensor,
- UList<face>& field
-)
-{};
-
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -263,8 +255,7 @@ void Foam::localPointRegion::calcPointRegions
mesh,
candidatePoint,
orEqOp<bool>(),
- false, // nullValue
- false // applySeparation
+ false // nullValue
);
@@ -419,12 +410,18 @@ void Foam::localPointRegion::calcPointRegions
// Transport minimum across coupled faces
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- syncTools::syncFaceList
+ SubList<face> l
(
- mesh,
minRegion,
+ mesh.nFaces()-mesh.nInternalFaces(),
+ mesh.nInternalFaces()
+ );
+ syncTools::syncBoundaryFaceList
+ (
+ mesh,
+ l,
minEqOpFace(),
- false // applySeparation
+ Foam::dummyTransform() // dummy transformation
);
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
index 2560de3471afd4ef7844ae518b7389d68903389f..c778b65d0ad80c05578883c09ca4dbce0f35ae5c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
@@ -130,8 +130,7 @@ Foam::labelList Foam::removeCells::getExposedFaces
(
mesh_,
nCellsUsingFace,
- plusEqOp<label>(),
- false
+ plusEqOp<label>()
);
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
index 7b01c6dbcc4b0112098206ce93e67a3453938c2a..e6eebc5c3f1609af59ffa30d311daec906831440 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
@@ -1084,8 +1084,7 @@ void Foam::removeFaces::setRefinement
mesh_,
nFacesPerEdge,
maxEqOp<label>(),
- labelMin, // guaranteed to be overridden by maxEqOp
- false // no separation
+ labelMin // guaranteed to be overridden by maxEqOp
);
// Convert to labelHashSet
@@ -1187,8 +1186,7 @@ void Foam::removeFaces::setRefinement
syncTools::swapFaceList
(
mesh_,
- nbrFaceRegion,
- false // no separation
+ nbrFaceRegion
);
labelList toNbrRegion(nRegions, -1);
@@ -1305,8 +1303,7 @@ void Foam::removeFaces::setRefinement
mesh_,
nEdgesPerPoint,
maxEqOp<label>(),
- labelMin,
- false // no separation
+ labelMin
);
forAll(nEdgesPerPoint, pointI)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 92ba164bb82de00df1319b2d2f31f5a869585d7c..e793d9ea33c6626d33f833ad4fd9799ca9d2d57c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -33,6 +33,7 @@ License
#include "polyModifyFace.H"
#include "syncTools.H"
#include "faceSet.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -41,6 +42,55 @@ namespace Foam
defineTypeNameAndDebug(removePoints, 0);
+//- Combine-reduce operator to combine data on faces. Takes care
+// of reverse orientation on coupled face.
+template <class T, template<class> class CombineOp>
+class faceEqOp
+{
+
+public:
+
+ void operator()(List<T>& x, const List<T>& y) const
+ {
+ if (y.size() > 0)
+ {
+ if (x.size() == 0)
+ {
+ x = y;
+ }
+ else
+ {
+ label j = 0;
+ forAll(x, i)
+ {
+ CombineOp<T>()(x[i], y[j]);
+ j = y.rcIndex(j);
+ }
+ }
+ }
+ }
+};
+
+
+//// Dummy transform for List. Used in synchronisation.
+//template <class T>
+//class dummyTransformList
+//{
+//public:
+// void operator()(const coupledPolyPatch&, Field<List<T> >&) const
+// {}
+//};
+//// Dummy template specialisation. Used in synchronisation.
+//template<>
+//class pTraits<boolList>
+//{
+//public:
+//
+// //- Component type
+// typedef label cmptType;
+//};
+
+
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -247,8 +297,7 @@ Foam::label Foam::removePoints::countPointUsage
mesh_,
pointCanBeDeleted,
andEqOp<bool>(),
- true, // null value
- false // no separation
+ true // null value
);
return returnReduce(nDeleted, sumOp<label>());
@@ -662,7 +711,7 @@ void Foam::removePoints::getUnrefimentSet
mesh_,
faceVertexRestore,
faceEqOp<bool, orEqOp>(), // special operator to handle faces
- false // no separation
+ Foam::dummyTransform() // no transformation
);
// So now if any of the points-to-restore is used by any coupled face
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index d9fd959a2c9ad6c2ee7ab8c1073ba8eb4e2a467a..f44e57684d04807b2061d9b23c75f10abdfb3780 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -59,38 +59,6 @@ class face;
class removePoints
{
- // Private classes
-
- //- Combine-reduce operator to combine data on faces. Takes care
- // of reverse orientation on coupled face.
- template <class T, template<class> class CombineOp>
- class faceEqOp
- {
-
- public:
-
- void operator()(List<T>& x, const List<T>& y) const
- {
- if (y.size() > 0)
- {
- if (x.empty())
- {
- x = y;
- }
- else
- {
- label j = 0;
- forAll(x, i)
- {
- CombineOp<T>()(x[i], y[j]);
- j = y.rcIndex(j);
- }
- }
- }
- }
- };
-
-
// Private data
//- Reference to mesh
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index b3aad246a1783f256ef2940846b0e593a3398d7f..3fa33b7e2062c01417b8e8f370398e0ba7750657 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -20,7 +20,9 @@ $(constraintFvPatches)/empty/emptyFvPatch.C
$(constraintFvPatches)/symmetry/symmetryFvPatch.C
$(constraintFvPatches)/wedge/wedgeFvPatch.C
$(constraintFvPatches)/cyclic/cyclicFvPatch.C
+$(constraintFvPatches)/cyclicSlip/cyclicSlipFvPatch.C
$(constraintFvPatches)/processor/processorFvPatch.C
+$(constraintFvPatches)/processorCyclic/processorCyclicFvPatch.C
derivedFvPatches = $(fvPatches)/derived
$(derivedFvPatches)/wall/wallFvPatch.C
@@ -95,10 +97,13 @@ $(basicFvPatchFields)/zeroGradient/zeroGradientFvPatchFields.C
constraintFvPatchFields = $(fvPatchFields)/constraint
$(constraintFvPatchFields)/cyclic/cyclicFvPatchFields.C
+$(constraintFvPatchFields)/cyclicSlip/cyclicSlipFvPatchFields.C
$(constraintFvPatchFields)/empty/emptyFvPatchFields.C
$(constraintFvPatchFields)/jumpCyclic/jumpCyclicFvPatchFields.C
$(constraintFvPatchFields)/processor/processorFvPatchFields.C
$(constraintFvPatchFields)/processor/processorFvPatchScalarField.C
+$(constraintFvPatchFields)/processorCyclic/processorCyclicFvPatchFields.C
+$(constraintFvPatchFields)/processorCyclic/processorCyclicFvPatchScalarField.C
$(constraintFvPatchFields)/symmetry/symmetryFvPatchFields.C
$(constraintFvPatchFields)/wedge/wedgeFvPatchFields.C
$(constraintFvPatchFields)/wedge/wedgeFvPatchScalarField.C
@@ -106,6 +111,7 @@ $(constraintFvPatchFields)/wedge/wedgeFvPatchScalarField.C
derivedFvPatchFields = $(fvPatchFields)/derived
$(derivedFvPatchFields)/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
$(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
+
$(derivedFvPatchFields)/directMappedFixedValue/directMappedFixedValueFvPatchFields.C
$(derivedFvPatchFields)/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
$(derivedFvPatchFields)/fan/fanFvPatchFields.C
@@ -150,7 +156,7 @@ $(derivedFvPatchFields)/turbulentIntensityKineticEnergyInlet/turbulentIntensityK
$(derivedFvPatchFields)/uniformFixedValue/uniformFixedValueFvPatchFields.C
$(derivedFvPatchFields)/waveTransmissive/waveTransmissiveFvPatchFields.C
$(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
-$(derivedFvPatchFields)/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+$(derivedFvPatchFields)/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
fvsPatchFields = fields/fvsPatchFields
$(fvsPatchFields)/fvsPatchField/fvsPatchFields.C
@@ -163,8 +169,10 @@ $(basicFvsPatchFields)/sliced/slicedFvsPatchFields.C
constraintFvsPatchFields = $(fvsPatchFields)/constraint
$(constraintFvsPatchFields)/cyclic/cyclicFvsPatchFields.C
+$(constraintFvsPatchFields)/cyclicSlip/cyclicSlipFvsPatchFields.C
$(constraintFvsPatchFields)/empty/emptyFvsPatchFields.C
$(constraintFvsPatchFields)/processor/processorFvsPatchFields.C
+$(constraintFvsPatchFields)/processorCyclic/processorCyclicFvsPatchFields.C
$(constraintFvsPatchFields)/symmetry/symmetryFvsPatchFields.C
$(constraintFvsPatchFields)/wedge/wedgeFvsPatchFields.C
@@ -265,7 +273,6 @@ $(multivariateSchemes)/limitedCubic/multivariateLimitedCubic.C
finiteVolume/fv/fv.C
finiteVolume/fvSchemes/fvSchemes.C
-finiteVolume/fvData/fvData.C
ddtSchemes = finiteVolume/ddtSchemes
$(ddtSchemes)/ddtScheme/ddtSchemes.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index e402e4edcac7193b5a441c95ecfa3f5ecb51596f..7db899daa1a3e91da174dda88916721bbf11cf86 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 | OpenFOAM: The Open Source CFD Toolbox
+ \\ / F ield | OpenOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
@@ -26,10 +26,15 @@ License
#include "directionMixedFvPatchField.H"
#include "symmTransformField.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
+directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -43,7 +48,7 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
+directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const directionMixedFvPatchField<Type>& ptf,
const fvPatch& p,
@@ -59,7 +64,7 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
+directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -76,7 +81,7 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type>
-Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
+directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const directionMixedFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -92,7 +97,7 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void Foam::directionMixedFvPatchField<Type>::autoMap
+void directionMixedFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -105,7 +110,7 @@ void Foam::directionMixedFvPatchField<Type>::autoMap
template<class Type>
-void Foam::directionMixedFvPatchField<Type>::rmap
+void directionMixedFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -123,8 +128,7 @@ void Foam::directionMixedFvPatchField<Type>::rmap
template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::directionMixedFvPatchField<Type>::snGrad() const
+tmp<Field<Type> > directionMixedFvPatchField<Type>::snGrad() const
{
Field<Type> pif = this->patchInternalField();
@@ -142,7 +146,7 @@ Foam::directionMixedFvPatchField<Type>::snGrad() const
template<class Type>
-void Foam::directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!this->updated())
{
@@ -164,8 +168,7 @@ void Foam::directionMixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::directionMixedFvPatchField<Type>::snGradTransformDiag() const
+tmp<Field<Type> > directionMixedFvPatchField<Type>::snGradTransformDiag() const
{
vectorField diag(valueFraction_.size());
@@ -190,7 +193,7 @@ Foam::directionMixedFvPatchField<Type>::snGradTransformDiag() const
template<class Type>
-void Foam::directionMixedFvPatchField<Type>::write(Ostream& os) const
+void directionMixedFvPatchField<Type>::write(Ostream& os) const
{
transformFvPatchField<Type>::write(os);
refValue_.writeEntry("refValue", os);
@@ -200,4 +203,8 @@ void Foam::directionMixedFvPatchField<Type>::write(Ostream& os) const
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 77ad9595b2769d74fd5c26b434105dca7e20a7b2..b0faf1caac38176e3d8f607545c3483793a170dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "cyclicFvPatchField.H"
+#include "transformField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -141,34 +142,28 @@ template<class Type>
tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
- const unallocLabelList& faceCells = cyclicPatch_.faceCells();
+ const unallocLabelList& nbrFaceCells =
+ cyclicPatch().cyclicPatch().neighbPatch().faceCells();
tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
Field<Type>& pnf = tpnf();
- label sizeby2 = this->size()/2;
if (doTransform())
{
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(pnf, facei)
{
pnf[facei] = transform
(
- forwardT()[0], iField[faceCells[facei + sizeby2]]
- );
-
- pnf[facei + sizeby2] = transform
- (
- reverseT()[0], iField[faceCells[facei]]
+ forwardT()[0], iField[nbrFaceCells[facei]]
);
}
}
else
{
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(pnf, facei)
{
- pnf[facei] = iField[faceCells[facei + sizeby2]];
- pnf[facei + sizeby2] = iField[faceCells[facei]];
+ pnf[facei] = iField[nbrFaceCells[facei]];
}
}
@@ -189,19 +184,20 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
{
scalarField pnf(this->size());
- label sizeby2 = this->size()/2;
- const unallocLabelList& faceCells = cyclicPatch_.faceCells();
+ const unallocLabelList& nbrFaceCells =
+ cyclicPatch().cyclicPatch().neighbPatch().faceCells();
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(pnf, facei)
{
- pnf[facei] = psiInternal[faceCells[facei + sizeby2]];
- pnf[facei + sizeby2] = psiInternal[faceCells[facei]];
+ pnf[facei] = psiInternal[nbrFaceCells[facei]];
}
// Transform according to the transformation tensors
transformCoupleField(pnf, cmpt);
// Multiply the field by coefficients and add into the result
+ const unallocLabelList& faceCells = cyclicPatch_.faceCells();
+
forAll(faceCells, elemI)
{
result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..6998c2c1eb1528131d2d8356690e6efc569a23d1
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ cyclicFvPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+ const cyclicSlipFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ cyclicFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ cyclicFvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+ const cyclicSlipFvPatchField<Type>& ptf
+)
+:
+ cyclicFvPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+ const cyclicSlipFvPatchField<Type>& ptf,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ cyclicFvPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..b33d2128be3867ec50936a6de70e131732a8acf2
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::cyclicSlipFvPatchField
+
+Description
+ Foam::cyclicSlipFvPatchField
+
+SourceFiles
+ cyclicSlipFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvPatchField_H
+#define cyclicSlipFvPatchField_H
+
+#include "cyclicFvPatchField.H"
+#include "cyclicSlipFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cyclicSlipFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class cyclicSlipFvPatchField
+:
+ public cyclicFvPatchField<Type>
+{
+ // Private data
+
+public:
+
+ //- Runtime type information
+ TypeName(cyclicSlipFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ cyclicSlipFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ cyclicSlipFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given cyclicSlipFvPatchField onto a new patch
+ cyclicSlipFvPatchField
+ (
+ const cyclicSlipFvPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ cyclicSlipFvPatchField
+ (
+ const cyclicSlipFvPatchField<Type>&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchField<Type> > clone() const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new cyclicSlipFvPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ cyclicSlipFvPatchField
+ (
+ const cyclicSlipFvPatchField<Type>&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchField<Type> > clone
+ (
+ const DimensionedField<Type, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new cyclicSlipFvPatchField<Type>(*this, iF)
+ );
+ }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "cyclicSlipFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..3d7707edd03780f1c2a1e9925696b553a199bf24
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(cyclicSlip);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..4b2d031fe5c161fb78ec3270519e9c10c5786a34
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvPatchFields_H
+#define cyclicSlipFvPatchFields_H
+
+#include "cyclicSlipFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(cyclicSlip)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..d1d914643f1731d1418dc5e29995abbb3c17d5e2
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvPatchFieldsFwd_H
+#define cyclicSlipFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class cyclicSlipFvPatchField;
+
+makePatchTypeFieldTypedefs(cyclicSlip)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 4b6b4660ffb6aa7d9d2a9c211604563e7dbfdecc..1c4d5f84a39dac075cc5f2c70dd56cdddcac0993 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -99,37 +99,34 @@ template<class Type>
tmp<Field<Type> > jumpCyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
- const unallocLabelList& faceCells = this->cyclicPatch().faceCells();
+ const unallocLabelList& nbrFaceCells =
+ this->cyclicPatch().neighbFvPatch().faceCells();
tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
Field<Type>& pnf = tpnf();
tmp<Field<scalar> > tjf = jump();
+ if (!this->cyclicPatch().owner())
+ {
+ tjf = -tjf;
+ }
const Field<scalar>& jf = tjf();
- label sizeby2 = this->size()/2;
-
if (this->doTransform())
{
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(*this, facei)
{
pnf[facei] = transform
(
- this->forwardT()[0], iField[faceCells[facei + sizeby2]]
+ this->forwardT()[0], iField[nbrFaceCells[facei]]
) - jf[facei];
-
- pnf[facei + sizeby2] = transform
- (
- this->reverseT()[0], iField[faceCells[facei]] + jf[facei]
- );
}
}
else
{
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(*this, facei)
{
- pnf[facei] = iField[faceCells[facei + sizeby2]] - jf[facei];
- pnf[facei + sizeby2] = iField[faceCells[facei]] + jf[facei];
+ pnf[facei] = iField[nbrFaceCells[facei]] - jf[facei];
}
}
@@ -150,26 +147,28 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
{
scalarField pnf(this->size());
- label sizeby2 = this->size()/2;
- const unallocLabelList& faceCells = this->cyclicPatch().faceCells();
+ const unallocLabelList& nbrFaceCells =
+ this->cyclicPatch().neighbFvPatch().faceCells();
if (&psiInternal == &this->internalField())
{
tmp<Field<scalar> > tjf = jump();
+ if (!this->cyclicPatch().owner())
+ {
+ tjf = -tjf;
+ }
const Field<scalar>& jf = tjf();
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(*this, facei)
{
- pnf[facei] = psiInternal[faceCells[facei + sizeby2]] - jf[facei];
- pnf[facei + sizeby2] = psiInternal[faceCells[facei]] + jf[facei];
+ pnf[facei] = psiInternal[nbrFaceCells[facei]] - jf[facei];
}
}
else
{
- for (label facei=0; facei<sizeby2; facei++)
+ forAll(*this, facei)
{
- pnf[facei] = psiInternal[faceCells[facei + sizeby2]];
- pnf[facei + sizeby2] = psiInternal[faceCells[facei]];
+ pnf[facei] = psiInternal[nbrFaceCells[facei]];
}
}
@@ -177,6 +176,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
this->transformCoupleField(pnf, cmpt);
// Multiply the field by coefficients and add into the result
+ const unallocLabelList& faceCells = this->cyclicPatch().faceCells();
forAll(faceCells, elemI)
{
result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 1e4e55637dd4d5cb0c1a176fbb2b379b27d3a276..9b287f8fa7431c39f323c8f5c60a03122a6152ff 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -73,7 +73,7 @@ processorFvPatchField<Type>::processorFvPatchField
coupledFvPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorFvPatch>(p))
{
- if (!isType<processorFvPatch>(this->patch()))
+ if (!isA<processorFvPatch>(this->patch()))
{
FatalErrorIn
(
@@ -105,7 +105,7 @@ processorFvPatchField<Type>::processorFvPatchField
coupledFvPatchField<Type>(p, iF, dict),
procPatch_(refCast<const processorFvPatch>(p))
{
- if (!isType<processorFvPatch>(p))
+ if (!isA<processorFvPatch>(p))
{
FatalIOErrorIn
(
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..c0a785597dd5744a19747c4097b478f44d69e75f
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -0,0 +1,265 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicFvPatchField.H"
+#include "processorCyclicFvPatch.H"
+#include "demandDrivenData.H"
+#include "transformField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ processorFvPatchField<Type>(p, iF),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{}
+
+
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const Field<Type>& f
+)
+:
+ //coupledFvPatchField<Type>(p, iF, f),
+ processorFvPatchField<Type>(p, iF, f),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{}
+
+
+// Construct by mapping given processorCyclicFvPatchField<Type>
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const processorCyclicFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ //coupledFvPatchField<Type>(ptf, p, iF, mapper),
+ processorFvPatchField<Type>(ptf, p, iF, mapper),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{
+ if (!isType<processorCyclicFvPatch>(this->patch()))
+ {
+ FatalErrorIn
+ (
+ "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
+ "(\n"
+ " const processorCyclicFvPatchField<Type>& ptf,\n"
+ " const fvPatch& p,\n"
+ " const DimensionedField<Type, volMesh>& iF,\n"
+ " const fvPatchFieldMapper& mapper\n"
+ ")\n"
+ ) << "\n patch type '" << p.type()
+ << "' not constraint type '" << typeName << "'"
+ << "\n for patch " << p.name()
+ << " of field " << this->dimensionedInternalField().name()
+ << " in file " << this->dimensionedInternalField().objectPath()
+ << exit(FatalIOError);
+ }
+}
+
+
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ //coupledFvPatchField<Type>(p, iF, dict),
+ processorFvPatchField<Type>(p, iF, dict),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{
+ if (!isType<processorCyclicFvPatch>(p))
+ {
+ FatalIOErrorIn
+ (
+ "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
+ "(\n"
+ " const fvPatch& p,\n"
+ " const Field<Type>& field,\n"
+ " const dictionary& dict\n"
+ ")\n",
+ dict
+ ) << "\n patch type '" << p.type()
+ << "' not constraint type '" << typeName << "'"
+ << "\n for patch " << p.name()
+ << " of field " << this->dimensionedInternalField().name()
+ << " in file " << this->dimensionedInternalField().objectPath()
+ << exit(FatalIOError);
+ }
+}
+
+
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const processorCyclicFvPatchField<Type>& ptf
+)
+:
+ //processorLduInterfaceField(),
+ //coupledFvPatchField<Type>(ptf),
+ processorFvPatchField<Type>(ptf),
+ procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
+{}
+
+
+template<class Type>
+processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
+(
+ const processorCyclicFvPatchField<Type>& ptf,
+ const DimensionedField<Type, volMesh>& iF
+)
+:
+ //coupledFvPatchField<Type>(ptf, iF),
+ processorFvPatchField<Type>(ptf, iF),
+ procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+//template<class Type>
+//tmp<Field<Type> > processorCyclicFvPatchField<Type>::patchNeighbourField() const
+//{
+// return *this;
+//}
+//
+//
+//template<class Type>
+//void processorCyclicFvPatchField<Type>::initEvaluate
+//(
+// const Pstream::commsTypes commsType
+//)
+//{
+// if (Pstream::parRun())
+// {
+// procPatch_.compressedSend(commsType, this->patchInternalField()());
+// }
+//}
+//
+//
+//template<class Type>
+//void processorCyclicFvPatchField<Type>::evaluate
+//(
+// const Pstream::commsTypes commsType
+//)
+//{
+// if (Pstream::parRun())
+// {
+// procPatch_.compressedReceive<Type>(commsType, *this);
+//
+// if (doTransform())
+// {
+// transform(*this, procPatch_.forwardT(), *this);
+// }
+// }
+//}
+//
+//
+//template<class Type>
+//tmp<Field<Type> > processorCyclicFvPatchField<Type>::snGrad() const
+//{
+// return this->patch().deltaCoeffs()*(*this - this->patchInternalField());
+//}
+//
+//
+//template<class Type>
+//void processorCyclicFvPatchField<Type>::initInterfaceMatrixUpdate
+//(
+// const scalarField& psiInternal,
+// scalarField&,
+// const lduMatrix&,
+// const scalarField&,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// procPatch_.compressedSend
+// (
+// commsType,
+// this->patch().patchInternalField(psiInternal)()
+// );
+//}
+//
+//
+//template<class Type>
+//void processorCyclicFvPatchField<Type>::updateInterfaceMatrix
+//(
+// const scalarField&,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// scalarField pnf
+// (
+// procPatch_.compressedReceive<scalar>(commsType, this->size())()
+// );
+//
+// // Transform according to the transformation tensor
+// transformCoupleField(pnf, cmpt);
+//
+// // Multiply the field by coefficients and add into the result
+//
+// const unallocLabelList& faceCells = this->patch().faceCells();
+//
+// forAll(faceCells, elemI)
+// {
+// result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+// }
+//}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..cc18c87005ccd04f28173a96ea3655e77af986f8
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -0,0 +1,337 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicFvPatchField
+
+Description
+ Foam::processorCyclicFvPatchField
+
+SourceFiles
+ processorCyclicFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvPatchField_H
+#define processorCyclicFvPatchField_H
+
+//#include "coupledFvPatchField.H"
+//#include "processorLduInterfaceField.H"
+#include "processorCyclicFvPatch.H"
+#include "processorFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class processorCyclicFvPatchField
+:
+// public processorLduInterfaceField,
+// public coupledFvPatchField<Type>
+ public processorFvPatchField<Type>
+{
+ // Private data
+
+ //- Local reference cast into the processor patch
+ const processorCyclicFvPatch& procPatch_;
+
+ // Private Member Functions
+
+// //- Get other patchfield
+// const coupledFvPatchField<Type>& patchField(const label patchID) const;
+public:
+
+ //- Runtime type information
+ TypeName(processorCyclicFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ processorCyclicFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct from patch and internal field and patch field
+ processorCyclicFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const Field<Type>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ processorCyclicFvPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given processorCyclicFvPatchField onto a
+ // new patch
+ processorCyclicFvPatchField
+ (
+ const processorCyclicFvPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ processorCyclicFvPatchField(const processorCyclicFvPatchField<Type>&);
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchField<Type> > clone() const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new processorCyclicFvPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ processorCyclicFvPatchField
+ (
+ const processorCyclicFvPatchField<Type>&,
+ const DimensionedField<Type, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchField<Type> > clone
+ (
+ const DimensionedField<Type, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchField<Type> >
+ (
+ new processorCyclicFvPatchField<Type>(*this, iF)
+ );
+ }
+
+
+ // Destructor
+
+ ~processorCyclicFvPatchField();
+
+
+ // Member functions
+
+ // Access
+
+// //- Return true if running parallel
+// virtual bool coupled() const
+// {
+// if (Pstream::parRun())
+// {
+// return true;
+// }
+// else
+// {
+// return false;
+// }
+// }
+//
+// //- Return neighbour field given internal field
+// tmp<Field<Type> > patchNeighbourField() const;
+//
+//
+// // Evaluation functions
+//
+// //- Initialise the evaluation of the patch field
+// virtual void initEvaluate(const Pstream::commsTypes commsType);
+//
+// //- Evaluate the patch field
+// virtual void evaluate(const Pstream::commsTypes commsType);
+//
+// //- Return patch-normal gradient
+// virtual tmp<Field<Type> > snGrad() const;
+//
+// //- Initialise neighbour matrix update
+// virtual void initInterfaceMatrixUpdate
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix& m,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+// ) const;
+//
+// //- Update result field based on interface functionality
+// virtual void updateInterfaceMatrix
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix& m,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const Pstream::commsTypes commsType
+// ) const;
+//
+// //- Processor coupled interface functions
+//
+// //- Return processor number
+// virtual int myProcNo() const
+// {
+// return procPatch_.myProcNo();
+// }
+//
+// //- Return neigbour processor number
+// virtual int neighbProcNo() const
+// {
+// return procPatch_.neighbProcNo();
+// }
+
+ //- Does the patch field perform the transfromation
+ virtual bool doTransform() const
+ {
+ return !(procPatch_.parallel() || pTraits<Type>::rank == 0);
+ }
+
+ //- Return face transformation tensor
+ virtual const tensorField& forwardT() const
+ {
+ return procPatch_.forwardT();
+ }
+
+// //- Return rank of component for transform
+// virtual int rank() const
+// {
+// return pTraits<Type>::rank;
+// }
+
+// //- Transform given patch component field
+// void transformCoupleField
+// (
+// scalarField& f,
+// const direction cmpt
+// ) const;
+
+// // Referred-patch functionality. Get called with a slice (size, start)
+// // of a patch that supplies fields and geometry/topology.
+//
+// //- Get patch-normal gradient
+// virtual void snGrad
+// (
+// Field<Type>& exchangeBuf,
+// const Field<Type>& subFld,
+// const coupledFvPatch& referringPatch,
+// const label size,
+// const label start
+// ) const
+// {
+// notImplemented("processorCyclicFvPatchField::snGrad(..)");
+// }
+//
+// //- Initialise the evaluation of the patch field.
+// virtual void initEvaluate
+// (
+// Field<Type>& exchangeBuf,
+// const coupledFvPatch& referringPatch,
+// const label size,
+// const label start
+// ) const
+// {
+// notImplemented("processorCyclicFvPatchField::initEvaluate(..)");
+// }
+//
+// //- Evaluate the patch field.
+// virtual void evaluate
+// (
+// Field<Type>& exchangeBuf,
+// const coupledFvPatch& referringPatch,
+// const label size,
+// const label start
+// ) const
+// {
+// notImplemented("processorCyclicFvPatchField::evaluate(..)");
+// }
+//
+// //- Initialise neighbour matrix update
+// virtual void initInterfaceMatrixUpdate
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix& m,
+// const scalarField& coeffs,
+// const direction cmpt,
+// const coupledFvPatch& referringPatch,
+// const label size,
+// const label start,
+// scalarField& exchangeBuf
+// ) const
+// {
+// notImplemented
+// (
+// "processorCyclicFvPatchField::initInterfaceMatrixUpdate(..)"
+// );
+// }
+//
+// //- Update result field based on interface functionality
+// virtual void updateInterfaceMatrix
+// (
+// const scalarField& psiInternal,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction,
+// const coupledFvPatch& referringPatch,
+// const label size,
+// const label start,
+// scalarField& exchangeBuf
+// ) const
+// {
+// notImplemented
+// (
+// "processorCyclicFvPatchField::updateInterfaceMatrix(..)"
+// );
+// }
+
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "processorCyclicFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..8d97c3818cfe136ea74804ac68fcea1118747a6d
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(processorCyclic);
+//makePatchTypeField(fvPatchScalarField, processorCyclicFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..c73bba59a5431efa8018bd3ff96a2e302a6efc45
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvPatchFields_H
+#define processorCyclicFvPatchFields_H
+
+#include "processorCyclicFvPatchScalarField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(processorCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..496834e43093842559630865c0071064d2586168
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvPatchFieldsFwd_H
+#define processorCyclicFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class processorCyclicFvPatchField;
+
+makePatchTypeFieldTypedefs(processor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
new file mode 100644
index 0000000000000000000000000000000000000000..51daf5762962b747bcfe579478fcbc1d74ca867f
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.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 "processorCyclicFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+//template<>
+//void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
+//(
+// const scalarField& psiInternal,
+// scalarField&,
+// const lduMatrix&,
+// const scalarField&,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// procPatch_.compressedSend
+// (
+// commsType,
+// patch().patchInternalField(psiInternal)()
+// );
+//}
+//
+//
+//template<>
+//void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
+//(
+// const scalarField&,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const
+//{
+// scalarField pnf
+// (
+// procPatch_.compressedReceive<scalar>(commsType, this->size())()
+// );
+//
+// const unallocLabelList& faceCells = patch().faceCells();
+//
+// forAll(faceCells, facei)
+// {
+// result[faceCells[facei]] -= coeffs[facei]*pnf[facei];
+// }
+//}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
new file mode 100644
index 0000000000000000000000000000000000000000..a68d181d8b4284dd55ae5feeacdf86b95460f221
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvPatchScalarField_H
+#define processorCyclicFvPatchScalarField_H
+
+#include "processorCyclicFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+//template<>
+//void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
+//(
+// const scalarField&,
+// scalarField&,
+// const lduMatrix&,
+// const scalarField&,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const;
+//
+//
+//template<>
+//void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
+//(
+// const scalarField&,
+// scalarField& result,
+// const lduMatrix&,
+// const scalarField& coeffs,
+// const direction,
+// const Pstream::commsTypes commsType
+//) const;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 2b9fd7434944c31bcf4384cd6500c7d61d0c6f24..c7288f621f1fb8778b4aef14310fe5a8b3bf3e20 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -27,6 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "volFields.H"
#include "surfaceFields.H"
+#include "cyclicFvPatch.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -44,6 +45,7 @@ activeBaffleVelocityFvPatchVectorField
orientation_(1),
initWallSf_(0),
initCyclicSf_(0),
+ nbrCyclicSf_(0),
openFraction_(0),
openingTime_(0),
maxOpenFractionDelta_(0),
@@ -67,6 +69,7 @@ activeBaffleVelocityFvPatchVectorField
orientation_(ptf.orientation_),
initWallSf_(ptf.initWallSf_),
initCyclicSf_(ptf.initCyclicSf_),
+ nbrCyclicSf_(ptf.nbrCyclicSf_),
openFraction_(ptf.openFraction_),
openingTime_(ptf.openingTime_),
maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
@@ -89,6 +92,13 @@ activeBaffleVelocityFvPatchVectorField
orientation_(readLabel(dict.lookup("orientation"))),
initWallSf_(p.Sf()),
initCyclicSf_(p.boundaryMesh()[cyclicPatchLabel_].Sf()),
+ nbrCyclicSf_
+ (
+ refCast<const cyclicFvPatch>
+ (
+ p.boundaryMesh()[cyclicPatchLabel_]
+ ).neighbFvPatch().Sf()
+ ),
openFraction_(readScalar(dict.lookup("openFraction"))),
openingTime_(readScalar(dict.lookup("openingTime"))),
maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
@@ -111,6 +121,7 @@ activeBaffleVelocityFvPatchVectorField
orientation_(ptf.orientation_),
initWallSf_(ptf.initWallSf_),
initCyclicSf_(ptf.initCyclicSf_),
+ nbrCyclicSf_(ptf.nbrCyclicSf_),
openFraction_(ptf.openFraction_),
openingTime_(ptf.openingTime_),
maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
@@ -132,6 +143,7 @@ activeBaffleVelocityFvPatchVectorField
orientation_(ptf.orientation_),
initWallSf_(ptf.initWallSf_),
initCyclicSf_(ptf.initCyclicSf_),
+ nbrCyclicSf_(ptf.nbrCyclicSf_),
openFraction_(ptf.openFraction_),
openingTime_(ptf.openingTime_),
maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
@@ -160,6 +172,13 @@ void Foam::activeBaffleVelocityFvPatchVectorField::autoMap
[
cyclicPatchLabel_
].patchSlice(areas);
+ nbrCyclicSf_ = refCast<const cyclicFvPatch>
+ (
+ patch().boundaryMesh()
+ [
+ cyclicPatchLabel_
+ ]
+ ).neighbFvPatch().patch().patchSlice(areas);
}
void Foam::activeBaffleVelocityFvPatchVectorField::rmap
@@ -177,6 +196,13 @@ void Foam::activeBaffleVelocityFvPatchVectorField::rmap
[
cyclicPatchLabel_
].patchSlice(areas);
+ nbrCyclicSf_ = refCast<const cyclicFvPatch>
+ (
+ patch().boundaryMesh()
+ [
+ cyclicPatchLabel_
+ ]
+ ).neighbFvPatch().patch().patchSlice(areas);
}
@@ -197,19 +223,24 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
const fvPatch& cyclicPatch = patch().boundaryMesh()[cyclicPatchLabel_];
const labelList& cyclicFaceCells = cyclicPatch.patch().faceCells();
- label nCyclicFaces = cyclicFaceCells.size();
- label nCyclicFacesPerSide = nCyclicFaces/2;
+ const fvPatch& nbrPatch = refCast<const cyclicFvPatch>
+ (
+ cyclicPatch
+ ).neighbFvPatch();
+ const labelList& nbrFaceCells = nbrPatch.patch().faceCells();
scalar forceDiff = 0;
- for (label facei=0; facei<nCyclicFacesPerSide; facei++)
+ // Add this side
+ forAll(cyclicFaceCells, facei)
{
forceDiff += p[cyclicFaceCells[facei]]*mag(initCyclicSf_[facei]);
}
- for (label facei=nCyclicFacesPerSide; facei<nCyclicFaces; facei++)
+ // Remove other side
+ forAll(nbrFaceCells, facei)
{
- forceDiff -= p[cyclicFaceCells[facei]]*mag(initCyclicSf_[facei]);
+ forceDiff -= p[nbrFaceCells[facei]]*mag(nbrCyclicSf_[facei]);
}
openFraction_ =
@@ -239,10 +270,16 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
}
const_cast<scalarField&>(patch().magSf()) = mag(patch().Sf());
+ // Update owner side of cyclic
const_cast<vectorField&>(cyclicPatch.Sf()) =
openFraction_*initCyclicSf_;
const_cast<scalarField&>(cyclicPatch.magSf()) =
mag(cyclicPatch.Sf());
+ // Update neighbour side of cyclic
+ const_cast<vectorField&>(nbrPatch.Sf()) =
+ openFraction_*nbrCyclicSf_;
+ const_cast<scalarField&>(nbrPatch.magSf()) =
+ mag(nbrPatch.Sf());
curTimeIndex_ = this->db().time().timeIndex();
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H
index c35cbc058e40b58c381be0f8ff9de77810f1f754..2bc39eedefbf8395f23989a6fbbf8d69c60e8fca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H
@@ -71,9 +71,12 @@ class activeBaffleVelocityFvPatchVectorField
//- Initial wall patch areas
vectorField initWallSf_;
- //- Initial cyclic patch areas
+ //- Initial this-side cyclic patch areas
vectorField initCyclicSf_;
+ //- Initial neighbour-side cyclic patch areas
+ vectorField nbrCyclicSf_;
+
//- Current fraction of the active baffle which is open
scalar openFraction_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 19181e0f4ed9929c055dabf723124d3f53c71616..e5bfc0c7f5db0dc8d5055168812144fceb3ddc73 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -42,7 +42,7 @@ fanFvPatchField<Type>::fanFvPatchField
:
jumpCyclicFvPatchField<Type>(p, iF),
f_(0),
- jump_(this->size()/2, 0.0)
+ jump_(this->size(), 0.0)
{}
@@ -71,12 +71,14 @@ fanFvPatchField<Type>::fanFvPatchField
:
jumpCyclicFvPatchField<Type>(p, iF),
f_(),
- jump_(this->size()/2, 0.0)
+ jump_(this->size(), 0.0)
{
{
Istream& is = dict.lookup("f");
is.format(IOstream::ASCII);
is >> f_;
+
+ // Check that f_ table is same on both sides.?
}
if (dict.found("value"))
@@ -128,21 +130,7 @@ void fanFvPatchField<Type>::autoMap
)
{
jumpCyclicFvPatchField<Type>::autoMap(m);
-
- // Jump is half size. Expand to full size, map and truncate.
- if (jump_.size() && jump_.size() == this->size()/2)
- {
- label oldSize = jump_.size();
- jump_.setSize(this->size());
-
- for (label i = oldSize; i < jump_.size(); i++)
- {
- jump_[i] = jump_[i-oldSize];
- }
-
- jump_.autoMap(m);
- jump_.setSize(oldSize);
- }
+ jump_.autoMap(m);
}
@@ -155,24 +143,9 @@ void fanFvPatchField<Type>::rmap
{
jumpCyclicFvPatchField<Type>::rmap(ptf, addr);
- // Jump is half size. Expand to full size, map and truncate.
- if (jump_.size() && jump_.size() == this->size()/2)
- {
- label oldSize = jump_.size();
- jump_.setSize(this->size());
-
- for (label i = oldSize; i < jump_.size(); i++)
- {
- jump_[i] = jump_[i-oldSize];
- }
-
- const fanFvPatchField<Type>& tiptf =
- refCast<const fanFvPatchField<Type> >(ptf);
-
- jump_.rmap(tiptf.jump_, addr);
-
- jump_.setSize(oldSize);
- }
+ const fanFvPatchField<Type>& tiptf =
+ refCast<const fanFvPatchField<Type> >(ptf);
+ jump_.rmap(tiptf.jump_, addr);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index ed19c47d689e23f0f8c5523dbd4a17096e00ba2b..5fbd932690dec303f86674ae731e57f48aa89a28 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -131,7 +131,13 @@ public:
// Access
- //- Return the "jump" across the patch as a "half" field
+ //- Return the polynomial coefficients
+ const List<scalar>& f() const
+ {
+ return f_;
+ }
+
+ //- Return the "jump" across the patch.
virtual tmp<Field<Type> > jump() const
{
return jump_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index f7371a7360f58a3f6f887958bdd0de9df6b51c29..a27f526741bd7fe9004f74c909489a427ddfc99a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -46,6 +46,7 @@ void Foam::fanFvPatchField<Foam::scalar>::updateCoeffs()
return;
}
+ // Constant
jump_ = f_[0];
if (f_.size() > 1)
@@ -56,21 +57,11 @@ void Foam::fanFvPatchField<Foam::scalar>::updateCoeffs()
const fvsPatchField<scalar>& phip =
patch().patchField<surfaceScalarField, scalar>(phi);
- scalarField Un = max
- (
- scalarField::subField(phip, size()/2)
- /scalarField::subField(patch().magSf(), size()/2),
- scalar(0)
- );
+ scalarField Un = max(phip/patch().magSf(), scalar(0));
if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
{
- Un /=
- scalarField::subField
- (
- patch().lookupPatchField<volScalarField, scalar>("rho"),
- size()/2
- );
+ Un /= patch().lookupPatchField<volScalarField, scalar>("rho");
}
for (label i=1; i<f_.size(); i++)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index a0684b9618dc121c4ddffc659e064b30e11e3c8d..489b82927f02cab4b5ff403b912ea16ef28638ce 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
- const scalar avgU = -flowRate_/gSum(patch().magSf());
+ scalar avgU = -flowRate_/gSum(patch().magSf());
- tmp<vectorField> n = patch().nf();
+ 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 690c7160b0aad3c4ca40b12e7d18f1f122834206..f86fdbe29ae88be22723fc77eef3f28fe61c3fcf 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/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
similarity index 71%
rename from src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
rename to src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
index 7114dc1d26f590bd0cd6c8d80c69d7142e9b9f4c..44a2239dca334961687f7ae19a63402c92f9a7ac 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "swirlFlowRateInletVelocityFvPatchVectorField.H"
+#include "swirlMassFlowRateInletVelocityFvPatchVectorField.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
@@ -33,8 +33,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::
-swirlFlowRateInletVelocityFvPatchVectorField::
-swirlFlowRateInletVelocityFvPatchVectorField
+swirlMassFlowRateInletVelocityFvPatchVectorField::
+swirlMassFlowRateInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF
@@ -49,10 +49,10 @@ swirlFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlFlowRateInletVelocityFvPatchVectorField::
-swirlFlowRateInletVelocityFvPatchVectorField
+swirlMassFlowRateInletVelocityFvPatchVectorField::
+swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField& ptf,
+ const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf,
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -66,8 +66,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlFlowRateInletVelocityFvPatchVectorField::
-swirlFlowRateInletVelocityFvPatchVectorField
+swirlMassFlowRateInletVelocityFvPatchVectorField::
+swirlMassFlowRateInletVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
@@ -83,10 +83,10 @@ swirlFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlFlowRateInletVelocityFvPatchVectorField::
-swirlFlowRateInletVelocityFvPatchVectorField
+swirlMassFlowRateInletVelocityFvPatchVectorField::
+swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField& ptf
+ const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf
)
:
fixedValueFvPatchField<vector>(ptf),
@@ -98,10 +98,10 @@ swirlFlowRateInletVelocityFvPatchVectorField
Foam::
-swirlFlowRateInletVelocityFvPatchVectorField::
-swirlFlowRateInletVelocityFvPatchVectorField
+swirlMassFlowRateInletVelocityFvPatchVectorField::
+swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField& ptf,
+ const swirlMassFlowRateInletVelocityFvPatchVectorField& ptf,
const DimensionedField<vector, volMesh>& iF
)
:
@@ -115,28 +115,25 @@ swirlFlowRateInletVelocityFvPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
+void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
{
if (updated())
{
return;
}
- const scalar totArea = gSum(patch().magSf());
+ scalar totArea = gSum(patch().magSf());
// a simpler way of doing this would be nice
- const scalar avgU = -flowRate_/totArea;
+ scalar avgU = -flowRate_/totArea;
- const vector avgCenter = gSum(patch().Cf()*patch().magSf())/totArea;
- const vector avgNormal = gSum(patch().Sf())/totArea;
+ vector center = gSum(patch().Cf()*patch().magSf())/totArea;
+ vector normal = gSum(patch().nf()*patch().magSf())/totArea;
- // Update angular velocity - convert [rpm] to [rad/s]
- vectorField tangentialVelocity =
- (
+ vectorField tangVelo =
(rpm_*constant::mathematical::pi/30.0)
- * (patch().Cf() - avgCenter) ^ avgNormal
- );
+ *(patch().Cf() - center) ^ normal;
- tmp<vectorField> n = patch().nf();
+ vectorField n = patch().nf();
const surfaceScalarField& phi =
db().lookupObject<surfaceScalarField>(phiName_);
@@ -144,7 +141,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
if (phi.dimensions() == dimVelocity*dimArea)
{
// volumetric flow-rate
- operator==(tangentialVelocity + n*avgU);
+ operator==(tangVelo + n*avgU);
}
else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
{
@@ -152,13 +149,13 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
patch().lookupPatchField<volScalarField, scalar>(rhoName_);
// mass flow-rate
- operator==(tangentialVelocity + n*avgU/rhop);
+ operator==(tangVelo + n*avgU/rhop);
}
else
{
FatalErrorIn
(
- "swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
+ "swirlMassFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
) << "dimensions of " << phiName_ << " are incorrect" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
@@ -170,15 +167,18 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
}
-void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
-(
- Ostream& os
-) const
+void Foam::swirlMassFlowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
os.writeKeyword("flowRate") << flowRate_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
- writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ if (phiName_ != "phi")
+ {
+ os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+ }
+ if (rhoName_ != "rho")
+ {
+ os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+ }
os.writeKeyword("rpm") << rpm_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
@@ -191,7 +191,7 @@ namespace Foam
makePatchTypeField
(
fvPatchVectorField,
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
similarity index 70%
rename from src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
rename to src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
index 4576f39c6c1b504e6d8bc42fd148a15a3f0e4889..0ea56eb798fe3ab58b8e94a66d386b2e12c68613 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlMassFlowRateInletVelocity/swirlMassFlowRateInletVelocityFvPatchVectorField.H
@@ -22,11 +22,11 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::swirlFlowRateInletVelocityFvPatchVectorField
+ Foam::swirlMassFlowRateInletVelocityFvPatchVectorField
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,30 +38,22 @@ Description
@verbatim
inlet
{
- type swirlFlowRateInletVelocity;
- flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
- rpm 100;
- value uniform (0 0 0); // placeholder
+ type swirlMassFlowRateInletVelocity;
+ flowRate 0.2; // Volumetric/mass flow rate [m3/s or kg/s]
+ rpm 100;
}
@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
- swirlFlowRateInletVelocityFvPatchVectorField.C
+ swirlMassFlowRateInletVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/
-#ifndef swirlFlowRateInletVelocityFvPatchVectorField_H
-#define swirlFlowRateInletVelocityFvPatchVectorField_H
+#ifndef swirlMassFlowRateInletVelocityFvPatchVectorField_H
+#define swirlMassFlowRateInletVelocityFvPatchVectorField_H
#include "fixedValueFvPatchFields.H"
@@ -70,10 +62,10 @@ SourceFiles
namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class swirlFlowRateInletVelocityFvPatchVectorField Declaration
+ Class swirlMassFlowRateInletVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
-class swirlFlowRateInletVelocityFvPatchVectorField
+class swirlMassFlowRateInletVelocityFvPatchVectorField
:
public fixedValueFvPatchVectorField
{
@@ -88,27 +80,27 @@ class swirlFlowRateInletVelocityFvPatchVectorField
//- Name of the density field used to normalize the mass flux
word rhoName_;
- //- Swirl rate [rpm]
+ //- RPM
scalar rpm_;
public:
//- Runtime type information
- TypeName("swirlFlowRateInletVelocity");
+ TypeName("swirlMassFlowRateInletVelocity");
// Constructors
//- Construct from patch and internal field
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&
);
//- Construct from patch, internal field and dictionary
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&,
@@ -118,18 +110,18 @@ public:
//- Construct by mapping given
// flowRateInletVelocityFvPatchVectorField
// onto a new patch
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField&,
+ const swirlMassFlowRateInletVelocityFvPatchVectorField&,
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField&
+ const swirlMassFlowRateInletVelocityFvPatchVectorField&
);
//- Construct and return a clone
@@ -137,14 +129,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlFlowRateInletVelocityFvPatchVectorField(*this)
+ new swirlMassFlowRateInletVelocityFvPatchVectorField(*this)
);
}
//- Construct as copy setting internal field reference
- swirlFlowRateInletVelocityFvPatchVectorField
+ swirlMassFlowRateInletVelocityFvPatchVectorField
(
- const swirlFlowRateInletVelocityFvPatchVectorField&,
+ const swirlMassFlowRateInletVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>&
);
@@ -156,7 +148,7 @@ public:
{
return tmp<fvPatchVectorField>
(
- new swirlFlowRateInletVelocityFvPatchVectorField(*this, iF)
+ new swirlMassFlowRateInletVelocityFvPatchVectorField(*this, iF)
);
}
@@ -177,18 +169,6 @@ 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();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index ed0f8504c0fdb6b829138c48e568c99dd837321d..0f2f46b834b04b81a17f1c621220535969f88770 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -60,13 +60,7 @@ timeVaryingMappedFixedValueFvPatchField
endSampleTime_(-1),
endSampledValues_(0),
endAverage_(pTraits<Type>::zero)
-{
- if (debug)
- {
- Pout<< "timeVaryingMappedFixedValue :"
- << " construct from fvPatch and internalField" << endl;
- }
-}
+{}
template<class Type>
@@ -92,13 +86,7 @@ timeVaryingMappedFixedValueFvPatchField
endSampleTime_(-1),
endSampledValues_(0),
endAverage_(pTraits<Type>::zero)
-{
- if (debug)
- {
- Pout<< "timeVaryingMappedFixedValue"
- << " : construct from mappedFixedValue and mapper" << endl;
- }
-}
+{}
template<class Type>
@@ -124,12 +112,6 @@ timeVaryingMappedFixedValueFvPatchField
endSampledValues_(0),
endAverage_(pTraits<Type>::zero)
{
- if (debug)
- {
- Pout<< "timeVaryingMappedFixedValue : construct from dictionary"
- << endl;
- }
-
dict.readIfPresent("fieldTableName", fieldTableName_);
if (dict.found("value"))
@@ -163,13 +145,7 @@ timeVaryingMappedFixedValueFvPatchField
endSampleTime_(ptf.endSampleTime_),
endSampledValues_(ptf.endSampledValues_),
endAverage_(ptf.endAverage_)
-{
- if (debug)
- {
- Pout<< "timeVaryingMappedFixedValue : copy construct"
- << endl;
- }
-}
+{}
@@ -194,13 +170,7 @@ timeVaryingMappedFixedValueFvPatchField
endSampleTime_(ptf.endSampleTime_),
endSampledValues_(ptf.endSampledValues_),
endAverage_(ptf.endAverage_)
-{
- if (debug)
- {
- Pout<< "timeVaryingMappedFixedValue :"
- << " copy construct, resetting internal field" << endl;
- }
-}
+{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -284,58 +254,52 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()
const point& p0 = samplePoints[0];
- // Find point separate from p0
+ // Find furthest away point
vector e1;
label index1 = -1;
+ scalar maxDist = -GREAT;
for (label i = 1; i < samplePoints.size(); i++)
{
e1 = samplePoints[i] - p0;
-
scalar magE1 = mag(e1);
- if (magE1 > SMALL)
+ if (magE1 > maxDist)
{
e1 /= magE1;
index1 = i;
- break;
+ maxDist = magE1;
}
}
- // Find point that makes angle with n1
- label index2 = -1;
- vector e2;
- vector n;
+ // Find point that is furthest away from line p0-p1
+ const point& p1 = samplePoints[index1];
- for (label i = index1+1; i < samplePoints.size(); i++)
+ label index2 = -1;
+ maxDist = -GREAT;
+ for (label i = 1; i < samplePoints.size(); i++)
{
- e2 = samplePoints[i] - p0;
-
- scalar magE2 = mag(e2);
-
- if (magE2 > SMALL)
+ if (i != index1)
{
- e2 /= magE2;
+ const point& p2 = samplePoints[i];
+ vector e2(p2 - p0);
+ e2 -= (e2&e1)*e1;
+ scalar magE2 = mag(e2);
- n = e1^e2;
-
- scalar magN = mag(n);
-
- if (magN > SMALL)
+ if (magE2 > maxDist)
{
index2 = i;
- n /= magN;
- break;
+ maxDist = magE2;
}
}
}
-
if (index2 == -1)
{
FatalErrorIn
(
"timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()"
) << "Cannot find points that make valid normal." << nl
+ << "Have so far points " << p0 << " and " << p1
<< "Need at least three sample points which are not in a line."
<< "\n on patch " << this->patch().name()
<< " of points " << samplePoints.name()
@@ -343,6 +307,9 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()
<< exit(FatalError);
}
+ vector n = e1^(samplePoints[index2]-p0);
+ n /= mag(n);
+
if (debug)
{
Info<< "timeVaryingMappedFixedValueFvPatchField :"
@@ -779,7 +746,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
if (fieldTableName_ != this->dimensionedInternalField().name())
{
- os.writeKeyword("fieldTableName") << fieldTableName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("fieldTableName") << fieldTableName_
+ << token::END_STATEMENT << nl;
}
this->writeEntry("value", os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 4b41508a868caf95ad2b97fe3e9b9bd979dbf328..a949b8e5a31ee3d255f9f14f350e196317181675 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -110,13 +110,11 @@ class timeVaryingMappedFixedValueFvPatchField
label& hi
) const;
+
//- Read boundary points and determine interpolation weights to patch
// faceCentres
void readSamplePoints();
- //- Find boundary data inbetween current time and interpolate
- void checkTable();
-
//- Do actual interpolation using current weights
tmp<Field<Type> > interpolate(const Field<Type>&) const;
@@ -199,6 +197,12 @@ public:
return referenceCS_;
}
+ //- Return startSampledValues
+ const Field<Type> startSampledValues()
+ {
+ return startSampledValues_;
+ }
+
// Mapping functions
@@ -216,6 +220,12 @@ public:
);
+ // Utility functions
+
+ //- Find boundary data inbetween current time and interpolate
+ void checkTable();
+
+
// Evaluation functions
//- Update the coefficients associated with the patch field
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..7677f99e0a927bf1ae3bb40733454bd18f4a27b7
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipFvsPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ cyclicFvsPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+ const cyclicSlipFvsPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const dictionary& dict
+)
+:
+ cyclicFvsPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+ const cyclicSlipFvsPatchField<Type>& ptf
+)
+:
+ cyclicFvsPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+(
+ const cyclicSlipFvsPatchField<Type>& ptf,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ cyclicFvsPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..b31ede5ddc0534bbda0829c6727ac0e96a42ebdb
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::cyclicSlipFvsPatchField
+
+Description
+ Foam::cyclicSlipFvsPatchField
+
+SourceFiles
+ cyclicSlipFvsPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvsPatchField_H
+#define cyclicSlipFvsPatchField_H
+
+#include "cyclicFvsPatchField.H"
+#include "cyclicSlipFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cyclicSlipFvsPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class cyclicSlipFvsPatchField
+:
+ public cyclicFvsPatchField<Type>
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(cyclicSlipFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ cyclicSlipFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ cyclicSlipFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given cyclicSlipFvsPatchField onto a new patch
+ cyclicSlipFvsPatchField
+ (
+ const cyclicSlipFvsPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ cyclicSlipFvsPatchField
+ (
+ const cyclicSlipFvsPatchField<Type>&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvsPatchField<Type> > clone() const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new cyclicSlipFvsPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ cyclicSlipFvsPatchField
+ (
+ const cyclicSlipFvsPatchField<Type>&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvsPatchField<Type> > clone
+ (
+ const DimensionedField<Type, surfaceMesh>& iF
+ ) const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new cyclicSlipFvsPatchField<Type>(*this, iF)
+ );
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "cyclicSlipFvsPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..c10ee19519f42d039928d095706110f94d6ee804
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipFvsPatchFields.H"
+#include "fvsPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFvsPatchFields(cyclicSlip);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..74cc35b17fdc29a5dd2e1f1b1a41b738ec7a9f9e
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvsPatchFields_H
+#define cyclicSlipFvsPatchFields_H
+
+#include "cyclicSlipFvsPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFvsPatchTypeFieldTypedefs(cyclicSlip)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..788950d2e778c43becc07caef92538da2279a774
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvsPatchFieldsFwd_H
+#define cyclicSlipFvsPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class cyclicSlipFvsPatchField;
+
+makeFvsPatchTypeFieldTypedefs(cyclicSlip)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
new file mode 100644
index 0000000000000000000000000000000000000000..d379d33189f2ccabff86cd6757b3efef8e1be633
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicFvsPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ coupledFvsPatchField<Type>(p, iF),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{}
+
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const Field<Type>& f
+)
+:
+ coupledFvsPatchField<Type>(p, iF, f),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{}
+
+
+// Construct by mapping given processorCyclicFvsPatchField<Type>
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const processorCyclicFvsPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ coupledFvsPatchField<Type>(ptf, p, iF, mapper),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{
+ if (!isType<processorCyclicFvPatch>(this->patch()))
+ {
+ FatalErrorIn
+ (
+ "processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
+ "(\n"
+ " const processorCyclicFvsPatchField<Type>& ptf,\n"
+ " const fvPatch& p,\n"
+ " const DimensionedField<Type, surfaceMesh>& iF,\n"
+ " const fvPatchFieldMapper& mapper\n"
+ ")\n"
+ ) << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
+ }
+}
+
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, surfaceMesh>& iF,
+ const dictionary& dict
+)
+:
+ coupledFvsPatchField<Type>(p, iF, dict),
+ procPatch_(refCast<const processorCyclicFvPatch>(p))
+{
+ if (!isType<processorCyclicFvPatch>(p))
+ {
+ FatalIOErrorIn
+ (
+ "processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
+ "(\n"
+ " const fvPatch& p,\n"
+ " const Field<Type>& field,\n"
+ " const dictionary& dict\n"
+ ")\n",
+ dict
+ ) << "patch " << this->patch().index() << " not processor type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
+ }
+}
+
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const processorCyclicFvsPatchField<Type>& ptf
+)
+:
+ coupledFvsPatchField<Type>(ptf),
+ procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
+{}
+
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+(
+ const processorCyclicFvsPatchField<Type>& ptf,
+ const DimensionedField<Type, surfaceMesh>& iF
+)
+:
+ coupledFvsPatchField<Type>(ptf, iF),
+ procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
+
+template<class Type>
+processorCyclicFvsPatchField<Type>::~processorCyclicFvsPatchField()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
new file mode 100644
index 0000000000000000000000000000000000000000..e2feb59efcd02efff35fa5cfafba6eef8b9fd6be
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicFvsPatchField
+
+Description
+ Foam::processorCyclicFvsPatchField
+
+SourceFiles
+ processorCyclicFvsPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvsPatchField_H
+#define processorCyclicFvsPatchField_H
+
+#include "coupledFvsPatchField.H"
+#include "processorCyclicFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicFvsPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class processorCyclicFvsPatchField
+:
+ public coupledFvsPatchField<Type>
+{
+ // Private data
+
+ //- Local reference cast into the processor patch
+ const processorCyclicFvPatch& procPatch_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName(processorCyclicFvPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ processorCyclicFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct from patch and internal field and patch field
+ processorCyclicFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const Field<Type>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ processorCyclicFvsPatchField
+ (
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given processorCyclicFvsPatchField onto a
+ // new patch
+ processorCyclicFvsPatchField
+ (
+ const processorCyclicFvsPatchField<Type>&,
+ const fvPatch&,
+ const DimensionedField<Type, surfaceMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ processorCyclicFvsPatchField(const processorCyclicFvsPatchField<Type>&);
+
+ //- Construct and return a clone
+ virtual tmp<fvsPatchField<Type> > clone() const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new processorCyclicFvsPatchField<Type>(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ processorCyclicFvsPatchField
+ (
+ const processorCyclicFvsPatchField<Type>&,
+ const DimensionedField<Type, surfaceMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvsPatchField<Type> > clone
+ (
+ const DimensionedField<Type, surfaceMesh>& iF
+ ) const
+ {
+ return tmp<fvsPatchField<Type> >
+ (
+ new processorCyclicFvsPatchField<Type>(*this, iF)
+ );
+ }
+
+
+ // Destructor
+
+ ~processorCyclicFvsPatchField();
+
+
+ // Member functions
+
+ // Access
+
+ //- Return true if running parallel
+ virtual bool coupled() const
+ {
+ if (Pstream::parRun())
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "processorCyclicFvsPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.C
new file mode 100644
index 0000000000000000000000000000000000000000..0061b985356cdcb33e8cd8675b29253f56099774
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicFvsPatchFields.H"
+#include "fvsPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFvsPatchFields(processorCyclic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..63ad5a8c8cc38176b7d107187213f820a6e0cc97
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFields.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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvsPatchFields_H
+#define processorCyclicFvsPatchFields_H
+
+#include "processorCyclicFvsPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFvsPatchTypeFieldTypedefs(processorCyclic)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..ddb0593965e41ce33af67d2c7ee02beafabe3b99
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvsPatchFieldsFwd_H
+#define processorCyclicFvsPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class processorCyclicFvsPatchField;
+
+makeFvsPatchTypeFieldTypedefs(processor)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index fcb479465b1a04d8d453ff99ef6c42be173f6dfb..ea181f77619cda6096b143f2d73dffb095142b1d 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -506,6 +506,13 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
return;
}
+ if (debug)
+ {
+ InfoIn("fvMatrix<Type>::relax(const scalar alpha)")
+ << "Relaxing " << psi_.name() << " by " << alpha
+ << endl;
+ }
+
Field<Type>& S = source();
scalarField& D = diag();
@@ -591,9 +598,14 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
template<class Type>
void Foam::fvMatrix<Type>::relax()
{
- if (psi_.mesh().relax(psi_.name()))
+ word name = psi_.select
+ (
+ psi_.mesh().data::lookupOrDefault<bool>("finalIteration", false)
+ );
+
+ if (psi_.mesh().relax(name))
{
- relax(psi_.mesh().relaxationFactor(psi_.name()));
+ relax(psi_.mesh().relaxationFactor(name));
}
}
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index e1984ef87892f5a5f837c79207206303148efba8..b4889660f6cb24fe76019af23064a581ce326490 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -167,21 +167,48 @@ template<class Type>
Foam::autoPtr<typename Foam::fvMatrix<Type>::fvSolver>
Foam::fvMatrix<Type>::solver()
{
- return solver(psi_.mesh().solverDict(psi_.name()));
+ return solver
+ (
+ psi_.mesh().solverDict
+ (
+ psi_.select
+ (
+ psi_.mesh().data::lookupOrDefault<bool>("finalIteration", false)
+ )
+ )
+ );
}
template<class Type>
Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
{
- return solve(psi_.mesh().solverDict(psi_.name()));
+ return solve
+ (
+ psi_.mesh().solverDict
+ (
+ psi_.select
+ (
+ psi_.mesh().data::lookupOrDefault<bool>("finalIteration", false)
+ )
+ )
+ );
}
template<class Type>
Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve()
{
- return solve(psi_.mesh().solverDict(psi_.name()));
+ return solve
+ (
+ psi_.mesh().solverDict
+ (
+ psi_.select
+ (
+ psi_.mesh().data::lookupOrDefault<bool>("finalIteration", false)
+ )
+ )
+ );
}
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 2fe12f0317b013b5daa1d850119614ffb9778354..d99aa43eb1f14c0ed1b8e3dad53f8b3e30c752d3 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -590,7 +590,7 @@ void Foam::MULES::limiter
}
}
- syncTools::syncFaceList(mesh, allLambda, minEqOp<scalar>(), false);
+ syncTools::syncFaceList(mesh, allLambda, minEqOp<scalar>());
}
}
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C
index aed12722c9df675808d81a141776df43854fb890..eb0f4303e175c79c55b92bf795680c1c4ca653ab 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C
@@ -25,6 +25,7 @@ License
#include "CECCellToCellStencil.H"
#include "syncTools.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -56,13 +57,7 @@ void Foam::CECCellToCellStencil::calcEdgeBoundaryData
);
}
- syncTools::syncEdgeMap
- (
- mesh(),
- neiGlobal,
- unionEqOp(),
- false // apply separation
- );
+ syncTools::syncEdgeMap(mesh(), neiGlobal, unionEqOp(), dummyTransform());
}
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C
index b121eb29c1c5914364eacb851ac1ced008f9ae1f..c5d0eaec92cce92b304112c603cde071dde898da 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C
@@ -78,7 +78,7 @@ void Foam::CFCCellToCellStencil::calcFaceBoundaryData
}
}
}
- syncTools::swapBoundaryFaceList(mesh(), neiGlobal, false);
+ syncTools::swapBoundaryFaceList(mesh(), neiGlobal);
}
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C
index bae45472a9d4df140049a6e37e5973cbb0998306..a4f757505402ff4a04be40cf40561d7bc0210f90 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C
@@ -25,6 +25,7 @@ License
#include "CPCCellToCellStencil.H"
#include "syncTools.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -61,7 +62,7 @@ void Foam::CPCCellToCellStencil::calcPointBoundaryData
mesh(),
neiGlobal,
unionEqOp(),
- false // apply separation
+ Foam::dummyTransform() // dummy transformation
);
}
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
index a2259bfc723c16f1c679c731fa425f2bc31f614c..82e91bcd4e64c52af211e09fa6d958a3f224e174 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
@@ -27,6 +27,7 @@ License
#include "cellToFaceStencil.H"
#include "syncTools.H"
#include "SortableList.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -315,7 +316,15 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencils
{
neiBndStencil[faceI-mesh_.nInternalFaces()] = ownStencil[faceI];
}
- syncTools::swapBoundaryFaceList(mesh_, neiBndStencil, false);
+ //syncTools::swapBoundaryFaceList(mesh_, neiBndStencil);
+ syncTools::syncBoundaryFaceList
+ (
+ mesh_,
+ neiBndStencil,
+ eqOp<labelList>(),
+ dummyTransform()
+ );
+
// Do the neighbour side
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C
index 048ef4391b077a1d4e7e0f1e24561b4852acf788..52a7ad6a57cef3d733abc295fcfb44b6377debcf 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C
@@ -26,9 +26,7 @@ License
#include "FECCellToFaceStencil.H"
#include "syncTools.H"
#include "emptyPolyPatch.H"
-//#include "meshTools.H"
-//#include "OFstream.H"
-//#include "Time.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -60,13 +58,7 @@ void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
);
}
- syncTools::syncEdgeMap
- (
- mesh(),
- neiGlobal,
- unionEqOp(),
- false // apply separation
- );
+ syncTools::syncEdgeMap(mesh(), neiGlobal, unionEqOp(), dummyTransform());
}
@@ -104,7 +96,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
}
}
}
- syncTools::swapBoundaryFaceList(mesh(), neiGlobalCell, false);
+ syncTools::swapBoundaryFaceList(mesh(), neiGlobalCell);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C
index d2289a721fc38f2be98201b25b9fed6436154fd8..e6d68f87dc9ce8578a86362d3ecd09e5426337ff 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C
@@ -24,9 +24,10 @@ License
\*---------------------------------------------------------------------------*/
#include "cellToFaceStencil.H"
-#include "syncTools.H"
#include "SortableList.H"
#include "emptyPolyPatch.H"
+#include "syncTools.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -370,7 +371,14 @@ void Foam::cellToFaceStencil::calcFaceStencil
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiGlobalCellCells, false);
+ //syncTools::swapBoundaryFaceList(mesh_, neiGlobalCellCells);
+ syncTools::syncBoundaryFaceList
+ (
+ mesh_,
+ neiGlobalCellCells,
+ eqOp<labelList>(),
+ dummyTransform()
+ );
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C
index 91d4f9ed5d05de7766502b3857cb06928a6490e8..12a46a28e797241fa3dbafaa5108cd46c6bbb76b 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C
@@ -26,6 +26,7 @@ License
#include "CFCFaceToCellStencil.H"
#include "syncTools.H"
#include "emptyPolyPatch.H"
+#include "dummyTransform.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -80,7 +81,14 @@ void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
// Do nothing since face itself already in stencil
}
}
- syncTools::swapBoundaryFaceList(mesh(), neiGlobal, false);
+ //syncTools::swapBoundaryFaceList(mesh(), neiGlobal);
+ syncTools::syncBoundaryFaceList
+ (
+ mesh(),
+ neiGlobal,
+ eqOp<labelList>(),
+ dummyTransform()
+ );
}
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 64ea8c41035552e904c6df9beb12d9c51ac14bfb..601c1a30e05cf538396aa02b811d6672843c0950 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -153,7 +153,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
surfaceInterpolation(*this),
fvSchemes(static_cast<const objectRegistry&>(*this)),
fvSolution(static_cast<const objectRegistry&>(*this)),
- fvData(static_cast<const objectRegistry&>(*this)),
+ data(static_cast<const objectRegistry&>(*this)),
boundary_(*this, boundaryMesh()),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
@@ -248,7 +248,7 @@ Foam::fvMesh::fvMesh
surfaceInterpolation(*this),
fvSchemes(static_cast<const objectRegistry&>(*this)),
fvSolution(static_cast<const objectRegistry&>(*this)),
- fvData(static_cast<const objectRegistry&>(*this)),
+ data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
@@ -281,7 +281,7 @@ Foam::fvMesh::fvMesh
surfaceInterpolation(*this),
fvSchemes(static_cast<const objectRegistry&>(*this)),
fvSolution(static_cast<const objectRegistry&>(*this)),
- fvData(static_cast<const objectRegistry&>(*this)),
+ data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 68ca4eeed93824d7f78a0c7da82acd1bb75ea4d8..3348915e56454bd06abab6db985c5feff5b032e7 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -54,7 +54,7 @@ SourceFiles
#include "surfaceInterpolation.H"
#include "fvSchemes.H"
#include "fvSolution.H"
-#include "fvData.H"
+#include "data.H"
#include "DimensionedField.H"
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
@@ -83,7 +83,7 @@ class fvMesh
public surfaceInterpolation,
public fvSchemes,
public fvSolution,
- public fvData
+ public data
{
// Private data
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 8cd71ce2c206076865c1095c94a7924f0971929a..f6266998a3ef5cfd915ea8aff26641c02175e0cd 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -102,6 +102,8 @@ void Foam::fvMeshSubset::doCoupledPatches
if (syncPar && Pstream::parRun())
{
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
// Send face usage across processor patches
forAll(oldPatches, oldPatchI)
{
@@ -112,17 +114,14 @@ void Foam::fvMeshSubset::doCoupledPatches
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
- OPstream toNeighbour
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
+ UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
toNeighbour
<< SubList<label>(nCellsUsingFace, pp.size(), pp.start());
}
}
+ pBufs.finishedSends();
// Receive face usage count and check for faces that become uncoupled.
forAll(oldPatches, oldPatchI)
@@ -134,11 +133,7 @@ void Foam::fvMeshSubset::doCoupledPatches
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(pp);
- IPstream fromNeighbour
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
+ UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
labelList nbrCellsUsingFace(fromNeighbour);
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 013c3aa2ac576ae0a60a62c41936f3f811c9c80a..899bebc9ac03e670671fd36feb8b9a5e4356e6f5 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -103,23 +103,14 @@ public:
return coupledPolyPatch_.coupled();
}
- //- Return face transformation tensor
- const tensorField& forwardT() const
- {
- return coupledPolyPatch_.forwardT();
- }
+ //- Are the cyclic planes parallel.
+ virtual bool parallel() const = 0;
- //- Return neighbour-cell transformation tensor
- const tensorField& reverseT() const
- {
- return coupledPolyPatch_.reverseT();
- }
+ //- Return face transformation tensor.
+ virtual const tensorField& forwardT() const = 0;
- //- Are the cyclic planes parallel
- bool parallel() const
- {
- return coupledPolyPatch_.parallel();
- }
+ //- Return neighbour-cell transformation tensor.
+ virtual const tensorField& reverseT() const = 0;
//- Return faceCell addressing
virtual const unallocLabelList& faceCells() const
@@ -140,21 +131,6 @@ public:
const unallocLabelList& internalData
) const = 0;
- //- Initialise interface data transfer
- virtual void initTransfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const
- {}
-
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const = 0;
-
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index 19ff7e6e6c6cebc1edb964f30b3109b5da51a364..e6fe565f5c117592483cb5cfcb910f57ac46757b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -26,6 +26,7 @@ License
#include "cyclicFvPatch.H"
#include "addToRunTimeSelectionTable.H"
#include "fvMesh.H"
+#include "transform.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,30 +44,31 @@ addToRunTimeSelectionTable(fvPatch, cyclicFvPatch, polyPatch);
// Make patch weighting factors
void cyclicFvPatch::makeWeights(scalarField& w) const
{
+ const cyclicFvPatch& nbrPatch = neighbFvPatch();
+
const scalarField& magFa = magSf();
+ const scalarField& nbrMagFa = nbrPatch.magSf();
scalarField deltas = nf() & fvPatch::delta();
- label sizeby2 = deltas.size()/2;
+ scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
- for (label facei = 0; facei < sizeby2; facei++)
+ forAll(magFa, facei)
{
- scalar avFa = (magFa[facei] + magFa[facei + sizeby2])/2.0;
+ scalar avFa = (magFa[facei] + nbrMagFa[facei])/2.0;
- if (mag(magFa[facei] - magFa[facei + sizeby2])/avFa > 1e-4)
+ if (mag(magFa[facei] - nbrMagFa[facei])/avFa > 1e-4)
{
FatalErrorIn("cyclicFvPatch::makeWeights(scalarField& w) const")
- << "face " << facei << " and " << facei + sizeby2
- << " areas do not match by "
- << 100*mag(magFa[facei] - magFa[facei + sizeby2])/avFa
+ << "face " << facei << " areas do not match by "
+ << 100*mag(magFa[facei] - nbrMagFa[facei])/avFa
<< "% -- possible face ordering problem"
<< abort(FatalError);
}
scalar di = deltas[facei];
- scalar dni = deltas[facei + sizeby2];
+ scalar dni = nbrDeltas[facei];
w[facei] = dni/(di + dni);
- w[facei + sizeby2] = 1 - w[facei];
}
}
@@ -74,16 +76,18 @@ void cyclicFvPatch::makeWeights(scalarField& w) const
// Make patch face - neighbour cell distances
void cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
{
+ //const cyclicPolyPatch& nbrPatch = cyclicPolyPatch_.neighbPatch();
+ const cyclicFvPatch& nbrPatch = neighbFvPatch();
+
scalarField deltas = nf() & fvPatch::delta();
- label sizeby2 = deltas.size()/2;
+ scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
- for (label facei = 0; facei < sizeby2; facei++)
+ forAll(deltas, facei)
{
scalar di = deltas[facei];
- scalar dni = deltas[facei + sizeby2];
+ scalar dni = nbrDeltas[facei];
dc[facei] = 1.0/(di + dni);
- dc[facei + sizeby2] = dc[facei];
}
}
@@ -92,7 +96,7 @@ void cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
tmp<vectorField> cyclicFvPatch::delta() const
{
vectorField patchD = fvPatch::delta();
- label sizeby2 = patchD.size()/2;
+ vectorField nbrPatchD = neighbFvPatch().fvPatch::delta();
tmp<vectorField> tpdv(new vectorField(patchD.size()));
vectorField& pdv = tpdv();
@@ -100,24 +104,22 @@ tmp<vectorField> cyclicFvPatch::delta() const
// To the transformation if necessary
if (parallel())
{
- for (label facei = 0; facei < sizeby2; facei++)
+ forAll(patchD, facei)
{
vector ddi = patchD[facei];
- vector dni = patchD[facei + sizeby2];
+ vector dni = nbrPatchD[facei];
pdv[facei] = ddi - dni;
- pdv[facei + sizeby2] = -pdv[facei];
}
}
else
{
- for (label facei = 0; facei < sizeby2; facei++)
+ forAll(patchD, facei)
{
vector ddi = patchD[facei];
- vector dni = patchD[facei + sizeby2];
+ vector dni = nbrPatchD[facei];
pdv[facei] = ddi - transform(forwardT()[0], dni);
- pdv[facei + sizeby2] = -transform(reverseT()[0], pdv[facei]);
}
}
@@ -134,47 +136,13 @@ tmp<labelField> cyclicFvPatch::interfaceInternalField
}
-tmp<labelField> cyclicFvPatch::transfer
-(
- const Pstream::commsTypes,
- const unallocLabelList& interfaceData
-) const
-{
- tmp<labelField> tpnf(new labelField(this->size()));
- labelField& pnf = tpnf();
-
- label sizeby2 = this->size()/2;
-
- for (label facei=0; facei<sizeby2; facei++)
- {
- pnf[facei] = interfaceData[facei + sizeby2];
- pnf[facei + sizeby2] = interfaceData[facei];
- }
-
- return tpnf;
-}
-
-
tmp<labelField> cyclicFvPatch::internalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
) const
{
- const unallocLabelList& faceCells = this->patch().faceCells();
-
- tmp<labelField> tpnf(new labelField(this->size()));
- labelField& pnf = tpnf();
-
- label sizeby2 = this->size()/2;
-
- for (label facei=0; facei<sizeby2; facei++)
- {
- pnf[facei] = iF[faceCells[facei + sizeby2]];
- pnf[facei + sizeby2] = iF[faceCells[facei]];
- }
-
- return tpnf;
+ return neighbFvPatch().patchInternalField(iF);
}
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
index 66a01caad8b6157d2b4cb0759593b7fbf945a8a0..ca2654c30ff5d0fd042daae7579488035e6d8ce6 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
@@ -38,6 +38,7 @@ SourceFiles
#include "coupledFvPatch.H"
#include "cyclicLduInterface.H"
#include "cyclicPolyPatch.H"
+#include "fvBoundaryMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -89,21 +90,61 @@ public:
// Access
+ //- Return local reference cast into the cyclic patch
+ const cyclicPolyPatch& cyclicPatch() const
+ {
+ return cyclicPolyPatch_;
+ }
+
+ //- Return neighbour
+ virtual label neighbPatchID() const
+ {
+ return cyclicPolyPatch_.neighbPatchID();
+ }
+
+ virtual bool owner() const
+ {
+ return cyclicPolyPatch_.owner();
+ }
+
+ //- Return processor number
+ virtual const cyclicLduInterface& neighbPatch() const
+ {
+ return refCast<const cyclicFvPatch>
+ (
+ this->boundaryMesh()[cyclicPolyPatch_.neighbPatchID()]
+ );
+ }
+
+ //- Are the cyclic planes parallel
+ virtual bool parallel() const
+ {
+ return cyclicPolyPatch_.parallel();
+ }
+
//- Return face transformation tensor
- const tensorField& forwardT() const
+ virtual const tensorField& forwardT() const
{
- return coupledFvPatch::forwardT();
+ return cyclicPolyPatch_.forwardT();
}
//- Return neighbour-cell transformation tensor
- const tensorField& reverseT() const
+ virtual const tensorField& reverseT() const
{
- return coupledFvPatch::reverseT();
+ return cyclicPolyPatch_.reverseT();
+ }
+
+ const cyclicFvPatch& neighbFvPatch() const
+ {
+ return refCast<const cyclicFvPatch>
+ (
+ this->boundaryMesh()[cyclicPolyPatch_.neighbPatchID()]
+ );
}
//- Return delta (P to N) vectors across coupled patch
- tmp<vectorField> delta() const;
+ virtual tmp<vectorField> delta() const;
// Interface transfer functions
@@ -115,13 +156,6 @@ public:
const unallocLabelList& internalData
) const;
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
//- Return neighbour field
virtual tmp<labelField> internalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..11a1dfe3837c6cb7a84f9adeb92128e692e48629
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "cyclicSlipFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(cyclicSlipFvPatch, 0);
+addToRunTimeSelectionTable(fvPatch, cyclicSlipFvPatch, polyPatch);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..9a68b1127c21d31eab3449400af89219d6fd5e80
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicSlip/cyclicSlipFvPatch.H
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::cyclicSlipFvPatch
+
+Description
+ Cyclic-plane patch.
+
+SourceFiles
+ cyclicSlipFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicSlipFvPatch_H
+#define cyclicSlipFvPatch_H
+
+#include "cyclicFvPatch.H"
+#include "cyclicSlipPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cyclicSlipFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class cyclicSlipFvPatch
+:
+ public cyclicFvPatch
+{
+
+public:
+
+ //- Runtime type information
+ TypeName(cyclicSlipPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from polyPatch
+ cyclicSlipFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
+ :
+ cyclicFvPatch(patch, bm)
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
index 4c7c55bc8205d014443aede655986b9caa7eecf9..18c5827eec4847e77fd95962f3770720891462e0 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
@@ -122,26 +122,6 @@ tmp<labelField> processorFvPatch::interfaceInternalField
}
-void processorFvPatch::initTransfer
-(
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
-) const
-{
- send(commsType, interfaceData);
-}
-
-
-tmp<labelField> processorFvPatch::transfer
-(
- const Pstream::commsTypes commsType,
- const unallocLabelList&
-) const
-{
- return receive<label>(commsType, this->size());
-}
-
-
void processorFvPatch::initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 300f2434313171d75470aceaacb2fd9fee4b9b17..68bff0e7e1e94b5e94700b7259d2dcb7250331ed 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -99,6 +99,12 @@ public:
return procPolyPatch_.neighbProcNo();
}
+ //- Return message tag used for sending
+ virtual int tag() const
+ {
+ return UPstream::msgType();
+ }
+
//- Return true if running parallel
virtual bool coupled() const
{
@@ -112,14 +118,31 @@ public:
}
}
+ const processorPolyPatch& procPolyPatch() const
+ {
+ return procPolyPatch_;
+ }
+
+ //- Are the cyclic planes parallel
+ virtual bool parallel() const
+ {
+ return procPolyPatch_.parallel();
+ }
+
//- Return face transformation tensor
virtual const tensorField& forwardT() const
{
return procPolyPatch_.forwardT();
}
+ //- Return neighbour-cell transformation tensor.
+ virtual const tensorField& reverseT() const
+ {
+ return procPolyPatch_.reverseT();
+ }
+
//- Return delta (P to N) vectors across coupled patch
- tmp<vectorField> delta() const;
+ virtual tmp<vectorField> delta() const;
// Interface transfer functions
@@ -131,20 +154,6 @@ public:
const unallocLabelList& internalData
) const;
- //- Initialise interface data transfer
- virtual void initTransfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
- //- Transfer and return neighbour field
- virtual tmp<labelField> transfer
- (
- const Pstream::commsTypes commsType,
- const unallocLabelList& interfaceData
- ) const;
-
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.C
new file mode 100644
index 0000000000000000000000000000000000000000..53e513e47e43ee93ac7b2b7a7aa27fa8c3c0633d
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "processorCyclicFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "transformField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(processorCyclicFvPatch, 0);
+addToRunTimeSelectionTable(fvPatch, processorCyclicFvPatch, polyPatch);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H
new file mode 100644
index 0000000000000000000000000000000000000000..fef763992754d1b9f859915e0659afd99cffee55
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::processorCyclicFvPatch
+
+Description
+ Processor patch.
+
+SourceFiles
+ processorCyclicFvPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef processorCyclicFvPatch_H
+#define processorCyclicFvPatch_H
+
+#include "processorCyclicPolyPatch.H"
+#include "processorFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class processorCyclicFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorCyclicFvPatch
+:
+ public processorFvPatch
+{
+ // Private Data
+
+ const processorCyclicPolyPatch& procPolyPatch_;
+
+public:
+
+ //- Runtime type information
+ TypeName(processorCyclicPolyPatch::typeName_());
+
+
+ // Constructors
+
+ //- Construct from components
+ processorCyclicFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
+ :
+ processorFvPatch(patch, bm),
+ procPolyPatch_(refCast<const processorCyclicPolyPatch>(patch))
+ {}
+
+
+ // Member functions
+
+ //- Return message tag used for sending
+ virtual int tag() const
+ {
+ // Allocate from Pstream?
+ return procPolyPatch_.tag();
+ }
+
+ const processorCyclicPolyPatch& procPolyPatch() const
+ {
+ return procPolyPatch_;
+ }
+
+ //- Are the cyclic planes parallel
+ virtual bool parallel() const
+ {
+ return procPolyPatch_.parallel();
+ }
+
+ //- Return face transformation tensor
+ virtual const tensorField& forwardT() const
+ {
+ return procPolyPatch_.forwardT();
+ }
+
+ //- Return neighbour-cell transformation tensor
+ virtual const tensorField& reverseT() const
+ {
+ return procPolyPatch_.reverseT();
+ }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 4b93d83e5c828dc51371dc8c082202042d6b6b58..86a60d8a7a74ab3ee65de824731a067b7738b9e0 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -81,7 +81,7 @@ void Foam::singleCellFvMesh::agglomerateMesh
}
}
}
- syncTools::swapBoundaryFaceList(mesh, nbrAgglom, false);
+ syncTools::swapBoundaryFaceList(mesh, nbrAgglom);
// Get correspondence between this agglomeration and remote one
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 4f5959627bbce7346c30c231664ba18a65e8cb2b..28376118b946417b646725e3fcc367f0ab4b1245 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -40,6 +40,7 @@ SourceFiles
#include "fvPatchFieldMapper.H"
#include "fvMesh.H"
+#include "labelListIOList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
index 47a7d69e46aa46d2762c12524f2b2cebc2c2c63c..b28ec8d4a8a2aa27b6c848d37caf69b78b8157cc 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
@@ -27,7 +27,6 @@ License
#include "surfaceFields.H"
#include "volFields.H"
#include "SVD.H"
-#include "syncTools.H"
#include "extendedUpwindCellToFaceStencil.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index 77da111828664fa21f5b4e461ff20c7171a658b4..8382c77bd7509f900b4f30d0d45433c3b7d2a23f 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -287,10 +287,13 @@ public:
wallFaceIndexAndTransformToDistribute() const;
//- Return access to the referred wall faces
- const List<referredWallFace>& referredWallFaces() const;
+ inline const List<referredWallFace>& referredWallFaces() const;
+
+ //- Return the name of the velocity field
+ inline const word& UName() const;
//- Return access to the referred wall data
- const List<vector>& referredWallData() const;
+ inline const List<vector>& referredWallData() const;
//- Return access to the referred particle container
inline const List<IDLList<ParticleType> >&
diff --git a/src/lagrangian/basic/InteractionLists/InteractionListsI.H b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
index ad28f696c5b1df3b6204d092889aefa1e49ccc79..1b61942f5eb671c6f97db05efbf25527b1b7b6bb 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionListsI.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
@@ -128,6 +128,13 @@ Foam::InteractionLists<ParticleType>::referredWallFaces() const
}
+template<class ParticleType>
+const Foam::word& Foam::InteractionLists<ParticleType>::UName() const
+{
+ return UName_;
+}
+
+
template<class ParticleType>
const Foam::List<Foam::vector>&
Foam::InteractionLists<ParticleType>::referredWallData() const
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index b413211499ef6947f72bf5f701135663e8400808..5717e0c76d6ef84b0d1a9eef37c15357cff4015b 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -474,25 +474,27 @@ void Foam::Particle<ParticleType>::hitCyclicPatch
TrackData&
)
{
- label patchFacei_ = cpp.whichFace(facei_);
+// label patchFacei_ = cpp.whichFace(facei_);
facei_ = cpp.transformGlobalFace(facei_);
celli_ = cloud_.polyMesh_.faceOwner()[facei_];
+ // Now the particle is on the receiving side
+
if (!cpp.parallel())
{
- const tensor& T = cpp.transformT(patchFacei_);
+ const tensor& T = cpp.reverseT()[0];
transformPosition(T);
static_cast<ParticleType&>(*this).transformProperties(T);
}
else if (cpp.separated())
{
- position_ += cpp.separation(patchFacei_);
+ position_ += cpp.separation()[0];
static_cast<ParticleType&>(*this).transformProperties
(
- cpp.separation(patchFacei_)
+ cpp.separation()[0]
);
}
}
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 0d9e84533d65a10babb8a3fd6d14ee254bbb916c..455ee7936da04b5c796a2ee456ab54e88003a748 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -291,7 +291,10 @@ void Foam::DsmcCloud<ParcelType>::initialise
template<class ParcelType>
void Foam::DsmcCloud<ParcelType>::collisions()
{
- buildCellOccupancy();
+ if (!binaryCollision().active())
+ {
+ return;
+ }
// Temporary storage for subCells
List<DynamicList<label> > subCells(8);
@@ -1057,6 +1060,9 @@ void Foam::DsmcCloud<ParcelType>::evolve()
// Move the particles ballistically with their current velocities
Cloud<ParcelType>::move(td);
+ // Update cell occupancy
+ buildCellOccupancy();
+
// Calculate new velocities via stochastic collisions
collisions();
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
index b07fd0cb2dfcedaa460468383cf9c3f34da99467..1e8356ef5fea5c12e5abbfea88a995bf95147687 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
@@ -25,6 +25,7 @@ License
#include "dsmcParcel.H"
#include "DsmcCloud.H"
+#include "NoBinaryCollision.H"
#include "VariableHardSphere.H"
#include "LarsenBorgnakkeVariableHardSphere.H"
@@ -34,6 +35,12 @@ namespace Foam
// Add instances of collision model to the table
makeBinaryCollisionModelType
+ (
+ NoBinaryCollision,
+ DsmcCloud,
+ dsmcParcel
+ );
+ makeBinaryCollisionModelType
(
VariableHardSphere,
DsmcCloud,
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
index 274b9ff79ca98274f842303d9ba29c873844cf06..f35eee7d986bb2512fc5bbde90110ea7857fd178 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::BinaryCollisionModel<CloudType>::BinaryCollisionModel(CloudType& owner)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::BinaryCollisionModel<CloudType>::BinaryCollisionModel
(
@@ -87,4 +96,3 @@ Foam::BinaryCollisionModel<CloudType>::coeffDict() const
#include "BinaryCollisionModelNew.C"
// ************************************************************************* //
-
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index 8550762aafd6bccbd15a8d58ff79692b04dd1bb6..0136cd5f6a0f53a3078e31a78436708ccf7e88b6 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -85,6 +85,9 @@ public:
// Constructors
+ //- Construct null from owner
+ BinaryCollisionModel(CloudType& owner);
+
//- Construct from components
BinaryCollisionModel
(
@@ -123,6 +126,9 @@ public:
// Member Functions
+ //- Flag to indicate whether model activates collision model
+ virtual bool active() const = 0;
+
//- Return the collision cross section * relative velocity product
virtual scalar sigmaTcR
(
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index c7bf6a00ab17645caa9d83bd673023857f5fe502..e5112d5c66c824e08ddb0521a1d27a385db6f3a7 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -117,6 +117,12 @@ Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+template<class CloudType>
+bool Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::active() const
+{
+ return true;
+}
+
template <class CloudType>
Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index f01f625e3f7e53a111f8fc0d3c5c89ea59b3c680..3f742a78ae607e445172c54efeea1faed1e8351c 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -89,6 +89,9 @@ public:
// Member Functions
+ //- Flag to indicate whether model activates collision model
+ virtual bool active() const;
+
//- Return the collision cross section * relative velocity product
virtual scalar sigmaTcR
(
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
new file mode 100644
index 0000000000000000000000000000000000000000..5ff988963832ad558c1d7a510bc728fa865d64c9
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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 "NoBinaryCollision.H"
+#include "constants.H"
+
+using namespace Foam::constant::mathematical;
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoBinaryCollision<CloudType>::NoBinaryCollision
+(
+ const dictionary& dict,
+ CloudType& cloud
+)
+:
+ BinaryCollisionModel<CloudType>(cloud)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoBinaryCollision<CloudType>::~NoBinaryCollision()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::NoBinaryCollision<CloudType>::active() const
+{
+ return false;
+}
+
+
+template <class CloudType>
+Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR
+(
+ label typeIdP,
+ label typeIdQ,
+ const vector& UP,
+ const vector& UQ
+) const
+{
+ FatalErrorIn
+ (
+ "Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR"
+ "("
+ "label typeIdP,"
+ "label typeIdQ,"
+ "const vector& UP,"
+ "const vector& UQ"
+ ") const"
+ )
+ << "sigmaTcR called on NoBinaryCollision model, this should "
+ << "not happen, this is not an actual model." << nl
+ << "Enclose calls to sigmaTcR within a if(binaryCollision().active()) "
+ << " check."
+ << abort(FatalError);
+
+ return 0.0;
+}
+
+
+template <class CloudType>
+void Foam::NoBinaryCollision<CloudType>::collide
+(
+ label typeIdP,
+ label typeIdQ,
+ vector& UP,
+ vector& UQ,
+ scalar& EiP,
+ scalar& EiQ
+)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
new file mode 100644
index 0000000000000000000000000000000000000000..b48cedb316ee780f18cd1976773e0b4748b0ecad
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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::NoBinaryCollision
+
+Description
+ No collison BinaryCollision Model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NoBinaryCollision_H
+#define NoBinaryCollision_H
+
+#include "BinaryCollisionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+ Class NoBinaryCollision Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class NoBinaryCollision
+:
+ public BinaryCollisionModel<CloudType>
+{
+public:
+
+ //- Runtime type information
+ TypeName("none");
+
+
+ // Constructors
+
+ //- Construct from dictionary
+ NoBinaryCollision
+ (
+ const dictionary& dict,
+ CloudType& cloud
+ );
+
+
+ //- Destructor
+ virtual ~NoBinaryCollision();
+
+
+ // Member Functions
+
+ //- Flag to indicate whether model activates collision model
+ virtual bool active() const;
+
+ //- Return the collision cross section * relative velocity product
+ virtual scalar sigmaTcR
+ (
+ label typeIdP,
+ label typeIdQ,
+ const vector& UP,
+ const vector& UQ
+ ) const;
+
+ //- Apply collision
+ virtual void collide
+ (
+ label typeIdP,
+ label typeIdQ,
+ vector& UP,
+ vector& UQ,
+ scalar& EiP,
+ scalar& EiQ
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "NoBinaryCollision.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index e248d01161f5ded486c513c0635853731795ba16..8f7d13dd7de02915be2b97acc3b6b69a861870eb 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -51,6 +51,12 @@ Foam::VariableHardSphere<CloudType>::~VariableHardSphere()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+template<class CloudType>
+bool Foam::VariableHardSphere<CloudType>::active() const
+{
+ return true;
+}
+
template <class CloudType>
Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index 17e1684ee9f9e25e416a9bc17a54b46d1b754630..bf986189c0b058ee0a1e6e15738f6fb4f52f00ef 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -74,6 +74,9 @@ public:
// Member Functions
+ //- Flag to indicate whether model activates collision model
+ virtual bool active() const;
+
//- Return the collision cross section * relative velocity product
virtual scalar sigmaTcR
(
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
index 6f5fe48f45246a5265030c6e21bb5268dc783d88..1f1f8c6254ab8ba41d862a8fadd90d8baa6c839a 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::InflowBoundaryModel<CloudType>::InflowBoundaryModel(CloudType& owner)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::InflowBoundaryModel<CloudType>::InflowBoundaryModel
(
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 764cde114179df4b45bfe217a17c702884e31580..e58fb30a6db6cc1d3165d762305edecfae84aad4 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -86,6 +86,9 @@ public:
// Constructors
+ //- Construct null from owner
+ InflowBoundaryModel(CloudType& owner);
+
//- Construct from dictionary
InflowBoundaryModel
(
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
index b8a9a88b1510cc4a4396cc164f63043fea295577..682ca7d530ea12b62206bfc21628e9fadef3abb3 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
@@ -34,7 +34,7 @@ Foam::NoInflow<CloudType>::NoInflow
CloudType& cloud
)
:
- InflowBoundaryModel<CloudType>(dict, cloud, typeName)
+ InflowBoundaryModel<CloudType>(cloud)
{}
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index e969da048c1ed4d52da4f8763b88de2a1e435f6a..1ed042ae79d6e97480bb1323519a7a5b48baa797 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -50,7 +50,7 @@ class NoInflow
public:
//- Runtime type information
- TypeName("NoInflow");
+ TypeName("none");
// Constructors
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index 947eddda07e8cc86d1523366a8b5c1b920a2f9dd..467e5fad4fe780de750fc96e939e6bae0b5584ac 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -37,7 +37,7 @@ Foam::MaxwellianThermal<CloudType>::MaxwellianThermal
CloudType& cloud
)
:
- WallInteractionModel<CloudType>(dict, cloud, typeName)
+ WallInteractionModel<CloudType>(cloud)
{}
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
index 979030938dd2adb5a3ed7d68d9b279754074115c..b690a0f87e8393d1ac81c850fd597d854ce1465d 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
@@ -36,7 +36,7 @@ Foam::SpecularReflection<CloudType>::SpecularReflection
CloudType& cloud
)
:
- WallInteractionModel<CloudType>(dict, cloud, typeName)
+ WallInteractionModel<CloudType>(cloud)
{}
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index 8d6d983690e8f1930f8deaf390d4023c357054a8..f9bcb86278a7c4eb8d28521598bd07c9121cbd47 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::WallInteractionModel<CloudType>::WallInteractionModel(CloudType& owner)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::WallInteractionModel<CloudType>::WallInteractionModel
(
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index f28a6cec0f4bac341dee5b95885526c6fcf422d5..dfed430ff76b954b5bf6dab8bd604bf129495dae 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -85,6 +85,9 @@ public:
// Constructors
+ //- Construct null from owner
+ WallInteractionModel(CloudType& owner);
+
//- Construct from components
WallInteractionModel
(
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 486c0959dddfb299e64c1c7747ebc2ff3f98a62f..7fc3cf863634c4167d4fc3dc88fd087f5ba1ad4c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -42,7 +42,7 @@ template<class ParcelType>
void Foam::KinematicCloud<ParcelType>::preEvolve()
{
this->dispersion().cacheFields(true);
- forces_.cacheFields(true);
+ forces_.cacheFields(true, interpolationSchemes_);
}
@@ -152,7 +152,7 @@ void Foam::KinematicCloud<ParcelType>::postEvolve()
}
this->dispersion().cacheFields(false);
- forces_.cacheFields(false);
+ forces_.cacheFields(false, interpolationSchemes_);
this->postProcessing().post();
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
index f0b4804cf5a432356fd66d9ab4fdaefec52447d7..4fd7453f3ed734451274831611845d8462c7575a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
@@ -28,37 +28,41 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template<class Type>
-Foam::CollisionRecordList<Type>::CollisionRecordList()
+template<class PairType, class WallType>
+Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList()
:
- DynamicList<CollisionRecord<Type> >()
+ pairRecords_(),
+ wallRecords_()
{}
-template<class Type>
-Foam::CollisionRecordList<Type>::CollisionRecordList(Istream& is)
+template<class PairType, class WallType>
+Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList(Istream& is)
:
- DynamicList<CollisionRecord<Type> >(is)
+ pairRecords_(is),
+ wallRecords_(is)
{
// Check state of Istream
is.check
(
- "Foam::CollisionRecordList<Type>::CollisionRecordList(Foam::Istream&)"
+ "Foam::CollisionRecordList<PairType, WallType>::"
+ "CollisionRecordList(Foam::Istream&)"
);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * /
-template<class Type>
-Foam::CollisionRecordList<Type>::~CollisionRecordList()
+template<class PairType, class WallType>
+Foam::CollisionRecordList<PairType, WallType>::~CollisionRecordList()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-template<class Type>
-Foam::CollisionRecord<Type>& Foam::CollisionRecordList<Type>::matchRecord
+template<class PairType, class WallType>
+Foam::PairCollisionRecord<PairType>&
+Foam::CollisionRecordList<PairType, WallType>::matchPairRecord
(
label origProcOfOther,
label origIdOfOther
@@ -68,15 +72,15 @@ Foam::CollisionRecord<Type>& Foam::CollisionRecordList<Type>::matchRecord
// identifiers. Two records with the same identification is not
// supported.
- forAll(*this, i)
+ forAll(pairRecords_, i)
{
- CollisionRecord<Type>& cR = (*this)[i];
+ PairCollisionRecord<PairType>& pCR = pairRecords_[i];
- if (cR.match(origProcOfOther, origIdOfOther))
+ if (pCR.match(origProcOfOther, origIdOfOther))
{
- cR.setAccessed();
+ pCR.setAccessed();
- return cR;
+ return pCR;
}
}
@@ -84,28 +88,179 @@ Foam::CollisionRecord<Type>& Foam::CollisionRecordList<Type>::matchRecord
// member of the list. The status of the record will be accessed
// by construction.
- append(CollisionRecord<Type>(origProcOfOther, origIdOfOther));
+ pairRecords_.append
+ (
+ PairCollisionRecord<PairType>(origProcOfOther, origIdOfOther)
+ );
+
+ return pairRecords_.last();
+}
+
+
+template<class PairType, class WallType>
+Foam::WallCollisionRecord<WallType>&
+Foam::CollisionRecordList<PairType, WallType>::matchWallRecord
+(
+ const vector& pRel,
+ scalar radius
+)
+{
+ // Returning the first record that matches the relative position.
+ // Two records with the same relative position is not supported.
+
+ forAll(wallRecords_, i)
+ {
+ WallCollisionRecord<WallType>& wCR = wallRecords_[i];
+
+ if (wCR.match(pRel, radius))
+ {
+ wCR.setAccessed();
+
+ return wCR;
+ }
+ }
+
+ // 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.
- return (*this)[this->size() - 1];
+ wallRecords_.append(WallCollisionRecord<WallType>(pRel));
+
+ return wallRecords_.last();
}
-template<class Type>
-void Foam::CollisionRecordList<Type>::update()
+
+template<class PairType, class WallType>
+void Foam::CollisionRecordList<PairType, WallType>::update()
{
- DynamicList<CollisionRecord<Type> > updatedRecords;
+ {
+ DynamicList<PairCollisionRecord<PairType> > updatedRecords;
+
+ forAll(pairRecords_, i)
+ {
+ if (pairRecords_[i].accessed())
+ {
+ pairRecords_[i].setUnaccessed();
+
+ updatedRecords.append(pairRecords_[i]);
+ }
+ }
+
+ pairRecords_ = updatedRecords;
+ }
- forAll(*this, i)
{
- if ((*this)[i].accessed())
+ DynamicList<WallCollisionRecord<WallType> > updatedRecords;
+
+ forAll(wallRecords_, i)
{
- (*this)[i].setUnaccessed();
+ if (wallRecords_[i].accessed())
+ {
+ wallRecords_[i].setUnaccessed();
- updatedRecords.append((*this)[i]);
+ updatedRecords.append(wallRecords_[i]);
+ }
}
+
+ wallRecords_ = updatedRecords;
+ }
+}
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
+
+template<class PairType, class WallType>
+void Foam::CollisionRecordList<PairType, WallType>::operator=
+(
+ const CollisionRecordList<PairType, WallType>& rhs
+)
+{
+ // Check for assignment to self
+ if (this == &rhs)
+ {
+ FatalErrorIn
+ (
+ "Foam::CollisionRecordList<PairType, WallType>::operator="
+ "(const Foam::CollisionRecordList<PairType, WallType>&)"
+ )
+ << "Attempted assignment to self"
+ << abort(FatalError);
}
- DynamicList<CollisionRecord<Type> >::operator=(updatedRecords);
+ pairRecords_ = rhs.pairRecords_;
+ wallRecords_ = rhs.wallRecords_;
}
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+template<class PairType, class WallType>
+inline bool Foam::operator==
+(
+ const CollisionRecordList<PairType, WallType>& a,
+ const CollisionRecordList<PairType, WallType>& b
+)
+{
+ return
+ (
+ a.pairRecords_ == b.pairRecords_
+ && a.wallRecords_ == b.wallRecords_
+ );
+}
+
+
+template<class PairType, class WallType>
+inline bool Foam::operator!=
+(
+ const CollisionRecordList<PairType, WallType>& a,
+ const CollisionRecordList<PairType, WallType>& b
+)
+{
+ return !(a == b);
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+template<class PairType, class WallType>
+Foam::Istream& Foam::operator>>
+(
+ Istream& is,
+ CollisionRecordList<PairType, WallType>& cRL
+)
+{
+ is >> cRL.pairRecords_ >> cRL.wallRecords_;
+
+ // Check state of Istream
+ is.check
+ (
+ "Foam::Istream& Foam::operator>>"
+ "(Foam::Istream&, Foam::CollisionRecordList<PairType, WallType>&)"
+ );
+
+ return is;
+}
+
+
+template<class PairType, class WallType>
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const CollisionRecordList<PairType, WallType>& cRL
+)
+{
+ os << cRL.pairRecords_ << cRL.wallRecords_;
+
+ // Check state of Ostream
+ os.check
+ (
+ "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+ "const Foam::CollisionRecordList<PairType, WallType>&)"
+ );
+
+ return os;
+}
+
+
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
index 32c7eef6c6fd4fab8b85384b5b774bf75bbca068..2993b9df30d7c7ff3f77c044e517f2b37ebd8aca 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
@@ -37,22 +37,53 @@ SourceFiles
#define CollisionRecordList_H
#include "DynamicList.H"
-#include "CollisionRecord.H"
+#include "PairCollisionRecord.H"
+#include "WallCollisionRecord.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+// Forward declaration of friend functions and operators
+template<class PairType, class WallType>
+class CollisionRecordList;
+
+template<class PairType, class WallType>
+inline bool operator==
+(
+ const CollisionRecordList<PairType, WallType>&,
+ const CollisionRecordList<PairType, WallType>&
+);
+
+template<class PairType, class WallType>
+inline bool operator!=
+(
+ const CollisionRecordList<PairType, WallType>&,
+ const CollisionRecordList<PairType, WallType>&
+);
+
+template<class PairType, class WallType>
+Istream& operator>>(Istream&, CollisionRecordList<PairType, WallType>&);
+
+template<class PairType, class WallType>
+Ostream& operator<<(Ostream&, const CollisionRecordList<PairType, WallType>&);
+
+
/*---------------------------------------------------------------------------*\
Class CollisionRecordList Declaration
\*---------------------------------------------------------------------------*/
-template<class Type>
+template<class PairType, class WallType>
class CollisionRecordList
-:
- public DynamicList<CollisionRecord<Type> >
{
+ // Private data
+
+ //- List of active pair collisions
+ DynamicList<PairCollisionRecord<PairType> > pairRecords_;
+
+ //- List of active wall collisions
+ DynamicList<WallCollisionRecord<WallType> > wallRecords_;
public:
@@ -72,19 +103,66 @@ public:
// Member Functions
//- Enquires if the proc and id pair of the other particle are
- // present in the records. If so, return access to the
- // collisionData and mark the CollisionRecord as accessed this
- // step, if not, create the record and return access to it.
- CollisionRecord<Type>& matchRecord
+ // present in the records. If so, return non-const access to
+ // the PairCollisionRecord (hence the data) and mark the
+ // PairCollisionRecord as accessed this step, if not, create
+ // the record and return access to it.
+ PairCollisionRecord<PairType>& matchPairRecord
(
label origProcOfOther,
label origIdOfOther
);
+ //- Enquires if the position of wall impact relative to the
+ // particle centre is present in the records. If so, return
+ // access to the WallCollisionRecord (hence the data) and
+ // mark the WallCollisionRecord as accesses this step, if
+ // not, create the record and return access to it.
+ WallCollisionRecord<WallType>& matchWallRecord
+ (
+ const vector& pRel,
+ scalar radius
+ );
+
//- Update the collision records, deleting any records not
// marked as having been accessed, then mark all records as
// not accessed ready for the next evaluation
void update();
+
+
+ // Member Operators
+
+ void operator=(const CollisionRecordList&);
+
+
+ // Friend Operators
+
+ friend bool operator== <PairType, WallType>
+ (
+ const CollisionRecordList<PairType, WallType>&,
+ const CollisionRecordList<PairType, WallType>&
+ );
+
+ friend bool operator!= <PairType, WallType>
+ (
+ const CollisionRecordList<PairType, WallType>&,
+ const CollisionRecordList<PairType, WallType>&
+ );
+
+
+ // IOstream Operators
+
+ friend Istream& operator>> <PairType, WallType>
+ (
+ Istream&,
+ CollisionRecordList<PairType, WallType>&
+ );
+
+ friend Ostream& operator<< <PairType, WallType>
+ (
+ Ostream&,
+ const CollisionRecordList<PairType, WallType>&
+ );
};
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
similarity index 77%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
index 8ccc72505483ec31d7fb3b4984e268f526d1e63c..0357d15c5dd0ca271e6e4d69b1becbd325ab2f60 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
@@ -23,12 +23,12 @@ License
\*---------------------------------------------------------------------------*/
-#include "CollisionRecord.H"
+#include "PairCollisionRecord.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-Foam::CollisionRecord<Type>::CollisionRecord()
+Foam::PairCollisionRecord<Type>::PairCollisionRecord()
:
origProcOfOther_(-VGREAT),
origIdOfOther_(-VGREAT),
@@ -37,7 +37,7 @@ Foam::CollisionRecord<Type>::CollisionRecord()
template<class Type>
-Foam::CollisionRecord<Type>::CollisionRecord
+Foam::PairCollisionRecord<Type>::PairCollisionRecord
(
label origProcOfOther,
label origIdOfOther,
@@ -51,33 +51,39 @@ Foam::CollisionRecord<Type>::CollisionRecord
template<class Type>
-Foam::CollisionRecord<Type>::CollisionRecord(const CollisionRecord<Type>& cR)
+Foam::PairCollisionRecord<Type>::PairCollisionRecord
+(
+ const PairCollisionRecord<Type>& pCR
+)
:
- origProcOfOther_(cR.origProcOfOther() + 1),
- origIdOfOther_(cR.origIdOfOther_),
- data_(cR.data_)
+ origProcOfOther_(pCR.origProcOfOther() + 1),
+ origIdOfOther_(pCR.origIdOfOther_),
+ data_(pCR.data_)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class Type>
-Foam::CollisionRecord<Type>::~CollisionRecord()
+Foam::PairCollisionRecord<Type>::~PairCollisionRecord()
{}
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
template<class Type>
-void Foam::CollisionRecord<Type>::operator=(const CollisionRecord<Type>& rhs)
+void Foam::PairCollisionRecord<Type>::operator=
+(
+ const PairCollisionRecord<Type>& rhs
+)
{
// Check for assignment to self
if (this == &rhs)
{
FatalErrorIn
(
- "Foam::CollisionRecord<Type>::operator="
- "(const Foam::CollisionRecord<Type>&)"
+ "Foam::PairCollisionRecord<Type>::operator="
+ "(const Foam::PairCollisionRecord<Type>&)"
)
<< "Attempted assignment to self"
<< abort(FatalError);
@@ -91,7 +97,7 @@ void Foam::CollisionRecord<Type>::operator=(const CollisionRecord<Type>& rhs)
// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
-#include "CollisionRecordIO.C"
+#include "PairCollisionRecordIO.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
similarity index 80%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
index de226c88e6b9ad3fbff924670e473d36d23a83bf..a14b645fb4617aec63176957f8bdd52ef1f35345 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::CollisionRecord
+ Foam::PairCollisionRecord
Description
@@ -35,14 +35,14 @@ Description
positive means that it has.
SourceFiles
- CollisionRecordI.H
- CollisionRecord.C
- CollisionRecordIO.C
+ PairCollisionRecordI.H
+ PairCollisionRecord.C
+ PairCollisionRecordIO.C
\*---------------------------------------------------------------------------*/
-#ifndef CollisionRecord_H
-#define CollisionRecord_H
+#ifndef PairCollisionRecord_H
+#define PairCollisionRecord_H
#include "label.H"
#include "vector.H"
@@ -54,35 +54,35 @@ namespace Foam
// Forward declaration of friend functions and operators
template<class Type>
-class CollisionRecord;
+class PairCollisionRecord;
template<class Type>
inline bool operator==
(
- const CollisionRecord<Type>&,
- const CollisionRecord<Type>&
+ const PairCollisionRecord<Type>&,
+ const PairCollisionRecord<Type>&
);
template<class Type>
inline bool operator!=
(
- const CollisionRecord<Type>&,
- const CollisionRecord<Type>&
+ const PairCollisionRecord<Type>&,
+ const PairCollisionRecord<Type>&
);
template<class Type>
-Istream& operator>>(Istream&, CollisionRecord<Type>&);
+Istream& operator>>(Istream&, PairCollisionRecord<Type>&);
template<class Type>
-Ostream& operator<<(Ostream&, const CollisionRecord<Type>&);
+Ostream& operator<<(Ostream&, const PairCollisionRecord<Type>&);
/*---------------------------------------------------------------------------*\
- Class CollisionRecord Declaration
+ Class PairCollisionRecord Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
-class CollisionRecord
+class PairCollisionRecord
{
// Private data
@@ -103,10 +103,10 @@ public:
// Constructors
//- Construct null
- CollisionRecord();
+ PairCollisionRecord();
//- Construct from components
- CollisionRecord
+ PairCollisionRecord
(
label origProcOfOther,
label origIdOfOther,
@@ -114,14 +114,14 @@ public:
);
//- Construct from Istream
- CollisionRecord(Istream&);
+ PairCollisionRecord(Istream&);
//- Construct as copy
- CollisionRecord(const CollisionRecord&);
+ PairCollisionRecord(const PairCollisionRecord&);
//- Destructor
- ~CollisionRecord();
+ ~PairCollisionRecord();
// Member Functions
@@ -165,21 +165,21 @@ public:
// Member Operators
- void operator=(const CollisionRecord&);
+ void operator=(const PairCollisionRecord&);
// Friend Operators
friend bool operator== <Type>
(
- const CollisionRecord<Type>&,
- const CollisionRecord<Type>&
+ const PairCollisionRecord<Type>&,
+ const PairCollisionRecord<Type>&
);
friend bool operator!= <Type>
(
- const CollisionRecord<Type>&,
- const CollisionRecord<Type>&
+ const PairCollisionRecord<Type>&,
+ const PairCollisionRecord<Type>&
);
@@ -188,13 +188,13 @@ public:
friend Istream& operator>> <Type>
(
Istream&,
- CollisionRecord<Type>&
+ PairCollisionRecord<Type>&
);
friend Ostream& operator<< <Type>
(
Ostream&,
- const CollisionRecord<Type>&
+ const PairCollisionRecord<Type>&
);
};
@@ -205,12 +205,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "CollisionRecordI.H"
+#include "PairCollisionRecordI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "CollisionRecord.C"
+# include "PairCollisionRecord.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
similarity index 77%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
index 33d60305ce4d9aa1e678ad5e6b694d5b4c9dd6e3..4c0d3abc879ba1fd06f821e5ac900e13d42f2daa 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H
@@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-inline bool Foam::CollisionRecord<Type>::match
+inline bool Foam::PairCollisionRecord<Type>::match
(
label queryOrigProcOfOther,
label queryOrigIdOfOther
@@ -41,14 +41,14 @@ inline bool Foam::CollisionRecord<Type>::match
template<class Type>
-inline Foam::label Foam::CollisionRecord<Type>::origProcOfOther() const
+inline Foam::label Foam::PairCollisionRecord<Type>::origProcOfOther() const
{
return mag(origProcOfOther_) - 1;
}
template<class Type>
-inline Foam::label Foam::CollisionRecord<Type>::origIdOfOther() const
+inline Foam::label Foam::PairCollisionRecord<Type>::origIdOfOther() const
{
return origIdOfOther_;
}
@@ -56,35 +56,35 @@ inline Foam::label Foam::CollisionRecord<Type>::origIdOfOther() const
template<class Type>
inline const Type&
-Foam::CollisionRecord<Type>::collisionData() const
+Foam::PairCollisionRecord<Type>::collisionData() const
{
return data_;
}
template<class Type>
-inline Type& Foam::CollisionRecord<Type>::collisionData()
+inline Type& Foam::PairCollisionRecord<Type>::collisionData()
{
return data_;
}
template<class Type>
-inline bool Foam::CollisionRecord<Type>::accessed() const
+inline bool Foam::PairCollisionRecord<Type>::accessed() const
{
return pos(origProcOfOther_);
}
template<class Type>
-inline void Foam::CollisionRecord<Type>::setAccessed()
+inline void Foam::PairCollisionRecord<Type>::setAccessed()
{
origProcOfOther_ = origProcOfOther() + 1;
}
template<class Type>
-inline void Foam::CollisionRecord<Type>::setUnaccessed()
+inline void Foam::PairCollisionRecord<Type>::setUnaccessed()
{
origProcOfOther_ = -(origProcOfOther() + 1);
}
@@ -95,8 +95,8 @@ inline void Foam::CollisionRecord<Type>::setUnaccessed()
template<class Type>
inline bool Foam::operator==
(
- const CollisionRecord<Type>& a,
- const CollisionRecord<Type>& b
+ const PairCollisionRecord<Type>& a,
+ const PairCollisionRecord<Type>& b
)
{
return
@@ -107,11 +107,12 @@ inline bool Foam::operator==
);
}
+
template<class Type>
inline bool Foam::operator!=
(
- const CollisionRecord<Type>& a,
- const CollisionRecord<Type>& b
+ const PairCollisionRecord<Type>& a,
+ const PairCollisionRecord<Type>& b
)
{
return !(a == b);
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
similarity index 72%
rename from src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
index e90611318bac36375c65be1e26a9b8daea694887..4c1de522f751fb785c6f29e6d0de2902a4c4ff6a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C
@@ -23,35 +23,38 @@ License
\*---------------------------------------------------------------------------*/
-#include "CollisionRecord.H"
+#include "PairCollisionRecord.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-Foam::CollisionRecord<Type>::CollisionRecord(Istream& is)
+Foam::PairCollisionRecord<Type>::PairCollisionRecord(Istream& is)
:
origProcOfOther_(readLabel(is)),
origIdOfOther_(readLabel(is)),
data_(is)
{
// Check state of Istream
- is.check("Foam::CollisionRecord<Type>::CollisionRecord(Foam::Istream&)");
+ is.check
+ (
+ "Foam::PairCollisionRecord<Type>::PairCollisionRecord(Foam::Istream&)"
+ );
}
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type>
-Foam::Istream& Foam::operator>>(Istream& is, CollisionRecord<Type>& cR)
+Foam::Istream& Foam::operator>>(Istream& is, PairCollisionRecord<Type>& pCR)
{
- is >> cR.origProcOfOther_ >> cR.origIdOfOther_ >> cR.data_;
+ is >> pCR.origProcOfOther_ >> pCR.origIdOfOther_ >> pCR.data_;
// Check state of Istream
is.check
(
"Foam::Istream&"
- "Foam::operator>>(Foam::Istream&, Foam::CollisionRecord<Type>&)"
+ "Foam::operator>>(Foam::Istream&, Foam::PairCollisionRecord<Type>&)"
);
return is;
@@ -59,17 +62,21 @@ Foam::Istream& Foam::operator>>(Istream& is, CollisionRecord<Type>& cR)
template<class Type>
-Foam::Ostream& Foam::operator<<(Ostream& os, const CollisionRecord<Type>& cR)
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const PairCollisionRecord<Type>& pCR
+)
{
- os << cR.origProcOfOther_
- << token::SPACE << cR.origIdOfOther_
- << token::SPACE << cR.data_;
+ os << pCR.origProcOfOther_
+ << token::SPACE << pCR.origIdOfOther_
+ << token::SPACE << pCR.data_;
// Check state of Ostream
os.check
(
"Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
- "const Foam::CollisionRecord<Type>&)"
+ "const Foam::PairCollisionRecord<Type>&)"
);
return os;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
new file mode 100644
index 0000000000000000000000000000000000000000..d3141e660df7795eaca443f8cb042c848fe4683e
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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 "WallCollisionRecord.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::WallCollisionRecord<Type>::WallCollisionRecord()
+:
+ accessed_(false),
+ pRel_(),
+ data_(pTraits<Type>::zero)
+{}
+
+
+template<class Type>
+Foam::WallCollisionRecord<Type>::WallCollisionRecord
+(
+ const vector& pRel,
+ const Type& data
+)
+:
+ accessed_(true),
+ pRel_(pRel),
+ data_(data)
+{}
+
+
+template<class Type>
+Foam::WallCollisionRecord<Type>::WallCollisionRecord
+(
+ const WallCollisionRecord<Type>& wCR
+)
+:
+ accessed_(wCR.accessed_),
+ pRel_(wCR.pRel_),
+ data_(wCR.data_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::WallCollisionRecord<Type>::~WallCollisionRecord()
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::WallCollisionRecord<Type>::operator=
+(
+ const WallCollisionRecord<Type>& rhs
+)
+{
+ // Check for assignment to self
+ if (this == &rhs)
+ {
+ FatalErrorIn
+ (
+ "Foam::WallCollisionRecord<Type>::operator="
+ "(const Foam::WallCollisionRecord<Type>&)"
+ )
+ << "Attempted assignment to self"
+ << abort(FatalError);
+ }
+
+ accessed_ = rhs.accessed_;
+ pRel_ = rhs.pRel_;
+ data_ = rhs.data_;
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+
+#include "WallCollisionRecordIO.C"
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
new file mode 100644
index 0000000000000000000000000000000000000000..33f021fc7c542deb715e82f16fba01dc5a20640e
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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::WallCollisionRecord
+
+Description
+ Record of a collision between the particle holding the record and
+ a wall face at the position relative to the centre of the particle.
+
+SourceFiles
+ WallCollisionRecordI.H
+ WallCollisionRecord.C
+ WallCollisionRecordIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef WallCollisionRecord_H
+#define WallCollisionRecord_H
+
+#include "vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+template<class Type>
+class WallCollisionRecord;
+
+template<class Type>
+inline bool operator==
+(
+ const WallCollisionRecord<Type>&,
+ const WallCollisionRecord<Type>&
+);
+
+template<class Type>
+inline bool operator!=
+(
+ const WallCollisionRecord<Type>&,
+ const WallCollisionRecord<Type>&
+);
+
+template<class Type>
+Istream& operator>>(Istream&, WallCollisionRecord<Type>&);
+
+template<class Type>
+Ostream& operator<<(Ostream&, const WallCollisionRecord<Type>&);
+
+
+/*---------------------------------------------------------------------------*\
+ Class WallCollisionRecord Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class WallCollisionRecord
+{
+ // Private data
+
+ // //- Recording whether or not this record has been accessed
+ bool accessed_;
+
+ //- The position of wall impact relative to the cell centre
+ vector pRel_;
+
+ //- Collision data, stored as if the storing particle was the
+ // first particle (particle A) in the collision.
+ Type data_;
+
+
+public:
+
+ // Constructors
+
+ //- Construct null
+ WallCollisionRecord();
+
+ //- Construct from components
+ WallCollisionRecord
+ (
+ const vector& pRel,
+ const Type& data = pTraits<Type>::zero
+ );
+
+ //- Construct from Istream
+ WallCollisionRecord(Istream&);
+
+ //- Construct as copy
+ WallCollisionRecord(const WallCollisionRecord&);
+
+
+ //- Destructor
+ ~WallCollisionRecord();
+
+
+ // Member Functions
+
+
+ // Access
+
+ //- Return the pRel data
+ inline const vector& pRel() const;
+
+ //- Return access to the collision data
+ inline const Type& collisionData() const;
+
+ //- Return access to the collision data
+ inline Type& collisionData();
+
+
+ // Check
+
+ inline bool match(const vector& pRel, scalar radius);
+
+ //- Return the accessed status of the record
+ inline bool accessed() const;
+
+
+ // Edit
+
+ //- Set the accessed property of the record to accessed
+ inline void setAccessed();
+
+ //- Set the accessed property of the record to unaccessed
+ inline void setUnaccessed();
+
+
+ // Member Operators
+
+ void operator=(const WallCollisionRecord&);
+
+
+ // Friend Operators
+
+ friend bool operator== <Type>
+ (
+ const WallCollisionRecord<Type>&,
+ const WallCollisionRecord<Type>&
+ );
+
+ friend bool operator!= <Type>
+ (
+ const WallCollisionRecord<Type>&,
+ const WallCollisionRecord<Type>&
+ );
+
+
+ // IOstream Operators
+
+ friend Istream& operator>> <Type>
+ (
+ Istream&,
+ WallCollisionRecord<Type>&
+ );
+
+ friend Ostream& operator<< <Type>
+ (
+ Ostream&,
+ const WallCollisionRecord<Type>&
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "WallCollisionRecordI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "WallCollisionRecord.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
new file mode 100644
index 0000000000000000000000000000000000000000..1a9a9feb0b99e8d67cddcfa407dbd2e25ccf82a6
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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 Type>
+inline bool Foam::WallCollisionRecord<Type>::match
+(
+ const vector& pRel,
+ scalar radius
+)
+{
+ scalar magpRel_= mag(pRel_);
+
+ scalar magpRel = mag(pRel);
+
+ // Using the new data as the acceptance criterion
+ scalar cosAcceptanceAngle = magpRel/radius;
+
+ if (cosAcceptanceAngle > 1.0)
+ {
+ Info<< "pRel_ " << pRel_ << " " << magpRel_ << nl
+ << "pRel " << pRel << " " << magpRel << nl
+ << "unit vector dot product " << (pRel & pRel_)/(magpRel_*magpRel)
+ << nl << "cosAcceptanceAngle " << cosAcceptanceAngle
+ << endl;
+
+ FatalErrorIn
+ (
+ "inline bool Foam::WallCollisionRecord<Type>::match"
+ "("
+ "const vector& pRel,"
+ "scalar radius"
+ ") const"
+ )
+ << "Problem with matching WallCollisionRecord." << nl
+ << "The given radius, " << radius << ", is smaller than distance "
+ << "to the relative position of the WallInteractionSite, "
+ << magpRel << nl
+ << abort(FatalError);
+ }
+
+ // Are the test and recorded pRel (relative position vectors)
+ // aligned to within the calculated tolerance?
+ bool matched = (pRel & pRel_)/(magpRel_*magpRel) > cosAcceptanceAngle;
+
+ if (matched)
+ {
+ pRel_ = pRel;
+ }
+
+ return matched;
+}
+
+
+template<class Type>
+inline const Type&
+Foam::WallCollisionRecord<Type>::collisionData() const
+{
+ return data_;
+}
+
+
+template<class Type>
+inline Type& Foam::WallCollisionRecord<Type>::collisionData()
+{
+ return data_;
+}
+
+
+template<class Type>
+inline bool Foam::WallCollisionRecord<Type>::accessed() const
+{
+ return accessed_;
+}
+
+
+template<class Type>
+inline void Foam::WallCollisionRecord<Type>::setAccessed()
+{
+ accessed_ = true;
+}
+
+
+template<class Type>
+inline void Foam::WallCollisionRecord<Type>::setUnaccessed()
+{
+ accessed_ = false;
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+template<class Type>
+inline bool Foam::operator==
+(
+ const WallCollisionRecord<Type>& a,
+ const WallCollisionRecord<Type>& b
+)
+{
+ return
+ (
+ a.accessed_ == b.accessed_
+ && a.pRel_ == b.pRel_
+ && a.data_ == b.data_
+ );
+}
+
+
+template<class Type>
+inline bool Foam::operator!=
+(
+ const WallCollisionRecord<Type>& a,
+ const WallCollisionRecord<Type>& b
+)
+{
+ return !(a == b);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
new file mode 100644
index 0000000000000000000000000000000000000000..afc35b5b09d9af62a3f318f33079e12bd68eca1d
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-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 "WallCollisionRecord.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::WallCollisionRecord<Type>::WallCollisionRecord(Istream& is)
+:
+ accessed_(is),
+ pRel_(is),
+ data_(is)
+{
+ // Check state of Istream
+ is.check
+ (
+ "Foam::WallCollisionRecord<Type>::WallCollisionRecord(Foam::Istream&)"
+ );
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Istream& Foam::operator>>(Istream& is, WallCollisionRecord<Type>& wCR)
+{
+ is >> wCR.accessed_ >> wCR.pRel_ >> wCR.data_;
+
+ // Check state of Istream
+ is.check
+ (
+ "Foam::Istream&"
+ "Foam::operator>>(Foam::Istream&, Foam::WallCollisionRecord<Type>&)"
+ );
+
+ return is;
+}
+
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const WallCollisionRecord<Type>& wCR
+)
+{
+ os << wCR.accessed_
+ << token::SPACE << wCR.pRel_
+ << token::SPACE << wCR.data_;
+
+ // Check state of Ostream
+ os.check
+ (
+ "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+ "const Foam::WallCollisionRecord<Type>&)"
+ );
+
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 31c274ea38d9fd0372992665f3b7edd61d975890..fc34e3b1614498aa2c19a7f3559d23bfbaf4d943 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -162,6 +162,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
// Momentum source due to particle forces
const vector FCoupled = mass*td.cloud().forces().calcCoupled
(
+ this->position(),
cellI,
dt,
rhoc_,
@@ -173,6 +174,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
const vector FNonCoupled = mass*td.cloud().forces().calcNonCoupled
(
+ this->position(),
cellI,
dt,
rhoc_,
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 4dd608c5bb236e4fd28137a281cbb4143e80755b..9b8691c534f2eaaa9709e786040442655b452882 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -182,8 +182,8 @@ public:
// Constructors
- //- Construct from components
- inline trackData
+ //- Construct from components
+ inline trackData
(
KinematicCloud<ParcelType>& cloud,
const constantProperties& constProps,
@@ -268,7 +268,7 @@ protected:
vector UTurb_;
//- Particle collision records
- CollisionRecordList<vector> collisionRecords_;
+ CollisionRecordList<vector, vector> collisionRecords_;
// Cell-based quantities
@@ -400,7 +400,8 @@ public:
inline const vector& UTurb() const;
//- Return const access to the collision records
- inline const CollisionRecordList<vector>& collisionRecords() const;
+ inline const CollisionRecordList<vector, vector>&
+ collisionRecords() const;
// Edit
@@ -439,7 +440,7 @@ public:
inline vector& UTurb();
//- Return access to collision records
- inline CollisionRecordList<vector>& collisionRecords();
+ inline CollisionRecordList<vector, vector>& collisionRecords();
// Helper functions
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 7f531a05cfd7b0598570694b43ea288eb779e676..e551c38b9e5c3b5b357f3592ca999c95203b881e 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>&
+inline const Foam::CollisionRecordList<Foam::vector, Foam::vector>&
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>&
+inline Foam::CollisionRecordList<Foam::vector, Foam::vector>&
Foam::KinematicParcel<ParcelType>::collisionRecords()
{
return collisionRecords_;
@@ -439,14 +439,23 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
const vector&
) const
{
- // Do not use a wall impact distance to allow proper multiple face
- // collisions. In a twisted mesh the particle can be within range
- // of a wall but not in the cell attached to a wall face, hence
- // miss the interaction.
+ const KinematicCloud<ParcelType>& c =
+ dynamic_cast<const KinematicCloud<ParcelType>&>(this->cloud());
- return 0.0;
+ if (c.collision().controlsWallInteraction())
+ {
+ // Do not use a wall impact distance if the collision model
+ // controls wall interactions to allow proper multiple face
+ // collisions. In a twisted mesh the particle can be within
+ // range of a wall but not in the cell attached to a wall
+ // face, hence miss the interaction.
- // return 0.5*d_;
+ return 0.0;
+ }
+ else
+ {
+ return 0.5*d_;
+ }
}
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
index 5d446037fe6b79a31eb33e8cd47ba965d7f68fe6..6591d2b8d44c7b38aef6beedb8d55d88fcb5676d 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.C
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -30,6 +30,24 @@ License
#include "mathematicalConstants.H"
#include "electromagneticConstants.H"
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void Foam::particleForces::deleteFields()
+{
+ if (gradUPtr_)
+ {
+ delete gradUPtr_;
+ gradUPtr_ = NULL;
+ }
+
+ if (HdotGradHInterPtr_)
+ {
+ delete HdotGradHInterPtr_;
+ HdotGradHInterPtr_ = NULL;
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::particleForces::particleForces
@@ -43,6 +61,7 @@ Foam::particleForces::particleForces
dict_(dict.subDict("particleForces")),
g_(g),
gradUPtr_(NULL),
+ HdotGradHInterPtr_(NULL),
gravity_(dict_.lookup("gravity")),
virtualMass_(dict_.lookup("virtualMass")),
Cvm_(0.0),
@@ -70,6 +89,7 @@ Foam::particleForces::particleForces(const particleForces& f)
dict_(f.dict_),
g_(f.g_),
gradUPtr_(f.gradUPtr_),
+ HdotGradHInterPtr_(f.HdotGradHInterPtr_),
gravity_(f.gravity_),
virtualMass_(f.virtualMass_),
Cvm_(f.Cvm_),
@@ -85,7 +105,7 @@ Foam::particleForces::particleForces(const particleForces& f)
Foam::particleForces::~particleForces()
{
- cacheFields(false);
+ deleteFields();
}
@@ -151,26 +171,46 @@ const Foam::word& Foam::particleForces::HdotGradHName() const
}
-void Foam::particleForces::cacheFields(const bool store)
+void Foam::particleForces::cacheFields
+(
+ const bool store,
+ const dictionary& interpolationSchemes
+)
{
- if (store && pressureGradient_)
+ if (store)
{
- const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
- gradUPtr_ = fvc::grad(U).ptr();
+ if (pressureGradient_)
+ {
+ const volVectorField& U =
+ mesh_.lookupObject<volVectorField>(UName_);
+
+ gradUPtr_ = fvc::grad(U).ptr();
+ }
+
+ if (paramagnetic_)
+ {
+ const volVectorField& HdotGradH = mesh_.lookupObject<volVectorField>
+ (
+ HdotGradHName_
+ );
+
+ HdotGradHInterPtr_ = interpolation<vector>::New
+ (
+ interpolationSchemes,
+ HdotGradH
+ ).ptr();
+ }
}
else
{
- if (gradUPtr_)
- {
- delete gradUPtr_;
- gradUPtr_ = NULL;
- }
+ deleteFields();
}
}
Foam::vector Foam::particleForces::calcCoupled
(
+ const vector& position,
const label cellI,
const scalar dt,
const scalar rhoc,
@@ -205,6 +245,7 @@ Foam::vector Foam::particleForces::calcCoupled
Foam::vector Foam::particleForces::calcNonCoupled
(
+ const vector& position,
const label cellI,
const scalar dt,
const scalar rhoc,
@@ -226,15 +267,12 @@ Foam::vector Foam::particleForces::calcNonCoupled
if (paramagnetic_)
{
- const volVectorField& HdotGradH = mesh_.lookupObject<volVectorField>
- (
- HdotGradHName_
- );
+ const interpolation<vector>& HdotGradHInter = *HdotGradHInterPtr_;
accelTot +=
3.0*constant::electromagnetic::mu0.value()/rho
*magneticSusceptibility_/(magneticSusceptibility_ + 3)
- *HdotGradH[cellI];
+ *HdotGradHInter.interpolate(position, cellI);
// force is:
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
index 90c5ecafa43101deb433ddee8a3389fa04e9e41a..8c76b1f773dfbba1d90f146878e649468b36abcd 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.H
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -40,6 +40,7 @@ SourceFiles
#include "Switch.H"
#include "vector.H"
#include "volFieldsFwd.H"
+#include "interpolation.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,6 +70,9 @@ class particleForces
//- Velocity gradient field
const volTensorField* gradUPtr_;
+ //- HdotGradH interpolator
+ const interpolation<vector>* HdotGradHInterPtr_;
+
// Forces to include in particle motion evaluation
@@ -101,6 +105,12 @@ class particleForces
const word HdotGradHName_;
+ // Private Member Functions
+
+ //- Delete cached carrier fields
+ void deleteFields();
+
+
public:
// Constructors
@@ -159,11 +169,16 @@ public:
// Evaluation
//- Cache carrier fields
- void cacheFields(const bool store);
+ void cacheFields
+ (
+ const bool store,
+ const dictionary& interpolationSchemes
+ );
//- Calculate action/reaction forces between carrier and particles
vector calcCoupled
(
+ const vector& position,
const label cellI,
const scalar dt,
const scalar rhoc,
@@ -176,6 +191,7 @@ public:
//- Calculate external forces applied to the particles
vector calcNonCoupled
(
+ const vector& position,
const label cellI,
const scalar dt,
const scalar rhoc,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index 3420f8d9e5b2922170c051e9371db1616aac71b0..cbce0ee43acc85e130ea867c751128a69a7be97f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -141,6 +141,10 @@ public:
//- Flag to indicate whether model activates injection model
virtual bool active() const = 0;
+ //- Indicates whether model determines wall collisions or not,
+ // used to determine what value to use for wallImpactDistance
+ virtual bool controlsWallInteraction() const = 0;
+
// Collision function
virtual void collide() = 0;
};
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
index f99edcd47f47be531341441632f4cc6c6b032635..993fe53b7041abab78c8238ea2e013123dfa5bc1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
@@ -61,6 +61,13 @@ bool Foam::NoCollision<CloudType>::active() const
}
+template<class CloudType>
+bool Foam::NoCollision<CloudType>::controlsWallInteraction() const
+{
+ return false;
+}
+
+
template<class CloudType>
void Foam::NoCollision<CloudType>::collide()
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
index 5806806892e1e40186a2c6b4974498df2a59bc79..e0c0ffbc6b5b9400fd4f87aae33804fd47484102 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
@@ -82,6 +82,10 @@ public:
//- Flag to indicate whether model activates injection model
virtual bool active() const;
+ //- Indicates whether model determines wall collisions or not,
+ // used to determine what value to use for wallImpactDistance
+ virtual bool controlsWallInteraction() const;
+
// Collision function
virtual void collide();
};
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 967acf06401671c9cb4c47dd9e560f9d5ccc01d3..e1e1587c95dc9afae113bd90d7129d9f2eb85111 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -175,13 +175,20 @@ void Foam::PairCollision<CloudType>::wallInteraction()
const labelListList directWallFaces = il_.dwfil();
+ const labelList& patchID = mesh.boundaryMesh().patchID();
+
+ const volVectorField& U = mesh.lookupObject<volVectorField>(il_.UName());
+
// Storage for the wall interaction sites
- DynamicList<point> flatSites;
+ DynamicList<point> flatSitePoints;
DynamicList<scalar> flatSiteExclusionDistancesSqr;
- DynamicList<point> otherSites;
+ DynamicList<WallSiteData<vector> > flatSiteData;
+ DynamicList<point> otherSitePoints;
DynamicList<scalar> otherSiteDistances;
- DynamicList<point> sharpSites;
+ DynamicList<WallSiteData<vector> > otherSiteData;
+ DynamicList<point> sharpSitePoints;
DynamicList<scalar> sharpSiteExclusionDistancesSqr;
+ DynamicList<WallSiteData<vector> > sharpSiteData;
forAll(dil, realCellI)
{
@@ -191,19 +198,22 @@ void Foam::PairCollision<CloudType>::wallInteraction()
// Loop over all Parcels in cell
forAll(cellOccupancy_[realCellI], cellParticleI)
{
- flatSites.clear();
+ flatSitePoints.clear();
flatSiteExclusionDistancesSqr.clear();
- otherSites.clear();
+ flatSiteData.clear();
+ otherSitePoints.clear();
otherSiteDistances.clear();
- sharpSites.clear();
+ otherSiteData.clear();
+ sharpSitePoints.clear();
sharpSiteExclusionDistancesSqr.clear();
+ sharpSiteData.clear();
typename CloudType::parcelType& p =
- *cellOccupancy_[realCellI][cellParticleI];
+ *cellOccupancy_[realCellI][cellParticleI];
const point& pos = p.position();
- scalar r = p.d()/2;
+ scalar r = wallModel_->pREff(p);
// real wallFace interactions
@@ -229,6 +239,18 @@ void Foam::PairCollision<CloudType>::wallInteraction()
scalar normalAlignment = normal & pW/mag(pW);
+ // Find the patchIndex and wallData for WallSiteData object
+ label patchI = patchID[realFaceI - mesh.nInternalFaces()];
+
+ label patchFaceI =
+ realFaceI - mesh.boundaryMesh()[patchI].start();
+
+ WallSiteData<vector> wSD
+ (
+ patchI,
+ U.boundaryField()[patchI][patchFaceI]
+ );
+
if (normalAlignment > cosPhiMinFlatWall)
{
// Guard against a flat interaction being
@@ -239,25 +261,29 @@ void Foam::PairCollision<CloudType>::wallInteraction()
(
!duplicatePointInList
(
- flatSites,
+ flatSitePoints,
nearPt,
sqr(r*flatWallDuplicateExclusion)
)
)
{
- flatSites.append(nearPt);
+ flatSitePoints.append(nearPt);
flatSiteExclusionDistancesSqr.append
(
sqr(r) - sqr(nearest.distance())
);
+
+ flatSiteData.append(wSD);
}
}
else
{
- otherSites.append(nearPt);
+ otherSitePoints.append(nearPt);
otherSiteDistances.append(nearest.distance());
+
+ otherSiteData.append(wSD);
}
}
}
@@ -269,8 +295,10 @@ void Foam::PairCollision<CloudType>::wallInteraction()
forAll(cellRefWallFaces, rWFI)
{
+ label refWallFaceI = cellRefWallFaces[rWFI];
+
const referredWallFace& rwf =
- il_.referredWallFaces()[cellRefWallFaces[rWFI]];
+ il_.referredWallFaces()[refWallFaceI];
const pointField& pts = rwf.points();
@@ -288,6 +316,14 @@ void Foam::PairCollision<CloudType>::wallInteraction()
scalar normalAlignment = normal & pW/mag(pW);
+ // Find the patchIndex and wallData for WallSiteData object
+
+ WallSiteData<vector> wSD
+ (
+ rwf.patchIndex(),
+ il_.referredWallData()[refWallFaceI]
+ );
+
if (normalAlignment > cosPhiMinFlatWall)
{
// Guard against a flat interaction being
@@ -298,25 +334,29 @@ void Foam::PairCollision<CloudType>::wallInteraction()
(
!duplicatePointInList
(
- flatSites,
+ flatSitePoints,
nearPt,
sqr(r*flatWallDuplicateExclusion)
)
)
{
- flatSites.append(nearPt);
+ flatSitePoints.append(nearPt);
flatSiteExclusionDistancesSqr.append
(
sqr(r) - sqr(nearest.distance())
);
+
+ flatSiteData.append(wSD);
}
}
else
{
- otherSites.append(nearPt);
+ otherSitePoints.append(nearPt);
otherSiteDistances.append(nearest.distance());
+
+ otherSiteData.append(wSD);
}
}
}
@@ -338,13 +378,13 @@ void Foam::PairCollision<CloudType>::wallInteraction()
{
label orderedIndex = sortedOtherSiteIndices[siteI];
- const point& otherPt = otherSites[orderedIndex];
+ const point& otherPt = otherSitePoints[orderedIndex];
if
(
!duplicatePointInList
(
- flatSites,
+ flatSitePoints,
otherPt,
flatSiteExclusionDistancesSqr
)
@@ -357,23 +397,32 @@ void Foam::PairCollision<CloudType>::wallInteraction()
(
!duplicatePointInList
(
- sharpSites,
+ sharpSitePoints,
otherPt,
sharpSiteExclusionDistancesSqr
)
)
{
- sharpSites.append(otherPt);
+ sharpSitePoints.append(otherPt);
sharpSiteExclusionDistancesSqr.append
(
sqr(r) - sqr(otherSiteDistances[orderedIndex])
);
+
+ sharpSiteData.append(otherSiteData[orderedIndex]);
}
}
}
- evaluateWall(p, flatSites, sharpSites);
+ evaluateWall
+ (
+ p,
+ flatSitePoints,
+ flatSiteData,
+ sharpSitePoints,
+ sharpSiteData
+ );
}
}
}
@@ -463,11 +512,20 @@ template<class CloudType>
void Foam::PairCollision<CloudType>::evaluateWall
(
typename CloudType::parcelType& p,
- const List<point>& flatSites,
- const List<point>& sharpSites
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
) const
{
- wallModel_->evaluateWall(p, flatSites, sharpSites);
+ wallModel_->evaluateWall
+ (
+ p,
+ flatSitePoints,
+ flatSiteData,
+ sharpSitePoints,
+ sharpSiteData
+ );
}
@@ -502,7 +560,8 @@ Foam::PairCollision<CloudType>::PairCollision
(
owner.mesh(),
readScalar(this->coeffDict().lookup("maxInteractionDistance")),
- Switch(this->coeffDict().lookup("writeReferredParticleCloud"))
+ Switch(this->coeffDict().lookup("writeReferredParticleCloud")),
+ this->coeffDict().lookupOrDefault("UName", word("U"))
)
{}
@@ -552,6 +611,13 @@ bool Foam::PairCollision<CloudType>::active() const
}
+template<class CloudType>
+bool Foam::PairCollision<CloudType>::controlsWallInteraction() const
+{
+ return true;
+}
+
+
template<class CloudType>
void Foam::PairCollision<CloudType>::collide()
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index 8582db464e25d6d2df5395344e85694b5b49895e..8699d477cdd225f52000a58bd283e8a175a4defd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -36,6 +36,7 @@ SourceFiles
#include "CollisionModel.H"
#include "InteractionLists.H"
+#include "WallSiteData.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -137,8 +138,10 @@ class PairCollision
void evaluateWall
(
typename CloudType::parcelType& p,
- const List<point>& flatSites,
- const List<point>& sharpSites
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
) const;
@@ -171,6 +174,10 @@ public:
//- Flag to indicate whether model activates injection model
virtual bool active() const;
+ //- Indicates whether model determines wall collisions or not,
+ // used to determine what value to use for wallImpactDistance
+ virtual bool controlsWallInteraction() const;
+
// Collision function
virtual void collide();
};
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index 1b6d1e56be43bafb0a9b6f195e86e3ce4bde155a..b5b36fdb68b8e5542ea1d93d6c15e48fbf48f09e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -54,7 +54,7 @@ class PairModel
{
// Private data
- //- The cloud dictionary
+ //- The CollisionModel dictionary
const dictionary& dict_;
//- Reference to the owner cloud class
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 bbefa136cacb2661e18efa1a8ac3406c26ecd01c..54bf3ab659ec04ca140bead0ca87491b61fac246 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,13 +45,15 @@ void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
// Finding minimum diameter to avoid excessive arithmetic
- RMin = min(p.d(), RMin);
+ scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+
+ RMin = min(dEff, RMin);
rhoMax = max(p.rho(), rhoMax);
UMagMax = max
(
- mag(p.U()) + mag(p.omega())*p.d()/2,
+ mag(p.U()) + mag(p.omega())*dEff/2,
UMagMax
);
}
@@ -91,7 +93,8 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
(
this->coeffDict().lookup("collisionResolutionSteps")
)
- )
+ ),
+ volumeFactor_(this->dict().lookupOrDefault("volumeFactor", 1.0))
{
scalar nu = this->owner().constProps().poissonsRatio();
@@ -155,7 +158,11 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
{
vector r_AB = (pA.position() - pB.position());
- scalar normalOverlapMag = 0.5*(pA.d() + pB.d()) - mag(r_AB);
+ scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_);
+
+ scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_);
+
+ scalar normalOverlapMag = 0.5*(dAEff + dBEff) - mag(r_AB);
if (normalOverlapMag > 0)
{
@@ -166,7 +173,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
vector U_AB = pA.U() - pB.U();
// Effective radius
- scalar R = 0.5*pA.d()*pB.d()/(pA.d() + pB.d());
+ scalar R = 0.5*dAEff*dBEff/(dAEff + dBEff);
// Effective mass
scalar M = pA.mass()*pB.mass()/(pA.mass() + pB.mass());
@@ -185,26 +192,26 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
vector USlip_AB =
U_AB - (U_AB & rHat_AB)*rHat_AB
- + (pA.omega() ^ (pA.d()/2*-rHat_AB))
- - (pB.omega() ^ (pB.d()/2*rHat_AB));
+ + (pA.omega() ^ (dAEff/2*-rHat_AB))
+ - (pB.omega() ^ (dBEff/2*rHat_AB));
scalar deltaT = this->owner().mesh().time().deltaTValue();
vector& tangentialOverlap_AB =
- pA.collisionRecords().matchRecord
+ pA.collisionRecords().matchPairRecord
(
pB.origProc(),
pB.origId()
).collisionData();
vector& tangentialOverlap_BA =
- pB.collisionRecords().matchRecord
+ pB.collisionRecords().matchPairRecord
(
pA.origProc(),
pA.origId()
).collisionData();
- vector deltaTangentialOverlap_AB = USlip_AB * deltaT;
+ vector deltaTangentialOverlap_AB = USlip_AB*deltaT;
tangentialOverlap_AB += deltaTangentialOverlap_AB;
tangentialOverlap_BA += -deltaTangentialOverlap_AB;
@@ -215,7 +222,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
{
scalar kT = 8.0*sqrt(R*normalOverlapMag)*Gstar_;
- scalar& etaT = etaN;
+ scalar etaT = etaN;
// Tangential force
vector fT_AB;
@@ -233,16 +240,16 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
else
{
fT_AB =
- -kT*tangentialOverlapMag
- *tangentialOverlap_AB/tangentialOverlapMag
- - etaT*USlip_AB;
+ -kT*tangentialOverlapMag
+ *tangentialOverlap_AB/tangentialOverlapMag
+ - etaT*USlip_AB;
}
pA.f() += fT_AB;
pB.f() += -fT_AB;
- pA.torque() += (pA.d()/2*-rHat_AB) ^ fT_AB;
- pB.torque() += (pB.d()/2*rHat_AB) ^ -fT_AB;
+ pA.torque() += (dAEff/2*-rHat_AB) ^ fT_AB;
+ pB.torque() += (dBEff/2*rHat_AB) ^ -fT_AB;
}
}
}
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 819e9a835bf72a7f1d4a530d697ad04a5d03b1c8..58cd3850127eeb6239f1af3960d5b45373016118 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
@@ -33,7 +33,7 @@ Description
#define PairSpringSliderDashpot_H
#include "PairModel.H"
-#include "CollisionRecord.H"
+#include "CollisionRecordList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -74,6 +74,24 @@ class PairSpringSliderDashpot
// 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_;
+
// Private Member Functions
@@ -104,6 +122,12 @@ public:
// Member Functions
+ //- Return the volumeFactor
+ inline scalar volumeFactor() const
+ {
+ return volumeFactor_;
+ }
+
//- Whether the PairModel has a timestep limit that will
// require subCycling
virtual bool controlsTimestep() 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 7088c4df05116381982734d5155c62b37bb78700..31fde4e2991f3293e29e124f3e6f53453a7800da 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
@@ -54,7 +54,7 @@ class WallModel
{
// Private data
- //- The cloud dictionary
+ //- The CollisionModel dictionary
const dictionary& dict_;
//- Reference to the owner cloud class
@@ -120,6 +120,9 @@ public:
// Member Functions
+ //- Return the effective radius for a particle for the model
+ virtual scalar pREff(const typename CloudType::parcelType& p) const = 0;
+
//- Whether the WallModel has a timestep limit that will
// require subCycling
virtual bool controlsTimestep() const = 0;
@@ -133,8 +136,10 @@ public:
virtual void evaluateWall
(
typename CloudType::parcelType& p,
- const List<point>& flatSites,
- const List<point>& sharpSites
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
) const = 0;
};
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 ba22ef38429ea87d3e9447423b3d2fb7a7d6dcb6..4bf524e387cc82605dd01a81d4d49fe2aca8b88a 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
@@ -44,13 +44,16 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
const typename CloudType::parcelType& p = iter();
// Finding minimum diameter to avoid excessive arithmetic
- rMin = min(p.d(), rMin);
+
+ scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_);
+
+ rMin = min(dEff, rMin);
rhoMax = max(p.rho(), rhoMax);
UMagMax = max
(
- mag(p.U()) + mag(p.omega())*p.d()/2,
+ mag(p.U()) + mag(p.omega())*dEff/2,
UMagMax
);
}
@@ -66,25 +69,74 @@ 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 kN,
+ scalar Gstar
) const
{
vector r_PW = p.position() - site;
- scalar normalOverlapMag = p.d()/2 - mag(r_PW);
+ vector U_PW = p.U() - data.wallData();
+
+ scalar normalOverlapMag = pREff - mag(r_PW);
vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
scalar etaN = alpha_*sqrt(p.mass()*kN)*pow025(normalOverlapMag);
vector fN_PW =
- rHat_PW
- *(kN*pow(normalOverlapMag, b_) - etaN*(p.U() & rHat_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;
+ }
}
@@ -109,7 +161,8 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
(
this->coeffDict().lookup("collisionResolutionSteps")
)
- )
+ ),
+ volumeFactor_(this->dict().lookupOrDefault("volumeFactor", 1.0))
{}
@@ -122,6 +175,15 @@ Foam::WallSpringSliderDashpot<CloudType>::~WallSpringSliderDashpot()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::scalar Foam::WallSpringSliderDashpot<CloudType>::pREff
+(
+ const typename CloudType::parcelType& p
+) const
+{
+ return p.d()/2*cbrt(p.nParticle()*volumeFactor_);
+}
+
template<class CloudType>
bool Foam::WallSpringSliderDashpot<CloudType>::controlsTimestep() const
{
@@ -164,28 +226,56 @@ template<class CloudType>
void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
(
typename CloudType::parcelType& p,
- const List<point>& flatSites,
- const List<point>& sharpSites
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ 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(p.d()/2)*Estar;
+ scalar kN = (4.0/3.0)*sqrt(pREff)*Estar;
- forAll(flatSites, siteI)
+ scalar GStar = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu_ - sqr(nu_))/E_));
+
+ forAll(flatSitePoints, siteI)
{
- evaluateWall(p, flatSites[siteI], pNu, pE, Estar, kN);
+ evaluateWall
+ (
+ p,
+ flatSitePoints[siteI],
+ flatSiteData[siteI],
+ pNu,
+ pE,
+ pREff,
+ Estar,
+ kN,
+ GStar
+ );
}
- forAll(sharpSites, siteI)
+ forAll(sharpSitePoints, siteI)
{
// Treating sharp sites like flat sites
- evaluateWall(p, sharpSites[siteI], pNu, pE, Estar, kN);
+ evaluateWall
+ (
+ p,
+ sharpSitePoints[siteI],
+ sharpSiteData[siteI],
+ pNu,
+ pE,
+ pREff,
+ Estar,
+ kN,
+ GStar
+ );
}
}
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 fcc83e22e6cb6278b13ba01960cfce9883a6fae9..2aefa7d7e7d70accf278ba26b29262146dd8078c 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
@@ -69,6 +69,24 @@ class WallSpringSliderDashpot
// 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_;
+
// Private Member Functions
@@ -86,10 +104,13 @@ class WallSpringSliderDashpot
(
typename CloudType::parcelType& p,
const point& site,
+ const WallSiteData<vector>& data,
scalar pNu,
scalar pE,
+ scalar pREff,
scalar Estar,
- scalar kN
+ scalar kN,
+ scalar Gstar
) const;
@@ -111,6 +132,15 @@ public:
// 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;
@@ -124,8 +154,10 @@ public:
virtual void evaluateWall
(
typename CloudType::parcelType& p,
- const List<point>& flatSites,
- const List<point>& sharpSites
+ const List<point>& flatSitePoints,
+ const List<WallSiteData<vector> >& flatSiteData,
+ const List<point>& sharpSitePoints,
+ const List<WallSiteData<vector> >& sharpSiteData
) const;
};
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C
new file mode 100644
index 0000000000000000000000000000000000000000..a9aa774c647cca91bf61538b33ac8c3c3f6e701a
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "WallSiteData.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::WallSiteData<Type>::WallSiteData()
+:
+ patchI_(),
+ wallData_()
+{}
+
+
+template<class Type>
+Foam::WallSiteData<Type>::WallSiteData
+(
+ label patchI,
+ const Type& wallData
+)
+:
+ patchI_(patchI),
+ wallData_(wallData)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::WallSiteData<Type>::~WallSiteData()
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::WallSiteData<Type>::operator==
+(
+ const WallSiteData<Type>& rhs
+) const
+{
+ return patchI_ == rhs.patchI_ && wallData_ == rhs.wallData_;
+}
+
+
+template<class Type>
+bool Foam::WallSiteData<Type>::operator!=
+(
+ const WallSiteData<Type>& rhs
+) const
+{
+ return !(*this == rhs);
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Istream& Foam::operator>>
+(
+ Istream& is,
+ WallSiteData<Type>& wIS
+)
+{
+ is >> wIS.patchI_ >> wIS.wallData_;
+
+ // Check state of Istream
+ is.check
+ (
+ "Foam::Istream& Foam::operator>>"
+ "(Foam::Istream&, Foam::WallSiteData<Type>&)"
+ );
+
+ return is;
+}
+
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const WallSiteData<Type>& wIS
+)
+{
+ os << wIS.patchI_ << token::SPACE << wIS.wallData_;
+
+ // Check state of Ostream
+ os.check
+ (
+ "Foam::Ostream& Foam::operator<<"
+ "(Ostream&, const WallSiteData<Type>&)"
+ );
+
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
new file mode 100644
index 0000000000000000000000000000000000000000..a179d4925c97c8399851a56039d5538cd3103528
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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::WallSiteData
+
+Description
+ Stores the patch ID and templated data to represent a collision
+ with a wall to be passed to the wall model.
+
+SourceFiles
+ WallSiteDataI.H
+ WallSiteData.C
+ WallSiteDataIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef WallSiteData_H
+#define WallSiteData_H
+
+#include "label.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Type>
+class WallSiteData;
+
+template<class Type>
+Istream& operator>>(Istream&, WallSiteData<Type>&);
+
+template<class Type>
+Ostream& operator<<(Ostream&, const WallSiteData<Type>&);
+
+
+/*---------------------------------------------------------------------------*\
+ Class WallSiteData Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class WallSiteData
+{
+ // Private data
+
+ //- Index of originating patch
+ label patchI_;
+
+ //- Wall data
+ Type wallData_;
+
+
+public:
+
+ // Constructors
+
+ //- Construct null
+ WallSiteData();
+
+ //- Construct from components
+ WallSiteData
+ (
+ label patchI,
+ const Type& wallData
+ );
+
+
+ //- Destructor
+ ~WallSiteData();
+
+
+ // Member Functions
+
+ //- Return access to the patch index
+ inline label patchIndex() const;
+
+ //- Return non-const access to the patch index
+ inline label& patchIndex();
+
+ //- Return access to wall data
+ inline const Type& wallData() const;
+
+ //- Return non-const access to wall data
+ inline Type& wallData();
+
+
+ // Member Operators
+
+ bool operator==(const WallSiteData<Type>&) const;
+ bool operator!=(const WallSiteData<Type>&) const;
+
+
+ // IOstream Operators
+
+ friend Istream& operator>> <Type>
+ (Istream&, WallSiteData<Type>&);
+
+ friend Ostream& operator<< <Type>
+ (Ostream&, const WallSiteData<Type>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "WallSiteDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "WallSiteData.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H
new file mode 100644
index 0000000000000000000000000000000000000000..b28bf3be23edd1ccd892b08f1d25eb93353d48c4
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H
@@ -0,0 +1,60 @@
+#/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 Type>
+Foam::label Foam::WallSiteData<Type>::patchIndex() const
+{
+ return patchI_;
+}
+
+
+template<class Type>
+Foam::label& Foam::WallSiteData<Type>::patchIndex()
+{
+ return patchI_;
+}
+
+
+template<class Type>
+const Type& Foam::WallSiteData<Type>::wallData() const
+{
+ return wallData_;
+}
+
+
+template<class Type>
+Type& Foam::WallSiteData<Type>::wallData()
+{
+ return wallData_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index a232a5f0609c754717d9d545817911d299b3054f..9b44324461ba87abce6e45c553f9f52fab06b71d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -129,10 +129,11 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
template<class CloudType>
-void Foam::InjectionModel<CloudType>::findCellAtPosition
+bool Foam::InjectionModel<CloudType>::findCellAtPosition
(
label& cellI,
- vector& position
+ vector& position,
+ bool errorOnNotFound
)
{
const volVectorField& cellCentres = owner_.mesh().C();
@@ -176,17 +177,26 @@ void Foam::InjectionModel<CloudType>::findCellAtPosition
if (procI == -1)
{
- FatalErrorIn
- (
- "Foam::InjectionModel<CloudType>::findCellAtPosition"
- "("
- "label&, "
- "vector&"
- ")"
- )<< "Cannot find parcel injection cell. "
- << "Parcel position = " << p0 << nl
- << abort(FatalError);
+ if (errorOnNotFound)
+ {
+ FatalErrorIn
+ (
+ "Foam::InjectionModel<CloudType>::findCellAtPosition"
+ "("
+ "label&, "
+ "vector&"
+ ")"
+ ) << "Cannot find parcel injection cell. "
+ << "Parcel position = " << p0 << nl
+ << abort(FatalError);
+ }
+ else
+ {
+ return false;
+ }
}
+
+ return true;
}
@@ -217,7 +227,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
}
case pbFixed:
{
- nP = nParticlesFixed_;
+ nP = nParticleFixed_;
break;
}
default:
@@ -290,7 +300,7 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
nInjections_(0),
parcelsAddedTotal_(0),
parcelBasis_(pbNumber),
- nParticlesFixed_(0.0),
+ nParticleFixed_(0.0),
time0_(0.0),
timeStep0_(0.0)
{
@@ -316,7 +326,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
nInjections_(0),
parcelsAddedTotal_(0),
parcelBasis_(pbNumber),
- nParticlesFixed_(0.0),
+ nParticleFixed_(0.0),
time0_(owner.db().time().value()),
timeStep0_(0.0)
{
@@ -340,11 +350,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
{
parcelBasis_ = pbFixed;
- Info<< " Choosing nParticles to be a fixed value, massTotal "
+ Info<< " Choosing nParticle to be a fixed value, massTotal "
<< "variable now does not determine anything."
<< endl;
- nParticlesFixed_ = readScalar(coeffDict_.lookup("nParticles"));
+ nParticleFixed_ = readScalar(coeffDict_.lookup("nParticle"));
}
else
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index c6fb6e424bc3270da4d41f4f546a493a6a79c1c3..ad3d4b1daeddba1bd4be74d814b4f79022c9eeec 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -138,9 +138,9 @@ protected:
//- Parcel basis enumeration
parcelBasis parcelBasis_;
- //- nParticles to assign to parcels when the 'fixed' basis
+ //- nParticle to assign to parcels when the 'fixed' basis
// is selected
- scalar nParticlesFixed_;
+ scalar nParticleFixed_;
//- Continuous phase time at start of injection time step [s]
scalar time0_;
@@ -180,7 +180,12 @@ protected:
//- Find the cell that contains the supplied position
// Will modify position slightly towards the owner cell centroid to
// ensure that it lies in a cell and not edge/face
- virtual void findCellAtPosition(label& cellI, vector& position);
+ virtual bool findCellAtPosition
+ (
+ label& cellI,
+ vector& position,
+ bool errorOnNotFound = true
+ );
//- Set number of particles to inject given parcel properties
virtual scalar setNumberOfParticles
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 9b9ec19084e474baca12f0d89176795014e18ab3..f64cdc22681c5282cb6547327e116b9781fc8dbf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -25,6 +25,8 @@ License
#include "ManualInjection.H"
#include "mathematicalConstants.H"
+#include "PackedBoolList.H"
+#include "Switch.H"
using namespace Foam::constant::mathematical;
@@ -100,6 +102,40 @@ Foam::ManualInjection<CloudType>::ManualInjection
)
)
{
+ Switch checkAndIgnoreOutOfBounds
+ (
+ this->coeffDict().lookupOrDefault("checkAndIgnoreOutOfBounds", false)
+ );
+
+ label nRejected = 0;
+
+ if (checkAndIgnoreOutOfBounds)
+ {
+ // Dummy cell
+ label cellI = -1;
+
+ PackedBoolList keep(positions_.size(), true);
+
+ forAll(positions_, pI)
+ {
+ if (!this->findCellAtPosition(cellI, positions_[pI], false))
+ {
+ keep[pI] = false;
+
+ nRejected++;
+ }
+ }
+
+ if (nRejected > 0)
+ {
+ inplaceSubset(keep, positions_);
+ inplaceSubset(keep, diameters_);
+
+ Info<< " " << nRejected
+ << " particles ignored, out of bounds." << endl;
+ }
+ }
+
// Construct parcel diameters
forAll(diameters_, i)
{
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 50942e39c72629a59aa17dd957a4f6c4fa0f487b..20a7e76b66bde027f981a0d594ade30861758963 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -487,8 +487,7 @@ Foam::labelList Foam::autoLayerDriver::collectFaces
(
mesh,
selected,
- orEqOp<bool>(), // combine operator
- false // separation
+ orEqOp<bool>() // combine operator
);
labelList selectedFaces(findIndices(selected, true));
@@ -534,8 +533,7 @@ Foam::labelList Foam::autoLayerDriver::growFaceCellFace
(
mesh,
selected,
- orEqOp<bool>(), // combine operator
- false // separation
+ orEqOp<bool>() // combine operator
);
return findIndices(selected, true);
}
@@ -1015,8 +1013,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
mesh,
edgeNormal,
nomalsCombine(),
- point::max, // null value
- false // no separation
+ point::max // null value
);
label vertI = 0;
@@ -1307,8 +1304,7 @@ void Foam::autoLayerDriver::setNumLayers
pp.meshPoints(),
maxLayers,
maxEqOp<label>(),
- labelMin, // null value
- false // no separation
+ labelMin // null value
);
syncTools::syncPointList
(
@@ -1316,8 +1312,7 @@ void Foam::autoLayerDriver::setNumLayers
pp.meshPoints(),
minLayers,
minEqOp<label>(),
- labelMax, // null value
- false // no separation
+ labelMax // null value
);
// Unmark any point with different min and max
@@ -1434,8 +1429,7 @@ void Foam::autoLayerDriver::growNoExtrusion
pp.meshPoints(),
status,
minEqOp<label>(),
- labelMax, // null value
- false // no separation
+ labelMax // null value
);
forAll(status, i)
{
@@ -1528,8 +1522,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
pp.meshPoints(),
expansionRatio,
minEqOp<scalar>(),
- GREAT, // null value
- false // no separation
+ GREAT // null value
);
syncTools::syncPointList
(
@@ -1537,8 +1530,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
pp.meshPoints(),
thickness,
minEqOp<scalar>(),
- GREAT, // null value
- false // no separation
+ GREAT // null value
);
syncTools::syncPointList
(
@@ -1546,8 +1538,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
pp.meshPoints(),
minThickness,
minEqOp<scalar>(),
- GREAT, // null value
- false // no separation
+ GREAT // null value
);
@@ -1594,8 +1585,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
pp.meshPoints(),
maxPointLevel,
maxEqOp<label>(),
- labelMin, // null value
- false // no separation
+ labelMin // null value
);
@@ -1664,8 +1654,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
meshPoints,
patchDisp,
minEqOp<vector>(),
- point::max, // null value
- false // no separation
+ point::max // null value
);
// Unmark if displacement too small
@@ -1697,8 +1686,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
meshPoints,
syncPatchNLayers,
minEqOp<label>(),
- labelMax, // null value
- false // no separation
+ labelMax // null value
);
// Reset if differs
@@ -1728,8 +1716,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
meshPoints,
syncPatchNLayers,
maxEqOp<label>(),
- labelMin, // null value
- false // no separation
+ labelMin // null value
);
// Reset if differs
@@ -1815,8 +1802,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
meshPoints,
pointNormals,
plusEqOp<vector>(),
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
syncTools::syncPointList
@@ -1825,8 +1811,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
meshPoints,
nPointFaces,
plusEqOp<label>(),
- 0, // null value
- false // no separation
+ 0 // null value
);
forAll(pointNormals, i)
@@ -2258,8 +2243,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
pp.meshPoints(),
foundNeighbour,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
forAll(pp.meshPoints(), patchPointI)
@@ -2318,8 +2302,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
pp.meshPoints(),
nPatchPointLayers,
maxEqOp<label>(),
- 0, // null value
- false // no separation
+ 0 // null value
);
}
}
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 56597063fcdae8cbca33878009b2471a795fd87f..ae0a2d724d022532afa4129190ed2b4ec872398f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -67,8 +67,7 @@ void Foam::autoLayerDriver::sumWeights
meshPoints,
invSumWeight,
plusEqOp<scalar>(),
- scalar(0.0), // null value
- false // no separation
+ scalar(0.0) // null value
);
forAll(invSumWeight, pointI)
@@ -521,8 +520,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
pp.meshPoints(),
keptPoints,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
label nChanged = 0;
@@ -589,8 +587,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
pp.meshPoints(),
isolatedPoint,
plusEqOp<label>(),
- 0, // null value
- false // no separation
+ 0 // null value
);
// stop layer growth on isolated faces
@@ -724,8 +721,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
meshPoints,
pointNormals,
plusEqOp<vector>(),
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
syncTools::syncPointList
@@ -734,8 +730,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
meshPoints,
nPointFaces,
plusEqOp<label>(),
- 0, // null value
- false // no separation
+ 0 // null value
);
forAll(pointNormals, i)
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
index d8784f5d03506db4025e396441197ba969a8fa7e..73f797dd8a29af3b950bbdfb4093909904d1163f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
@@ -64,8 +64,7 @@ void Foam::autoLayerDriver::averageNeighbours
meshPoints,
average,
plusEqOp<Type>(),
- pTraits<Type>::zero, // null value
- false // no separation
+ pTraits<Type>::zero // null value
);
average *= invSumWeight;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index a73e7bdcf606b1bd05b253cc612da9a159ab4396..0801f4de3e30ad56c349a5be21aa1f57cfb70588 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -274,8 +274,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
pp.meshPoints(),
avgBoundary,
plusEqOp<point>(), // combine op
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
syncTools::syncPointList
(
@@ -283,8 +282,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
pp.meshPoints(),
nBoundary,
plusEqOp<label>(), // combine op
- 0, // null value
- false // no separation
+ 0 // null value
);
forAll(avgBoundary, i)
@@ -322,36 +320,18 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
forAll(patches, patchI)
{
- if (Pstream::parRun() && isA<processorPolyPatch>(patches[patchI]))
- {
- const processorPolyPatch& pp =
- refCast<const processorPolyPatch>(patches[patchI]);
-
- if (pp.myProcNo() < pp.neighbProcNo())
- {
- const vectorField::subField faceCentres = pp.faceCentres();
-
- forAll(pp, i)
- {
- const face& f = pp[i];
- const point& fc = faceCentres[i];
-
- forAll(f, fp)
- {
- globalSum[f[fp]] += fc;
- globalNum[f[fp]]++;
- }
- }
- }
- }
- else if (isA<cyclicPolyPatch>(patches[patchI]))
+ if
+ (
+ patches[patchI].coupled()
+ && refCast<const coupledPolyPatch>(patches[patchI]).owner()
+ )
{
- const cyclicPolyPatch& pp =
- refCast<const cyclicPolyPatch>(patches[patchI]);
+ const coupledPolyPatch& pp =
+ refCast<const coupledPolyPatch>(patches[patchI]);
const vectorField::subField faceCentres = pp.faceCentres();
- for (label i = 0; i < pp.size()/2; i++)
+ forAll(pp, i)
{
const face& f = pp[i];
const point& fc = faceCentres[i];
@@ -370,16 +350,14 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
mesh,
globalSum,
plusEqOp<vector>(), // combine op
- vector::zero, // null value
- false // no separation
+ vector::zero // null value
);
syncTools::syncPointList
(
mesh,
globalNum,
plusEqOp<label>(), // combine op
- 0, // null value
- false // no separation
+ 0 // null value
);
avgInternal.setSize(meshPoints.size());
@@ -815,8 +793,7 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
pp.meshPoints(),
maxEdgeLen,
maxEqOp<scalar>(), // combine op
- -GREAT, // null value
- false // no separation
+ -GREAT // null value
);
return snapParams.snapTol()*maxEdgeLen;
@@ -1123,8 +1100,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
pp.meshPoints(),
patchDisp,
minMagEqOp(), // combine op
- vector(GREAT, GREAT, GREAT), // null value
- false // no separation
+ vector(GREAT, GREAT, GREAT) // null value
);
@@ -1178,7 +1154,7 @@ void Foam::autoSnapDriver::smoothDisplacement
}
pointVectorField oldDisp(disp);
- meshMover.smooth(oldDisp, edgeGamma, false, disp);
+ meshMover.smooth(oldDisp, edgeGamma, disp);
}
Info<< "Displacement smoothed in = "
<< mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 12298ce6e1669f793ff6050f1c4b6e88af98d469..0622273a4ef922a6342de997919c1a1eefb82a7a 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -146,8 +146,8 @@ void Foam::meshRefinement::calcNeighbourData
}
// Swap coupled boundaries. Apply separation to cc since is coordinate.
- syncTools::swapBoundaryFaceList(mesh_, neiCc, true);
- syncTools::swapBoundaryFaceList(mesh_, neiLevel, false);
+ syncTools::swapBoundaryFacePositions(mesh_, neiCc);
+ syncTools::swapBoundaryFaceList(mesh_, neiLevel);
}
@@ -235,7 +235,7 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
// Make sure both sides have same information. This should be
// case in general since same vectors but just to make sure.
- syncTools::syncFaceList(mesh_, surfaceIndex_, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, surfaceIndex_, maxEqOp<label>());
label nHits = countHits();
label nTotHits = returnReduce(nHits, sumOp<label>());
@@ -275,11 +275,11 @@ void Foam::meshRefinement::checkData()
// Get neighbouring face centres
pointField neiBoundaryFc(boundaryFc);
- syncTools::swapBoundaryFaceList
+ syncTools::syncBoundaryFacePositions
(
mesh_,
neiBoundaryFc,
- true
+ eqOp<point>()
);
// Compare
@@ -339,7 +339,7 @@ void Foam::meshRefinement::checkData()
mesh_.nInternalFaces()
)
);
- syncTools::swapBoundaryFaceList(mesh_, neiHit, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiHit);
// Check
forAll(surfaceHit, faceI)
@@ -390,8 +390,7 @@ void Foam::meshRefinement::checkData()
syncTools::swapBoundaryFaceList
(
mesh_,
- neiBoundarySurface,
- false
+ neiBoundarySurface
);
// Compare
@@ -1158,8 +1157,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
(
mesh_,
blockedFace,
- andEqOp<bool>(), // combine operator
- false // separation
+ andEqOp<bool>() // combine operator
);
}
reduce(nUnblocked, sumOp<label>());
@@ -1527,7 +1525,7 @@ void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
}
labelList neiFaceToZone(faceToZone);
- syncTools::swapBoundaryFaceList(mesh, neiFaceToZone, false);
+ syncTools::swapBoundaryFaceList(mesh, neiFaceToZone);
forAll(faceToZone, i)
{
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 2491f557fb54cbc6e0dc876fae235d183ffff451..0eabd33adc2eaa89dc0f3628f2a3bc0c073284f2 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -354,8 +354,8 @@ void Foam::meshRefinement::getBafflePatches
// might not be owner on the other processor but the neighbour is
// not used when creating baffles from proc faces.
// - tolerances issues occasionally crop up.
- syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
- syncTools::syncFaceList(mesh_, neiPatch, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>());
+ syncTools::syncFaceList(mesh_, neiPatch, maxEqOp<label>());
}
@@ -386,9 +386,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
if (debug)
{
labelList syncedOwnPatch(ownPatch);
- syncTools::syncFaceList(mesh_, syncedOwnPatch, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, syncedOwnPatch, maxEqOp<label>());
labelList syncedNeiPatch(neiPatch);
- syncTools::syncFaceList(mesh_, syncedNeiPatch, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, syncedNeiPatch, maxEqOp<label>());
forAll(syncedOwnPatch, faceI)
{
@@ -669,8 +669,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
mesh_,
nBafflesPerEdge,
plusEqOp<label>(), // in-place add
- 0, // initial value
- false // no separation
+ 0 // initial value
);
@@ -1030,7 +1029,7 @@ void Foam::meshRefinement::findCellZoneGeometric
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
forAll(patches, patchI)
{
@@ -1058,13 +1057,7 @@ void Foam::meshRefinement::findCellZoneGeometric
}
// Sync
- syncTools::syncFaceList
- (
- mesh_,
- namedSurfaceIndex,
- maxEqOp<label>(),
- false
- );
+ syncTools::syncFaceList(mesh_, namedSurfaceIndex, maxEqOp<label>());
}
//XXXXXXXXX
void Foam::meshRefinement::findCellZoneInsideWalk
@@ -1371,7 +1364,7 @@ void Foam::meshRefinement::findCellZoneTopo
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiCellRegion, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiCellRegion);
// Calculate region to zone from cellRegions on either side of coupled
// face.
@@ -1492,7 +1485,7 @@ void Foam::meshRefinement::makeConsistentFaceIndex
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
// Use coupled cellZone to do check
forAll(patches, patchI)
@@ -1812,7 +1805,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
blockedFace[faceI] = true;
}
}
- syncTools::syncFaceList(mesh_, blockedFace, orEqOp<bool>(), false);
+ syncTools::syncFaceList(mesh_, blockedFace, orEqOp<bool>());
// Set region per cell based on walking
regionSplit cellRegion(mesh_, blockedFace);
@@ -1924,8 +1917,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
mesh_,
pointBaffle,
maxEqOp<label>(),
- -1, // null value
- false // no separation
+ -1 // null value
);
@@ -1950,7 +1942,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
}
}
}
- syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>());
// 3. From faces to cells (cellRegion) and back to faces (ownPatch)
@@ -1999,7 +1991,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
ownPatch.transfer(newOwnPatch);
- syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>(), false);
+ syncTools::syncFaceList(mesh_, ownPatch, maxEqOp<label>());
}
@@ -2376,8 +2368,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
(
mesh_,
namedSurfaceIndex,
- maxEqOp<label>(),
- false
+ maxEqOp<label>()
);
// Print a bit
@@ -2541,7 +2532,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiCellZone, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
// Get per face whether is it master (of a coupled set of faces)
PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index 03dda28ede76ef0c4ba27cadc4a476bf227c6492..2074814ac5a6f107955dd80194149f2f3a8ad53a 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -496,8 +496,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
mesh_,
isBoundaryPoint,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
syncTools::syncEdgeList
@@ -505,16 +504,14 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
mesh_,
isBoundaryEdge,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
syncTools::syncFaceList
(
mesh_,
isBoundaryFace,
- orEqOp<bool>(),
- false // no separation
+ orEqOp<bool>()
);
@@ -805,8 +802,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
mesh_,
isBoundaryPoint,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
syncTools::syncEdgeList
@@ -814,16 +810,14 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
mesh_,
isBoundaryEdge,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
syncTools::syncFaceList
(
mesh_,
isBoundaryFace,
- orEqOp<bool>(),
- false // no separation
+ orEqOp<bool>()
);
@@ -1107,8 +1101,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
// (
// mesh_,
// facePatch,
-// maxEqOp<label>(),
-// false // no separation
+// maxEqOp<label>()
// );
//
// return facePatch;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 23a0bfe6901ab801271d33890eb4e17f4c96c0d5..7a1968500f21020a4402b6a64b61230493d1a0fb 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -133,8 +133,7 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
(
mesh,
refinedBoundaryFace,
- orEqOp<bool>(),
- false
+ orEqOp<bool>()
);
@@ -176,8 +175,7 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
(
mesh,
changedFace,
- orEqOp<bool>(),
- false
+ orEqOp<bool>()
);
@@ -925,8 +923,8 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
neiBndMaxLevel[bFaceI] = cellMaxLevel[own];
neiBndMaxNormal[bFaceI] = cellMaxNormal[own];
}
- syncTools::swapBoundaryFaceList(mesh_, neiBndMaxLevel, false);
- syncTools::swapBoundaryFaceList(mesh_, neiBndMaxNormal, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiBndMaxLevel);
+ syncTools::swapBoundaryFaceList(mesh_, neiBndMaxNormal);
// Loop over all faces. Could only be checkFaces.. except if they're coupled
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.C b/src/mesh/blockMesh/blockMesh/blockMesh.C
index fc79070eee323c8b29c17ac69b2d9a36e820058a..8641c44a717fc9c9ab3e46a7a262e7decbd286e2 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.C
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.C
@@ -77,6 +77,24 @@ const Foam::polyMesh& Foam::blockMesh::topology() const
}
+Foam::PtrList<Foam::dictionary> Foam::blockMesh::patchDicts() const
+{
+ const polyPatchList& patchTopologies = topology().boundaryMesh();
+
+ PtrList<dictionary> patchDicts(patchTopologies.size());
+
+ forAll(patchTopologies, patchI)
+ {
+ OStringStream os;
+ patchTopologies[patchI].write(os);
+ IStringStream is(os.str());
+ patchDicts.set(patchI, new dictionary(is));
+ patchDicts[patchI].set("name", patchTopologies[patchI].name());
+ }
+ return patchDicts;
+}
+
+
Foam::scalar Foam::blockMesh::scaleFactor() const
{
return scaleFactor_;
@@ -116,22 +134,22 @@ const Foam::faceListList& Foam::blockMesh::patches() const
}
-Foam::wordList Foam::blockMesh::patchNames() const
-{
- return topology().boundaryMesh().names();
-}
-
-
-Foam::wordList Foam::blockMesh::patchTypes() const
-{
- return topology().boundaryMesh().types();
-}
-
-
-Foam::wordList Foam::blockMesh::patchPhysicalTypes() const
-{
- return topology().boundaryMesh().physicalTypes();
-}
+//Foam::wordList Foam::blockMesh::patchNames() const
+//{
+// return topology().boundaryMesh().names();
+//}
+//
+//
+//Foam::wordList Foam::blockMesh::patchTypes() const
+//{
+// return topology().boundaryMesh().types();
+//}
+//
+//
+//Foam::wordList Foam::blockMesh::patchPhysicalTypes() const
+//{
+// return topology().boundaryMesh().physicalTypes();
+//}
Foam::label Foam::blockMesh::numZonedBlocks() const
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H
index 4d1b1deb0aa285ef7234aaa77013cc55222290c1..fa91e40b689352a31ef165fbaef1740b3b4fa516 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.H
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.H
@@ -109,6 +109,24 @@ class blockMesh
const faceList& patchShapes
) const;
+ bool readPatches
+ (
+ const dictionary& meshDescription,
+ faceListList& tmpBlocksPatches,
+ wordList& patchNames,
+ wordList& patchTypes,
+ wordList& nbrPatchNames
+ );
+
+ bool readBoundary
+ (
+ const dictionary& meshDescription,
+ faceListList& tmpBlocksPatches,
+ PtrList<dictionary>& patchDicts
+ );
+
+ void createCellShapes(cellShapeList& tmpBlockCells);
+
polyMesh* createTopology(IOdictionary&);
void checkBlockMesh(const polyMesh&) const;
@@ -163,11 +181,15 @@ public:
const faceListList& patches() const;
- wordList patchNames() const;
- wordList patchTypes() const;
+ //- Get patch information from the topology mesh
+ PtrList<dictionary> patchDicts() const;
- wordList patchPhysicalTypes() const;
+// wordList patchNames() const;
+//
+// wordList patchTypes() const;
+//
+// wordList patchPhysicalTypes() const;
//- Number of blocks with specified zones
label numZonedBlocks() const;
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index 62d30c38965f862553b9b8bd464c0dbff079853e..9a962483681826ed40c7855855e397b8895527b3 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -27,11 +27,232 @@ License
#include "Time.H"
#include "preservePatchTypes.H"
#include "emptyPolyPatch.H"
+#include "cyclicPolyPatch.H"
+
+
+bool Foam::blockMesh::readPatches
+(
+ const dictionary& meshDescription,
+ faceListList& tmpBlocksPatches,
+ wordList& patchNames,
+ wordList& patchTypes,
+ wordList& nbrPatchNames
+)
+{
+ bool topologyOK = true;
+
+ ITstream& patchStream(meshDescription.lookup("patches"));
+
+ // read number of patches in mesh
+ label nPatches = 0;
+
+ token firstToken(patchStream);
+
+ if (firstToken.isLabel())
+ {
+ nPatches = firstToken.labelToken();
+
+ tmpBlocksPatches.setSize(nPatches);
+ patchNames.setSize(nPatches);
+ patchTypes.setSize(nPatches);
+ nbrPatchNames.setSize(nPatches);
+ }
+ else
+ {
+ patchStream.putBack(firstToken);
+ }
+
+ // Read beginning of blocks
+ patchStream.readBegin("patches");
+
+ nPatches = 0;
+
+ token lastToken(patchStream);
+ while
+ (
+ !(
+ lastToken.isPunctuation()
+ && lastToken.pToken() == token::END_LIST
+ )
+ )
+ {
+ if (tmpBlocksPatches.size() <= nPatches)
+ {
+ tmpBlocksPatches.setSize(nPatches + 1);
+ patchNames.setSize(nPatches + 1);
+ patchTypes.setSize(nPatches + 1);
+ nbrPatchNames.setSize(nPatches + 1);
+ }
+
+ patchStream.putBack(lastToken);
+
+ patchStream
+ >> patchTypes[nPatches]
+ >> patchNames[nPatches];
+
+ // Read patch faces
+ patchStream >> tmpBlocksPatches[nPatches];
+
+
+ // Catch multiple patches asap.
+ for (label i = 0; i < nPatches; i++)
+ {
+ if (patchNames[nPatches] == patchNames[i])
+ {
+ FatalErrorIn
+ (
+ "blockMesh::createTopology(IOdictionary&)"
+ ) << "Duplicate patch " << patchNames[nPatches]
+ << " at line " << patchStream.lineNumber()
+ << ". Exiting !" << nl
+ << exit(FatalError);
+ }
+ }
+
+ topologyOK = topologyOK && patchLabelsOK
+ (
+ nPatches,
+ blockPointField_,
+ tmpBlocksPatches[nPatches]
+ );
+
+ nPatches++;
+
+
+ // Split old style cyclics
+
+ if (patchTypes[nPatches-1] == cyclicPolyPatch::typeName)
+ {
+ word halfA = patchNames[nPatches-1] + "_half0";
+ word halfB = patchNames[nPatches-1] + "_half1";
+
+ WarningIn("blockMesh::createTopology(IOdictionary&)")
+ << "Old-style cyclic definition."
+ << " Splitting patch "
+ << patchNames[nPatches-1] << " into two halves "
+ << halfA << " and " << halfB << endl
+ << " Alternatively use new 'boundary' dictionary syntax."
+ << endl;
+
+ // Add extra patch
+ if (tmpBlocksPatches.size() <= nPatches)
+ {
+ tmpBlocksPatches.setSize(nPatches + 1);
+ patchNames.setSize(nPatches + 1);
+ patchTypes.setSize(nPatches + 1);
+ nbrPatchNames.setSize(nPatches + 1);
+ }
+
+ // Update halfA info
+ patchNames[nPatches-1] = halfA;
+ nbrPatchNames[nPatches-1] = halfB;
+ // Update halfB info
+ patchTypes[nPatches] = patchTypes[nPatches-1];
+ patchNames[nPatches] = halfB;
+ nbrPatchNames[nPatches] = halfA;
+
+ // Split faces
+ if ((tmpBlocksPatches[nPatches-1].size() % 2) != 0)
+ {
+ FatalErrorIn
+ (
+ "blockMesh::createTopology(IOdictionary&)"
+ ) << "Size of cyclic faces is not a multiple of 2 :"
+ << tmpBlocksPatches[nPatches-1]
+ << exit(FatalError);
+ }
+ label sz = tmpBlocksPatches[nPatches-1].size()/2;
+ faceList unsplitFaces(tmpBlocksPatches[nPatches-1], true);
+ tmpBlocksPatches[nPatches-1] = faceList
+ (
+ SubList<face>(unsplitFaces, sz)
+ );
+ tmpBlocksPatches[nPatches] = faceList
+ (
+ SubList<face>(unsplitFaces, sz, sz)
+ );
+
+ nPatches++;
+ }
+
+ patchStream >> lastToken;
+ }
+ patchStream.putBack(lastToken);
+
+ // Read end of blocks
+ patchStream.readEnd("patches");
+
+ return topologyOK;
+}
+
+
+bool Foam::blockMesh::readBoundary
+(
+ const dictionary& meshDescription,
+ faceListList& tmpBlocksPatches,
+ PtrList<dictionary>& patchDicts
+)
+{
+ bool topologyOK = true;
+
+ // Read like boundary file
+ const PtrList<entry> patchesInfo
+ (
+ meshDescription.lookup("boundary")
+ );
+
+ tmpBlocksPatches.setSize(patchesInfo.size());
+ patchDicts.setSize(patchesInfo.size());
+
+ forAll(tmpBlocksPatches, patchI)
+ {
+ const entry& patchInfo = patchesInfo[patchI];
+
+ // Construct dictionary and add name
+ patchDicts.set(patchI, new dictionary(patchInfo.dict()));
+ patchDicts[patchI].set("name", patchInfo.keyword());
+ // Read block faces
+ patchDicts[patchI].lookup("faces") >> tmpBlocksPatches[patchI];
+
+ topologyOK = topologyOK && patchLabelsOK
+ (
+ patchI,
+ blockPointField_,
+ tmpBlocksPatches[patchI]
+ );
+ }
+
+ return topologyOK;
+}
+
+
+void Foam::blockMesh::createCellShapes
+(
+ cellShapeList& tmpBlockCells
+)
+{
+ const blockMesh& blocks = *this;
+
+ tmpBlockCells.setSize(blocks.size());
+ forAll(blocks, blockI)
+ {
+ tmpBlockCells[blockI] = cellShape(blocks[blockI].blockShape());
+
+ if (tmpBlockCells[blockI].mag(blockPointField_) < 0.0)
+ {
+ WarningIn
+ (
+ "blockMesh::createTopology(IOdictionary&)"
+ ) << "negative volume block : " << blockI
+ << ", probably defined inside-out" << endl;
+ }
+ }
+}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& dict)
+Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
{
bool topologyOK = true;
@@ -43,30 +264,30 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& dict)
// get names/types for the unassigned patch faces
// this is a bit heavy handed (and ugly), but there is currently
// no easy way to rename polyMesh patches subsequently
- if (const dictionary* dictPtr = dict.subDictPtr("defaultPatch"))
+ if (const dictionary* dictPtr = meshDescription.subDictPtr("defaultPatch"))
{
dictPtr->readIfPresent("name", defaultPatchName);
dictPtr->readIfPresent("type", defaultPatchType);
}
// optional 'convertToMeters' or 'scale' scaling factor
- if (!dict.readIfPresent("convertToMeters", scaleFactor_))
+ if (!meshDescription.readIfPresent("convertToMeters", scaleFactor_))
{
- dict.readIfPresent("scale", scaleFactor_);
+ meshDescription.readIfPresent("scale", scaleFactor_);
}
//
// get the non-linear edges in mesh
//
- if (dict.found("edges"))
+ if (meshDescription.found("edges"))
{
if (verboseOutput)
{
Info<< "Creating curved edges" << endl;
}
- ITstream& is(dict.lookup("edges"));
+ ITstream& is(meshDescription.lookup("edges"));
// read number of edges in mesh
label nEdges = 0;
@@ -134,7 +355,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& dict)
}
{
- ITstream& is(dict.lookup("blocks"));
+ ITstream& is(meshDescription.lookup("blocks"));
// read number of blocks in mesh
label nBlocks = 0;
@@ -201,6 +422,8 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& dict)
}
+ polyMesh* blockMeshPtr = NULL;
+
//
// Create the patches
//
@@ -209,160 +432,140 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& dict)
Info<< "Creating topology patches" << endl;
}
- faceListList tmpBlocksPatches;
- wordList patchNames;
- wordList patchTypes;
-
+ if (meshDescription.found("patches"))
{
- ITstream& is(dict.lookup("patches"));
+ Info<< nl << "Reading patches section" << endl;
- // read number of patches in mesh
- label nPatches = 0;
-
- token firstToken(is);
-
- if (firstToken.isLabel())
- {
- nPatches = firstToken.labelToken();
+ faceListList tmpBlocksPatches;
+ wordList patchNames;
+ wordList patchTypes;
+ wordList nbrPatchNames;
- tmpBlocksPatches.setSize(nPatches);
- patchNames.setSize(nPatches);
- patchTypes.setSize(nPatches);
- }
- else
+ topologyOK = topologyOK && readPatches
+ (
+ meshDescription,
+ tmpBlocksPatches,
+ patchNames,
+ patchTypes,
+ nbrPatchNames
+ );
+
+ if (!topologyOK)
{
- is.putBack(firstToken);
+ FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+ << "Cannot create mesh due to errors in topology, exiting !"
+ << nl << exit(FatalError);
}
- // Read beginning of blocks
- is.readBegin("patches");
+ Info<< nl << "Creating block mesh topology" << endl;
- nPatches = 0;
+ cellShapeList tmpBlockCells(blocks.size());
+ createCellShapes(tmpBlockCells);
- token lastToken(is);
- while
+
+ Info<< nl << "Reading physicalType from existing boundary file" << endl;
+
+ wordList patchPhysicalTypes(tmpBlocksPatches.size());
+
+ preservePatchTypes
(
- !(
- lastToken.isPunctuation()
- && lastToken.pToken() == token::END_LIST
- )
- )
+ meshDescription.time(),
+ meshDescription.time().constant(),
+ polyMesh::meshSubDir,
+ patchNames,
+ patchTypes,
+ defaultPatchName,
+ defaultPatchType,
+ patchPhysicalTypes
+ );
+
+
+ // Convert into dictionary
+ PtrList<dictionary> patchDicts(patchNames.size());
+ forAll(patchDicts, patchI)
{
- if (tmpBlocksPatches.size() <= nPatches)
+ patchDicts.set(patchI, new dictionary());
+ patchDicts[patchI].set("name", patchNames[patchI]);
+ patchDicts[patchI].set("type", patchTypes[patchI]);
+ if (nbrPatchNames[patchI] != word::null)
{
- tmpBlocksPatches.setSize(nPatches + 1);
- patchNames.setSize(nPatches + 1);
- patchTypes.setSize(nPatches + 1);
+ patchDicts[patchI].set("neighbourPatch", nbrPatchNames[patchI]);
}
-
- is.putBack(lastToken);
-
- is
- >> patchTypes[nPatches]
- >> patchNames[nPatches]
- >> tmpBlocksPatches[nPatches];
-
-
- // Catch multiple patches asap.
- for (label i = 0; i < nPatches; i++)
+ if (patchPhysicalTypes[patchI] != word::null)
{
- if (patchNames[nPatches] == patchNames[i])
- {
- FatalErrorIn
- (
- "blockMesh::createTopology(IOdictionary&)"
- ) << "Duplicate patch " << patchNames[nPatches]
- << " at line " << is.lineNumber()
- << ". Exiting !" << nl
- << exit(FatalError);
- }
+ patchDicts[patchI].set
+ (
+ "physicalType",
+ patchPhysicalTypes[patchI]
+ );
}
-
- topologyOK = topologyOK && patchLabelsOK
- (
- nPatches,
- blockPointField_,
- tmpBlocksPatches[nPatches]
- );
-
- nPatches++;
-
- is >> lastToken;
}
- is.putBack(lastToken);
-
- // Read end of blocks
- is.readEnd("patches");
- }
- if (!topologyOK)
- {
- FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
- << "Cannot create mesh due to errors in topology, exiting !" << nl
- << exit(FatalError);
+ blockMeshPtr = new polyMesh
+ (
+ IOobject
+ (
+ "blockMesh",
+ meshDescription.time().constant(),
+ meshDescription.time(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ xferCopy(blockPointField_), // copy these points, do NOT move
+ tmpBlockCells,
+ tmpBlocksPatches,
+ patchDicts,
+ defaultPatchName,
+ defaultPatchType
+ );
}
-
-
- //
- // Create the topology
- //
- if (verboseOutput)
+ else if (meshDescription.found("boundary"))
{
- Info<< "Creating topology mesh" << endl;
- }
+ faceListList tmpBlocksPatches;
+ PtrList<dictionary> patchDicts;
- cellShapeList tmpBlockShapes(blocks.size());
- forAll(blocks, blockI)
- {
- tmpBlockShapes[blockI] = cellShape(blocks[blockI].blockShape());
+ topologyOK = topologyOK && readBoundary
+ (
+ meshDescription,
+ tmpBlocksPatches,
+ patchDicts
+ );
- if (tmpBlockShapes[blockI].mag(blockPointField_) < 0.0)
+ if (!topologyOK)
{
- WarningIn
- (
- "blockMesh::createTopology(IOdictionary&)"
- ) << "negative volume block : " << blockI
- << ", probably defined inside-out" << endl;
+ FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+ << "Cannot create mesh due to errors in topology, exiting !"
+ << nl << exit(FatalError);
}
- }
- wordList patchPhysicalTypes(tmpBlocksPatches.size());
- preservePatchTypes
- (
- dict.time(),
- dict.time().constant(),
- polyMesh::meshSubDir,
- patchNames,
- patchTypes,
- defaultPatchName,
- defaultPatchType,
- patchPhysicalTypes
- );
+ Info<< nl << "Creating block mesh topology" << endl;
+ cellShapeList tmpBlockCells(blocks.size());
+ createCellShapes(tmpBlockCells);
- // construct the topology as its own mesh
- polyMesh* blockMeshPtr = new polyMesh
- (
- IOobject
+
+ blockMeshPtr = new polyMesh
(
- "blockMesh",
- dict.time().constant(),
- dict.time(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- xferCopy(blockPointField_), // copy these points, do NOT move
- tmpBlockShapes,
- tmpBlocksPatches,
- patchNames,
- patchTypes,
- defaultPatchName,
- defaultPatchType,
- patchPhysicalTypes
- );
+ IOobject
+ (
+ "blockMesh",
+ meshDescription.time().constant(),
+ meshDescription.time(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ xferCopy(blockPointField_), // copy these points, do NOT move
+ tmpBlockCells,
+ tmpBlocksPatches,
+ patchDicts,
+ defaultPatchName,
+ defaultPatchType
+ );
+ }
checkBlockMesh(*blockMeshPtr);
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.C b/src/meshTools/PointEdgeWave/PointEdgeWave.C
index d88b5699f45df9fe8aee1fb547ed94036c73995d..7d42f0c75e65e500dac79e2d84fdca112a5390ba 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.C
@@ -56,49 +56,6 @@ void Foam::PointEdgeWave<Type>::offset(const label val, labelList& elems)
// - list of halfA points (in cyclic patch points)
// - list of halfB points (can overlap with A!)
// - for every patchPoint its corresponding point
-template <class Type>
-void Foam::PointEdgeWave<Type>::calcCyclicAddressing()
-{
- label cycHalf = 0;
-
- forAll(mesh_.boundaryMesh(), patchI)
- {
- const polyPatch& patch = mesh_.boundaryMesh()[patchI];
-
- if (isA<cyclicPolyPatch>(patch))
- {
- label halfSize = patch.size()/2;
-
- SubList<face> halfAFaces
- (
- mesh_.faces(),
- halfSize,
- patch.start()
- );
-
- cycHalves_.set
- (
- cycHalf++,
- new primitivePatch(halfAFaces, mesh_.points())
- );
-
- SubList<face> halfBFaces
- (
- mesh_.faces(),
- halfSize,
- patch.start() + halfSize
- );
-
- cycHalves_.set
- (
- cycHalf++,
- new primitivePatch(halfBFaces, mesh_.points())
- );
- }
- }
-}
-
-
// Handle leaving domain. Implementation referred to Type
template <class Type>
void Foam::PointEdgeWave<Type>::leaveDomain
@@ -575,96 +532,57 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
// 1. Send all point info on cyclic patches. Send as
// face label + offset in face.
- label cycHalf = 0;
-
forAll(mesh_.boundaryMesh(), patchI)
{
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
if (isA<cyclicPolyPatch>(patch))
{
- const primitivePatch& halfA = cycHalves_[cycHalf++];
- const primitivePatch& halfB = cycHalves_[cycHalf++];
-
- // HalfA : get all changed points in relative addressing
-
- DynamicList<Type> halfAInfo(halfA.nPoints());
- DynamicList<label> halfAPoints(halfA.nPoints());
- DynamicList<label> halfAOwner(halfA.nPoints());
- DynamicList<label> halfAIndex(halfA.nPoints());
-
- getChangedPatchPoints
- (
- halfA,
- halfAInfo,
- halfAPoints,
- halfAOwner,
- halfAIndex
- );
+ const cyclicPolyPatch& cycPatch =
+ refCast<const cyclicPolyPatch>(patch);
- // HalfB : get all changed points in relative addressing
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
- DynamicList<Type> halfBInfo(halfB.nPoints());
- DynamicList<label> halfBPoints(halfB.nPoints());
- DynamicList<label> halfBOwner(halfB.nPoints());
- DynamicList<label> halfBIndex(halfB.nPoints());
+ DynamicList<Type> nbrInfo(nbrPatch.nPoints());
+ DynamicList<label> nbrPoints(nbrPatch.nPoints());
+ DynamicList<label> nbrOwner(nbrPatch.nPoints());
+ DynamicList<label> nbrIndex(nbrPatch.nPoints());
getChangedPatchPoints
(
- halfB,
- halfBInfo,
- halfBPoints,
- halfBOwner,
- halfBIndex
+ nbrPatch,
+ nbrInfo,
+ nbrPoints,
+ nbrOwner,
+ nbrIndex
);
-
- // HalfA : adapt for leaving domain
- leaveDomain(patch, halfA, halfAPoints, halfAInfo);
-
- // HalfB : adapt for leaving domain
- leaveDomain(patch, halfB, halfBPoints, halfBInfo);
-
+ // nbr : adapt for leaving domain
+ leaveDomain(nbrPatch, nbrPatch, nbrPoints, nbrInfo);
// Apply rotation for non-parallel planes
- const cyclicPolyPatch& cycPatch =
- refCast<const cyclicPolyPatch>(patch);
if (!cycPatch.parallel())
{
// received data from half1
- transform(cycPatch.forwardT(), halfAInfo);
-
- // received data from half2
- transform(cycPatch.reverseT(), halfBInfo);
+ transform(cycPatch.forwardT(), nbrInfo);
}
if (debug)
{
Pout<< "Cyclic patch " << patchI << ' ' << patch.name()
- << " Changed on first half : " << halfAInfo.size()
- << " Changed on second half : " << halfBInfo.size()
+ << " Changed : " << nbrInfo.size()
<< endl;
}
// Half1: update with data from halfB
updateFromPatchInfo
(
- patch,
- halfA,
- halfBOwner,
- halfBIndex,
- halfBInfo
- );
-
- // Half2: update with data from halfA
- updateFromPatchInfo
- (
- patch,
- halfB,
- halfAOwner,
- halfAIndex,
- halfAInfo
+ cycPatch,
+ cycPatch,
+ nbrOwner,
+ nbrIndex,
+ nbrInfo
);
if (debug)
@@ -703,7 +621,6 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
changedEdges_(mesh_.nEdges()),
nChangedEdges_(0),
nCyclicPatches_(countPatchType<cyclicPolyPatch>()),
- cycHalves_(2*nCyclicPatches_),
nEvals_(0),
nUnvisitedPoints_(mesh_.nPoints()),
nUnvisitedEdges_(mesh_.nEdges())
@@ -736,13 +653,6 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
}
- // Calculate cyclic halves addressing.
- if (nCyclicPatches_ > 0)
- {
- calcCyclicAddressing();
- }
-
-
// Set from initial changed points data
setPointInfo(changedPoints, changedPointsInfo);
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index a40edb3b83cd7b8dc068ee121c59f3919c4ae2e5..2164ae1da13a94bb673c3de3e9c2377a14f34945 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -230,9 +230,6 @@ class PointEdgeWave
//- Merge data from across processor boundaries
void handleProcPatches();
- //- Calculate cyclic halves addressing.
- void calcCyclicAddressing();
-
//- Merge data from across cyclic boundaries
void handleCyclicPatches();
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index ae5edb82ad970b140f73c566003fdde5a11cbe00..d1645ae9ae773d37f096722eccc421d2ade58f57 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -209,16 +209,22 @@ void Foam::regionSplit::fillSeedMask
{
const polyPatch& pp = patches[patchI];
- if (isA<cyclicPolyPatch>(pp))
+ if
+ (
+ isA<cyclicPolyPatch>(pp)
+ && refCast<const cyclicPolyPatch>(pp).owner()
+ )
{
- label faceI = pp.start();
+ // Transfer from neighbourPatch to here or vice versa.
+
+ const cyclicPolyPatch& cycPatch =
+ refCast<const cyclicPolyPatch>(pp);
- label halfSz = pp.size()/2;
+ label faceI = cycPatch.start();
- for (label i = 0; i < halfSz; i++)
+ forAll(cycPatch, i)
{
- label otherFaceI = refCast<const cyclicPolyPatch>(pp)
- .transformGlobalFace(faceI);
+ label otherFaceI = cycPatch.transformGlobalFace(faceI);
transferCoupledFaceRegion
(
@@ -268,7 +274,7 @@ Foam::label Foam::regionSplit::calcRegionSplit
{
// Check that blockedFace is synced.
boolList syncBlockedFace(blockedFace);
- syncTools::swapFaceList(mesh_, syncBlockedFace, false);
+ syncTools::swapFaceList(mesh_, syncBlockedFace);
forAll(syncBlockedFace, faceI)
{
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
index d9be5d55cfd31218359d9632ee74fb18fb82dc1d..56ee4e493b4774a39d823b9810dee96292ddd0ec 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
@@ -97,7 +97,7 @@ void Foam::regionToCell::combine(topoSet& set, const bool add) const
{
neiSet[faceI-nInt] = inSubset[mesh_.faceOwner()[faceI]];
}
- syncTools::swapBoundaryFaceList(mesh_, neiSet, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiSet);
// Find faces inbetween subSet and non-subset.
for (label faceI = 0; faceI < nInt; faceI++)
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 431fad348ce007bc895624c1478e033faaad654a..9a0fcc78798e5c11a958ffd206cd0c79d87df646 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -127,7 +127,7 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiInSet, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiInSet);
// Check all boundary faces
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 9c506589b1ceb3794b556547dc5d25be474f8a8e..0a387c669ff885477df44ceeabc6385d3527abab 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -26,8 +26,6 @@ License
#include "cellZoneSet.H"
#include "mapPolyMesh.H"
#include "polyMesh.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
#include "addToRunTimeSelectionTable.H"
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 1dea0b0e9b02c0c5e35cd19f70ec4825dfee40bb..0569591704b9c4242a5fe794fc8bdddf746695d2 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -26,8 +26,7 @@ License
#include "faceSet.H"
#include "mapPolyMesh.H"
#include "polyMesh.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
+#include "syncTools.H"
#include "addToRunTimeSelectionTable.H"
@@ -113,116 +112,40 @@ faceSet::~faceSet()
void faceSet::sync(const polyMesh& mesh)
{
- const polyBoundaryMesh& patches = mesh.boundaryMesh();
+ boolList set(mesh.nFaces(), false);
+
+ forAllConstIter(faceSet, *this, iter)
+ {
+ set[iter.key()] = true;
+ }
+ syncTools::syncFaceList(mesh, set, orEqOp<bool>());
label nAdded = 0;
- if (Pstream::parRun())
+ forAll(set, faceI)
{
- // Send faces in set that are on a processorPatch. Send as patch face
- // indices.
- forAll(patches, patchI)
+ if (set[faceI])
{
- const polyPatch& pp = patches[patchI];
-
- if (isA<processorPolyPatch>(pp))
+ if (insert(faceI))
{
- const processorPolyPatch& procPatch =
- refCast<const processorPolyPatch>(pp);
-
- // Convert faceSet locally to labelList.
- DynamicList<label> setFaces(pp.size());
-
- forAll(pp, i)
- {
- if (found(pp.start() + i))
- {
- setFaces.append(i);
- }
- }
- setFaces.shrink();
-
- OPstream toNeighbour
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
-
- toNeighbour << setFaces;
+ nAdded++;
}
}
-
- // Receive
- forAll(patches, patchI)
+ else if (found(faceI))
{
- const polyPatch& pp = patches[patchI];
-
- if (isA<processorPolyPatch>(pp))
- {
- const processorPolyPatch& procPatch =
- refCast<const processorPolyPatch>(pp);
-
- IPstream fromNeighbour
- (
- Pstream::blocking,
- procPatch.neighbProcNo()
- );
-
- labelList setFaces(fromNeighbour);
-
- forAll(setFaces, i)
- {
- if (insert(pp.start() + setFaces[i]))
- {
- nAdded++;
- }
- }
- }
+ FatalErrorIn("faceSet::sync(const polyMesh&)")
+ << "Problem : syncing removed faces from set."
+ << abort(FatalError);
}
}
- // Couple cyclic patches
- forAll(patches, patchI)
+ reduce(nAdded, sumOp<label>());
+ if (nAdded > 0)
{
- const polyPatch& pp = patches[patchI];
-
- if (isA<cyclicPolyPatch>(pp))
- {
- const cyclicPolyPatch& cycPatch =
- refCast<const cyclicPolyPatch>(pp);
-
- forAll(cycPatch, i)
- {
- label thisFaceI = cycPatch.start() + i;
- label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
-
- if (found(thisFaceI))
- {
- if (insert(otherFaceI))
- {
- nAdded++;
- }
- }
- else if (found(otherFaceI))
- {
- if (insert(thisFaceI))
- {
- nAdded++;
- }
- }
- }
- }
+ Info<< "Added an additional " << nAdded
+ << " faces on coupled patches. "
+ << "(processorPolyPatch, cyclicPolyPatch)" << endl;
}
-
-
- reduce(nAdded, sumOp<label>());
-
- //if (nAdded > 0)
- //{
- // Info<< "Added an additional " << nAdded
- // << " faces on coupled patches. "
- // << "(processorPolyPatch, cyclicPolyPatch)" << endl;
- //}
}
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index fdee31918fc0257821b0807df6190f38356a2f51..ed552af24b20315f71b40823734e7b5ec8f7146a 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -26,8 +26,6 @@ License
#include "faceZoneSet.H"
#include "mapPolyMesh.H"
#include "polyMesh.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
#include "addToRunTimeSelectionTable.H"
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 4567847d49e317281a5523317590d68be87f192c..53e7c63591595516b5f72be6bcb1751096c9a26b 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -125,8 +125,7 @@ void pointSet::sync(const polyMesh& mesh)
mesh,
contents,
orEqOp<bool>(),
- false, // null value
- false // no separation
+ false // null value
);
// Convert back to labelHashSet
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 2e240d6ea302c05f68c398bdaaa199662c4bff7e..4e026f9e487a7b46fc034f959fe8129ea22921ca 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -287,16 +287,25 @@ void Foam::decompositionMethod::calcCSR
forAll(pbm, patchI)
{
- if (isA<cyclicPolyPatch>(pbm[patchI]))
+ if
+ (
+ isA<cyclicPolyPatch>(pbm[patchI])
+ && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
+ )
{
- const unallocLabelList& faceCells = pbm[patchI].faceCells();
+ const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
+ (
+ pbm[patchI]
+ );
- label sizeby2 = faceCells.size()/2;
+ const unallocLabelList& faceCells = cycPatch.faceCells();
+ const unallocLabelList& nbrCells =
+ cycPatch.neighbPatch().faceCells();
- for (label faceI=0; faceI<sizeby2; faceI++)
+ forAll(faceCells, facei)
{
- label own = faceCells[faceI];
- label nei = faceCells[faceI + sizeby2];
+ label own = faceCells[facei];
+ label nei = nbrCells[facei];
if (cellPair.insert(edge(own, nei)))
{
@@ -348,16 +357,25 @@ void Foam::decompositionMethod::calcCSR
cellPair.clear();
forAll(pbm, patchI)
{
- if (isA<cyclicPolyPatch>(pbm[patchI]))
+ if
+ (
+ isA<cyclicPolyPatch>(pbm[patchI])
+ && refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
+ )
{
- const unallocLabelList& faceCells = pbm[patchI].faceCells();
+ const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
+ (
+ pbm[patchI]
+ );
- label sizeby2 = faceCells.size()/2;
+ const unallocLabelList& faceCells = cycPatch.faceCells();
+ const unallocLabelList& nbrCells =
+ cycPatch.neighbPatch().faceCells();
- for (label faceI=0; faceI<sizeby2; faceI++)
+ forAll(faceCells, facei)
{
- label own = faceCells[faceI];
- label nei = faceCells[faceI + sizeby2];
+ label own = faceCells[facei];
+ label nei = nbrCells[facei];
if (cellPair.insert(edge(own, nei)))
{
@@ -479,7 +497,7 @@ void Foam::decompositionMethod::calcDistributedCSR
}
// Get the cell on the other side of coupled patches
- syncTools::swapBoundaryFaceList(mesh, globalNeighbour, false);
+ syncTools::swapBoundaryFaceList(mesh, globalNeighbour);
// Count number of faces (internal + coupled)
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index fe04eaf8bd5423eb0378de652245409f00854241..70187fad00c76f1e87465ed9677acaca6b3be2ba 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 517e5803b74c637eba7d25f895346ead24c46b98..bc0639b28bbae66b0877a38871dc598de9e5d31e 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -27,7 +27,7 @@ License
#include "fvMesh.H"
#include "cyclicPolyPatch.H"
#include "emptyPolyPatch.H"
-#include "processorPolyPatch.H"
+#include "coupledPolyPatch.H"
#include "surfaceFields.H"
#include "volFields.H"
@@ -96,9 +96,9 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
{
facePatchId = mesh().boundaryMesh().whichPatch(faceI);
const polyPatch& pp = mesh().boundaryMesh()[facePatchId];
- if (isA<processorPolyPatch>(pp))
+ if (isA<coupledPolyPatch>(pp))
{
- if (refCast<const processorPolyPatch>(pp).owner())
+ if (refCast<const coupledPolyPatch>(pp).owner())
{
faceId = pp.whichFace(faceI);
}
@@ -107,18 +107,6 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
faceId = -1;
}
}
- else if (isA<cyclicPolyPatch>(pp))
- {
- label patchFaceI = faceI - pp.start();
- if (patchFaceI < pp.size()/2)
- {
- faceId = patchFaceI;
- }
- else
- {
- faceId = -1;
- }
- }
else if (!isA<emptyPolyPatch>(pp))
{
faceId = faceI - pp.start();
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index 3c63ece5dab6fec115b6dbdb473ab8a3bcf54df0..c6cbc3c11fe6665a55a711c91b34005788fe8edb 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionConstraint.C
- dynamicFvMeshNew.C
+ sixDoFRigidBodyMotionConstraintNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
index bab292bc4ddf0df3835431c1977b5a3109788713..545b17db8dead568bb815fb0eb090b095a51bc38 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
@@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionRestraint.C
- dynamicFvMeshNew.C
+ sixDoFRigidBodyMotionRestraintNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 08bf5ce773354f3022f8878a6b043e7b15874fdb..9cd6a2af07aa5279c5e9980920f0bdfa014e1a2b 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-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,7 +28,6 @@ License
#include "error.H"
#include "Time.H"
#include "OSspecific.H"
-#include "PstreamReduceOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -53,12 +52,8 @@ const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
void Foam::abortCalculation::removeFile() const
{
- bool hasAbort = isFile(abortFile_);
- reduce(hasAbort, orOp<bool>());
-
- if (hasAbort && Pstream::master())
+ if (isFile(abortFile_))
{
- // cleanup ABORT file (on master only)
rm(abortFile_);
}
}
@@ -97,9 +92,14 @@ 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,41 +115,26 @@ void Foam::abortCalculation::read(const dictionary& dict)
void Foam::abortCalculation::execute()
{
- bool hasAbort = isFile(abortFile_);
- reduce(hasAbort, orOp<bool>());
-
- if (hasAbort)
+ if (isFile(abortFile_))
{
switch (action_)
{
case noWriteNow :
- if (obr_.time().stopAt(Time::saNoWriteNow))
- {
- Info<< "USER REQUESTED ABORT (timeIndex="
- << obr_.time().timeIndex()
- << "): stop without writing data"
- << endl;
- }
+ obr_.time().stopAt(Time::saNoWriteNow);
+ Info<< "user requested abort - "
+ "stop immediately without writing data" << endl;
break;
case writeNow :
- if (obr_.time().stopAt(Time::saWriteNow))
- {
- Info<< "USER REQUESTED ABORT (timeIndex="
- << obr_.time().timeIndex()
- << "): stop+write data"
- << endl;
- }
+ obr_.time().stopAt(Time::saWriteNow);
+ Info<< "user requested abort - "
+ "stop immediately with writing data" << endl;
break;
case nextWrite :
- if (obr_.time().stopAt(Time::saNextWrite))
- {
- Info<< "USER REQUESTED ABORT (timeIndex="
- << obr_.time().timeIndex()
- << "): stop after next data write"
- << endl;
- }
+ obr_.time().stopAt(Time::saNextWrite);
+ Info<< "user requested abort - "
+ "stop after next data write" << endl;
break;
}
}
@@ -164,7 +149,7 @@ void Foam::abortCalculation::end()
void Foam::abortCalculation::write()
{
- // Do nothing - only valid on execute
+ execute();
}
diff --git a/src/sampling/probes/probesDict b/src/sampling/probes/probesDict
index 90c0fe96de22780a38981b35bded61e10de7dee2..83da4ce91a74c56f4e7243769c7a3506d070cf96 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index 405065906fa2a066f8901b715139dc6dea90a738..82a8c80185af319dd30cf72dd9cd7e4b84727104 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -26,7 +26,6 @@ License
#include "isoSurface.H"
#include "fvMesh.H"
#include "mergePoints.H"
-#include "syncTools.H"
#include "addToRunTimeSelectionTable.H"
#include "slicedVolFields.H"
#include "volFields.H"
@@ -56,10 +55,10 @@ bool Foam::isoSurface::noTransform(const tensor& tt) const
}
+// Calculates per face whether couple is collocated.
bool Foam::isoSurface::collocatedPatch(const polyPatch& pp)
{
const coupledPolyPatch& cpp = refCast<const coupledPolyPatch>(pp);
-
return cpp.parallel() && !cpp.separated();
}
@@ -73,78 +72,29 @@ Foam::PackedBoolList Foam::isoSurface::collocatedFaces
// Initialise to false
PackedBoolList collocated(pp.size());
- const vectorField& separation = pp.separation();
- const tensorField& forwardT = pp.forwardT();
-
- if (forwardT.size() == 0)
+ if (isA<processorPolyPatch>(pp) && collocatedPatch(pp))
{
- // Parallel.
- if (separation.size() == 0)
- {
- collocated = 1u;
- }
- else if (separation.size() == 1)
- {
- // Fully separate. Do not synchronise.
- }
- else
+ forAll(pp, i)
{
- // Per face separation.
- forAll(pp, faceI)
- {
- if (mag(separation[faceI]) < mergeDistance_)
- {
- collocated[faceI] = 1u;
- }
- }
+ collocated[i] = 1u;
}
}
- else if (forwardT.size() == 1)
- {
- // Fully transformed.
- }
- else
+ else if (isA<cyclicPolyPatch>(pp) && collocatedPatch(pp))
{
- // Per face transformation.
- forAll(pp, faceI)
+ forAll(pp, i)
{
- if (noTransform(forwardT[faceI]))
- {
- collocated[faceI] = 1u;
- }
+ collocated[i] = 1u;
}
}
- return collocated;
-}
-
-
-// Insert the data for local point patchPointI into patch local values
-// and/or into the shared values field.
-void Foam::isoSurface::insertPointData
-(
- const processorPolyPatch& pp,
- const Map<label>& meshToShared,
- const pointField& pointValues,
- const label patchPointI,
- pointField& patchValues,
- pointField& sharedValues
-) const
-{
- label meshPointI = pp.meshPoints()[patchPointI];
-
- // Store in local field
- label nbrPointI = pp.neighbPoints()[patchPointI];
- if (nbrPointI >= 0 && nbrPointI < patchValues.size())
- {
- minEqOp<point>()(patchValues[nbrPointI], pointValues[meshPointI]);
- }
-
- // Store in shared field
- Map<label>::const_iterator iter = meshToShared.find(meshPointI);
- if (iter != meshToShared.end())
+ else
{
- minEqOp<point>()(sharedValues[iter()], pointValues[meshPointI]);
+ FatalErrorIn
+ (
+ "isoSurface::collocatedFaces(const coupledPolyPatch&) const"
+ ) << "Unhandled coupledPolyPatch type " << pp.type()
+ << abort(FatalError);
}
+ return collocated;
}
@@ -157,20 +107,6 @@ void Foam::isoSurface::syncUnseparatedPoints
// Until syncPointList handles separated coupled patches with multiple
// transforms do our own synchronisation of non-separated patches only
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
- const globalMeshData& pd = mesh_.globalData();
- const labelList& sharedPtAddr = pd.sharedPointAddr();
- const labelList& sharedPtLabels = pd.sharedPointLabels();
-
- // Create map from meshPoint to globalShared index.
- Map<label> meshToShared(2*sharedPtLabels.size());
- forAll(sharedPtLabels, i)
- {
- meshToShared.insert(sharedPtLabels[i], sharedPtAddr[i]);
- }
-
- // Values on shared points.
- pointField sharedInfo(pd.nGlobalPoints(), nullValue);
-
if (Pstream::parRun())
{
@@ -181,37 +117,21 @@ void Foam::isoSurface::syncUnseparatedPoints
(
isA<processorPolyPatch>(patches[patchI])
&& patches[patchI].nPoints() > 0
+ && collocatedPatch(patches[patchI])
)
{
const processorPolyPatch& pp =
refCast<const processorPolyPatch>(patches[patchI]);
- const labelList& meshPts = pp.meshPoints();
- pointField patchInfo(meshPts.size(), nullValue);
+ const labelList& meshPts = pp.meshPoints();
+ const labelList& nbrPts = pp.neighbPoints();
- PackedBoolList isCollocated(collocatedFaces(pp));
+ pointField patchInfo(meshPts.size());
- forAll(isCollocated, faceI)
+ forAll(nbrPts, pointI)
{
- if (isCollocated[faceI])
- {
- const face& f = pp.localFaces()[faceI];
-
- forAll(f, fp)
- {
- label pointI = f[fp];
-
- insertPointData
- (
- pp,
- meshToShared,
- pointValues,
- pointI,
- patchInfo,
- sharedInfo
- );
- }
- }
+ label nbrPointI = nbrPts[pointI];
+ patchInfo[nbrPointI] = pointValues[meshPts[pointI]];
}
OPstream toNbr(Pstream::blocking, pp.neighbProcNo());
@@ -227,6 +147,7 @@ void Foam::isoSurface::syncUnseparatedPoints
(
isA<processorPolyPatch>(patches[patchI])
&& patches[patchI].nPoints() > 0
+ && collocatedPatch(patches[patchI])
)
{
const processorPolyPatch& pp =
@@ -240,9 +161,6 @@ void Foam::isoSurface::syncUnseparatedPoints
fromNbr >> nbrPatchInfo;
}
- // Null any value which is not on neighbouring processor
- nbrPatchInfo.setSize(pp.nPoints(), nullValue);
-
const labelList& meshPts = pp.meshPoints();
forAll(meshPts, pointI)
@@ -258,22 +176,72 @@ void Foam::isoSurface::syncUnseparatedPoints
}
}
+ // Do the cyclics.
+ forAll(patches, patchI)
+ {
+ if (isA<cyclicPolyPatch>(patches[patchI]))
+ {
+ const cyclicPolyPatch& cycPatch =
+ refCast<const cyclicPolyPatch>(patches[patchI]);
+
+ if (cycPatch.owner() && collocatedPatch(cycPatch))
+ {
+ // Owner does all.
- // Don't do cyclics for now. Are almost always separated anyway.
+ const edgeList& coupledPoints = cycPatch.coupledPoints();
+ const labelList& meshPts = cycPatch.meshPoints();
+ const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+ const labelList& nbrMeshPoints = nbrPatch.meshPoints();
+ pointField half0Values(coupledPoints.size());
+ pointField half1Values(coupledPoints.size());
- // Shared points
+ forAll(coupledPoints, i)
+ {
+ const edge& e = coupledPoints[i];
+ half0Values[i] = pointValues[meshPts[e[0]]];
+ half1Values[i] = pointValues[nbrMeshPoints[e[1]]];
+ }
- // Combine on master.
- Pstream::listCombineGather(sharedInfo, minEqOp<point>());
- Pstream::listCombineScatter(sharedInfo);
+ forAll(coupledPoints, i)
+ {
+ const edge& e = coupledPoints[i];
+ label p0 = meshPts[e[0]];
+ label p1 = nbrMeshPoints[e[1]];
- // Now we will all have the same information. Merge it back with
- // my local information. (Note assignment and not combine operator)
- forAll(sharedPtLabels, i)
+ minEqOp<point>()(pointValues[p0], half1Values[i]);
+ minEqOp<point>()(pointValues[p1], half0Values[i]);
+ }
+ }
+ }
+ }
+
+ // Synchronize multiple shared points.
+ const globalMeshData& pd = mesh_.globalData();
+
+ if (pd.nGlobalPoints() > 0)
{
- label meshPointI = sharedPtLabels[i];
- pointValues[meshPointI] = sharedInfo[sharedPtAddr[i]];
+ // Values on shared points.
+ pointField sharedPts(pd.nGlobalPoints(), nullValue);
+
+ forAll(pd.sharedPointLabels(), i)
+ {
+ label meshPointI = pd.sharedPointLabels()[i];
+ // Fill my entries in the shared points
+ sharedPts[pd.sharedPointAddr()[i]] = pointValues[meshPointI];
+ }
+
+ // Combine on master.
+ Pstream::listCombineGather(sharedPts, minEqOp<point>());
+ Pstream::listCombineScatter(sharedPts);
+
+ // Now we will all have the same information. Merge it back with
+ // my local information.
+ forAll(pd.sharedPointLabels(), i)
+ {
+ label meshPointI = pd.sharedPointLabels()[i];
+ pointValues[meshPointI] = sharedPts[pd.sharedPointAddr()[i]];
+ }
}
}
@@ -1801,7 +1769,7 @@ Foam::isoSurface::isoSurface
const polyPatch& pp = patches[patchI];
// Adapt separated coupled (proc and cyclic) patches
- if (isA<coupledPolyPatch>(pp) && !collocatedPatch(pp))
+ if (isA<coupledPolyPatch>(pp))
{
fvPatchVectorField& pfld = const_cast<fvPatchVectorField&>
(
@@ -1918,26 +1886,23 @@ Foam::isoSurface::isoSurface
if (patches[patchI].coupled())
{
- if (!collocatedPatch(patches[patchI]))
- {
- const coupledPolyPatch& cpp =
- refCast<const coupledPolyPatch>
- (
- patches[patchI]
- );
+ const coupledPolyPatch& cpp =
+ refCast<const coupledPolyPatch>
+ (
+ patches[patchI]
+ );
- PackedBoolList isCollocated(collocatedFaces(cpp));
+ PackedBoolList isCollocated(collocatedFaces(cpp));
- forAll(isCollocated, i)
+ forAll(isCollocated, i)
+ {
+ if (!isCollocated[i])
{
- if (!isCollocated[i])
- {
- const face& f = mesh_.faces()[cpp.start()+i];
+ const face& f = mesh_.faces()[cpp.start()+i];
- forAll(f, fp)
- {
- isBoundaryPoint.set(f[fp], 1);
- }
+ forAll(f, fp)
+ {
+ isBoundaryPoint.set(f[fp], 1);
}
}
}
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index c4762bd97a23d1d571f500d6ad4cef06ccce3ff3..85cdc148b00c5048c362503293a2f2710b7b6425 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -149,19 +149,6 @@ class isoSurface
//- Per face whether is collocated
PackedBoolList collocatedFaces(const coupledPolyPatch&) const;
- //- Take value at local point patchPointI and assign it to its
- // correct place in patchValues (for transferral) and sharedValues
- // (for reduction)
- void insertPointData
- (
- const processorPolyPatch& pp,
- const Map<label>& meshToShared,
- const pointField& pointValues,
- const label patchPointI,
- pointField& patchValues,
- pointField& sharedValues
- ) const;
-
//- Synchonise points on all non-separated coupled patches
void syncUnseparatedPoints
(
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 822c668f8fed0ff6ea9099b971568334ec051fa7..72837ffd699256886fa17a1716e0188b64d2cb3e 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -755,13 +755,12 @@ void Foam::isoSurfaceCell::calcSnappedPoint
}
}
- syncTools::syncPointList
+ syncTools::syncPointPositions
(
mesh_,
collapsedPoint,
minEqOp<point>(),
- point::max,
- true // are coordinates so separate
+ point::max
);
snappedPoint.setSize(mesh_.nPoints());
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 4ad827a1f32cf9afa124f70aa2462fa2b9b7a09b..72467ed2398c99d06ab248efd1c78656ced3515e 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -116,7 +116,7 @@ Foam::isoSurface::adaptPatchFields
{
// Already has interpolate as value
}
- else if (isA<processorPolyPatch>(pp) && !collocatedPatch(pp))
+ else if (isA<processorPolyPatch>(pp))
{
fvPatchField<Type>& pfld = const_cast<fvPatchField<Type>&>
(
@@ -568,8 +568,8 @@ void Foam::isoSurface::generateTriPoints
}
}
}
- syncTools::swapBoundaryFaceList(mesh_, neiSnapped, false);
- syncTools::swapBoundaryFaceList(mesh_, neiSnappedPoint, false);
+ syncTools::swapBoundaryFaceList(mesh_, neiSnapped);
+ syncTools::swapBoundaryFaceList(mesh_, neiSnappedPoint);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
index ae719eb968abbcaa18672e7e8bf2244f3ec460cf..381b24ae0c0f4bf4de772ee725105498a32b552f 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -330,11 +330,11 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
- << this->dimensionedInternalField().name() << " -> "
+ << this->dimensionedInternalField().name() << " <- "
<< nbrMesh.name() << ':'
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
- << " heatFlux:" << Q
+ << " heat[W]:" << Q
<< " walltemperature "
<< " min:" << gMin(*this)
<< " max:" << gMax(*this)
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index c58c5f162a055aa4f52bf1ca86adfe9dee2283a9..278320f25318ec3f5fa2424c49a347b405eb2e05 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -198,7 +198,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
// Get the coupling information from the directMappedPatchBase
const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
(
- this->patch().patch()
+ patch().patch()
);
const polyMesh& nbrMesh = mpp.sampleMesh();
const fvPatch& nbrPatch = refCast<const fvMesh>
@@ -285,11 +285,11 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
- << this->dimensionedInternalField().name() << " -> "
+ << this->dimensionedInternalField().name() << " <- "
<< nbrMesh.name() << ':'
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
- << " heatFlux:" << Q
+ << " heat[W]:" << Q
<< " walltemperature "
<< " min:" << gMin(*this)
<< " max:" << gMax(*this)
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
index f6107822dfbc1cee80f472537f5ef4448d187c6d..9b95469a648584e4b3311e46e01119a2abc09a49 100644
--- a/src/turbulenceModels/incompressible/RAS/Make/files
+++ b/src/turbulenceModels/incompressible/RAS/Make/files
@@ -44,6 +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
backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C
new file mode 100644
index 0000000000000000000000000000000000000000..a69a36f140c85afe0aa2fa26a988aa954e9aab86
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.C
@@ -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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ABLInletEpsilonFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchScalarField(p, iF),
+ Ustar_(0),
+ z_(pTraits<vector>::zero),
+ z0_(0),
+ kappa_(0.41)
+{}
+
+
+ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+(
+ const ABLInletEpsilonFvPatchScalarField& ptf,
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+ Ustar_(ptf.Ustar_),
+ z_(ptf.z_),
+ z0_(ptf.z0_),
+ kappa_(ptf.kappa_)
+{}
+
+
+ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchScalarField(p, iF),
+ Ustar_(readScalar(dict.lookup("Ustar"))),
+ z_(dict.lookup("z")),
+ z0_(readScalar(dict.lookup("z0"))),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41))
+{
+ if (mag(z_) < SMALL)
+ {
+ FatalErrorIn("ABLInletEpsilonFvPatchScalarField(dict)")
+ << "z is not correct"
+ << abort(FatalError);
+ }
+
+ z_ /= mag(z_);
+
+ evaluate();
+}
+
+
+ABLInletEpsilonFvPatchScalarField::ABLInletEpsilonFvPatchScalarField
+(
+ const ABLInletEpsilonFvPatchScalarField& fcvpvf,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchScalarField(fcvpvf, iF),
+ Ustar_(fcvpvf.Ustar_),
+ z_(fcvpvf.z_),
+ z0_(fcvpvf.z0_),
+ kappa_(fcvpvf.kappa_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void ABLInletEpsilonFvPatchScalarField::updateCoeffs()
+{
+ const vectorField& c = patch().Cf();
+ scalarField coord = (c & z_);
+ scalarField::operator=(pow(Ustar_, 3.0)/(kappa_*(coord + z0_)));
+}
+
+
+// Write
+void ABLInletEpsilonFvPatchScalarField::write(Ostream& os) const
+{
+ fvPatchScalarField::write(os);
+ os.writeKeyword("Ustar")
+ << Ustar_ << token::END_STATEMENT << nl;
+ os.writeKeyword("z")
+ << z_ << token::END_STATEMENT << nl;
+ os.writeKeyword("z0")
+ << z0_ << token::END_STATEMENT << nl;
+ os.writeKeyword("kappa")
+ << kappa_ << token::END_STATEMENT << nl;
+ writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, ABLInletEpsilonFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H
new file mode 100644
index 0000000000000000000000000000000000000000..39560879aa929566299c32045848f7660db21514
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletEpsilon/ABLInletEpsilonFvPatchScalarField.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ ABLInletEpsilonFvPatchScalarField
+
+Description
+ Boundary condition specifies a epsilon inlet for the atmospheric boundary
+ layer (ABL). This boundaty is to be used in conjunction with
+ ABLInletVelocity.
+
+ @verbatim
+ epsilon = Ustar^3 / (K(z + z0))
+
+ where:
+
+ Ustar is the frictional velocity
+ K is karman's constant
+ z is the verical coordinate
+ z0 is the surface roughness lenght
+
+ @endverbatim
+
+ Reference:
+ D.M. Hargreaves and N.G. Wright
+ "On the use of the k-epsilon model in commercial CFD software to model the
+ neutral atmospheric boundary layer"
+ Journal of Wind Engineering and Industrial Aerodynamics 95(2007) 355-369.
+
+SourceFiles
+ ABLInletEpsilonFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ABLInletEpsilonFvPatchScalarField_H
+#define ABLInletEpsilonFvPatchScalarField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+ Class ABLInletEpsilonFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class ABLInletEpsilonFvPatchScalarField
+:
+ public fixedValueFvPatchScalarField
+{
+ // Private data
+
+ //- Peak velocity magnitude
+ scalar Ustar_;
+
+ //- Direction of the z-coordinate
+ vector z_;
+
+ //- Surface roughness lenght
+ scalar z0_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+public:
+
+ //- Runtime type information
+ TypeName("ABLInletEpsilon");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ ABLInletEpsilonFvPatchScalarField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ ABLInletEpsilonFvPatchScalarField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given ABLInletEpsilonFvPatchScalarField
+ // onto a new patch
+ ABLInletEpsilonFvPatchScalarField
+ (
+ const ABLInletEpsilonFvPatchScalarField&,
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchScalarField> clone() const
+ {
+ return tmp<fvPatchScalarField>
+ (
+ new ABLInletEpsilonFvPatchScalarField(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ ABLInletEpsilonFvPatchScalarField
+ (
+ const ABLInletEpsilonFvPatchScalarField&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchScalarField> clone
+ (
+ const DimensionedField<scalar, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchScalarField>
+ (
+ new ABLInletEpsilonFvPatchScalarField(*this, iF)
+ );
+ }
+
+
+ // Member functions
+
+ //- Return max value
+ scalar& Ustar()
+ {
+ return Ustar_;
+ }
+
+ //- Return z direction
+ vector& z()
+ {
+ return z_;
+ }
+
+ //- Update coefficients
+ virtual void updateCoeffs();
+
+ //- Write
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000000000000000000000000000000000..d8e7ae4639bcfa5f896692aa373805a85d480fac
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.C
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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 "ABLInletVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+(
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF
+)
+:
+ fixedValueFvPatchVectorField(p, iF),
+ Ustar_(0),
+ n_(pTraits<vector>::zero),
+ z_(pTraits<vector>::zero),
+ z0_(0),
+ kappa_(0.41)
+{}
+
+
+ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+(
+ const ABLInletVelocityFvPatchVectorField& ptf,
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchVectorField(ptf, p, iF, mapper),
+ Ustar_(ptf.Ustar_),
+ n_(ptf.n_),
+ z_(ptf.z_),
+ z0_(ptf.z0_),
+ kappa_(ptf.kappa_)
+{}
+
+
+ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+(
+ const fvPatch& p,
+ const DimensionedField<vector, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchVectorField(p, iF),
+ Ustar_(readScalar(dict.lookup("Ustar"))),
+ n_(dict.lookup("n")),
+ z_(dict.lookup("z")),
+ z0_(readScalar(dict.lookup("z0"))),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41))
+{
+ if (mag(n_) < SMALL || mag(z_) < SMALL)
+ {
+ FatalErrorIn("ABLInletVelocityFvPatchVectorField(dict)")
+ << "n or z given with zero size not correct"
+ << abort(FatalError);
+ }
+
+ n_ /= mag(n_);
+ z_ /= mag(z_);
+
+ evaluate();
+}
+
+
+ABLInletVelocityFvPatchVectorField::ABLInletVelocityFvPatchVectorField
+(
+ const ABLInletVelocityFvPatchVectorField& fcvpvf,
+ const DimensionedField<vector, volMesh>& iF
+)
+:
+ fixedValueFvPatchVectorField(fcvpvf, iF),
+ Ustar_(fcvpvf.Ustar_),
+ n_(fcvpvf.n_),
+ z_(fcvpvf.z_),
+ z0_(fcvpvf.z0_),
+ kappa_(fcvpvf.kappa_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void ABLInletVelocityFvPatchVectorField::updateCoeffs()
+{
+ const vectorField& c = patch().Cf();
+ scalarField coord = (c & z_);
+ vectorField::operator=(n_*(Ustar_/kappa_)*log((coord + z0_)/z0_));
+}
+
+
+// Write
+void ABLInletVelocityFvPatchVectorField::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")
+ << kappa_ << token::END_STATEMENT << nl;
+ writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchVectorField, ABLInletVelocityFvPatchVectorField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000000000000000000000000000000000..0e7a9167cdb4395f7346339e59666bf0f1a01243
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/ABLInletVelocity/ABLInletVelocityFvPatchVectorField.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / 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
+ ABLInletVelocityFvPatchVectorField
+
+Description
+ Boundary condition specifies a atmospheric boundary layer (ABL)
+ velocity inlet profile given the friction velocity value,
+ flow direction n and direction of the parabolic coordinate z.
+
+ @verbatim
+ U = (Ustar/K) ln((z + z0)/z0)
+
+ where:
+
+ Ustar is the frictional velocity
+ K is karman's constant
+ z0 is the surface roughness lenght
+ z is the verical coordinate
+
+ and:
+
+ Ustar = K Uref/ln((Zref + z0)/z0)
+
+ where:
+
+ Uref is the reference velocity at Zref
+ Zref is the reference height.
+
+ @endverbatim
+
+ Reference:
+ D.M. Hargreaves and N.G. Wright
+ "On the use of the k-epsilon model in commercial CFD software to model the
+ neutral atmospheric boundary layer"
+ Journal of Wind Engineering and Industrial Aerodynamics 95(2007) 355-369.
+
+NOTE: D.M. Hargreaves and N.G. Wright recommend Gamma epsilon in the k-epsilon
+ model should be changed from 1.3 to 1.11 for consistency.
+ The roughness height (Er) is given by Er = 20 z0 following the same
+ reference
+
+SourceFiles
+ ABLInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ABLInletVelocityFvPatchVectorField_H
+#define ABLInletVelocityFvPatchVectorField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+ Class ABLInletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class ABLInletVelocityFvPatchVectorField
+:
+ public fixedValueFvPatchVectorField
+{
+ // Private data
+
+ //- Friction velocity
+ scalar Ustar_;
+
+ //- Flow direction
+ vector n_;
+
+ //- Direction of the z-coordinate
+ vector z_;
+
+ //- Surface roughness lenght
+ scalar z0_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+public:
+
+ //- Runtime type information
+ TypeName("ABLInletVelocity");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ ABLInletVelocityFvPatchVectorField
+ (
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ ABLInletVelocityFvPatchVectorField
+ (
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given ABLInletVelocityFvPatchVectorField
+ // onto a new patch
+ ABLInletVelocityFvPatchVectorField
+ (
+ const ABLInletVelocityFvPatchVectorField&,
+ const fvPatch&,
+ const DimensionedField<vector, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchVectorField> clone() const
+ {
+ return tmp<fvPatchVectorField>
+ (
+ new ABLInletVelocityFvPatchVectorField(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ ABLInletVelocityFvPatchVectorField
+ (
+ const ABLInletVelocityFvPatchVectorField&,
+ 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 ABLInletVelocityFvPatchVectorField(*this, iF)
+ );
+ }
+
+
+ // Member functions
+
+ //- Return max value
+ scalar& Ustar()
+ {
+ return Ustar_;
+ }
+
+ //- Return flow direction
+ vector& n()
+ {
+ return n_;
+ }
+
+ //- Return y direction
+ vector& z()
+ {
+ return z_;
+ }
+
+ //- Update coefficients
+ virtual void updateCoeffs();
+
+ //- Write
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 8291b745f8ca9ece50b8fecc160aeed1476d269e..1fd82c9b3c271d744bcc0036ab3ef07183c1e54f 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.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) 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 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,7 +19,8 @@ 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/>.
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
\*---------------------------------------------------------------------------*/
@@ -133,7 +134,7 @@ void fixedShearStressFvPatchVectorField::updateCoeffs()
{
vectorField nHat = this->patch().nf();
volSymmTensorField Reff = rasModel.devReff();
- Info<< "tau : " << (nHat & Reff.boundaryField()[patchI])() << endl;
+ Info << "tau : " << (nHat & Reff.boundaryField()[patchI])() << endl;
}
fixedValueFvPatchVectorField::updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
index a8878cc450e9c4ce8355a55c1495a10047321166..5597f01bc21dac55d027d3781ce405960056c1f3 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.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) 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 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,7 +19,8 @@ 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/>.
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::fixedShearStressFvPatchVectorField
@@ -45,7 +46,7 @@ namespace Foam
namespace incompressible
{
/*---------------------------------------------------------------------------*\
- Class fixedShearStressFvPatchVectorField Declaration
+ Class fixedShearStressFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
class fixedShearStressFvPatchVectorField
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
index 3e6be442b59f58f03528a1273a2757d91745c004..397b66806fc5995aba08be194a66a638e9ad1846 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
@@ -152,6 +152,21 @@ public:
// Member functions
+ // Acces functions
+
+ // Return Ks
+ scalarField& Ks()
+ {
+ return Ks_;
+ }
+
+ // Return Cs
+ scalarField& Cs()
+ {
+ return Cs_;
+ }
+
+
// Mapping functions
//- Map (and resize as needed) from self given a mapping object
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/U b/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
index 868f8c5149fee13751037a31a3e00e9a36a98859..9b2701a3ae515953c50901eb7e6c878fc2d1dbe2 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,28 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "1";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
}
- patch1
+ patch1_half0
{
type cyclic;
}
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ }
+ patch0_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
index cda0c450b1a1f7ee0164038afa1a3dd84127f18d..254013e6c9f63ad74a4d1e7595ee11d4fc6b6f8e 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,31 +10,48 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object enstrophy;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 -2 0 0 0 0];
+dimensions [ 0 0 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
value uniform 0;
}
- patch1
+ patch1_half0
{
type cyclic;
value uniform 0;
}
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch0_half1
{
type cyclic;
value uniform 0;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/p b/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
index b8f1cdbd52fcc8be0682b2496e48b6a47b47c6f3..0738f6a86781b8089f5a029ad3195c72c2ca319a 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
}
-
- patch1
+ patch1_half0
{
type cyclic;
}
-
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ }
+ patch0_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/U b/tutorials/DNS/dnsFoam/boxTurb16/0/U
index 868f8c5149fee13751037a31a3e00e9a36a98859..9b2701a3ae515953c50901eb7e6c878fc2d1dbe2 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,28 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "1";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
}
- patch1
+ patch1_half0
{
type cyclic;
}
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ }
+ patch0_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
index cda0c450b1a1f7ee0164038afa1a3dd84127f18d..254013e6c9f63ad74a4d1e7595ee11d4fc6b6f8e 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,31 +10,48 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object enstrophy;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 -2 0 0 0 0];
+dimensions [ 0 0 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
value uniform 0;
}
- patch1
+ patch1_half0
{
type cyclic;
value uniform 0;
}
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ patch0_half1
{
type cyclic;
value uniform 0;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/p b/tutorials/DNS/dnsFoam/boxTurb16/0/p
index b8f1cdbd52fcc8be0682b2496e48b6a47b47c6f3..0738f6a86781b8089f5a029ad3195c72c2ca319a 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- patch0
+ patch0_half0
{
type cyclic;
}
-
- patch1
+ patch1_half0
{
type cyclic;
}
-
- patch2
+ patch2_half0
+ {
+ type cyclic;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ }
+ patch1_half1
+ {
+ type cyclic;
+ }
+ patch0_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
index 9973b0032f31d670d094decf11334075e4f7793d..7758339eba3b086e537720b498c6b6ec3b0790c3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
index bbae8091918170ac889ea09258b8ee430c65b892..1999f682b1cef32176181b155c87805e3809153f 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-3
+6
(
- patch0
+ patch0_half0
{
type cyclic;
- nFaces 512;
+ nFaces 256;
startFace 11520;
- featureCos 0.9;
+ neighbourPatch patch0_half1;
}
- patch1
+ patch0_half1
{
type cyclic;
- nFaces 512;
+ nFaces 256;
+ startFace 11776;
+ neighbourPatch patch0_half0;
+ }
+ patch1_half0
+ {
+ type cyclic;
+ nFaces 256;
startFace 12032;
- featureCos 0.9;
+ neighbourPatch patch1_half1;
}
- patch2
+ patch1_half1
{
type cyclic;
- nFaces 512;
+ nFaces 256;
+ startFace 12288;
+ neighbourPatch patch1_half0;
+ }
+ patch2_half0
+ {
+ type cyclic;
+ nFaces 256;
startFace 12544;
- featureCos 0.9;
+ neighbourPatch patch2_half1;
+ }
+ patch2_half1
+ {
+ type cyclic;
+ nFaces 256;
+ startFace 12800;
+ neighbourPatch patch2_half0;
}
)
diff --git a/tutorials/basic/laplacianFoam/flange/0/T b/tutorials/basic/laplacianFoam/flange/0/T
index eb6b0630dfbe3987f6b9f387037eb33d51d38a18..fda50237c2108a8092cec11740f615e6cd380956 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 612c3415e0f942de55bceeea6f18f6703fcfd617..77d8d3c4b1b2339b4a3cb784068f9b5883f22650 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c4ac2d9f945ba014bd2db6919a29d49afb3989d9..c2b2150d9b3dbc50c1b1c8897fcc1ab8b71c437d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 906f2b8441e7ba525a6455aebfab74600d9ebd6e..3d61ee194e9715cfe4ea28f98c18c75dd3a3cf7a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0/U b/tutorials/basic/potentialFoam/cylinder/0/U
index c4ac2d9f945ba014bd2db6919a29d49afb3989d9..c2b2150d9b3dbc50c1b1c8897fcc1ab8b71c437d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0/p b/tutorials/basic/potentialFoam/cylinder/0/p
index 906f2b8441e7ba525a6455aebfab74600d9ebd6e..3d61ee194e9715cfe4ea28f98c18c75dd3a3cf7a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0425c44ef2b6ac482f83af276f0ea082077aaf77..98f2805eff09d6b6fe8bd9bccf4f50a5e9e3cdcd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6ce2a587ad0fc718b51bbc94842bf55bf5df75f7..ec085adb4f59eb5cc3f97b7e0d9c0d100e1ccfc4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/U b/tutorials/basic/potentialFoam/pitzDaily/0/U
index 6ce2a587ad0fc718b51bbc94842bf55bf5df75f7..ec085adb4f59eb5cc3f97b7e0d9c0d100e1ccfc4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/p b/tutorials/basic/potentialFoam/pitzDaily/0/p
index f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
index 0d47b7393d942a61eec550613e46b4b81d4decd2..ed4cbba8d5bd15dc87bf57fb012a63a6ef87a56c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
index f5ecaaa1aeabea87faaa0ef0a3a859493e3f716d..c8dd4f1a7890160f23709cbcb2cc824d32468574 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict b/tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..2adabb4f217630938807a89e65ff8bf132a508d3
--- /dev/null
+++ b/tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict
@@ -0,0 +1,177 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+ (0 0 0)
+ (4 0 0)
+ (0 1 0)
+ (4 1 0)
+ (0 2 0)
+ (4 2 0)
+ (0 0 2)
+ (4 0 2)
+ (0 1 2)
+ (4 1 2)
+ (0 2 2)
+ (4 2 2)
+);
+
+blocks
+(
+ hex (0 1 3 2 6 7 9 8) (40 25 30) simpleGrading (1 10.7028 1)
+ hex (2 3 5 4 8 9 11 10) (40 25 30) simpleGrading (1 0.0984 1)
+);
+
+edges
+(
+);
+
+//patches
+//(
+// wall bottomWall
+// (
+// (0 1 7 6)
+// )
+// wall topWall
+// (
+// (4 10 11 5)
+// )
+// cyclic sides1
+// (
+// (0 2 3 1)
+// (6 7 9 8)
+// )
+// cyclic sides2
+// (
+// (2 4 5 3)
+// (8 9 11 10)
+// )
+// cyclic inout1
+// (
+// (1 3 9 7)
+// (0 6 8 2)
+// )
+// cyclic inout2
+// (
+// (3 5 11 9)
+// (2 8 10 4)
+// )
+//);
+
+boundary
+(
+ bottomWall
+ {
+ type wall;
+ faces
+ (
+ (0 1 7 6)
+ );
+ }
+ topWall
+ {
+ type wall;
+ faces
+ (
+ (4 10 11 5)
+ );
+ }
+
+ sides1_half0
+ {
+ type cyclic;
+ neighbourPatch sides1_half1;
+ faces
+ (
+ (0 2 3 1)
+ );
+ }
+ sides1_half1
+ {
+ type cyclic;
+ neighbourPatch sides1_half0;
+ faces
+ (
+ (6 7 9 8)
+ );
+ }
+
+ sides2_half0
+ {
+ type cyclic;
+ neighbourPatch sides2_half1;
+ faces
+ (
+ (2 4 5 3)
+ );
+ }
+ sides2_half1
+ {
+ type cyclic;
+ neighbourPatch sides2_half0;
+ faces
+ (
+ (8 9 11 10)
+ );
+ }
+
+ inout1_half0
+ {
+ type cyclic;
+ neighbourPatch inout1_half1;
+ faces
+ (
+ (1 3 9 7)
+ );
+ }
+ inout1_half1
+ {
+ type cyclic;
+ neighbourPatch inout1_half0;
+ faces
+ (
+ (0 6 8 2)
+ );
+ }
+
+ inout2_half0
+ {
+ type cyclic;
+ neighbourPatch inout2_half1;
+ faces
+ (
+ (3 5 11 9)
+ );
+ }
+ inout2_half1
+ {
+ type cyclic;
+ neighbourPatch inout2_half0;
+ faces
+ (
+ (2 8 10 4)
+ );
+ }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
index 3fbfd04efad601d78d4b9e9a39de028e006ff496..650d0b954062096331ddd1af8507233be540eca2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5f6bd6c4c3efafdffadb07fbec76eb3070ac632f..0d7442b7b599438cdeb4107be2b4eebf1dcbbfb0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 29395f8940e486b4056b3ad7553776fa686db5e9..2ecafa1cdb2eeda599b81d83d54beebc8f85e061 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e51b3a346f46a2525f2e8d617d3fea333315ee70..c625528d1648cf11570956045bfb20a2db32387b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5d71d1eeae47c87084a59bfde40acbdca34b893e..3ab3f03da4b46a2b2bd5b2200ff5179bb375e5a6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 acf9170256040e7a5214cf230dcf514e53c3ac87..145d82f010edc275814c6e8dc9cc94b059de5ad9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3a1dc34da5a6a48165d1ab7a2ee2820abf37674d..231a96a26d35f0a3aa5e3cf44d279f9033036808 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f0a968598d87fb7746fd8e950a5171505e29f8c3..8c3df7e4bab021ba2455fdc280e23d4a6702c1d7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1f439921e102ed56642cbdf9e39c1ecc7a2aafa2..05bf1b53293ad42e085447b264136dc549337082 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cc2360484baacbb97d98735ab2537d5dc5047223..4893a741d7d5ff1099704e2076be6b9cf3b4d320 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 273b2a1d0e74b1564612b0aa474599c5ff724f78..5935b5b9bf1c04837233f31fbf2f409b5de396fc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c50f8dd3b6ab59e84edd4ce8116afcf483bd65b2..d3cc26e7d8edcece3ed0f559929d3a42b65dd790 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object Su;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
internalField uniform 0.135;
@@ -25,28 +26,29 @@ boundaryField
type fixedValue;
value uniform 0.135;
}
-
outlet
{
type inletOutlet;
inletValue uniform 0.135;
value uniform 0.135;
}
-
upperWall
{
type zeroGradient;
}
-
lowerWall
{
type zeroGradient;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
index 5980f4471a7a33c52a1beeaaffa97f7116d37f18..f8c2f8ec0c30c2a93e9ee7e325f4bb1a6a34fc50 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 293;
@@ -25,30 +26,31 @@ boundaryField
type fixedValue;
value uniform 293;
}
-
outlet
{
type inletOutlet;
inletValue uniform 293;
value uniform 293;
}
-
upperWall
{
type fixedValue;
value uniform 293;
}
-
lowerWall
{
type fixedValue;
value uniform 570;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
index 6c693ab62c47c4b4bff21f5fe776c0fffb044e9e..c0fa420d2b62b98d05296879a8b5e8289480a86a 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object Tu;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 293;
@@ -25,30 +26,31 @@ boundaryField
type fixedValue;
value uniform 293;
}
-
outlet
{
type inletOutlet;
inletValue uniform 293;
value uniform 293;
}
-
upperWall
{
type fixedValue;
value uniform 293;
}
-
lowerWall
{
type fixedValue;
value uniform 570;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
index 15e77cbb136bca51e0f5992d35204d67ec9a230b..6067884afc1f8ba65ad62799fad8ba288dc8503b 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,47 +10,49 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
inlet
{
type turbulentInlet;
- referenceField uniform (13.3 0 0);
- fluctuationScale (0.04 0.02 0.02);
- alpha 0.1;
+ referenceField uniform ( 13.3 0 0 );
+ fluctuationScale ( 0.04 0.02 0.02 );
+ alpha 0.1;
}
-
outlet
{
type inletOutlet;
- inletValue uniform (0 0 0);
- value uniform (0 0 0);
+ inletValue uniform ( 0 0 0 );
+ value uniform ( 0 0 0 );
}
-
upperWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
lowerWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
index 863fce3689a2777fa5680a257e64d0fa567d8627..eb94d243a8299f1a42311c97ef06561d3bc3b3e8 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object Xi;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 1;
@@ -25,28 +26,29 @@ boundaryField
type fixedValue;
value uniform 1;
}
-
outlet
{
type inletOutlet;
inletValue uniform 1;
value uniform 1;
}
-
upperWall
{
type zeroGradient;
}
-
lowerWall
{
type zeroGradient;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index d5bf070dc60eda9fedd295905f57138fc5a08243..3b3abcca8bf70d6ba77f8774cfa16af41350dee9 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object alphaSgs;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -24,28 +25,29 @@ boundaryField
{
type zeroGradient;
}
-
outlet
{
type zeroGradient;
}
-
upperWall
{
type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
-
lowerWall
{
type alphaSgsJayatillekeWallFunction;
value uniform 0;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
index e5324f7be213fcc86b87f4ea7250232f210d7a14..072346a532ce026b329c6d84788bee5d55bb5b17 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object b;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 1;
@@ -25,28 +26,29 @@ boundaryField
type fixedValue;
value uniform 1;
}
-
outlet
{
type inletOutlet;
inletValue uniform 1;
value uniform 1;
}
-
upperWall
{
type zeroGradient;
}
-
lowerWall
{
type zeroGradient;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
index 9ffa783635fa8685f0fe2c8b7c9c9d83a310a86a..862110ed4c789c6277106727b0bf7de2ba4a24d0 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 2e-05;
@@ -25,30 +26,31 @@ boundaryField
type fixedValue;
value uniform 2e-05;
}
-
outlet
{
type inletOutlet;
inletValue uniform 2e-05;
value uniform 2e-05;
}
-
upperWall
{
type zeroGradient;
value uniform 2e-05;
}
-
lowerWall
{
type zeroGradient;
value uniform 2e-05;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
index 049b4b2e16930d7002e74b798e37b08398b0c616..3894d39183dbecfca54f3e40c7de54595996ab03 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object muSgs;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -24,28 +25,29 @@ boundaryField
{
type zeroGradient;
}
-
outlet
{
type zeroGradient;
}
-
upperWall
{
type muSgsUSpaldingWallFunction;
value uniform 0;
}
-
lowerWall
{
type muSgsUSpaldingWallFunction;
value uniform 0;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
index 8f87f2facb4f0d6f04615e47368d342528eff2e4..bfd7be5db2f7b4d190e99ed451e14ca016b3374d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
-internalField uniform 1e5;
+internalField uniform 100000;
boundaryField
{
@@ -24,7 +25,6 @@ boundaryField
{
type zeroGradient;
}
-
outlet
{
type waveTransmissive;
@@ -33,25 +33,27 @@ boundaryField
rho rho;
psi psi;
gamma 1.3;
- fieldInf 1e5;
+ fieldInf 100000;
lInf 0.3;
- value uniform 1e5;
+ value uniform 100000;
}
-
upperWall
{
type zeroGradient;
}
-
lowerWall
{
type zeroGradient;
}
-
- frontAndBack
+ frontAndBack_half0
+ {
+ type cyclic;
+ }
+ frontAndBack_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
index 6eac04dd4778c69b439c810ca332e36a45cc93e6..2caf83dfc8a1f876e3913d3c00d9f7a887927cf8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
index 19a09dd2c70ea42bdd3a67d5f2b730301dfbb213..807a1d700bcacca6e34218714b5a5c6c5d5d12f3 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-5
+6
(
inlet
{
@@ -41,12 +41,19 @@ FoamFile
nFaces 5000;
startFace 721875;
}
- frontAndBack
+ frontAndBack_half0
{
type cyclic;
- nFaces 24450;
+ nFaces 12225;
startFace 726875;
- featureCos 0.9;
+ neighbourPatch frontAndBack_half1;
+ }
+ frontAndBack_half1
+ {
+ type cyclic;
+ nFaces 12225;
+ startFace 739100;
+ neighbourPatch frontAndBack_half0;
}
)
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
index 7e94b7be7badafcf81d0724987b5795138286a45..d2e580c0f43f84a5553d2ece9e630c0ee2b91431 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 07563246953128d3e05df9e29fdcc20aadc583c8..756840b371ab9d18e84e815ef4840dddd317ac3f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 594b9d8f13613d55cf7f92c6f0980f559b3599c4..ec98da12f2dc84b699f7fe07af785e8fe887ceab 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 399882c98aec234a8b5295fe22b6982ed710d33e..8451816bf8b9a272f50ba3b166e467bb9c0366af 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6a6679b493414a11efb008c29ef30c1fec0525ce..e21fdfd192d5f5e3280622e16d43c016ff7ebf4a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6d79d7ef46a85720441df410d9558d4a33ad77fc..11f03d6cd01ff25e03d6427c3e5a3f9fd5ee7f7a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bb2261438e748d3569ae05bbadb3b69b421ff21d..ac78cadd81979e90d4fa7b41272b204295541677 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f4de3286b3b055fca386383a60971bdd6b8d746e..7d5810b1767bdcc0e446bf023da83b2ec93d3652 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0f754753b5241206879d5f130851899b2145588f..0a690886a054c5c1383a803effd26b8e0b2d5df4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 24d80f61cb25a8ec7a236bda398049b1424340d9..ac183157082b176abf7f2a97fe41e4dd578c67aa 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 b/tutorials/combustion/dieselFoam/aachenBomb/0/N2
index f153e95df0d6ca6044f3b38d8acf58e3f6018a0f..3c377c50351f1632476d6f7cc28cc6b811d63ca5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/O2 b/tutorials/combustion/dieselFoam/aachenBomb/0/O2
index 77a26da9239a05c282ffe9c8d0c225009b483d79..d966d53a96c92a17d331ac3f2fe6acbb75d9a476 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/T b/tutorials/combustion/dieselFoam/aachenBomb/0/T
index 5ce3d1719fc118e69798f1dc36b7b9e0c9e43668..accaf72fb0f0253e8738adfa77242f0298cf48e8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/U b/tutorials/combustion/dieselFoam/aachenBomb/0/U
index 8b1633e903444f7fc50261e74b2c1362c12d8aac..06ed818a6b5f26239a1ed7831ed8dbea2f99da0c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
index 982cb78702aaa3855423f6221d2cab4928e91ab9..ed460af0e6b5af75981b34f7be037ce4c3cadb43 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/ft b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
index cb43f04d74a5fef37dd74ae8d0b515db9f3ad705..f9dbf9d442a005c5f3c35637be5aa16b5f0417a8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/fu b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
index 58a0d91732ba4e065a9ccf6609221b3396f2f014..5a3a35f68da719245f45e03a335fb319c352d458 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p
index e73e0d9748f0ddd9ec5f10ba21492537f7a37f77..7cc844fdccf0e8a4cd0daa6e4aba92b36a74218c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
index 223d2839e83e0d3b59c1c8610b9bfdad987a0390..1dd31857dba8cfbf9ab1287217cd5480962c4511 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f7be24a59f73dba36e7498ae70efdb4cc680a3a0..070a7befc06c66196cb74e32c54cdcace242d01c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fe21e4cf458f4ce3027f63104e9f1bcf35b163f0..dfe1035aab16cf0055d1d6951062743a8152367b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1cb000fd6b651164fe67afd413954bad4ccf8d3c..fd0982491c620462f6851cb538d2be2efe95d6c9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9b5a4aaba07b50fa4ded7fdbdbf7fa64ee1c168a..61b02dea13d844c93a773502a5c9288b99978b97 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 326c221fcb3c6c78c0b325e2f78e92880aeea86f..1c7d1ebb4d55cb4cfb065e9a471cc237c216ecb0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cd208831a417067fe0bbb9e0352f1c0e34fde431..48e4aab470ddcae4baead5ef0e43b75acc0903d9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d280f5f5be175e9d7012f9fb9bc9740290546458..c840a07a08e78775f21a5ff3ea0cc2cc6b821f97 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4dd9299c18f84b06c524651daa021f847bbdf238..0fbbd652fef5c361395a5502ae033ccb19005d7d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 85daec9f3036793385511f10ca156466e13028c8..44b0a149551af8622f9968807576310b0de84173 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2f6a283d17eef1cc04a33ab7802af0ff18703799..e3b3011de317a317c710f4fc6b42d666046f8c91 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3c869cb21ce88f96dcfc812f64d9b42f74afd130..80db42f64f8d054dd7a85b2de03ce68589e01a0f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e82c20fd75a68abc8cd8bf73a7dd08400a5df727..f8b645f718b5ca5fe7094bb6e9b642641f632528 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 19305abecd564ccbbe3e4041abba47ed6112e41e..d25a0c7e11d1bf93f25afe42aa3f1bcdeaab1f6b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f516bbc03534963171ff0604299e8e097472b4e1..17f30efd1fb7fd5e67a17052137394e3de003448 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
index 43b9cb32668b63a38acd84dc20537368007b9bab..98d27237ea171a717c84e0497a66cbad00a75484 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 84fecf9489cced19c6955b5278e2763fa9eb9cb0..0f18c0d733830bc2768ff312ea9078a0c821ce14 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
index ce658ffe2525b139025eff2cb449728439bbadf9..ec0f8f9092dbd828af9f68e4cb0c8cca498788f8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,37 +15,31 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-5
+4
(
base
{
type patch;
- nFaces 134;
+ nFaces 150;
startFace 44700;
}
outlet
{
type patch;
nFaces 150;
- startFace 44834;
+ startFace 44850;
}
sides
{
type patch;
nFaces 300;
- startFace 44984;
+ startFace 45000;
}
frontAndBack
{
type empty;
nFaces 45000;
- startFace 45284;
- }
- inlet
- {
- type patch;
- nFaces 16;
- startFace 90284;
+ startFace 45300;
}
)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 7ee7270c9c49358dfb4b454c652af9689ff89375..2e4a2e74af5eccb9b5c187a22a7ac761db6e1355 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
index a0ced45af58128ad43f899fe9ce74570a8ccab90..d44ea0a37125e0c4a34ba83ae4a6c556f39236d4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index 31c2ca798c866cb78ada5a2a2efc5ed9f86127f7..b2ef1f85d98e7df6dace771df1e228f91b611ee5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 600018cf28bc9e00090d4bd6f10785f908c81c10..1d9cb818fcee777680abc0405e0b685344f13dca 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 18b578964e9399089513bceddcf48da3cc963a6d..8b24cb3469fc56cae3a762677be34b696decc0b5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b7272e5ab31442539a51c121a807b7dd82a9b982..ac4b5ee3ed9fb59fec01e8353c90274f565a9e29 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1215229094d38dc5cd3e3ca42e7895a3115ab9f6..dcdd095f09ce778b4f9b289317d1af77e70849bb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8566c3dc243db949c793a897e8e4e9b7ced0772b..3a0de95a3cef9fa762991deb700b5d36c2e2e921 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ee78235a174d03ed782ab826d8be042d03b472cd..3a038966c2d56797f6a8e7f9d15a85cd5e1294e4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 770c1f6fff15577da9f79933dd264f22d627540e..254322f38e0defb9ce1268bf7b66ddc5a57607f1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7352601cb7d5183c8fe79509f104dcd891f25490..374e9131d30b557d560def625079a7f768a49e35 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 11aff05e315216b702e7396b31132a12a5b84029..da2957b4c847cd35605ba82e6bde984b5ec709f2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 55e1248927f6bb96950efb1b8f0b9e2767da7aab..cf60ba7894adaf942a63ada5a18a086a510ce222 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0dcc148e10655b1f626f78723a3f5a210221ff37..52209c27a3d1f591c39186ddab495677b43cad85 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ee1ce9c6d016dd2ca1431a98ed41e8a80ab51022..6b2458ec7657ebe4ab7744bad8fc4bb2dbf68646 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a09e783af6f0b92a4daca2d91af43ed275b8e90b..3fd75130c23483a38dd276b9c826a313c74b4d6f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 78f63564fa8566078778936af378fc7c01dbd3ff..9de9e6bced1b7d0a14b56f6345d3452602362e9c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9911942144f982994f4645ee659a458c45f39cd0..87a0f24bdac4d214ca3ab2dd913940539abcb32a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 78d45ada8591cacce7034462ea0b92ffa938ec2f..94a83152f759c655ef7d7d7d793a07df462f3b1e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 18f61b36137026efc05ecf55745de1722a63f213..7ae764cdc8fe27f3dcae16e998a0592085c7b461 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d7db059aeeef3f515da5b5e4b5d4bf42b1eb139a..a16582984ced87f39b4ff9f54e3963a06ffd0e0a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
index 8d83f66b7afe71734b400821092990b611783992..13f3623dbad5605a70c17e48e4a64cbb5a055e5c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
index fa84a2cdc9a32c9a5154d47c88b9ef284dfc39f1..0d3da1ba78936a126def044a053456659527bd20 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
index 236ba29395dcd89ee6d6f1926f46a8465423d0bc..92841d280b7b7407c04821c0e53fc9a9265e54ff 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 572455f05294295e160fa12c4ededfcd42aaf2c0..86b0c61b1c2957dd0baac112098b80b447ff81c2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dbaa5ab1cd13426db3b67867a7b2a424242facb2..5194ec98dff9afbea94922b95e89f2844c7fcd69 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0426d873242d006f6d1faf5b3bff0a08afddbd7d..dd6f7a1733c3a61f5563b627059abbdb44fa6b8e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fb709cba97151e4c33fec6b2947aba2eff4661e6..3e679952bd5950ded3a9b456522e2aa8d3d50216 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ae769b731453a0ad517a9c381372d6809f6c4b6f..083e7714f3ae0e46b8fd16c09bad2e2c40b22d82 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9ca19696d5efa6561ece675ee1b22bb450c5d540..f2082350de589d3cd8c28decda24d1aab9f67ff6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
index 6b18131bdbdc0e4b4015a84ab8d379af0a701b72..81a1384e4b0498b30c2ac81decb44fb581963519 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
index b1300d4bbda0f3303414ac64acecbb7bca3af6d5..007785e3bcb67a688db3b96173a56738eb8cadac 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
index 25e016803cf03c05a5d26e3f4fed5f2305c37a42..932d7ae8e1fc3cfa414985e6fe4caedb0d4de153 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
index 0b64e4439f035e45ea4ce66aec41e75003a79031..583933f34ae076e6646f727bc0cd7b062c710ae6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ff13de03c7d10a9e6761ed451e9830578c3ff2a5..b85cc7385b0c637e1fb66571a46e851e789e4937 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
index 675cb6d2ee55d5b797e7e4d5e1bc1b741b3c516a..98ec2dbd2699b9bf6a15ef632a44da1a66e7edae 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
index 8d3d63fb73c1f1aa3c7020618081135a5bf025da..99db71dfd9575c01bd3a984b858f7017994290b5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
index 2378dcf603055c99d240512c95f510fd67e80f3e..9c672841a65594d4cd424a606119fb7f6b68dd36 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 593073bcc652cabcccda8a26ef76f06e5d7836bb..cbcfc6c55a54fe6ad3c24ff61eba3d75939978ef 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
index 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
index 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
index 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 84f6d25381c765ce614138a0cf3317aa19441795..5de374c371781f8f88812929995a6a8cde2ed330 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
index ab439e5da6c1997cde048225b6306ce76b761351..74c9fa43c01ddaba7616d26d9b51ae6044687fcf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
index a6d47e78c41f194494cc0e69583e137ad82f329f..c903efcbb174380bb8489a9f970e3633dbb083ae 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
index 0b64e4439f035e45ea4ce66aec41e75003a79031..583933f34ae076e6646f727bc0cd7b062c710ae6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2b1abb18980be68e55a1422107ccc8e01a2cce02..c9d3dd16eb214dc087dd41d6a55c0e9bf7cd8427 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/B b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/B
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/B
index 7247fcdbef32943109bfb5f8262b549ac649b6a3..94cbead26d3a54c0a6fbbe76dadeb2e097b7a8b5 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/T b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/T
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
index e507e0334270261c5ef13eb70170fde574cd72ba..10dca5a78cd2e3690a64ae21131954a1a2d73c62 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
similarity index 89%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/U
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
index 86af6cb642c11fb794f969d2bd44d6e41a3f081d..1cbf4b00ef4790f101d16a28af1f9f965ff9f39e 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -20,7 +20,7 @@ internalField uniform (0 0 0);
boundaryField
{
- inlet
+ inlet
{
type turbulentInlet;
referenceField uniform (10 0 0);
@@ -28,26 +28,26 @@ boundaryField
value uniform (10 0 0);
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
- upperWall
+ upperWall
{
type fixedValue;
value uniform (0 0 0);
}
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform (0 0 0);
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphaSgs
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphaSgs
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/k b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/k
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
index 8b7e616bd1c0dc641081a4538d8aec8d38ca76a9..7f07f9dd1c3fc678f88ab2333a677e8cfeb2bc82 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
index c329a43522ef93c2c14f65c451ecc278dff1e473..3d660931766f22dc73eeb090e4f3c9900e707c16 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muTilda b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muTilda
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
index 34fc080cf7a05fafe9d5b8e29965f3d8a6b1dd30..aa318f8418ea79eb1387646e36bad13813976961 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
similarity index 88%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/p
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
index 874dc6bc8ffca047f342c55fc5797c94df8b7cc4..4893a741d7d5ff1099704e2076be6b9cf3b4d320 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -20,12 +20,12 @@ internalField uniform 1e5;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type waveTransmissive;
field p;
@@ -38,17 +38,17 @@ boundaryField
value uniform 1e5;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 98%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
index 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
index eb4a4e461df4c51d64c38b8a33c61baff06750ca..313dcceba1abd7b93d57320c4c674f1734692506 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/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/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
similarity index 98%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
index ee66ef78e6a23163fa4beee1d2b980a3c3087ce2..98ab2d342a6bd34a6471f36f03d3a1eeeb3a3cb2 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application rhoPisoFoam;
+application rhoPimpleFoam;
startFrom startTime;
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
similarity index 91%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
index b98e0f6c571163a59b79ae127d95d9481b5b98b4..1512d63d8e237d3d53173ec35278c7160aef6b31 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
@@ -23,15 +23,13 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
- grad(p) Gauss linear;
- grad(U) Gauss linear;
}
divSchemes
{
default none;
- div(phi,U) Gauss linear;
- div(phi,h) Gauss linear;
+ div(phi,U) Gauss filteredLinear2V 0.2 0;
+ div(phi,h) Gauss filteredLinear2 0.2 0;
div(phiU,p) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
@@ -54,7 +52,6 @@ laplacianSchemes
interpolationSchemes
{
default linear;
- interpolate(HbyA) linear;
}
snGradSchemes
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
similarity index 77%
rename from tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
index b016735ea1215e6993c921a4e4e91b2d7ebb1593..d6834127cd3658ffdc9d24edb74c1ee321d8794c 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
@@ -21,31 +21,42 @@ solvers
{
solver PCG;
preconditioner DIC;
- tolerance 1e-06;
+ tolerance 1e-6;
relTol 0;
}
- h
+ "(p|rho)Final"
+ {
+ $p;
+ relTol 0;
+ }
+
+ "(U|h|k|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-06;
+ tolerance 1e-6;
relTol 0;
}
- "(U|k|B|nuTilda)"
+ "(U|h|k|nuTilda)Final"
{
- $h;
- tolerance 1e-05;
+ $U;
relTol 0;
}
}
-PISO
+PIMPLE
{
- nCorrectors 2;
+ momentumPredictor yes;
+ nOuterCorrectors 2;
+ nCorrectors 1;
nNonOrthogonalCorrectors 0;
}
+relaxationFactors
+{
+ "(U|h|k|epsilon|omega).*" 1;
+}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
similarity index 95%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/T
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
index 4600a6cc79ac54e263926ceb1506bd57ed158b2d..e1df94398773b013813d4f9f37769c8587889a1c 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
similarity index 96%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/U
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index 300f2217166569cea29e0908e54e338194cb2fc9..fa9053408e12e351500e5e5a3ff182636f830329 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/k
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
similarity index 95%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/0/p
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
index 0a670cc92eb7cf8c06c891c9c311700a7666c0ca..9dc24513e7996ec136fea6c7a1c20423a85cf988 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict
similarity index 97%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict
index 5863a04e716efd2404a54afd54635946689ab1c9..0438819b2509cf399923c3a2ce92ea0999735aea 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
index 1eabb3e673c02b1156cf21d58af2035e8254b3f8..6d6d0669392b2396160799c4747d2e9f6c2c54d2 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/boundary
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
similarity index 94%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/porousZones
index e081bbf9e388af3d134a2214050aa8b20e8fb2ee..634799837eaf7009528df07d027deafc7c6cc1f4 100644
--- a/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
similarity index 81%
rename from tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index bb9efe65599ec4cc60520ec0e4d566e21db0266d..bc91389ba36c301a708daeb560bd7ae7404bd302 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -32,14 +32,7 @@ solvers
relTol 0;
}
- rho
- {
- $p;
- tolerance 1e-05;
- relTol 0;
- }
-
- U
+ "(rho|U|h|k|epsilon|omega)"
{
solver PBiCG;
preconditioner DILU;
@@ -47,9 +40,7 @@ solvers
relTol 0.1;
}
- h { $U; }
-
- "(UFinal|hFinal|R|k|epsilon|omega)"
+ "(rho|U|h|k|epsilon|omega)Final"
{
$U;
tolerance 1e-05;
@@ -60,20 +51,18 @@ solvers
PIMPLE
{
+ momentumPredictor yes;
nOuterCorrectors 50;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
- momentumPredictor yes;
- pMin pMin [ 1 -1 -2 0 0 0 0 ] 1000;
}
relaxationFactors
{
- p 0.3;
- rho 0.05;
- U 0.7;
- h 0.7;
- "(k|epsilon|omega)" 0.7;
+ "p.*" 0.3;
+ "rho.*" 1;
+ "(U|h|k|epsilon|omega)" 0.7;
+ "(U|h|k|epsilon|omega)Final" 1;
}
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/R
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/R
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/R
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/T b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/T
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
index 2fdcf77f745a7dd87439afc9add8894fb03c33ce..e93d5c74482b1fe80eb94bc65943a3fc77edf13b 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/U b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/U
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
index 745a9e12ffb8d83dcec4b4b03614ce7e6696238c..4c2a23c3d1ef5e620fbf4a7bcb6b55d5f5d1c7d2 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/mut
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/mut
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/p b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/0/p
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
index 4b749d4c7480bb2f87e40e65fc258ad642d70709..f3d5040762012331506751f81d14ae28beb37ac1 100644
--- a/tutorials/compressible/rhoPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/blockMeshDict
similarity index 95%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/blockMeshDict
index 5fb6428c770ade908072bca57b7bca255d31d8ff..52c065ae83dcc5367fb3a226cca1606b05d51435 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary
similarity index 92%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary
index 8947c6cace9751ecd3b53633e53e7eb55ad10789..5cfd85f252fbdcbf77bc848269a3110c1079041f 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary
@@ -1,14 +1,14 @@
/*--------------------------------*- 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 | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
similarity index 94%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
index 5207df21bbc4b13d4af263f9adae5c8d4def0932..8e0460733bbe506fef0f56186f4c385a7ab059f6 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application rhoPisoFoam;
+application rhoPimpleFoam;
startFrom startTime;
@@ -33,9 +33,9 @@ writeInterval 0.1;
purgeWrite 0;
-writeFormat ascii;
+writeFormat binary;
-writePrecision 6;
+writePrecision 10;
writeCompression off;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
similarity index 87%
rename from tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
index 863d53ae7f6d9cfe09b30ef6db87d83a1d7569ba..4f6ea01974af7b43ae631d40f295145188172f9f 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
@@ -22,10 +22,16 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ pFinal
+ {
+ $p;
relTol 0;
}
- rho
+ "rho.*"
{
$p;
tolerance 1e-05;
@@ -37,15 +43,22 @@ solvers
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ "(U|h|R|k|epsilon|omega)Final"
+ {
+ $U;
relTol 0;
}
}
-PISO
+PIMPLE
{
+ momentumPredictor yes;
+ nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- momentumPredictor yes;
}
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/T
index 11aacec25878e3cd9fa7656b6e832e32a369dcef..c8760070627a095b7b08401dea7b53162fc5efd5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/U
index 7576a5dc544ea31314c3763429ed75bff2628bcd..ee6588db42363bdd3e5bb01d5ffbe353e241ba0a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/0/p
index 89b97cd69d5b036e26a6f75ba0760c512eb923c0..de53bf93f6d62bd02269a9004e782ccd70c0ed3c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
index 00f3baa8b4d8936c58ce9df0a622244d813dc3d4..bff11fb77f1dbc6c68f903566b10f52ae6b6648d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d00ff96582b01cb35c8819f31a1d1f9be9b39b76..ef73b0c7b75531001c82f6b5b19cefa98298e5d4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9f72950a33660e87d04dd8a9a63651fccef66a2d..dccc042d22493ca6d40e25d7cb8ba8c76f8857aa 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/porousZones
index 85f3ddcc32c192c3d4b939b07556e8e1fef1ddc1..e7986b4d348fbc45c5ca68d87a78a78043636f9f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
index 4600a6cc79ac54e263926ceb1506bd57ed158b2d..e1df94398773b013813d4f9f37769c8587889a1c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index 0b3a166e5b3849bd3c69dc41444b2b9c3d08af3a..88f509425865e94093e76cca468b5839e437ab77 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
index 0a670cc92eb7cf8c06c891c9c311700a7666c0ca..9dc24513e7996ec136fea6c7a1c20423a85cf988 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5863a04e716efd2404a54afd54635946689ab1c9..0438819b2509cf399923c3a2ce92ea0999735aea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1eabb3e673c02b1156cf21d58af2035e8254b3f8..6d6d0669392b2396160799c4747d2e9f6c2c54d2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
index 5494cc7427145953924df2a0d4cd0b7f13e0bd94..43602a72a6b0fed8c3528eb0791f130bcab38fcc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/T b/tutorials/compressible/rhoSimplecFoam/squareBend/0/T
index 2e8687cf0108660bfaf1e25aec719d0a8d03c17c..c8a138aa58790f15280607c4f5efcbb6af718458 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/U b/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
index 8b6eee4ba58d68ae372cee28b1d37e58944e5b47..971e760d3de41121061402f49b9b5f48606e05df 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/p b/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
index cb8900c8271ff1d12e84af7141f64fff96e8ebf5..fa45b63e2ce0c795081c3adcd857d0ec8ff1ba3b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 723e1a8948b1cd56760582a2aae9abf21eb51809..f8b06e3446c6677dfb854db4183fb39cb55b4a9d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/T b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T
index ab439e5da6c1997cde048225b6306ce76b761351..74c9fa43c01ddaba7616d26d9b51ae6044687fcf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/U b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U
index ea567fe8794d4536291de8b1b2bbabfc6bc9747e..488db5a6749ca13acb1a0c0e45649c6ece6d7958 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/p b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p
index 0b64e4439f035e45ea4ce66aec41e75003a79031..583933f34ae076e6646f727bc0cd7b062c710ae6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d3a3349ed66b500b655a8b2b95fdcbb976812e86..43f728fbec3385ee835012de7c14ba04e7f84ce7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4a82eb7719cec924e71db5d1dbfb80cb5c37858a..0fd4b44e6f05f324058b5dc3db3bf4dfda9ca281 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU
index 4a82eb7719cec924e71db5d1dbfb80cb5c37858a..0fd4b44e6f05f324058b5dc3db3bf4dfda9ca281 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2cca973a7b5d0da84dcf43682a61c029c7cde0cd..c9bce43fbbb7a81570510d7ef7d5611927e0390c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/T b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
index 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/U b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
index 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/p b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
index 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 84f6d25381c765ce614138a0cf3317aa19441795..5de374c371781f8f88812929995a6a8cde2ed330 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
index ab439e5da6c1997cde048225b6306ce76b761351..74c9fa43c01ddaba7616d26d9b51ae6044687fcf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
index 3235e3c3f7458ca0559159d370c3c1c49b226b90..ad82f1f256f93c64ee6e73d3406015a6eddd43c8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
index 57da73d4f0c9b37938987b965c0880fcdd8de407..9ec17cbfc065817c530856d6e79983008cce7a18 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2b1abb18980be68e55a1422107ccc8e01a2cce02..c9d3dd16eb214dc087dd41d6a55c0e9bf7cd8427 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ab439e5da6c1997cde048225b6306ce76b761351..74c9fa43c01ddaba7616d26d9b51ae6044687fcf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ea567fe8794d4536291de8b1b2bbabfc6bc9747e..488db5a6749ca13acb1a0c0e45649c6ece6d7958 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f919e8ed31d93332aba8bf40242bdd148c88b50e..5e993bac23829489dfa2bb5d0bfa288ae698c9f3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d3a3349ed66b500b655a8b2b95fdcbb976812e86..43f728fbec3385ee835012de7c14ba04e7f84ce7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4a82eb7719cec924e71db5d1dbfb80cb5c37858a..0fd4b44e6f05f324058b5dc3db3bf4dfda9ca281 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 04e9eb34ed48efe75944420c5c58ac6f12a6cd8e..26cd813bf2c51348e82d72e849c0d5f08c9f757e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 989a9aa6c4016abce119cb0bd297496e5d46ec65..501712894305dd82b2396ae139fec221d35a1466 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4a82eb7719cec924e71db5d1dbfb80cb5c37858a..0fd4b44e6f05f324058b5dc3db3bf4dfda9ca281 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ac9b83800383db32455ef32f7f03183cbef534d..7a9a0ce1aeb6f0acae1e2e87a5a6b14d861d062d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2cca973a7b5d0da84dcf43682a61c029c7cde0cd..c9bce43fbbb7a81570510d7ef7d5611927e0390c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a488a851d7ae7540720de7a4557a056d4eb98a1e..41259fbd7cd4ef878370700c601d62d2a56b0f77 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3d45213e747f6da606cb078e15dd20e2b7674984..c1e2d42a81d26f26e1ef76d03ba071ebabb8bdbc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6bfbcbc5202bd9cdf81d2d7aa56e86bc4322f036..ff971336468b1ac09b040596e0dc763eddd4b0b6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cf0c785ac05bf7bb6a9661996b163956707f7156..d033035f97c0dfd75388cf456ecffa9c18667d97 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a7d30232908c56c71db305ac729c225447f901f3..97bca6a5fc806032c4fc8c89854556bdaa9422df 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fc2e64ae1e2d663970325b008f2499a489c82671..1f0102c348df3cf7dda8a53fac7fd4467d0243a7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4fefb77017332252427eb0e4fd41354509d43b57..be0a9f3334e643e694cfb97e0850b697e644f2b1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f167766b853fae3329879d19057500f3c9a1458a..5422cfc5a63c88eca1c74a3c48a28fa108d920fd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
index 1d20bd2da2182620e61c4800f873aa4e3010ba46..9610e2068b2d06070610fd305677358c473cf858 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
index ed95d613b8e0eba066280de50fab22864a0e5c28..0084d6dc3f7f1d4f976365730b690c402319fec9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 17d703a3a041490196c030347956838af01d06bb..1dd311e1c2ac3a3b81e7ba1bc06007e0aa185479 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
index f799f12d9cdca49b7ce86ba16b82062eb9a9be4f..ece1ab678bf98765b9167650337a833cdc6662bd 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object boundaryT;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
index 2c7a9bbaa99613e62243f4ac2d99c7c4e17b34c9..c75e5506a6ffcc4f0e74d4f75805144e7183260d 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object boundaryU;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
index cd10595cbf2e2348ca6c40daf29b260d1408e6c4..2494f1643f1b6d201b7a9ff35e6e4b07de66fe35 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object dsmcRhoN;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 -3 0 0 0 0 0];
+dimensions [ 0 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
index 1113e00b712194320b60aa781b97d30a8db90bf5..bcc188d7b5a790a122ed4667767c6eeb45d6f929 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object fD;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
index bbf96f206593ef5649f05d25cce84872d1f8f20a..1dd93605f14168df6fea5446e1fe7fdf01c9052e 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object iDof;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 -3 0 0 0 0 0];
+dimensions [ 0 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
index 0a4496dad8d76a9fcda834334dcaa9ad53344bfa..b5e11bb73855edbfea417b5ce73b338d433d2fcc 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object internalE;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
index c50da10c1e4f74a2efd547e5a1aff0328fb14409..4edb0c49dcbad0d7f929b94aca49811d361999f0 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object linearKE;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
index 6d1e2af7df9127364b71d3609bf203719ec51c6f..1b17cb300b1101ba9193c0976630601dadcfc5af 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object momentum;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -2 -1 0 0 0 0];
+dimensions [ 1 -2 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
index fd7e0832dd00ed7c34d0d36605d653bc6e5a795a..e4cb992d829e294268b4721d21cf028bf7eac1ac 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object q;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 0 -3 0 0 0 0];
+dimensions [ 1 0 -3 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
index 767f3be84ecfe7d6aac03975882de752bd551d45..2eb277f9c6aac08e1175469ed8856cf23d8fa8c0 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object rhoM;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -3 0 0 0 0 0];
+dimensions [ 1 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
index 7b05d4dafffd1452bbc944cff98c1f24a24489c8..7d6a69919866eba37b88df23e2b8131f0002db76 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: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object rhoN;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 -3 0 0 0 0 0];
+dimensions [ 0 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
}
-
- yPeriodic
+ yPeriodic_half0
{
type cyclic;
}
-
- zPeriodic
+ zPeriodic_half0
+ {
+ type cyclic;
+ }
+ yPeriodic_half1
+ {
+ type cyclic;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ }
+ xPeriodic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
index 71f793e9de1e6be9ac193b6e1689222283e95701..33fa0433817a0a270277233d657404839c17ccba 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
@@ -27,7 +27,6 @@ nEquivalentParticles 1e12;
WallInteractionModel SpecularReflection;
-SpecularReflectionCoeffs {}
// Binary Collision Model
// ~~~~~~~~~~~~~~~~~~~~~~
@@ -43,9 +42,8 @@ LarsenBorgnakkeVariableHardSphereCoeffs
// Inflow Boundary Model
// ~~~~~~~~~~~~~~~~~~~~~
-InflowBoundaryModel NoInflow;
+InflowBoundaryModel none;
-NoInflowCoeffs {}
// Molecular species
// ~~~~~~~~~~~~~~~~~
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
index 97bf4695307c5f5caabeeea7f9893db19aa9781d..18351b2877d03dfdae46a66f2faad61e12efffc7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
index 3b2f641ec20c76b9836081f4ce540999efedac67..7be12b03615615d7d4762dcdc49f8bdab32c205b 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/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 | |
\*---------------------------------------------------------------------------*/
@@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-3
+6
(
- xPeriodic
+ xPeriodic_half0
{
type cyclic;
- nFaces 512;
+ nFaces 256;
startFace 14464;
- featureCos 0.9;
+ neighbourPatch xPeriodic_half1;
}
- yPeriodic
+ xPeriodic_half1
{
type cyclic;
- nFaces 640;
+ nFaces 256;
+ startFace 14720;
+ neighbourPatch xPeriodic_half0;
+ }
+ yPeriodic_half0
+ {
+ type cyclic;
+ nFaces 320;
startFace 14976;
- featureCos 0.9;
+ neighbourPatch yPeriodic_half1;
}
- zPeriodic
+ yPeriodic_half1
{
type cyclic;
- nFaces 640;
+ nFaces 320;
+ startFace 15296;
+ neighbourPatch yPeriodic_half0;
+ }
+ zPeriodic_half0
+ {
+ type cyclic;
+ nFaces 320;
startFace 15616;
- featureCos 0.9;
+ neighbourPatch zPeriodic_half1;
+ }
+ zPeriodic_half1
+ {
+ type cyclic;
+ nFaces 320;
+ startFace 15936;
+ neighbourPatch zPeriodic_half0;
}
)
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
index 2cfde8992df9086d57f578ca115a28ca30dd45fe..b4415cdcaccbdad11761f5b35880b539283c3764 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
index 0d9e96d66e73b7ca1eaa85e54ca2dfa918939172..c4a7ffe6977d05cd0a9ad4731efde3bef00985ac 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
index d83c09b2269aa1e0f9179a66db871ccbb1c1ea75..823194202066146076c20c8518ef01248073a964 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
index 5c7e8435f4907cf018c773b4978e6e9bb3e76c9c..fbc135df53158591819197c95a7b73e48c2fdc6a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
index f6a14ca9581e0bb00d13407fe780872b1bbe41b7..04bb9394b0ad172d2206f5decbe13cd286c4ad31 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
index 58c7a464f20376b4d8aa5df1d774fc7af506ed39..ff19c819e408f2b2489ba616610d6d65978be8d2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/interpolaterhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/interpolaterhoN
deleted file mode 100644
index 73a629252df9a59f19d8371621b6a3e63599e4d1..0000000000000000000000000000000000000000
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/interpolaterhoN
+++ /dev/null
@@ -1,42 +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 surfaceScalarField;
- location "0";
- object interpolaterhoN;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 -3 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- outlet
- {
- type calculated;
- value uniform 0;
- }
- inlet
- {
- type calculated;
- value uniform 0;
- }
- sides
- {
- type calculated;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
index e1a071e627c5d36320659d28c22dd12ffe132b1d..e8c080b09df389c1512d3de5a3c3e76dcbbf1953 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
index f597df58049d634525a4160328672773bd767b3b..53327c5862c5576307a4ad56e78f13855179a33d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
index 906229f0fd8943b564b74fab42298e11e44c5695..4a8b2d2c3e720bde4612ddf0c06b0fe16482ff30 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
index 02dc5b642e6ba57fd41c34a40e7ae64e15de4763..730a121aa8ed50764f7ddad3bfd4549881e93460 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
index 3d3e599d1c221c73676347da880a2b694a4bc981..b52b74dc0069d2aca4e64dfaacae04da6a3535c1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
index 273e2b2cbe52364a6582ede1a508747f2d3f43fd..154582ddcdbf5017dfaf41a311e25a55c9c7e98d 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
@@ -27,8 +27,6 @@ nEquivalentParticles 1e12;
WallInteractionModel MaxwellianThermal;
-MaxwellianThermalCoeffs {}
-
// Binary Collision Model
// ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
index 69cde6440d9d6fe2f16f467f7ed70b02a3c434a0..eafb3dc32affde3d63fdc39fa483e09ecb34614d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
index 562a25c503b4b6154d0dbd548ebe771bf60f0cc4..196febe80309169829fd303101e5d351f6e66fa5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
index 497cf3201ae458f300a473dc19f97c89471e4009..91eab0e837f893343c17a126fcf4d8735721011e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
index c17242ed6179fb8d9623dd0c5b4b75c4c29a9961..b005545e6642ae19e72cd8cfc83d79e24dfe6f46 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
index 5cb9bf628748999d5af948ffef73ef202a2e0ff8..fae3c26dc8992afad2a8a7004da3a4d6d0c4b7aa 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
index 2d6fc415cabc41043c45f1e90ffc0e88ce587c84..1e13af9370f63157d67336a43f8506b935b100bd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
index fc66ad0a443ad0c0b13ad1292862036aa976db5e..976ec30e748377cdf28804e7eafffd9678af758d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
index 71e0100e21a2981b170fa32907a0524c6cddfc7d..b26e99313c337f33fdd5fb3a6014ddfc4be6bf1f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
index c33b2e6c9cb278fb8a8d29d23e0a6d04ede0126e..05d234bd2a9faeea9e3be9f3704f6c70332adf85 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
index d6461db437c09dee918048b84b8f1cb62af1ace7..5e954626a4b63af5d87c28bbc1b61bd7ed04fd7b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
index c9f47a595d632f4b2c79d49543be91aa1c698e3c..7ec6f3368f6ffb0e880a51f0cf7caf0d5fe7dd08 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
index 1e1977851a3aa896efb806cc41f85988883e7c52..f847c22cd09bcd571c103f2dd0ccb8512cf97fbc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
index 6fd38ae2e68c1805ddf00982b17dc4e779f49c33..bf85f1abe7829525db450e885f5703727dbf681d 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
@@ -25,39 +25,24 @@ nEquivalentParticles 1.2e12;
// Wall Interaction Model
// ~~~~~~~~~~~~~~~~~~~~~~
-//WallInteractionModel SpecularReflection;
WallInteractionModel MaxwellianThermal;
-SpecularReflectionCoeffs {}
-
-MaxwellianThermalCoeffs {}
-
// Binary Collision Model
// ~~~~~~~~~~~~~~~~~~~~~~
-//BinaryCollisionModel VariableHardSphere;
-BinaryCollisionModel LarsenBorgnakkeVariableHardSphere;
+BinaryCollisionModel VariableHardSphere;
VariableHardSphereCoeffs
{
Tref 273;
}
-LarsenBorgnakkeVariableHardSphereCoeffs
-{
- Tref 273;
- relaxationCollisionNumber 5.0;
-}
-
// Inflow Boundary Model
// ~~~~~~~~~~~~~~~~~~~~~
InflowBoundaryModel FreeStream;
-//InflowBoundaryModel NoInflow;
-
-NoInflowCoeffs {}
FreeStreamCoeffs
{
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
index bd60593f88f6c8e8395772a51f81fcc4c7fdd4cb..b9ec0f2ebfb2e6fe53e5c4e1280491c4971b2a56 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
index 2f381b011bfd45d48bad0faae938c7cfa0043471..f587cd73801a22ca0080a46e5b85625d271dbe53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -32,9 +32,9 @@ boundaryField
value uniform 550;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
index b83ab4b41c26dc6a0deb7a8219af1076fd728bfb..415380b9891c6c4b7afd1a4f69009f4ce2e0d38e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -32,9 +32,9 @@ boundaryField
value uniform (0 0 0);
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
index 7575c83fcf5ce17fd81c6f8dc582c64dfdc76293..07c6a1b456e23d56b39e27de03e9849d624402ef 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -30,9 +30,9 @@ boundaryField
type zeroGradient;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
index 7b90c7d7a2b44ba8e42f9a96035537576fcad4df..646849b96e5abba41f92fde621167fa11d4f9b4b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform (0 0 0);
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
index 9c96369cd646ade45ee663995d33574ef389c2bd..1ce7e3b052bc821b0cf23b7fcd0763629c6f3a6d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
index b93273a4d0ee6f18bf7a1a1ddf0bda9ca724fc73..b13d432e3a228a010213250f39d4cbd86f65d0e2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
index df1b1c05f810358074d08a85b665b13edbdb6ce2..189311cb1dc5f9a7113727652d214f5848cf20de 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
index 84c095e1ee155b573ce020c2552064231bc51037..979ab3893adf9dafe1e93e7e67b54da395ff846b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform (0 0 0);
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
index 5d1d38abfb36f12fb4d426bd2ecdf13f81f80ad8..5de7659935206a2a837b4b10f48d80687caaff9f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
index f4351eb42a02f72695a04d8e85533d2b6e4e755a..3f9855fdb9335f40fe545f272565e0c65ec8c410 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
index a5d398a37cb2dabcf31951ae0589b9005b62a2c6..f4305a74a9951d9be82c32326084b6f25d273922 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,9 +31,9 @@ boundaryField
value uniform 0;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
index d338013dcce4998074e9bc28c288543e5936af1c..032885b138fbd9b9f2272c30ca882a5c0564e77b 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
@@ -27,8 +27,6 @@ nEquivalentParticles 5e12;
WallInteractionModel MaxwellianThermal;
-MaxwellianThermalCoeffs {}
-
// Binary Collision Model
// ~~~~~~~~~~~~~~~~~~~~~~
@@ -47,8 +45,6 @@ LarsenBorgnakkeVariableHardSphereCoeffs
InflowBoundaryModel FreeStream;
-NoInflowCoeffs {}
-
FreeStreamCoeffs
{
numberDensities
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
index 85c33661fe262ce5a5129215d90c40d618e78fa1..5ef67b3d5842cf3e8e113eeec14aa3fe3378cece 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -18,26 +18,26 @@ convertToMeters 1;
vertices
(
- (-0.15242 0 -0.05)
- ( 0 0 -0.05)
- ( 0.3048 0.081670913853 -0.05)
- (-0.15242 0.3 -0.05)
- ( 0 0.3 -0.05)
- ( 0.3048 0.3 -0.05)
+ (-0.15242 0 -0.0042)
+ ( 0 0 -0.0042)
+ ( 0.3048 0.081670913853 -0.0042)
+ (-0.15242 0.3 -0.0042)
+ ( 0 0.3 -0.0042)
+ ( 0.3048 0.3 -0.0042)
- (-0.15242 0 0.05)
- ( 0 0 0.05)
- ( 0.3048 0.081670913853 0.05)
- (-0.15242 0.3 0.05)
- ( 0 0.3 0.05)
- ( 0.3048 0.3 0.05)
+ (-0.15242 0 0.0042)
+ ( 0 0 0.0042)
+ ( 0.3048 0.081670913853 0.0042)
+ (-0.15242 0.3 0.0042)
+ ( 0 0.3 0.0042)
+ ( 0.3048 0.3 0.0042)
);
blocks
(
- hex (0 1 4 3 6 7 10 9 ) (20 40 12) simpleGrading (1 1 1)
- hex (1 2 5 4 7 8 11 10) (40 40 12) simpleGrading (1 1 1)
+ hex (0 1 4 3 6 7 10 9 ) (20 40 1) simpleGrading (1 1 1)
+ hex (1 2 5 4 7 8 11 10) (40 40 1) simpleGrading (1 1 1)
);
edges
@@ -58,7 +58,7 @@ patches
(
(1 2 8 7)
)
- cyclic periodic
+ empty frontAndBack
(
(0 3 4 1)
(1 4 5 2)
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/boundary
index 3c32e9b0e45d140b2507c26bdb7cf13e06c0f350..0ea523348c908b5c83bd197dcc8cf423a92b01ae 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/boundary
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/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 | |
\*---------------------------------------------------------------------------*/
@@ -20,21 +20,20 @@ FoamFile
flow
{
type patch;
- nFaces 1920;
- startFace 82800;
+ nFaces 160;
+ startFace 4700;
}
obstacle
{
type wall;
- nFaces 480;
- startFace 84720;
+ nFaces 40;
+ startFace 4860;
}
- periodic
+ frontAndBack
{
- type cyclic;
+ type empty;
nFaces 4800;
- startFace 85200;
- featureCos 0.9;
+ startFace 4900;
}
)
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 31f6cf1b8de8eaf45b8aac2d4e60d15c9bb8457f..2c4749bb06a5bfbe185a684edec7d52f783a75a8 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -23,14 +23,13 @@ startTime 0;
stopAt endTime;
-endTime 0.00125;
-// endTime 0.01;
+endTime 0.02;
deltaT 2e-6;
writeControl runTime;
-writeInterval 1e-4;
+writeInterval 1e-3;
purgeWrite 0;
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
index eb1bea1fce690ff2dbc5e771db06d9a27737c1a1..f1482468d421307958abf604cda46138a6feee91 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
@@ -21,7 +21,7 @@ method simple;
simpleCoeffs
{
- n ( 1 1 4 );
+ n ( 2 2 1 );
delta 0.001;
}
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
deleted file mode 100644
index 786c02fc0c7a7b2bca257e8a9539753967f29975..0000000000000000000000000000000000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
+++ /dev/null
@@ -1,37 +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 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 434cdea83b046941c07d4aa02e71f7396176d43a..947047da6982639a71483731c9f28e4def1dc794 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8a432d8218a393fbc4a6a57c760751a451340401..769ffba243754c2466291c72b8dde6433f8f3127 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/boundary b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/boundary
index 850c9baa1ec078697b17ec724c99578c6047e10d..27b419834dad502306e2c14b961decb22a2277b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/boundary
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/boundary
@@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-3
+6
(
- periodicX
+ periodicX_half0
{
type cyclic;
- nFaces 288;
+ nFaces 144;
startFace 4752;
- featureCos 0.9;
+ neighbourPatch periodicX_half1;
}
- periodicY
+ periodicX_half1
{
type cyclic;
- nFaces 288;
+ nFaces 144;
+ startFace 4896;
+ neighbourPatch periodicX_half0;
+ }
+ periodicY_half0
+ {
+ type cyclic;
+ nFaces 144;
startFace 5040;
- featureCos 0.9;
+ neighbourPatch periodicY_half1;
}
- periodicZ
+ periodicY_half1
{
type cyclic;
- nFaces 288;
+ nFaces 144;
+ startFace 5184;
+ neighbourPatch periodicY_half0;
+ }
+ periodicZ_half0
+ {
+ type cyclic;
+ nFaces 144;
startFace 5328;
- featureCos 0.9;
+ neighbourPatch periodicZ_half1;
+ }
+ periodicZ_half1
+ {
+ type cyclic;
+ nFaces 144;
+ startFace 5472;
+ neighbourPatch periodicZ_half0;
}
)
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 4da03ed3f3d31013c6d47b623d09966dff06787b..6846736f6be63f7fef67c1ec70d2371768e06f04 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1c829f6d4cba56254968da7c6ddb6150881c6195..78b5c29d385f4802fa7361fb70cad21c03e3e0be 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 33e684a3ee52bbf54d5e57aad0231aedcea077ea..992b7b3d47c0724e161aba0d375a28a93c3fbc40 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 32ad6ab7f31ffd17adc1016b43d4c9a46a344c89..0c0439ca09b7b4a102d6d685929d1b9b43e341b4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bf7767259ecc97a86cc9b98c2b30b640147aeda1..5d6aca13c1c4e2808648446fc82b4d59bd9b8f80 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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
deleted file mode 100644
index 786c02fc0c7a7b2bca257e8a9539753967f29975..0000000000000000000000000000000000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
+++ /dev/null
@@ -1,37 +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 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 f62302881c4fe53d3bdd8b9f12c8dee18f6f46a2..b7167f77ac3abc6a586bc3ba80a3d305c8268c37 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6ca693e6a022f774f4bc5019325de72dff234b7c..bb24cc7054e57d7638f7ab9d42cc07f7ea301c7c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/boundary b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/boundary
index 435792380c287b91998681aa08de3a108131264c..d5b72fc7283c8c32830f1a2f73740630e53f023a 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/boundary
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/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 | |
\*---------------------------------------------------------------------------*/
@@ -15,28 +15,49 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-3
+6
(
- periodicX
+ periodicX_half0
{
type cyclic;
- nFaces 264;
+ nFaces 132;
startFace 4344;
- featureCos 0.9;
+ neighbourPatch periodicX_half1;
}
- periodicY
+ periodicX_half1
{
type cyclic;
- nFaces 264;
+ nFaces 132;
+ startFace 4476;
+ neighbourPatch periodicX_half0;
+ }
+ periodicY_half0
+ {
+ type cyclic;
+ nFaces 132;
startFace 4608;
- featureCos 0.9;
+ neighbourPatch periodicY_half1;
}
- periodicZ
+ periodicY_half1
{
type cyclic;
- nFaces 288;
+ nFaces 132;
+ startFace 4740;
+ neighbourPatch periodicY_half0;
+ }
+ periodicZ_half0
+ {
+ type cyclic;
+ nFaces 144;
startFace 4872;
- featureCos 0.9;
+ neighbourPatch periodicZ_half1;
+ }
+ periodicZ_half1
+ {
+ type cyclic;
+ nFaces 144;
+ startFace 5016;
+ neighbourPatch periodicZ_half0;
}
)
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index ad34ce0b2c39e1fdd0f4ac11995a2c45e60ca92f..dda6c1a4de2e523c4439c28d1964d89e285dd042 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9e252f9135df6627734a8d474e3b55b5fd5c9fbb..3d0485eefa85f372c1c40e4e0f794b3f438f1896 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 68019a7f1e615c4857d6b8132f8b485aca901ebe..aa3060834feef98f2c9dee01a27d9e59c0533c9a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d4b32368717e1b8ee98c05456d76380fdb5bf7a1..2c2f42d851a6791c199cc31706648efd460cbaca 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 98ae840006b1aedf4011ea4703303fef65b8a3d9..c1af478bcc0e7a7c9ab704f0b329656bc0590bc2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 188b54d50d390e8c6b7a85d3b97e03f868fcf7ce..b9dc8a00f4cdb6a111635e8b620ffc2011f275cc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 83a924ce2b7a96f884e8da8acd408e4666674361..14f7fb31776018dbf0cc7b39404f60d028ea8f69 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d4c6546e3e29e467a90ee21543d13fa68b2a50c8..11d54e00c527d7d561ed18e4cf9f6d6ae6a1e5c3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7e5b2dcfa9c7dc1a2baa89783adffe6b7e3dfee9..708791f4ec1587ff7e038013329ad2ad9e194c12 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 061d98f166e750b68618d1b19bc5424f4c9d09ed..8c5e563a6480a70440f16fe47e3de779079cc501 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 68019a7f1e615c4857d6b8132f8b485aca901ebe..aa3060834feef98f2c9dee01a27d9e59c0533c9a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2373141f8a2c163665e0743624752e77a66a994f..5b10f0048d158d3cbf45caddebe09a32998bacd8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 98ae840006b1aedf4011ea4703303fef65b8a3d9..c1af478bcc0e7a7c9ab704f0b329656bc0590bc2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
index ca10e4a9f621b8617709c70ff8a2fdadc37fbd11..301b230f427860b64ac2c98d6d61df73e791f5cb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
index f0abe5c74aefd2a26ba279638c12e29ff9f4a91a..ab4ad199e69ce699a12894b0f85d43a699868756 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 caa5da75d903f743279f05938abdd3fc2b0f4be5..5cc96fdb79679bcdbd0c7cd24e591879b918a305 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/B b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
index 3ce5a237b34928024dbf4c4b50aad003616ada57..7027728c0a64984169818edcda258de98d80b595 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/U b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
index f269e2a862d90a40239531c4b65266f372cc467a..9ddff27844014d6cc1e898c1c06e6f1f4ae49dfb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/p b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
index da9131c4243f33b8eae25eef4fc254ee1c3feaf4..61a8a91555470a255ed3e810f93cd23b3c1add78 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/pB b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
index f3e16d564e955343889f4952f1ac482d02e79747..0d7b5a060d108b6ece370352da0bc0dd4cfcb9be 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 aa90c2b886eeb3076fab7630ad9b00c6f6d1b754..885c2b67dedd7b56b0cca67572bceeda157d3eab 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V
index 3eea666e14fd2501f03b05a3faeb41288e4517a6..43902e350fb44f071eac8b0512eaeea98c6d93f3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 544668f72159f9b840af8da42efc0bb2238cf8b2..4a90e62405e0c7c5fcabf2f03012ecea50df7199 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T
similarity index 97%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T
index 0a7701acf8cf9afcd9056c41195d58d0afa803ae..76b8877c7e780d42f65a1520dcaba50fa64795d8 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
similarity index 97%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/T.org
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
index 0a7701acf8cf9afcd9056c41195d58d0afa803ae..76b8877c7e780d42f65a1520dcaba50fa64795d8 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
index 3f054f0a23d177540befdf3efc2607f5154d85f2..2d20d38354d7c5b03739f6103d0ab251e6b85183 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
index fcaa8d0c1dd5f6bcf88248540939fa15760f20d3..5398bd05954b8f8ab9aad002275c0a267cc39825 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
similarity index 95%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
index 12d1bdf61ad58d1919b88e88b9622240337063a2..fa5d55a2b2e0dd4e562a4f57baa0e9ed58f40c47 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
similarity index 83%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
index 814ade458e36f85190977d27fd5c9e27a843eb36..cb0be1e6e06e5244e2bddc492b8cb56b1ca04acd 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
-compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
+compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
runApplication blockMesh
runApplication setHotRoom
runApplication $application
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
similarity index 95%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index 84848b66f0cb86e8f82bcb07c200fb0af599401f..e6ba59b71ddabe665b681333294b610a8a558636 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/boundary
index b66c382b6a97cb8be2343bf548a944f463442571..0d4d0e498dae524c835cc1addc9707eb5af47fb3 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/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/buoyantBoussinesqPisoFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
similarity index 94%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/transportProperties
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
index edc9d789a473b319e49eeae9140e7f682b940ffa..12e263d48c07d0911bf71ff2a17676c737c4eff9 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
similarity index 91%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
index 53d1882a044bad7508845c178951f2916e24a570..1d5d0b66a78afc493ea0aed13384abfd9aa9fa71 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application buoyantBoussinesqPisoFoam;
+application buoyantBoussinesqPimpleFoam;
startFrom startTime;
@@ -23,13 +23,13 @@ startTime 0;
stopAt endTime;
-endTime 1000;
+endTime 2000;
-deltaT 1;
+deltaT 2;
writeControl timeStep;
-writeInterval 100;
+writeInterval 200;
purgeWrite 0;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
similarity index 81%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
index 2526e8b4b12e25990b8962a606a349c98e01ddc5..8a3fb5637562e3f1d98e08fd90a6475e39d55c32 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
@@ -21,14 +21,13 @@ solvers
{
solver PCG;
preconditioner DIC;
- tolerance 1e-07;
+ tolerance 1e-8;
relTol 0.1;
}
pFinal
{
$p;
- tolerance 1e-07;
relTol 0;
}
@@ -36,19 +35,31 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-6;
+ relTol 0.1;
+ }
+
+ "(U|T|k|epsilon|R)Final"
+ {
+ $U;
relTol 0;
}
}
-PISO
+PIMPLE
{
- momentumPredictor yes;
+ momentumPredictor no;
+ nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
pRefCell 0;
pRefValue 0;
}
+relaxationFactors
+{
+ "(U|T|k|epsilon|R)" 1;
+ "(U|T|k|epsilon|R)Final" 1;
+}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T
index c4031678832c6ae81dd0f7fd24b522bc0a0c9d3d..18610a300b685b169a045233b2775105e8767351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c4031678832c6ae81dd0f7fd24b522bc0a0c9d3d..18610a300b685b169a045233b2775105e8767351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
index 3f054f0a23d177540befdf3efc2607f5154d85f2..2d20d38354d7c5b03739f6103d0ab251e6b85183 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
index fcaa8d0c1dd5f6bcf88248540939fa15760f20d3..5398bd05954b8f8ab9aad002275c0a267cc39825 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
index 12d1bdf61ad58d1919b88e88b9622240337063a2..fa5d55a2b2e0dd4e562a4f57baa0e9ed58f40c47 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 84848b66f0cb86e8f82bcb07c200fb0af599401f..e6ba59b71ddabe665b681333294b610a8a558636 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
index edc9d789a473b319e49eeae9140e7f682b940ffa..12e263d48c07d0911bf71ff2a17676c737c4eff9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index 7ef0fa06e2bf99b087a861bb1d541a8f045abff0..a63d9d4ad9222c0b97a121130d60f561ac80810e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 3403ec4715db52fb23a44e5aaacce0cb5faf03ce..3d3a738a377b00ff034663164408f9453e54ec05 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index 42d75c5d3edcbfb14a945f0ae7d66a0053f07598..e425ac8eb5b7c3ad917d1fa8f4c33b94d601afc9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index de044e160322a78b9ef0c197b25047475fceba24..a3743ec6591a7e42dddec7b8699a812fff831bc5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 03b5b6722eb4da7337f54418a29df3e33383c165..eec7278da05642c3e09c68c1b651f59070267b0d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
index edc9d789a473b319e49eeae9140e7f682b940ffa..12e263d48c07d0911bf71ff2a17676c737c4eff9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ed62a3046c0acd3a0e8b7907539fffc2bec5fa64..5ee3242eb38c54322743376defb1257c5af32d48 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 6f6506f595d78426b018fd98d885b82be0073d39..4c921888160634dd27f7603a95d5b828521f7341 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
index 75ad17a3a43e63187e33fce7258be0e76714984f..8d91e2e9f1124b71ad6cbb03305baa9cf40cb89a 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T.org
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
index 75ad17a3a43e63187e33fce7258be0e76714984f..8d91e2e9f1124b71ad6cbb03305baa9cf40cb89a 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
similarity index 94%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
index 3f054f0a23d177540befdf3efc2607f5154d85f2..2d20d38354d7c5b03739f6103d0ab251e6b85183 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/alphat
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/mut
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/mut
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
index c93d03abc69ff2671ea9e3881f68f0c2887b1bec..60476789b96d7bb407921a9f67df1d88bde8abec 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
similarity index 95%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
index 84848b66f0cb86e8f82bcb07c200fb0af599401f..e6ba59b71ddabe665b681333294b610a8a558636 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/boundary
index b66c382b6a97cb8be2343bf548a944f463442571..0d4d0e498dae524c835cc1addc9707eb5af47fb3 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/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/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/turbulenceProperties
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/files
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/files
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/options
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/Make/options
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/createFields.H
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/createFields.H
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/setHotRoom.C
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/setHotRoom/setHotRoom.C
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
similarity index 93%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
index 11e3efe957916a56bee39b245f8a40fd42cd2bde..df7983f0d9ebe7d3cb61404a07dce18f7ac67dce 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application buoyantPisoFoam;
+application buoyantPimpleFoam;
startFrom startTime;
@@ -23,9 +23,9 @@ startTime 0;
stopAt endTime;
-endTime 1000;
+endTime 2000;
-deltaT 1;
+deltaT 2;
writeControl timeStep;
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
similarity index 86%
rename from tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
index c1e26f6e57cce3e022ece0f1bce5687dc5860388..eb860df2b23ffa537444df0ceec2de4abf6a340f 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
solvers
{
- rho
+ "rho.*"
{
solver PCG;
preconditioner DIC;
@@ -29,14 +29,13 @@ solvers
{
solver PCG;
preconditioner DIC;
- tolerance 1e-06;
+ tolerance 1e-8;
relTol 0.1;
}
pFinal
{
$p;
- tolerance 1e-06;
relTol 0;
}
@@ -44,13 +43,21 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-6;
+ relTol 0;
+ }
+
+ "(U|h|k|epsilon|R)Final"
+ {
+ $U;
relTol 0;
}
}
-PISO
+PIMPLE
{
+ momentumPredictor no;
+ nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
index e270b4ef128b55e0393ad56165ad8716f07d420b..c15520f99480bc62f8cee42c8c9682936da065f4 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 2858e65d322dc5212b43f3c2042e19452577ecd0..3e850b913b8e4e22f89efb090f72b55cc95df55b 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 2eda19d6adc19c4a5031eb3676156e6292ec3c7c..19224ed2b042a1d302968794cc34529c1300e58a 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 28b914fd7620ad2d9b0b105016ebccfd76b71c23..8abafb5ce5cf041f2557f35504df2a499bfe75b7 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 5dbe4b8413cb95c9aecf357af329c67b09f7c590..318288028686d750f4296b265ae9d58b23ce7f34 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/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index c1d6b112e91446fb68a8fafe3a2f7a41c06ea7f3..6f5a818e17daaa710530bcf2d17628d8f1a71fd5 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 b0a009a45b738004974598ce0d35af0583a7b917..e250c63939d7c025988d79068560350c1ba8add0 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 3aa1a122cc904369d3d669f4829a14501bd9eadb..517ebe571ff909252e2a8706f196144db76d11f5 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
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
index 9625d2cd11f1f4d357d711f94464455b8144dd2e..e2b70a1cfe2690053d349bbb64d08b8da4c965c3 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
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
index 0a7701acf8cf9afcd9056c41195d58d0afa803ae..76b8877c7e780d42f65a1520dcaba50fa64795d8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0a7701acf8cf9afcd9056c41195d58d0afa803ae..76b8877c7e780d42f65a1520dcaba50fa64795d8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
index 3f054f0a23d177540befdf3efc2607f5154d85f2..2d20d38354d7c5b03739f6103d0ab251e6b85183 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
index c93d03abc69ff2671ea9e3881f68f0c2887b1bec..60476789b96d7bb407921a9f67df1d88bde8abec 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 84848b66f0cb86e8f82bcb07c200fb0af599401f..e6ba59b71ddabe665b681333294b610a8a558636 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
index 44a41769a9dd386184575d112e948e0790ca5c89..6139ef5da8ac0923e8705812e26b03323c200739 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
index 026b3aa7665cd5d0a5b9c3c5e0c4256c8f441f1c..513a57a47aebda443516fb055dc8bbd50f6ef263 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
index 9a2a7f88bf6604fbbaf948c6b83740061274e472..68b5a4fa26490a6f53ed121de52fffbcf7b97092 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
index 8ac4cd06242b79f1f994da332d1033080ef46d41..f1dea8c18989c78a05ad64ed102298c10f42d1d6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 153904f7560becae2a45e43cb313d8952a743a16..4e67bfd893d1236ad447c9cbaa6fa3a04d70a9c3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/G
index 44a41769a9dd386184575d112e948e0790ca5c89..6139ef5da8ac0923e8705812e26b03323c200739 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/IDefault
index 44c3e87c9b282224bd406b79816872bf835daa8f..9f2e99587e8a40c74464e53f4875dfbebe2e0482 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/T
index 026b3aa7665cd5d0a5b9c3c5e0c4256c8f441f1c..513a57a47aebda443516fb055dc8bbd50f6ef263 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/U
index 9a2a7f88bf6604fbbaf948c6b83740061274e472..68b5a4fa26490a6f53ed121de52fffbcf7b97092 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
index 8ac4cd06242b79f1f994da332d1033080ef46d41..f1dea8c18989c78a05ad64ed102298c10f42d1d6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 153904f7560becae2a45e43cb313d8952a743a16..4e67bfd893d1236ad447c9cbaa6fa3a04d70a9c3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
index 4d9246ebcba6047921fc1d1667673ad2527959a6..4068676987cd2dd76f0d037797f8ff5c731ba2eb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
index beaf073ba5c2808588348655605434eb50fb31da..c6ae16042a23970bf06cb47a4d916c97d04ececb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
index 153de0bd0921a770a0124ad4de42a729fcb34615..42ab6a0a093e32a475a47cec7682dc47d2b91093 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
index 853fd78eebbf45396294079fca5877efbc648d93..84aab72ae1cdbe89a2ad06c7c6b3fafa51c33b87 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
index 64f7bcda23c1b7e13fcd7760fa78faf79d2f3b4d..0233591ba356bbb9965aa9b06fe11aac419d1c5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
index 8a0910516d8d950aa16d891044a7d8604acdc3cd..e8c31261f17caace5f88ee78dd69ce48770986ce 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2e7d3413fc149e0ab287f79da33b11fd8d6e24a0..0d135f28e9f77d83787cf6240d8ebc961aa3be47 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fcb0e7a6a93592cc8e413c7b8a99834c1c90f686..c2d48ee2b07a5e07c946f1f9b253e0f5da364b75 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a8317a372fc1afdfbb4f657f5bf11948a7314e48..9edb2bbd94bab3c47940647b1052ed861e056d6a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 51e6fe0e74daae29c929ccd40188c0a86c808773..06d8984cac79bcf4f38f35fa074db015f33fe978 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 09a9a55851d05da7dc6c64a6e800b9f5d0fe7a0e..29aa27e2378121b1620e293c24e384922b046665 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ae93c0c12f8dd59a0c0182c80fc6f8152fe9b049..af8ff6f5eb4a073a1d890d8c385db0a1cd3fdedb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e63bbc50815e89dfc7ef93352a3228a18620220d..e009ce86dad347dba559dac50a0c90718781edcb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 949d7d15215bf02a8f0564d1119d4085074d7da5..b9a8773586c82ac5d800e20139fde5154662b03a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 14b6f258e20a17205afb28bd366ce13fe9cc475e..cedcc3c61167fc381f40b263c8743d9cc76629c6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 49a947de37aab3a5fc105b441d35bba93af5f1dc..16947842afa6f8a069354291de55d8810a5c1d5c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
index d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
index e46addeb9a1a305f7e78ea125894a096b3a8e7b8..7662a20c90a6cd9bdfe1b69c7ce6a893baee27e0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
index 034233532a9f1f0f03af5b2f0fdc6b62a192225f..fd0e7cced2f2fa02d008a6052d4ac1060e3af1dc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 20dac9a399e63a4566e7d7a742f80c90be20e7bb..b2b1284ef3acd8b67e074a7fb7f6564cfa231b13 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9c6ea7f0bc50770cca4d323dac3fe2c3a518906..05d3011024a3585fd845a854e340007df876be93 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5fa61a7f8f91ec33d06523ba4ce2bc3b64b80304..7e1adc24b3cbe56cb8ee32acec7530b08a38633f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1934047abf2eed0e9ba378be67eb778c2634d50e..6e9192301de24ef41cc000f14ef9ab40bc7a659f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index 14b6f258e20a17205afb28bd366ce13fe9cc475e..cedcc3c61167fc381f40b263c8743d9cc76629c6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c2e710a010ad47420c3749ac71566b3146634a77..27f5cfb1dd778872ef6c12a8acdda71bfa29a298 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
index 4d9246ebcba6047921fc1d1667673ad2527959a6..4068676987cd2dd76f0d037797f8ff5c731ba2eb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
index beaf073ba5c2808588348655605434eb50fb31da..c6ae16042a23970bf06cb47a4d916c97d04ececb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
index 153de0bd0921a770a0124ad4de42a729fcb34615..42ab6a0a093e32a475a47cec7682dc47d2b91093 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
index 853fd78eebbf45396294079fca5877efbc648d93..84aab72ae1cdbe89a2ad06c7c6b3fafa51c33b87 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
index 64f7bcda23c1b7e13fcd7760fa78faf79d2f3b4d..0233591ba356bbb9965aa9b06fe11aac419d1c5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
index 8a0910516d8d950aa16d891044a7d8604acdc3cd..e8c31261f17caace5f88ee78dd69ce48770986ce 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9f5e8cf39b7e2b0ca1273816307a27f767a24f34..7af714ce80c2673f10284a9774bec65cb2708b01 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fcb0e7a6a93592cc8e413c7b8a99834c1c90f686..c2d48ee2b07a5e07c946f1f9b253e0f5da364b75 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a8317a372fc1afdfbb4f657f5bf11948a7314e48..9edb2bbd94bab3c47940647b1052ed861e056d6a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c9a3d6ffbd80e27520219568562e91bdd49db579..33ec044c079bff5993ab7f35f801c0f697e4ceae 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9f5e8cf39b7e2b0ca1273816307a27f767a24f34..7af714ce80c2673f10284a9774bec65cb2708b01 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fcb0e7a6a93592cc8e413c7b8a99834c1c90f686..c2d48ee2b07a5e07c946f1f9b253e0f5da364b75 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a8317a372fc1afdfbb4f657f5bf11948a7314e48..9edb2bbd94bab3c47940647b1052ed861e056d6a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4420a87f360e90ad6ba1dd434c57454373626980..60db2d7cffa8ef5379a0048f8c126ee9c1f050a3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 14b6f258e20a17205afb28bd366ce13fe9cc475e..cedcc3c61167fc381f40b263c8743d9cc76629c6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 17e88546c2a20f01771c4623903840232762526c..a2f76a21ca2233f2d049cf01c448ec0876fe66b0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
index db9c8ba2c3ac9dd4d7e2b63f1891194b9c2b6497..75c18cb478419f8b772c6d415556643327d29429 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
index 034233532a9f1f0f03af5b2f0fdc6b62a192225f..fd0e7cced2f2fa02d008a6052d4ac1060e3af1dc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 282c8e4ca9dcecc00e3a4113734d3af7872286f4..8e65b465fb3aacc9db508d048e3448c483be0ba0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4fc8984feca2c516b6faeb60036d1c0a731eb693..0ff29fa63a47d2af0ddc95852e0bcc10e95ea88f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dc4fe7b846cc93df03406ac44ef7968959ee6956..18df13896bb7b7d0382b903b7d268ef5851403e0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
index 655585fe6bec30b02d225fae8bef530fbc10ac76..74053b0ab3ded29a9bb6536d918e55e092273405 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ea75f5e695b3da7074a475689aba91f12b08642..19370a0e39c4b42a7a58941a05170e9a33a37b4f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
index 10ddad813a695b8d668bee3956b509c7614073c6..5c92e704da138a5ab9f4d2dd4ba7597ec8f42797 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a00b3414327937f752e7cb02b11c5563e30089e4..943461dcb55883c9b321452ac558f9aef30d23f7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index 14b6f258e20a17205afb28bd366ce13fe9cc475e..cedcc3c61167fc381f40b263c8743d9cc76629c6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c2e710a010ad47420c3749ac71566b3146634a77..27f5cfb1dd778872ef6c12a8acdda71bfa29a298 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K
index 4d9246ebcba6047921fc1d1667673ad2527959a6..4068676987cd2dd76f0d037797f8ff5c731ba2eb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/T
index beaf073ba5c2808588348655605434eb50fb31da..c6ae16042a23970bf06cb47a4d916c97d04ececb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/U
index 153de0bd0921a770a0124ad4de42a729fcb34615..42ab6a0a093e32a475a47cec7682dc47d2b91093 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/cp
index 853fd78eebbf45396294079fca5877efbc648d93..84aab72ae1cdbe89a2ad06c7c6b3fafa51c33b87 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/p
index 64f7bcda23c1b7e13fcd7760fa78faf79d2f3b4d..0233591ba356bbb9965aa9b06fe11aac419d1c5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/rho
index 8a0910516d8d950aa16d891044a7d8604acdc3cd..e8c31261f17caace5f88ee78dd69ce48770986ce 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2e7d3413fc149e0ab287f79da33b11fd8d6e24a0..0d135f28e9f77d83787cf6240d8ebc961aa3be47 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fcb0e7a6a93592cc8e413c7b8a99834c1c90f686..c2d48ee2b07a5e07c946f1f9b253e0f5da364b75 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a8317a372fc1afdfbb4f657f5bf11948a7314e48..9edb2bbd94bab3c47940647b1052ed861e056d6a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 51e6fe0e74daae29c929ccd40188c0a86c808773..06d8984cac79bcf4f38f35fa074db015f33fe978 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 09a9a55851d05da7dc6c64a6e800b9f5d0fe7a0e..29aa27e2378121b1620e293c24e384922b046665 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ae93c0c12f8dd59a0c0182c80fc6f8152fe9b049..af8ff6f5eb4a073a1d890d8c385db0a1cd3fdedb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e63bbc50815e89dfc7ef93352a3228a18620220d..e009ce86dad347dba559dac50a0c90718781edcb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 949d7d15215bf02a8f0564d1119d4085074d7da5..b9a8773586c82ac5d800e20139fde5154662b03a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
index d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
index e46addeb9a1a305f7e78ea125894a096b3a8e7b8..7662a20c90a6cd9bdfe1b69c7ce6a893baee27e0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
index 064b9b08f6552253ba4192c241af3edf45bb5db3..ddc551d45ed6a34fe4a48fc2dd7b9d6b7b6d0395 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 20dac9a399e63a4566e7d7a742f80c90be20e7bb..b2b1284ef3acd8b67e074a7fb7f6564cfa231b13 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
index c2eadba0fb42f1e8e589c21f446c76927be779fe..aadaf61f87dfe02d79d38dc07030e8742940d1f4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e4c42fc4202511f216778ce5796a7b3541eba433..5cf50f1f1e80285001192a673d37b7eba3d02e22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9c6ea7f0bc50770cca4d323dac3fe2c3a518906..05d3011024a3585fd845a854e340007df876be93 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 5fa61a7f8f91ec33d06523ba4ce2bc3b64b80304..7e1adc24b3cbe56cb8ee32acec7530b08a38633f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 2b1dbdcf90d60cd58da705047aedf2d3a02b3022..5c811e67833c750a30b249275b25a1037164898c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d8deb33bf49e426cdd8254c5dcc8d22dbe34e6a4..aad15ee459b6e01cdf6fabba08eb2fa5b8c2a4dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index a6dff430789ae889f7e1ab9def1037a5d0ad7310..fde798231995881b8bd8b5add82b3f989c0e8d04 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 65446b252a127f3f377f411a5bf3f715f4fb8fd6..e620dcb6521dcf5731286f837d1ae4a573955872 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..8cd967d0a920980d81bab51aba197dadb0e5e4cc
--- /dev/null
+++ b/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
@@ -0,0 +1,97 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+vertices
+(
+ (0 0 0)
+ (1 0 0)
+ (1 1 0)
+ (0 1 0)
+ (0 0 0.1)
+ (1 0 0.1)
+ (1 1 0.1)
+ (0 1 0.1)
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+//patches
+//(
+// wall movingWall
+// (
+// (3 7 6 2)
+// )
+// wall fixedWalls
+// (
+// (0 4 7 3)
+// (2 6 5 1)
+// (1 5 4 0)
+// )
+// empty frontAndBack
+// (
+// (0 3 2 1)
+// (4 5 6 7)
+// )
+//);
+
+boundary
+(
+ movingWall
+ {
+ type wall;
+ faces
+ (
+ (3 7 6 2)
+ );
+ }
+
+ fixedWalls
+ {
+ type wall;
+ faces
+ (
+ (0 4 7 3)
+ (2 6 5 1)
+ (1 5 4 0)
+ );
+ }
+
+ frontAndBack
+ {
+ type empty;
+ faces
+ (
+ (0 3 2 1)
+ (4 5 6 7)
+ );
+ }
+);
+
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
index 7576a5dc544ea31314c3763429ed75bff2628bcd..ee6588db42363bdd3e5bb01d5ffbe353e241ba0a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
index 211f49a0c10fd5aaa58526225e6fb073c6b88cd0..f5153f11ad84352b8290acf2e28a0c94269f5a4e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
index 8ace7c09a3793552e667b1ebe8d4fe73ffcaaf67..e995f6f4484b66e516dd350e303d08af441f0698 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7081624ee2501a94f545fdb1d0d51e5182744959..552afa40de33acd0f931aaace5feb215741d4fbf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1b90bac98f8d484b5e7b57a337e215036c0f8f39..5175a4176531b0622e2fdc2862edce8f7fbf7115 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
index 68853b213e2669523b2f7d4b6efbb3bca24beabd..4c521594c6711856b11639ea6ec40772c60731f1 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volSymmTensorField;
+ location "0";
object R;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
-internalField uniform (0 0 0 0 0 0);
+internalField uniform ( 0 0 0 0 0 0 );
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
- value uniform (0 0 0 0 0 0);
+ value uniform ( 0 0 0 0 0 0 );
}
-
- upperWall
+ upperWall
{
type fixedValue;
- value uniform (0 0 0 0 0 0);
+ value uniform ( 0 0 0 0 0 0 );
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
index f6aacdf3f88e689604ff87cd98391da5efd1871e..c9e313803e47db09d64aba5279d1322b0be93b3e 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (10 0 0);
+internalField uniform ( 10 0 0 );
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- upperWall
+ upperWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
index 5075002ebdc24d83e8065eec33a2f7f93450ad99..52126ce75462a71b644cfec5e8f8ea033d16ac58 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 10;
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform 1e-08;
}
-
- upperWall
+ upperWall
{
type fixedValue;
value uniform 1e-08;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
index 480b2196166d56d3db54ed60bebaa9039b3e8ab8..c0be82cd30a7929e2c1b0e1f5f7878b712aae3b5 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 1;
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform 1e-10;
}
-
- upperWall
+ upperWall
{
type fixedValue;
value uniform 1e-10;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy
index 2494e52d0cdddef5b33903b136e441df5a7b72c4..a2d65783b77e48a63f602310aa21e48df6cd11ca 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy
@@ -1,80 +1,80 @@
--0.0499719 1e-05
--0.0499122 1e-05
- -0.049845 1e-05
--0.0497694 1e-05
--0.0496843 1e-05
--0.0495885 1e-05
--0.0494808 1e-05
--0.0493595 1e-05
--0.0492231 1e-05
--0.0490695 1e-05
--0.0488967 1e-05
--0.0487022 1e-05
--0.0484834 1e-05
--0.0482371 1e-05
- -0.04796 1e-05
--0.0476481 1e-05
--0.0472971 1e-05
--0.0469021 1e-05
--0.0464577 1e-05
--0.0459575 1e-05
--0.0453947 1e-05
--0.0447613 1e-05
--0.0440485 1e-05
--0.0432464 1e-05
--0.0423437 1e-05
--0.0413279 1e-05
--0.0401848 1e-05
--0.0388984 1e-05
--0.0374508 1e-05
--0.0358218 1e-05
--0.0339885 1e-05
--0.0319255 1e-05
- -0.029604 1e-05
--0.0269914 1e-05
--0.0240515 1e-05
- -0.020743 1e-05
--0.0170199 1e-05
--0.0128301 1e-05
--0.00811521 1e-05
--0.00280937 1e-05
-0.00280937 1e-05
-0.00811521 1e-05
- 0.0128301 1e-05
- 0.0170199 1e-05
- 0.020743 1e-05
- 0.0240515 1e-05
- 0.0269914 1e-05
- 0.029604 1e-05
- 0.0319255 1e-05
- 0.0339885 1e-05
- 0.0358218 1e-05
- 0.0374508 1e-05
- 0.0388984 1e-05
- 0.0401848 1e-05
- 0.0413279 1e-05
- 0.0423437 1e-05
- 0.0432464 1e-05
- 0.0440485 1e-05
- 0.0447613 1e-05
- 0.0453947 1e-05
- 0.0459575 1e-05
- 0.0464577 1e-05
- 0.0469021 1e-05
- 0.0472971 1e-05
- 0.0476481 1e-05
- 0.04796 1e-05
- 0.0482371 1e-05
- 0.0484834 1e-05
- 0.0487022 1e-05
- 0.0488967 1e-05
- 0.0490695 1e-05
- 0.0492231 1e-05
- 0.0493595 1e-05
- 0.0494808 1e-05
- 0.0495885 1e-05
- 0.0496843 1e-05
- 0.0497694 1e-05
- 0.049845 1e-05
- 0.0499122 1e-05
- 0.0499719 1e-05
+2.80937e-05 1e-05
+8.78022e-05 1e-05
+0.000154994 1e-05
+0.000230608 1e-05
+0.000315699 1e-05
+0.000411455 1e-05
+0.000519212 1e-05
+0.000640475 1e-05
+0.000776937 1e-05
+0.000930502 1e-05
+0.00110331 1e-05
+0.00129779 1e-05
+0.00151663 1e-05
+0.00176291 1e-05
+0.00204005 1e-05
+0.00235193 1e-05
+ 0.0027029 1e-05
+0.00309785 1e-05
+0.00354231 1e-05
+0.00404248 1e-05
+0.00460533 1e-05
+0.00523873 1e-05
+0.00595151 1e-05
+0.00675364 1e-05
+ 0.0076563 1e-05
+0.00867209 1e-05
+ 0.0098152 1e-05
+ 0.0111016 1e-05
+ 0.0125492 1e-05
+ 0.0141782 1e-05
+ 0.0160115 1e-05
+ 0.0180745 1e-05
+ 0.020396 1e-05
+ 0.0230086 1e-05
+ 0.0259485 1e-05
+ 0.029257 1e-05
+ 0.0329801 1e-05
+ 0.0371699 1e-05
+ 0.0418848 1e-05
+ 0.0471906 1e-05
+ 0.0528094 1e-05
+ 0.0581152 1e-05
+ 0.0628301 1e-05
+ 0.0670199 1e-05
+ 0.070743 1e-05
+ 0.0740515 1e-05
+ 0.0769914 1e-05
+ 0.079604 1e-05
+ 0.0819255 1e-05
+ 0.0839885 1e-05
+ 0.0858218 1e-05
+ 0.0874508 1e-05
+ 0.0888984 1e-05
+ 0.0901848 1e-05
+ 0.0913279 1e-05
+ 0.0923437 1e-05
+ 0.0932464 1e-05
+ 0.0940485 1e-05
+ 0.0947613 1e-05
+ 0.0953947 1e-05
+ 0.0959575 1e-05
+ 0.0964577 1e-05
+ 0.0969021 1e-05
+ 0.0972971 1e-05
+ 0.0976481 1e-05
+ 0.09796 1e-05
+ 0.0982371 1e-05
+ 0.0984834 1e-05
+ 0.0987022 1e-05
+ 0.0988967 1e-05
+ 0.0990695 1e-05
+ 0.0992231 1e-05
+ 0.0993595 1e-05
+ 0.0994808 1e-05
+ 0.0995885 1e-05
+ 0.0996843 1e-05
+ 0.0997694 1e-05
+ 0.099845 1e-05
+ 0.0999122 1e-05
+ 0.0999719 1e-05
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
index 65c3a5557c71e21a8d8bf4f303a53d8524e8ddc8..a9534f20fbf342e18599551d8ebe3cd6839529ef 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object nuTilda;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform 0;
}
-
- upperWall
+ upperWall
{
type fixedValue;
value uniform 0;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
index 0d38ae153c03cec85ed99e8d049f53f47a729603..4bb886708ff62152e851f01ef89241fe633cf6b2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
index 9948385f121d383a0404a9b74c6f47b8f4d4d20f..0c4f64d3e0c3c3f0e927b0265f9bda2334208ef3 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-4
+5
(
lowerWall
{
@@ -29,12 +29,19 @@ FoamFile
nFaces 1;
startFace 80;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- nFaces 160;
+ nFaces 80;
startFace 81;
- featureCos 0.9;
+ neighbourPatch frontBack_half1;
+ }
+ frontBack_half1
+ {
+ type cyclic;
+ nFaces 80;
+ startFace 161;
+ neighbourPatch frontBack_half0;
}
defaultFaces
{
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
index ba8852a25f88b85908eed0be7a47ea406170fb99..1c5c522387400f39c6533b8ac235ee6e9c51649d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,35 +10,38 @@ FoamFile
version 2.0;
format ascii;
class volSymmTensorField;
+ location "0";
object R;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
-internalField uniform (0 0 0 0 0 0);
+internalField uniform ( 0 0 0 0 0 0 );
boundaryField
{
- lowerWall
+ lowerWall
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
type zeroGradient;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
index 23c18e95cd37b83743c492ad5499313a750626f4..cc15bf6bfee1281e568002f55bc2e3bb1cf05d7d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- upperWall
+ upperWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
index 5b6d7f698f76f16741b27760ecdc6c1cd79234ca..37c5fc7837b9c59f828f5eb54c99d9aff2f8bf13 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 1e-08;
@@ -31,15 +31,18 @@ boundaryField
type epsilonWallFunction;
value uniform 1e-08;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 1e-08;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
index a51a9a2e6d3d10c59b608977d419120be19e4e14..ac3233b3d312f36bb49f6105942b002506014558 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 1e-10;
@@ -31,179 +31,18 @@ boundaryField
type kqRWallFunction;
value uniform 1e-10;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value nonuniform List<scalar>
-160
-(
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-1e-10
-)
-;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
index 9417b47353e7aeafc786a158ca814ce6a523854e..008ac1a40ff22cf531b1da423e0f16e7bf3e88c6 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
@@ -1,43 +1,3 @@
- -0.049375 1e-05
- -0.048125 1e-05
- -0.046875 1e-05
- -0.045625 1e-05
- -0.044375 1e-05
- -0.043125 1e-05
- -0.041875 1e-05
- -0.040625 1e-05
- -0.039375 1e-05
- -0.038125 1e-05
- -0.036875 1e-05
- -0.035625 1e-05
- -0.034375 1e-05
- -0.033125 1e-05
- -0.031875 1e-05
- -0.030625 1e-05
- -0.029375 1e-05
- -0.028125 1e-05
- -0.026875 1e-05
- -0.025625 1e-05
- -0.024375 1e-05
- -0.023125 1e-05
- -0.021875 1e-05
- -0.020625 1e-05
- -0.019375 1e-05
- -0.018125 1e-05
- -0.016875 1e-05
- -0.015625 1e-05
- -0.014375 1e-05
- -0.013125 1e-05
- -0.011875 1e-05
- -0.010625 1e-05
- -0.009375 1e-05
- -0.008125 1e-05
- -0.006875 1e-05
- -0.005625 1e-05
- -0.004375 1e-05
- -0.003125 1e-05
- -0.001875 1e-05
- -0.000625 1e-05
0.000625 1e-05
0.001875 1e-05
0.003125 1e-05
@@ -78,3 +38,43 @@
0.046875 1e-05
0.048125 1e-05
0.049375 1e-05
+ 0.050625 1e-05
+ 0.051875 1e-05
+ 0.053125 1e-05
+ 0.054375 1e-05
+ 0.055625 1e-05
+ 0.056875 1e-05
+ 0.058125 1e-05
+ 0.059375 1e-05
+ 0.060625 1e-05
+ 0.061875 1e-05
+ 0.063125 1e-05
+ 0.064375 1e-05
+ 0.065625 1e-05
+ 0.066875 1e-05
+ 0.068125 1e-05
+ 0.069375 1e-05
+ 0.070625 1e-05
+ 0.071875 1e-05
+ 0.073125 1e-05
+ 0.074375 1e-05
+ 0.075625 1e-05
+ 0.076875 1e-05
+ 0.078125 1e-05
+ 0.079375 1e-05
+ 0.080625 1e-05
+ 0.081875 1e-05
+ 0.083125 1e-05
+ 0.084375 1e-05
+ 0.085625 1e-05
+ 0.086875 1e-05
+ 0.088125 1e-05
+ 0.089375 1e-05
+ 0.090625 1e-05
+ 0.091875 1e-05
+ 0.093125 1e-05
+ 0.094375 1e-05
+ 0.095625 1e-05
+ 0.096875 1e-05
+ 0.098125 1e-05
+ 0.099375 1e-05
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
index dc4f0e1a6eda5b748195c20e0264f55bf619bc8a..1a0a5c1a46e2c9b6a7698fbd797268bf04e0629b 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,35 +10,38 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object nuTilda;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- lowerWall
+ lowerWall
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
type zeroGradient;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
index 5bcd4c4a1db7b020221531c616c9e56b26d8c2c4..986830e430429ea325ac281391ff2aa165a5356c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -31,15 +31,18 @@ boundaryField
type nutkWallFunction;
value uniform 0;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
index 072525042145f1be144180ef323395d544a95857..e74a803e10b1bb1e3da0e929a560916f8d65ff9e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
index 9948385f121d383a0404a9b74c6f47b8f4d4d20f..0c4f64d3e0c3c3f0e927b0265f9bda2334208ef3 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-4
+5
(
lowerWall
{
@@ -29,12 +29,19 @@ FoamFile
nFaces 1;
startFace 80;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- nFaces 160;
+ nFaces 80;
startFace 81;
- featureCos 0.9;
+ neighbourPatch frontBack_half1;
+ }
+ frontBack_half1
+ {
+ type cyclic;
+ nFaces 80;
+ startFace 161;
+ neighbourPatch frontBack_half0;
}
defaultFaces
{
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
index 5cedb57af59b64e2674bda6b196ceef541bc6807..24fd818213520a39aabfb177004d11ae6cadb8b4 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,37 +10,40 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (1 0 0);
+internalField uniform ( 1 0 0 );
boundaryField
{
- lowerWall
+ lowerWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- upperWall
+ upperWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
index 5b6d7f698f76f16741b27760ecdc6c1cd79234ca..37c5fc7837b9c59f828f5eb54c99d9aff2f8bf13 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 1e-08;
@@ -31,15 +31,18 @@ boundaryField
type epsilonWallFunction;
value uniform 1e-08;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 1e-08;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
index d278c05cef04184fc247738de09b461bfc25b452..be252cdb7863c231b6ef2c904095ce9e09fb1202 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,9 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
-internalField uniform 0.000000001;
+internalField uniform 1e-09;
boundaryField
{
@@ -31,15 +31,18 @@ boundaryField
type kqRWallFunction;
internalField uniform 0.1;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- internalField uniform 0.1;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
index dc4f0e1a6eda5b748195c20e0264f55bf619bc8a..1a0a5c1a46e2c9b6a7698fbd797268bf04e0629b 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,35 +10,38 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object nuTilda;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- lowerWall
+ lowerWall
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
type zeroGradient;
}
-
- frontBack
+ frontBack_half0
{
type cyclic;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
index 5bcd4c4a1db7b020221531c616c9e56b26d8c2c4..986830e430429ea325ac281391ff2aa165a5356c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -31,15 +31,18 @@ boundaryField
type nutkWallFunction;
value uniform 0;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
index 5bcd4c4a1db7b020221531c616c9e56b26d8c2c4..63deabe6d36826d6268b69bee97e43613b40d00d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -11,11 +11,11 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object nut;
+ object nut.k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -31,15 +31,18 @@ boundaryField
type nutkWallFunction;
value uniform 0;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
index 21cc8ebc19cf9a1a6f660d7f94746585bdae05d2..174b075808e8aaf0761401dd55df13a58e7a3166 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -11,11 +11,11 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object nut;
+ object nut.spalding;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -31,15 +31,18 @@ boundaryField
type nutUSpaldingWallFunction;
value uniform 0;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
index 75b8cd335bae6a37a31959c89d59b51b83034cfe..948c7e240928bd919bc67c8b98041dd68658ce47 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 -1 0 0 0 0];
+dimensions [ 0 0 -1 0 0 0 0 ];
internalField uniform 1111.11;
@@ -31,15 +31,18 @@ boundaryField
type omegaWallFunction;
value uniform 1111.11;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- value uniform 1111.11;
}
defaultFaces
{
type empty;
}
+ frontBack_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
index 072525042145f1be144180ef323395d544a95857..e74a803e10b1bb1e3da0e929a560916f8d65ff9e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary
index 34af32827c52f64f9c0f99296856c5d408b17d70..0c4f64d3e0c3c3f0e927b0265f9bda2334208ef3 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-4
+5
(
lowerWall
{
@@ -29,12 +29,19 @@ FoamFile
nFaces 1;
startFace 80;
}
- frontBack
+ frontBack_half0
{
type cyclic;
- nFaces 160;
+ nFaces 80;
startFace 81;
- featureCos 0.9;
+ neighbourPatch frontBack_half1;
+ }
+ frontBack_half1
+ {
+ type cyclic;
+ nFaces 80;
+ startFace 161;
+ neighbourPatch frontBack_half0;
}
defaultFaces
{
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/B b/tutorials/incompressible/channelFoam/channel395/0.org/B
index 5c77a560367680aff17b98666d3ca87b2cba70b2..afb27554914d6201e4d48f2f5cc4e46765f42311 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,45 +10,58 @@ FoamFile
version 2.0;
format ascii;
class volTensorField;
+ location "1";
object B;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
-internalField uniform (0 0 0 0 0 0 0 0 0);
+internalField uniform ( 0 0 0 0 0 0 0 0 0 );
boundaryField
{
- bottomWall
+ bottomWall
{
type zeroGradient;
}
-
- topWall
+ topWall
{
type zeroGradient;
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/U b/tutorials/incompressible/channelFoam/channel395/0.org/U
index 2ffa7c17a0f3d31b8dd8bd976675fca52728935b..77aea5e8f061ddf491b308af126d7ad31e05cec3 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,47 +10,60 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "1";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0.1335 0 0);
+internalField uniform ( 0.1335 0 0 );
boundaryField
{
- bottomWall
+ bottomWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- topWall
+ topWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/k b/tutorials/incompressible/channelFoam/channel395/0.org/k
index ddf6a5374f687002d5f73882fd63cd3d9b199021..c2e41f797b29a0f4aaecfeb4e9b9adf0db13bc29 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,47 +10,60 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- bottomWall
+ bottomWall
{
type fixedValue;
value uniform 0;
}
-
- topWall
+ topWall
{
type fixedValue;
value uniform 0;
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
index 0f60d0d3da7580474e1887bf38b96aa5bc7db7ff..0779277fe261e66618f54f61410bce9eaa42564d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,45 +10,58 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object nuSgs;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- bottomWall
+ bottomWall
{
type zeroGradient;
}
-
- topWall
+ topWall
{
type zeroGradient;
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
index ec9985843ad010261ce4efcaa6fd61992e3c5e9f..af18403bb51ddce2dc18a68d0f5c1bad8fca4687 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,47 +10,60 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object nuTilda;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- bottomWall
+ bottomWall
{
type fixedValue;
value uniform 0;
}
-
- topWall
+ topWall
{
type fixedValue;
value uniform 0;
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/p b/tutorials/incompressible/channelFoam/channel395/0.org/p
index 9a72601984e116ad32c2da466ba90f5a0b29e8c0..4c9f41f7f4218718bf315459596c7355cfb27ac4 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,45 +10,58 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "1";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
- bottomWall
+ bottomWall
{
type zeroGradient;
}
-
- topWall
+ topWall
{
type zeroGradient;
}
-
- sides1
+ sides1_half0
{
type cyclic;
}
-
- sides2
+ sides2_half0
{
type cyclic;
}
-
- inout1
+ inout1_half0
{
type cyclic;
}
-
- inout2
+ inout2_half0
+ {
+ type cyclic;
+ }
+ sides2_half1
+ {
+ type cyclic;
+ }
+ sides1_half1
+ {
+ type cyclic;
+ }
+ inout1_half1
+ {
+ type cyclic;
+ }
+ inout2_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/0/B.gz b/tutorials/incompressible/channelFoam/channel395/0/B.gz
index 8f0c76a0d0fd9df8f698f0fd0339ff616d3f91a5..20acb0941ebd031c8a7d6e1e7179f18df228b86b 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/B.gz and b/tutorials/incompressible/channelFoam/channel395/0/B.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/0/U.gz b/tutorials/incompressible/channelFoam/channel395/0/U.gz
index 8d760d6bf3b665930b73373fb25d238798439920..2a35b7da6c60a3adfd2dde3b6af9553ab4ee34e9 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/U.gz and b/tutorials/incompressible/channelFoam/channel395/0/U.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/0/k.gz b/tutorials/incompressible/channelFoam/channel395/0/k.gz
index 8764beb118e16f4fd336ab3824ebcef0786bd26c..dc3f5d446e05afeb9d8873f7d910f61747819a69 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/k.gz and b/tutorials/incompressible/channelFoam/channel395/0/k.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz b/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz
index b35b5e290b8dd0cea21c207f4a60dfbd2cbb4808..7c05e74de9f71cf1d5853ab5496bae46aa9d785d 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz and b/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz b/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz
index fce239f5205458acc00a6d3b6d0a930d0c282e7d..397113a510c2d3fc5adf7a6c6ef89ce9f69e7faf 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz and b/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/0/p.gz b/tutorials/incompressible/channelFoam/channel395/0/p.gz
index e370a3649721eba302b5283a7509f9e6bce2e273..c34acaeab415a66406e392f6e55460a3f367e2f3 100644
Binary files a/tutorials/incompressible/channelFoam/channel395/0/p.gz and b/tutorials/incompressible/channelFoam/channel395/0/p.gz differ
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
index a9e38fba3d6e474681635ab6cf9b4d3df2d8059e..57e0203eca9f9125040252d07abf0b20257ce6d1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -42,36 +42,70 @@ edges
(
);
-patches
+boundary
(
- wall bottomWall
- (
- (0 1 7 6)
- )
- wall topWall
- (
- (4 10 11 5)
- )
- cyclic sides1
- (
- (0 2 3 1)
- (6 7 9 8)
- )
- cyclic sides2
- (
- (2 4 5 3)
- (8 9 11 10)
- )
- cyclic inout1
- (
- (1 3 9 7)
- (0 6 8 2)
- )
- cyclic inout2
- (
- (3 5 11 9)
- (2 8 10 4)
- )
+ bottomWall
+ {
+ type wall;
+ faces ((0 1 7 6));
+ }
+ topWall
+ {
+ type wall;
+ faces ((4 10 11 5));
+ }
+
+ sides1_half0
+ {
+ type cyclic;
+ neighbourPatch sides1_half1;
+ faces ((0 2 3 1));
+ }
+ sides1_half1
+ {
+ type cyclic;
+ neighbourPatch sides1_half0;
+ faces ((6 7 9 8));
+ }
+
+ sides2_half0
+ {
+ type cyclic;
+ neighbourPatch sides2_half1;
+ faces ((2 4 5 3));
+ }
+ sides2_half1
+ {
+ type cyclic;
+ neighbourPatch sides2_half0;
+ faces ((8 9 11 10));
+ }
+
+ inout1_half0
+ {
+ type cyclic;
+ neighbourPatch inout1_half1;
+ faces ((1 3 9 7));
+ }
+ inout1_half1
+ {
+ type cyclic;
+ neighbourPatch inout1_half0;
+ faces ((0 6 8 2));
+ }
+
+ inout2_half0
+ {
+ type cyclic;
+ neighbourPatch inout2_half1;
+ faces ((3 5 11 9));
+ }
+ inout2_half1
+ {
+ type cyclic;
+ neighbourPatch inout2_half0;
+ faces ((2 8 10 4));
+ }
);
mergePatchPairs
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
deleted file mode 100644
index 99406517bfb287df344dc1e5bc6c5e0274b6d564..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +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 polyBoundaryMesh;
- location "constant/polyMesh";
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
- bottomWall
- {
- type wall;
- nFaces 1200;
- startFace 175300;
- }
- topWall
- {
- type wall;
- nFaces 1200;
- startFace 176500;
- }
- sides1
- {
- type cyclic;
- nFaces 2000;
- startFace 177700;
- featureCos 0.9;
- }
- sides2
- {
- type cyclic;
- nFaces 2000;
- startFace 179700;
- featureCos 0.9;
- }
- inout1
- {
- type cyclic;
- nFaces 1500;
- startFace 181700;
- featureCos 0.9;
- }
- inout2
- {
- type cyclic;
- nFaces 1500;
- startFace 183200;
- featureCos 0.9;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U
index efc5a91fe3de8827419d52f294ac596107702a5c..86a9f78b7a2fb7970b468b36a8c612125eaa710b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/0/p
index 8898350acf153cd88ca3d199da2c1dfa7ca56163..14768e8f18da60ebfeb8b396d7a99922bae05f31 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fab9f741105b09f87de279952cb2bb822e958a2c..eda42b9602456c3983b45958ab0f047bfa3d4cd2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -37,23 +37,36 @@ edges
(
);
-patches
+boundary
(
- wall movingWall
- (
- (3 7 6 2)
- )
- wall fixedWalls
- (
- (0 4 7 3)
- (2 6 5 1)
- (1 5 4 0)
- )
- empty frontAndBack
- (
- (0 3 2 1)
- (4 5 6 7)
- )
+
+ movingWall
+ {
+ type wall;
+ faces
+ (
+ (3 7 6 2)
+ );
+ }
+ fixedWalls
+ {
+ type wall;
+ faces
+ (
+ (0 4 7 3)
+ (2 6 5 1)
+ (1 5 4 0)
+ );
+ }
+ frontAndBack
+ {
+ type empty;
+ faces
+ (
+ (0 3 2 1)
+ (4 5 6 7)
+ );
+ }
);
mergePatchPairs
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
index 8947c6cace9751ecd3b53633e53e7eb55ad10789..7cd893d8ae53136aac19df8242dd3406cb080b69 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavityClipped/0/U
index e4d9db421be5994de4319e8301bb700da9ae4619..3d32047c87be3f87c659fe2721735c2eb4df465d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavityClipped/0/p
index 1b1a9084085076679c27ad01b7a218425a0b0e1c..da7b082e71f252dae83ae983170418a8aede3f40 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 87489029c2cc411be24f83b9c64ba6866d49bdd8..414dc7787fdbf8a770c7fea0cdbe75aa7782788e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavityGrade/0/U
index 8baa56780bfa8ccb82ef25477f364b368cb4e342..b29cc1d70d3bc470fb8a9ae85b69109aa9f95a54 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavityGrade/0/p
index c19bffc19f4b58c2ab3d3f7daeb70f8183476078..5765e5aa1b6b5e748a7906f7715990a528c7201d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 93b10a09991d466d7c76cdf702bedde450edb770..329e58a71a9f79f2270334504b5554e0b3199430 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/U b/tutorials/incompressible/icoFoam/elbow/0/U
index 666b59a28e71577a844258cc03c5cbd4d81f2a1e..68169029dfde566de687cfa91583d0b4925bc53e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/p b/tutorials/incompressible/icoFoam/elbow/0/p
index 6791ebf14d8378b3acce3bfb4e37135d74ce4faf..eb2b62827260a63bb9892b725e679713f5631834 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dfac095efddbbcc4ee34ea67ec33ce5814415be6..7b89e8a1fc57b042017181be69c4bf8d88ca6f12 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
index ab6eba0f78ae748b614a6c35624c7c6e045629e6..056feccbd42edcb1225a578bf4e3723db529e567 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
index 6367b89e05a7c0ddb77cbea5239a386a86d73f53..0b4f34f6a85e05aa9aa1bbc975c827dcd83ab9e1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1171971216cb027be19d0fae80c1263a7c8506a2..8d28ff87d41c43aa38cef31f9023ef2969c45f44 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
index 882677871a930faf72954c330d0069eb2c6e6f4a..ed08e0cd93daa8782f6bda1a9f1bd6d3b900c748 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
index fae0e625b5a32e699c0f71a190a210260d00563a..711b6e2865871222933241b61aeed112c5dbc6f6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
index 7fd57360dba1f47d0bf4019efc1e7669dd8ada4d..e0a68b5aff1f4d4d3c3ccd6ed8238c2e8e4b339c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3fab7c27e5967597a3aaab627aa8f5c81eb9fa93..c738ec6d98bcd0c6fd67185dc24aba7a7a07bf14 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 adc41fd7a512d3890e8c86269b57718b831ea0f2..345f30007b004214f5e2d9dbe032e1e5313412b4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a4c24f48f96ab58eead96fba96a7323f4e3b86dd..ccf1d6e897baf617a75af14cdf49e136cb168f4d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dfe4f42bd5ca2218dfc491c497f5b5673413b7f0..70336f846e6428ba9578120138cf680fb4fc4b05 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ec8f512b697bd9b4d732bf6935d6a8732597ee86..e0d098096aea7dcb37f78c607bd48210b3860f16 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 67887f27eddeaa2cea7a6a7da2cdbfea674a70ff..8ba642effb82407c85cd573a4003cf5b64fc6c51 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2c3ae490c42986681a570f9f44faeebcacb5e4ff..2024b25ef7a61172628ed36c60ce313ccc428081 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5206b4843929eed1ebb124f7e05d302d488c0388..78a5d1529945bb82c0ce7bd21e0e39bca8196f32 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 36045963c762af3cdd05e8b7872972b73cc4ba5c..986a599c5f6fb54ca9ce0f46162ad9217b1e213d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 530e23bba84d289a9a252cdac53672365368c951..a9d8bf659c481e6b65403d6814dbbf361361b5ba 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 286a0e47f0e8c13e1c127fe55d714fa96e920384..2bee15799dbc02b91812c538ff4bb95babbc39d4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c432c600cb52a5faccf56e1ea67acb1f78f98d2d..038b442397ebdf55f778c1d22f15909c56b38397 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c63f88d76a02a75e234db2728364b406bbe95026..bd35fcfb40cc0394b19a543f3f1607549e463108 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a4c24f48f96ab58eead96fba96a7323f4e3b86dd..ccf1d6e897baf617a75af14cdf49e136cb168f4d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dfe4f42bd5ca2218dfc491c497f5b5673413b7f0..70336f846e6428ba9578120138cf680fb4fc4b05 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ec8f512b697bd9b4d732bf6935d6a8732597ee86..e0d098096aea7dcb37f78c607bd48210b3860f16 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 67887f27eddeaa2cea7a6a7da2cdbfea674a70ff..8ba642effb82407c85cd573a4003cf5b64fc6c51 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2c3ae490c42986681a570f9f44faeebcacb5e4ff..2024b25ef7a61172628ed36c60ce313ccc428081 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5206b4843929eed1ebb124f7e05d302d488c0388..78a5d1529945bb82c0ce7bd21e0e39bca8196f32 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 08b0437e51ff9552728d100df44874fe2f1c6786..bbb18ba9e66e35d9fad161d83d6564c048f9c3ec 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 530e23bba84d289a9a252cdac53672365368c951..a9d8bf659c481e6b65403d6814dbbf361361b5ba 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 71a1a89704b44c4deecdf7ac4123c9b69a222c46..b75b8e1075f5c2f01de1948ea2acfebffe48f939 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 12c4007e1c230ec6bbb05109277c7565e575beec..2eb6038d7f1eb31b8cb71726f352f8c9f69a026c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4020e040fa003a16b034d5f5d925b3136d121507..e99098b5b9c395c01a65884467579249c4e1dfa4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5c13cba12f7f68d1b8bb8b9b26b955e750c924fd..1a5ba112ca6198044972c6f28b652185a097c227 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 743813fefcf74f1118569dbe22f903618d754590..2300d79207167b29935dfe749886a76ea289e261 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f1e1569442b99ba1df4edd7955090ccf9eae173a..749fb95b703acfd431ea31472304ee3f933afffb 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,50 +10,53 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
inlet
{
type pressureInletOutletVelocity;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
outlet1
{
type inletOutlet;
- inletValue uniform (0 0 0);
- value uniform (0 0 0);
+ inletValue uniform ( 0 0 0 );
+ value uniform ( 0 0 0 );
}
-
outlet2
{
type inletOutlet;
- inletValue uniform (0 0 0);
- value uniform (0 0 0);
+ inletValue uniform ( 0 0 0 );
+ value uniform ( 0 0 0 );
}
baffles
{
type fixedValue;
value uniform ( 0 0 0 );
}
- fan
+ fan_half0
{
type cyclic;
- value uniform ( 0 0 0 );
}
defaultFaces
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
+ }
+ fan_half1
+ {
+ type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
index 35ddfed6617fe6722388c66a195947607a3568bb..638085d526370c6c29513cd658c098767804bb33 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -24,7 +24,7 @@ boundaryField
inlet
{
type turbulentMixingLengthDissipationRateInlet;
- mixingLength 0.01; // 1cm - half channel height
+ mixingLength 0.01;
value uniform 1;
}
outlet1
@@ -33,7 +33,6 @@ boundaryField
inletValue uniform 1;
value uniform 1;
}
-
outlet2
{
type inletOutlet;
@@ -45,16 +44,19 @@ boundaryField
type epsilonWallFunction;
value uniform 1;
}
- fan
+ fan_half0
{
type cyclic;
- value uniform 1;
}
defaultFaces
{
type epsilonWallFunction;
value uniform 1;
}
+ fan_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
index e87a5855d2cf51fe91b10aaf4de295e5377ad5c0..b0af77f38269d6d743296723db12d31f3ac79a2a 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -24,7 +24,7 @@ boundaryField
inlet
{
type turbulentIntensityKineticEnergyInlet;
- intensity 0.05; // 5% turbulent intensity
+ intensity 0.05;
value uniform 1;
}
outlet1
@@ -33,7 +33,6 @@ boundaryField
inletValue uniform 1;
value uniform 1;
}
-
outlet2
{
type inletOutlet;
@@ -45,17 +44,19 @@ boundaryField
type kqRWallFunction;
value uniform 1;
}
- fan
+ fan_half0
{
type cyclic;
- value uniform 1;
}
-
defaultFaces
{
type kqRWallFunction;
value uniform 1;
}
+ fan_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
index f783b0b1717dc933d019b4ee43f31729ca852843..14f47a7b67a3392dcbe1fe757e2c57fe0d95d8cf 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object nuTilda;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -24,12 +25,10 @@ boundaryField
{
type zeroGradient;
}
-
outlet1
{
type zeroGradient;
}
-
outlet2
{
type zeroGradient;
@@ -38,15 +37,19 @@ boundaryField
{
type zeroGradient;
}
- fan
+ fan_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type zeroGradient;
}
+ fan_half1
+ {
+ type cyclic;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
index 570f1f90ac5188e944d686866217964790e2118d..cd1e41281fe315710771c71eb3e67e421a079bea 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -26,13 +26,11 @@ boundaryField
type calculated;
value uniform 0;
}
-
outlet1
{
type calculated;
value uniform 0;
}
-
outlet2
{
type calculated;
@@ -43,16 +41,19 @@ boundaryField
type nutkWallFunction;
value uniform 0;
}
- fan
+ fan_half0
{
type cyclic;
- value uniform 0;
}
defaultFaces
{
type nutkWallFunction;
value uniform 0;
}
+ fan_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
index 9f095249c938356fa665e28374afbe07889bfdc3..14a655e690ae7667affb9bec45c8d3529c8ffd48 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 100000;
@@ -22,14 +23,10 @@ boundaryField
{
inlet
{
- //type totalPressure;
- //p0 uniform 100040;
-
type timeVaryingTotalPressure;
- p0 100040; // only used for restarts
+ p0 100040;
outOfBounds clamp;
fileName "$FOAM_CASE/constant/p0vsTime";
-
U U;
phi phi;
rho none;
@@ -37,13 +34,11 @@ boundaryField
gamma 1;
value uniform 100040;
}
-
outlet1
{
type fixedValue;
value uniform 100010;
}
-
outlet2
{
type fixedValue;
@@ -53,17 +48,25 @@ boundaryField
{
type zeroGradient;
}
- fan
+ fan_half0
{
type fan;
patchType cyclic;
f 2 ( 50 -0.1 );
- value uniform 100000;
+ value $internalField;
}
defaultFaces
{
type zeroGradient;
}
+ fan_half1
+ {
+ type fan;
+ patchType cyclic;
+ f 2 ( 50 -0.1 );
+ value $internalField;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
index 54e4a04eddd818478efed08a70fde5c832f18897..0d96a34fc9adf6cff732d973e403b97d37bc8b8c 100755
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
@@ -16,12 +16,14 @@ unset FOAM_SETNAN
# Add cyclic baffles for fan
runApplication setSet -batch selectCyclics.setSet
-runApplication createBaffles cyclicFaces fan -overwrite
+#runApplication createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite
+createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite > log.createBaffles 2>&1
# Add wall baffles
rm log.setSet
runApplication setSet -batch selectBaffles.setSet
rm log.createBaffles
-runApplication createBaffles baffleFaces baffles -overwrite
+#runApplication createBaffles baffleFaces '(baffles baffles)' -overwrite
+createBaffles baffleFaces '(baffles baffles)' -overwrite > log.createBaffles 2>&1
runApplication $application
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 def178123455e3f3323835a8af47f07ab88f7a58..288339e21a740249143ec22e4ec387ca8ba50e3b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -84,32 +84,50 @@ edges
(
);
-patches
-(
- patch inlet
- (
- (0 10 13 3)
- )
-
- patch outlet1
- (
- (6 7 17 16)
- )
-
- patch outlet2
- (
- (8 18 19 9)
- )
-
- wall baffles
- ()
-
- cyclic fan
- ()
-
- wall defaultFaces
- ()
-
+boundary
+(
+ inlet
+ {
+ type patch;
+ faces ((0 10 13 3));
+ }
+
+ outlet1
+ {
+ type patch;
+ faces ((6 7 17 16));
+ }
+
+ outlet2
+ {
+ type patch;
+ faces ((8 18 19 9));
+ }
+
+ baffles
+ {
+ type wall;
+ faces ();
+ }
+
+ fan_half0
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch fan_half1;
+ }
+ fan_half1
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch fan_half0;
+ }
+
+ defaultFaces
+ {
+ type wall;
+ faces ();
+ }
);
mergePatchPairs
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
index 24c53efd55cf0afb003ec8b7b92bf27279f40aed..339de8e615a8238283370335059d580909327e4f 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,44 +15,51 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-6
+7
(
inlet
{
type patch;
nFaces 25;
- startFace 10050;
+ startFace 10025;
}
outlet1
{
type patch;
nFaces 25;
- startFace 10075;
+ startFace 10050;
}
outlet2
{
type patch;
nFaces 25;
- startFace 10100;
+ startFace 10075;
}
baffles
{
type wall;
- nFaces 0;
- startFace 10125;
+ nFaces 32;
+ startFace 10100;
+ }
+ fan_half0
+ {
+ type cyclic;
+ nFaces 9;
+ startFace 10132;
+ neighbourPatch fan_half1;
}
- fan
+ fan_half1
{
type cyclic;
- nFaces 0;
- startFace 10125;
- featureCos 0.9;
+ nFaces 9;
+ startFace 10141;
+ neighbourPatch fan_half0;
}
defaultFaces
{
type wall;
nFaces 3075;
- startFace 10125;
+ startFace 10150;
}
)
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U
index d4b36a17322f024d033454aee25aad597c5642b1..937d3966b255a95cf121b0233e6c1ad9cfe79759 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d97e548826e1671a9a990f8b78ad4308c2406d2a..fe8744b3989e69e694abd968d917fcb1fb9afc32 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2e95ffcae30ee367405fa2b9b67879f84ae69a87..93170d7a0cba0489f226d72d14e996c0755156c4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0646f8c8a567256274470a08472ad76dbc726d24..7f78827df0ae075da9cafda0600ea1a3ddc2811e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7247fcdbef32943109bfb5f8262b549ac649b6a3..94cbead26d3a54c0a6fbbe76dadeb2e097b7a8b5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 86af6cb642c11fb794f969d2bd44d6e41a3f081d..7ed39fbf24c92296b4d8f9ac6cbebef883de893c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8b7e616bd1c0dc641081a4538d8aec8d38ca76a9..7f07f9dd1c3fc678f88ab2333a677e8cfeb2bc82 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8443f1a57b299cdeb5322acc375591a9de28f1ae..5a94fb1c5039e3772d24c185825ffda65195b319 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b38fd323fd2766d71d760779babe0c01adb7611e..e35b20fd644748441b53e543afd87b6aa77e8840 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 82b9ce7ca26d6febdf8024b037f41897502f30d7..b4b6cda3e1b634fb0521b3ca386565a2c69feae6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 faa9809d78b72021747a02855e8d7ee818f2a379..7cce4aecb5722e6560b2697e27ffdc7a8b353305 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bc606e685a3ac75b00a4751b73f1d549873822e9..898cfe01f2c102b78f3adcb72906fca591531117 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8443f1a57b299cdeb5322acc375591a9de28f1ae..5a94fb1c5039e3772d24c185825ffda65195b319 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a7c8e902c5471880cc5aad131e73038627e6ae77..1278c1973779508b5f9363a1f9d3939f58ad75bb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a1420ab9ae9ae820691f264cd8e6be34e6786d86..83338d7e0b737be4a21b4d4620bc61dd06ff234c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bdf8398e635c878fb21f99cc5ca35b0cad0243b6..bba9b5b414e19bef2567a27f90d5c247f12803db 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 efc5a91fe3de8827419d52f294ac596107702a5c..86a9f78b7a2fb7970b468b36a8c612125eaa710b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5762805202dc55f1f8d4045253f097a57585dd23..616a37e30072c361efcd337a57113c321b437273 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8898350acf153cd88ca3d199da2c1dfa7ca56163..14768e8f18da60ebfeb8b396d7a99922bae05f31 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5fb6428c770ade908072bca57b7bca255d31d8ff..52c065ae83dcc5367fb3a226cca1606b05d51435 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
index 4600a6cc79ac54e263926ceb1506bd57ed158b2d..e1df94398773b013813d4f9f37769c8587889a1c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index 0b3a166e5b3849bd3c69dc41444b2b9c3d08af3a..88f509425865e94093e76cca468b5839e437ab77 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
index 92af2a10280e99e3089c23597718d09ea1480bd5..4794b84b189f7020d3f1bc09e5d43bbf914d7b45 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5863a04e716efd2404a54afd54635946689ab1c9..0438819b2509cf399923c3a2ce92ea0999735aea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1eabb3e673c02b1156cf21d58af2035e8254b3f8..6d6d0669392b2396160799c4747d2e9f6c2c54d2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porousZones
index e081bbf9e388af3d134a2214050aa8b20e8fb2ee..634799837eaf7009528df07d027deafc7c6cc1f4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
index 0fa6827f06e9f1fc13891102f41dc793ad301399..7f3bedaae59eebf8d32dd99ac2f9c8ff8adf77a6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index feb97fc3d2682749e50c80c64f95fdc5c8e3e42d..5de491639a1005089042ebe5faa2452765d627d1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
index 663af1f5ec9fdc16ff3d9a0c935d2e2a6f108f5c..155410c1be9cbcbebb3e87f78a085c08d43f3ba5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index d1d3fa39706adf6c3e5d820891ca7d4203bb2918..18870c0af00f0cc629c3a87ae4abb538ad45dd8a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
index 2f6f2c7f4eae8c82658a6f0fff7564447f26628a..b79b2a11e816e4856c172e05d51e3e6106caf6f3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
index b91959982914dae1bdea3ae455958dd2dc518aeb..7883f151b935071e853807cd82c13acc57d4bfdf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
index 952c12eb639138ffd030386f7ccc303728b97319..9f005f2f65ce7623f7e2ca0b414607625aa13b24 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index 3e13a3b875e7afac2f9fb23a10dc09a654903266..96e4a43d3c268344c07685a2053f46fc40a89598 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/p b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
index d6194d2707cc5086885baf60889983e6f15fdf4a..4c7cbbd80a8481d9ad68b3e9ca9f3140f08758a5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6be85586c593c986cd9052cdf155e4869a0e1ad5..5b35737d185908c27d35393fbe003e7f9a09e1f2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e184b856b9502ee98a826af9f0ff18d1f4eed846..8817844624a47310d755024921a8bdc143fc5665 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 daad58d3f690ed68743654037cd9e400d8ca5c81..2778803f123d77a899aaa911e778ee65b8a789ea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f0086fa788b5c2c98169868e3edb9e4c87dc073c..cc9ea68b321b56854962bf10d64167c2005cd272 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 42123de4289cb62f4278baec98ed50e51829a2b0..bd4633a67754831c2c292e9bad5a59cd2f49d415 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1cad198322f53caaa258486d1e7114970e7789c4..38310185184a76e3e54c699e76ed7ed00d854af6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/U b/tutorials/incompressible/simpleFoam/motorBike/0/U
index 2ce3a6fff957831a4e7acfc67982544ba8f018a3..b074474b00dd7123ef33a12c7e8b57c03325b7d7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a4c24f48f96ab58eead96fba96a7323f4e3b86dd..ccf1d6e897baf617a75af14cdf49e136cb168f4d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches b/tutorials/incompressible/simpleFoam/motorBike/0/include/frontBackUpperPatches
index 6db619f38d42b9e113820f498a74844b3f81d8b2..d858932a9d7b2e82752104eef3f9882015c4d413 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions b/tutorials/incompressible/simpleFoam/motorBike/0/include/initialConditions
index c8fa21f3b545e8458f962e4a568170295bc9dd77..a90ff786cc55310cc128c7526be0136adf0e87c1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0/k
index 076a183a9cb471a848f0570f9a447313f68b3e22..f8da4fe9ab325ddca52043a64dc242398cdfa43c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0/omega
index 274011e8169957f1127ea557d2c018cf55262578..dcd88e8d675ec3e6a8d8990edf4131bdd328db8d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/p b/tutorials/incompressible/simpleFoam/motorBike/0/p
index 7ab531ef650b2233966450455267debcd8876256..9bf8e9d43dfc08c662920cbe9abc3378f2756ca6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
index 24a4e1ec3e9952a8e02de6f5e30a860318d34034..e0f7c78180d7b067fb4a3002c1fb66ca309751da 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c1b88f752519a862b58b5722354d906509578d55..2fdea02592fa5f3f9e7f8b863e72189900f04978 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
index 0fa6827f06e9f1fc13891102f41dc793ad301399..7f3bedaae59eebf8d32dd99ac2f9c8ff8adf77a6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 4761ae7037379f7283d4056f59d9e65a27cf861a..72478f821e13083be91a965432687694beea94bf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
index 7a1f92e1681e77bd9012115826858ced55e40322..c8c86b3fd8722dcd6639b553a60a029552a2835d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index cd5ed7425c6850d4f3b689b928c0d13e279c784f..b83088fb0e64278bd1bda4e68c848932038c0bd0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 4020e040fa003a16b034d5f5d925b3136d121507..e99098b5b9c395c01a65884467579249c4e1dfa4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 9f6ce0452065488b647104bf216f06155db489d7..affc38cb2dafa0c652d7818b9733e60c6db15d37 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/R b/tutorials/incompressible/simpleFoam/pitzDaily/0/R
index 9a4e4f96becb70a7af7968eb4f7b8b750bf13e61..2eb8459d869ba07ad57e704de02347f6f94833ee 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
index 6ce2a587ad0fc718b51bbc94842bf55bf5df75f7..ec085adb4f59eb5cc3f97b7e0d9c0d100e1ccfc4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
index e2034bcc242a74877752c6073954afb061deffa6..be7ac0223a2e57d8151e9e89bff3773340dc5a5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/p b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
index f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
index 9a4e4f96becb70a7af7968eb4f7b8b750bf13e61..2eb8459d869ba07ad57e704de02347f6f94833ee 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
index c49915e890edc3d755222515b57e71debc9e137f..cc7970b18e82f51242b30c556823d7a5f08e996b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
index e2034bcc242a74877752c6073954afb061deffa6..be7ac0223a2e57d8151e9e89bff3773340dc5a5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
index f8b316739644c871fcd66559e980f091414e48b2..db9c0a3a745a0730223b607369c30f015490eff3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7efaf20113f2828456e2bfbe2aeef3f076306647..c3bb73b5a9ba9d593512ece5d3fda88f565126df 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4aa34033d014bded901af52bb65e0dd11dac1105..f6c97ebb3d77897a41e45d76dbc684596fb0465e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5d217e794f0dad520e39da6bd1086aba377d0c3d..f8e3d4273fed540cdc1a33d70124c015cce389a2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 423ff6219d195e0da2724c5362ade03ac2f4467d..83cbf6a2e79f891ecd1894279ca50d0272c15439 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 964452a9e6c8c207134f154bdf0a5fdb7164b919..89852b13afd14dcd4d02930bbc4362e086316919 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
index 912e11d367969f053e84f460fb3453ed97919d3f..dbf1defeadeffb3576fa714721557e8413e43a66 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,47 +10,49 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object Urel;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
inlet
{
type SRFVelocity;
- inletValue uniform (0 0 -10);
+ inletValue uniform ( 0 0 -10 );
relative yes;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
outlet
{
type zeroGradient;
}
-
innerWall
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
outerWall
{
type SRFVelocity;
- inletValue uniform (0 0 0);
+ inletValue uniform ( 0 0 0 );
relative yes;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
-
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ }
+ cyclic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
index 73ba594afef47b83c405f2ec1c947466a0f42373..c4b875bc8acec3f1257d9bce9f2d3d874daf7065 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,45 +10,47 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 14.855;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 14.855;
}
-
- outlet
+ outlet
{
type zeroGradient;
}
-
- innerWall
+ innerWall
{
type epsilonWallFunction;
U Urel;
value uniform 14.855;
}
-
- outerWall
+ outerWall
{
type epsilonWallFunction;
U Urel;
value uniform 14.855;
}
-
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ }
+ cyclic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/k b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
index 229ac266814e6fa7292fb2fd2ef71e6f5dbcdde2..5dff207809651283e148895c67f5b1a30f7e6457 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/k
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0.375;
@@ -40,7 +40,12 @@ boundaryField
type kqRWallFunction;
value uniform 0.375;
}
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ value uniform 0.375;
+ }
+ cyclic_half1
{
type cyclic;
value uniform 0.375;
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
index 82d057a58b12618c365a34e2e0e9f02f916ff0b7..e3c05b94b67269a73838daba667077618ac3aa20 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -1 0 0 0 0];
+dimensions [ 0 2 -1 0 0 0 0 ];
internalField uniform 0;
@@ -43,7 +43,12 @@ boundaryField
U Urel;
value uniform 0;
}
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ cyclic_half1
{
type cyclic;
value uniform 0;
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/omega b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
index b2f952d00c528d1374957df2d88f8e298635adf3..a7915f30b10436e470cddf6a7eee99231e057a3a 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 -1 0 0 0 0];
+dimensions [ 0 0 -1 0 0 0 0 ];
internalField uniform 3.5;
@@ -42,7 +42,12 @@ boundaryField
U Urel;
value uniform 3.5;
}
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ value uniform 3.5;
+ }
+ cyclic_half1
{
type cyclic;
value uniform 3.5;
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/p b/tutorials/incompressible/simpleSRFFoam/mixer/0/p
index ff72f5db7f140539dce2bf2c1536da0d0c50d097..dfb6fe99fe26f3e27cc3596fb2763359f3c797ca 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0;
@@ -24,27 +25,28 @@ boundaryField
{
type zeroGradient;
}
-
outlet
{
type fixedValue;
value uniform 0;
}
-
innerWall
{
type zeroGradient;
}
-
outerWall
{
type zeroGradient;
}
-
- cyclic
+ cyclic_half0
+ {
+ type cyclic;
+ }
+ cyclic_half1
{
type cyclic;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
index 967148c5ad915f9afda017a6c3a0713cf4c6699d..948100235fafe9a335b97bbe9ced9a7e2bdacc46 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary
index 3fff299c5a6ee14dbf30c8b018c753e9de6d2a46..9dd337f2de4b4c560bffa209470ffb53e9a012a2 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-5
+6
(
inlet
{
@@ -41,12 +41,19 @@ FoamFile
nFaces 880;
startFace 100840;
}
- cyclic
+ cyclic_half0
{
type cyclic;
- nFaces 3200;
+ nFaces 1600;
startFace 101720;
- featureCos 0.9;
+ neighbourPatch cyclic_half1;
+ }
+ cyclic_half1
+ {
+ type cyclic;
+ nFaces 1600;
+ startFace 103320;
+ neighbourPatch cyclic_half0;
}
)
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index 9ec2a85526d187b5e810b70dded7a7bc9208d33f..4b5bfcf421988d19b72689ff2f368602caca1d9d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
index 2a53304fdaa427ba5ce3ebf699897cb00e5d7cdc..36f4c7a3fb649aa0050a1f1b63f68eea18fd1ef1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index 41968dd9bff75eb7de45668184c60766aabdd0ba..814c5a8f9e21d4398b60b8851dcdc32407e4460e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d047da6b26d48153428009a1beb474bc90ac7d20..e95384474bf2c2a80d77a346cd1af1a6a05c0d37 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object G;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 0 -3 0 0 0 0];
+dimensions [ 1 0 -3 0 0 0 0 ];
internalField uniform 0;
@@ -27,6 +27,9 @@ boundaryField
T T;
emissivity 1;
value uniform 0;
+ refValue uniform 0;
+ refGradient uniform 0;
+ valueFraction uniform 0;
}
inlet
{
@@ -34,25 +37,34 @@ boundaryField
T T;
emissivity 1;
value uniform 0;
+ refValue uniform 0;
+ refGradient uniform 0;
+ valueFraction uniform 0;
}
outlet
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O
index ad71bd5b281cf189bbb4f71f6a6325261e601d9c..b99dfc07c7c2c408559fe691cc9a184fb3841c96 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object H2O;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2
index c7d31516aaf80479d6edfd4f73d21a8bb44653ef..bac9361933be71af80f27c72dc34525f5fd00a6a 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object N2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0.79;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.79;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.79;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2
index bb7895700a0c48f122f0516a8fe59a64f2955ba1..7fa3e2e4886fa4d98bc2ab713e5044f1ec50b332 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object O2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0.21;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.21;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.21;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T
index 2fc51bb2f441c313209fa8d3b75db9fa3df7b518..00f9fd04b862fa82cce6bc05a55c3076a4764c83 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 350;
@@ -35,11 +35,11 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
}
- cycRight
+ cycRight_half0
{
type cyclic;
}
@@ -47,6 +47,14 @@ boundaryField
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U
index 117d2186f4818f2e5fe544fa5125d06378289b0d..a0c6dd9ec1e2da43a15d4ab9af02f108740abb9c 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,36 +10,36 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
- location "0";
+ location "1";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
walls
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
inlet
{
type fixedValue;
- value uniform (5 0 0);
+ value uniform ( 5 0 0 );
}
outlet
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
}
- cycRight
+ cycRight_half0
{
type cyclic;
}
@@ -47,6 +47,14 @@ boundaryField
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
index c87862d4ae4f758cac81ec3587a619730cfee3f1..f7c1245cbf2eb1ca62a32b65c64fce3c871d48ed 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -36,20 +36,26 @@ boundaryField
type calculated;
value uniform 0;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon
index 9a102e372abd7058195ee79ec6aa756d3dfb1a40..bb80a5e3d1dc6f8b78cf986943c05a7fe4e726db 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 0.0449;
@@ -35,20 +35,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.0449;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.0449;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k
index 9bbfb01b910dfff0b912a52398bcd3d603059288..1b91a7d191a823124191de8c0702efaf6ad9b81c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0.0938;
@@ -35,20 +35,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.0938;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.0938;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
index 9a7573f3f13cdc21e247c8b19a8192f41728c2a3..d3ec136050dbae710ecbe6d44625769f74ea24ad 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -36,20 +36,26 @@ boundaryField
type calculated;
value uniform 0;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p
index 04a13f7c5f61a336382a25a6df5e9051d44ae472..ba5cc3d6069c551a5fe104ef7c3693e0e3c7e38d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 100000;
@@ -34,20 +34,26 @@ boundaryField
type fixedValue;
value uniform 100000;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 100000;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 100000;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G
index d047da6b26d48153428009a1beb474bc90ac7d20..e95384474bf2c2a80d77a346cd1af1a6a05c0d37 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object G;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 0 -3 0 0 0 0];
+dimensions [ 1 0 -3 0 0 0 0 ];
internalField uniform 0;
@@ -27,6 +27,9 @@ boundaryField
T T;
emissivity 1;
value uniform 0;
+ refValue uniform 0;
+ refGradient uniform 0;
+ valueFraction uniform 0;
}
inlet
{
@@ -34,25 +37,34 @@ boundaryField
T T;
emissivity 1;
value uniform 0;
+ refValue uniform 0;
+ refGradient uniform 0;
+ valueFraction uniform 0;
}
outlet
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O
index ad71bd5b281cf189bbb4f71f6a6325261e601d9c..b99dfc07c7c2c408559fe691cc9a184fb3841c96 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object H2O;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2
index c7d31516aaf80479d6edfd4f73d21a8bb44653ef..bac9361933be71af80f27c72dc34525f5fd00a6a 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object N2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0.79;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.79;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.79;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2
index bb7895700a0c48f122f0516a8fe59a64f2955ba1..7fa3e2e4886fa4d98bc2ab713e5044f1ec50b332 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object O2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [ 0 0 0 0 0 0 0 ];
internalField uniform 0.21;
@@ -34,20 +34,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.21;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.21;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T
index 2fc51bb2f441c313209fa8d3b75db9fa3df7b518..00f9fd04b862fa82cce6bc05a55c3076a4764c83 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 1 0 0 0];
+dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 350;
@@ -35,11 +35,11 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
}
- cycRight
+ cycRight_half0
{
type cyclic;
}
@@ -47,6 +47,14 @@ boundaryField
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U
index 117d2186f4818f2e5fe544fa5125d06378289b0d..a0c6dd9ec1e2da43a15d4ab9af02f108740abb9c 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,36 +10,36 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
- location "0";
+ location "1";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 1 -1 0 0 0 0];
+dimensions [ 0 1 -1 0 0 0 0 ];
-internalField uniform (0 0 0);
+internalField uniform ( 0 0 0 );
boundaryField
{
walls
{
type fixedValue;
- value uniform (0 0 0);
+ value uniform ( 0 0 0 );
}
inlet
{
type fixedValue;
- value uniform (5 0 0);
+ value uniform ( 5 0 0 );
}
outlet
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
}
- cycRight
+ cycRight_half0
{
type cyclic;
}
@@ -47,6 +47,14 @@ boundaryField
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
index c87862d4ae4f758cac81ec3587a619730cfee3f1..f7c1245cbf2eb1ca62a32b65c64fce3c871d48ed 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -36,20 +36,26 @@ boundaryField
type calculated;
value uniform 0;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon
index 9a102e372abd7058195ee79ec6aa756d3dfb1a40..bb80a5e3d1dc6f8b78cf986943c05a7fe4e726db 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [ 0 2 -3 0 0 0 0 ];
internalField uniform 0.0449;
@@ -35,20 +35,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.0449;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.0449;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k
index 9bbfb01b910dfff0b912a52398bcd3d603059288..1b91a7d191a823124191de8c0702efaf6ad9b81c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [ 0 2 -2 0 0 0 0 ];
internalField uniform 0.0938;
@@ -35,20 +35,26 @@ boundaryField
{
type zeroGradient;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0.0938;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0.0938;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
index 9a7573f3f13cdc21e247c8b19a8192f41728c2a3..d3ec136050dbae710ecbe6d44625769f74ea24ad 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -1 0 0 0 0];
+dimensions [ 1 -1 -1 0 0 0 0 ];
internalField uniform 0;
@@ -36,20 +36,26 @@ boundaryField
type calculated;
value uniform 0;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 0;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 0;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p
index 04a13f7c5f61a336382a25a6df5e9051d44ae472..ba5cc3d6069c551a5fe104ef7c3693e0e3c7e38d 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: 1.6 |
+| \\ / O peration | Version: splitCyclic |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,12 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- location "0";
+ location "1";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [1 -1 -2 0 0 0 0];
+dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 100000;
@@ -34,20 +34,26 @@ boundaryField
type fixedValue;
value uniform 100000;
}
- cycLeft
+ cycLeft_half0
{
type cyclic;
- value uniform 100000;
}
- cycRight
+ cycRight_half0
{
type cyclic;
- value uniform 100000;
}
frontAndBack
{
type empty;
}
+ cycLeft_half1
+ {
+ type cyclic;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ }
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index b44a7c8e2f7be6290578156d30d38091665d74a7..2fee29a1301c29041a33ec68e71f332ee580b21a 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -17,10 +17,10 @@ setsToZones -noFlipMap >& log.setsToZones
# create the first cyclic - lhs of porous zone
unset FOAM_SETNAN
-createBaffles cycLeft cycLeft -overwrite >& log.createBaffles1
+createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite >& log.createBaffles1
# create the second cyclic - rhs of porous zone
-createBaffles cycRight cycRight -overwrite >& log.createBaffles2
+createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite >& log.createBaffles2
runApplication $application
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties
index d13d2161c46ddeb89ebb605609eae194ef9de0bd..a6b95d334d3ad51482c6674449f1056ad3dbe180 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 16ee298419d11564872e472182368a0ec451282f..a7981f61867354ef29f8ec99f9d572f04cd195ae 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -62,51 +62,87 @@ edges
(
);
-patches
+boundary
(
- wall walls
- (
- ( 0 1 13 12)
- ( 1 2 14 13)
- ( 2 3 15 14)
- ( 3 4 16 15)
- ( 4 5 17 16)
- ( 6 7 19 18)
- ( 7 8 20 19)
- ( 8 9 21 20)
- ( 9 10 22 21)
- (10 11 23 22)
- )
-
- patch inlet
- (
- (11 0 12 23)
- )
-
- patch outlet
- (
- ( 5 6 18 17)
- )
-
- cyclic cycLeft
- ()
-
- cyclic cycRight
- ()
-
- empty frontAndBack
- (
- ( 0 11 10 1)
- ( 1 10 9 2)
- ( 2 9 8 3)
- ( 3 8 7 4)
- ( 4 7 6 5)
- (12 13 22 23)
- (13 14 21 22)
- (14 15 20 21)
- (15 16 19 20)
- (16 17 18 19)
- )
+ walls
+ {
+ type wall;
+ faces
+ (
+ ( 0 1 13 12)
+ ( 1 2 14 13)
+ ( 2 3 15 14)
+ ( 3 4 16 15)
+ ( 4 5 17 16)
+ ( 6 7 19 18)
+ ( 7 8 20 19)
+ ( 8 9 21 20)
+ ( 9 10 22 21)
+ (10 11 23 22)
+ );
+ }
+
+ inlet
+ {
+ type patch;
+ faces
+ (
+ (11 0 12 23)
+ );
+ }
+
+ outlet
+ {
+ type patch;
+ faces
+ (
+ ( 5 6 18 17)
+ );
+ }
+
+ cycLeft_half0
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch cycLeft_half1;
+ }
+ cycLeft_half1
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch cycLeft_half0;
+ }
+
+ cycRight_half0
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch cycRight_half1;
+ }
+ cycRight_half1
+ {
+ type cyclic;
+ faces ();
+ neighbourPatch cycRight_half0;
+ }
+
+ frontAndBack
+ {
+ type empty;
+ faces
+ (
+ ( 0 11 10 1)
+ ( 1 10 9 2)
+ ( 2 9 8 3)
+ ( 3 8 7 4)
+ ( 4 7 6 5)
+ (12 13 22 23)
+ (13 14 21 22)
+ (14 15 20 21)
+ (15 16 19 20)
+ (16 17 18 19)
+ );
+ }
);
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions
index 3d89cfc87adc3c3c1aeaed0350d49f5976d47df6..380a953bfb4e70c50e1fc93e8e62f8634c91a55e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 70086f0b264a20fc7ab84aae9e8e2747fe8893c6..e2ebae02d6f4b28854dde91c8c2e43ec6a5e2ed9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -136,7 +136,11 @@ LocalInteractionCoeffs
{
type rebound;
}
- cycLeft
+ cycLeft_half0
+ {
+ type rebound;
+ }
+ cycLeft_half1
{
type rebound;
}
@@ -184,7 +188,8 @@ PatchPostProcessingCoeffs
patches
(
- cycLeft
+ cycLeft_half0
+ cycLeft_half1
);
}
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties
index f089b5aa1f000179cc5c062d2154cd5f78c30832..d49f3cf71d02a4f2922cbece9fb87ac9508635b8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index b5f8df21a79c6ef466839f7e58e0e376ba27e218..0f3fa40cf92dd05d7fb6cf2633986f4668a6ae27 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so" "libradiation.so");
+
application porousExplicitSourceReactingParcelFoam;
startFrom startTime;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
index 161079237f24c7b7b5abfe1800a1deaf6288291e..6e8fb5d0e6c24f35752bcc2dd77f41aa6194dc53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
index 72caac37b54a52400327add6cf730af030f06985..f49b0231f03bef98edc8f9eafcd17549f50a7a57 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
index accf5dd083002f6c983d8d615f35f31aade991ee..5d813907a8063eb389d767d6fe4b05ef0a949f98 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
index 962641cf24eef9dabe612d58fcc3c3d49bed05c1..2ef228419242135ec9d36dded38f6dd5fedc9001 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
index 0b6f5a1ecc75903dd7ec4d271221f8d81e6dfaf4..8a461bd14756023f4e10ab13ffe7e942f541e10a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
index c1b0c45daa8fedfb8aea17738f7bf09327271b89..9523758e82c0d8e662a5700317c4db542bd22a19 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 36a2c0b6e00e53ca77cdfc932af10ae4be9956ec..68bb6d93691a873021761f1c0b6fd8cc63431b67 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
index 7482b74389972b873a6fd44ed4499de2b57bf0ba..98646ad46e93bc7571169e63bc3e3a8ec2592b6e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/turbulenceProperties
index c00a70ffcd10c39b6c7e1932cade7e37a7a5f529..693c0989a7a80636269ffddc6b231e1c21dff283 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
index 08fb2ca37de69973eec07ec74cfc200729139806..ae04abedd6afb8ba59e3d3da4e67f7ade161f0e9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/probesDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM 1.4.1 |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0.org/H2O
index aa35b84aff9dd4d6bdd1bc662d9075ed91dae115..3e46197b969abc2773cb84a71720294d192a5966 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4a53e52e1a33322b651347544b9c780e7d894766..69f5653ca787665fe7d0ba17a5df972270ca4f80 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e54716bb87ccd2f2d60bab4a73f5535cc0632016..5fbc4f5e7f973288ddede8ee4fa61fd762fdec18 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cc559b5f01e5629a89777ed45ac98ed95171b7d2..983de9aa2e99af13521e03fb504fd1a3f5d124df 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/H2O
index aa35b84aff9dd4d6bdd1bc662d9075ed91dae115..3e46197b969abc2773cb84a71720294d192a5966 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/T
index 4a53e52e1a33322b651347544b9c780e7d894766..69f5653ca787665fe7d0ba17a5df972270ca4f80 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/U
index 39d9711c4080366f8db54efaeefbe1c0551951d0..be47ccdfa5232ffb1bb64296cb645d33f28563e0 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/U
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/U
@@ -33,13 +33,13 @@ boundaryField
{
type flowRateInletVelocity;
flowRate 0.00379;
- value uniform (0 10.82857143 0);
+ value uniform (0 14.68 0);
}
inletSides
{
type flowRateInletVelocity;
flowRate 0.00832;
- value uniform (0 11.88571429 0);
+ value uniform (0 17.79 0);
}
outlet
{
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/air
index e54716bb87ccd2f2d60bab4a73f5535cc0632016..5fbc4f5e7f973288ddede8ee4fa61fd762fdec18 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
index cc559b5f01e5629a89777ed45ac98ed95171b7d2..983de9aa2e99af13521e03fb504fd1a3f5d124df 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/RASProperties
index a780880b2404d08b13fa39d78a9555dab9d7b88d..02c52e85d0070b4258c314a2650e2fff5d442929 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2cb8bbb4bd2560566fbbb397a9bff37f806e437e..8f1fd10943be05453af59a3795fd180c4a222904 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.openfoam.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index f089b5aa1f000179cc5c062d2154cd5f78c30832..d49f3cf71d02a4f2922cbece9fb87ac9508635b8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c0ec071c9b3f41738ba9b468d590f501e2ea7654..ac30f9d6366c0f9d1d7243da0d587fe691b56ebf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 44eacb8ce341b8814bd4a0097aa9680f76ea8876..d0b01aa6f801a3b1efc653a7fd5b3046195c34d9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b92c0bb9fa60af82d60a3f3a3621a8341489ccf4..bc29aca83ad2d1568e115c198dd1f91df2f82995 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bfaf11072f07c650726809ffe2dd2750cd413e51..5a52c991691b0c821834d3b4bbc6238cb369aca4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fb9983b04439f8ff9d65d8c48062663742e1eeb9..1720f371e3699a0527631efc69df5a8b2fe5f96e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d2359386afd7167062d9d014671ebe21b67ea2ee..b8de19a2e12cceb96fc9ec611db4772967d8b485 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1eccd6ea378ed2fb59b91abc02e79b113ba2ba96..c016f0b3e77d94ec6918a517cf16c3f5ec599e7d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 283a98712786b62915f54ea6a4f470b5759468b8..8d5ec13bfdf41321f5933238155d396b1f5cd959 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c0ec071c9b3f41738ba9b468d590f501e2ea7654..ac30f9d6366c0f9d1d7243da0d587fe691b56ebf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 44eacb8ce341b8814bd4a0097aa9680f76ea8876..d0b01aa6f801a3b1efc653a7fd5b3046195c34d9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b92c0bb9fa60af82d60a3f3a3621a8341489ccf4..bc29aca83ad2d1568e115c198dd1f91df2f82995 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 bfaf11072f07c650726809ffe2dd2750cd413e51..5a52c991691b0c821834d3b4bbc6238cb369aca4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fb9983b04439f8ff9d65d8c48062663742e1eeb9..1720f371e3699a0527631efc69df5a8b2fe5f96e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d2359386afd7167062d9d014671ebe21b67ea2ee..b8de19a2e12cceb96fc9ec611db4772967d8b485 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1eccd6ea378ed2fb59b91abc02e79b113ba2ba96..c016f0b3e77d94ec6918a517cf16c3f5ec599e7d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 283a98712786b62915f54ea6a4f470b5759468b8..8d5ec13bfdf41321f5933238155d396b1f5cd959 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2360627d5612dd343109a6275ee73e00179b8074..22a062a6db92216439f91317decd05613ab1c884 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes
index fb67e7d1ac4d5a7c29fe61deaee41d10d663ce06..a254f7f2b43e4a23ef4723a46abf296886c63b22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Positions
index fe81377d7a54b9c98e6cd1d835a96c10314b28a8..af3a75c15bb8d9665765521b4e635a340edbc751 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4bac918f7119682d4bc5eb01e199bddf8ac23f7d..a006148876aa71f557ec6336eccd2b6d4f95a7b3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1d1dc79489e137dd20be6290cffdd386b2040646..b02e9e00f01c73a3e1b453853bdec0697c4f0928 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 61084f931da39ed6f3500b51880d62c1c9735b61..9ea9e845535257e93edfa8ecaea7cbfad0e1c29a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ce2dbca1f7a7a7d6b30fcbc9d6640eebf8e3befc..69c9e2a5c8481ac77d289226e79ff33f2b40f275 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cfd4eb3b56d659f4b61bc579b8173ddd754e3b98..47f15fad957c4b667608570498552c9d7e1e8bc8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 31c395cf5c5c12165792a40681834cf55d4691be..28f9e6b83126f11cadaecbe013997ed8fb62c336 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 718d0f8981a0536b79853f3ac566a35a98070d94..bdb198e79761832ea445990838e76005dafc6846 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 680a919369d73dab06a4a57ffd183c08c4710c94..bd4dc96fec7cf11dc650c0865e850e77057dd7e4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d038a768836cc1835a7e5c115f7566375a9d7844..9b201d1dabc323e668c75eb3d4c32438938beb13 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 90cb0e6f9d6bda1264d1fbb0079734ddcff12a62..53cacbdc73a6c0ae9ae218ad6aa198967acbd42f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/T
index 4bac918f7119682d4bc5eb01e199bddf8ac23f7d..a006148876aa71f557ec6336eccd2b6d4f95a7b3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/panel/0/p
index 1d1dc79489e137dd20be6290cffdd386b2040646..b02e9e00f01c73a3e1b453853bdec0697c4f0928 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 61084f931da39ed6f3500b51880d62c1c9735b61..9ea9e845535257e93edfa8ecaea7cbfad0e1c29a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ce2dbca1f7a7a7d6b30fcbc9d6640eebf8e3befc..69c9e2a5c8481ac77d289226e79ff33f2b40f275 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cfd4eb3b56d659f4b61bc579b8173ddd754e3b98..47f15fad957c4b667608570498552c9d7e1e8bc8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 31c395cf5c5c12165792a40681834cf55d4691be..28f9e6b83126f11cadaecbe013997ed8fb62c336 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 718d0f8981a0536b79853f3ac566a35a98070d94..bdb198e79761832ea445990838e76005dafc6846 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 680a919369d73dab06a4a57ffd183c08c4710c94..bd4dc96fec7cf11dc650c0865e850e77057dd7e4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d038a768836cc1835a7e5c115f7566375a9d7844..9b201d1dabc323e668c75eb3d4c32438938beb13 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 90cb0e6f9d6bda1264d1fbb0079734ddcff12a62..53cacbdc73a6c0ae9ae218ad6aa198967acbd42f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f210eb8a654caaf3658adfd5799cac3492ebf3c2..8d35586fcfb47c50a4d5684c1e402b85e99aaad5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
index d1ec0b43543eab909213a82a69a896389371ae0e..4260fe53ff4c5e81567d0884957347468fef5143 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 35814b7beb6f0d4d0c07a43e3b884b1b986c6ee9..887efae020522a98769682605de8b98046bbb7ce 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/T
index 7af14ccae9ab96b103266d00563fc90836a7eac5..557c2a00a457fc3620c9cfeb17182a0c9fafac83 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/U
index e8ca849242b0babd08658a8e3b956a3d2cdd28e8..ab700ac7fc19f617f94af8bda566b9ff2044b36c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/0/p
index 33a8121aaa658b51ba482c747065c95e4baf014e..d9e704b77eee544f3f2229b3c83214f7cada0dcb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e607484c06a99763703fb3470b6a7f345fdae8e8..f027e3747b8bbbbb8f3dfed42296d036bbd939db 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
index 9aa7e858c1afd32ad98f665f25a3924c8769ad19..4936063330be067d061e1a6130f4847859305b20 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
index 4ab828938237d594500bffedb67bfedeab0a2bf8..e1d465f739141f333fa76d7811879345f02899ea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
index 64412b357f52603d8e2e0ef45948d3cb415e1d12..fdef44841c22d24b752af33864962bf0f1bf4f55 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
index ce40d1cce5713183824640ae0564812a3218db39..52c0f33bf0ac0cae2c7d08b687ba415ee40dade4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
index ca72907fdafa3b18a77044d437342faad874e404..413fb65ee01f9daa5228f590091e83de4f91e42e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
index 8ce16d7a47e9f2dde7cdd4654c0d98d8fd1eeda1..8e86b07a312c9c67d7f1d0ed95e540a9a4e20d63 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7dfdefa13aebd9599ed8ce410db50a7b5445fd5d..48cc0c40f340250bb72c210f19371e9353e59e88 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
index ee07fc2fd1377fa567ab109f1c42503c91cee57d..836a2125c4b55ee1d1e28e8eb9b2dbcf9b1f616a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 5f0eec5065a633586bff459129cb4c69f6c0fa9a..fb5719202fdf5dcf70e3203d520679821f3581e8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index bbbd6ec481ceb9c7428e52b86fa55c22105005e3..cc32e107da616f994cb1f6af5c9768839d241dfd 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -1,10 +1,10 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
+/*-------------------------------*- C++ -*---------------------------------*\
+| ========= |
+| \\ / OpenFOAM |
+| \\ / |
+| \\ / The Open Source CFD Toolbox |
+| \\/ http://www.OpenFOAM.org |
+\*-------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
index 852331bc83fa2ba82708c929090f5b8774e116dc..290ca17103b1c174ee0c980a2d5c0148ccf7eb06 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7b849ddc86b4f98776cc4ed96cf3863577cb21b2..27a206460501d0e60f4a30fea1256ea06c658917 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d0e20aa930db00a971a24ca975eafe18204f7b24..620076aa4f598c27c0f70e979a98e91ff32d6473 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 dd4026c3f1d0d0e39886bd5bbb0cc18afccbef16..74d99a034100cd6f3a317549ad53e528f4403365 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2613426bdcef7031fd71e0ae3e5b97899049a658..d1cf75982549a3d3f4a211c8908ba743020edf53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4cff4010165c8c51f5d78388b53d9fed66dc96c7..97628b7599d9f832e9da866503e825faecacf93d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
index 6034d0c751fee599bf3ed21866ca09d1a7b274c1..7c7c20286a6ae5416428b73d15f7e84057082368 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
index 0d22e95a26663ced3209d036e31d5b726ae3de2c..858e81fca7c37d0df55490e116c9cd1892397577 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
index 0f2b2147503225b8c01030d9d710995bf9ff5114..23a28e0e408b989b75d0891d41375e5be5b2d807 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
index dd4026c3f1d0d0e39886bd5bbb0cc18afccbef16..74d99a034100cd6f3a317549ad53e528f4403365 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
index 2613426bdcef7031fd71e0ae3e5b97899049a658..d1cf75982549a3d3f4a211c8908ba743020edf53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index 3af4d065e414ba0b9b8e4e0375c6d56877eebbc1..fd48cfbe77496428f70b3eccc88aaf292b780a54 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8211d45402c996591a24f2f5b9d442f3a6437491..226eff6239f25279b01193d1d4670d6511b26cd7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3b8cf58b5ed66c9a8c57468dbb7c3ac461ec9b06..d8b7d8aff2ec2626bde96691b411ed03a7e0dec9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6549e7a1a1837f43f0e4f5911cdce9bfa0c8a7ac..78e7fc8ec37c7ce336fc37abd7118678d762027f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 beb5e8ad00497f3b1cc767fe53ce87dff7c503d2..bd99b180046b73d6d39b1f00c5a9da921862a312 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cefaae04021e8f2879f917fc660b82a10a51a528..61362a1185bd682d89f5c537a0f35a3746cd335f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 65ceada6de51443c1925c604fdac22545150b315..43b40be486474f36e5f4a1f3ec994b4cf8ca0711 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 537983c812ffae9fa7fe677e6c593b255f3390c1..e4987690002d1d73c02e6011bc0f2c806c770bac 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c5fe8c454af14b77458a8c0444dac062ba35a653..72cc5089cbe97a6f079319db7882a902d8100ab5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1df4f1e9d15b88149bf635dad978f45a49a8ffdc..24516751f40cba6cfcff597fca16f0b4569a58da 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c4186a9b8e7300a3397a2984a8ae331820324386..b518bc63ecc8dde533d8c4f4aa4b674d47072c1f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 93806551c7674cb715f4f0f8622236186c7b12cb..06970f3e495f8479d7109f4067482c03156cf5cc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d02d49e097238c2e08fc1a471d6a340aa29b9b76..d8e57ead937ec24b700e072064c8085db24a704c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 497247ea216441a8f82b5371d4e759c3e6b17a36..1a1b0bb9c62eb04fc40928a9c7c9a97635572cbf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d7ce75fc2e4cf8468d1b4fdad7d29322e0d8a1b5..4b434b5f7ddda455fd42767885fe51e2821bf1e3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1df4f1e9d15b88149bf635dad978f45a49a8ffdc..24516751f40cba6cfcff597fca16f0b4569a58da 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c4186a9b8e7300a3397a2984a8ae331820324386..b518bc63ecc8dde533d8c4f4aa4b674d47072c1f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 93806551c7674cb715f4f0f8622236186c7b12cb..06970f3e495f8479d7109f4067482c03156cf5cc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d02d49e097238c2e08fc1a471d6a340aa29b9b76..d8e57ead937ec24b700e072064c8085db24a704c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 497247ea216441a8f82b5371d4e759c3e6b17a36..1a1b0bb9c62eb04fc40928a9c7c9a97635572cbf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d7ce75fc2e4cf8468d1b4fdad7d29322e0d8a1b5..4b434b5f7ddda455fd42767885fe51e2821bf1e3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7097a7fd46890b242b3346a0e2a4e42ec91ffd34..e6d091009eb0cc3b255069c917006765e2e27056 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 71b56102692cf8a3207fed0ad1e9f0c79ad1fec6..df97c7370266feeebbdb0ed3831cb4b56f945ed2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6549e7a1a1837f43f0e4f5911cdce9bfa0c8a7ac..78e7fc8ec37c7ce336fc37abd7118678d762027f 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 65ceada6de51443c1925c604fdac22545150b315..43b40be486474f36e5f4a1f3ec994b4cf8ca0711 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 537983c812ffae9fa7fe677e6c593b255f3390c1..e4987690002d1d73c02e6011bc0f2c806c770bac 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c5fe8c454af14b77458a8c0444dac062ba35a653..72cc5089cbe97a6f079319db7882a902d8100ab5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 360c554fe8e54fe208e0c14e8ebf16d0db31d529..efd12704820c03a9fdc09ca1d2d2fc6dc8aa869a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4c1f958e8b09fea734ed37857b8434eaf0ab5bb6..a21ae5c855fcc34a8007dcf0b0c984386b383dfd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 29b3ad1dd7b669a95a2e78f5e33d32aa5fb65aa6..427d8c26c167df31beee8b18c4e60ad9a58a56c4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 acbeff0f775f764afdd97a0b6f117b6ba200d575..c76e0e94bcf2622c60a12a07771b010e3e9f319a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 91ef2164cb29e2255b7a583a7c3b960f65102a7f..97acd94621f325c1ae605cd58233b48f2859e78d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ef23b09de46a570bb209379a912e36dab339406..4772b35127a7d826e59acfb93ed9e8221a84360d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c5897539abcfe79fa3a779c16fa4876bee7009ba..e0e94930821e7403edf222f85b6e99fbd9d88b08 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e87a9075ef08e604ea4a049ba162f700e07c5f65..2ea938f206816b71fef4ac76de8faa6b0e709095 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1d8d21b809d8001181b444d17ea499f4c63c6342..898782da0f2b09f74cea48482f0d39650356c0ea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3dd23ca8542b66bd3c27889869f4013ae83f55d7..d4b188f0254aeac71bb4aef6478f847ab21e361b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3dd23ca8542b66bd3c27889869f4013ae83f55d7..d4b188f0254aeac71bb4aef6478f847ab21e361b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f92d8da369afd11cb282f1e6ee84d90e63977f15..a07be1723a3277c90a94469101011e97904447bd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3dd23ca8542b66bd3c27889869f4013ae83f55d7..d4b188f0254aeac71bb4aef6478f847ab21e361b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f92d8da369afd11cb282f1e6ee84d90e63977f15..a07be1723a3277c90a94469101011e97904447bd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d3bc3b6f5a26f24385714faf55da3de4506beada..df92de808dbc7b61c619d025f36db9be006022bc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7beceea5a6010da1dae0098801b797a9f5a01dcc..b5127205565f8a4d0e734bf5f989b385e51ff768 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ccb8389ba4de4fb4affe5fa6e81582f9269bee4..083baf725a14ecb9787708faf739d7e859f6172e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 548ad0064e7e0d9117af108ddbbc2615299c6865..611466bb780fc9e54585ddbdbe160ad492fde813 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2d9e6e21d30d41ce6bd05b7e60fbf88e5d229eaa..7fdf7ca03a211e2ca66f32fcb6edf24eea0d4753 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fbc6ab7a177b523a9743ea8385aef87b29a24125..cc537fd8a3454e395d7c8a4c3939a8c706d5acd5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2203f7e5d0d0c2fbcc842a055a1b221c2c0a856e..1411e6ce4a762e93441d0b39b8bbfdb7c331f1ea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ebc41278261e431e237b5fc0588be8a935aa74c4..cc5521b16f54d4f87e4f021cf22d6f4c6bffaab8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0341c304769d1b10dbc2881accb81bc8b736ce3f..70aa130dc86021d8d1f59ff6dc2cf109fee249cf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3fb3c4a7d4c58f93faed009ef91dace8d9785f01..63a339f2b9ac030c609b24b5570574dc0b40a7e1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 fbc6ab7a177b523a9743ea8385aef87b29a24125..cc537fd8a3454e395d7c8a4c3939a8c706d5acd5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2203f7e5d0d0c2fbcc842a055a1b221c2c0a856e..1411e6ce4a762e93441d0b39b8bbfdb7c331f1ea 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ebc41278261e431e237b5fc0588be8a935aa74c4..cc5521b16f54d4f87e4f021cf22d6f4c6bffaab8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0341c304769d1b10dbc2881accb81bc8b736ce3f..70aa130dc86021d8d1f59ff6dc2cf109fee249cf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3fb3c4a7d4c58f93faed009ef91dace8d9785f01..63a339f2b9ac030c609b24b5570574dc0b40a7e1 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cef053f055736ca828e089c1929fa0c3ee0cc929..a1abb4874af6b1f8edd6e8ecd5344cd643f3cf5e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9e92e77c4c3af0e5a0f7ddc408f12be618bcfe2..fbbc61ac18ab37928e7755f25d050e956bf28f39 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e1b9c008e5adcf3135bc993d9e971bc08b0e8aff..dd16aa2b670d12ba08f55fbf4b8e1ced78409351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 348445a10789c12420610bdd95b9861f176375c9..49a0cf9faeca834874a0c502363e933b942962a4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f16c37b1b9d60c338e8281031fdc9ec93fff6a5d..4060d827218afc9f062d6497beb2e5a68070624b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cef053f055736ca828e089c1929fa0c3ee0cc929..a1abb4874af6b1f8edd6e8ecd5344cd643f3cf5e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9e92e77c4c3af0e5a0f7ddc408f12be618bcfe2..fbbc61ac18ab37928e7755f25d050e956bf28f39 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e1b9c008e5adcf3135bc993d9e971bc08b0e8aff..dd16aa2b670d12ba08f55fbf4b8e1ced78409351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 348445a10789c12420610bdd95b9861f176375c9..49a0cf9faeca834874a0c502363e933b942962a4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f16c37b1b9d60c338e8281031fdc9ec93fff6a5d..4060d827218afc9f062d6497beb2e5a68070624b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cef053f055736ca828e089c1929fa0c3ee0cc929..a1abb4874af6b1f8edd6e8ecd5344cd643f3cf5e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9e92e77c4c3af0e5a0f7ddc408f12be618bcfe2..fbbc61ac18ab37928e7755f25d050e956bf28f39 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e1b9c008e5adcf3135bc993d9e971bc08b0e8aff..dd16aa2b670d12ba08f55fbf4b8e1ced78409351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 348445a10789c12420610bdd95b9861f176375c9..49a0cf9faeca834874a0c502363e933b942962a4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 f16c37b1b9d60c338e8281031fdc9ec93fff6a5d..4060d827218afc9f062d6497beb2e5a68070624b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cef053f055736ca828e089c1929fa0c3ee0cc929..a1abb4874af6b1f8edd6e8ecd5344cd643f3cf5e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a9e92e77c4c3af0e5a0f7ddc408f12be618bcfe2..fbbc61ac18ab37928e7755f25d050e956bf28f39 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e1b9c008e5adcf3135bc993d9e971bc08b0e8aff..dd16aa2b670d12ba08f55fbf4b8e1ced78409351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 e807f388d3e10c2999b2d93c92a987b06ab89156..ed9075c3ac5c9b96088110e814a61e8b83a2fd06 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6d51bd063a767c392789e9c90cfb99796263eccb..b8cc18736b954697bdea7b70dc8613c25f94aead 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 4ea08586b90373f794eb501076a919e23e95050f..db463ab1beeb742376195dfa8d4bb98efd3b4a08 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2ed99cbdc2a4055e4b0cc3972eedd2eb78ea26a6..0ef40d2fc80ced2fad0009ab2ab9eabfbb971dcc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7081624ee2501a94f545fdb1d0d51e5182744959..552afa40de33acd0f931aaace5feb215741d4fbf 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 1b90bac98f8d484b5e7b57a337e215036c0f8f39..5175a4176531b0622e2fdc2862edce8f7fbf7115 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a916058a370e8ce307bd56507cb88481c2c71fc2..26852141c2105c1e29071bcfc24a91c920937a02 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0f40f11f1946b53589c8107de417b4c0cb59a882..b7b66879d3d0b38c6c59dd7b83c039fb99bee862 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 0f40f11f1946b53589c8107de417b4c0cb59a882..b7b66879d3d0b38c6c59dd7b83c039fb99bee862 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 57caa25d462df7e83225b29fa77594a5165c4274..b77bfe911838f761d5818a97593e1a4652949d22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 46ba31da890ae37a16f8487580bc78b1a11c9779..a2553926d290a80076f1bf827324fd256d933b53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d569e87ce2372947b82397b24d4e67d2bc0f4d61..ac37c4d02d24044e0960c88550ebc2d7101405ee 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 481c06a662fb93be9cdd28272ad4af4b53fbe630..2fbf889b498bda982e087def0be42d26ff08b351 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 add26afe4ba0a6a16ca2190959904e418f41ed69..555614b82952fa1f77ecabcf6daefdfb5806ccc4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 15b10ced508ca45ca8932770d0b4a2d86578e280..d79a980fe357fa7122e27f64dc2e215d2da16741 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 93359824435693fc103e8848f474fb95b1f8dce1..22a1a3ccae5dc14b4e1058a52b9127f452df20c8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 204cfbb358dd60830a37c2707c85d4d2961eb3a5..eaf7f5fc9143d2983e43b16af8a6c75a10433074 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a7a3b919fd2e37f08278e93a6ae56032fc6efb5a..0785a10958c5a54833fd004125fa78c2dcbced82 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 771303be571436149aad6c541fa7784819786e6d..3da20b0cea9d0f22ec5ddfb6fe99c78499089e4e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a30c09779c8f782bd99351be67c787bf90f599e3..ddc972e63dd9d1d54fdead750d5c0db63aaa70cc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a30c09779c8f782bd99351be67c787bf90f599e3..ddc972e63dd9d1d54fdead750d5c0db63aaa70cc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b7dded56b09511294d775e9582c8609d60394a9a..c48d7b029693a5da8eb4f9ee225f73825fd00783 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b7dded56b09511294d775e9582c8609d60394a9a..c48d7b029693a5da8eb4f9ee225f73825fd00783 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 7727e252532cc1680cdf67618d6f0815f0a498cb..d0e5e2e1c74c25aab5930377454730a1bbe56e5a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 57caa25d462df7e83225b29fa77594a5165c4274..b77bfe911838f761d5818a97593e1a4652949d22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 46ba31da890ae37a16f8487580bc78b1a11c9779..a2553926d290a80076f1bf827324fd256d933b53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 a916058a370e8ce307bd56507cb88481c2c71fc2..26852141c2105c1e29071bcfc24a91c920937a02 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 18e74caf803a756c955ff7db6530c078558884eb..f0bdefa8cddb1ae29fe7f3c675625c288f9a509e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 042ba2a84a36adcb9a8b6835b2cfe43561eba88c..122e71dacedafedd83ea01b45380bc03d789950a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 aec86a3f98f693e1c0676bbe8d373a78fa8c3e0f..f3d69ec08266a13c1c1f9ce2a80b2f1bdb6655cd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 57caa25d462df7e83225b29fa77594a5165c4274..b77bfe911838f761d5818a97593e1a4652949d22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 46ba31da890ae37a16f8487580bc78b1a11c9779..a2553926d290a80076f1bf827324fd256d933b53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
index 3eb31bf607d6688b78bd807b92b72ae335050543..6f307153531a385db560448a48a7f21ca26fd423 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index d3b6f996b4f523bf5e0178a32f32403c87722931..6262dc6bdea78f8d70b7fefa82aa9007334b9e04 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index ae81912fbcf66fb1357f72e5bd158793316eab2d..fc9f400f23e0a9e0a4ea746282bf093de9228c33 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index dc1aeecc04bd6313d795f52ec6015803b0aed9c4..169c2b903b951a54d8a23b402e217f8f220088f4 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 2760a6814dbadd52593f970a7ab8109924d9ce0c..9e2f08ee67ce1e0b4cf9ef220e8e39b6eaee3e8b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 95fe4a50d1c70b7f75173cd96887777328f9ad43..99656a7c348523b11a7102e4bd809200d642c64e 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 1d7db61ae0f7fa9f0042553bfc7553beba5ece9c..7dace65475ae4c95b188783215901fd25b7e5312 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
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury
index eb770a8d943f78e69d9f0900bf166f246971398f..938941063244f4e67d2a8d06559d76dc6c900c93 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 c97aec687b587c8f28259a4c743827ec88f45f41..606e71d5b6e2d306e098729ba79cc001ccb8b2b0 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/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater
index fb4b3a2c3340022abf11c94010a81fba2e8c2ddc..05a6fc2edb313465a484fc9edbebc06d02f401db 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 57caa25d462df7e83225b29fa77594a5165c4274..b77bfe911838f761d5818a97593e1a4652949d22 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 46ba31da890ae37a16f8487580bc78b1a11c9779..a2553926d290a80076f1bf827324fd256d933b53 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/damBreak4phaseFine/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U
index 95fe4a50d1c70b7f75173cd96887777328f9ad43..99656a7c348523b11a7102e4bd809200d642c64e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 83693b7b8e871c965e18d2f56cb0b9d2692149d5..4441a5df02834013b4b03c67331f333e4b386e7e 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 171627ee36f238e3be088640c1405571d317e858..9f2ae07b73c3a40a0d072d9e6aa392043f4b8ce6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 3ba2034d4a23461be4a44bcc1dae5d1c0569e614..0caca07b5fd4374b22dfd6493d57382492e68af3 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9b6fd85338601e10916c9e0103fde69b942f2c36..500a8c8e7b0f5c78ab07a8f734162f398df1eccb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 57caa25d462df7e83225b29fa77594a5165c4274..b77bfe911838f761d5818a97593e1a4652949d22 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 9bf44fd6f6662381785e175ee817cc02dd0e1033..2133317874dda05202a10c4a7864952640493805 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 097104af65f5bcca212e7ea7945cb6dff1a1d0a4..a0a0043af1b42aafb9d3f5dccd99d9edcbf12f3c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 071ae37fd7a8956a6a11658f2dc264068e2b5de7..ca6b9f8f7a0181e912ba0a0b4bc5c24a1af6a435 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 45dd8a227924a3899b95f87938f078b70a242ca1..27b4ba3c1fee38db5552a5b98879866b91e704bd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 c4746372dd43b34b93bd3af0ee8f867b0da952d5..6bd1a6b4164ecbd395f3ec1b861933536b211248 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 ffffdae8050ddf66fa82135b2b0240df23062148..a2a965130f57a71e8bc7cc3d8126c8fdedfe7143 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d4e6e63e58d55a7b691f6f4d5aa80802657b6a68..28b3bb25feafd4b3209bb37a2db1dfc8e73e9fd6 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 2225c01c349c8d7a9fa054058f1e1caf7d9c91b1..bac98acc6cf42017b1c0653f92effee12092e5ec 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 cfdaca1e1ee05656ad963fe6329b204bf59d2bcd..18e136580a964dceebcfebe1bd472da6c9f29167 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 05ba38c6462e2fbe136addeb22aaeceb81805c23..634512f95121d036d093ba8d760b5f2f10b80dd5 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 d41ccc00f1e08ab75338ee3e22291e01407640b9..5bc3ea2d5113c3a8905e20e0ba0716313fd42caa 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b6d7779938edbbbf1244740b68f8c0a599f3af4f..fafd5b9bb17ae18c697ad721c315d8d96f7b9246 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 931b4164387e42d2ddbe4004d81d1f6ae9da5851..5d48248b2e6256ca95f170cfbc3b177570cb0ef9 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
index 9dc4815fc918485283cb32b4c897f47b88bf044c..6ba52b9f30f792bb8ddcdbd677a768553bba98a8 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
index 8cddab864b83d3475b21cf9a3fbc5e46c77f8564..6ee0d6d1bc0867b7b766b1d129203c9b169e597d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
index 52e464a1ddb0c6ebf6d6334e5fa2e1b4c17c9ad6..a34a308197ab5754cbd00542ac5581f317dbf16d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
index bc06977aed1fa265ac2ecffea37a62ca2dbbc63f..3ad8dd0aa24279878215d811d9689b3bfd121155 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
index c143a8d49182d400306030f53eb1ffc096bf65d8..55f4ac67865ca168e153abb2655d264f3e398dfc 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
index 4d63bf283efff9e2664d7c3fa430c3660685b6e6..48e7b295ae545451946021f62258a18b620381bb 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 48de7326de1cb721d5fff94879e09c2df03340ec..2028ac422a7408a27dc7c68640ed556aba041350 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 b53f84028277a7401faab658e48e6901781e279e..46813128f98b90b02f725448f9bfbde55811c653 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
index 2ddeacd71853d7db1ad0ba26f06398c8bf6b38f1..3a01b0c106bb6b8713769cfdc23b4716d0ed9cc2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
index 10968909fed15ae0373bd1a35a6b48c4080fb237..1826401e4e088b2df1d831252be246e4d668606a 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
index 47c04d80f674a696a262bfb75ac1076d56ed6bcc..7914675720f5c1bb42d84f103dbddc745225e68c 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
index e156448740ecd2efa2c4165137df18809e790cc9..55975fe34db8ca656444e6ed83282f4b225874a0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
index 8e2ed5e86095b10528cabf2a46956a29da4c6c1e..c29b1859e83d580210edfa6ded2a438bc5123802 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
index cf6be6bb426131da3c1c72d55fc1ed76cc3701e2..9a8dbe0f01f14262c6c1a31345b8bdbc19761843 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
index f52ff703e023075931a55fe6b0af6869755249cd..658b9abcc3b62915f66ca312e38f09ba62a1940d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 196f5c7f97d4245321c5ce128e9f47c38c9556bf..8188166eff363d27e79b12fb1cd78db590ca20fd 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
index 700d77bb8d5f70a23bad1242e88e0943ce85de82..b177c93a4bac42a54feb405c87491e8476d2be8d 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
index 6034d0c751fee599bf3ed21866ca09d1a7b274c1..7c7c20286a6ae5416428b73d15f7e84057082368 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
index 0d22e95a26663ced3209d036e31d5b726ae3de2c..858e81fca7c37d0df55490e116c9cd1892397577 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
index 0f2b2147503225b8c01030d9d710995bf9ff5114..23a28e0e408b989b75d0891d41375e5be5b2d807 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
index dd4026c3f1d0d0e39886bd5bbb0cc18afccbef16..74d99a034100cd6f3a317549ad53e528f4403365 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
index 2613426bdcef7031fd71e0ae3e5b97899049a658..d1cf75982549a3d3f4a211c8908ba743020edf53 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index 3af4d065e414ba0b9b8e4e0375c6d56877eebbc1..fd48cfbe77496428f70b3eccc88aaf292b780a54 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 8211d45402c996591a24f2f5b9d442f3a6437491..226eff6239f25279b01193d1d4670d6511b26cd7 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
index 918606efcabb91e968cc0391f580353d01e377b4..0b4e256c715754d7327c9318e59883dac2602560 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
index e31bae514f29e555bc3ffe03dac7b397e9daf8f3..8abec760d6f831a90ae4995f4768fa6a5282e9b2 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 acc15964b320065368a05c32e1d6904271f72329..76c0da85fc320d1f1a34a39660e1dd738f28442b 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
index e04a2bbc2b44c1e04b5d49d6f76965a4baa618d9..5e3af9404b4c1e0a58f9f838cd93463db2727df0 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
index bd9e60862e8067b4425b3eb014d9663ad96cb259..c1c8677397a34c81d8dcce56032219f8688a3e26 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://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 6ce7fc85b2bda9e090c3d40de6d49c7da254ea23..633de6a4063f40106423584f4cbec1f45a5023db 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: www.OpenFOAM.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt
index 3446f7f58cbeb23e1753e982a9734bbf1a180b43..5e2b738cd9bd0935ff3a504e9c7586c742493d63 100644
--- a/wmake/rules/linux64Gcc/c++Opt
+++ b/wmake/rules/linux64Gcc/c++Opt
@@ -1,4 +1,3 @@
-c++DBUG =
+#c++DBUG = -O0 -DFULLDEBUG -g
+c++DBUG =
c++OPT = -O3
-#c++OPT = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3