ENH: MRF: Remove ddtCorr from MRF regions

MRFZone: Filter-out excluded patches from ddtCorr
2018-02-10 22:46:17 +00:00 · 2018-02-10 22:46:17 +00:00 · 05f5a293bc
commit 05f5a293bc
parent fe4752d28a
29 changed files with 179 additions and 34 deletions
--- a/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H
@ -13,7 +13,10 @@ if (pimple.transonic())
       *(
            (
                fvc::flux(HbyA)
-              + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
+              + MRF.zeroFilter
+                (
+                    rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
+                )
            )
        )
    );
@ -47,7 +50,7 @@ else
        "phiHbyA",
        (
            fvc::flux(rho*HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
+          + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, rhoUf))
        )
    );

--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@ -11,7 +11,7 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
    )
  + phig
 );
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@ -17,7 +17,10 @@ if (pimple.transonic())
        fvc::interpolate(psi)
       *(
            fvc::flux(HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+          + MRF.zeroFilter
+            (
+                rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+            )
        )
    );

@ -49,7 +52,7 @@ else
        "phiHbyA",
        (
            fvc::flux(rho*HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)
+          + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
        )
    );

--- a/applications/solvers/combustion/reactingFoam/pcEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pcEqn.H
@ -17,8 +17,11 @@ if (pimple.transonic())
        fvc::interpolate(psi)
       *(
            fvc::flux(HbyA)
-          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
-           /fvc::interpolate(rho)
+          + MRF.zeroFilter
+            (
+                fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+               /fvc::interpolate(rho)
+            )
        )
    );

@ -61,7 +64,7 @@ else
        "phiHbyA",
        (
            fvc::flux(rho*HbyA)
-          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+          + MRF.zeroFilter(fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi))
        )
    );

--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
@ -15,7 +15,7 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
    )
  + phig
 );
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@ -20,7 +20,7 @@ surfaceScalarField phiHbyA
 (
    "phiHbyA",
    fvc::interpolate(rho)*fvc::flux(HbyA)
-  + rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf)
+  + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf))
 );

 fvc::makeRelative(phiHbyA, rho, U);
--- a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
@ -21,7 +21,10 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::interpolate(rho)*fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi, rhoUf)
+      + MRF.zeroFilter
+        (
+            fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi, rhoUf)
+        )
    )
 );

--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@ -9,7 +9,7 @@ surfaceScalarField phid
    fvc::interpolate(psi)
   *(
        fvc::flux(HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho))
    )
 );

--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@ -9,7 +9,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + rAUf*fvc::ddtCorr(U, phi)
+      + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, phi))
      + phig
    );

--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@ -19,7 +19,7 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
    )
  + phig
 );
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@ -19,7 +19,7 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
    )
  + phig
 );
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@ -4,7 +4,7 @@ surfaceScalarField phiHbyA
 (
    "phiHbyA",
    fvc::flux(HbyA)
-  + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi, Uf)
+  + MRF.zeroFilter(fvc::interpolate(rAU)*fvc::ddtCorr(U, phi, Uf))
 );

 MRF.makeRelative(phiHbyA);
--- a/applications/solvers/incompressible/pisoFoam/pEqn.H
+++ b/applications/solvers/incompressible/pisoFoam/pEqn.H
@ -4,7 +4,7 @@ surfaceScalarField phiHbyA
 (
    "phiHbyA",
    fvc::flux(HbyA)
-  + fvc::interpolate(rAU)*fvc::ddtCorr(U, phi)
+  + MRF.zeroFilter(fvc::interpolate(rAU)*fvc::ddtCorr(U, phi))
 );

 MRF.makeRelative(phiHbyA);
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@ -12,7 +12,10 @@ if (pimple.transonic())
        fvc::interpolate(psi)
       *(
            fvc::flux(HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+          + MRF.zeroFilter
+            (
+                rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+            )
        )
    );

@ -45,7 +48,7 @@ else
        "phiHbyA",
        (
            fvc::flux(rho*HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)
+          + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
        )
    );

--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@ -18,7 +18,7 @@ surfaceScalarField phiHbyA
    "phiHbyA",
    (
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi))
    )
  + phig
 );
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@ -20,7 +20,10 @@ if (pimple.transonic())
        fvc::interpolate(psi)
       *(
            fvc::flux(HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+          + MRF.zeroFilter
+            (
+                rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+            )
        )
    );

--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H
@ -20,7 +20,10 @@ if (pimple.transonic())
        fvc::interpolate(psi)
       *(
            fvc::flux(HbyA)
-          + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
+          + MRF.zeroFilter
+            (
+                rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
+            )
        )
    );

