Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/compressible/rhoPimpleFoam/Allwmake

@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake
-wmake rhoLTSPimpleFoam
 wmake rhoPorousMRFPimpleFoam
+wmake rhoPorousMRFLTSPimpleFoam
 
 # ----------------------------------------------------------------- end-of-file

applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/files

@@ -1,3 +0,0 @@
-rhoLTSPimpleFoam.C
-
-EXE = $(FOAM_APPBIN)/rhoLTSPimpleFoam

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/files

@@ -0,0 +1,3 @@
+rhoPorousMRFLTSPimpleFoam.C
+
+EXE = $(FOAM_APPBIN)/rhoPorousMRFLTSPimpleFoam

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options

@@ -1,9 +1,11 @@
 EXE_INC = \
+    -I../rhoPorousMRFPimpleFoam \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lbasicThermophysicalModels \

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C

@@ -22,11 +22,11 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    rhoLTSPimpleFoam
+    rhoLTSPorousMRFPimpleFoam
 
 Description
     Transient solver for laminar or turbulent flow of compressible fluids
-    for HVAC and similar applications.
+    with support for porous media and MRF for HVAC and similar applications.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations with support for local time-stepping for
@@ -37,6 +37,8 @@ Description
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
+#include "MRFZones.H"
+#include "porousZones.H"
 #include "fvcSmooth.H"
 #include "pimpleLoop.H"
 #include "bound.H"
@@ -51,6 +53,7 @@ int main(int argc, char *argv[])
     #include "readPIMPLEControls.H"
     #include "setInitialrDeltaT.H"
     #include "createFields.H"
+    #include "createZones.H"
     #include "initContinuityErrs.H"
 
     Info<< "\nStarting time loop\n" << endl;

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H

@@ -2,7 +2,8 @@
 
 tmp<fvVectorMatrix> UEqn
 (
-    pZones.ddt(rho, U)
+    //pZones.ddt(rho, U)
+    fvc::ddt(rho, U)
   + fvm::div(phi, U)
   + turbulence->divDevRhoReff(U)
 );

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H

@@ -19,7 +19,7 @@ if (transonic)
         fvc::interpolate(psi)
        *(
             (fvc::interpolate(U) & mesh.Sf())
-        //+ fvc::ddtPhiCorr(rAU, rho, U, phi)
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
         )
     );
     mrfZones.relativeFlux(fvc::interpolate(psi), phid);
@@ -60,7 +60,7 @@ else
         fvc::interpolate(rho)*
         (
             (fvc::interpolate(U) & mesh.Sf())
-        //+ fvc::ddtPhiCorr(rAU, rho, U, phi)
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
         );
     mrfZones.relativeFlux(fvc::interpolate(rho), phi);
 

applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H

@@ -1,7 +1,7 @@
     fvVectorMatrix UEqn
     (
-//        fvm::ddt(rho, U)
+        //pZones.ddt(rho, U)
-        pZones.ddt(rho, U)
+        fvm::ddt(rho, U)
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H

@@ -1,7 +1,7 @@
     fvVectorMatrix UEqn
     (
-//        fvm::ddt(rho, U)
+        //pZones.ddt(rho, U)
-        pZones.ddt(rho, U)
+        fvm::ddt(rho, U)
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==

applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H

@@ -10,7 +10,8 @@
 
     fvVectorMatrix UEqn
     (
-        pZones.ddt(rho, U)
+        //pZones.ddt(rho, U)
+        fvc::ddt(rho, U)
       + fvm::div(rhoPhi, U)
       - fvm::laplacian(muEff, U)
       - (fvc::grad(U) & fvc::grad(muEff))

tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones

@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0
+()
+
+// ************************************************************************* //

tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     rhoLTSPimpleFoam;
+application     rhoPorousMRFLTSPimpleFoam;
 
 startFrom       startTime;
 

tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSolution

@@ -58,8 +58,8 @@ PIMPLE
     rhoMin            rhoMin [ 1 -3 0 0 0 ] 0.5;
     rhoMax            rhoMax [ 1 -3 0 0 0 ] 2.0;
 
-    maxCo             0.8;
+    maxCo             0.2;
-    rDeltaTSmoothingCoeff 0.02;
+    rDeltaTSmoothingCoeff 0.1;
     rDeltaTDampingCoeff 1;
     maxDeltaT         1;
 }

tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution

@@ -85,6 +85,7 @@ PISO
 
     maxCo           0.9;
     maxAlphaCo      0.2;
+    nAlphaSweepIter 1;
 
     rDeltaTSmoothingCoeff 0.1;
     rDeltaTDampingCoeff 1;