diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake index e47a184d7a..241e22eb1b 100755 --- a/applications/solvers/compressible/rhoPimpleFoam/Allwmake +++ b/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 diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/files deleted file mode 100644 index ff61e6022f..0000000000 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -rhoLTSPimpleFoam.C - -EXE = $(FOAM_APPBIN)/rhoLTSPimpleFoam diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/files new file mode 100644 index 0000000000..3b438a6177 --- /dev/null +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/files @@ -0,0 +1,3 @@ +rhoPorousMRFLTSPimpleFoam.C + +EXE = $(FOAM_APPBIN)/rhoPorousMRFLTSPimpleFoam diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options similarity index 77% rename from applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options index d16a0ee1d8..dcf5a81490 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C similarity index 94% rename from applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C index 06bcced406..9bceaa1167 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C @@ -22,11 +22,11 @@ License along with OpenFOAM. If not, see . 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; diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setInitialrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H similarity index 100% rename from applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setInitialrDeltaT.H rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H similarity index 95% rename from applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setrDeltaT.H rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H index 42fbe7e76b..80ccb1a560 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setrDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H @@ -70,7 +70,9 @@ && runTime.timeIndex() > runTime.startTimeIndex() + 1 ) { - rDeltaT = rDeltaT0*max(rDeltaT/rDeltaT0, 1.0 - rDeltaTDampingCoeff); + rDeltaT = + rDeltaT0 + *max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff); Info<< "Damped flow time scale min/max = " << gMin(1/rDeltaT.internalField()) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H index faae8152ca..2a9b92d9f0 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H @@ -2,7 +2,8 @@ tmp UEqn ( - pZones.ddt(rho, U) + //pZones.ddt(rho, U) + fvc::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) ); diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 9eee6f7cfa..4a0626e3d1 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H +++ b/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); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H index 82ac8a2fd2..7405dee8d5 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H @@ -1,6 +1,5 @@ // We do not have a top-level mesh. Construct the fvSolution for // the runTime instead. - runTime.readOpt() = IOobject::MUST_READ_IF_MODIFIED; fvSolution solutionDict(runTime); const dictionary& pimple = solutionDict.subDict("PIMPLE"); diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H index e227ee532d..98cd388d26 100644 --- a/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H +++ b/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) == diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H index fee0fe1a68..35394576f8 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H +++ b/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) == diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H index 3a4e6385ec..1e8d8da3e7 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H @@ -11,7 +11,7 @@ scalar rDeltaTSmoothingCoeff ( - piso.lookupOrDefault("rDeltaTSmoothingCoeff", 0.02) + piso.lookupOrDefault("rDeltaTSmoothingCoeff", 0.1) ); label nAlphaSpreadIter @@ -21,17 +21,17 @@ scalar alphaSpreadDiff ( - piso.lookupOrDefault