diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake index e47a184d7a10af357a2c9079c5c308107361774b..241e22eb1b6c4fd85d2b42836dcc7d78cbfa4915 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 ff61e6022f6a5fae2729c5bd287c2ddacd2390b1..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..3b438a61773fd05589a0a7d0131d152ceb99d258 --- /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 d16a0ee1d88a2d9a037f976e6f5b9bc7c7074261..dcf5a81490fdfecb93c5c995b24bf6b82e0ad9ce 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 06bcced40633352b106c0bb796db946663f2d4df..9bceaa1167a3a3600b94c1dea65fe7ffe0940867 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 <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; 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 100% rename from applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/setrDeltaT.H rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 9eee6f7cfa79061e044a76169ecc662315886866..4a0626e3d1d7d88f8ff22bccc275d297ca6c7835 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/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/T b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/T similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/T rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/T diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/U b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/U similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/U rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/U diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/alphat similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/alphat rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/alphat diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/epsilon similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/epsilon diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/k similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/k diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/mut similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/mut rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/mut diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/p b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/p similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/p rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/0/p diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/Allrun similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/Allrun diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones new file mode 100644 index 0000000000000000000000000000000000000000..8ed8ab7d22cedba15028e808dd29a50846532d86 --- /dev/null +++ b/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 +() + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/RASProperties similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/RASProperties diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/polyMesh/boundary similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/boundary rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/polyMesh/boundary diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/porousZones rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/porousZones diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/thermophysicalProperties rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/turbulenceProperties similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/turbulenceProperties diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/controlDict similarity index 96% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/controlDict rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/controlDict index ad6e941334f8abe5567a9d7175881ba4b6f7bcf9..ad7ca431894590621bed8fdec8f39476c0f95ed8 100644 --- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoLTSPimpleFoam; +application rhoPorousMRFLTSPimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes similarity index 100% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSolution similarity index 96% rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSolution rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSolution index 7367176b724fb916a5322123dcae91ab1e94bf19..89cbc0d794a6280ae371930eaa4123af3510cafa 100644 --- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSolution +++ b/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; - rDeltaTSmoothingCoeff 0.02; + maxCo 0.2; + rDeltaTSmoothingCoeff 0.1; rDeltaTDampingCoeff 1; maxDeltaT 1; }