@ -53,7 +56,7 @@ else
    (
        "phiHbyA",
        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
+      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, rhoUf))
    );

    fvc::makeRelative(phiHbyA, rho, U);
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@ -6,7 +6,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
+      + MRF.zeroFilter(fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf))
    );
    MRF.makeRelative(phiHbyA);

--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H
@ -6,7 +6,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
+      + MRF.zeroFilter(fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi))
    );
    MRF.makeRelative(phiHbyA);

--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@ -6,7 +6,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
+      + MRF.zeroFilter(fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi))
    );
    MRF.makeRelative(phiHbyA);

--- a/applications/solvers/multiphase/driftFluxFoam/pEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/pEqn.H
@ -6,7 +6,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
+      + MRF.zeroFilter(fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi))
    );
    MRF.makeRelative(phiHbyA);
    adjustPhi(phiHbyA, U, p_rgh);
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@ -14,7 +14,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU())*fvc::ddtCorr(U, phi, Uf)
+      + MRF.zeroFilter(fvc::interpolate(rho*rAU())*fvc::ddtCorr(U, phi, Uf))
    );
    MRF.makeRelative(phiHbyA);

--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@ -98,7 +98,10 @@
        phiHbyAs[phasei] =
        (
            fvc::flux(HbyAs[phasei])
-          + rAlphaAUfs[phasei]*fvc::ddtCorr(phase.U(), phase.phi())
+          + MRF.zeroFilter
+            (
+                rAlphaAUfs[phasei]*fvc::ddtCorr(phase.U(), phase.phi())
+            )
        );
        MRF.makeRelative(phiHbyAs[phasei]);
        MRF.makeRelative(phase.phi().oldTime());
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
@ -11,7 +11,7 @@ surfaceScalarField phiHbyA
 (
    "phiHbyA",
    fvc::flux(HbyA)
-  + rAUf*fvc::ddtCorr(U, phi)
+  + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, phi))
 );

 MRF.makeRelative(phiHbyA);
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H
@ -12,7 +12,7 @@
    (
        "phiHbyA",
        fvc::flux(HbyA)
-      + rAUf*fvc::ddtCorr(U, Uf)
+      + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, Uf))
    );

    MRF.makeRelative(phiHbyA);
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -257,6 +257,10 @@ public:
        //- Correct the boundary velocity for the rotation of the MRF region
        void correctBoundaryVelocity(volVectorField& U) const;

+        //- Zero the MRF region of the given field
+        template<class Type>
+        void zero(GeometricField<Type, fvsPatchField, surfaceMesh>& phi) const;
+
        //- Update MRFZone faces if the mesh topology changes
        void update();

--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -184,6 +184,14 @@ public:
            surfaceScalarField& phi
        ) const;

+        //- Filter-out the MRF region contribution from the given field
+        // setting the corresponding values to zero
+        template<class Type>
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> zeroFilter
+        (
+            const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tphi
+        ) const;
+
        //- Update MRFZone faces if the mesh topology changes
        void update();

@ -210,6 +218,12 @@ public:

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

+#ifdef NoRepository
+    #include "MRFZoneListTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif

 // ************************************************************************* //
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneListTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneListTemplates.C
@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "MRFZoneList.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
+Foam::MRFZoneList::zeroFilter
+(
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tphi
+) const
+{
+    if (size())
+    {
+        tmp<surfaceScalarField> zphi
+        (
+            New
+            (
+                tphi,
+                "zeroFilter(" + tphi().name() + ')',
+                tphi().dimensions(),
+                true
+            )
+        );
+
+        forAll(*this, i)
+        {
+            operator[](i).zero(zphi.ref());
+        }
+
+        return zphi;
+    }
+    else
+    {
+        return tmp<surfaceScalarField>(tphi, true);
+    }
+}
+
+
+// ************************************************************************* //
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -207,4 +207,43 @@ void Foam::MRFZone::makeAbsoluteRhoFlux
 }


+template<class Type>
+void Foam::MRFZone::zero
+(
+    GeometricField<Type, fvsPatchField, surfaceMesh>& phi
+) const
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    Field<Type>& phii = phi.primitiveFieldRef();
+
+    forAll(internalFaces_, i)
+    {
+        phii[internalFaces_[i]] = Zero;
+    }
+
+    typename GeometricField<Type, fvsPatchField, surfaceMesh>::Boundary& phibf =
+        phi.boundaryFieldRef();
+
+    forAll(includedFaces_, patchi)
+    {
+        forAll(includedFaces_[patchi], i)
+        {
+            phibf[patchi][includedFaces_[patchi][i]] = Zero;
+        }
+    }
+
+    forAll(excludedFaces_, patchi)
+    {
+        forAll(excludedFaces_[patchi], i)
+        {
+            phibf[patchi][excludedFaces_[patchi][i]] = Zero;
+        }
+    }
+}
+
+
 // ************************************************************************* //