From 12ec31f0c9aaa287e7d5b2ba7ddfcf39bf2fa545 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 5 Dec 2012 17:07:15 +0000
Subject: [PATCH] ENH: Updated sources handling in pimpleFoam
---
applications/solvers/incompressible/pimpleFoam/UEqn.H | 8 +++-----
.../solvers/incompressible/pimpleFoam/createZones.H | 4 ----
applications/solvers/incompressible/pimpleFoam/pEqn.H | 4 ++--
.../solvers/incompressible/pimpleFoam/pimpleFoam.C | 4 +---
4 files changed, 6 insertions(+), 14 deletions(-)
delete mode 100644 applications/solvers/incompressible/pimpleFoam/createZones.H
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index c274f6a2e8e..84a404654ab 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -5,12 +5,10 @@ tmp<fvVectorMatrix> UEqn
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ ==
+ sources(U)
);
-mrfZones.addCoriolis(UEqn());
-
-pZones.addResistance(UEqn());
-
UEqn().relax();
sources.constrain(UEqn());
@@ -19,5 +17,5 @@ volScalarField rAU(1.0/UEqn().A());
if (pimple.momentumPredictor())
{
- solve(UEqn() == -fvc::grad(p) + sources(U));
+ solve(UEqn() == -fvc::grad(p));
}
diff --git a/applications/solvers/incompressible/pimpleFoam/createZones.H b/applications/solvers/incompressible/pimpleFoam/createZones.H
deleted file mode 100644
index fcd02024d58..00000000000
--- a/applications/solvers/incompressible/pimpleFoam/createZones.H
+++ /dev/null
@@ -1,4 +0,0 @@
- IOMRFZoneList mrfZones(mesh);
- mrfZones.correctBoundaryVelocity(U);
-
- IOporosityModelList pZones(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index 1eb8590552b..9fc62bd9f13 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -1,5 +1,5 @@
volVectorField HbyA("HbyA", U);
-HbyA = rAU*(UEqn() == sources(U))().H();
+HbyA = rAU*UEqn().H();
if (pimple.nCorrPISO() <= 1)
{
@@ -15,7 +15,7 @@ surfaceScalarField phiHbyA
adjustPhi(phiHbyA, U, p);
-mrfZones.relativeFlux(phiHbyA);
+sources.relativeFlux(phiHbyA);
// Non-orthogonal pressure corrector loop
while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index d55af57e34d..8b0f240e4d6 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -30,8 +30,7 @@ Description
Sub-models include:
- turbulence modelling, i.e. laminar, RAS or LES
- - porosity (explicit treatment)
- - Multiple Reference Frame (MRF)
+ - run-time selectable sources, e.g. MRF, explicit porosity
\*---------------------------------------------------------------------------*/
@@ -51,7 +50,6 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
- #include "createZones.H"
#include "initContinuityErrs.H"
pimpleControl pimple(mesh);
--
GitLab