diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H index 66ac498923..db14dfaa86 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H @@ -1,6 +1,4 @@ { - rho = thermo.rho(); - // Thermodynamic density needs to be updated by psi*d(p) after the // pressure solution - done in 2 parts. Part 1: thermo.rho() -= psi*p; @@ -54,6 +52,7 @@ rho = thermo.rho(); rho = max(rho, rhoMin); rho = min(rho, rhoMax); + rho.relax(); Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl; } diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C index f99612eed6..a1a8d22846 100644 --- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C +++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,9 +108,27 @@ Foam::scalar Foam::layerAdditionRemoval::readOldThickness void Foam::layerAdditionRemoval::clearAddressing() const { - // Layer removal data - deleteDemandDrivenData(pointsPairingPtr_); - deleteDemandDrivenData(facesPairingPtr_); + if (pointsPairingPtr_) + { + if (debug) + { + Pout<< "layerAdditionRemoval::clearAddressing()" << nl + << " clearing pointsPairingPtr_" << endl; + } + + deleteDemandDrivenData(pointsPairingPtr_); + } + + if (facesPairingPtr_) + { + if (debug) + { + Pout<< "layerAdditionRemoval::clearAddressing()" << nl + << " clearing facesPairingPtr_" << endl; + } + + deleteDemandDrivenData(facesPairingPtr_); + } } diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution index 984e70bf68..b78de15ced 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution @@ -43,16 +43,16 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes index 1e91b43fba..73cdf5dcaa 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes @@ -29,12 +29,12 @@ divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinear 1; div(phi,Yi_h) Gauss limitedLinear 1; div(phi,K) Gauss limitedLinear 1; div(phid,p) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; - div(phi,k) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; div((muEff*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index cf6feec247..205e4f6276 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -24,10 +24,16 @@ solvers p { - solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0.1; + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal @@ -38,8 +44,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-6; relTol 0.1; } diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict index 808ac7e71c..073b1ed886 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 10; +endTime 5; deltaT 2e-4; diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution index e1353a6e33..6a9e257c0a 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution @@ -43,26 +43,30 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PCG; //PBiCG; - preconditioner DIC; //DILU; + solver GAMG; tolerance 1e-06; relTol 0; + smoother GaussSeidel; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } } diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution index d52e9d19e9..3603be1ce2 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -19,10 +19,16 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + solver GAMG; + tolerance 0; relTol 0.01; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal @@ -33,24 +39,24 @@ solvers U.air { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } U.airFinal { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution index b79164acae..e53bc1e515 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution @@ -43,8 +43,8 @@ solvers "(U|k|omega).*" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 8294bbda04..b30a44e775 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -56,8 +56,8 @@ solvers "(U|h|R|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } @@ -71,16 +71,12 @@ solvers "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0.1; + $h; } "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final" { $Yi; - preconditioner DILU; tolerance 1e-06; relTol 0; } @@ -107,4 +103,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution index b05dd58db6..b2d6387581 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal @@ -73,6 +79,7 @@ solvers } } + PIMPLE { nCorrectors 2; @@ -80,6 +87,7 @@ PIMPLE momentumPredictor yes; } + relaxationFactors { fields diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution index fcce5dd225..331f1752d7 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -49,7 +49,7 @@ solvers p_rgh { - solver GAMG; + solver GAMG; tolerance 0; relTol 0.1; smoother DICGaussSeidel; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution index b05dd58db6..be992a7810 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution index 86cdc388bf..1d67d6d259 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution index b05dd58db6..be992a7810 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index 7af9d07fae..85d0e7b998 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index 50950087e3..a42e10c1b5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index f52df1d2f8..d77e5f75e9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index 9cff5583eb..b9bb909f5b 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -34,18 +34,24 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + solver GAMG; + tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal