diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index c7289b23f901906c4fe7c96366c041ac8f0a3e9d..c4edc961d887231dfa7be0afe4f105f39379862c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -70,7 +70,7 @@
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
runTime.timeName(),
mesh,
IOobject::NO_READ,
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 163955056439cd7615e0acf7e020fb3f026ab643..12dc93795c250ca173b90710b80e8c9bc84dd4f3 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -83,14 +83,14 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
- dimensionedScalar("rho*phi", dimMass/dimTime, 0.0)
+ dimensionedScalar("rhoPhi", dimMass/dimTime, 0.0)
),
alphas_
@@ -986,6 +986,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
MULES::limit
(
+ 1.0/mesh_.time().deltaT().value(),
geometricOneField(),
alpha,
phi_,
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
index 980d1be6306103ff2aea735fdd2cb49eca276ce3..e9aa9fb9b9efa54295d25c629fa901ca72bc9073 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
@@ -38,7 +38,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "incompressibleTwoPhaseMixture.H"
@@ -77,16 +77,26 @@ int main(int argc, char *argv[])
#include "setrDeltaT.H"
- twoPhaseProperties.correct();
-
- #include "alphaEqnSubCycle.H"
- interface.correct();
-
- turbulence->correct();
+ tmp<surfaceScalarField> tphiAlpha;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties.correct();
+
+ #define LTSSOLVE
+ #include "alphaEqnSubCycle.H"
+ #undef LTSSOLVE
+
+ interface.correct();
+ }
+
+ turbulence->correct();
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files
index 205812e978dd9dfe7ace29f84753167d1186ab39..db8b3af426e048fcb0857ec82650dd8a08868468 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files
@@ -1,4 +1,3 @@
LTSInterFoam.C
-MULES.C
EXE = $(FOAM_APPBIN)/LTSInterFoam
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqn.H
deleted file mode 100644
index faae19767035025223dbd22b6be483d7dc6d6ace..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqn.H
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- word alphaScheme("div(phi,alpha)");
- word alpharScheme("div(phirb,alpha)");
-
- surfaceScalarField phic(mag(phi/mesh.magSf()));
- phic = min(interface.cAlpha()*phic, max(phic));
- surfaceScalarField phir(phic*interface.nHatf());
-
- for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
- {
- surfaceScalarField phiAlpha
- (
- fvc::flux
- (
- phi,
- alpha1,
- alphaScheme
- )
- + fvc::flux
- (
- -fvc::flux(-phir, alpha2, alpharScheme),
- alpha1,
- alpharScheme
- )
- );
-
- MULES::explicitLTSSolve(alpha1, phi, phiAlpha, 1, 0);
- //MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
-
- alpha2 = 1.0 - alpha1;
- rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
- }
-
- Info<< "Phase-1 volume fraction = "
- << alpha1.weightedAverage(mesh.Vsc()).value()
- << " Min(alpha1) = " << min(alpha1).value()
- << " Max(alpha1) = " << max(alpha1).value()
- << endl;
-}
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqnSubCycle.H
deleted file mode 100644
index 81c65c1caf737480956f72ff2d3952f7311436c5..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqnSubCycle.H
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "alphaControls.H"
-
-if (nAlphaSubCycles > 1)
-{
- dimensionedScalar totalDeltaT = runTime.deltaT();
- surfaceScalarField rhoPhiSum
- (
- IOobject
- (
- "rhoPhiSum",
- runTime.timeName(),
- mesh
- ),
- mesh,
- dimensionedScalar("0", rhoPhi.dimensions(), 0)
- );
-
- for
- (
- subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
- !(++alphaSubCycle).end();
- )
- {
- #include "alphaEqn.H"
- rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
- }
-
- rhoPhi = rhoPhiSum;
-}
-else
-{
- #include "alphaEqn.H"
-}
-
-rho == alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
index 887ef9e34b5f032d62e730a6fd9faae6a97f0c32..56527781a25b4f3b5093f04ccd5c370438e48635 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
@@ -37,7 +37,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "incompressibleTwoPhaseMixture.H"
@@ -81,15 +81,22 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- twoPhaseProperties.correct();
-
- #include "alphaEqnSubCycle.H"
- interface.correct();
- #include "zonePhaseVolumes.H"
+ tmp<surfaceScalarField> tphiAlpha;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties.correct();
+
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ #include "zonePhaseVolumes.H"
+ }
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index b1cfcac9bd812c22bd62a4560d5c5b2d42ac20e6..8811a53df650d1ae1646edae2769d78846fbe4fa 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = \
+EXE_INC = -ggdb3 \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index a2720e20eeec598b64ac4e783e175670069f98da..f6e57df771d897333bcc161ab381f66f4767f4b5 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -6,9 +6,37 @@
phic = min(interface.cAlpha()*phic, max(phic));
surfaceScalarField phir(phic*interface.nHatf());
+ if (pimple.firstIter() && MULESCorr)
+ {
+ fvScalarMatrix alpha1Eqn
+ (
+ #ifdef LTSSOLVE
+ fv::localEulerDdtScheme<scalar>(mesh, rDeltaT.name()).fvmDdt(alpha1)
+ #else
+ fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
+ #endif
+ + fv::gaussConvectionScheme<scalar>
+ (
+ mesh,
+ phi,
+ upwind<scalar>(mesh, phi)
+ ).fvmDiv(phi, alpha1)
+ );
+
+ alpha1Eqn.solve();
+
+ Info<< "Phase-1 volume fraction = "
+ << alpha1.weightedAverage(mesh.Vsc()).value()
+ << " Min(alpha1) = " << min(alpha1).value()
+ << " Max(alpha1) = " << max(alpha1).value()
+ << endl;
+
+ tphiAlpha = alpha1Eqn.flux();
+ }
+
for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
{
- surfaceScalarField phiAlpha
+ tmp<surfaceScalarField> tphiAlpha0
(
fvc::flux
(
@@ -24,12 +52,32 @@
)
);
- MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
+ if (MULESCorr)
+ {
+ tphiAlpha0() -= tphiAlpha();
+ #ifdef LTSSOLVE
+ MULES::LTScorrect(alpha1, tphiAlpha0(), 1, 0);
+ #else
+ MULES::correct(alpha1, tphiAlpha0(), 1, 0);
+ #endif
+ tphiAlpha() += tphiAlpha0();
+ }
+ else
+ {
+ tphiAlpha = tphiAlpha0;
+
+ #ifdef LTSSOLVE
+ MULES::explicitLTSSolve(alpha1, phi, tphiAlpha(), 1, 0);
+ #else
+ MULES::explicitSolve(alpha1, phi, tphiAlpha(), 1, 0);
+ #endif
+ }
alpha2 = 1.0 - alpha1;
- rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
}
+ rhoPhi = tphiAlpha()*(rho1 - rho2) + phi*rho2;
+
Info<< "Phase-1 volume fraction = "
<< alpha1.weightedAverage(mesh.Vsc()).value()
<< " Min(alpha1) = " << min(alpha1).value()
diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
index 81c65c1caf737480956f72ff2d3952f7311436c5..5db9f16546180ca8b428eb2527dd5798c4acddba 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
@@ -1,5 +1,3 @@
-#include "alphaControls.H"
-
if (nAlphaSubCycles > 1)
{
dimensionedScalar totalDeltaT = runTime.deltaT();
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index f0d18098483634633a10f2c7ffb9068a06f91cb6..3039171f77a74c38d46bb5770ed85d8357f3d597 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -62,13 +62,14 @@
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
- rho1*phi
+ mesh,
+ dimensionedScalar("0", dimMass/dimTime, 0)
);
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 032f2db7303cc5004bc0e01355c78bceb346dfa6..d56e300581d9d9e4cbd46dc79270392f4d51f887 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "incompressibleTwoPhaseMixture.H"
@@ -77,46 +77,56 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
+ tmp<surfaceScalarField> tphiAlpha;
- mesh.update();
-
- if (mesh.changing())
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
{
- Info<< "Execution time for mesh.update() = "
- << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
- << " s" << endl;
+ if (pimple.firstIter() || moveMeshOuterCorrectors)
+ {
+ scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
- gh = g & mesh.C();
- ghf = g & mesh.Cf();
- }
+ mesh.update();
- if (mesh.changing() && correctPhi)
- {
- // Calculate absolute flux from the mapped surface velocity
- phi = mesh.Sf() & Uf;
+ if (mesh.changing())
+ {
+ Info<< "Execution time for mesh.update() = "
+ << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
+ << " s" << endl;
- #include "correctPhi.H"
+ gh = g & mesh.C();
+ ghf = g & mesh.Cf();
+ }
- // Make the flux relative to the mesh motion
- fvc::makeRelative(phi, U);
+ if (mesh.changing() && correctPhi)
+ {
+ // Calculate absolute flux from the mapped surface velocity
+ phi = mesh.Sf() & Uf;
- interface.correct();
- }
+ #include "correctPhi.H"
- if (mesh.changing() && checkMeshCourantNo)
- {
- #include "meshCourantNo.H"
- }
+ // Make the flux relative to the mesh motion
+ fvc::makeRelative(phi, U);
- twoPhaseProperties.correct();
+ interface.correct();
+ }
- #include "alphaEqnSubCycle.H"
- interface.correct();
+ if (mesh.changing() && checkMeshCourantNo)
+ {
+ #include "meshCourantNo.H"
+ }
+ }
+
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties.correct();
+
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ }
- // --- Pressure-velocity PIMPLE corrector loop
- while (pimple.loop())
- {
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H b/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
index d4e332ff38e9d2699c0919ef45a1a9edd3769fc1..bf8b38f42616a82904a1aa8ff4dd5eba9cffb629 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H
@@ -1,6 +1,16 @@
- #include "readTimeControls.H"
+#include "readTimeControls.H"
- bool correctPhi =
- pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
- bool checkMeshCourantNo =
- pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+bool correctPhi
+(
+ pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+);
+
+bool checkMeshCourantNo
+(
+ pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+);
+
+bool moveMeshOuterCorrectors
+(
+ pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+);
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index fa9b4fffe44c0407fbb51c4639001c272876c75a..0ddfed50396eefbe37953f16d608fa60b69d83f1 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -38,7 +38,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "incompressibleTwoPhaseMixture.H"
@@ -80,14 +80,21 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- twoPhaseProperties.correct();
-
- #include "alphaEqnSubCycle.H"
- interface.correct();
+ tmp<surfaceScalarField> tphiAlpha;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties.correct();
+
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ }
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
index 15759adfe4a354816f94c2c928d77558aa9fdd32..970da9fc925c8c15ef0e3aa54f7fde4a2197502f 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
@@ -75,6 +75,7 @@
MULES::limiter
(
allLambda,
+ 1.0/runTime.deltaT().value(),
geometricOneField(),
alpha1,
phiAlpha1BD,
@@ -116,6 +117,7 @@
MULES::limiter
(
allLambda,
+ 1.0/runTime.deltaT().value(),
geometricOneField(),
alpha2,
phiAlpha2BD,
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 196c82194c9fdac753607d426491c67f5dbaf972..3fd5874d5b479efc9288e9bf143970c2227a481e 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -63,7 +63,7 @@
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
runTime.timeName(),
mesh,
IOobject::NO_READ,
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 93cb8a0c3de15eb5e42884b8356aa17019bd1d5f..3321da57f9dffa699ab0a136187f94c34810f49f 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "threePhaseMixture.H"
#include "threePhaseInterfaceProperties.H"
@@ -74,16 +74,23 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- threePhaseProperties.correct();
-
- #include "alphaEqnsSubCycle.H"
- interface.correct();
-
- #define twoPhaseProperties threePhaseProperties
+ tmp<surfaceScalarField> tphiAlpha;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ threePhaseProperties.correct();
+
+ #include "alphaEqnsSubCycle.H"
+ interface.correct();
+
+ #define twoPhaseProperties threePhaseProperties
+ }
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
index 64938174dc06bec138163a2c160a7a176ed2a102..15b4439220846d0079623443d49ef38b0530ac86 100644
--- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
@@ -39,7 +39,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "incompressibleTwoPhaseMixture.H"
@@ -83,14 +83,21 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- twoPhaseProperties.correct();
-
- #include "alphaEqnSubCycle.H"
- interface.correct();
+ tmp<surfaceScalarField> tphiAlpha;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties.correct();
+
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ }
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index b6e70fc2950b491da1614c4aea58c2e4b80cf955..45cba01d5b62d950cb6b7d795aa1819b3d7502c2 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
@@ -16,8 +16,14 @@
{
fvScalarMatrix alpha1Eqn
(
- fvm::ddt(alpha1)
- + fvm::div(phi, alpha1, "UD") - fvm::Sp(divU, alpha1)
+ fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
+ + fv::gaussConvectionScheme<scalar>
+ (
+ mesh,
+ phi,
+ upwind<scalar>(mesh, phi)
+ ).fvmDiv(phi, alpha1)
+ - fvm::Sp(divU, alpha1)
==
fvm::Sp(vDotvmcAlphal, alpha1)
+ vDotcAlphal
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
index a4338b907f8c0f633d89919d4896d276d21cc16e..077738ccb2945dc7b3609742c86a0974434bb2e1 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
@@ -1,18 +1,4 @@
-surfaceScalarField rhoPhi
-(
- IOobject
- (
- "rhoPhi",
- runTime.timeName(),
- mesh
- ),
- mesh,
- dimensionedScalar("0", dimMass/dimTime, 0)
-);
-
{
- #include "alphaControls.H"
-
surfaceScalarField phic(mag(phi/mesh.magSf()));
phic = min(interface.cAlpha()*phic, max(phic));
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
index 630b94534eec7a95298de13cda999fa07b8b4ebb..0bfd8ad56eab6c4ca652b238ec5f4e8c36a3847b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
@@ -43,7 +43,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "phaseChangeTwoPhaseMixture.H"
@@ -86,44 +86,64 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
+ {
+ if (pimple.firstIter() || moveMeshOuterCorrectors)
+ {
+ scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
- mesh.update();
+ mesh.update();
- if (mesh.changing())
- {
- Info<< "Execution time for mesh.update() = "
- << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
- << " s" << endl;
+ if (mesh.changing())
+ {
+ Info<< "Execution time for mesh.update() = "
+ << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
+ << " s" << endl;
- gh = g & mesh.C();
- ghf = g & mesh.Cf();
- }
+ gh = g & mesh.C();
+ ghf = g & mesh.Cf();
+ }
- if (mesh.changing() && correctPhi)
- {
- // Calculate absolute flux from the mapped surface velocity
- phi = mesh.Sf() & Uf;
+ if (mesh.changing() && correctPhi)
+ {
+ // Calculate absolute flux from the mapped surface velocity
+ phi = mesh.Sf() & Uf;
- #include "../interFoam/interDyMFoam/correctPhi.H"
+ #include "../interFoam/interDyMFoam/correctPhi.H"
- // Make the flux relative to the mesh motion
- fvc::makeRelative(phi, U);
- }
+ // Make the flux relative to the mesh motion
+ fvc::makeRelative(phi, U);
+ }
- if (mesh.changing() && checkMeshCourantNo)
- {
- #include "meshCourantNo.H"
- }
+ if (mesh.changing() && checkMeshCourantNo)
+ {
+ #include "meshCourantNo.H"
+ }
+ }
- twoPhaseProperties->correct();
+ #include "alphaControls.H"
+
+ surfaceScalarField rhoPhi
+ (
+ IOobject
+ (
+ "rhoPhi",
+ runTime.timeName(),
+ mesh
+ ),
+ mesh,
+ dimensionedScalar("0", dimMass/dimTime, 0)
+ );
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties->correct();
- #include "alphaEqnSubCycle.H"
- interface.correct();
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ }
- // --- Pressure-velocity PIMPLE corrector loop
- while (pimple.loop())
- {
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index c1d13ca92645a04f75a33c5ce0245e5689461103..2a653dcf37fb115d9ad1dc5c4de7552f168bea0f 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -41,7 +41,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
#include "subCycle.H"
#include "interfaceProperties.H"
#include "phaseChangeTwoPhaseMixture.H"
@@ -83,14 +83,31 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- twoPhaseProperties->correct();
-
- #include "alphaEqnSubCycle.H"
- interface.correct();
-
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
+ #include "alphaControls.H"
+
+ surfaceScalarField rhoPhi
+ (
+ IOobject
+ (
+ "rhoPhi",
+ runTime.timeName(),
+ mesh
+ ),
+ mesh,
+ dimensionedScalar("0", dimMass/dimTime, 0)
+ );
+
+ if (pimple.firstIter() || alphaOuterCorrectors)
+ {
+ twoPhaseProperties->correct();
+
+ #include "alphaEqnSubCycle.H"
+ interface.correct();
+ }
+
#include "UEqn.H"
// --- Pressure corrector loop
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 995d07d7e451ac0dd17fd243875fa709ccd2f7eb..0a276c6e6f86a4c8a950f699c30ccddb45657cdb 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -148,6 +148,7 @@ void Foam::multiphaseSystem::solveAlphas()
MULES::limit
(
+ 1.0/mesh_.time().deltaT().value(),
geometricOneField(),
phase1,
phi_,
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 2a5d9a03b0a14c2576ef9485675fab3310eb731d..e41b0128603ef02eb028310bfa1576869ab7b54e 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -87,14 +87,14 @@ Foam::multiphaseMixture::multiphaseMixture
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
- dimensionedScalar("rho*phi", dimMass/dimTime, 0.0)
+ dimensionedScalar("rhoPhi", dimMass/dimTime, 0.0)
),
alphas_
@@ -598,6 +598,7 @@ void Foam::multiphaseMixture::solveAlphas
MULES::limit
(
+ 1.0/mesh_.time().deltaT().value(),
geometricOneField(),
alpha,
phi_,
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 18b686f4f8afcfdcbf92f61f2e4f7c3a54d26893..31e1e61d5d3a6688952ee5b543c2efe96968c390 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -54,7 +54,7 @@
(
IOobject
(
- "rho*phi",
+ "rhoPhi",
runTime.timeName(),
mesh,
IOobject::NO_READ,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index c3da8d972a299a103d802aacf2d74a964a9711d0..a382b769b53cbd05bce45cff5861435b19903f83 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -78,10 +78,6 @@
- fvc::div(phi2)*U2
);
-
- Info<< "Calculating field g.h\n" << endl;
- volScalarField gh("gh", g & mesh.C());
-
volScalarField rAU1
(
IOobject
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index b097abf7451d8c2dc6c500e6dd8d91ad4d281e2e..ea3f6bdb33827e223b782909a19e965c666f4d36 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -34,6 +34,7 @@
fvc::interpolate((1.0/rho1)*rAU1*phase1.turbulence().pPrime())
*fvc::snGrad(alpha1)*mesh.magSf()
);
+ phiP1.boundaryField() == 0;
// Phase-2 pressure flux (e.g. due to particle-particle pressure)
surfaceScalarField phiP2
@@ -42,6 +43,7 @@
fvc::interpolate((1.0/rho2)*rAU2*phase2.turbulence().pPrime())
*fvc::snGrad(alpha2)*mesh.magSf()
);
+ phiP2.boundaryField() == 0;
surfaceScalarField phiHbyA1
(
@@ -126,9 +128,11 @@
);
pEqnComp1 =
- fvc::ddt(rho1)
- + fvc::div(phi1, rho1) - fvc::Sp(fvc::div(phi1), rho1)
- + correction
+ (
+ fvc::ddt(alpha1, rho1) + fvc::div(alphaPhi1, rho1)
+ - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
+ )/rho1
+ + (alpha1/rho1)*correction
(
psi1*fvm::ddt(p)
+ fvm::div(phid1, p) - fvm::Sp(fvc::div(phid1), p)
@@ -137,9 +141,11 @@
pEqnComp1().relax();
pEqnComp2 =
- fvc::ddt(rho2)
- + fvc::div(phi2, rho2) - fvc::Sp(fvc::div(phi2), rho2)
- + correction
+ (
+ fvc::ddt(alpha2, rho2) + fvc::div(alphaPhi2, rho2)
+ - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
+ )/rho2
+ + (alpha2/rho2)*correction
(
psi2*fvm::ddt(p)
+ fvm::div(phid2, p) - fvm::Sp(fvc::div(phid2), p)
@@ -150,12 +156,18 @@
else
{
pEqnComp1 =
- fvc::ddt(rho1) + psi1*correction(fvm::ddt(p))
- + fvc::div(phi1, rho1) - fvc::Sp(fvc::div(phi1), rho1);
+ (
+ fvc::ddt(alpha1, rho1) + fvc::div(alphaPhi1, rho1)
+ - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
+ )/rho1
+ + (alpha1*psi1/rho1)*correction(fvm::ddt(p));
pEqnComp2 =
- fvc::ddt(rho2) + psi2*correction(fvm::ddt(p))
- + fvc::div(phi2, rho2) - fvc::Sp(fvc::div(phi2), rho2);
+ (
+ fvc::ddt(alpha2, rho2) + fvc::div(alphaPhi2, rho2)
+ - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
+ )/rho2
+ + (alpha2*psi2/rho2)*correction(fvm::ddt(p));
}
// Cache p prior to solve for density update
@@ -171,11 +183,7 @@
solve
(
- (
- (alpha1/rho1)*pEqnComp1()
- + (alpha2/rho2)*pEqnComp2()
- )
- + pEqnIncomp,
+ pEqnComp1() + pEqnComp2() + pEqnIncomp,
mesh.solver(p.select(pimple.finalInnerIter()))
);
@@ -201,8 +209,8 @@
fluid.dgdt() =
(
- pos(alpha2)*(pEqnComp2 & p)/rho2
- - pos(alpha1)*(pEqnComp1 & p)/rho1
+ pos(alpha2)*(pEqnComp2 & p)/max(alpha2, scalar(1e-3))
+ - pos(alpha1)*(pEqnComp1 & p)/max(alpha1, scalar(1e-3))
);
p.relax();
diff --git a/applications/test/HashingSpeed/Test-HashingSpeed.C b/applications/test/HashingSpeed/Test-HashingSpeed.C
index 1b42b5d34da58037fbcc52674960f5b385ffe9a0..c3cbda702d8d172b4884b96dfa6f9be4a5f7a88f 100644
--- a/applications/test/HashingSpeed/Test-HashingSpeed.C
+++ b/applications/test/HashingSpeed/Test-HashingSpeed.C
@@ -1016,7 +1016,6 @@ int i;
// found somewhere in the 2nd addition
uint32_t stroustrup (const char * s, int len) {
uint32_t h;
- int i;
for (register int i=0; i < len; ++s, ++i)
{
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index ca303d53b72f6cb3af70b19d2c6a6e172979c62e..719a5ebc5c7e7e05ceaf9e274156e31b5f05f9db 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
Info<< " std::list constructed from Foam::List: ";
std::list<vector>::iterator it;
- for (it=stlList.begin(); it != stlList.end(); it++)
+ for (it=stlList.begin(); it != stlList.end(); ++it)
{
Info<< *it << " ";
}
diff --git a/applications/test/string/Test-string.C b/applications/test/string/Test-string.C
index 8494e8a104585e972b742a042e0f5a37761e06be..f39be8c20629f8072e1d48fd8848263b21f9f59d 100644
--- a/applications/test/string/Test-string.C
+++ b/applications/test/string/Test-string.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
while (iter != iter2)
{
Info<< *iter;
- iter++;
+ ++iter;
}
Info<< "<\n";
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 2a958b3a3cc3c59d8e2d4f8c6379d116c3a60b61..c6181aaa21f57372b88bf0cfdbced5b73f44f8e4 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -540,7 +540,7 @@ void subsetMesh
Info<< "Writing refined mesh to time " << runTime.timeName() << nl
<< endl;
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}
@@ -909,7 +909,7 @@ int main(int argc, char *argv[])
Info<< " Writing refined mesh to time " << runTime.timeName()
<< nl << endl;
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
<< endl;
// Write final mesh
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
@@ -991,7 +991,7 @@ int main(int argc, char *argv[])
<< endl;
// Write final mesh. (will have been written already if writeMesh=true)
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
mesh.write();
refLevel.write();
}
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index fc02d833141b566a2542ad5628efa3b6c2911a5c..e0525a0b61a28923fc2ba293d69d2a0973722ce0 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -696,7 +696,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index e1e4cb5f6834ef8f8f677dd28807efbe0616c111..26df789d57cd7d466edb8b3c48be0edf0d58a241 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -747,7 +747,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 54055e8406f28b35e7c415f0c5ed6eb17a478924..1b44415f89f35a36c25278c4c8fe7fbd59eeef1f 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
mesh.setInstance(runTime.constant());
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< nl << "Writing mesh to " << mesh.objectPath() << endl;
mesh.write();
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index e99ddaccf6d525036a7a915be1efe65aadb8e0e6..f641763864cad9d5cd46ab091094dd2ef65bccfc 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -1543,7 +1543,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// Zones
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index dc4531fef649caacb533446749a74049dfce6ac2..edd5d7d271119fc70f0e4f7b0b214c06c06de50b 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index ef5d5fd0a0cf5329614bb97b7cd80d3a4825a416..c40b5dd16d119602ce9e39a5dcd05d3228588a5a 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index 8aba0df523ad03cd570b9e25d1a92bdd2463dd63..55745b958ce7859eca1db2be4db6c825514b5c19 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
sammMesh makeMesh(args[1], runTime, scaleFactor);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index 6b57de942362d63481d17b72ab87a930a58da26f..75b6e09edc95cb6d9f34e5838ae6da284726edd8 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
starMesh makeMesh(args[1], runTime, scaleFactor);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index 45491d1bd8758325d6c3a03b86d1b5ff7717ec19..f8e1657e79115d077985736147b5574f910205ae 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
}
// increase the precision of the points data
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// remove extensions and/or trailing '.'
const fileName prefix = fileName(args[1]).lessExt();
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 95b8741e4323481683492e2eed8893d4fbd7ed30..9e0fe6d83aaa61bb03611c1b819dfae25c214fe8 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
}
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< nl << "Writing polyMesh" << endl;
mesh.removeFiles();
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index bf8eba6e0d6f02afd597fa73ca4f25cae914f430..9db10ea85eb8673efaeec2d12a77a1a46cf1105c 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -474,10 +474,12 @@ meshQualityControls
// Advanced
// Flags for optional output
-// 0 : only write final meshes
-// 1 : write intermediate meshes
-// 2 : write volScalarField with cellLevel for postprocessing
-// 4 : write current intersections as .obj files
+// 0 : only write final meshes
+// 1 : write intermediate meshes
+// 2 : write volScalarField with cellLevel for postprocessing
+// 4 : write current mesh intersections as .obj files
+// 8 : write information about explicit feature edge refinement
+// 16 : write information about layers
debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index 6ee2ea56a24439c7582bd4257722301edc5afecb..359dcdd87fc468c886555e78444d0667e6eb07ca 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -248,8 +248,11 @@ int main(int argc, char *argv[])
{
mesh.setInstance(oldInstance);
}
- mesh.write();
+ // Set the precision of the points data to 10
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
+
+ mesh.write();
Info<< "End\n" << endl;
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index a2abec368c36bbe5974f9e0181ae06f9b26ebf2a..6f283d4794183125b72a1d767a50e2454656e97b 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -872,7 +872,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
if (!overwrite)
{
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 9be145648fa8ae53ee6e0c9c6090b5f71288ea2a..4d87cf67287ac7430e493c90bbac27b70f5ef843 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
twoDCorr.correctPoints(points);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index dc4c199a4a495bbde02c9154b531442cc1e3f516..0682682b02c31f8853f75c71bdc03585a817fe40 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing mirrored mesh" << endl;
mesh.mirrorMesh().write();
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/Allrun b/applications/utilities/mesh/manipulation/orientFaceZone/cavity/Allrun
deleted file mode 100755
index 11f1cb983e2ab9bcc09f950117ff12b2a5952e32..0000000000000000000000000000000000000000
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/Allrun
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name
-application=`getApplication`
-
-runApplication blockMesh
-# Make random cell numbering to get faceZone orientation random
-runApplication renumberMesh -dict system/renumberMeshDict
-
-# Construct faceZone
-runApplication topoSet
-
-runApplication decomposePar -force -cellDist
-runParallel orientFaceZone 2 f0 '(10 0 0)'
-runApplication reconstructParMesh -latestTime -mergeTol 1e-6
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/README.txt b/applications/utilities/mesh/manipulation/orientFaceZone/cavity/README.txt
deleted file mode 100644
index df428773022fcae8b4139b76430acb31f74628ac..0000000000000000000000000000000000000000
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-2013-09-16 To test orientFaceZone. Make random orientation. Orient afterwards.
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/decomposeParDict b/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/decomposeParDict
deleted file mode 100644
index 60454a0a87e62eb6e58b3d1f1b1b06353c0369b8..0000000000000000000000000000000000000000
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/decomposeParDict
+++ /dev/null
@@ -1,135 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- note "mesh decomposition control dictionary";
- object decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 2;
-
-//- Keep owner and neighbour on same processor for faces in zones:
-// preserveFaceZones (heater solid1 solid3);
-
-//- Keep owner and neighbour on same processor for faces in patches:
-// (makes sense only for cyclic patches)
-//preservePatches (cyclic_half0 cyclic_half1);
-
-//- Keep all of faceSet on a single processor. This puts all cells
-// connected with a point, edge or face on the same processor.
-// (just having face connected cells might not guarantee a balanced
-// decomposition)
-// The processor can be -1 (the decompositionMethod chooses the processor
-// for a good load balance) or explicitly provided (upsets balance).
-//singleProcessorFaceSets ((f0 -1));
-
-
-//- Use the volScalarField named here as a weight for each cell in the
-// decomposition. For example, use a particle population field to decompose
-// for a balanced number of particles in a lagrangian simulation.
-// weightField dsmcRhoNMean;
-
-//method scotch;
-method hierarchical;
-// method simple;
-// method metis;
-// method manual;
-// method multiLevel;
-// method structured; // does 2D decomposition of structured mesh
-
-multiLevelCoeffs
-{
- // Decomposition methods to apply in turn. This is like hierarchical but
- // fully general - every method can be used at every level.
-
- level0
- {
- numberOfSubdomains 64;
- //method simple;
- //simpleCoeffs
- //{
- // n (2 1 1);
- // delta 0.001;
- //}
- method scotch;
- }
- level1
- {
- numberOfSubdomains 4;
- method scotch;
- }
-}
-
-// Desired output
-
-simpleCoeffs
-{
- n (2 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (2 1 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- /*
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
- */
-}
-
-scotchCoeffs
-{
- //processorWeights
- //(
- // 1
- // 1
- // 1
- // 1
- //);
- //writeGraph true;
- //strategy "b";
-}
-
-manualCoeffs
-{
- dataFile "decompositionData";
-}
-
-structuredCoeffs
-{
- // Patches to do 2D decomposition on. Structured mesh only; cells have
- // to be in 'columns' on top of patches.
- patches (bottomPatch);
-}
-
-//// Is the case distributed? Note: command-line argument -roots takes
-//// precedence
-//distributed yes;
-//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots
-//(
-// "/tmp"
-// "/tmp"
-//);
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/renumberMeshDict b/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/renumberMeshDict
deleted file mode 100644
index addb04236e699fa0eb5f375e72a947688de8e634..0000000000000000000000000000000000000000
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/renumberMeshDict
+++ /dev/null
@@ -1,110 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- note "mesh renumbering dictionary";
- object renumberMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Write maps from renumbered back to original mesh
-writeMaps true;
-
-// Optional entry: sort cells on coupled boundaries to last for use with
-// e.g. nonBlockingGaussSeidel.
-sortCoupledFaceCells false;
-
-// Optional entry: renumber on a block-by-block basis. It uses a
-// blockCoeffs dictionary to construct a decompositionMethod to do
-// a block subdivision) and then applies the renumberMethod to each
-// block in turn. This can be used in large cases to keep the blocks
-// fitting in cache with all the the cache misses bunched at the end.
-// This number is the approximate size of the blocks - this gets converted
-// to a number of blocks that is the input to the decomposition method.
-//blockSize 1000;
-
-// Optional entry: sort points into internal and boundary points
-//orderPoints false;
-
-
-
-//method CuthillMcKee;
-//method Sloan;
-//method manual;
-method random;
-//method structured;
-//method spring;
-//method zoltan; // only if compiled with zoltan support
-
-//CuthillMcKeeCoeffs
-//{
-// // Reverse CuthillMcKee (RCM) or plain
-// reverse true;
-//}
-
-manualCoeffs
-{
- // In system directory: new-to-original (i.e. order) labelIOList
- dataFile "cellMap";
-}
-
-
-// For extruded (i.e. structured in one direction) meshes
-structuredCoeffs
-{
- // Patches that mesh was extruded from. These determine the starting
- // layer of cells
- patches (movingWall);
- // Method to renumber the starting layer of cells
- method random;
-
- // Renumber in columns (depthFirst) or in layers
- depthFirst true;
-
- // Optional: reverse ordering
- //reverse false;
-}
-
-
-springCoeffs
-{
- // Maximum jump of cell indices. Is fraction of number of cells
- maxCo 0.01;
-
- // Limit the amount of movement; the fraction maxCo gets decreased
- // with every iteration
- freezeFraction 0.999;
-
- // Maximum number of iterations
- maxIter 1000;
-}
-
-
-blockCoeffs
-{
- method scotch;
- //method hierarchical;
- //hierarchicalCoeffs
- //{
- // n (1 2 1);
- // delta 0.001;
- // order xyz;
- //}
-}
-
-
-zoltanCoeffs
-{
- ORDER_METHOD LOCAL_HSFC;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index 2046e2e700c76fe586cbd2963738418405e06e09..77822cd06f502bee5d39d807ad713f2ff5e9d718 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
points = transform(T, points);
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 90601e8730f9b0d95fd989888dc8f91a76530993..a5ec424e45744624807148b778bcde8bdd63616f 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
}
Info<< nl << "Writing polyMesh to time " << runTime.timeName() << endl;
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
// Bypass runTime write (since only writes at outputTime)
if
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 9dee4d1df94aeebde25c2bdbffd8b6e9815131d9..5f0e5c0b39df3b00054a35303fab1e9bad40f819 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -368,6 +368,8 @@ FoamFile
// {
// faceSet f0; // name of faceSet
// cellSet c0; // name of cellSet of slave side
+// flip false; // optional: flip the faceZone (so now the cellSet
+// // is the master side)
// }
//
// // Select based on surface. Orientation from normals on surface
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 26900011e93c75fad0c28d6df46479434ae63034..e5714eeaa8fcf88d75412f489eb70695088a9027 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
}
// Set the precision of the points data to 10
- IOstream::defaultPrecision(10);
+ IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
index 1f66fa276e8e0e2e5340a35c64e56fe44b029c93..54887f662a2b560fdf8417bd8b8f1b33ac88cf55 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/cellSets.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -78,6 +78,26 @@ public:
hexes(nCells),
polys(nCells)
{}
+
+
+ // Member Functions
+
+ void setSize(const label nCells)
+ {
+ nTets = 0;
+ nPyrs = 0;
+ nPrisms = 0;
+ nHexesWedges = 0;
+ nPolys = 0;
+
+ tets.setSize(nCells);
+ pyrs.setSize(nCells);
+ prisms.setSize(nCells);
+ wedges.setSize(nCells);
+ hexes.setSize(nCells);
+ polys.setSize(nCells);
+ }
+
};
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 0332572eeb0d16cdb907354ac36fd9a139063803..267b8dc84421a58f13afcfa678d86befe17ffcd9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -47,7 +47,8 @@ License
void Foam::ensightMesh::correct()
{
patchPartOffset_ = 2;
- meshCellSets_ = mesh_.nCells();
+ meshCellSets_.setSize(mesh_.nCells());
+
boundaryFaceSets_.setSize(mesh_.boundary().size());
allPatchNames_.clear();
patchNames_.clear();
@@ -194,44 +195,41 @@ void Foam::ensightMesh::correct()
{
forAll(mesh_.boundary(), patchi)
{
- if (mesh_.boundary()[patchi].size())
- {
- const polyPatch& p = mesh_.boundaryMesh()[patchi];
+ const polyPatch& p = mesh_.boundaryMesh()[patchi];
- labelList& tris = boundaryFaceSets_[patchi].tris;
- labelList& quads = boundaryFaceSets_[patchi].quads;
- labelList& polys = boundaryFaceSets_[patchi].polys;
+ labelList& tris = boundaryFaceSets_[patchi].tris;
+ labelList& quads = boundaryFaceSets_[patchi].quads;
+ labelList& polys = boundaryFaceSets_[patchi].polys;
- tris.setSize(p.size());
- quads.setSize(p.size());
- polys.setSize(p.size());
+ tris.setSize(p.size());
+ quads.setSize(p.size());
+ polys.setSize(p.size());
- label nTris = 0;
- label nQuads = 0;
- label nPolys = 0;
+ label nTris = 0;
+ label nQuads = 0;
+ label nPolys = 0;
- forAll(p, faceI)
- {
- const face& f = p[faceI];
+ forAll(p, faceI)
+ {
+ const face& f = p[faceI];
- if (f.size() == 3)
- {
- tris[nTris++] = faceI;
- }
- else if (f.size() == 4)
- {
- quads[nQuads++] = faceI;
- }
- else
- {
- polys[nPolys++] = faceI;
- }
+ if (f.size() == 3)
+ {
+ tris[nTris++] = faceI;
+ }
+ else if (f.size() == 4)
+ {
+ quads[nQuads++] = faceI;
+ }
+ else
+ {
+ polys[nPolys++] = faceI;
}
-
- tris.setSize(nTris);
- quads.setSize(nQuads);
- polys.setSize(nPolys);
}
+
+ tris.setSize(nTris);
+ quads.setSize(nQuads);
+ polys.setSize(nPolys);
}
}
@@ -242,12 +240,9 @@ void Foam::ensightMesh::correct()
if (patchNames_.empty() || patchNames_.found(patchName))
{
- if (mesh_.boundary()[patchi].size())
- {
- nfp.nTris = boundaryFaceSets_[patchi].tris.size();
- nfp.nQuads = boundaryFaceSets_[patchi].quads.size();
- nfp.nPolys = boundaryFaceSets_[patchi].polys.size();
- }
+ nfp.nTris = boundaryFaceSets_[patchi].tris.size();
+ nfp.nQuads = boundaryFaceSets_[patchi].quads.size();
+ nfp.nPolys = boundaryFaceSets_[patchi].polys.size();
}
reduce(nfp.nTris, sumOp<label>());
@@ -1148,6 +1143,7 @@ void Foam::ensightMesh::write
if (nfp.nTris || nfp.nQuads || nfp.nPolys)
{
const polyPatch& p = mesh_.boundaryMesh()[patchi];
+
const labelList& tris = boundaryFaceSets_[patchi].tris;
const labelList& quads = boundaryFaceSets_[patchi].quads;
const labelList& polys = boundaryFaceSets_[patchi].polys;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
index f795ed8eec77b749c1c94b1dd94eded37dc965dd..3b111ff59f079dc42e325a9ff565865c0438246a 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -441,8 +441,6 @@ void pqPV3FoamReaderPanel::IncludeZonesToggled()
void pqPV3FoamReaderPanel::ExtrapolatePatchesToggled()
{
- vtkSMProperty* prop;
-
vtkSMIntVectorProperty::SafeDownCast
(
this->proxy()->GetProperty("UiExtrapolatePatches")
@@ -454,8 +452,6 @@ void pqPV3FoamReaderPanel::ExtrapolatePatchesToggled()
void pqPV3FoamReaderPanel::InterpolateVolFieldsToggled()
{
- vtkSMProperty* prop;
-
vtkSMIntVectorProperty::SafeDownCast
(
this->proxy()->GetProperty("UiInterpolateVolFields")
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index 00a190cc77e4ee16f157198cee7af4e5ce19e8f1..96fb5a7f8660e27c2d9f788726a6128c91906529 100644
--- a/applications/utilities/preProcessing/mapFields/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// List of pairs of source/target patches for mapping
+// List of pairs of target/source patches for mapping
patchMap
(
lid movingWall
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 936e815717f3efc408fc965e236c88010fc8099e..870e71d8e7eb2b0a462097c6a856379893c47233 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -133,7 +133,8 @@ namespace Foam
//- initialise inotify
inline fileMonitorWatcher(const bool useInotify, const label sz = 20)
:
- useInotify_(useInotify)
+ useInotify_(useInotify),
+ inotifyFd_(-1)
{
if (useInotify_)
{
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index b33a9bc0918b83b0f457e4d9670da8bfbafed1ad..b5a49f68817e8f5dcb5567f1c47e2f2a7b6d2664 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -358,6 +358,59 @@ Type sum(const UList<Type>& f)
TMP_UNARY_FUNCTION(Type, sum)
+template<class Type>
+Type maxMagSqr(const UList<Type>& f)
+{
+ if (f.size())
+ {
+ Type Max(f[0]);
+ TFOR_ALL_S_OP_FUNC_F_S
+ (
+ Type,
+ Max,
+ =,
+ maxMagSqrOp<Type>(),
+ Type,
+ f,
+ Type,
+ Max
+ )
+ return Max;
+ }
+ else
+ {
+ return pTraits<Type>::zero;
+ }
+}
+
+TMP_UNARY_FUNCTION(Type, maxMagSqr)
+
+template<class Type>
+Type minMagSqr(const UList<Type>& f)
+{
+ if (f.size())
+ {
+ Type Min(f[0]);
+ TFOR_ALL_S_OP_FUNC_F_S
+ (
+ Type,
+ Min,
+ =,
+ minMagSqrOp<Type>(),
+ Type,
+ f,
+ Type,
+ Min
+ )
+ return Min;
+ }
+ else
+ {
+ return pTraits<Type>::rootMax;
+ }
+}
+
+TMP_UNARY_FUNCTION(Type, minMagSqr)
template<class Type>
scalar sumProd(const UList<Type>& f1, const UList<Type>& f2)
@@ -488,6 +541,8 @@ TMP_UNARY_FUNCTION(ReturnType, gFunc)
G_UNARY_FUNCTION(Type, gMax, max, max)
G_UNARY_FUNCTION(Type, gMin, min, min)
G_UNARY_FUNCTION(Type, gSum, sum, sum)
+G_UNARY_FUNCTION(Type, gMaxMagSqr, maxMagSqr, maxMagSqr)
+G_UNARY_FUNCTION(Type, gMinMagSqr, minMagSqr, minMagSqr)
G_UNARY_FUNCTION(scalar, gSumSqr, sumSqr, sum)
G_UNARY_FUNCTION(scalar, gSumMag, sumMag, sum)
G_UNARY_FUNCTION(Type, gSumCmptMag, sumCmptMag, sum)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index f1fa2fdd968281bd575b0c40152099d110078705..4c51262f9e36c9f76e1489c1ab31cb6280ca0348 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -171,6 +171,16 @@ Type sum(const UList<Type>& f);
TMP_UNARY_FUNCTION(Type, sum)
+template<class Type>
+Type maxMagSqr(const UList<Type>& f);
+
+TMP_UNARY_FUNCTION(Type, maxMagSqr)
+
+template<class Type>
+Type minMagSqr(const UList<Type>& f);
+
+TMP_UNARY_FUNCTION(Type, minMagSqr)
+
template<class Type>
scalar sumProd(const UList<Type>& f1, const UList<Type>& f2);
@@ -208,6 +218,8 @@ TMP_UNARY_FUNCTION(ReturnType, gFunc)
G_UNARY_FUNCTION(Type, gMax, max, max)
G_UNARY_FUNCTION(Type, gMin, min, min)
G_UNARY_FUNCTION(Type, gSum, sum, sum)
+G_UNARY_FUNCTION(Type, gMaxMagSqr, maxMagSqr, maxMagSqr)
+G_UNARY_FUNCTION(Type, gMinMagSqr, minMagSqr, minMagSqr)
G_UNARY_FUNCTION(scalar, gSumSqr, sumSqr, sum)
G_UNARY_FUNCTION(scalar, gSumMag, sumMag, sum)
G_UNARY_FUNCTION(Type, gSumCmptMag, sumCmptMag, sum)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index a83b2bf1909f9e962ac843bd95e981d290148a92..2739e828b349f34986ea6028e57f2967de45f885 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1963,7 +1963,7 @@ Foam::pointField Foam::globalMeshData::geometricSharedPoints() const
pointField sharedPoints(mesh_.points(), sharedPointLabels());
// Append from all processors
- combineReduce(sharedPoints, plusEqOp<pointField>());
+ combineReduce(sharedPoints, ListPlusEqOp<pointField>());
// Merge tolerance
scalar tolDim = matchTol_ * mesh_.bounds().mag();
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index ab1858b1484f436d7434f0e5c84044cb34a15b9e..35543fd0937d399aa4df018d4f0e75b88c0c8482 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -109,29 +109,6 @@ class globalMeshData
public processorTopology
{
- // Private class
-
- // To combineReduce a pointField. Just appends all lists.
- template<class T>
- class plusEqOp
- {
-
- public:
-
- void operator()(T& x, const T& y) const
- {
- label n = x.size();
-
- x.setSize(x.size() + y.size());
-
- forAll(y, i)
- {
- x[n++] = y[i];
- }
- }
- };
-
-
// Private data
//- Reference to mesh
@@ -337,6 +314,29 @@ class globalMeshData
public:
+ // Public class
+
+ // To combineReduce a List. Just appends all lists.
+ template<class T>
+ class ListPlusEqOp
+ {
+
+ public:
+
+ void operator()(T& x, const T& y) const
+ {
+ label n = x.size();
+
+ x.setSize(x.size() + y.size());
+
+ forAll(y, i)
+ {
+ x[n++] = y[i];
+ }
+ }
+ };
+
+
//- Runtime type information
ClassName("globalMeshData");
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 313eb3e25bb08e2ba52ffc161c78a2c3b1ef6c66..6015f1167ddfed9f450c2d0ef5f6911123294165 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -74,11 +74,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Find the point and cell instance
fileName pointsInst(time().findInstance(meshDir(), "points"));
fileName facesInst(time().findInstance(meshDir(), "faces"));
+ //fileName boundaryInst(time().findInstance(meshDir(), "boundary"));
if (debug)
{
Info<< "Faces instance: old = " << facesInstance()
<< " new = " << facesInst << nl
+ //<< "Boundary instance: old = " << boundary_.instance()
+ //<< " new = " << boundaryInst << nl
<< "Points instance: old = " << pointsInstance()
<< " new = " << pointsInst << endl;
}
@@ -447,6 +450,50 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
geometricD_ = Vector<label>::zero;
solutionD_ = Vector<label>::zero;
+
+ //if (boundaryInst != boundary_.instance())
+ //{
+ // // Boundary file but no topology change
+ // if (debug)
+ // {
+ // Info<< "Boundary state change" << endl;
+ // }
+ //
+ // // Reset the boundary patches
+ // polyBoundaryMesh newBoundary
+ // (
+ // IOobject
+ // (
+ // "boundary",
+ // facesInst,
+ // meshSubDir,
+ // *this,
+ // IOobject::MUST_READ,
+ // IOobject::NO_WRITE,
+ // false
+ // ),
+ // *this
+ // );
+ //
+ //
+ //
+ //
+ // boundary_.clear();
+ // boundary_.setSize(newBoundary.size());
+ //
+ // forAll(newBoundary, patchI)
+ // {
+ // boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
+ // }
+ // // Calculate topology for the patches (processor-processor comms
+ // // etc.)
+ // boundary_.updateMesh();
+ //
+ // // Calculate the geometry for the patches (transformation tensors
+ // // etc.)
+ // boundary_.calcGeometry();
+ //}
+
return polyMesh::POINTS_MOVED;
}
else
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 259c46706d5bc509dd25fec6281546321678039b..de2eb11e714efb296c305ea6b3e4b21d3fc13ea6 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,6 +35,8 @@ const Scalar pTraits<Scalar>::zero = 0.0;
const Scalar pTraits<Scalar>::one = 1.0;
const Scalar pTraits<Scalar>::min = -ScalarVGREAT;
const Scalar pTraits<Scalar>::max = ScalarVGREAT;
+const Scalar pTraits<Scalar>::rootMin = -ScalarROOTVGREAT;
+const Scalar pTraits<Scalar>::rootMax = ScalarROOTVGREAT;
const char* pTraits<Scalar>::componentNames[] = { "x" };
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 7fee0a9687e704e394c3738112cda8ae17535d51..b7234bc68518e5845dcc2c409f7eb8d71af66e04 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,6 +62,8 @@ public:
static const Scalar one;
static const Scalar max;
static const Scalar min;
+ static const Scalar rootMax;
+ static const Scalar rootMin;
// Constructors
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
index 7e7396528e8311fbbbbca84380936f20f5b93abe..378b7d592a9ff276905f85bcf40c3a50e57c79da 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,11 +33,15 @@ License
#define Scalar doubleScalar
#define ScalarVGREAT doubleScalarVGREAT
#define ScalarVSMALL doubleScalarVSMALL
+#define ScalarROOTVGREAT doubleScalarROOTVGREAT
+#define ScalarROOTVSMALL doubleScalarROOTVSMALL
#define readScalar readDoubleScalar
#include "Scalar.C"
#undef Scalar
#undef ScalarVGREAT
#undef ScalarVSMALL
+#undef ScalarROOTVGREAT
+#undef ScalarROOTVSMALL
#undef readScalar
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
index 13a70e475e68730fb459dec1e49ac70aed879787..80687f6f0727bf6995512abe50189b8cfad40f37 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
@@ -70,6 +70,8 @@ inline bool readScalar(const char* buf, doubleScalar& s)
#define Scalar doubleScalar
#define ScalarVGREAT doubleScalarVGREAT
#define ScalarVSMALL doubleScalarVSMALL
+#define ScalarROOTVGREAT doubleScalarROOTVGREAT
+#define ScalarROOTVSMALL doubleScalarROOTVSMALL
#define readScalar readDoubleScalar
inline Scalar mag(const Scalar s)
@@ -108,6 +110,8 @@ inline Scalar yn(const int n, const Scalar s)
#undef Scalar
#undef ScalarVGREAT
#undef ScalarVSMALL
+#undef ScalarROOTVGREAT
+#undef ScalarROOTVSMALL
#undef readScalar
#undef transFunc
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
index 5f72b1539d888c86b853b459fd528cc0653a20b2..dec0b215d39340e84321fc82747d5922729051bd 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,11 +33,15 @@ License
#define Scalar floatScalar
#define ScalarVGREAT floatScalarVGREAT
#define ScalarVSMALL floatScalarVSMALL
+#define ScalarROOTVGREAT floatScalarROOTVGREAT
+#define ScalarROOTVSMALL floatScalarROOTVSMALL
#define readScalar readFloatScalar
#include "Scalar.C"
#undef Scalar
#undef ScalarVSMALL
#undef ScalarVSMALL
+#undef ScalarROOTVGREAT
+#undef ScalarROOTVSMALL
#undef readScalar
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
index 5401bc79a6cd77035b79654f7d25ed38b7c6f3b3..c379e0fbdabec466662ad8a0f34e41343b5b6845 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
@@ -70,6 +70,8 @@ inline bool readScalar(const char* buf, floatScalar& s)
#define Scalar floatScalar
#define ScalarVGREAT floatScalarVGREAT
#define ScalarVSMALL floatScalarVSMALL
+#define ScalarROOTVGREAT floatScalarROOTVGREAT
+#define ScalarROOTVSMALL floatScalarROOTVSMALL
#define readScalar readFloatScalar
inline Scalar mag(const Scalar s)
@@ -108,6 +110,8 @@ inline Scalar yn(const int n, const Scalar s)
#undef Scalar
#undef ScalarVGREAT
#undef ScalarVSMALL
+#undef ScalarROOTVGREAT
+#undef ScalarROOTVSMALL
#undef readScalar
#undef transFunc
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index cb2e71d10658831f23d0fbe16efc07b8e370d175..8eda8e99ab312f08a33b8a07922c5961b03cdfae 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -82,6 +82,8 @@ public:
static const Vector one;
static const Vector max;
static const Vector min;
+ static const Vector rootMax;
+ static const Vector rootMin;
//- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Vector/vector/vector.C b/src/OpenFOAM/primitives/Vector/vector/vector.C
index 3a684791a89916fb1ccd0fe00d0f81490947a24f..40b6e79c31ac1d84a5bb791825183bb023008124 100644
--- a/src/OpenFOAM/primitives/Vector/vector/vector.C
+++ b/src/OpenFOAM/primitives/Vector/vector/vector.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,6 +53,12 @@ const vector vector::max(VGREAT, VGREAT, VGREAT);
template<>
const vector vector::min(-VGREAT, -VGREAT, -VGREAT);
+template<>
+const vector vector::rootMax(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT);
+
+template<>
+const vector vector::rootMin(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT);
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
index 3eec19bcf245148de02ee72f327964c9aaa834b7..d0129af7da203779564af86c4a34e5f92d8803fe 100644
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,6 +38,8 @@ const label pTraits<label>::zero = 0;
const label pTraits<label>::one = 1;
const label pTraits<label>::min = labelMin;
const label pTraits<label>::max = labelMax;
+const label pTraits<label>::rootMin = pTraits<label>::min;
+const label pTraits<label>::rootMax = pTraits<label>::max;
const char* pTraits<label>::componentNames[] = { "x" };
@@ -59,6 +61,10 @@ const int pTraits<int>::zero = 0;
const int pTraits<int>::one = 1;
const int pTraits<int>::min = INT_MIN;
const int pTraits<int>::max = INT_MAX;
+const int pTraits<int>::min = INT_MIN;
+const int pTraits<int>::max = INT_MAX;
+const int pTraits<int>::rootMin = pTraits<int>::min;
+const int pTraits<int>::rootMax = pTraits<int>::max;
const char* pTraits<int>::componentNames[] = { "x" };
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index 0e97dc7c576c950da96b78d4e00f9a53bba78a44..ed0160a108685cccbd1efad9f331fdbea98f4877 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -179,6 +179,8 @@ public:
static const label one;
static const label min;
static const label max;
+ static const label rootMin;
+ static const label rootMax;
// Constructors
@@ -237,6 +239,8 @@ public:
static const int one;
static const int min;
static const int max;
+ static const int rootMax;
+ static const int rootMin;
// Constructors
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
index c51926a5e20f2b9d22665e4843bb087371a9b0ac..2e8f4889833730f7108051000768e8813f0c1088 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,6 +38,8 @@ const uLabel pTraits<uLabel>::zero = 0;
const uLabel pTraits<uLabel>::one = 1;
const uLabel pTraits<uLabel>::min = uLabelMin;
const uLabel pTraits<uLabel>::max = uLabelMax;
+const uLabel pTraits<uLabel>::rootMin = pTraits<uLabel>::min;
+const uLabel pTraits<uLabel>::rootMax = pTraits<uLabel>::max;
const char* pTraits<uLabel>::componentNames[] = { "x" };
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index 2dd937d17b79f1d54b87e5cde6cab61f4546f174..d8a985f39ee5b5ba7aafaf2b858e4d6e83519be4 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -145,6 +145,8 @@ public:
static const uLabel one;
static const uLabel max;
static const uLabel min;
+ static const uLabel rootMax;
+ static const uLabel rootMin;
// Constructors
diff --git a/src/OpenFOAM/primitives/triad/triad.C b/src/OpenFOAM/primitives/triad/triad.C
index b6aef8c7f1f9bc1df27cfc62e8990be9b5b01650..e8fdbdacb4fbbc5876b765594efb52ddf3932e1d 100644
--- a/src/OpenFOAM/primitives/triad/triad.C
+++ b/src/OpenFOAM/primitives/triad/triad.C
@@ -66,6 +66,20 @@ const triad triad::min
vector(-VGREAT, -VGREAT, -VGREAT)
);
+const triad triad::rootMax
+(
+ vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT),
+ vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT),
+ vector(ROOTVGREAT, ROOTVGREAT, ROOTVGREAT)
+);
+
+const triad triad::rootMin
+(
+ vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT),
+ vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT),
+ vector(-ROOTVGREAT, -ROOTVGREAT, -ROOTVGREAT)
+);
+
const triad triad::I
(
vector(1, 0, 0),
diff --git a/src/OpenFOAM/primitives/triad/triad.H b/src/OpenFOAM/primitives/triad/triad.H
index 69f4b40e81060e2de94b74f70ef9924a5bd19891..aeb2c38d6c124efe3145d384e0412df06b4f73c2 100644
--- a/src/OpenFOAM/primitives/triad/triad.H
+++ b/src/OpenFOAM/primitives/triad/triad.H
@@ -100,6 +100,8 @@ public:
static const triad one;
static const triad max;
static const triad min;
+ static const triad rootMax;
+ static const triad rootMin;
static const triad I;
static const triad unset;
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index dc1a5ea7904a1aaeb5308304ad14bf9978693837..f86bdb4823493772573293a3a1669e1b7613977a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -237,7 +237,6 @@ void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
- writeEntry("value", os);
}
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index a99d3e3a3196dd0a5791fdc876c18bde5b85dedd..212a22baf5195e9d20666c4406567f2f40b358d3 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -220,6 +220,7 @@ fields/surfaceFields/surfaceFields.C
fvMatrices/fvMatrices.C
fvMatrices/fvScalarMatrix/fvScalarMatrix.C
fvMatrices/solvers/MULES/MULES.C
+fvMatrices/solvers/MULES/CMULES.C
fvMatrices/solvers/MULES/IMULES.C
fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H
index e7b3cf7794c14d1dc34d0c5d42ec2873ef73a333..e57869309aa3da416416158d413863ac6919b016 100644
--- a/src/finiteVolume/cfdTools/general/include/alphaControls.H
+++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H
@@ -1,4 +1,12 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name());
+
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-Switch MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
+
+bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
+
+bool alphaOuterCorrectors
+(
+ alphaControls.lookupOrDefault<Switch>("alphaOuterCorrectors", false)
+);
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
index 2c89cc4cae0a0eb08e80800de12ca2a12b3d1a43..8329580bffb30afa36a6cd77e9692b0703564deb 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
index 6cb9d3a21f652df26ddf6251473c7281de0e7611..510e3081881173a4c08fc54b4c4895b432ea51be 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -129,6 +129,9 @@ public:
//- Helper function to identify when to store the intial residuals
inline bool storeInitialResiduals() const;
+ //- Helper function to identify first PIMPLE (outer) iteration
+ inline bool firstIter() const;
+
//- Helper function to identify final PIMPLE (outer) iteration
inline bool finalIter() const;
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
index 1d8917de89b34dfa38f65ef411f555de35ffe303..8ac86bdfa886f1c37929c6c2586931eea2b3951d 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,14 +66,20 @@ inline bool Foam::pimpleControl::correct()
inline bool Foam::pimpleControl::storeInitialResiduals() const
{
- // start from second PIMPLE iteration
+ // Start from second PIMPLE iteration
return (corr_ == 2) && (corrPISO_ == 0) && (corrNonOrtho_ == 0);
}
+inline bool Foam::pimpleControl::firstIter() const
+{
+ return corr_ == 1;
+}
+
+
inline bool Foam::pimpleControl::finalIter() const
{
- return converged_ || (corr_ == nCorrPIMPLE_);
+ return converged_ || (corr_ == corrPISO_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index 745918403b5528423cc474b6efb6860dfd19ef7c..e5f7a049f4e80181e8033780360a72c7f2801204 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -38,7 +38,7 @@ interstitialInletVelocityFvPatchVectorField
const DimensionedField<vector, volMesh>& iF
)
:
- fixedValueFvPatchField<vector>(p, iF),
+ fixedValueFvPatchVectorField(p, iF),
inletVelocity_(p.size(), vector::zero),
alphaName_("alpha")
{}
@@ -53,8 +53,8 @@ interstitialInletVelocityFvPatchVectorField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
- inletVelocity_(ptf.inletVelocity_),
+ fixedValueFvPatchVectorField(ptf, p, iF, mapper),
+ inletVelocity_(ptf.inletVelocity_, mapper),
alphaName_(ptf.alphaName_)
{}
@@ -67,7 +67,7 @@ interstitialInletVelocityFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchField<vector>(p, iF, dict),
+ fixedValueFvPatchVectorField(p, iF, dict),
inletVelocity_("inletVelocity", dict, p.size()),
alphaName_(dict.lookupOrDefault<word>("alpha", "alpha"))
{}
@@ -79,7 +79,7 @@ interstitialInletVelocityFvPatchVectorField
const interstitialInletVelocityFvPatchVectorField& ptf
)
:
- fixedValueFvPatchField<vector>(ptf),
+ fixedValueFvPatchVectorField(ptf),
inletVelocity_(ptf.inletVelocity_),
alphaName_(ptf.alphaName_)
{}
@@ -92,7 +92,7 @@ interstitialInletVelocityFvPatchVectorField
const DimensionedField<vector, volMesh>& iF
)
:
- fixedValueFvPatchField<vector>(ptf, iF),
+ fixedValueFvPatchVectorField(ptf, iF),
inletVelocity_(ptf.inletVelocity_),
alphaName_(ptf.alphaName_)
{}
@@ -100,6 +100,31 @@ interstitialInletVelocityFvPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+void Foam::interstitialInletVelocityFvPatchVectorField::autoMap
+(
+ const fvPatchFieldMapper& m
+)
+{
+ fixedValueFvPatchVectorField::autoMap(m);
+ inletVelocity_.autoMap(m);
+}
+
+
+void Foam::interstitialInletVelocityFvPatchVectorField::rmap
+(
+ const fvPatchVectorField& ptf,
+ const labelList& addr
+)
+{
+ fixedValueFvPatchVectorField::rmap(ptf, addr);
+
+ const interstitialInletVelocityFvPatchVectorField& tiptf =
+ refCast<const interstitialInletVelocityFvPatchVectorField>(ptf);
+
+ inletVelocity_.rmap(tiptf.inletVelocity_, addr);
+}
+
+
void Foam::interstitialInletVelocityFvPatchVectorField::updateCoeffs()
{
if (updated())
@@ -111,7 +136,7 @@ void Foam::interstitialInletVelocityFvPatchVectorField::updateCoeffs()
patch().lookupPatchField<volScalarField, scalar>(alphaName_);
operator==(inletVelocity_/alphap);
- fixedValueFvPatchField<vector>::updateCoeffs();
+ fixedValueFvPatchVectorField::updateCoeffs();
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H
index 1952b826335ec9556cddb01beab19149f8e71515..6affdefada49a1e8ac53587b62459a1618e4d7e8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H
@@ -141,8 +141,26 @@ public:
// Member functions
- //- Update the coefficients associated with the patch field
- virtual void updateCoeffs();
+ // Mapping functions
+
+ //- Map (and resize as needed) from self given a mapping object
+ virtual void autoMap
+ (
+ const fvPatchFieldMapper&
+ );
+
+ //- Reverse map the given fvPatchField onto this fvPatchField
+ virtual void rmap
+ (
+ const fvPatchVectorField&,
+ const labelList&
+ );
+
+
+ // Evaluation functions
+
+ //- Update the coefficients associated with the patch field
+ virtual void updateCoeffs();
//- Write
virtual void write(Ostream&) const;
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
index 58a6d067a94b4bf61b50cd31cf193a51353ded74..204a79358714e9fc2246972e3030e156e2269264 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
@@ -198,7 +198,6 @@ tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -206,6 +205,13 @@ tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index 41fbbd0c28fc26d409ce9d26a0cae9bab19fb874..94c34b8ea82bd658c54c733f2a819c5352e4774d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -270,7 +270,6 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -278,6 +277,13 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
index ddaae47a872d7187accf9c975aa9153e66de22dd..1e2b840a136f4bc3401d8cc47d280698c85a5e12 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
@@ -176,7 +176,6 @@ tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -184,6 +183,13 @@ tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
index 8c4f0a178b3386d7e9f61bde5d85a8d7562dc765..b420f2b16147f2e590ef9b9c71677c91f37279f1 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
@@ -199,7 +199,6 @@ tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -207,6 +206,13 @@ tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
index c905f5e29a85928b61c9dda1d63eb804c5868fb3..425e78ece6504d666665e5230b1a58dde7df3c9e 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
@@ -187,7 +187,6 @@ tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -195,6 +194,13 @@ tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
index 2494f8dfcb38df690ef731cea619f81e241cfcae..db309c8c8150901e5b83376b68aaabe8d9be4e34 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
@@ -185,7 +185,6 @@ tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -193,6 +192,13 @@ tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
index c78f5891228c55b21c433493973a893e0a50b010..50aed99d523ddb8c10751d8c10f43422db1f4fd6 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
@@ -91,6 +91,13 @@ public:
// Constructors
+ //- Construct from mesh and name of the rDeltaT field
+ localEulerDdtScheme(const fvMesh& mesh, const word& rDeltaTName)
+ :
+ ddtScheme<Type>(mesh),
+ rDeltaTName_(rDeltaTName)
+ {}
+
//- Construct from mesh and Istream
localEulerDdtScheme(const fvMesh& mesh, Istream& is)
:
@@ -188,7 +195,6 @@ tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -196,6 +202,13 @@ tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
index ee2d6937a6df854cb5ac09fea8198a809c2d2775..4512d0531027df863af9e0ebdc347eca82c4b3c5 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
@@ -175,7 +175,6 @@ tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtUfCorr
const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
);
-
template<>
tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtPhiCorr
(
@@ -183,6 +182,13 @@ tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtPhiCorr
const surfaceScalarField& phi
);
+template<>
+tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtUfCorr
+(
+ const volScalarField& rho,
+ const volScalarField& U,
+ const surfaceScalarField& Uf
+);
template<>
tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtPhiCorr
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C
similarity index 70%
rename from applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.C
rename to src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C
index 1720a267a0bc252879a8a64d205efb0d3c392bfe..a954dccf561db59269c0abf86ff8973167ffdc9b 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,57 +23,42 @@ License
\*---------------------------------------------------------------------------*/
-#include "MULES.H"
-#include "upwind.H"
-#include "uncorrectedSnGrad.H"
-#include "gaussConvectionScheme.H"
-#include "gaussLaplacianScheme.H"
-#include "uncorrectedSnGrad.H"
-#include "surfaceInterpolate.H"
-#include "fvcSurfaceIntegrate.H"
-#include "slicedSurfaceFields.H"
-#include "syncTools.H"
-
-#include "fvCFD.H"
+#include "CMULES.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void Foam::MULES::explicitLTSSolve
+void Foam::MULES::correct
(
volScalarField& psi,
- const surfaceScalarField& phi,
- surfaceScalarField& phiPsi,
+ surfaceScalarField& phiPsiCorr,
const scalar psiMax,
const scalar psiMin
)
{
- explicitLTSSolve
+ correct
(
geometricOneField(),
psi,
- phi,
- phiPsi,
+ phiPsiCorr,
zeroField(), zeroField(),
psiMax, psiMin
);
}
-void Foam::MULES::implicitSolve
+void Foam::MULES::LTScorrect
(
volScalarField& psi,
- const surfaceScalarField& phi,
- surfaceScalarField& phiPsi,
+ surfaceScalarField& phiPsiCorr,
const scalar psiMax,
const scalar psiMin
)
{
- implicitSolve
+ LTScorrect
(
geometricOneField(),
psi,
- phi,
- phiPsi,
+ phiPsiCorr,
zeroField(), zeroField(),
psiMax, psiMin
);
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
similarity index 66%
rename from applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.H
rename to src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
index 2c2e282ae2768196ed51c18d9dd0f08da20012dc..2786a86aaebe63b0f3a8cf99ff4d8503cd0edaa7 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,67 +25,77 @@ Global
MULES
Description
- MULES: Multidimensional universal limiter with explicit solution.
+ CMULES: Multidimensional universal limiter for
+ explicit corrected implicit solution.
Solve a convective-only transport equation using an explicit universal
- multi-dimensional limiter.
+ multi-dimensional limiter to correct an implicit conservative bounded
+ obtained using rigorously bounded schemes such as Euler-implicit in time
+ upwind in space.
Parameters are the variable to solve, the normal convective flux and the
actual explicit flux of the variable which is also used to return limited
flux used in the bounded-solution.
SourceFiles
- MULES.C
+ CMULES.C
+ CMULESTemplates.C
\*---------------------------------------------------------------------------*/
-#ifndef MULES_H
-#define MULES_H
+#ifndef CMULES_H
+#define CMULES_H
-#include "volFields.H"
-#include "surfaceFieldsFwd.H"
-#include "primitiveFieldsFwd.H"
-#include "zeroField.H"
-#include "geometricOneField.H"
+#include "MULES.H"
+#include "EulerDdtScheme.H"
+#include "localEulerDdtScheme.H"
+#include "gaussConvectionScheme.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+namespace MULES
+{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace MULES
-{
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void correct
+(
+ const RdeltaTType& rDeltaT,
+ const RhoType& rho,
+ volScalarField& psi,
+ const surfaceScalarField& phiCorr,
+ const SpType& Sp,
+ const SuType& Su
+);
template<class RhoType, class SpType, class SuType>
-void explicitLTSSolve
+void correct
(
const RhoType& rho,
volScalarField& psi,
- const surfaceScalarField& phiBD,
- surfaceScalarField& phiPsi,
+ surfaceScalarField& phiCorr,
const SpType& Sp,
const SuType& Su,
const scalar psiMax,
const scalar psiMin
);
-void explicitLTSSolve
+void correct
(
volScalarField& psi,
- const surfaceScalarField& phiBD,
- surfaceScalarField& phiPsi,
+ surfaceScalarField& phiCorr,
const scalar psiMax,
const scalar psiMin
);
template<class RhoType, class SpType, class SuType>
-void implicitSolve
+void LTScorrect
(
const RhoType& rho,
- volScalarField& gamma,
- const surfaceScalarField& phi,
+ volScalarField& psi,
surfaceScalarField& phiCorr,
const SpType& Sp,
const SuType& Su,
@@ -93,22 +103,22 @@ void implicitSolve
const scalar psiMin
);
-void implicitSolve
+void LTScorrect
(
- volScalarField& gamma,
- const surfaceScalarField& phi,
+ volScalarField& psi,
surfaceScalarField& phiCorr,
const scalar psiMax,
const scalar psiMin
);
-template<class RhoType, class SpType, class SuType>
-void limiter
+
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void limiterCorr
(
scalarField& allLambda,
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
- const surfaceScalarField& phiBD,
const surfaceScalarField& phiCorr,
const SpType& Sp,
const SuType& Su,
@@ -117,16 +127,30 @@ void limiter
const label nLimiterIter
);
-} // End namespace MULES
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void limitCorr
+(
+ const RdeltaTType& rDeltaT,
+ const RhoType& rho,
+ const volScalarField& psi,
+ surfaceScalarField& phiCorr,
+ const SpType& Sp,
+ const SuType& Su,
+ const scalar psiMax,
+ const scalar psiMin,
+ const label nLimiterIter
+);
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace MULES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "MULESTemplates.C"
+# include "CMULESTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
similarity index 55%
rename from applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
rename to src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index 9185897283a8cf2c0e574ff2583b3b692f0b6946..2ff99745da71a2f463d13b281269de7ce8fef172 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,105 +23,49 @@ License
\*---------------------------------------------------------------------------*/
-#include "MULES.H"
-#include "upwind.H"
-#include "uncorrectedSnGrad.H"
-#include "gaussConvectionScheme.H"
-#include "gaussLaplacianScheme.H"
-#include "uncorrectedSnGrad.H"
-#include "surfaceInterpolate.H"
+#include "CMULES.H"
#include "fvcSurfaceIntegrate.H"
#include "slicedSurfaceFields.H"
+#include "wedgeFvPatch.H"
#include "syncTools.H"
-#include "fvCFD.H"
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-template<class RhoType, class SpType, class SuType>
-void Foam::MULES::explicitLTSSolve
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void Foam::MULES::correct
(
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
volScalarField& psi,
- const surfaceScalarField& phi,
- surfaceScalarField& phiPsi,
+ const surfaceScalarField& phiCorr,
const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin
+ const SuType& Su
)
{
- Info<< "MULES: Solving for " << psi.name() << endl;
+ Info<< "MULES: Correcting " << psi.name() << endl;
const fvMesh& mesh = psi.mesh();
- psi.correctBoundaryConditions();
- surfaceScalarField phiBD(upwind<scalar>(psi.mesh(), phi).flux(psi));
-
- surfaceScalarField& phiCorr = phiPsi;
- phiCorr -= phiBD;
-
- scalarField allLambda(mesh.nFaces(), 1.0);
-
- slicedSurfaceScalarField lambda
- (
- IOobject
- (
- "lambda",
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh,
- dimless,
- allLambda,
- false // Use slices for the couples
- );
-
- limiter
- (
- allLambda,
- rho,
- psi,
- phiBD,
- phiCorr,
- Sp.field(),
- Su.field(),
- psiMax,
- psiMin,
- 3
- );
-
- phiPsi = phiBD + lambda*phiCorr;
-
- scalarField& psiIf = psi;
- const scalarField& psi0 = psi.oldTime();
-
- const volScalarField& rDeltaT =
- mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
-
- psiIf = 0.0;
- fvc::surfaceIntegrate(psiIf, phiPsi);
+ scalarField psiIf(psi.size(), 0);
+ fvc::surfaceIntegrate(psiIf, phiCorr);
if (mesh.moving())
{
- psiIf =
+ psi.internalField() =
(
- mesh.Vsc0()*rho.oldTime()*psi0*rDeltaT/mesh.Vsc()
+ rho.field()*psi.internalField()*rDeltaT
+ Su.field()
- psiIf
- )/(rho*rDeltaT - Sp.field());
+ )/(rho.field()*rDeltaT - Sp.field());
}
else
{
- psiIf =
+ psi.internalField() =
(
- rho.oldTime()*psi0*rDeltaT
+ rho.field()*psi.internalField()*rDeltaT
+ Su.field()
- psiIf
- )/(rho*rDeltaT - Sp.field());
+ )/(rho.field()*rDeltaT - Sp.field());
}
psi.correctBoundaryConditions();
@@ -129,12 +73,11 @@ void Foam::MULES::explicitLTSSolve
template<class RhoType, class SpType, class SuType>
-void Foam::MULES::implicitSolve
+void Foam::MULES::correct
(
const RhoType& rho,
volScalarField& psi,
- const surfaceScalarField& phi,
- surfaceScalarField& phiPsi,
+ surfaceScalarField& phiCorr,
const SpType& Sp,
const SuType& Su,
const scalar psiMax,
@@ -142,176 +85,56 @@ void Foam::MULES::implicitSolve
)
{
const fvMesh& mesh = psi.mesh();
+ const scalar rDeltaT = 1.0/mesh.time().deltaTValue();
const dictionary& MULEScontrols = mesh.solverDict(psi.name());
- label maxIter
- (
- readLabel(MULEScontrols.lookup("maxIter"))
- );
-
label nLimiterIter
(
readLabel(MULEScontrols.lookup("nLimiterIter"))
);
- scalar maxUnboundedness
- (
- readScalar(MULEScontrols.lookup("maxUnboundedness"))
- );
-
- scalar CoCoeff
- (
- readScalar(MULEScontrols.lookup("CoCoeff"))
- );
-
- scalarField allCoLambda(mesh.nFaces());
-
- {
- surfaceScalarField Cof
- (
- mesh.time().deltaT()*mesh.surfaceInterpolation::deltaCoeffs()
- *mag(phi)/mesh.magSf()
- );
-
- slicedSurfaceScalarField CoLambda
- (
- IOobject
- (
- "CoLambda",
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh,
- dimless,
- allCoLambda,
- false // Use slices for the couples
- );
+ limitCorr(rDeltaT, rho, psi, phiCorr, Sp, Su, psiMax, psiMin, nLimiterIter);
+ correct(rDeltaT, rho, psi, phiCorr, Sp, Su);
+}
- CoLambda == 1.0/max(CoCoeff*Cof, scalar(1));
- }
- scalarField allLambda(allCoLambda);
- //scalarField allLambda(mesh.nFaces(), 1.0);
+template<class RhoType, class SpType, class SuType>
+void Foam::MULES::LTScorrect
+(
+ const RhoType& rho,
+ volScalarField& psi,
+ surfaceScalarField& phiCorr,
+ const SpType& Sp,
+ const SuType& Su,
+ const scalar psiMax,
+ const scalar psiMin
+)
+{
+ const fvMesh& mesh = psi.mesh();
- slicedSurfaceScalarField lambda
- (
- IOobject
- (
- "lambda",
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh,
- dimless,
- allLambda,
- false // Use slices for the couples
- );
+ const volScalarField& rDeltaT =
+ mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
- linear<scalar> CDs(mesh);
- upwind<scalar> UDs(mesh, phi);
- //fv::uncorrectedSnGrad<scalar> snGrads(mesh);
+ const dictionary& MULEScontrols = mesh.solverDict(psi.name());
- fvScalarMatrix psiConvectionDiffusion
+ label nLimiterIter
(
- fvm::ddt(rho, psi)
- + fv::gaussConvectionScheme<scalar>(mesh, phi, UDs).fvmDiv(phi, psi)
- //- fv::gaussLaplacianScheme<scalar, scalar>(mesh, CDs, snGrads)
- //.fvmLaplacian(Dpsif, psi)
- - fvm::Sp(Sp, psi)
- - Su
+ readLabel(MULEScontrols.lookup("nLimiterIter"))
);
- surfaceScalarField phiBD(psiConvectionDiffusion.flux());
-
- surfaceScalarField& phiCorr = phiPsi;
- phiCorr -= phiBD;
-
- for (label i=0; i<maxIter; i++)
- {
- if (i != 0 && i < 4)
- {
- allLambda = allCoLambda;
- }
-
- limiter
- (
- allLambda,
- rho,
- psi,
- phiBD,
- phiCorr,
- Sp.field(),
- Su.field(),
- psiMax,
- psiMin,
- nLimiterIter
- );
-
- solve
- (
- psiConvectionDiffusion + fvc::div(lambda*phiCorr),
- MULEScontrols
- );
-
- scalar maxPsiM1 = gMax(psi.internalField()) - 1.0;
- scalar minPsi = gMin(psi.internalField());
-
- scalar unboundedness = max(max(maxPsiM1, 0.0), -min(minPsi, 0.0));
-
- if (unboundedness < maxUnboundedness)
- {
- break;
- }
- else
- {
- Info<< "MULES: max(" << psi.name() << " - 1) = " << maxPsiM1
- << " min(" << psi.name() << ") = " << minPsi << endl;
-
- phiBD = psiConvectionDiffusion.flux();
-
- /*
- word gammaScheme("div(phi,gamma)");
- word gammarScheme("div(phirb,gamma)");
-
- const surfaceScalarField& phir =
- mesh.lookupObject<surfaceScalarField>("phir");
-
- phiCorr =
- fvc::flux
- (
- phi,
- psi,
- gammaScheme
- )
- + fvc::flux
- (
- -fvc::flux(-phir, scalar(1) - psi, gammarScheme),
- psi,
- gammarScheme
- )
- - phiBD;
- */
- }
- }
-
- phiPsi = psiConvectionDiffusion.flux() + lambda*phiCorr;
+ limitCorr(rDeltaT, rho, psi, phiCorr, Sp, Su, psiMax, psiMin, nLimiterIter);
+ correct(rDeltaT, rho, psi, phiCorr, Sp, Su);
}
-template<class RhoType, class SpType, class SuType>
-void Foam::MULES::limiter
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void Foam::MULES::limiterCorr
(
scalarField& allLambda,
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
- const surfaceScalarField& phiBD,
const surfaceScalarField& phiCorr,
const SpType& Sp,
const SuType& Su,
@@ -323,8 +146,6 @@ void Foam::MULES::limiter
const scalarField& psiIf = psi;
const volScalarField::GeometricBoundaryField& psiBf = psi.boundaryField();
- const scalarField& psi0 = psi.oldTime();
-
const fvMesh& mesh = psi.mesh();
const labelUList& owner = mesh.owner();
@@ -332,13 +153,6 @@ void Foam::MULES::limiter
tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
const scalarField& V = tVsc();
- const volScalarField& rDeltaT =
- mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
-
- const scalarField& phiBDIf = phiBD;
- const surfaceScalarField::GeometricBoundaryField& phiBDBf =
- phiBD.boundaryField();
-
const scalarField& phiCorrIf = phiCorr;
const surfaceScalarField::GeometricBoundaryField& phiCorrBf =
phiCorr.boundaryField();
@@ -367,8 +181,6 @@ void Foam::MULES::limiter
scalarField psiMaxn(psiIf.size(), psiMin);
scalarField psiMinn(psiIf.size(), psiMax);
- scalarField sumPhiBD(psiIf.size(), 0.0);
-
scalarField sumPhip(psiIf.size(), VSMALL);
scalarField mSumPhim(psiIf.size(), VSMALL);
@@ -383,9 +195,6 @@ void Foam::MULES::limiter
psiMaxn[nei] = max(psiMaxn[nei], psiIf[own]);
psiMinn[nei] = min(psiMinn[nei], psiIf[own]);
- sumPhiBD[own] += phiBDIf[facei];
- sumPhiBD[nei] -= phiBDIf[facei];
-
scalar phiCorrf = phiCorrIf[facei];
if (phiCorrf > 0.0)
@@ -403,14 +212,13 @@ void Foam::MULES::limiter
forAll(phiCorrBf, patchi)
{
const fvPatchScalarField& psiPf = psiBf[patchi];
- const scalarField& phiBDPf = phiBDBf[patchi];
const scalarField& phiCorrPf = phiCorrBf[patchi];
const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
if (psiPf.coupled())
{
- scalarField psiPNf(psiPf.patchNeighbourField());
+ const scalarField psiPNf(psiPf.patchNeighbourField());
forAll(phiCorrPf, pFacei)
{
@@ -435,8 +243,6 @@ void Foam::MULES::limiter
{
label pfCelli = pFaceCells[pFacei];
- sumPhiBD[pfCelli] += phiBDPf[pFacei];
-
scalar phiCorrf = phiCorrPf[pFacei];
if (phiCorrf > 0.0)
@@ -453,39 +259,30 @@ void Foam::MULES::limiter
psiMaxn = min(psiMaxn, psiMax);
psiMinn = max(psiMinn, psiMin);
- //scalar smooth = 0.5;
- //psiMaxn = min((1.0 - smooth)*psiIf + smooth*psiMaxn, psiMax);
- //psiMinn = max((1.0 - smooth)*psiIf + smooth*psiMinn, psiMin);
-
- if (mesh.moving())
- {
- tmp<volScalarField::DimensionedInternalField> V0 = mesh.Vsc0();
-
- psiMaxn =
- V*((rho*rDeltaT - Sp)*psiMaxn - Su)
- - (V0()*rDeltaT)*rho.oldTime()*psi0
- + sumPhiBD;
+ // scalar smooth = 0.5;
+ // psiMaxn = min((1.0 - smooth)*psiIf + smooth*psiMaxn, psiMax);
+ // psiMinn = max((1.0 - smooth)*psiIf + smooth*psiMinn, psiMin);
- psiMinn =
- V*(Su - (rho*rDeltaT - Sp)*psiMinn)
- + (V0*rDeltaT)*rho.oldTime()*psi0
- - sumPhiBD;
- }
- else
- {
- psiMaxn =
- V*((rho*rDeltaT - Sp)*psiMaxn - (rho.oldTime()*rDeltaT)*psi0 - Su)
- + sumPhiBD;
+ psiMaxn =
+ V
+ *(
+ (rho.field()*rDeltaT - Sp.field())*psiMaxn
+ - Su.field()
+ - rho.field()*psi.internalField()*rDeltaT
+ );
- psiMinn =
- V*((rho*rDeltaT)*psi0 - (rho.oldTime()*rDeltaT - Sp)*psiMinn + Su)
- - sumPhiBD;
- }
+ psiMinn =
+ V
+ *(
+ Su.field()
+ - (rho.field()*rDeltaT - Sp.field())*psiMinn
+ + rho.field()*psi.internalField()*rDeltaT
+ );
scalarField sumlPhip(psiIf.size());
scalarField mSumlPhim(psiIf.size());
- for(int j=0; j<nLimiterIter; j++)
+ for (int j=0; j<nLimiterIter; j++)
{
sumlPhip = 0.0;
mSumlPhim = 0.0;
@@ -533,19 +330,21 @@ void Foam::MULES::limiter
}
}
- forAll (sumlPhip, celli)
+ forAll(sumlPhip, celli)
{
sumlPhip[celli] =
max(min
(
- (sumlPhip[celli] + psiMaxn[celli])/mSumPhim[celli],
+ (sumlPhip[celli] + psiMaxn[celli])
+ /(mSumPhim[celli] - SMALL),
1.0), 0.0
);
mSumlPhim[celli] =
max(min
(
- (mSumlPhim[celli] + psiMinn[celli])/sumPhip[celli],
+ (mSumlPhim[celli] + psiMinn[celli])
+ /(sumPhip[celli] + SMALL),
1.0), 0.0
);
}
@@ -578,20 +377,57 @@ void Foam::MULES::limiter
{
fvsPatchScalarField& lambdaPf = lambdaBf[patchi];
const scalarField& phiCorrfPf = phiCorrBf[patchi];
+ const fvPatchScalarField& psiPf = psiBf[patchi];
- const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
-
- forAll(lambdaPf, pFacei)
+ if (isA<wedgeFvPatch>(mesh.boundary()[patchi]))
{
- label pfCelli = pFaceCells[pFacei];
+ lambdaPf = 0;
+ }
+ else if (psiPf.coupled())
+ {
+ const labelList& pFaceCells =
+ mesh.boundary()[patchi].faceCells();
- if (phiCorrfPf[pFacei] > 0.0)
+ forAll(lambdaPf, pFacei)
{
- lambdaPf[pFacei] = min(lambdaPf[pFacei], lambdap[pfCelli]);
+ label pfCelli = pFaceCells[pFacei];
+
+ if (phiCorrfPf[pFacei] > 0.0)
+ {
+ lambdaPf[pFacei] =
+ min(lambdaPf[pFacei], lambdap[pfCelli]);
+ }
+ else
+ {
+ lambdaPf[pFacei] =
+ min(lambdaPf[pFacei], lambdam[pfCelli]);
+ }
}
- else
+ }
+ else
+ {
+ const labelList& pFaceCells =
+ mesh.boundary()[patchi].faceCells();
+ const scalarField& phiCorrPf = phiCorrBf[patchi];
+
+ forAll(lambdaPf, pFacei)
{
- lambdaPf[pFacei] = min(lambdaPf[pFacei], lambdam[pfCelli]);
+ // Limit outlet faces only
+ if (phiCorrPf[pFacei] > SMALL*SMALL)
+ {
+ label pfCelli = pFaceCells[pFacei];
+
+ if (phiCorrfPf[pFacei] > 0.0)
+ {
+ lambdaPf[pFacei] =
+ min(lambdaPf[pFacei], lambdap[pfCelli]);
+ }
+ else
+ {
+ lambdaPf[pFacei] =
+ min(lambdaPf[pFacei], lambdam[pfCelli]);
+ }
+ }
}
}
}
@@ -601,4 +437,57 @@ void Foam::MULES::limiter
}
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void Foam::MULES::limitCorr
+(
+ const RdeltaTType& rDeltaT,
+ const RhoType& rho,
+ const volScalarField& psi,
+ surfaceScalarField& phiCorr,
+ const SpType& Sp,
+ const SuType& Su,
+ const scalar psiMax,
+ const scalar psiMin,
+ const label nLimiterIter
+)
+{
+ const fvMesh& mesh = psi.mesh();
+
+ scalarField allLambda(mesh.nFaces(), 1.0);
+
+ slicedSurfaceScalarField lambda
+ (
+ IOobject
+ (
+ "lambda",
+ mesh.time().timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ mesh,
+ dimless,
+ allLambda,
+ false // Use slices for the couples
+ );
+
+ limiterCorr
+ (
+ allLambda,
+ rDeltaT,
+ rho,
+ psi,
+ phiCorr,
+ Sp,
+ Su,
+ psiMax,
+ psiMin,
+ nLimiterIter
+ );
+
+ phiCorr *= lambda;
+}
+
+
// ************************************************************************* //
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
index 1866e8022f158319487a75ffe26cca638914ea8f..2d6e4a26a0860e196f46fe1e4921373f505d2db3 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/IMULES.H
@@ -25,7 +25,14 @@ Global
IMULES
Description
- IMULES: Multidimensional universal limiter with implicit solution.
+ IMULES: Multidimensional universal limiter for implicit solution.
+
+ Solve a convective-only transport equation using an explicit universal
+ multi-dimensional limiter applied to an implicit formulation requiring
+ iteration to guarantee boundedness. The number of iterations required
+ to obtain boundedness increases with the Courant number of the simulation.
+
+ It may be more efficient to use CMULES.
SourceFiles
IMULES.C
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
index 14749ff9b73d68f9f42f7bfb0b44776f2e63f564..542181e90dd89ac75af8984ed402ba4c43d19444 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
@@ -179,6 +179,7 @@ void Foam::MULES::implicitSolve
limiter
(
allLambda,
+ 1.0/mesh.time().deltaTValue(),
rho,
psi,
phiBD,
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
index ff5994e670ce942784ddbdb283ebc4247896a603..cb0970b5c4f269b5e1022ea060e2aa27448da675 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
@@ -48,19 +48,21 @@ void Foam::MULES::explicitSolve
}
-void Foam::MULES::correct
+void Foam::MULES::explicitLTSSolve
(
volScalarField& psi,
- surfaceScalarField& phiPsiCorr,
+ const surfaceScalarField& phi,
+ surfaceScalarField& phiPsi,
const scalar psiMax,
const scalar psiMin
)
{
- correct
+ explicitLTSSolve
(
geometricOneField(),
psi,
- phiPsiCorr,
+ phi,
+ phiPsi,
zeroField(), zeroField(),
psiMax, psiMin
);
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
index c1d824b9503a16fce8f27befc168e3a40b754e66..f0525ddc9ec8c73d0cf8d9821f91e1ec29dcbb6b 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
@@ -25,7 +25,7 @@ Global
MULES
Description
- MULES: Multidimensional universal limiter with explicit solution.
+ MULES: Multidimensional universal limiter for explicit solution.
Solve a convective-only transport equation using an explicit universal
multi-dimensional limiter.
@@ -60,6 +60,17 @@ namespace MULES
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
+void explicitSolve
+(
+ const RdeltaTType& rDeltaT,
+ const RhoType& rho,
+ volScalarField& psi,
+ const surfaceScalarField& phiPsi,
+ const SpType& Sp,
+ const SuType& Su
+);
+
template<class RhoType, class SpType, class SuType>
void explicitSolve
(
@@ -92,42 +103,34 @@ void explicitSolve
const scalar psiMin
);
-
-template<class RhoType, class SpType, class SuType>
-void correct
-(
- const RhoType& rho,
- volScalarField& psi,
- const surfaceScalarField& phiCorr,
- const SpType& Sp,
- const SuType& Su
-);
-
template<class RhoType, class SpType, class SuType>
-void correct
+void explicitLTSSolve
(
const RhoType& rho,
volScalarField& psi,
- surfaceScalarField& phiCorr,
+ const surfaceScalarField& phiBD,
+ surfaceScalarField& phiPsi,
const SpType& Sp,
const SuType& Su,
const scalar psiMax,
const scalar psiMin
);
-void correct
+void explicitLTSSolve
(
volScalarField& psi,
- surfaceScalarField& phiCorr,
+ const surfaceScalarField& phiBD,
+ surfaceScalarField& phiPsi,
const scalar psiMax,
const scalar psiMin
);
-template<class RhoType, class SpType, class SuType>
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
void limiter
(
scalarField& allLambda,
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
const surfaceScalarField& phiBD,
@@ -139,9 +142,10 @@ void limiter
const label nLimiterIter
);
-template<class RhoType, class SpType, class SuType>
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
void limit
(
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
const surfaceScalarField& phi,
@@ -155,39 +159,12 @@ void limit
);
-template<class RhoType, class SpType, class SuType>
-void limiterCorr
-(
- scalarField& allLambda,
- const RhoType& rho,
- const volScalarField& psi,
- const surfaceScalarField& phiCorr,
- const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin,
- const label nLimiterIter
-);
-
-template<class RhoType, class SpType, class SuType>
-void limitCorr
-(
- const RhoType& rho,
- const volScalarField& psi,
- surfaceScalarField& phiCorr,
- const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin,
- const label nLimiterIter
-);
-
-
void limitSum(UPtrList<scalarField>& phiPsiCorrs);
template<class SurfaceScalarFieldList>
void limitSum(SurfaceScalarFieldList& phiPsiCorrs);
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace MULES
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 53b64a5f7b550df925f57ca7ea74406ff81a0602..a7a528281827d5b0e55eb49bd8a77583b93f3983 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -32,9 +32,10 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-template<class RhoType, class SpType, class SuType>
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
void Foam::MULES::explicitSolve
(
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
volScalarField& psi,
const surfaceScalarField& phiPsi,
@@ -48,7 +49,6 @@ void Foam::MULES::explicitSolve
scalarField& psiIf = psi;
const scalarField& psi0 = psi.oldTime();
- const scalar deltaT = mesh.time().deltaTValue();
psiIf = 0.0;
fvc::surfaceIntegrate(psiIf, phiPsi);
@@ -58,19 +58,19 @@ void Foam::MULES::explicitSolve
psiIf =
(
mesh.Vsc0()().field()*rho.oldTime().field()
- *psi0/(deltaT*mesh.Vsc()().field())
+ *psi0*rDeltaT/mesh.Vsc()().field()
+ Su.field()
- psiIf
- )/(rho.field()/deltaT - Sp.field());
+ )/(rho.field()*rDeltaT - Sp.field());
}
else
{
psiIf =
(
- rho.oldTime().field()*psi0/deltaT
+ rho.oldTime().field()*psi0*rDeltaT
+ Su.field()
- psiIf
- )/(rho.field()/deltaT - Sp.field());
+ )/(rho.field()*rDeltaT - Sp.field());
}
psi.correctBoundaryConditions();
@@ -82,68 +82,45 @@ void Foam::MULES::explicitSolve
(
const RhoType& rho,
volScalarField& psi,
- const surfaceScalarField& phi,
- surfaceScalarField& phiPsi,
+ const surfaceScalarField& phiPsi,
const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin
+ const SuType& Su
)
{
- psi.correctBoundaryConditions();
- limit(rho, psi, phi, phiPsi, Sp, Su, psiMax, psiMin, 3, false);
- explicitSolve(rho, psi, phiPsi, Sp, Su);
+ const fvMesh& mesh = psi.mesh();
+ const scalar rDeltaT = 1.0/mesh.time().deltaTValue();
+ explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
}
template<class RhoType, class SpType, class SuType>
-void Foam::MULES::correct
+void Foam::MULES::explicitSolve
(
const RhoType& rho,
volScalarField& psi,
- const surfaceScalarField& phiCorr,
+ const surfaceScalarField& phi,
+ surfaceScalarField& phiPsi,
const SpType& Sp,
- const SuType& Su
+ const SuType& Su,
+ const scalar psiMax,
+ const scalar psiMin
)
{
- Info<< "MULES: Correcting " << psi.name() << endl;
-
const fvMesh& mesh = psi.mesh();
-
- const scalar deltaT = mesh.time().deltaTValue();
-
- scalarField psiIf(psi.size(), 0);
- fvc::surfaceIntegrate(psiIf, phiCorr);
-
- if (mesh.moving())
- {
- psi.internalField() =
- (
- rho.field()*psi.internalField()/deltaT
- + Su.field()
- - psiIf
- )/(rho.field()/deltaT - Sp.field());
- }
- else
- {
- psi.internalField() =
- (
- rho.field()*psi.internalField()/deltaT
- + Su.field()
- - psiIf
- )/(rho.field()/deltaT - Sp.field());
- }
-
+ const scalar rDeltaT = 1.0/mesh.time().deltaTValue();
psi.correctBoundaryConditions();
+ limit(rDeltaT, rho, psi, phi, phiPsi, Sp, Su, psiMax, psiMin, 3, false);
+ explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
}
template<class RhoType, class SpType, class SuType>
-void Foam::MULES::correct
+void Foam::MULES::explicitLTSSolve
(
const RhoType& rho,
volScalarField& psi,
- surfaceScalarField& phiCorr,
+ const surfaceScalarField& phi,
+ surfaceScalarField& phiPsi,
const SpType& Sp,
const SuType& Su,
const scalar psiMax,
@@ -152,22 +129,20 @@ void Foam::MULES::correct
{
const fvMesh& mesh = psi.mesh();
- const dictionary& MULEScontrols = mesh.solverDict(psi.name());
-
- label nLimiterIter
- (
- readLabel(MULEScontrols.lookup("nLimiterIter"))
- );
+ const volScalarField& rDeltaT =
+ mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT");
- limitCorr(rho, psi, phiCorr, Sp, Su, psiMax, psiMin, nLimiterIter);
- correct(rho, psi, phiCorr, Sp, Su);
+ psi.correctBoundaryConditions();
+ limit(rDeltaT, rho, psi, phi, phiPsi, Sp, Su, psiMax, psiMin, 3, false);
+ explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su);
}
-template<class RhoType, class SpType, class SuType>
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
void Foam::MULES::limiter
(
scalarField& allLambda,
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
const surfaceScalarField& phiBD,
@@ -190,7 +165,6 @@ void Foam::MULES::limiter
const labelUList& neighb = mesh.neighbour();
tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
const scalarField& V = tVsc();
- const scalar deltaT = mesh.time().deltaTValue();
const scalarField& phiBDIf = phiBD;
const surfaceScalarField::GeometricBoundaryField& phiBDBf =
@@ -321,19 +295,19 @@ void Foam::MULES::limiter
psiMaxn =
V
*(
- (rho.field()/deltaT - Sp.field())*psiMaxn
+ (rho.field()*rDeltaT - Sp.field())*psiMaxn
- Su.field()
)
- - (V0().field()/deltaT)*rho.oldTime().field()*psi0
+ - (V0().field()*rDeltaT)*rho.oldTime().field()*psi0
+ sumPhiBD;
psiMinn =
V
*(
Su.field()
- - (rho.field()/deltaT - Sp.field())*psiMinn
+ - (rho.field()*rDeltaT - Sp.field())*psiMinn
)
- + (V0().field()/deltaT)*rho.oldTime().field()*psi0
+ + (V0().field()*rDeltaT)*rho.oldTime().field()*psi0
- sumPhiBD;
}
else
@@ -341,9 +315,9 @@ void Foam::MULES::limiter
psiMaxn =
V
*(
- (rho.field()/deltaT - Sp.field())*psiMaxn
+ (rho.field()*rDeltaT - Sp.field())*psiMaxn
- Su.field()
- - (rho.oldTime().field()/deltaT)*psi0
+ - (rho.oldTime().field()*rDeltaT)*psi0
)
+ sumPhiBD;
@@ -351,8 +325,8 @@ void Foam::MULES::limiter
V
*(
Su.field()
- - (rho.field()/deltaT - Sp.field())*psiMinn
- + (rho.oldTime().field()/deltaT)*psi0
+ - (rho.field()*rDeltaT - Sp.field())*psiMinn
+ + (rho.oldTime().field()*rDeltaT)*psi0
)
- sumPhiBD;
}
@@ -413,14 +387,16 @@ void Foam::MULES::limiter
sumlPhip[celli] =
max(min
(
- (sumlPhip[celli] + psiMaxn[celli])/mSumPhim[celli],
+ (sumlPhip[celli] + psiMaxn[celli])
+ /(mSumPhim[celli] - SMALL),
1.0), 0.0
);
mSumlPhim[celli] =
max(min
(
- (mSumlPhim[celli] + psiMinn[celli])/sumPhip[celli],
+ (mSumlPhim[celli] + psiMinn[celli])
+ /(sumPhip[celli] + SMALL),
1.0), 0.0
);
}
@@ -514,9 +490,10 @@ void Foam::MULES::limiter
}
-template<class RhoType, class SpType, class SuType>
+template<class RdeltaTType, class RhoType, class SpType, class SuType>
void Foam::MULES::limit
(
+ const RdeltaTType& rDeltaT,
const RhoType& rho,
const volScalarField& psi,
const surfaceScalarField& phi,
@@ -558,6 +535,7 @@ void Foam::MULES::limit
limiter
(
allLambda,
+ rDeltaT,
rho,
psi,
phiBD,
@@ -580,364 +558,6 @@ void Foam::MULES::limit
}
-template<class RhoType, class SpType, class SuType>
-void Foam::MULES::limiterCorr
-(
- scalarField& allLambda,
- const RhoType& rho,
- const volScalarField& psi,
- const surfaceScalarField& phiCorr,
- const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin,
- const label nLimiterIter
-)
-{
- const scalarField& psiIf = psi;
- const volScalarField::GeometricBoundaryField& psiBf = psi.boundaryField();
-
- const fvMesh& mesh = psi.mesh();
-
- const labelUList& owner = mesh.owner();
- const labelUList& neighb = mesh.neighbour();
- tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
- const scalarField& V = tVsc();
- const scalar deltaT = mesh.time().deltaTValue();
-
- const scalarField& phiCorrIf = phiCorr;
- const surfaceScalarField::GeometricBoundaryField& phiCorrBf =
- phiCorr.boundaryField();
-
- slicedSurfaceScalarField lambda
- (
- IOobject
- (
- "lambda",
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh,
- dimless,
- allLambda,
- false // Use slices for the couples
- );
-
- scalarField& lambdaIf = lambda;
- surfaceScalarField::GeometricBoundaryField& lambdaBf =
- lambda.boundaryField();
-
- scalarField psiMaxn(psiIf.size(), psiMin);
- scalarField psiMinn(psiIf.size(), psiMax);
-
- scalarField sumPhip(psiIf.size(), VSMALL);
- scalarField mSumPhim(psiIf.size(), VSMALL);
-
- forAll(phiCorrIf, facei)
- {
- label own = owner[facei];
- label nei = neighb[facei];
-
- psiMaxn[own] = max(psiMaxn[own], psiIf[nei]);
- psiMinn[own] = min(psiMinn[own], psiIf[nei]);
-
- psiMaxn[nei] = max(psiMaxn[nei], psiIf[own]);
- psiMinn[nei] = min(psiMinn[nei], psiIf[own]);
-
- scalar phiCorrf = phiCorrIf[facei];
-
- if (phiCorrf > 0.0)
- {
- sumPhip[own] += phiCorrf;
- mSumPhim[nei] += phiCorrf;
- }
- else
- {
- mSumPhim[own] -= phiCorrf;
- sumPhip[nei] -= phiCorrf;
- }
- }
-
- forAll(phiCorrBf, patchi)
- {
- const fvPatchScalarField& psiPf = psiBf[patchi];
- const scalarField& phiCorrPf = phiCorrBf[patchi];
-
- const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
-
- if (psiPf.coupled())
- {
- const scalarField psiPNf(psiPf.patchNeighbourField());
-
- forAll(phiCorrPf, pFacei)
- {
- label pfCelli = pFaceCells[pFacei];
-
- psiMaxn[pfCelli] = max(psiMaxn[pfCelli], psiPNf[pFacei]);
- psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPNf[pFacei]);
- }
- }
- else
- {
- forAll(phiCorrPf, pFacei)
- {
- label pfCelli = pFaceCells[pFacei];
-
- psiMaxn[pfCelli] = max(psiMaxn[pfCelli], psiPf[pFacei]);
- psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPf[pFacei]);
- }
- }
-
- forAll(phiCorrPf, pFacei)
- {
- label pfCelli = pFaceCells[pFacei];
-
- scalar phiCorrf = phiCorrPf[pFacei];
-
- if (phiCorrf > 0.0)
- {
- sumPhip[pfCelli] += phiCorrf;
- }
- else
- {
- mSumPhim[pfCelli] -= phiCorrf;
- }
- }
- }
-
- psiMaxn = min(psiMaxn, psiMax);
- psiMinn = max(psiMinn, psiMin);
-
- // scalar smooth = 0.5;
- // psiMaxn = min((1.0 - smooth)*psiIf + smooth*psiMaxn, psiMax);
- // psiMinn = max((1.0 - smooth)*psiIf + smooth*psiMinn, psiMin);
-
- psiMaxn =
- V
- *(
- (rho.field()/deltaT - Sp.field())*psiMaxn
- - Su.field()
- - rho.field()*psi.internalField()/deltaT
- );
-
- psiMinn =
- V
- *(
- Su.field()
- - (rho.field()/deltaT - Sp.field())*psiMinn
- + rho.field()*psi.internalField()/deltaT
- );
-
- scalarField sumlPhip(psiIf.size());
- scalarField mSumlPhim(psiIf.size());
-
- for (int j=0; j<nLimiterIter; j++)
- {
- sumlPhip = 0.0;
- mSumlPhim = 0.0;
-
- forAll(lambdaIf, facei)
- {
- label own = owner[facei];
- label nei = neighb[facei];
-
- scalar lambdaPhiCorrf = lambdaIf[facei]*phiCorrIf[facei];
-
- if (lambdaPhiCorrf > 0.0)
- {
- sumlPhip[own] += lambdaPhiCorrf;
- mSumlPhim[nei] += lambdaPhiCorrf;
- }
- else
- {
- mSumlPhim[own] -= lambdaPhiCorrf;
- sumlPhip[nei] -= lambdaPhiCorrf;
- }
- }
-
- forAll(lambdaBf, patchi)
- {
- scalarField& lambdaPf = lambdaBf[patchi];
- const scalarField& phiCorrfPf = phiCorrBf[patchi];
-
- const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
-
- forAll(lambdaPf, pFacei)
- {
- label pfCelli = pFaceCells[pFacei];
-
- scalar lambdaPhiCorrf = lambdaPf[pFacei]*phiCorrfPf[pFacei];
-
- if (lambdaPhiCorrf > 0.0)
- {
- sumlPhip[pfCelli] += lambdaPhiCorrf;
- }
- else
- {
- mSumlPhim[pfCelli] -= lambdaPhiCorrf;
- }
- }
- }
-
- forAll(sumlPhip, celli)
- {
- sumlPhip[celli] =
- max(min
- (
- (sumlPhip[celli] + psiMaxn[celli])/mSumPhim[celli],
- 1.0), 0.0
- );
-
- mSumlPhim[celli] =
- max(min
- (
- (mSumlPhim[celli] + psiMinn[celli])/sumPhip[celli],
- 1.0), 0.0
- );
- }
-
- const scalarField& lambdam = sumlPhip;
- const scalarField& lambdap = mSumlPhim;
-
- forAll(lambdaIf, facei)
- {
- if (phiCorrIf[facei] > 0.0)
- {
- lambdaIf[facei] = min
- (
- lambdaIf[facei],
- min(lambdap[owner[facei]], lambdam[neighb[facei]])
- );
- }
- else
- {
- lambdaIf[facei] = min
- (
- lambdaIf[facei],
- min(lambdam[owner[facei]], lambdap[neighb[facei]])
- );
- }
- }
-
-
- forAll(lambdaBf, patchi)
- {
- fvsPatchScalarField& lambdaPf = lambdaBf[patchi];
- const scalarField& phiCorrfPf = phiCorrBf[patchi];
- const fvPatchScalarField& psiPf = psiBf[patchi];
-
- if (isA<wedgeFvPatch>(mesh.boundary()[patchi]))
- {
- lambdaPf = 0;
- }
- else if (psiPf.coupled())
- {
- const labelList& pFaceCells =
- mesh.boundary()[patchi].faceCells();
-
- forAll(lambdaPf, pFacei)
- {
- label pfCelli = pFaceCells[pFacei];
-
- if (phiCorrfPf[pFacei] > 0.0)
- {
- lambdaPf[pFacei] =
- min(lambdaPf[pFacei], lambdap[pfCelli]);
- }
- else
- {
- lambdaPf[pFacei] =
- min(lambdaPf[pFacei], lambdam[pfCelli]);
- }
- }
- }
- else
- {
- const labelList& pFaceCells =
- mesh.boundary()[patchi].faceCells();
- const scalarField& phiCorrPf = phiCorrBf[patchi];
-
- forAll(lambdaPf, pFacei)
- {
- // Limit outlet faces only
- if (phiCorrPf[pFacei] > SMALL*SMALL)
- {
- label pfCelli = pFaceCells[pFacei];
-
- if (phiCorrfPf[pFacei] > 0.0)
- {
- lambdaPf[pFacei] =
- min(lambdaPf[pFacei], lambdap[pfCelli]);
- }
- else
- {
- lambdaPf[pFacei] =
- min(lambdaPf[pFacei], lambdam[pfCelli]);
- }
- }
- }
- }
- }
-
- syncTools::syncFaceList(mesh, allLambda, minEqOp<scalar>());
- }
-}
-
-
-template<class RhoType, class SpType, class SuType>
-void Foam::MULES::limitCorr
-(
- const RhoType& rho,
- const volScalarField& psi,
- surfaceScalarField& phiCorr,
- const SpType& Sp,
- const SuType& Su,
- const scalar psiMax,
- const scalar psiMin,
- const label nLimiterIter
-)
-{
- const fvMesh& mesh = psi.mesh();
-
- scalarField allLambda(mesh.nFaces(), 1.0);
-
- slicedSurfaceScalarField lambda
- (
- IOobject
- (
- "lambda",
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh,
- dimless,
- allLambda,
- false // Use slices for the couples
- );
-
- limiterCorr
- (
- allLambda,
- rho,
- psi,
- phiCorr,
- Sp,
- Su,
- psiMax,
- psiMin,
- nLimiterIter
- );
-
- phiCorr *= lambda;
-}
-
-
template<class SurfaceScalarFieldList>
void Foam::MULES::limitSum(SurfaceScalarFieldList& phiPsiCorrs)
{
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 22e24d2b1b262dc3171ba6bc72e29a0efb71cdb3..2c6add9fc910e5d6b1e6f0edbf9304a49538ba50 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -1262,6 +1262,9 @@ void Foam::autoLayerDriver::calculateLayerThickness
<< setf(ios_base::left) << setw(maxPatchNameLen) << "-----"
<< setw(0) << " ----- ------ --------- -------" << endl;
+
+ const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
+
forAll(patchIDs, i)
{
label patchI = patchIDs[i];
@@ -1270,23 +1273,29 @@ void Foam::autoLayerDriver::calculateLayerThickness
scalar sumThickness = 0;
scalar sumNearWallThickness = 0;
+ label nMasterPoints = 0;
forAll(meshPoints, patchPointI)
{
- label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+ label meshPointI = meshPoints[patchPointI];
+ if (isMasterPoint[meshPointI])
+ {
+ label ppPointI = pp.meshPointMap()[meshPointI];
- sumThickness += thickness[ppPointI];
- sumNearWallThickness += layerParams.firstLayerThickness
- (
- patchNLayers[ppPointI],
- firstLayerThickness[ppPointI],
- finalLayerThickness[ppPointI],
- thickness[ppPointI],
- expansionRatio[ppPointI]
- );
+ sumThickness += thickness[ppPointI];
+ sumNearWallThickness += layerParams.firstLayerThickness
+ (
+ patchNLayers[ppPointI],
+ firstLayerThickness[ppPointI],
+ finalLayerThickness[ppPointI],
+ thickness[ppPointI],
+ expansionRatio[ppPointI]
+ );
+ nMasterPoints++;
+ }
}
- label totNPoints = returnReduce(meshPoints.size(), sumOp<label>());
+ label totNPoints = returnReduce(nMasterPoints, sumOp<label>());
// For empty patches, totNPoints is 0.
scalar avgThickness = 0;
@@ -1319,7 +1328,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
// Synchronize displacement among coupled patches.
void Foam::autoLayerDriver::syncPatchDisplacement
(
- const motionSmoother& meshMover,
+ const indirectPrimitivePatch& pp,
const scalarField& minThickness,
pointField& patchDisp,
labelList& patchNLayers,
@@ -1327,7 +1336,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
) const
{
const fvMesh& mesh = meshRefiner_.mesh();
- const labelList& meshPoints = meshMover.patch().meshPoints();
+ const labelList& meshPoints = pp.meshPoints();
label nChangedTotal = 0;
@@ -1437,9 +1446,9 @@ void Foam::autoLayerDriver::syncPatchDisplacement
}
}
- Info<< "Prevented extrusion on "
- << returnReduce(nChangedTotal, sumOp<label>())
- << " coupled patch points during syncPatchDisplacement." << endl;
+ //Info<< "Prevented extrusion on "
+ // << returnReduce(nChangedTotal, sumOp<label>())
+ // << " coupled patch points during syncPatchDisplacement." << endl;
}
@@ -1569,7 +1578,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
// Make sure displacement is equal on both sides of coupled patches.
syncPatchDisplacement
(
- meshMover,
+ pp,
minThickness,
patchDisp,
patchNLayers,
@@ -1767,7 +1776,7 @@ Foam::label Foam::autoLayerDriver::truncateDisplacement
{
syncPatchDisplacement
(
- meshMover,
+ pp,
minThickness,
patchDisp,
patchNLayers,
@@ -2450,8 +2459,9 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
const dictionary& motionDict
)
{
- // Clip to 30 degrees
- scalar planarAngle = min(30.0, layerParams.featureAngle());
+ // Clip to 30 degrees. Not helpful!
+ //scalar planarAngle = min(30.0, layerParams.featureAngle());
+ scalar planarAngle = layerParams.featureAngle();
scalar minCos = Foam::cos(degToRad(planarAngle));
scalar concaveCos = Foam::cos(degToRad(layerParams.concaveAngle()));
@@ -2856,7 +2866,7 @@ void Foam::autoLayerDriver::addLayers
// Make sure displacement is equal on both sides of coupled patches.
syncPatchDisplacement
(
- meshMover,
+ pp,
minThickness,
patchDisp,
patchNLayers,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index ee3ced9b219d72eb920424e3a74f73357b7c8e84..df7ea815a0d291c1adaf20cdfed787e6d63ff18f 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -257,7 +257,7 @@ class autoLayerDriver
//- Synchronize displacement among coupled patches.
void syncPatchDisplacement
(
- const motionSmoother& meshMover,
+ const indirectPrimitivePatch& pp,
const scalarField& minThickness,
pointField& patchDisp,
labelList& patchNLayers,
@@ -403,6 +403,7 @@ class autoLayerDriver
void smoothField
(
const motionSmoother& meshMover,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const scalarField& fieldMin,
@@ -414,6 +415,7 @@ class autoLayerDriver
void smoothPatchNormals
(
const motionSmoother& meshMover,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const label nSmoothDisp,
@@ -424,6 +426,7 @@ class autoLayerDriver
void smoothNormals
(
const label nSmoothDisp,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& fixedPoints,
pointVectorField& normals
@@ -440,8 +443,11 @@ class autoLayerDriver
// large feature angle
void handleFeatureAngleLayerTerminations
(
- const indirectPrimitivePatch& pp,
const scalar minCos,
+ const PackedBoolList& isMasterPoint,
+ const indirectPrimitivePatch& pp,
+ const labelList& meshEdges,
+
List<extrudeMode>& extrudeStatus,
pointField& patchDisp,
labelList& patchNLayers,
@@ -453,10 +459,13 @@ class autoLayerDriver
// in the layer mesh and stop any layer growth at these points.
void findIsolatedRegions
(
- const indirectPrimitivePatch& pp,
+ const scalar minCosLayerTermination,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
+ const indirectPrimitivePatch& pp,
const labelList& meshEdges,
- const scalar minCosLayerTermination,
+ const scalarField& minThickness,
+
List<extrudeMode>& extrudeStatus,
pointField& patchDisp,
labelList& patchNLayers
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 07210a87f04fc6cd437f49dbcb278fa77dbc576e..3e824b1e0287624034d6af5e6e993783a6164e2b 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -103,6 +103,7 @@ void Foam::autoLayerDriver::sumWeights
void Foam::autoLayerDriver::smoothField
(
const motionSmoother& meshMover,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const scalarField& fieldMin,
@@ -136,7 +137,7 @@ void Foam::autoLayerDriver::smoothField
isMasterEdge,
meshEdges,
meshPoints,
- pp.edges(),
+ edges,
invSumWeight,
field,
average
@@ -162,10 +163,14 @@ void Foam::autoLayerDriver::smoothField
// Do residual calculation every so often.
if ((iter % 10) == 0)
{
- Info<< " Iteration " << iter << " residual "
- << gSum(mag(field-average))
- /returnReduce(average.size(), sumOp<label>())
- << endl;
+ scalar resid = meshRefinement::gAverage
+ (
+ meshMover.mesh(),
+ isMasterPoint,
+ meshPoints,
+ mag(field-average)()
+ );
+ Info<< " Iteration " << iter << " residual " << resid << endl;
}
}
}
@@ -265,6 +270,7 @@ void Foam::autoLayerDriver::smoothField
void Foam::autoLayerDriver::smoothPatchNormals
(
const motionSmoother& meshMover,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const label nSmoothDisp,
@@ -299,7 +305,7 @@ void Foam::autoLayerDriver::smoothPatchNormals
isMasterEdge,
meshEdges,
meshPoints,
- pp.edges(),
+ edges,
invSumWeight,
normals,
average
@@ -308,10 +314,14 @@ void Foam::autoLayerDriver::smoothPatchNormals
// Do residual calculation every so often.
if ((iter % 10) == 0)
{
- Info<< " Iteration " << iter << " residual "
- << gSum(mag(normals-average))
- /returnReduce(average.size(), sumOp<label>())
- << endl;
+ scalar resid = meshRefinement::gAverage
+ (
+ meshMover.mesh(),
+ isMasterPoint,
+ meshPoints,
+ mag(normals-average)()
+ );
+ Info<< " Iteration " << iter << " residual " << resid << endl;
}
// Transfer to normals vector field
@@ -330,6 +340,7 @@ void Foam::autoLayerDriver::smoothPatchNormals
void Foam::autoLayerDriver::smoothNormals
(
const label nSmoothDisp,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
const labelList& fixedPoints,
pointVectorField& normals
@@ -372,8 +383,6 @@ void Foam::autoLayerDriver::smoothNormals
invSumWeight
);
- Info<< "shrinkMeshDistance : Smoothing normals in interior ..." << endl;
-
for (label iter = 0; iter < nSmoothDisp; iter++)
{
vectorField average(mesh.nPoints());
@@ -392,10 +401,13 @@ void Foam::autoLayerDriver::smoothNormals
// Do residual calculation every so often.
if ((iter % 10) == 0)
{
- Info<< " Iteration " << iter << " residual "
- << gSum(mag(normals-average))
- /returnReduce(average.size(), sumOp<label>())
- << endl;
+ scalar resid = meshRefinement::gAverage
+ (
+ mesh,
+ isMasterPoint,
+ mag(normals-average)()
+ );
+ Info<< " Iteration " << iter << " residual " << resid << endl;
}
@@ -479,14 +491,18 @@ bool Foam::autoLayerDriver::isMaxEdge
// large feature angle
void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
(
- const indirectPrimitivePatch& pp,
const scalar minCos,
+ const PackedBoolList& isMasterPoint,
+ const indirectPrimitivePatch& pp,
+ const labelList& meshEdges,
List<extrudeMode>& extrudeStatus,
pointField& patchDisp,
labelList& patchNLayers,
label& nPointCounter
) const
{
+ const fvMesh& mesh = meshRefiner_.mesh();
+
// Mark faces that have all points extruded
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -507,15 +523,60 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
}
+
+ //label nOldPointCounter = nPointCounter;
+
// Detect situation where two featureedge-neighbouring faces are partly or
// not extruded and the edge itself is extruded. In this case unmark the
// edge for extrusion.
- forAll(pp.edgeFaces(), edgeI)
+
+ List<List<point> > edgeFaceNormals(pp.nEdges());
+ List<List<bool> > edgeFaceExtrude(pp.nEdges());
+
+ const labelListList& edgeFaces = pp.edgeFaces();
+ const vectorField& faceNormals = pp.faceNormals();
+ const labelList& meshPoints = pp.meshPoints();
+
+ forAll(edgeFaces, edgeI)
{
- const labelList& eFaces = pp.edgeFaces()[edgeI];
+ const labelList& eFaces = edgeFaces[edgeI];
- if (eFaces.size() == 2)
+ edgeFaceNormals[edgeI].setSize(eFaces.size());
+ edgeFaceExtrude[edgeI].setSize(eFaces.size());
+ forAll(eFaces, i)
+ {
+ label faceI = eFaces[i];
+ edgeFaceNormals[edgeI][i] = faceNormals[faceI];
+ edgeFaceExtrude[edgeI][i] = extrudedFaces[faceI];
+ }
+ }
+
+ syncTools::syncEdgeList
+ (
+ mesh,
+ meshEdges,
+ edgeFaceNormals,
+ globalMeshData::ListPlusEqOp<List<point> >(), // combine operator
+ List<point>() // null value
+ );
+
+ syncTools::syncEdgeList
+ (
+ mesh,
+ meshEdges,
+ edgeFaceExtrude,
+ globalMeshData::ListPlusEqOp<List<bool> >(), // combine operator
+ List<bool>() // null value
+ );
+
+
+ forAll(edgeFaceNormals, edgeI)
+ {
+ const List<point>& eFaceNormals = edgeFaceNormals[edgeI];
+ const List<bool>& eFaceExtrude = edgeFaceExtrude[edgeI];
+
+ if (eFaceNormals.size() == 2)
{
const edge& e = pp.edges()[edgeI];
label v0 = e[0];
@@ -527,10 +588,10 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
|| extrudeStatus[v1] != NOEXTRUDE
)
{
- if (!extrudedFaces[eFaces[0]] || !extrudedFaces[eFaces[1]])
+ if (!eFaceExtrude[0] || !eFaceExtrude[1])
{
- const vector& n0 = pp.faceNormals()[eFaces[0]];
- const vector& n1 = pp.faceNormals()[eFaces[1]];
+ const vector& n0 = eFaceNormals[0];
+ const vector& n1 = eFaceNormals[1];
if ((n0 & n1) < minCos)
{
@@ -545,7 +606,10 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
)
)
{
- nPointCounter++;
+ if (isMasterPoint[meshPoints[v0]])
+ {
+ nPointCounter++;
+ }
}
if
(
@@ -558,13 +622,20 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
)
)
{
- nPointCounter++;
+ if (isMasterPoint[meshPoints[v1]])
+ {
+ nPointCounter++;
+ }
}
}
}
}
}
}
+
+ //Info<< "Added "
+ // << returnReduce(nPointCounter-nOldPointCounter, sumOp<label>())
+ // << " point not to extrude." << endl;
}
@@ -572,10 +643,12 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
// in the layer mesh and stop any layer growth at these points.
void Foam::autoLayerDriver::findIsolatedRegions
(
- const indirectPrimitivePatch& pp,
+ const scalar minCosLayerTermination,
+ const PackedBoolList& isMasterPoint,
const PackedBoolList& isMasterEdge,
+ const indirectPrimitivePatch& pp,
const labelList& meshEdges,
- const scalar minCosLayerTermination,
+ const scalarField& minThickness,
List<extrudeMode>& extrudeStatus,
pointField& patchDisp,
labelList& patchNLayers
@@ -594,8 +667,10 @@ void Foam::autoLayerDriver::findIsolatedRegions
// large feature angle
handleFeatureAngleLayerTerminations
(
- pp,
minCosLayerTermination,
+ isMasterPoint,
+ pp,
+ meshEdges,
extrudeStatus,
patchDisp,
@@ -603,6 +678,15 @@ void Foam::autoLayerDriver::findIsolatedRegions
nPointCounter
);
+ syncPatchDisplacement
+ (
+ pp,
+ minThickness,
+ patchDisp,
+ patchNLayers,
+ extrudeStatus
+ );
+
// Do not extrude from point where all neighbouring
// faces are not grown
@@ -802,25 +886,18 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
// Predetermine mesh edges
// ~~~~~~~~~~~~~~~~~~~~~~~
- // Precalulate master edge (only relevant for shared edges)
- PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
+ // Precalulate master point/edge (only relevant for shared points/edges)
+ const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
+ const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
// Precalculate meshEdge per pp edge
- labelList meshEdges(pp.nEdges());
-
- forAll(meshEdges, patchEdgeI)
- {
- const edge& e = pp.edges()[patchEdgeI];
-
- label v0 = pp.meshPoints()[e[0]];
- label v1 = pp.meshPoints()[e[1]];
- meshEdges[patchEdgeI] = meshTools::findEdge
+ const labelList meshEdges
+ (
+ pp.meshEdges
(
mesh.edges(),
- mesh.pointEdges()[v0],
- v0,
- v1
- );
- }
+ mesh.pointEdges()
+ )
+ );
// Determine pointNormal
@@ -832,7 +909,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
{
pointField meshPointNormals(mesh.nPoints(), point(1, 0, 0));
- UIndirectList<point>(meshPointNormals, pp.meshPoints()) = pointNormals;
+ UIndirectList<point>(meshPointNormals, meshPoints) = pointNormals;
meshRefinement::testSyncPointList
(
"pointNormals",
@@ -845,6 +922,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
smoothPatchNormals
(
meshMover,
+ isMasterPoint,
isMasterEdge,
meshEdges,
nSmoothSurfaceNormals,
@@ -855,7 +933,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
{
pointField meshPointNormals(mesh.nPoints(), point(1, 0, 0));
- UIndirectList<point>(meshPointNormals, pp.meshPoints()) = pointNormals;
+ UIndirectList<point>(meshPointNormals, meshPoints) = pointNormals;
meshRefinement::testSyncPointList
(
"smoothed pointNormals",
@@ -929,18 +1007,18 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
{
pointField origin(pointWallDist.size());
scalarField distSqr(pointWallDist.size());
- scalarField passiveS(pointWallDist.size());
+ //NA scalarField passiveS(pointWallDist.size());
pointField passiveV(pointWallDist.size());
forAll(pointWallDist, pointI)
{
origin[pointI] = pointWallDist[pointI].origin();
distSqr[pointI] = pointWallDist[pointI].distSqr();
- passiveS[pointI] = pointWallDist[pointI].s();
+ //passiveS[pointI] = pointWallDist[pointI].s();
passiveV[pointI] = pointWallDist[pointI].v();
}
meshRefinement::testSyncPointList("origin", mesh, origin);
meshRefinement::testSyncPointList("distSqr", mesh, distSqr);
- meshRefinement::testSyncPointList("passiveS", mesh, passiveS);
+ //meshRefinement::testSyncPointList("passiveS", mesh, passiveS);
meshRefinement::testSyncPointList("passiveV", mesh, passiveV);
}
@@ -1186,7 +1264,14 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
}
// Smooth normal vectors. Do not change normals on pp.meshPoints
- smoothNormals(nSmoothNormals, isMasterEdge, meshPoints, dispVec);
+ smoothNormals
+ (
+ nSmoothNormals,
+ isMasterPoint,
+ isMasterEdge,
+ meshPoints,
+ dispVec
+ );
if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
{
@@ -1288,25 +1373,18 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
const indirectPrimitivePatch& pp = meshMover.patch();
const labelList& meshPoints = pp.meshPoints();
- // Precalulate master edge (only relevant for shared edges)
- PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
+ // Precalulate master points/edge (only relevant for shared points/edges)
+ const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
+ const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
// Precalculate meshEdge per pp edge
- labelList meshEdges(pp.nEdges());
-
- forAll(meshEdges, patchEdgeI)
- {
- const edge& e = pp.edges()[patchEdgeI];
-
- label v0 = pp.meshPoints()[e[0]];
- label v1 = pp.meshPoints()[e[1]];
- meshEdges[patchEdgeI] = meshTools::findEdge
+ const labelList meshEdges
+ (
+ pp.meshEdges
(
mesh.edges(),
- mesh.pointEdges()[v0],
- v0,
- v1
- );
- }
+ mesh.pointEdges()
+ )
+ );
scalarField thickness(layerThickness.size());
@@ -1405,7 +1483,10 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
patchDisp[patchPointI] = thickness[patchPointI]*n;
- numThicknessRatioExclude++;
+ if (isMasterPoint[pointI])
+ {
+ numThicknessRatioExclude++;
+ }
if (str.valid())
{
@@ -1433,14 +1514,17 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
<< numThicknessRatioExclude
<< " nodes where thickness to medial axis distance is large " << endl;
+
// find points where layer growth isolated to a lone point, edge or face
findIsolatedRegions
(
- pp,
+ minCosLayerTermination,
+ isMasterPoint,
isMasterEdge,
+ pp,
meshEdges,
- minCosLayerTermination,
+ minThickness,
extrudeStatus,
patchDisp,
@@ -1461,6 +1545,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
smoothField
(
meshMover,
+ isMasterPoint,
isMasterEdge,
meshEdges,
minThickness,
@@ -1608,9 +1693,13 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
// Do residual calculation every so often.
if ((iter % 10) == 0)
{
- Info<< " Iteration " << iter << " residual "
- << gSum(mag(displacement-average))
- /returnReduce(average.size(), sumOp<label>())
+ scalar resid = meshRefinement::gAverage
+ (
+ mesh,
+ syncTools::getMasterPoints(mesh),
+ mag(displacement-average)()
+ );
+ Info<< " Iteration " << iter << " residual " << resid
<< endl;
}
}
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 07ff697df6a010fed0e6e41bcd3eeccf3f81f971..adb7c3859032a928765510d046141f802df54794 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -910,6 +910,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
Info<< "Detecting near surfaces ..." << endl;
const pointField& localPoints = pp.localPoints();
+ const labelList& meshPoints = pp.meshPoints();
const refinementSurfaces& surfaces = meshRefiner_.surfaces();
const fvMesh& mesh = meshRefiner_.mesh();
@@ -1220,6 +1221,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
}
+ const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
label nOverride = 0;
// 1. All points to non-interface surfaces
@@ -1332,7 +1334,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
}
}
- if (override)
+ if (override && isMasterPoint[meshPoints[pointI]])
{
nOverride++;
}
@@ -1399,8 +1401,6 @@ void Foam::autoSnapDriver::detectNearSurfaces
);
- label nOverride = 0;
-
forAll(hit1, i)
{
label pointI = zonePointIndices[i];
@@ -1472,7 +1472,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
}
}
- if (override)
+ if (override && isMasterPoint[meshPoints[pointI]])
{
nOverride++;
}
@@ -1690,7 +1690,13 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
scalarField magDisp(mag(patchDisp));
Info<< "Wanted displacement : average:"
- << gSum(magDisp)/returnReduce(patchDisp.size(), sumOp<label>())
+ << meshRefinement::gAverage
+ (
+ mesh,
+ syncTools::getMasterPoints(mesh),
+ pp.meshPoints(),
+ magDisp
+ )
<< " min:" << gMin(magDisp)
<< " max:" << gMax(magDisp) << endl;
}
@@ -2548,25 +2554,30 @@ void Foam::autoSnapDriver::doSnap
adaptPatchIDs
)
);
- indirectPrimitivePatch& pp = ppPtr();
+
// Distance to attract to nearest feature on surface
- const scalarField snapDist(calcSnapDistance(mesh, snapParams, pp));
+ const scalarField snapDist(calcSnapDistance(mesh, snapParams, ppPtr()));
// Construct iterative mesh mover.
Info<< "Constructing mesh displacer ..." << endl;
Info<< "Using mesh parameters " << motionDict << nl << endl;
- const pointMesh& pMesh = pointMesh::New(mesh);
-
- motionSmoother meshMover
+ autoPtr<motionSmoother> meshMoverPtr
(
- mesh,
- pp,
- adaptPatchIDs,
- meshRefinement::makeDisplacementField(pMesh, adaptPatchIDs),
- motionDict
+ new motionSmoother
+ (
+ mesh,
+ ppPtr(),
+ adaptPatchIDs,
+ meshRefinement::makeDisplacementField
+ (
+ pointMesh::New(mesh),
+ adaptPatchIDs
+ ),
+ motionDict
+ )
);
@@ -2595,16 +2606,95 @@ void Foam::autoSnapDriver::doSnap
snapParams,
nInitErrors,
baffles,
- meshMover
+ meshMoverPtr()
);
+
+ //- Only if in feature attraction mode:
+ // Nearest feature
+ vectorField patchAttraction;
+ // Constraints at feature
+ List<pointConstraint> patchConstraints;
+
+
for (label iter = 0; iter < nFeatIter; iter++)
{
Info<< nl
<< "Morph iteration " << iter << nl
<< "-----------------" << endl;
+
+ //if (iter > 0 && iter == nFeatIter/2)
+ //{
+ // Info<< "Splitting diagonal attractions" << endl;
+ // const labelList& bFaces = ppPtr().addressing();
+ //
+ // DynamicList<label> splitFaces(bFaces.size());
+ // DynamicList<labelPair> splits(bFaces.size());
+ //
+ // forAll(bFaces, faceI)
+ // {
+ // const labelPair split
+ // (
+ // findDiagonalAttraction
+ // (
+ // ppPtr(),
+ // patchAttraction,
+ // patchConstraints,
+ // faceI
+ // )
+ // );
+ //
+ // if (split != labelPair(-1, -1))
+ // {
+ // splitFaces.append(bFaces[faceI]);
+ // splits.append(split);
+ // }
+ // }
+ //
+ // autoPtr<mapPolyMesh> mapPtr = meshRefiner_.splitFaces
+ // (
+ // splitFaces,
+ // splits
+ // );
+ //
+ // const labelList& faceMap = mapPtr().faceMap();
+ // meshRefinement::updateList(faceMap, -1, duplicateFace);
+ // const labelList& reverseFaceMap = mapPtr().reverseFaceMap();
+ // forAll(baffles, i)
+ // {
+ // labelPair& baffle = baffles[i];
+ // baffle.first() = reverseFaceMap[baffle.first()];
+ // baffle.second() = reverseFaceMap[baffle.second()];
+ // }
+ //
+ // meshMoverPtr.clear();
+ // ppPtr.clear();
+ //
+ // ppPtr = meshRefinement::makePatch(mesh, adaptPatchIDs);
+ // meshMoverPtr.reset
+ // (
+ // new motionSmoother
+ // (
+ // mesh,
+ // ppPtr(),
+ // adaptPatchIDs,
+ // meshRefinement::makeDisplacementField
+ // (
+ // pointMesh::New(mesh),
+ // adaptPatchIDs
+ // ),
+ // motionDict
+ // )
+ // );
+ //}
+
+
+ indirectPrimitivePatch& pp = ppPtr();
+ motionSmoother& meshMover = meshMoverPtr();
+
+
// Calculate displacement at every patch point. Insert into
// meshMover.
// Calculate displacement at every patch point
@@ -2652,7 +2742,9 @@ void Foam::autoSnapDriver::doSnap
scalar(iter+1)/nFeatIter,
snapDist,
disp,
- meshMover
+ meshMover,
+ patchAttraction,
+ patchConstraints
);
}
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index 77327c0689b0728b34f4201c0a09af4a9d874650..b8282bedfcd8e5f0399be522e5eccbfe2b1bf827 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -125,7 +125,9 @@ class autoSnapDriver
void smoothAndConstrain
(
+ const PackedBoolList& isMasterEdge,
const indirectPrimitivePatch& pp,
+ const labelList& meshEdges,
const List<pointConstraint>& constraints,
vectorField& disp
) const;
@@ -196,6 +198,16 @@ class autoSnapDriver
List<pointConstraint>& patchConstraints
) const;
+ //- Detect any diagonal attraction. Returns indices in face
+ // or (-1, -1) if none
+ labelPair findDiagonalAttraction
+ (
+ const indirectPrimitivePatch& pp,
+ const vectorField& patchAttraction,
+ const List<pointConstraint>& patchConstraints,
+ const label faceI
+ ) const;
+
//- Return hit if on multiple points
pointIndexHit findMultiPatchPoint
(
@@ -371,7 +383,9 @@ class autoSnapDriver
const scalar featureAttract,
const scalarField& snapDist,
const vectorField& nearestDisp,
- motionSmoother& meshMover
+ motionSmoother& meshMover,
+ vectorField& patchAttraction,
+ List<pointConstraint>& patchConstraints
) const;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 887674ea7aebe982742e249b2681c1791d8b9b50..32133ad5f8437c3e754777792bf6385a1260c951 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -38,50 +38,18 @@ License
#include "treeDataPoint.H"
#include "indexedOctree.H"
#include "snapParameters.H"
+#include "PatchTools.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
- class listTransform
- {
- public:
-
- void operator()
- (
- const vectorTensorTransform& vt,
- const bool forward,
- List<List<point> >& fld
- ) const
- {
- const tensor T
- (
- forward
- ? vt.R()
- : vt.R().T()
- );
-
- forAll(fld, i)
- {
- List<point>& elems = fld[i];
- forAll(elems, elemI)
- {
- elems[elemI] = transform(T, elems[elemI]);
- }
- }
- }
- };
-
template<class T>
class listPlusEqOp
{
public:
- void operator()
- (
- List<T>& x,
- const List<T>& y
- ) const
+ void operator()(List<T>& x, const List<T>& y) const
{
label sz = x.size();
x.setSize(sz+y.size());
@@ -159,7 +127,9 @@ bool Foam::autoSnapDriver::isFeaturePoint
void Foam::autoSnapDriver::smoothAndConstrain
(
+ const PackedBoolList& isMasterEdge,
const indirectPrimitivePatch& pp,
+ const labelList& meshEdges,
const List<pointConstraint>& constraints,
vectorField& disp
) const
@@ -197,11 +167,16 @@ void Foam::autoSnapDriver::smoothAndConstrain
{
forAll(pEdges, i)
{
- label nbrPointI = edges[pEdges[i]].otherVertex(pointI);
- if (constraints[nbrPointI].first() >= nConstraints)
+ label edgeI = pEdges[i];
+
+ if (isMasterEdge[meshEdges[edgeI]])
{
- dispSum[pointI] += disp[nbrPointI];
- dispCount[pointI]++;
+ label nbrPointI = edges[pEdges[i]].otherVertex(pointI);
+ if (constraints[nbrPointI].first() >= nConstraints)
+ {
+ dispSum[pointI] += disp[nbrPointI];
+ dispCount[pointI]++;
+ }
}
}
}
@@ -564,6 +539,9 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
{
const fvMesh& mesh = meshRefiner_.mesh();
+ const PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh));
+
+
// For now just get all surrounding face data. Expensive - should just
// store and sync data on coupled points only
// (see e.g PatchToolsNormals.C)
@@ -583,7 +561,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
forAll(pFaces, i)
{
label faceI = pFaces[i];
- if (faceSurfaceGlobalRegion[faceI] != -1)
+ if (isMasterFace[faceI] && faceSurfaceGlobalRegion[faceI] != -1)
{
nFaces++;
}
@@ -605,7 +583,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
label faceI = pFaces[i];
label globalRegionI = faceSurfaceGlobalRegion[faceI];
- if (globalRegionI != -1)
+ if (isMasterFace[faceI] && globalRegionI != -1)
{
pNormals[nFaces] = faceSurfaceNormal[faceI];
pDisp[nFaces] = faceDisp[faceI];
@@ -694,7 +672,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
pointFaceSurfNormals,
listPlusEqOp<point>(),
List<point>(),
- listTransform()
+ mapDistribute::transform()
);
syncTools::syncPointList
(
@@ -703,7 +681,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
pointFaceDisp,
listPlusEqOp<point>(),
List<point>(),
- listTransform()
+ mapDistribute::transform()
);
syncTools::syncPointList
(
@@ -712,7 +690,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
pointFaceCentres,
listPlusEqOp<point>(),
List<point>(),
- listTransform()
+ mapDistribute::transformPosition()
);
syncTools::syncPointList
(
@@ -722,6 +700,25 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
listPlusEqOp<label>(),
List<label>()
);
+
+
+ // Sort the data according to the face centres. This is only so we get
+ // consistent behaviour serial and parallel.
+ labelList visitOrder;
+ forAll(pointFaceDisp, pointI)
+ {
+ List<point>& pNormals = pointFaceSurfNormals[pointI];
+ List<point>& pDisp = pointFaceDisp[pointI];
+ List<point>& pFc = pointFaceCentres[pointI];
+ labelList& pFid = pointFacePatchID[pointI];
+
+ sortedOrder(mag(pFc)(), visitOrder);
+
+ pNormals = List<point>(pNormals, visitOrder);
+ pDisp = List<point>(pDisp, visitOrder);
+ pFc = List<point>(pFc, visitOrder);
+ pFid = UIndirectList<label>(pFid, visitOrder);
+ }
}
@@ -1360,6 +1357,70 @@ void Foam::autoSnapDriver::stringFeatureEdges
}
+// If only two attractions and across face return the face indices
+Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
+(
+ const indirectPrimitivePatch& pp,
+ const vectorField& patchAttraction,
+ const List<pointConstraint>& patchConstraints,
+ const label faceI
+) const
+{
+ const face& f = pp.localFaces()[faceI];
+ // For now just detect any attraction. Improve this to look at
+ // actual attraction position and orientation
+
+ labelPair attractIndices(-1, -1);
+
+ if (f.size() >= 4)
+ {
+ forAll(f, fp)
+ {
+ label pointI = f[fp];
+ if (patchConstraints[pointI].first() >= 2)
+ {
+ // Attract to feature edge or point
+ if (attractIndices[0] == -1)
+ {
+ // First attraction. Store
+ attractIndices[0] = fp;
+ }
+ else if (attractIndices[1] == -1)
+ {
+ // Second attraction. Check if not consecutive to first
+ // attraction
+ label fp0 = attractIndices[0];
+ if (f.fcIndex(fp0) == fp || f.fcIndex(fp) == fp0)
+ {
+ // Consecutive. Skip.
+ attractIndices = labelPair(-1, -1);
+ break;
+ }
+ else
+ {
+ attractIndices[1] = fp;
+ }
+ }
+ else
+ {
+ // More than two attractions. Skip.
+ attractIndices = labelPair(-1, -1);
+ break;
+ }
+ }
+ }
+
+
+ if (attractIndices[1] == -1)
+ {
+ // Found only one attraction. Skip.
+ attractIndices = labelPair(-1, -1);
+ }
+ }
+ return attractIndices;
+}
+
+
Foam::pointIndexHit Foam::autoSnapDriver::findNearFeatureEdge
(
const indirectPrimitivePatch& pp,
@@ -1929,7 +1990,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
edgeFaceNormals,
listPlusEqOp<point>(),
List<point>(),
- listTransform()
+ mapDistribute::transform()
);
}
@@ -2778,7 +2839,9 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
const scalar featureAttract,
const scalarField& snapDist,
const vectorField& nearestDisp,
- motionSmoother& meshMover
+ motionSmoother& meshMover,
+ vectorField& patchAttraction,
+ List<pointConstraint>& patchConstraints
) const
{
const Switch implicitFeatureAttraction = snapParams.implicitFeatureSnap();
@@ -2851,7 +2914,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// - faceSurfaceNormal
// - faceDisp
- // - faceCentres&faceNormal
+ // - faceCentres
List<List<point> > pointFaceSurfNormals(pp.nPoints());
List<List<point> > pointFaceDisp(pp.nPoints());
List<List<point> > pointFaceCentres(pp.nPoints());
@@ -2884,10 +2947,11 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
// here.
// Nearest feature
- vectorField patchAttraction(localPoints.size(), vector::zero);
+ patchAttraction.setSize(localPoints.size());
+ patchAttraction = vector::zero;
// Constraints at feature
- List<pointConstraint> patchConstraints(localPoints.size());
-
+ patchConstraints.setSize(localPoints.size());
+ patchConstraints = pointConstraint();
if (implicitFeatureAttraction)
{
@@ -2951,15 +3015,29 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
patchConstraints
);
+ const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
+ {
+ vector avgPatchDisp = meshRefinement::gAverage
+ (
+ mesh,
+ isMasterPoint,
+ pp.meshPoints(),
+ patchDisp
+ );
+ vector avgPatchAttr = meshRefinement::gAverage
+ (
+ mesh,
+ isMasterPoint,
+ pp.meshPoints(),
+ patchAttraction
+ );
- Info<< "Attraction:" << endl
- << " linear : max:" << gMax(patchDisp)
- << " avg:" << gAverage(patchDisp)
- << endl
- << " feature : max:" << gMax(patchAttraction)
- << " avg:" << gAverage(patchAttraction)
- << endl;
-
+ Info<< "Attraction:" << endl
+ << " linear : max:" << gMaxMagSqr(patchDisp)
+ << " avg:" << avgPatchDisp << endl
+ << " feature : max:" << gMaxMagSqr(patchAttraction)
+ << " avg:" << avgPatchAttr << endl;
+ }
// So now we have:
// - patchDisp : point movement to go to nearest point on surface
@@ -2986,37 +3064,45 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
// Count
{
+ const labelList& meshPoints = pp.meshPoints();
+
+ label nMasterPoints = 0;
label nPlanar = 0;
label nEdge = 0;
label nPoint = 0;
forAll(patchConstraints, pointI)
{
- if (patchConstraints[pointI].first() == 1)
+ if (isMasterPoint[meshPoints[pointI]])
{
- nPlanar++;
- }
- else if (patchConstraints[pointI].first() == 2)
- {
- nEdge++;
- }
- else if (patchConstraints[pointI].first() == 3)
- {
- nPoint++;
+ nMasterPoints++;
+
+ if (patchConstraints[pointI].first() == 1)
+ {
+ nPlanar++;
+ }
+ else if (patchConstraints[pointI].first() == 2)
+ {
+ nEdge++;
+ }
+ else if (patchConstraints[pointI].first() == 3)
+ {
+ nPoint++;
+ }
}
}
- label nTotPoints = returnReduce(pp.nPoints(), sumOp<label>());
+ reduce(nMasterPoints, sumOp<label>());
reduce(nPlanar, sumOp<label>());
reduce(nEdge, sumOp<label>());
reduce(nPoint, sumOp<label>());
- Info<< "Feature analysis : total points:"
- << nTotPoints
+ Info<< "Feature analysis : total master points:"
+ << nMasterPoints
<< " attraction to :" << nl
<< " feature point : " << nPoint << nl
<< " feature edge : " << nEdge << nl
<< " nearest surface : " << nPlanar << nl
- << " rest : " << nTotPoints-nPoint-nEdge-nPlanar
+ << " rest : " << nMasterPoints-nPoint-nEdge-nPlanar
<< nl
<< endl;
}
@@ -3035,11 +3121,29 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
if (featureAttract < 1-0.001)
{
+ const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
+
+ const vectorField pointNormals
+ (
+ PatchTools::pointNormals
+ (
+ mesh,
+ pp
+ )
+ );
+ const labelList meshEdges
+ (
+ pp.meshEdges(mesh.edges(), mesh.pointEdges())
+ );
+
+
// 1. Smoothed all displacement
vectorField smoothedPatchDisp = patchDisp;
smoothAndConstrain
(
+ isMasterEdge,
pp,
+ meshEdges,
patchConstraints,
smoothedPatchDisp
);
@@ -3047,16 +3151,18 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
// 2. Smoothed tangential component
vectorField tangPatchDisp = patchDisp;
- tangPatchDisp -= (pp.pointNormals() & patchDisp) * pp.pointNormals();
+ tangPatchDisp -= (pointNormals & patchDisp) * pointNormals;
smoothAndConstrain
(
+ isMasterEdge,
pp,
+ meshEdges,
patchConstraints,
tangPatchDisp
);
// Re-add normal component
- tangPatchDisp += (pp.pointNormals() & patchDisp) * pp.pointNormals();
+ tangPatchDisp += (pointNormals & patchDisp) * pointNormals;
if (debug&meshRefinement::OBJINTERSECTIONS)
{
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index c37e9c6f833827502e393000d1595b8a050bde0a..873167bc4f0227cfb7302e7f79ef7382c6e3e8cb 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -259,23 +259,14 @@ private:
label& nRefine
) const;
- //- Mark cell if local curvature > curvature or
- // markDifferingRegions = true and intersections with different
- // regions.
- bool checkCurvature
+ //- Helper: count number of normals1 that are in normals2
+ label countMatches
(
- const scalar curvature,
- const label nAllowRefine,
- const label surfaceLevel,
- const vector& surfaceNormal,
- const label cellI,
- label& cellMaxLevel,
- vector& cellMaxNormal,
- labelList& refineCell,
- label& nRefine
+ const List<point>& normals1,
+ const List<point>& normals2,
+ const scalar tol = 1e-6
) const;
-
//- Mark cells for surface curvature based refinement. Marks if
// local curvature > curvature or if on different regions
// (markDifferingRegions)
@@ -989,6 +980,14 @@ public:
const UList<T>&
) const;
+ //- Print list according to (collected and) sorted coordinate
+ template<class T>
+ static void collectAndPrint
+ (
+ const UList<point>& points,
+ const UList<T>& data
+ );
+
//- Print some mesh stats.
void printMeshInfo(const bool, const string&) const;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 7444493e2982bfe088d20f804db3facc52b5c3b9..ce84ceec38eeb6c633986d83de12bb7a2a1fdb4d 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -38,7 +38,74 @@ License
#include "featureEdgeMesh.H"
#include "Cloud.H"
//#include "globalIndex.H"
-//#include "OBJstream.H"
+#include "OBJstream.H"
+#include "cellSet.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ //- To compare normals
+ static bool less(const vector& x, const vector& y)
+ {
+ for (direction i = 0; i < vector::nComponents; i++)
+ {
+ if (x[i] < y[i])
+ {
+ return true;
+ }
+ else if (x[i] > y[i])
+ {
+ return false;
+ }
+ }
+ // All components the same
+ return false;
+ }
+
+
+ //- To compare normals
+ class normalLess
+ {
+ const vectorList& values_;
+
+ public:
+
+ normalLess(const vectorList& values)
+ :
+ values_(values)
+ {}
+
+ bool operator()(const label a, const label b) const
+ {
+ return less(values_[a], values_[b]);
+ }
+ };
+
+
+ //- template specialization for pTraits<labelList> so we can have fields
+ template<>
+ class pTraits<labelList>
+ {
+
+ public:
+
+ //- Component type
+ typedef labelList cmptType;
+ };
+
+ //- template specialization for pTraits<labelList> so we can have fields
+ template<>
+ class pTraits<vectorList>
+ {
+
+ public:
+
+ //- Component type
+ typedef vectorList cmptType;
+ };
+}
+
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -954,64 +1021,33 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
}
-// Checks if multiple intersections of a cell (by a surface with a higher
-// max than the cell level) and if so if the normals at these intersections
-// make a large angle.
-// Returns false if the nRefine limit has been reached, true otherwise.
-bool Foam::meshRefinement::checkCurvature
+// Count number of matches of first argument in second argument
+Foam::label Foam::meshRefinement::countMatches
(
- const scalar curvature,
- const label nAllowRefine,
-
- const label surfaceLevel, // current intersection max level
- const vector& surfaceNormal,// current intersection normal
-
- const label cellI,
-
- label& cellMaxLevel, // cached max surface level for this cell
- vector& cellMaxNormal, // cached surface normal for this cell
-
- labelList& refineCell,
- label& nRefine
+ const List<point>& normals1,
+ const List<point>& normals2,
+ const scalar tol
) const
{
- const labelList& cellLevel = meshCutter_.cellLevel();
+ label nMatches = 0;
- // Test if surface applicable
- if (surfaceLevel > cellLevel[cellI])
+ forAll(normals1, i)
{
- if (cellMaxLevel == -1)
- {
- // First visit of cell. Store
- cellMaxLevel = surfaceLevel;
- cellMaxNormal = surfaceNormal;
- }
- else
+ const vector& n1 = normals1[i];
+
+ forAll(normals2, j)
{
- // Second or more visit. Check curvature.
- if ((cellMaxNormal & surfaceNormal) < curvature)
- {
- return markForRefine
- (
- surfaceLevel, // mark with any non-neg number.
- nAllowRefine,
- refineCell[cellI],
- nRefine
- );
- }
+ const vector& n2 = normals2[j];
- // Set normal to that of highest surface. Not really necessary
- // over here but we reuse cellMax info when doing coupled faces.
- if (surfaceLevel > cellMaxLevel)
+ if (magSqr(n1-n2) < tol)
{
- cellMaxLevel = surfaceLevel;
- cellMaxNormal = surfaceNormal;
+ nMatches++;
+ break;
}
}
}
- // Did not reach refinement limit.
- return true;
+ return nMatches;
}
@@ -1039,6 +1075,9 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
// on a different surface gets refined (if its current level etc.)
+ const PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
+
+
// Collect candidate faces (i.e. intersecting any surface and
// owner/neighbour not yet refined.
labelList testFaces(getRefineCandidateFaces(refineCell));
@@ -1068,6 +1107,12 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
start[i] = cellCentres[own];
end[i] = neiCc[bFaceI];
+
+ if (!isMasterFace[faceI])
+ {
+ Swap(start[i], end[i]);
+ }
+
minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
}
}
@@ -1081,10 +1126,9 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
// Test for all intersections (with surfaces of higher max level than
- // minLevel) and cache per cell the max surface level and the local normal
- // on that surface.
- labelList cellMaxLevel(mesh_.nCells(), -1);
- vectorField cellMaxNormal(mesh_.nCells(), vector::zero);
+ // minLevel) and cache per cell the interesting inter
+ labelListList cellSurfLevels(mesh_.nCells());
+ List<vectorList> cellSurfNormals(mesh_.nCells());
{
// Per segment the normals of the surfaces
@@ -1104,12 +1148,29 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
surfaceNormal,
surfaceLevel
);
+
+
+ // Sort the data according to surface location. This will guarantee
+ // that on coupled faces both sides visit the intersections in
+ // the same order so will decide the same
+ labelList visitOrder;
+ forAll(surfaceNormal, pointI)
+ {
+ vectorList& pNormals = surfaceNormal[pointI];
+ labelList& pLevel = surfaceLevel[pointI];
+
+ sortedOrder(pNormals, visitOrder, normalLess(pNormals));
+
+ pNormals = List<point>(pNormals, visitOrder);
+ pLevel = UIndirectList<label>(pLevel, visitOrder);
+ }
+
// Clear out unnecessary data
start.clear();
end.clear();
minLevel.clear();
- // Extract per cell information on the surface with the highest max
+ // Convert face-wise data to cell.
forAll(testFaces, i)
{
label faceI = testFaces[i];
@@ -1118,164 +1179,280 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
const vectorList& fNormals = surfaceNormal[i];
const labelList& fLevels = surfaceLevel[i];
- forAll(fLevels, hitI)
+ forAll(fNormals, hitI)
{
- checkCurvature
- (
- curvature,
- nAllowRefine,
-
- fLevels[hitI],
- fNormals[hitI],
-
- own,
- cellMaxLevel[own],
- cellMaxNormal[own],
+ if (fLevels[hitI] > cellLevel[own])
+ {
+ cellSurfLevels[own].append(fLevels[hitI]);
+ cellSurfNormals[own].append(fNormals[hitI]);
+ }
- refineCell,
- nRefine
- );
+ if (mesh_.isInternalFace(faceI))
+ {
+ label nei = mesh_.faceNeighbour()[faceI];
+ if (fLevels[hitI] > cellLevel[nei])
+ {
+ cellSurfLevels[nei].append(fLevels[hitI]);
+ cellSurfNormals[nei].append(fNormals[hitI]);
+ }
+ }
}
+ }
+ }
- if (mesh_.isInternalFace(faceI))
- {
- label nei = mesh_.faceNeighbour()[faceI];
-
- forAll(fLevels, hitI)
- {
- checkCurvature
- (
- curvature,
- nAllowRefine,
- fLevels[hitI],
- fNormals[hitI],
- nei,
- cellMaxLevel[nei],
- cellMaxNormal[nei],
-
- refineCell,
- nRefine
- );
- }
+ // Bit of statistics
+ {
+ label nSet = 0;
+ label nNormals = 9;
+ forAll(cellSurfNormals, cellI)
+ {
+ const vectorList& normals = cellSurfNormals[cellI];
+ if (normals.size())
+ {
+ nSet++;
+ nNormals += normals.size();
}
}
+ reduce(nSet, sumOp<label>());
+ reduce(nNormals, sumOp<label>());
+ Info<< "markSurfaceCurvatureRefinement :"
+ << " cells:" << mesh_.globalData().nTotalCells()
+ << " of which with normals:" << nSet
+ << " ; total normals stored:" << nNormals
+ << endl;
}
- // 2. Find out a measure of surface curvature and region edges.
- // Send over surface region and surface normal to neighbour cell.
- labelList neiBndMaxLevel(mesh_.nFaces()-mesh_.nInternalFaces());
- vectorField neiBndMaxNormal(mesh_.nFaces()-mesh_.nInternalFaces());
- for (label faceI = mesh_.nInternalFaces(); faceI < mesh_.nFaces(); faceI++)
- {
- label bFaceI = faceI-mesh_.nInternalFaces();
- label own = mesh_.faceOwner()[faceI];
+ bool reachedLimit = false;
- neiBndMaxLevel[bFaceI] = cellMaxLevel[own];
- neiBndMaxNormal[bFaceI] = cellMaxNormal[own];
- }
- syncTools::swapBoundaryFaceList(mesh_, neiBndMaxLevel);
- syncTools::swapBoundaryFaceList(mesh_, neiBndMaxNormal);
- // Loop over all faces. Could only be checkFaces.. except if they're coupled
+ // 1. Check normals per cell
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~
- // Internal faces
- for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+ for
+ (
+ label cellI = 0;
+ !reachedLimit && cellI < cellSurfNormals.size();
+ cellI++
+ )
{
- label own = mesh_.faceOwner()[faceI];
- label nei = mesh_.faceNeighbour()[faceI];
+ const vectorList& normals = cellSurfNormals[cellI];
+ const labelList& levels = cellSurfLevels[cellI];
- if (cellMaxLevel[own] != -1 && cellMaxLevel[nei] != -1)
+ // n^2 comparison of all normals in a cell
+ for (label i = 0; !reachedLimit && i < normals.size(); i++)
{
- // Have valid data on both sides. Check curvature.
- if ((cellMaxNormal[own] & cellMaxNormal[nei]) < curvature)
+ for (label j = i+1; !reachedLimit && j < normals.size(); j++)
{
- // See which side to refine
- if (cellLevel[own] < cellMaxLevel[own])
+ if ((normals[i] & normals[j]) < curvature)
{
- if
- (
- !markForRefine
+ label maxLevel = max(levels[i], levels[j]);
+
+ if (cellLevel[cellI] < maxLevel)
+ {
+ if
(
- cellMaxLevel[own],
- nAllowRefine,
- refineCell[own],
- nRefine
+ !markForRefine
+ (
+ maxLevel,
+ nAllowRefine,
+ refineCell[cellI],
+ nRefine
+ )
)
- )
- {
- if (debug)
{
- Pout<< "Stopped refining since reaching my cell"
- << " limit of " << mesh_.nCells()+7*nRefine
- << endl;
+ if (debug)
+ {
+ Pout<< "Stopped refining since reaching my cell"
+ << " limit of " << mesh_.nCells()+7*nRefine
+ << endl;
+ }
+ reachedLimit = true;
+ break;
}
- break;
}
}
+ }
+ }
+ }
- if (cellLevel[nei] < cellMaxLevel[nei])
+
+
+ // 2. Find out a measure of surface curvature
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // Look at normals between neighbouring surfaces
+ // Loop over all faces. Could only be checkFaces, except if they're coupled
+
+ // Internal faces
+ for
+ (
+ label faceI = 0;
+ !reachedLimit && faceI < mesh_.nInternalFaces();
+ faceI++
+ )
+ {
+ label own = mesh_.faceOwner()[faceI];
+ label nei = mesh_.faceNeighbour()[faceI];
+
+ const vectorList& ownNormals = cellSurfNormals[own];
+ const labelList& ownLevels = cellSurfLevels[own];
+ const vectorList& neiNormals = cellSurfNormals[nei];
+ const labelList& neiLevels = cellSurfLevels[nei];
+
+
+ // Special case: owner normals set is a subset of the neighbour
+ // normals. Do not do curvature refinement since other cell's normals
+ // do not add any information. Avoids weird corner extensions of
+ // refinement regions.
+ bool ownIsSubset =
+ countMatches(ownNormals, neiNormals)
+ == ownNormals.size();
+
+ bool neiIsSubset =
+ countMatches(neiNormals, ownNormals)
+ == neiNormals.size();
+
+
+ if (!ownIsSubset && !neiIsSubset)
+ {
+ // n^2 comparison of between ownNormals and neiNormals
+ for (label i = 0; !reachedLimit && i < ownNormals.size(); i++)
+ {
+ for (label j = 0; !reachedLimit && j < neiNormals.size(); j++)
{
- if
- (
- !markForRefine
- (
- cellMaxLevel[nei],
- nAllowRefine,
- refineCell[nei],
- nRefine
- )
- )
+ // Have valid data on both sides. Check curvature.
+ if ((ownNormals[i] & neiNormals[j]) < curvature)
{
- if (debug)
+ // See which side to refine.
+ if (cellLevel[own] < ownLevels[i])
{
- Pout<< "Stopped refining since reaching my cell"
- << " limit of " << mesh_.nCells()+7*nRefine
- << endl;
+ if
+ (
+ !markForRefine
+ (
+ ownLevels[i],
+ nAllowRefine,
+ refineCell[own],
+ nRefine
+ )
+ )
+ {
+ if (debug)
+ {
+ Pout<< "Stopped refining since reaching"
+ << " my cell limit of "
+ << mesh_.nCells()+7*nRefine << endl;
+ }
+ reachedLimit = true;
+ break;
+ }
+ }
+ if (cellLevel[nei] < neiLevels[j])
+ {
+ if
+ (
+ !markForRefine
+ (
+ neiLevels[j],
+ nAllowRefine,
+ refineCell[nei],
+ nRefine
+ )
+ )
+ {
+ if (debug)
+ {
+ Pout<< "Stopped refining since reaching"
+ << " my cell limit of "
+ << mesh_.nCells()+7*nRefine << endl;
+ }
+ reachedLimit = true;
+ break;
+ }
}
- break;
}
}
}
}
}
+
+
+ // Send over surface normal to neighbour cell.
+ List<vectorList> neiSurfaceNormals;
+ syncTools::swapBoundaryCellList(mesh_, cellSurfNormals, neiSurfaceNormals);
+
// Boundary faces
- for (label faceI = mesh_.nInternalFaces(); faceI < mesh_.nFaces(); faceI++)
+ for
+ (
+ label faceI = mesh_.nInternalFaces();
+ !reachedLimit && faceI < mesh_.nFaces();
+ faceI++
+ )
{
label own = mesh_.faceOwner()[faceI];
label bFaceI = faceI - mesh_.nInternalFaces();
- if (cellLevel[own] < cellMaxLevel[own] && neiBndMaxLevel[bFaceI] != -1)
+ const vectorList& ownNormals = cellSurfNormals[own];
+ const labelList& ownLevels = cellSurfLevels[own];
+ const vectorList& neiNormals = neiSurfaceNormals[bFaceI];
+
+ // Special case: owner normals set is a subset of the neighbour
+ // normals. Do not do curvature refinement since other cell's normals
+ // do not add any information. Avoids weird corner extensions of
+ // refinement regions.
+ bool ownIsSubset =
+ countMatches(ownNormals, neiNormals)
+ == ownNormals.size();
+
+ bool neiIsSubset =
+ countMatches(neiNormals, ownNormals)
+ == neiNormals.size();
+
+
+ if (!ownIsSubset && !neiIsSubset)
{
- // Have valid data on both sides. Check curvature.
- if ((cellMaxNormal[own] & neiBndMaxNormal[bFaceI]) < curvature)
+ // n^2 comparison of between ownNormals and neiNormals
+ for (label i = 0; !reachedLimit && i < ownNormals.size(); i++)
{
- if
- (
- !markForRefine
- (
- cellMaxLevel[own],
- nAllowRefine,
- refineCell[own],
- nRefine
- )
- )
+ for (label j = 0; !reachedLimit && j < neiNormals.size(); j++)
{
- if (debug)
+ // Have valid data on both sides. Check curvature.
+ if ((ownNormals[i] & neiNormals[j]) < curvature)
{
- Pout<< "Stopped refining since reaching my cell"
- << " limit of " << mesh_.nCells()+7*nRefine
- << endl;
+ if (cellLevel[own] < ownLevels[i])
+ {
+ if
+ (
+ !markForRefine
+ (
+ ownLevels[i],
+ nAllowRefine,
+ refineCell[own],
+ nRefine
+ )
+ )
+ {
+ if (debug)
+ {
+ Pout<< "Stopped refining since reaching"
+ << " my cell limit of "
+ << mesh_.nCells()+7*nRefine
+ << endl;
+ }
+ reachedLimit = true;
+ break;
+ }
+ }
}
- break;
}
}
}
}
+
if
(
returnReduce(nRefine, sumOp<label>())
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index 812f313abe402b2b8e080d7a2b6c985b0f8fe559..83e3389a5cdab446efd255076c14773dba2230dd 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -25,6 +25,7 @@ License
#include "meshRefinement.H"
#include "fvMesh.H"
+#include "globalIndex.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -112,11 +113,11 @@ T meshRefinement::gAverage
(
const polyMesh& mesh,
const PackedBoolList& isMasterElem,
- const labelList& meshPoints,
+ const labelList& meshElems,
const UList<T>& values
)
{
- if (values.size() != meshPoints.size())
+ if (values.size() != meshElems.size())
{
FatalErrorIn
(
@@ -128,8 +129,8 @@ T meshRefinement::gAverage
" const UList<T>& values\n"
")\n"
) << "Number of elements in list " << values.size()
- << " does not correspond to number of elements in meshPoints "
- << meshPoints.size()
+ << " does not correspond to number of elements in meshElems "
+ << meshElems.size()
<< exit(FatalError);
}
@@ -138,7 +139,7 @@ T meshRefinement::gAverage
forAll(values, i)
{
- if (isMasterElem[meshPoints[i]])
+ if (isMasterElem[meshElems[i]])
{
sum += values[i];
n++;
@@ -218,6 +219,53 @@ void meshRefinement::testSyncBoundaryFaceList
}
+// Print list sorted by coordinates. Used for comparing non-parallel v.s.
+// parallel operation
+template<class T>
+void meshRefinement::collectAndPrint
+(
+ const UList<point>& points,
+ const UList<T>& data
+)
+{
+ globalIndex globalPoints(points.size());
+
+ pointField allPoints;
+ globalPoints.gather
+ (
+ Pstream::worldComm,
+ identity(Pstream::nProcs()),
+ points,
+ allPoints,
+ UPstream::msgType(),
+ Pstream::blocking
+ );
+
+ List<T> allData;
+ globalPoints.gather
+ (
+ Pstream::worldComm,
+ identity(Pstream::nProcs()),
+ data,
+ allData,
+ UPstream::msgType(),
+ Pstream::blocking
+ );
+
+
+ scalarField magAllPoints(mag(allPoints-point(-0.317, 0.117, 0.501)));
+
+ labelList visitOrder;
+ sortedOrder(magAllPoints, visitOrder);
+ forAll(visitOrder, i)
+ {
+ label allPointI = visitOrder[i];
+ Info<< allPoints[allPointI] << " : " << allData[allPointI]
+ << endl;
+ }
+}
+
+
//template<class T, class Mesh>
template<class GeoField>
void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index bee6ada5a82a09939712052a3a318ea9fcc05f20..8d4180d6b7b7c200ca25ad9e5c8c42b042bb0410 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -720,7 +720,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
labelList pRegions;
vectorField pNormals;
- forAll(surfaces(), surfI)
+ forAll(surfaces_, surfI)
{
const searchableSurface& surface = allGeometry_[surfaces_[surfI]];
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
index bb09ecb0849605e4c971d25a596738b8323d6e3c..d4699870a47a3a86f1c3ccd99988ffe4a049597e 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,12 +56,14 @@ Foam::setsToFaceZone::setsToFaceZone
(
const polyMesh& mesh,
const word& faceSetName,
- const word& cellSetName
+ const word& cellSetName,
+ const Switch& flip
)
:
topoSetSource(mesh),
faceSetName_(faceSetName),
- cellSetName_(cellSetName)
+ cellSetName_(cellSetName),
+ flip_(flip)
{}
@@ -74,7 +76,8 @@ Foam::setsToFaceZone::setsToFaceZone
:
topoSetSource(mesh),
faceSetName_(dict.lookup("faceSet")),
- cellSetName_(dict.lookup("cellSet"))
+ cellSetName_(dict.lookup("cellSet")),
+ flip_(dict.lookupOrDefault("flip", false))
{}
@@ -87,7 +90,8 @@ Foam::setsToFaceZone::setsToFaceZone
:
topoSetSource(mesh),
faceSetName_(checkIs(is)),
- cellSetName_(checkIs(is))
+ cellSetName_(checkIs(is)),
+ flip_(false)
{}
@@ -136,7 +140,7 @@ void Foam::setsToFaceZone::applyToSet
if (!fzSet.found(faceI))
{
- bool flip = false;
+ bool flipFace = false;
label own = mesh_.faceOwner()[faceI];
bool ownFound = cSet.found(own);
@@ -148,11 +152,11 @@ void Foam::setsToFaceZone::applyToSet
if (ownFound && !neiFound)
{
- flip = false;
+ flipFace = false;
}
else if (!ownFound && neiFound)
{
- flip = true;
+ flipFace = true;
}
else
{
@@ -174,11 +178,17 @@ void Foam::setsToFaceZone::applyToSet
}
else
{
- flip = !ownFound;
+ flipFace = !ownFound;
+ }
+
+
+ if (flip_)
+ {
+ flipFace = !flipFace;
}
newAddressing.append(faceI);
- newFlipMap.append(flip);
+ newFlipMap.append(flipFace);
}
}
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
index 686849cc5000fedf3f3e3a1520272e14f41d036c..72d2f6501e1d8656b135553316ebb4e653be4275 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,6 +36,7 @@ SourceFiles
#define setsToFaceZone_H
#include "topoSetSource.H"
+#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,10 +57,13 @@ class setsToFaceZone
static addToUsageTable usage_;
//- Name of set to use
- word faceSetName_;
+ const word faceSetName_;
//- Name of set to use
- word cellSetName_;
+ const word cellSetName_;
+
+ //- Whether cellSet is slave cells or master cells
+ const Switch flip_;
public:
@@ -73,7 +77,8 @@ public:
(
const polyMesh& mesh,
const word& faceSetName,
- const word& cellSetName
+ const word& cellSetName,
+ const Switch& flip
);
//- Construct from dictionary
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 691339102a442d918f67476e87ba96d6ca8972ce..79e3796baab586c438f6ca388fdefb3ff016ef06 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -344,7 +344,7 @@ Foam::topoSet::topoSet
(
mesh.dbDir()/polyMesh::meshSubDir/"sets",
word::null,
- IOobject::MUST_READ,
+ r, //IOobject::MUST_READ,
mesh.facesInstance()
),
polyMesh::meshSubDir/"sets",
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
index 9fd2eb7777741f08f321aede555ed40ddb7ef753..a23933030b1a519945789536653ebead7e836000 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
@@ -66,7 +66,11 @@ void thixotropicViscosity::updateMu()
const volScalarField filmMass("filmMass", film.netMass() + mSMALL);
// weighting field to blend new and existing mass contributions
- const volScalarField w("w", max(0.0, min(1.0, deltaMass/filmMass)));
+ const volScalarField w
+ (
+ "w",
+ max(scalar(0.0), min(scalar(1.0), deltaMass/filmMass))
+ );
// evaluate thixotropic viscosity
volScalarField muThx("muThx", muInf_/(sqr(1.0 - K_*lambda_) + ROOTVSMALL));
diff --git a/src/sampling/include/buildPatch.H b/src/sampling/include/buildPatch.H
deleted file mode 100644
index e355d794905e9934b93e7b68230e075f2233d7b2..0000000000000000000000000000000000000000
--- a/src/sampling/include/buildPatch.H
+++ /dev/null
@@ -1,82 +0,0 @@
-
-IOdictionary planeToPatchDict
-(
- IOobject
- (
- "planeToPatchDict",
- runTime.system(),
- runTime,
- IOobject::MUST_READ_IF_MODIFIED,
- IOobject::NO_WRITE
- )
-);
-
-Switch planeMapping
-(
- planeToPatchDict.lookup("mappingPlane")
-);
-
-Info << "Constructing planePatch" << endl;
-cuttingPlane cut(plane(planeToPatchDict), mesh);
-
-primitiveFacePatch planePatch
-(
- cut.faces(),
- cut.points()
-);
-
-Info << "Finding target patch" << endl;
-
-word toPatchName
-(
- planeToPatchDict.lookup("targetPatchName")
-);
-
-const fvPatchList& patches = mesh.boundary();
-bool targetPatchNamePresent(false);
-label targetPatchNumber = -1;
-
-forAll(patches, patchI)
-{
- if (patches[patchI].name() == toPatchName)
- {
- targetPatchNamePresent = true;
- targetPatchNumber = patchI;
- }
-}
-
-const labelList& cutCells(cut.cells());
-
-if (!targetPatchNamePresent)
-{
- targetPatchNumber = 1;
- Serr<< "Target patch not present. " << endl;
-}
-else
-{
- Serr<< "Target patch name: " << patches[targetPatchNumber].name() << endl;
-}
-
-patchToPatchInterpolation interPatch
-(
- planePatch,
- patches[targetPatchNumber].patch()
-);
-
-
-PrimitivePatchInterpolation
-<
- PrimitivePatch<face, List, const pointField&>
-> planePatchInter
-(
- planePatch
-);
-
-
-PrimitivePatchInterpolation
-<
- PrimitivePatch<face, List, const pointField&>
-> toPatchInter
-(
- patches[targetPatchNumber].patch()
-);
diff --git a/src/sampling/include/mapPatch.H b/src/sampling/include/mapPatch.H
deleted file mode 100644
index 371317a0ab2a5747a95817610ee5110e48de3556..0000000000000000000000000000000000000000
--- a/src/sampling/include/mapPatch.H
+++ /dev/null
@@ -1,90 +0,0 @@
- if (planeMapping && targetPatchNamePresent && cut.cut())
- {
- //Map variables U, phi & k
- //Info<< typeInfo("isoLESmodel") << endl;
- //Info<< "SGS model" << sgsModel.type() << endl;
-
- scalarField planek(cutCells.size());
- scalarField planeNuTilda(cutCells.size());
- vectorField planeU(cutCells.size());
-
- forAll(cutCells, cCellsI)
- {
- if (sgsModel.type() == "SpalartAllmaras")
- {
- planeNuTilda[cCellsI] = sgsModel.nuTilda()()[cutCells[cCellsI]];
- }
- else
- {
- planek[cCellsI] = sgsModel.k()()[cutCells[cCellsI]];
- }
- planeU[cCellsI] = U[cutCells[cCellsI]];
- }
-
- if (sgsModel.type() == "SpalartAllmaras")
- {
- Info<< "Mapping NuTilda." << endl;
- sgsModel.nuTilda()().boundaryField()[targetPatchNumber] ==
- interPatch.faceInterpolate(planeNuTilda)();
- }
- else
- {
- Info<< "Mapping k." << endl;
- sgsModel.k()().boundaryField()[targetPatchNumber] ==
- interPatch.faceInterpolate(planek)();
- }
-
- U.boundaryField()[targetPatchNumber] ==
- interPatch.faceInterpolate(planeU)();
-
-/* sgsModel.k()().boundaryField()[targetPatchNumber] ==
- toPatchInter.pointToFaceInterpolate
- (
- interPatch.pointInterpolate
- (
- planePatchInter.faceToPointInterpolate
- (
- planek
- )
- )
- );
-
- U.boundaryField()[targetPatchNumber] ==
- toPatchInter.pointToFaceInterpolate
- (
- interPatch.pointInterpolate
- (
- planePatchInter.faceToPointInterpolate
- (
- planeU
- )
- )
- );
-
-*/
-
- scalar Q = sum
- (
- mesh.Sf().boundaryField()[targetPatchNumber]
- & U.boundaryField()[targetPatchNumber]
- );
-
- scalar Qbar = sum
- (
- mesh.Sf().boundaryField()[targetPatchNumber] &
- Ubar.value()
- );
-
- U.boundaryField()[targetPatchNumber] ==
- U.boundaryField()[targetPatchNumber] * (Qbar/Q);
-
- Info<< "Mass flux correction factor: " << (Qbar/Q) << endl;
-
- phi.boundaryField()[targetPatchNumber] ==
- (
- mesh.Sf().boundaryField()[targetPatchNumber] &
- U.boundaryField()[targetPatchNumber]
- );
- }
-
-
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
index 3542c053d075c9e2b3e81f65a8ac75a9345aa8f2..0ea74754c6ace58072660ada757476f5e3cebb9b 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
@@ -47,14 +47,11 @@ SourceFiles
#ifndef viscosityModel_H
#define viscosityModel_H
-#include "IOdictionary.H"
-#include "typeInfo.H"
-#include "runTimeSelectionTables.H"
+#include "dictionary.H"
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
#include "dimensionedScalar.H"
-#include "tmp.H"
-#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index 5e403ab932b1baa4c74022cdde82ab74eefe6b1e..2ea6a67adb8106bfd224f1f25bf09eb2286e0263 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -230,7 +230,7 @@ void kLowReWallFunctionFvPatchScalarField::evaluate
void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
{
- fixedValueFvPatchField<scalar>::write(os);
+ fvPatchField<scalar>::write(os);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index a53c5e0697cfd2280d9de3d32039afb650231cfd..437ea76234f7c1c3bf63e02fa7f9063becde037e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -233,7 +233,6 @@ void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
- writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
index 2406f30d0ad656f8534d8f1f807e2fa6ec1ba62b..9e724596bf18237891ae0c7a97fbf754087a0d62 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -63,10 +63,10 @@ tmp<scalarField> nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const
scalar uStar = Cmu25*sqrt(k[faceCellI]);
scalar yPlus = uStar*y[faceI]/nuw[faceI];
- scalar Edash = (y[faceI] + z0_[faceI])/z0_[faceI];
+ scalar Edash = (y[faceI] + z0_[faceI])/(z0_[faceI] + 1e-4);
nutw[faceI] =
- nuw[faceI]*(yPlus*kappa_/log(max(Edash, 1+1e-4)) - 1);
+ nuw[faceI]*(yPlus*kappa_/log(max(Edash, 1 + 1e-4)) - 1);
if (debug)
{
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index c6a1eaf3547778d8a5a1f221436846f03930b8ae..dbda14ce2e99e2601cfeb1ef009f233b935c1889 100644
--- a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
- div(phi,Yi_h) Gauss limitedLinear01 1;
- div(phi,h) Gauss limitedLinear 1;
+ div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
new file mode 100755
index 0000000000000000000000000000000000000000..df1b2ab5da25d2c8bc795e41fb4958debf9871c7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object C3H8;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ ground
+ {
+ type zeroGradient;
+ }
+
+ side
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type totalFlowRateAdvectiveDiffusive;
+ phi phi;
+ rho rho;
+ value uniform 1;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type totalFlowRateAdvectiveDiffusive;
+ phi phi;
+ rho rho;
+ massFluxFraction 1.0;
+ value $internalField;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
new file mode 100755
index 0000000000000000000000000000000000000000..629aa0b799c783524f36a1d5f5c3efe5efede723
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object IDefault;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 0 -3 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type greyDiffusiveRadiation;
+ T T;
+ emissivityMode solidRadiation;
+ emissivity uniform 1.0;
+ value uniform 0;
+ }
+
+ frontAndBack
+ {
+ type cyclic;
+ }
+
+ ".*"
+ {
+ type greyDiffusiveRadiation;
+ T T;
+ emissivityMode lookup;
+ emissivity uniform 1.0;
+ value uniform 0;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
new file mode 100755
index 0000000000000000000000000000000000000000..251bc6632f9a720a7771244fab9f0fcfd15098ea
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.76699;
+
+boundaryField
+{
+
+ outlet
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ ground
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ side
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type calculated;
+ value $internalField;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
new file mode 100755
index 0000000000000000000000000000000000000000..91036e1a56a1e3de15df95dca82cfb89de9d852f
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.23301;
+
+boundaryField
+{
+
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ ground
+ {
+ type zeroGradient;
+ }
+
+ side
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type fixedValue;
+ value uniform 0;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type totalFlowRateAdvectiveDiffusive;
+ phi phi;
+ rho rho;
+ massFluxFraction 0.0;
+ value $internalField;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
new file mode 100755
index 0000000000000000000000000000000000000000..c7614c8c273ae114c14d80d2205320431ead8bda
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 1 0 0 0];
+
+internalField uniform 298;
+
+boundaryField
+{
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ ground
+ {
+ type zeroGradient;
+ }
+
+ side
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type fixedValue;
+ value $internalField;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type filmPyrolysisRadiativeCoupledMixed;
+ Tnbr T;
+ kappa fluidThermo;
+ QrNbr none;
+ Qr Qr;
+ kappaName none;
+ filmDeltaDry 0.0;
+ filmDeltaWet 2e-4;
+ value $internalField;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
new file mode 100755
index 0000000000000000000000000000000000000000..418120f1e9c49a0440c802c19d1de79096552286
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ location "0";
+ object U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ ground
+ {
+ type fixedValue;
+ value $internalField;
+ }
+
+ side
+ {
+ type pressureInletOutletVelocity;
+ phi phi;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type flowRateInletVelocity;
+ massFlowRate constant 0.01;
+ value uniform (0 0 0);
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type mappedFlowRate;
+ phi phi;
+ nbrPhi phiGas;
+ rho rho;
+ value uniform (0 0 0);
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
new file mode 100755
index 0000000000000000000000000000000000000000..cc3de91d28160e9a0e88611399e7bfd7169d1834
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object Ydefault;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0.0;
+
+boundaryField
+{
+
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ ground
+ {
+ type zeroGradient;
+ }
+
+ side
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type fixedValue;
+ phi phi;
+ rho rho;
+ value uniform 0;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type totalFlowRateAdvectiveDiffusive;
+ phi phi;
+ rho rho;
+ massFluxFraction 0.0;
+ value $internalField;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs
new file mode 100644
index 0000000000000000000000000000000000000000..91c0c2894e3024443ce19558d2ef323443ca02a8
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphaSgs;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ ground
+ {
+ type compressible::alphatWallFunction;
+ mut muSgs;
+ value uniform 0;
+ }
+
+ side
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type compressible::alphatWallFunction;
+ mut muSgs;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
new file mode 100755
index 0000000000000000000000000000000000000000..0ebaacfbc0ab1c93ba060480a5536c7e3e829515
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0/filmRegion";
+ object Tf;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 1 0 0 0];
+
+internalField uniform 298;
+
+boundaryField
+{
+ region0_to_filmRegion_coupledWall // Patch to pyrolysis
+ {
+ type mappedField;
+ sampleRegion pyrolysisRegion;
+ sampleMode nearestPatchFace;
+ samplePatch region0_to_pyrolysisRegion_coupledWall;
+ offset (0 0 0);
+ fieldName T;
+ setAverage no;
+ average 0;
+ value uniform 298;
+ }
+
+ coupledWall_top // Patch to Region0
+ {
+ type zeroGradient;
+ }
+
+ "side.*"
+ {
+ type inletOutlet;
+ inletValue uniform 298;
+ value uniform 298;
+ }
+
+ outlet
+ {
+ type zeroGradient;
+ }
+
+ inlet
+ {
+ type fixedValue;
+ value uniform 298.0;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
new file mode 100755
index 0000000000000000000000000000000000000000..0ac01a3002d79b98cc4bbf7ef0b0d43de7d88b36
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volVectorField;
+ location "0/filmRegion";
+ object Uf;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform (0 0 0);
+
+boundaryField
+{
+ coupledWall_top // Patch to Region0
+ {
+ type slip;
+ }
+
+ region0_to_filmRegion_coupledWall // Patch to pyrolysis
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
+
+ outlet
+ {
+ type zeroGradient;
+ }
+
+ "side.*"
+ {
+ type fixedValue;
+ value uniform (0 0 0);
+ }
+
+ inlet
+ {
+ type fixedValue;
+ rho rhof;
+ value uniform (0 0 -0.01);
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
new file mode 100755
index 0000000000000000000000000000000000000000..69e916c492cb8c44a1a3fbb760e68baa0eca3954
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0/filmRegion";
+ object deltaf;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 0 0 0 0 0];
+
+internalField uniform 1e-6;
+
+boundaryField
+{
+ coupledWall_top
+ {
+ type zeroGradient;
+ }
+
+ region0_to_filmRegion_coupledWall
+ {
+ type zeroGradient;
+ }
+
+ "side.*"
+ {
+ type zeroGradient;
+ }
+
+ inlet
+ {
+ type fixedValue;
+ value uniform 6e-4;
+ }
+
+ outlet
+ {
+ type zeroGradient;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
new file mode 100755
index 0000000000000000000000000000000000000000..2c8622d2286f433e3ee695a405829dff572f972b
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 1e-5;
+
+boundaryField
+{
+ outlet
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+ ground
+ {
+ type zeroGradient;
+ }
+
+ side
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+ inlet
+ {
+ type fixedValue;
+ value $internalField;
+ }
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type zeroGradient;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs
new file mode 100755
index 0000000000000000000000000000000000000000..9da5b0c67de46057a51f7b7f99381e0ebb6449d7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ location "0";
+ class volScalarField;
+ object muSgs;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ ground
+ {
+ type mutUSpaldingWallFunction;
+ value uniform 0;
+ }
+
+ side
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type mutUSpaldingWallFunction;
+ value uniform 0;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
new file mode 100755
index 0000000000000000000000000000000000000000..9aee743d50a78a4ee7c791fe56fdd093da9e1056
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object p;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions [1 -1 -2 0 0 0 0];
+
+internalField uniform 101325;
+
+boundaryField
+{
+
+ outlet
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ ground
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ side
+ {
+ type calculated;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type calculated;
+ value $internalField;
+ }
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type calculated;
+ value $internalField;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
new file mode 100755
index 0000000000000000000000000000000000000000..e0461769d0df7f7d60f7dbff5bbbe256f9691ac8
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -2 0 0 0 0];
+
+internalField uniform 101325;
+
+boundaryField
+{
+ wall
+ {
+ type fixedFluxPressure;
+ value $internalField;
+ }
+
+ outlet
+ {
+ type fixedFluxPressure;
+ value $internalField;
+ }
+
+ ground
+ {
+ type fixedFluxPressure;
+
+ }
+
+ side
+ {
+ type totalPressure;
+ U U;
+ phi phi;
+ rho rho;
+ psi none;
+ gamma 1.4;
+ p0 $internalField;
+ value $internalField;
+ }
+
+ inlet
+ {
+ type fixedFluxPressure;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type fixedFluxPressure;
+ value $internalField;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
new file mode 100755
index 0000000000000000000000000000000000000000..aaeee9d11c502629db6277670b0e16e1bd4394e6
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object Qr;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 0 -3 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ coupledWall_top
+ {
+ type zeroGradient;
+ }
+
+ coupledWall_side
+ {
+ type empty;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type mappedField;
+ sampleRegion region0;
+ sampleMode nearestPatchFace;
+ samplePatch region0_to_pyrolysisRegion_coupledWall;
+ offset (0 0 0);
+ fieldName Qr; // this is the name of Qr field in region0
+ setAverage no;
+ average 0;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
new file mode 100755
index 0000000000000000000000000000000000000000..2664855cf3c7291bed9286f4d79ea0df8a995ce9
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0/pyrolysisRegion";
+ object T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 1 0 0 0];
+
+internalField uniform 298;
+
+boundaryField
+{
+ coupledWall_top
+ {
+ type zeroGradient;
+ }
+
+ coupledWall_side
+ {
+ type empty;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type filmPyrolysisRadiativeCoupledMixed;
+ Tnbr T;
+ kappa solidThermo;
+ kappaName none;
+ QrNbr Qr;
+ Qr none;
+ filmDeltaDry 0.0;
+ filmDeltaWet 2e-4;
+ value uniform 298;
+ }
+ oneDEmptyPatch
+ {
+ type empty;
+ }
+
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
old mode 100644
new mode 100755
similarity index 61%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/boundary
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
index 3d253979063ae7c46c4636ec15b41fd7ec5e7e99..50c0c51a59c4996c70d14c2a4bc0bbcdaa12bc74
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/boundary
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.x |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -9,33 +9,32 @@ FoamFile
{
version 2.0;
format ascii;
- class polyBoundaryMesh;
- location "constant/polyMesh";
- object boundary;
+ class volScalarField;
+ location "0/pyrolysisRegion";
+ object Ydefault;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-3
-(
- movingWall
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ coupledWall_top
{
- type wall;
- nFaces 20;
- startFace 760;
+ type zeroGradient;
}
- fixedWalls
+ region0_to_pyrolysisRegion_coupledWall
{
- type wall;
- nFaces 60;
- startFace 780;
+ type zeroGradient;
}
- frontAndBack
+ oneDEmptyPatch
{
type empty;
- inGroups 1(empty);
- nFaces 800;
- startFace 840;
}
-)
+
+}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
new file mode 100755
index 0000000000000000000000000000000000000000..4b88585cc8654e446c146a9c8e55dbaa5272e4a6
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0/pyrolysisRegion";
+ object Ychar;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ coupledWall_top
+ {
+ type zeroGradient;
+ }
+
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type zeroGradient;
+ }
+
+ oneDEmptyPatch
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
new file mode 100755
index 0000000000000000000000000000000000000000..5e2985df7e46b4e2948c21a4a9a5b4abf3f96d59
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -2 0 0 0 0];
+
+internalField uniform 1e5;
+
+boundaryField
+{
+
+ ".*"
+ {
+ type zeroGradient;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
new file mode 100755
index 0000000000000000000000000000000000000000..3e15d9f4262d9ae59d4ba1b1058317412e59b6d1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0/pyrolysisRegion";
+ object wood;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 1;
+
+boundaryField
+{
+ coupledWall_top
+ {
+ type zeroGradient;
+ }
+ region0_to_pyrolysisRegion_coupledWall
+ {
+ type zeroGradient;
+ }
+ oneDEmptyPatch
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..1b6c341340783be86701f5c0b85f0e99a1f81e27
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allclean
@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+rm -rf constant/filmRegion/polyMesh
+rm -rf constant/pyrolysisRegion/polyMesh
+
+rm -rf system/pyrolysisRegion/filmRegion
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..6945c4e06e0ca440e259643b907e48d1ae2d03d6
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun
@@ -0,0 +1,41 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# create the underlying block mesh
+runApplication blockMesh
+
+# create faceSet for burner inlet and faceZone for coupled wall
+runApplication topoSet
+
+# create burner inlet
+runApplication createPatch -overwrite
+
+# extrude Film
+runApplication extrudeToRegionMesh -dict system/extrudeToRegionMeshDictFilm -overwrite
+
+rm log.extrudeToRegionMesh
+
+# extrude pyrolysis
+runApplication extrudeToRegionMesh -dict system/extrudeToRegionMeshDictPyr -overwrite
+
+# change samplePatch in the boundary to coupled patch betwee region0 and
+# pyrolysis
+runApplication changeDictionary -region filmRegion -constant
+
+# create faceSets for inlet, outlet, sides for the Film
+rm log.topoSet
+runApplication topoSet -region filmRegion
+
+rm log.createPatch
+# create actual patches
+runApplication createPatch -region filmRegion -overwrite
+
+# Run
+runApplication `getApplication`
+
+paraFoam -touchAll
+
+# ----------------------------------------------------------------- end-of-file
\ No newline at end of file
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties
new file mode 100644
index 0000000000000000000000000000000000000000..5ecdc02d18a2f1602cec522f63bce5623f3b34aa
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties
@@ -0,0 +1,93 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object LESProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+LESModel oneEqEddy;
+
+delta cubeRootVol;
+
+turbulence on;
+
+printCoeffs on;
+
+oneEqEddyCoeffs
+{
+ Prt 1;
+}
+
+cubeRootVolCoeffs
+{
+ deltaCoeff 1;
+}
+
+PrandtlCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ smoothCoeffs
+ {
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+ }
+
+ Cdelta 0.158;
+}
+
+vanDriestCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ smoothCoeffs
+ {
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+ }
+
+ Aplus 26;
+ Cdelta 0.158;
+}
+
+smoothCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/transportProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
old mode 100644
new mode 100755
similarity index 91%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/transportProperties
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
index fa1c1ca0b14b50fa06f4c8577b4998addd44b1f3..ccf72d6127fe929daa8364cccbd9268a0a5d4705
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/transportProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
@@ -11,11 +11,10 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object transportProperties;
+ object additionalControls;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-nu nu [ 0 2 -1 0 0 0 0 ] 0.01;
-
+solvePrimaryRegion true;
// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
new file mode 100755
index 0000000000000000000000000000000000000000..a57292861b47fef3925f42532899f8b20866a5a2
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
@@ -0,0 +1,26 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
+
+active true;
+
+infinitelyFastChemistryCoeffs
+{
+ semiImplicit no;
+ C 10;
+}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
new file mode 100755
index 0000000000000000000000000000000000000000..b10785499bf70ecbdd938de4c1a41c842400e787
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class uniformDimensionedVectorField;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value (0 0 -9.8);
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/polyMesh/blockMeshDict
similarity index 71%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/polyMesh/blockMeshDict
index 165a600c7b4a929aaa62ad1750bfbb9d279c2e65..b4802459ae92a29a5661f0862baa3b777b9d96c2 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/polyMesh/blockMeshDict
@@ -1,10 +1,11 @@
-/*--------------------------------*- C++ -*----------------------------------*\
+/*-----------------------------*-C++-*---------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
+
FoamFile
{
version 2.0;
@@ -14,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-convertToMeters 0.1;
+convertToMeters 1;
vertices
(
@@ -22,15 +23,15 @@ vertices
(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)
+ (0 0 2)
+ (1 0 2)
+ (1 1 2)
+ (0 1 2)
);
blocks
(
- hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+ hex (0 1 2 3 4 5 6 7) (10 20 20) simpleGrading (1 1 1)
);
edges
@@ -39,33 +40,44 @@ edges
boundary
(
- movingWall
+ side
{
- type wall;
+ type patch;
+ faces
+ (
+ (1 2 6 5)
+ (0 1 5 4)
+ (7 6 2 3)
+ );
+ }
+
+ outlet
+ {
+ type patch;
faces
(
- (3 7 6 2)
+ (4 5 6 7)
);
}
- fixedWalls
+
+ ground
{
type wall;
faces
(
- (0 4 7 3)
- (2 6 5 1)
- (1 5 4 0)
+ (0 3 2 1)
);
}
- frontAndBack
+
+ coupledWallTmp
{
- type empty;
+ type wall;
faces
(
- (0 3 2 1)
- (4 5 6 7)
+ (0 4 7 3)
);
}
+
);
mergePatchPairs
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
new file mode 100644
index 0000000000000000000000000000000000000000..1366ff04bdf5e7bb89a39616cb80ef065906cdd6
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistryType
+{
+ chemistrySolver ode;
+ chemistryThermo pyrolysis;
+}
+
+chemistry on;
+
+initialChemicalTimeStep 1e-07;
+
+odeCoeffs
+{
+ solver SIBS;
+ eps 0.05;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
new file mode 100644
index 0000000000000000000000000000000000000000..e59089a58539bdfa7adde05b4968c36f67ef3f2f
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiationModel opaqueSolid;
+
+absorptionEmissionModel greyMeanSolidAbsorptionEmission;
+
+
+greyMeanSolidAbsorptionEmissionCoeffs
+{
+ wood
+ {
+ absorptivity 0.17;
+ emissivity 0.17;
+ }
+
+ char
+ {
+ absorptivity 0.85;
+ emissivity 0.85;
+ }
+}
+
+scatterModel none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions
new file mode 100644
index 0000000000000000000000000000000000000000..7fc5f0719be60dc5ff7dc6805178ee1d9f82004c
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/reactions
@@ -0,0 +1,22 @@
+species
+(
+ wood
+ char
+);
+
+gaseousSpecies
+(
+ gas
+);
+
+reactions
+{
+ charReaction
+ {
+ type irreversibleArrheniusSolidReaction;
+ reaction "wood^4.86 = char + gas";
+ A 7.83e10;
+ Ta 15274.57;
+ Tcrit 400;
+ }
+}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
new file mode 100644
index 0000000000000000000000000000000000000000..a4b2c48134af29807b445bf6c48b5d530ec22f0c
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object thermo.solid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+wood
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+ transport
+ {
+ kappa 0.135;
+ }
+ thermodynamics
+ {
+ Cp 696;
+ Hf -1.41e6;
+ }
+ equationOfState
+ {
+ rho 114.7;
+ }
+};
+
+char
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+ transport
+ {
+ kappa 0.4;
+ }
+ thermodynamics
+ {
+ Cp 611;
+ Hf 0;
+ }
+ equationOfState
+ {
+ rho 11.5;
+ }
+};
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..4765d84e02f76676776fc741b5e73270ff0e41e6
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
@@ -0,0 +1,68 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+ type heSolidThermo;
+ mixture reactingMixture;
+ transport constIso;
+ thermo hConst;
+ equationOfState rhoConst;
+ specie specie;
+ energy sensibleEnthalpy;
+}
+
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/pyrolysisRegion/reactions";
+
+foamChemistryThermoFile "$FOAM_CASE/constant/pyrolysisRegion/thermo.solid";
+
+gasThermoType
+{
+ transport sutherland;
+ thermo janaf;
+ equationOfState perfectGas;
+ specie specie;
+ energy sensibleEnthalpy;
+}
+
+
+gas
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 18.0153;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 2.67215 0.00305629 -8.73026e-07 1.20100e-10 -6.39162e-15 -29899.2 6.86282 );
+ lowCpCoeffs ( 3.38684 0.00347498 -6.35470e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
new file mode 100755
index 0000000000000000000000000000000000000000..f4ba9724e7253c069ea386027cd58448bc3ddec9
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object pyrolysisProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+1
+(
+ pyrolysis
+ {
+ active true;
+
+ pyrolysisModel reactingOneDim;
+
+ regionName pyrolysisRegion;
+
+ reactingOneDimCoeffs
+ {
+ filmCoupled true;
+
+ gasHSource true;
+ QrHSource false;
+
+ radFluxName Qr;
+
+ moveMesh false; // true;
+ minimumDelta 1e-6;
+
+ useChemistrySolvers true;
+ }
+ }
+
+)
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
new file mode 100755
index 0000000000000000000000000000000000000000..392c1acad2ccf0ebd05304d8cdbbd522f2390ba3
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation on;
+
+radiationModel fvDOM;
+
+
+fvDOMCoeffs
+{
+ nPhi 2; // azimuthal angles in PI/2 on X-Y.(from Y to X)
+ nTheta 2; // polar angles in PI (from Z to X-Y plane)
+ convergence 1e-2; // convergence criteria for radiation iteration
+ maxIter 3; // maximum number of iterations
+ cacheDiv true; // cache the div of the RTE equation.
+}
+
+// Number of flow iterations per radiation iteration
+solverFreq 10;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+ absorptivity absorptivity [ 0 -1 0 0 0 0 0 ] 0.1;
+ emissivity emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+ E E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+greyMeanAbsorptionEmissionSootCoeffs
+{
+
+ lookUpTableFileName none;
+ EhrrCoeff 0.4;
+}
+
+scatterModel constantScatter;
+
+constantScatterCoeffs
+{
+ sigma sigma [ 0 -1 0 0 0 0 0 ] 0;
+ C C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
new file mode 100755
index 0000000000000000000000000000000000000000..f369d4d97d64099d56e97444820c59953c98c8b1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class vectorField;
+ location "constant";
+ object reactingCloud1Positions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+(
+
+)
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
new file mode 100755
index 0000000000000000000000000000000000000000..330a418c283d54b788fd41f4f79c17e7ba341fc5
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
@@ -0,0 +1,254 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object reactingCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+ active false;
+ coupled yes;
+ transient yes;
+ cellValueSourceCorrection yes;
+
+ sourceTerms
+ {
+ schemes
+ {
+ rho explicit 1;
+ U explicit 1;
+ Yi explicit 1;
+ hs explicit 1;
+ }
+ }
+
+ interpolationSchemes
+ {
+ rho cell;
+ U cellPoint;
+ mu cell;
+ T cell;
+ Cp cell;
+ p cell;
+ }
+
+ integrationSchemes
+ {
+ U Euler;
+ T analytical;
+ }
+}
+
+constantProperties
+{
+ parcelTypeId 1;
+
+ rhoMin 1e-15;
+ TMin 200;
+ pMin 1000;
+ minParticleMass 1e-15;
+
+ rho0 1000;
+ T0 300;
+ Cp0 4187;
+
+ youngsModulus 1e9;
+ poissonsRatio 0.35;
+
+ epsilon0 1;
+ f0 0.5;
+ Pr 0.7;
+ Tvap 273;
+ Tbp 373;
+
+ constantVolume false;
+}
+
+subModels
+{
+ particleForces
+ {
+ sphereDrag;
+ gravity;
+ }
+
+ injectionModel none;//coneInjection;
+
+ dispersionModel none;
+
+ patchInteractionModel standardWallInteraction;
+
+ heatTransferModel none;
+
+ compositionModel singlePhaseMixture;
+
+ phaseChangeModel none;
+
+ surfaceFilmModel thermoSurfaceFilm;
+
+ radiation off;
+
+ coneNozzleInjectionCoeffs
+ {
+ massTotal massTotal [ 1 0 0 0 0 ] 0.0005;
+ parcelBasisType mass;
+ SOI 0.001;
+ duration 10; //0.005;
+ position ( 0. 0.0 0.0 );
+ direction ( 0 -1 0 );
+ parcelsPerSecond 10000;
+ //flowRateProfile constant 0.01;
+ flowRateProfile constant 0.01;
+ Umag constant 50;
+ thetaInner constant 0;
+ thetaOuter constant 30;
+
+ parcelPDF
+ {
+ pdfType RosinRammler;
+ RosinRammlerPDF
+ {
+ minValue 5e-05;
+ maxValue 0.0001;
+ // d ( 7.5e-05 );
+ d 7.5e-05;
+ // n ( 0.5 );
+ n 0.5;
+ }
+ }
+ }
+
+ coneInjectionCoeffs
+ {
+ SOI 1055.00;//800.000;
+ duration 1000.00;//1800.000;
+ // positionsFile "reactingCloud1Positions";
+ // axesFile "reactingCloud1Axes";
+ positionAxis
+ (
+ ( ( -2.13360 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 -1.52400) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 -1.52400) ( 0 -1 0 ) )
+
+ ( ( -2.13360 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 -0.91440) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 -0.91440) ( 0 -1 0 ) )
+
+ ( ( -2.13360 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 -0.30480) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 -0.30480) ( 0 -1 0 ) )
+
+ ( ( -2.13360 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 0.30480) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 0.30480) ( 0 -1 0 ) )
+
+ ( ( -2.13360 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 0.91440) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 0.91440) ( 0 -1 0 ) )
+
+ ( ( -2.13360 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( -1.52400 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( -0.91440 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( -0.30480 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( 0.30480 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( 0.91440 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( 1.52400 4.47040 1.52400) ( 0 -1 0 ) )
+ ( ( 2.13360 4.47040 1.52400) ( 0 -1 0 ) )
+ );
+
+ //massTotal is the total for all injectors
+ massTotal 1211.35; //kg over 1000 seconds (0.1 gpm/ft2)
+ //massTotal 3634.05; //kg over 1000 seconds (0.3 gpm/ft2)
+
+ parcelsPerInjector 30000;
+ parcelsPerSecond 500;
+ parcelBasisType mass;
+ flowRateProfile constant 0.1;
+ Umag constant 2.0;
+ thetaInner constant 5;
+ thetaOuter constant 120;
+
+ sizeDistribution
+ {
+ type uniform;
+ uniformDistribution
+ {
+ minValue 0.001;
+ maxValue 0.002;
+ d ( 7.5e-05 );
+ n ( 0.5 );
+ }
+ }
+ }
+
+
+ standardWallInteractionCoeffs
+ {
+ type escape;//stick;//rebound;
+ }
+
+ RanzMarshallCoeffs
+ {
+ // thermal shielding
+ BirdCorrection true;
+ }
+
+ singlePhaseMixtureCoeffs
+ {
+ phases
+ (
+ liquid
+ {
+ H2O 1;
+ }
+ );
+ }
+
+ thermoSurfaceFilmCoeffs
+ {
+ interactionType splashBai;
+ deltaWet 0.0002;
+ Adry 2630;
+ Awet 1320;
+ Cf 0.6;
+ }
+
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions
new file mode 100755
index 0000000000000000000000000000000000000000..d0b053b1794aceebb2c7ff92188dbc1e820ce559
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactions
@@ -0,0 +1,17 @@
+species
+(
+ O2
+ H2O
+ C3H8
+ CO2
+ N2
+);
+
+reactions
+{
+ propaneReaction
+ {
+ type irreversibleinfiniteReaction;
+ reaction "C3H8 + 5O2 + 18.8N2 = 3CO2 + 4H2O + 18.8N2";
+ }
+}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
new file mode 100755
index 0000000000000000000000000000000000000000..05847fabf5c5991d3269d8d04f3af5c117367a2d
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -0,0 +1,138 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object SurfaceFilmProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+active true;
+
+surfaceFilmModel thermoSingleLayer;
+
+regionName filmRegion;
+
+thermoSingleLayerCoeffs
+{
+ thermoModel singleComponent;
+
+ hydrophilic no;
+ deltaWet 1e-4;
+
+ liquid H2O;
+
+ turbulence laminar;
+ laminarCoeffs
+ {
+ Cf 0.005;
+ }
+
+ radiationModel none;
+ standardRadiationCoeffs
+ {
+ //deltaMi 1e-6;
+ beta 0.75;
+ kappaBar 0.25;
+ }
+
+ upperSurfaceModels
+ {
+
+ heatTransferModel constant;
+ constantCoeffs
+ {
+ c0 10;
+ }
+ }
+
+ lowerSurfaceModels
+ {
+ heatTransferModel constant;
+ constantCoeffs
+ {
+ c0 100;
+ }
+ }
+
+ forces
+ (
+ surfaceShear
+ thermocapillary
+ //contactAngle
+ );
+
+ surfaceShearCoeffs
+ {
+ Cf 0.005;
+ }
+
+ contactAngleCoeffs
+ {
+ Ccf 0.085;
+ contactAngleDistribution
+ {
+ type normal;
+ normalDistribution
+ {
+ minValue 50;
+ maxValue 100;
+ expectation 75;
+ variance 100;
+ }
+ }
+ zeroForcePatches
+ ();
+ }
+
+ injectionModels
+ (
+ //curvatureSeparation
+ //drippingInjection
+ );
+
+ curvatureSeparationCoeffs
+ {
+ definedPatchRadii
+ (
+ ("(cube[0-9][0-9]_side[0-9]_to_cube[0-9][0-9]_side[0-9])" 0)
+ );
+ }
+
+ drippingInjectionCoeffs
+ {
+ cloudName reactingCloud1;
+ deltaStable 0;
+
+ particlesPerParcel 100.0;
+
+ parcelDistribution
+ {
+ type RosinRammler;
+ RosinRammlerDistribution
+ {
+ minValue 5e-04;
+ maxValue 0.0012;
+ d 7.5e-05;
+ n 0.5;
+ }
+ }
+ }
+
+ phaseChangeModel standardPhaseChange;
+
+ standardPhaseChangeCoeffs
+ {
+ Tb 373;
+ deltaMin 1e-8;
+ L 1.0;
+ }
+}
\ No newline at end of file
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
new file mode 100755
index 0000000000000000000000000000000000000000..d2d8f2cd2a31ace40060deb04df1a606715a2b4b
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
@@ -0,0 +1,126 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermo.compressibleGas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 31.9988;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+ lowCpCoeffs ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
+
+H2O
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 18.0153;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+ lowCpCoeffs ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
+
+CO2
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 44.01;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
+ lowCpCoeffs ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
+
+N2
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 28.0134;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+ lowCpCoeffs ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
+
+C3H8
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 44.0962;
+ }
+ thermodynamics
+ {
+ Tlow 200;
+ Thigh 5000;
+ Tcommon 1000;
+ highCpCoeffs ( 7.5341368 0.018872239 -6.2718491e-06 9.1475649e-10 -4.7838069e-14 -16467.516 -17.892349 );
+ lowCpCoeffs ( 0.93355381 0.026424579 6.1059727e-06 -2.1977499e-08 9.5149253e-12 -13958.52 19.201691 );
+ }
+ transport
+ {
+ As 1.67212e-06;
+ Ts 170.672;
+ }
+}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
new file mode 100755
index 0000000000000000000000000000000000000000..8ce5d08b45c1d30c52a2c071d03010d5d56a38d0
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+ type hePsiThermo;
+ mixture singleStepReactingMixture;
+ transport sutherland;
+ thermo janaf;
+ energy sensibleEnthalpy;
+ equationOfState perfectGas;
+ specie specie;
+}
+
+inertSpecie N2;
+
+fuel C3H8;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/reactions";
+
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
+
+
+liquids
+{
+ H2O
+ {
+ defaultCoeffs yes;
+ }
+}
+
+solids
+{
+}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
new file mode 100755
index 0000000000000000000000000000000000000000..098d0823ab8eea1574eccb5c77ffe4f4559166db
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..471023d263d9364fea45cd8210e8b71cb527b048
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application fireFoam;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 10;
+
+deltaT 0.005;
+
+writeControl adjustableRunTime;
+
+writeInterval 1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+graphFormat raw;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 1.0;
+
+maxDi 0.25;
+
+maxDeltaT 0.01;
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/controlDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
similarity index 66%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/controlDict
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
index f28aaab14691c117baa5fb158619b68487a19002..8fb65d5c53857c310111fa63b16d790822eb7693 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
@@ -10,40 +10,32 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
- object controlDict;
+ object createPatchDict;
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application icoFoam;
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 0.5;
-deltaT 0.005;
-
-writeControl timeStep;
-
-writeInterval 20;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-writeCompression off;
+pointSync false;
-timeFormat general;
+// Patches to create.
+patches
+(
+ {
+ // Name of new patch
+ name inlet;
-timePrecision 6;
+ // Type of new patch
+ patchInfo
+ {
+ type patch;
+ }
-runTimeModifiable true;
+ // How to construct: either from 'patches' or 'set'
+ constructFrom set;
+ // If constructFrom = set : name of faceSet
+ set f0;
+ }
+);
// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
new file mode 100755
index 0000000000000000000000000000000000000000..77e4e801efc04234ad5c2ef5a69bc31cc0208766
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object extrudeToRegionMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+region filmRegion;
+
+faceZones (coupledWall);
+
+oneD false;
+
+sampleMode nearestPatchFace;
+
+extrudeModel linearNormal;
+
+nLayers 1;
+
+expansionRatio 1;
+
+adaptMesh false; // leave primary region patches intact
+
+linearNormalCoeffs
+{
+ thickness 0.001;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
new file mode 100755
index 0000000000000000000000000000000000000000..4e723ce9ece155bbc0ffe6738413963b39529818
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object extrudeToRegionMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+region pyrolysisRegion;
+
+faceZones (coupledWall);
+
+oneD true;
+
+sampleMode nearestPatchFace;
+
+extrudeModel linearNormal;
+
+oneDPolyPatchType empty;
+
+nLayers 8;
+
+expansionRatio 1;
+
+adaptMesh true; // directMapped for both
+
+linearNormalCoeffs
+{
+ thickness 0.0039;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
new file mode 100644
index 0000000000000000000000000000000000000000..edf40660b6f46dc7375e64b1bb2b62a6837bdbb4
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+ boundary
+ {
+ region0_to_filmRegion_coupledWall
+ {
+ samplePatch region0_to_pyrolysisRegion_coupledWall;
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
new file mode 100644
index 0000000000000000000000000000000000000000..09a0c7f2dd0a1f643126d754d0c7bdef974b23bc
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object createPatchDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+matchTolerance 1E-3;
+
+pointSync false;
+
+patches
+(
+ {
+ name outlet;
+
+ patchInfo
+ {
+ type patch;
+ }
+
+ constructFrom set;
+
+ set f0;
+ }
+ {
+ name side1;
+
+ patchInfo
+ {
+ type patch;
+ }
+
+ constructFrom set;
+
+ set f1;
+ }
+ {
+ name inlet;
+
+ patchInfo
+ {
+ type patch;
+ }
+
+ constructFrom set;
+
+ set f2;
+ }
+ {
+ name side2;
+
+ patchInfo
+ {
+ type patch;
+ }
+
+ constructFrom set;
+
+ set f3;
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
new file mode 100755
index 0000000000000000000000000000000000000000..1af5787d81bf4741b38323fb60829dcbe31be9e1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system/wallFilmRegion";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+divSchemes
+{
+ default none;
+ div(phi,Uf) Gauss upwind;
+ div(phid,deltaf) Gauss upwind;
+ div(phi,hf) Gauss upwind;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear uncorrected;
+}
+
+snGradSchemes
+{
+ default uncorrected;
+}
+
+fluxRequired
+{
+ default no;
+ deltaf;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
new file mode 100755
index 0000000000000000000000000000000000000000..9872d8c84cd90c45de1ab0a8d5b7e794ab091953
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
@@ -0,0 +1,57 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system/wallFilmRegion";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ hf
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 0;
+ relTol 1e-3;
+ }
+ "(Uf|deltaf\*rhof)"
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+ deltaf
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+}
+
+
+PISO
+{
+ momentumPredictor true;
+ nOuterCorr 1;
+ nCorr 1;
+ nNonOrthCorr 0;
+ dfMin 1e-10;
+}
+
+
+relaxationFactors
+{}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
new file mode 100644
index 0000000000000000000000000000000000000000..0d88de754adcec893d38fdccafe188e998e48f0b
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name f0;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-1 -0.00001 -0.00001) (1 1.00001 0.00001);
+ }
+ }
+
+
+ {
+ name f1;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-1 0.99999 -0.00001) (1 1.00001 2.00001);
+ }
+ }
+
+ {
+ name f2;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-1 -0.00001 1.99999) (1 1.00001 2.00001);
+ }
+ }
+
+ {
+ name f3;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (-1 -0.00001 -0.00001) (1 0.00001 2.00001);
+ }
+ }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
new file mode 100755
index 0000000000000000000000000000000000000000..460de940322b0d141dacc278f04932ae51c13b3e
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
@@ -0,0 +1,74 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+ div(phi,U) Gauss filteredLinear2V 0.2 0.05;
+ div(phi,k) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
+ div(phi,Yi_h) Gauss multivariateSelection
+ {
+ O2 limitedLinear01 1;
+ N2 limitedLinear01 1;
+ CH4 limitedLinear01 1;
+ C3H8 limitedLinear01 1;
+ CORRUGATED limitedLinear01 1;
+ CH2O limitedLinear01 1;
+ H2O limitedLinear01 1;
+ CO2 limitedLinear01 1;
+ h limitedLinear 1;
+ };
+
+ div((muEff*dev2(T(grad(U))))) Gauss linear;
+ div(phiU,p) Gauss linear;
+ div(Ji,Ii_h) Gauss upwind;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ p_rgh;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
new file mode 100755
index 0000000000000000000000000000000000000000..c9c48e1c30d5406e140334924582d4d48c90fa5d
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
@@ -0,0 +1,111 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 0;
+ relTol 0.1;
+ };
+
+ rhoFinal
+ {
+ $rho;
+ tolerance 1e-6;
+ relTol 0;
+ };
+
+ p_rgh
+ {
+ solver GAMG;
+ tolerance 1e-5;
+ relTol 0.01;
+ smoother GaussSeidel;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ };
+
+ p_rghFinal
+ {
+ solver GAMG;
+ tolerance 1e-6;
+ relTol 0;
+ smoother GaussSeidel;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ //nCellsInCoarsestLevel 1;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ };
+
+ "(U|Yi|h|k)"
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-8;
+ relTol 0.1;
+ };
+
+ "(U|Yi|h|k)Final"
+ {
+ $U;
+ tolerance 1e-8;
+ relTol 0;
+ };
+
+ Ii
+ {
+ solver GAMG;
+ tolerance 1e-4;
+ relTol 0;
+ smoother DILU;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ maxIter 20;
+ }
+}
+
+PIMPLE
+{
+ momentumPredictor yes;
+ nOuterCorrectors 1;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+ fields
+ {
+ }
+ equations
+ {
+ "(U|k).*" 1;
+ "(C3H8|O2|H2O|CO2|h).*" 1;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
old mode 100644
new mode 100755
similarity index 76%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSchemes
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
index c311eb8961a0e5567560c8f89a87efadf31973fd..7ba1c2cc9d3e61f12a630003a6a8c55beaa363b2
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
@@ -10,51 +10,45 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
{
default Gauss linear;
- grad(p) Gauss linear;
}
divSchemes
{
- default none;
- div(phi,U) Gauss linear;
+ default none;
}
laplacianSchemes
{
default none;
- laplacian(nu,U) Gauss linear orthogonal;
- laplacian((1|A(U)),p) Gauss linear orthogonal;
+ laplacian(thermo:alpha,h) Gauss linear uncorrected;
+ laplacian(kappa,T) Gauss harmonic uncorrected;
}
interpolationSchemes
{
default linear;
- interpolate(HbyA) linear;
}
snGradSchemes
{
- default orthogonal;
+ default uncorrected;
}
fluxRequired
{
default no;
- p ;
}
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
old mode 100644
new mode 100755
similarity index 77%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSolution
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
index cc4750f16c98b1528266fdd6ea34f2d80b412fd9..f40565020a70931fff74a9f4f2bf2c502a03e5e0
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
@@ -10,14 +10,13 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p
+ h
{
solver PCG;
preconditioner DIC;
@@ -25,22 +24,38 @@ solvers
relTol 0;
}
- U
+ "Yi"
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
}
+
+ "rho|rhot"
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 0;
+ relTol 0;
+ };
+
}
-PISO
+SIMPLE
{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
+ nNonOrthCorr 0;
}
+relaxationFactors
+{
+ fields
+ {
+ }
+ equations
+ {
+ h 1;
+ }
+}
// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/topoSetDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
similarity index 61%
rename from applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/topoSetDict
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
index fca42b45f869a6a72d3437a1ab8f7c0f9dbce513..2c4402d4bd62ebc88c7ae5569cf023487853866b 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/cavity/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.2.1 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -12,11 +12,11 @@ FoamFile
class dictionary;
object topoSetDict;
}
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
- // Get 'T' of faces
{
name f0;
type faceSet;
@@ -24,39 +24,30 @@ actions
source boxToFace;
sourceInfo
{
- boxes
- (
- (0.0499 -100 -100)(0.0501 100 100)
- (0.03 0.0499 -100)(0.05 0.0501 100)
- );
+ box (-0.1 -2.1 -0.1)(0.201 2.51 0.01);
}
}
-// // Pick up some cells
-// {
-// name c0;
-// type cellSet;
-// action new;
-// source boxToCell;
-// sourceInfo
-// {
-// boxes
-// (
-// (-100 -100 -100)(0.05 0.05 100)
-// (0.05 0.05 -100)(100 100 100)
-// );
-// }
-// }
- // Convert faceSet to faceZone
{
- name f0;
+ name coupledWall;
+ type faceSet;
+ action new;
+ source patchToFace;
+ sourceInfo
+ {
+ name coupledWallTmp;
+ }
+ }
+
+ {
+ name coupledWall;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
- faceSet f0;
+ faceSet coupledWall;
}
}
);
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index 3731c816a3acf054ff89d0babbb582274050a767..4e19f9c7de191b5a27f4dfca980a761c634866ba 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
- div(phi,Yi_h) Gauss limitedLinear01 1;
- div(phi,h) Gauss limitedLinear 1;
+ div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
index abde516d9c98828a50c6ca65366574d9fa653228..e7d3368b02fbebdb38ef8236c31ec80c16af63d7 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun
@@ -4,15 +4,15 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-moveTimeMeshToConstant()
-{
- DT=`foamInfoExec -times | tail -1`
- if [ "$DT" != 0 ]
- then
- mv ${DT}/polyMesh/* constant/polyMesh
- rm -rf ${DT}
- fi
-}
+#moveTimeMeshToConstant()
+#{
+# DT=`foamInfoExec -times | tail -1`
+# if [ "$DT" != 0 ]
+# then
+# mv ${DT}/polyMesh/* constant/polyMesh
+# rm -rf ${DT}
+# fi
+#}
runApplication blockMesh
@@ -20,8 +20,8 @@ runApplication datToFoam grid256.dat
CONST="constant"
cat $CONST/pointsHeader $CONST/points.tmp > $CONST/polyMesh/points
-runApplication collapseEdges
-moveTimeMeshToConstant
+runApplication collapseEdges -overwrite
+#moveTimeMeshToConstant
echo "Changing patch type to wedge type in boundary file"
mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
index 0fb9d229742229e6b760a243b1add899a4d47823..347a7444d46b3fb1f0e7c992c07c1b975e201dd6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
@@ -30,9 +30,6 @@ baffles
zoneName baffleFaces;
- //- Optional flip
- //flip false;
-
patches
{
master
@@ -42,9 +39,7 @@ baffles
type mappedWall;
sampleMode nearestPatchFace;
- sampleRegion region0;
samplePatch baffle1Wall_1;
- offsetMode uniform;
offset (0 0 0);
@@ -121,9 +116,7 @@ baffles
type mappedWall;
sampleMode nearestPatchFace;
- sampleRegion region0;
samplePatch baffle1Wall_0;
- offsetMode uniform;
offset (0 0 0);
patchFields
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
index dd00d8dd674be6959d27445e21093d95a1d5e02e..1e91b43fba102408f657b912397c8816094abe12 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
@@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
- div(phi,Yi_h) Gauss limitedLinear01 1;
- div(phi,h) Gauss limitedLinear 1;
+ div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index bae61318bbdfcedfb88a544d74c1a9e069d543bd..77ec4eba8758af0c0513ea7ca1fdcf130678df6d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -47,8 +47,8 @@ runTimeModifiable yes;
adjustTimeStep yes;
-maxCo 0.5;
-maxAlphaCo 0.5;
+maxCo 1;
+maxAlphaCo 1;
maxDeltaT 1;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index 36156e86145c247b6b99b8a34bd10a54fbbc1434..9e473a7865023654a2e5865a837a2989d6071492 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -19,16 +19,25 @@ solvers
{
alpha.water
{
- nAlphaCorr 1;
- nAlphaSubCycles 2;
+ nAlphaCorr 2;
+ nAlphaSubCycles 1;
+ alphaOuterCorrectors yes;
cAlpha 1;
+
+ MULESCorr yes;
+ nLimiterIter 3;
+
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-8;
+ relTol 0;
}
pcorr
{
solver PCG;
preconditioner DIC;
- tolerance 1e-10;
+ tolerance 1e-5;
relTol 0;
}
@@ -43,14 +52,13 @@ solvers
p_rghFinal
{
$p_rgh;
- tolerance 1e-07;
relTol 0;
}
U
{
- solver PBiCG;
- preconditioner DILU;
+ solver smoothSolver;
+ smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}
@@ -58,10 +66,22 @@ solvers
PIMPLE
{
- momentumPredictor no;
- nCorrectors 3;
+ momentumPredictor no;
+ nOuterCorrectors 1;
+ nCorrectors 3;
nNonOrthogonalCorrectors 0;
}
+relaxationFactors
+{
+ fields
+ {
+ }
+ equations
+ {
+ ".*" 1;
+ }
+}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
index be315b40aceac6e99721857ec3b1f36b0585c46d..05b109778c550ad3fa1a6cb1a3a94641829382a8 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
application interFoam;
-startFrom latestTime;
+startFrom startTime;
startTime 0;
@@ -25,7 +25,7 @@ stopAt endTime;
endTime 100;
-deltaT 0.01;
+deltaT 0.1;
writeControl adjustableRunTime;
@@ -46,8 +46,9 @@ timePrecision 6;
runTimeModifiable yes;
adjustTimeStep yes;
-maxCo 0.5;
-maxAlphaCo 0.5;
+
+maxCo 6;
+maxAlphaCo 6;
maxDeltaT 1;
functions
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
index 40a4e9640d28f74370feee1d7cd01260e7248968..11fc30f2729251a04dbc6d17b621722ea785fbdb 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -27,12 +27,13 @@ gradSchemes
divSchemes
{
- div(rho*phi,U) Gauss linearUpwind grad(U);
- div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss interfaceCompression;
+ default none;
- div(phi,k) Gauss upwind;
- div(phi,omega) $div(phi,k);
+ div(rho*phi,U) Gauss linearUpwind grad(U);
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss interfaceCompression;
+
+ "div\(phi,(k|omega)\)" Gauss upwind;
div((muEff*dev(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
index d2428017c40d148cdeba93484b4f9caecbd33c46..f6208ef3d23141f4002c87e5a90a0d4207596194 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -20,8 +20,16 @@ solvers
alpha.water
{
nAlphaCorr 1;
- nAlphaSubCycles 3;
+ nAlphaSubCycles 1;
cAlpha 1;
+
+ MULESCorr yes;
+ nLimiterIter 3;
+
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-8;
+ relTol 0;
}
pcorr
@@ -30,9 +38,9 @@ solvers
preconditioner
{
preconditioner GAMG;
- tolerance 1e-05;
+ tolerance 1e-5;
relTol 0;
- smoother DICGaussSeidel;
+ smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
@@ -41,31 +49,43 @@ solvers
agglomerator faceAreaPair;
mergeLevels 1;
}
- tolerance 1e-10;
+ tolerance 1e-5;
relTol 0;
- maxIter 100;
+ maxIter 50;
}
p_rgh
{
- $pcorr;
- tolerance 1e-6;
- relTol 0.01;
+ solver GAMG;
+ tolerance 5e-9;
+ relTol 0.01;
+
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+
+ cacheAgglomeration true;
+
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+
+ maxIter 50;
};
p_rghFinal
{
$p_rgh;
- tolerance 1e-6;
+ tolerance 5e-9;
relTol 0;
}
"(U|k|omega).*"
{
solver smoothSolver;
- smoother GaussSeidel;
+ smoother symGaussSeidel;
nSweeps 1;
- tolerance 1e-7;
+ tolerance 1e-6;
relTol 0.1;
};
}
@@ -84,6 +104,7 @@ relaxationFactors
}
equations
{
+ ".*" 1;
}
}
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
index 8b9ef8e645041c16a8f156769cc5d6f6d74a0456..17c34d0093bec0469e5824177f10948c1f2b86ba 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
@@ -39,7 +39,7 @@ FoamFile
bullet
{
type wall;
- nFaces 37752;
+ nFaces 37743;
startFace 1133431;
}
)
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index ded24b94b605f04fe5d8e12d4d17c552382b5bf5..bc5571af9ea6e138c703ab98c0f193a4519e17d2 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -32,7 +32,6 @@ divSchemes
div(phi,k) Gauss linearUpwind grad(k);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression;
- UD Gauss upwind;
div((muEff*dev(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index f55c52ee564855bde82231ad16e98d275780af37..0c84553dbc46a185e94d5a3566429c14cd6a9c71 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index d3f22a16e83654868ecdc438167a2bd61f8df600..0ccc0c9b67888ba13c9ec849500c9b1e08d8fc52 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
index 155187199907bcc1ea0a526baea46812b3b29d63..58313dfb2b5c6f5d87e45ee056240033c9e61406 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
@@ -22,16 +22,12 @@ boundaryField
{
inlet
{
- type fixedValue;
- value $internalField;
+ type zeroGradient;
}
outlet
{
- type inletOutlet;
- phi phi.particles;
- inletValue $internalField;
- value $internalField;
+ type zeroGradient;
}
walls
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
index 4896cfb962a47eebb1ef639ae307045472f49060..a9af55993e23ff26e112eb927135b6667f7d6f45 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
@@ -22,8 +22,10 @@ boundaryField
{
inlet
{
- type fixedValue;
- value uniform (0 0.25 0);
+ type interstitialInletVelocity;
+ inletVelocity uniform (0 0.25 0);
+ alpha alpha.air;
+ value $internalField;
}
outlet
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
index 69666444bc1beb16275c2ac20a69f6c41cd4252e..b28a5a97d9b1034a39925ead65f04cd371860b89 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
@@ -22,8 +22,7 @@ boundaryField
{
inlet
{
- type fixedValue;
- value uniform 0;
+ type zeroGradient;
}
outlet
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index 2546db411275847e1db31badc51db945562292ac..1c6548cac37c3d48da4c96941dfb5f51b1683442 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index 894a1d3dde695dfefc79feee9f4dc781e88a905d..f5519a78a9b0119de56bfc6b6d2d03dc34d8bf2d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -87,7 +87,7 @@ solvers
PIMPLE
{
nOuterCorrectors 1;
- nCorrectors 3;
+ nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 549178c4c6d23cc27d375e5f3ec2f1c7084672ee..0bd5b9026ec94c19b121fe86056002cf740600e8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index 3fd8876cb600ec235534eb44522c437e989fb8df..c405673fdaadf30aa5668d1f433553970e5ebf59 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 9fc65bf8cbc74f0036a8175ef25d5f528fb57565..0360d1b8ce1d847bad66314a1e19d67cd5add7c7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index 894a1d3dde695dfefc79feee9f4dc781e88a905d..f5519a78a9b0119de56bfc6b6d2d03dc34d8bf2d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -87,7 +87,7 @@ solvers
PIMPLE
{
nOuterCorrectors 1;
- nCorrectors 3;
+ nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index c29b10072aedbfddf0ac04218b035914f8091684..61f5962400d0546881c35db9f00fdd5ec799191d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
"div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
- "div\(phi.*,.*rho.*\)" Gauss linear;
+ "div\(alphaPhi.*,.*rho.*\)" Gauss linear;
"div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
"div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;