From a5f0ea6867149070a9404dfc994574ac8e238467 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 23 Apr 2014 14:34:07 +0100
Subject: [PATCH] multiphaseInterFoam: Added fvOptions support for MRF etc. and
added MRF tutorial Deleted MRFMultiphaseInterFoam
---
.../multiphase/multiphaseInterFoam/Allwclean | 2 +-
.../multiphase/multiphaseInterFoam/Allwmake | 1 -
.../MRFMultiphaseInterFoam.C | 110 ------------------
.../MRFMultiphaseInterFoam/Make/files | 3 -
.../MRFMultiphaseInterFoam/Make/options | 19 ---
.../MRFMultiphaseInterFoam/UEqn.H | 35 ------
.../MRFMultiphaseInterFoam/pEqn.H | 68 -----------
.../MRFMultiphaseInterFoam/zonePhaseVolumes.H | 26 -----
.../multiphaseInterFoam/Make/options | 10 +-
.../multiphase/multiphaseInterFoam/UEqn.H | 6 +
.../multiphaseInterFoam/createFields.H | 2 +
.../multiphaseInterFoam/multiphaseInterFoam.C | 3 +-
.../multiphase/multiphaseInterFoam/pEqn.H | 4 +-
.../laminar/mixerVessel2D/0.org}/U | 2 +-
.../laminar}/mixerVessel2D/0.org/alpha.air | 2 +-
.../mixerVessel2D/0.org/alpha.mercury | 2 +-
.../laminar}/mixerVessel2D/0.org/alpha.oil | 2 +-
.../laminar}/mixerVessel2D/0.org/alpha.water | 2 +-
.../laminar}/mixerVessel2D/0.org/p_rgh | 2 +-
.../laminar/mixerVessel2D/0}/U | 2 +-
.../laminar}/mixerVessel2D/0/alpha.air | 2 +-
.../laminar}/mixerVessel2D/0/alpha.mercury | 2 +-
.../laminar}/mixerVessel2D/0/alpha.oil | 2 +-
.../laminar}/mixerVessel2D/0/alpha.water | 2 +-
.../laminar}/mixerVessel2D/0/p_rgh | 2 +-
.../laminar}/mixerVessel2D/Allclean | 0
.../laminar}/mixerVessel2D/Allrun | 0
.../laminar}/mixerVessel2D/constant/g | 2 +-
.../constant/polyMesh/blockMeshDict.m4 | 2 +-
.../mixerVessel2D/constant/polyMesh/boundary | 4 +-
.../constant/transportProperties | 2 +-
.../constant/turbulenceProperties | 2 +-
.../laminar}/mixerVessel2D/makeMesh | 0
.../laminar}/mixerVessel2D/system/controlDict | 4 +-
.../laminar/mixerVessel2D/system/fvOptions} | 28 +++--
.../laminar}/mixerVessel2D/system/fvSchemes | 2 +-
.../laminar}/mixerVessel2D/system/fvSolution | 2 +-
.../mixerVessel2D/system/setFieldsDict | 2 +-
.../laminar}/mixerVessel2D/system/topoSetDict | 2 +-
39 files changed, 64 insertions(+), 301 deletions(-)
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/files
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/options
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/UEqn.H
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
delete mode 100644 applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/zonePhaseVolumes.H
rename tutorials/multiphase/{MRFMultiphaseInterFoam/mixerVessel2D/0 => multiphaseInterFoam/laminar/mixerVessel2D/0.org}/U (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0.org/alpha.air (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0.org/alpha.mercury (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0.org/alpha.oil (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0.org/alpha.water (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0.org/p_rgh (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam/mixerVessel2D/0.org => multiphaseInterFoam/laminar/mixerVessel2D/0}/U (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0/alpha.air (99%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0/alpha.mercury (99%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0/alpha.oil (99%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0/alpha.water (99%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/0/p_rgh (94%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/Allclean (100%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/Allrun (100%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/constant/g (93%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 (99%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/constant/polyMesh/boundary (91%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/constant/transportProperties (96%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/constant/turbulenceProperties (92%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/makeMesh (100%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/system/controlDict (92%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties => multiphaseInterFoam/laminar/mixerVessel2D/system/fvOptions} (62%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/system/fvSchemes (95%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/system/fvSolution (96%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/system/setFieldsDict (96%)
rename tutorials/multiphase/{MRFMultiphaseInterFoam => multiphaseInterFoam/laminar}/mixerVessel2D/system/topoSetDict (93%)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
index 6f55580c42a..6b5dc2e5c65 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean
@@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
+wclean libso multiphaseMixture
wclean
-wclean MRFMultiphaseInterFoam
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
index 6e47f91dd92..6ceded9c1a9 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
@@ -4,6 +4,5 @@ set -x
wmake libso multiphaseMixture
wmake
-wmake MRFMultiphaseInterFoam
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
deleted file mode 100644
index 8c73d798f6e..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
+++ /dev/null
@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Application
- MRFMultiphaseInterFoam
-
-Description
- Solver for n incompressible fluids which captures the interfaces and
- includes surface-tension and contact-angle effects for each phase.
-
- Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "multiphaseMixture.H"
-#include "turbulenceModel.H"
-#include "IOMRFZoneList.H"
-#include "pimpleControl.H"
-#include "fixedFluxPressureFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
- #include "setRootCase.H"
- #include "createTime.H"
- #include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
- #include "initContinuityErrs.H"
- #include "createFields.H"
- #include "createMRFZones.H"
- #include "readTimeControls.H"
- #include "createPrghCorrTypes.H"
- #include "correctPhi.H"
- #include "CourantNo.H"
- #include "setInitialDeltaT.H"
-
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
- Info<< "\nStarting time loop\n" << endl;
-
- while (runTime.run())
- {
- #include "readTimeControls.H"
- #include "CourantNo.H"
- #include "alphaCourantNo.H"
- #include "setDeltaT.H"
-
- runTime++;
-
- Info<< "Time = " << runTime.timeName() << nl << endl;
-
- mixture.solve();
- rho = mixture.rho();
- #include "zonePhaseVolumes.H"
-
- // --- Pressure-velocity PIMPLE corrector loop
- while (pimple.loop())
- {
- #include "UEqn.H"
-
- // --- Pressure corrector loop
- while (pimple.correct())
- {
- #include "pEqn.H"
- }
-
- if (pimple.turbCorr())
- {
- turbulence->correct();
- }
- }
-
- runTime.write();
-
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
- }
-
- Info<< "End\n" << endl;
-
- return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/files b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/files
deleted file mode 100644
index c4ed7d3fc42..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-MRFMultiphaseInterFoam.C
-
-EXE = $(FOAM_APPBIN)/MRFMultiphaseInterFoam
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/options
deleted file mode 100644
index 11e9aee8a52..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/Make/options
+++ /dev/null
@@ -1,19 +0,0 @@
-EXE_INC = \
- -I.. \
- -I../../interFoam \
- -I../../interFoam/MRFInterFoam \
- -I../multiphaseMixture/lnInclude \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
- -lmultiphaseInterFoam \
- -linterfaceProperties \
- -lincompressibleTransportModels \
- -lincompressibleTurbulenceModel \
- -lincompressibleRASModels \
- -lincompressibleLESModels \
- -lfiniteVolume
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/UEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/UEqn.H
deleted file mode 100644
index 3b860b975a7..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/UEqn.H
+++ /dev/null
@@ -1,35 +0,0 @@
- surfaceScalarField muEff
- (
- "muEff",
- mixture.muf()
- + fvc::interpolate(rho*turbulence->nut())
- );
-
- fvVectorMatrix UEqn
- (
- fvm::ddt(rho, U)
- + fvm::div(mixture.rhoPhi(), U)
- - fvm::laplacian(muEff, U)
- - (fvc::grad(U) & fvc::grad(muEff))
- //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
- );
- mrfZones.addCoriolis(rho, UEqn);
-
- UEqn.relax();
-
- if (pimple.momentumPredictor())
- {
- solve
- (
- UEqn
- ==
- fvc::reconstruct
- (
- (
- mixture.surfaceTensionForce()
- - ghf*fvc::snGrad(rho)
- - fvc::snGrad(p_rgh)
- ) * mesh.magSf()
- )
- );
- }
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
deleted file mode 100644
index 12862266769..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- volScalarField rAU("rAU", 1.0/UEqn.A());
- surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-
- volVectorField HbyA("HbyA", U);
- HbyA = rAU*UEqn.H();
-
- surfaceScalarField phiHbyA
- (
- "phiHbyA",
- (fvc::interpolate(HbyA) & mesh.Sf())
- + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
- );
- adjustPhi(phiHbyA, U, p_rgh);
- mrfZones.makeRelative(phiHbyA);
-
- surfaceScalarField phig
- (
- - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf()
- );
-
- phiHbyA += phig;
-
- // Update the fixedFluxPressure BCs to ensure flux consistency
- setSnGrad<fixedFluxPressureFvPatchScalarField>
- (
- p_rgh.boundaryField(),
- (
- phiHbyA.boundaryField()
- - mrfZones.relative(mesh.Sf().boundaryField() & U.boundaryField())
- )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
- );
-
- while (pimple.correctNonOrthogonal())
- {
- fvScalarMatrix p_rghEqn
- (
- fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
- );
-
- p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
-
- p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
-
- if (pimple.finalNonOrthogonalIter())
- {
- phi = phiHbyA - p_rghEqn.flux();
-
- U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
- U.correctBoundaryConditions();
- }
- }
-
- #include "continuityErrs.H"
-
- p == p_rgh + rho*gh;
-
- if (p_rgh.needReference())
- {
- p += dimensionedScalar
- (
- "p",
- p.dimensions(),
- pRefValue - getRefCellValue(p, pRefCell)
- );
- p_rgh = p - rho*gh;
- }
-}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/zonePhaseVolumes.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/zonePhaseVolumes.H
deleted file mode 100644
index 0c5d12217b5..00000000000
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/zonePhaseVolumes.H
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- const scalarField& V = mesh.V();
-
- forAll(mesh.cellZones(), czi)
- {
- const labelList& cellLabels = mesh.cellZones()[czi];
-
- forAllConstIter(PtrDictionary<phase>, mixture.phases(), iter)
- {
- const volScalarField& alpha = iter();
- scalar phaseVolume = 0;
-
- forAll(cellLabels, cli)
- {
- label celli = cellLabels[cli];
- phaseVolume += alpha[celli]*V[celli];
- }
-
- reduce(phaseVolume, sumOp<scalar>());
-
- Info<< alpha.name()
- << " phase volume in zone " << mesh.cellZones()[czi].name()
- << " = " << phaseVolume*1e6 << " ml " << endl;
- }
- }
-}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 022293a58fe..27f633d621e 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -5,7 +5,10 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lmultiphaseInterFoam \
@@ -14,4 +17,7 @@ EXE_LIBS = \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
- -lfiniteVolume
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
index fbcba7db72d..5dd13a4ecf5 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
@@ -3,10 +3,14 @@
fvm::ddt(rho, U)
+ fvm::div(mixture.rhoPhi(), U)
+ turbulence->divDevRhoReff(rho, U)
+ ==
+ fvOptions(rho, U)
);
UEqn.relax();
+ fvOptions.constrain(UEqn);
+
if (pimple.momentumPredictor())
{
solve
@@ -22,4 +26,6 @@
) * mesh.magSf()
)
);
+
+ fvOptions.correct(U);
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index 78fa0ec3098..c19f9ea9e3e 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -90,3 +90,5 @@
pRefValue - getRefCellValue(p, pRefCell)
);
}
+
+ fv::IOoptionList fvOptions(mesh);
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index d2c565b915c..fdd93eae5da 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.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-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,6 +36,7 @@ Description
#include "multiphaseMixture.H"
#include "turbulenceModel.H"
#include "pimpleControl.H"
+#include "fvIOoptionList.H"
#include "fixedFluxPressureFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index a40c2be91b9..8ce663528d1 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -12,6 +12,7 @@
+ fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
);
adjustPhi(phiHbyA, U, p_rgh);
+ fvOptions.makeRelative(phiHbyA);
surfaceScalarField phig
(
@@ -29,7 +30,7 @@
p_rgh.boundaryField(),
(
phiHbyA.boundaryField()
- - (mesh.Sf().boundaryField() & U.boundaryField())
+ - fvOptions.relative(mesh.Sf().boundaryField() & U.boundaryField())
)/(mesh.magSf().boundaryField()*rAUf.boundaryField())
);
@@ -50,6 +51,7 @@
U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
U.correctBoundaryConditions();
+ fvOptions.correct(U);
}
}
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/U
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
index b2024d5b773..b13f9a2d8cb 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
index 3b026125b2d..43635299383 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
index 7fb8dd6a40d..58a898efca4 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
index 43b245bed14..b8e2333b422 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
index 613e7cf1e90..cfa5d44c55d 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/p_rgh
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
index 3ea5cd88c81..7b7a6e046b2 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/U
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
index b2024d5b773..b13f9a2d8cb 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
index ed1b0a21f52..4cad3a396bc 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
index ad43adf298c..e414b356b61 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
index 8b4649379fa..1820db5e793 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
index 10bf5279e5d..de2872a5333 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
similarity index 94%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/p_rgh
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
index 3ea5cd88c81..7b7a6e046b2 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean
similarity index 100%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/Allclean
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
similarity index 100%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/Allrun
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
similarity index 93%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/g
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
index 36eafd9d27f..099c2ee8a62 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index baeabd14140..2b215888a71 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
similarity index 91%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
index 7ee4864d8bb..e1125126de8 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -20,12 +20,14 @@ FoamFile
rotor
{
type wall;
+ inGroups 1(wall);
nFaces 192;
startFace 5952;
}
stator
{
type wall;
+ inGroups 1(wall);
nFaces 192;
startFace 6144;
}
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
similarity index 96%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
index d74633a02a6..79b59a2cbbd 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
similarity index 92%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/turbulenceProperties
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index b2fc0a43429..8e0954f7116 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
similarity index 100%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/makeMesh
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
similarity index 92%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/controlDict
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
index 6d4e722854f..1f50b401575 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application MRFMultiphaseInterFoam;
+application multiphaseInterFoam;
startFrom startTime;
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvOptions
similarity index 62%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvOptions
index c9bc352a738..6cc02ab9a77 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvOptions
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,22 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
- object MRFProperties;
+ location "system";
+ object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-zone1
+MRF1
{
- cellZone rotor;
- active yes;
+ type MRFSource;
+ active yes;
+ selectionMode cellZone;
+ cellZone rotor;
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
+ MRFSourceCoeffs
+ {
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
- origin (0 0 0);
- axis (0 0 1);
- omega constant 6.2831853;
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 6.2831853;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
similarity index 95%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
index f2a3633fe52..17714c6ce73 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
similarity index 96%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
index cd2b6c16090..e6e9fbddd0d 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
similarity index 96%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
index d9e536a99f6..6e8f2f034c8 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
similarity index 93%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/topoSetDict
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
index 439171e72f2..8aa466295f7 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
+| \\ / O peration | Version: 2.3.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
--
GitLab