From ee443e201f65dd90d74c863cc381c0463ed34c0d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 17 Nov 2018 19:42:23 +0000 Subject: [PATCH] Rationalised the handling of "Final" solver and relaxation factor settings Now for transient simulations "Final" solver settings are required for ALL equations providing consistency between the solution of velocity, energy, composition and radiation properties. However "Final" relaxation factors are no longer required for fields or equations and if not present the standard value for the variable will be applied. Given that relaxation factors other than 1 are rarely required for transient runs and hence the same for all iterations including the final one this approach provide simpler input while still providing the flexibility to specify a different value for the final iteration if required. For steady cases it is usual to execute just 1 outer iteration per time-step for which the standard relaxation factors are appropriate, and if more than one iteration is executed it is common to use the same factors for both. In the unlikely event of requiring different relaxation factors for the final iteration this is still possible to specify via the now optional "Final" specification. --- applications/solvers/DNS/dnsFoam/dnsFoam.C | 2 +- .../solvers/combustion/PDRFoam/pEqn.H | 4 +- .../combustion/XiFoam/XiEngineFoam/pEqn.H | 4 +- applications/solvers/combustion/XiFoam/pEqn.H | 4 +- .../solvers/combustion/chemFoam/YEqn.H | 8 +- .../solvers/combustion/fireFoam/YEEqn.H | 2 +- .../solvers/combustion/fireFoam/pEqn.H | 2 +- .../solvers/combustion/reactingFoam/YEqn.H | 2 +- .../solvers/combustion/reactingFoam/pEqn.H | 4 +- .../solvers/combustion/reactingFoam/pcEqn.H | 4 +- .../rhoReactingBuoyantFoam/pEqn.H | 2 +- .../solvers/compressible/rhoPimpleFoam/pEqn.H | 4 +- .../compressible/rhoPimpleFoam/pcEqn.H | 4 +- .../electromagnetics/mhdFoam/mhdFoam.C | 4 +- .../buoyantBoussinesqPimpleFoam/pEqn.H | 2 +- .../heatTransfer/buoyantPimpleFoam/pEqn.H | 2 +- .../chtMultiRegionFoam/fluid/YEqn.H | 2 +- .../chtMultiRegionFoam/fluid/pEqn.H | 2 +- .../solid/setRegionSolidFields.H | 1 - .../chtMultiRegionFoam/solid/solveSolid.H | 2 +- .../solvers/incompressible/icoFoam/icoFoam.C | 2 +- .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 2 +- .../pimpleFoam/SRFPimpleFoam/pEqn.H | 2 +- .../solvers/incompressible/pimpleFoam/pEqn.H | 2 +- .../solvers/incompressible/pisoFoam/pEqn.H | 2 +- .../shallowWaterFoam/shallowWaterFoam.C | 2 +- .../solvers/lagrangian/DPMFoam/pEqn.H | 2 +- .../lagrangian/coalChemistryFoam/YEqn.H | 2 +- .../lagrangian/coalChemistryFoam/pEqn.H | 4 +- .../lagrangian/reactingParcelFoam/YEqn.H | 2 +- .../lagrangian/reactingParcelFoam/pEqn.H | 2 +- .../simpleReactingParcelFoam/YEqn.H | 2 +- .../solvers/lagrangian/sprayFoam/YEqn.H | 2 +- .../solvers/lagrangian/sprayFoam/pEqn.H | 4 +- .../solvers/multiphase/cavitatingFoam/pEqn.H | 2 +- .../compressibleInterFilmFoam/pEqn.H | 2 +- .../multiphase/compressibleInterFoam/pEqn.H | 2 +- .../compressibleMultiphaseInterFoam/pEqn.H | 2 +- .../driftFluxFoam/alphaEqnSubCycle.H | 2 +- .../solvers/multiphase/driftFluxFoam/pEqn.H | 2 +- .../solvers/multiphase/interFoam/pEqn.H | 2 +- .../multiphase/interPhaseChangeFoam/pEqn.H | 2 +- .../multiphase/multiphaseEulerFoam/pEqn.H | 2 +- .../potentialFreeSurfaceFoam/pEqn.H | 2 +- .../reactingMultiphaseEulerFoam/YEqns.H | 2 +- .../reactingMultiphaseEulerFoam/pU/pEqn.H | 2 +- .../reactingMultiphaseEulerFoam/pUf/pEqn.H | 2 +- .../reactingTwoPhaseEulerFoam/YEqns.H | 4 +- .../reactingTwoPhaseEulerFoam/pU/pEqn.H | 2 +- .../reactingTwoPhaseEulerFoam/pUf/pEqn.H | 2 +- .../multiphase/twoLiquidMixingFoam/pEqn.H | 2 +- .../multiphase/twoPhaseEulerFoam/pU/pEqn.H | 2 +- .../multiphase/twoPhaseEulerFoam/pUf/pEqn.H | 2 +- .../GeometricField/GeometricField.C | 10 +- src/OpenFOAM/matrices/solution/solution.C | 11 -- src/OpenFOAM/matrices/solution/solution.H | 3 - .../cfdTools/general/CorrectPhi/CorrectPhi.C | 10 +- .../fvMatrices/fvMatrix/fvMatrix.C | 57 ++------ .../fvMatrices/fvMatrix/fvMatrix.H | 46 +++++- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 135 +++++++++++++++++- .../solvers/scalarTransport/scalarTransport.C | 4 +- .../reactingOneDim/reactingOneDim.C | 3 +- .../radiativeIntensityRay.C | 6 +- .../combustion/chemFoam/gri/system/fvSolution | 2 +- .../combustion/chemFoam/h2/system/fvSolution | 2 +- .../chemFoam/ic8h18/system/fvSolution | 2 +- .../chemFoam/ic8h18_TDAC/system/fvSolution | 2 +- .../chemFoam/nc7h16/system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../oppositeBurningPanels/system/fvSolution | 2 +- .../LES/smallPoolFire2D/system/fvSolution | 4 +- .../LES/smallPoolFire3D/system/fvSolution | 4 +- .../RAS/DLR_A_LTS/system/fvSolution | 2 +- .../RAS/SandiaD_LTS/system/fvSolution | 4 +- .../RAS/membrane/system/fvSolution | 2 +- .../counterFlowFlame2D/system/fvSolution | 2 +- .../counterFlowFlame2DLTS/system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../counterFlowFlame2D_GRI/system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../RAS/angledDuct/system/fvSolution | 10 +- .../RAS/mixerVessel2D/system/fvSolution | 5 +- .../hotRadiationRoom/system/fvSolution | 2 +- .../hotRadiationRoomFvDOM/system/fvSolution | 2 +- .../heatExchanger/system/air/fvSolution | 12 +- .../heatExchanger/system/porous/fvSolution | 13 +- .../heatedDuct/system/fluid/fvSolution | 4 +- .../system/bottomWater/fvSolution | 4 +- .../system/bottomAir/fvSolution | 12 +- .../system/heater/fvSolution | 2 +- .../reverseBurner/system/gas/fvSolution | 4 +- .../system/bottomAir/fvSolution | 4 +- .../SRFPimpleFoam/rotor2D/system/fvSolution | 4 +- .../RAS/TJunction/system/fvSolution | 4 +- .../RAS/TJunctionFan/system/createBafflesDict | 2 +- .../RAS/TJunctionFan/system/fvSolution | 4 +- .../mixerVesselAMI2D/system/fvSolution | 2 +- .../laminar/movingCone/system/fvSolution | 2 +- .../simpleFoam/pipeCyclic/system/fvSolution | 3 +- .../counterFlowFlame2DLTS/system/fvSolution | 2 +- .../cylinder/system/fvSolution | 13 +- .../filter/system/fvSolution | 2 +- .../hotBoxes/system/fvSolution | 4 +- .../parcelInBox/system/fvSolution | 2 +- .../splashPanel/system/fvSolution | 11 +- .../verticalChannel/system/fvSolution | 4 +- .../sprayFoam/aachenBomb/system/fvSolution | 13 +- .../backgroundMeshDecomposition/fvSolution | 5 +- .../mixerVessel/system/fvSolution | 5 +- .../RAS/sloshingTank2D/system/fvSolution | 2 +- .../laminar/damBreak4phase/system/fvSolution | 2 +- .../RAS/mixerVesselAMI/system/fvSolution | 5 +- .../sloshingCylinder/system/fvSolution | 2 +- .../laminar/sloshingTank2D/system/fvSolution | 2 +- .../sloshingTank2D3DoF/system/fvSolution | 2 +- .../laminar/sloshingTank3D/system/fvSolution | 2 +- .../sloshingTank3D3DoF/system/fvSolution | 2 +- .../sloshingTank3D6DoF/system/fvSolution | 2 +- .../laminar/testTubeMixer/system/fvSolution | 2 +- .../cavitatingBullet/system/fvSolution | 2 +- .../laminar/damBreak4phase/system/fvSolution | 2 +- .../damBreak4phaseFine/system/fvSolution | 2 +- .../laminar/mixerVessel2D/system/fvSolution | 2 +- .../wallBoiling1D_2phase/system/fvSolution | 10 +- .../wallBoiling1D_3phase/system/fvSolution | 10 +- .../system/fvSolution | 2 +- .../RAS/wallBoiling/system/fvSolution | 6 +- .../RAS/wallBoiling1D/system/fvSolution | 10 +- .../RAS/wallBoilingIATE/system/fvSolution | 6 +- .../wallBoilingPolyDisperse/system/fvSolution | 6 +- .../bubbleColumnEvaporating/system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../laminar/steamInjection/system/fvSolution | 2 +- 133 files changed, 376 insertions(+), 325 deletions(-) diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index 822782c168..f4a246da4e 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) fvm::laplacian(rAUf, p) == fvc::div(phiHbyA) ); - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); + pEqn.solve(piso.finalInnerIter()); phi = phiHbyA - pEqn.flux(); diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H index 390221f003..08733f4249 100644 --- a/applications/solvers/combustion/PDRFoam/pEqn.H +++ b/applications/solvers/combustion/PDRFoam/pEqn.H @@ -27,7 +27,7 @@ if (pimple.transonic()) betav*fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -57,7 +57,7 @@ else betav*fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H index fedaea7106..a2d20f7035 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H @@ -35,7 +35,7 @@ if (pimple.transonic()) fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -71,7 +71,7 @@ else fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H index afba129157..8ee2bec677 100644 --- a/applications/solvers/combustion/XiFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/pEqn.H @@ -29,7 +29,7 @@ if (pimple.transonic()) fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -64,7 +64,7 @@ else fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/chemFoam/YEqn.H b/applications/solvers/combustion/chemFoam/YEqn.H index edb4072b7d..9361b93e2f 100644 --- a/applications/solvers/combustion/chemFoam/YEqn.H +++ b/applications/solvers/combustion/chemFoam/YEqn.H @@ -3,10 +3,6 @@ { volScalarField& Yi = Y[specieI]; - solve - ( - fvm::ddt(rho, Yi) - chemistry.RR(specieI), - mesh.solver("Yi") - ); + solve(fvm::ddt(rho, Yi) - chemistry.RR(specieI), "Yi"); } -} \ No newline at end of file +} diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index de70ace85a..7699411c0a 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -36,7 +36,7 @@ tmp> mvConvection fvOptions.constrain(YiEqn); - YiEqn.solve(mesh.solver("Yi")); + YiEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H index 19cafee7ce..83e77a83a6 100644 --- a/applications/solvers/combustion/fireFoam/pEqn.H +++ b/applications/solvers/combustion/fireFoam/pEqn.H @@ -36,7 +36,7 @@ while (pimple.correctNonOrthogonal()) + fvOptions(psi, p_rgh, rho.name()) ); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H index 4d209a3d81..81b6b5c413 100644 --- a/applications/solvers/combustion/reactingFoam/YEqn.H +++ b/applications/solvers/combustion/reactingFoam/YEqn.H @@ -34,7 +34,7 @@ tmp> mvConvection fvOptions.constrain(YiEqn); - YiEqn.solve(mesh.solver("Yi")); + YiEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H index 9c30e8e7ec..57150a3758 100644 --- a/applications/solvers/combustion/reactingFoam/pEqn.H +++ b/applications/solvers/combustion/reactingFoam/pEqn.H @@ -37,7 +37,7 @@ if (pimple.transonic()) fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -72,7 +72,7 @@ else fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/reactingFoam/pcEqn.H b/applications/solvers/combustion/reactingFoam/pcEqn.H index 5ca9b4adca..23f77069fd 100644 --- a/applications/solvers/combustion/reactingFoam/pcEqn.H +++ b/applications/solvers/combustion/reactingFoam/pcEqn.H @@ -49,7 +49,7 @@ if (pimple.transonic()) fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -89,7 +89,7 @@ else fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H index d5feab6e53..072a27250a 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H @@ -41,7 +41,7 @@ while (pimple.correctNonOrthogonal()) - fvm::laplacian(rhorAUf, p_rgh) ); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 81b540d94e..4a6628b64a 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -54,7 +54,7 @@ if (pimple.transonic()) // Relax the pressure equation to ensure diagonal-dominance pEqn.relax(); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -76,7 +76,7 @@ else { fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAUf, p)); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H index a22f52ddb9..585b63d657 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pcEqn.H @@ -65,7 +65,7 @@ if (pimple.transonic()) // Relax the pressure equation to ensure diagonal-dominance pEqn.relax(); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -90,7 +90,7 @@ else { fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAtU, p)); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C index cd7dacec89..3566756ba0 100644 --- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C +++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) ); pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); + pEqn.solve(piso.finalInnerIter()); if (piso.finalNonOrthogonalIter()) { @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) fvm::laplacian(rABf, pB) == fvc::div(phiB) ); - pBEqn.solve(mesh.solver(pB.select(bpiso.finalInnerIter()))); + pBEqn.solve(bpiso.finalInnerIter()); if (bpiso.finalNonOrthogonalIter()) { diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H index 0eeb6e15a3..c5449fb3e8 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H @@ -27,7 +27,7 @@ p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H index 40081f0545..f999a3cdab 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H @@ -46,7 +46,7 @@ while (pimple.correctNonOrthogonal()) p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); } - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H index ef730cec6f..f532b95fc9 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H @@ -52,7 +52,7 @@ if (Y.size()) fvOptions.constrain(YiEqn); - YiEqn.solve(mesh.solver("Yi")); + YiEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H index 05446e6b60..c06a87d8c1 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H @@ -69,7 +69,7 @@ constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF); pressureControl.refValue() ); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H index aa736e7d9e..f99bbb4e8b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H @@ -1,4 +1,3 @@ -fvMesh& mesh = solidRegions[i]; solidThermo& thermo = thermos[i]; tmp trho = thermo.rho(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H index 697e902078..559ac80f38 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H @@ -17,7 +17,7 @@ fvOptions.constrain(hEqn); - hEqn.solve(mesh.solver(h.select(pimples.finalIter()))); + hEqn.solve(pimples.finalIter()); fvOptions.correct(h); } diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C index a4d247333d..5e89ca57c6 100644 --- a/applications/solvers/incompressible/icoFoam/icoFoam.C +++ b/applications/solvers/incompressible/icoFoam/icoFoam.C @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); + pEqn.solve(piso.finalInnerIter()); if (piso.finalNonOrthogonalIter()) { diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C index 48df861d74..fd078d60cc 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); + pEqn.solve(piso.finalInnerIter()); if (piso.finalNonOrthogonalIter()) { diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H index 3cb0580ba4..dec58939d3 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H @@ -40,7 +40,7 @@ while (pimple.correctNonOrthogonal()) pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H index e3c61fe37d..1266ec349a 100644 --- a/applications/solvers/incompressible/pimpleFoam/pEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H @@ -44,7 +44,7 @@ while (pimple.correctNonOrthogonal()) pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/incompressible/pisoFoam/pEqn.H b/applications/solvers/incompressible/pisoFoam/pEqn.H index 866d84e945..b1b7cb0023 100644 --- a/applications/solvers/incompressible/pisoFoam/pEqn.H +++ b/applications/solvers/incompressible/pisoFoam/pEqn.H @@ -26,7 +26,7 @@ while (piso.correctNonOrthogonal()) pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); + pEqn.solve(piso.finalInnerIter()); if (piso.finalNonOrthogonalIter()) { diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C index cf6bf2d576..ac84b52a23 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C +++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) - fvm::laplacian(ghrAUf, h) ); - hEqn.solve(mesh.solver(h.select(pimple.finalInnerIter()))); + hEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/lagrangian/DPMFoam/pEqn.H b/applications/solvers/lagrangian/DPMFoam/pEqn.H index 81efb9b9ff..0a05468efa 100644 --- a/applications/solvers/lagrangian/DPMFoam/pEqn.H +++ b/applications/solvers/lagrangian/DPMFoam/pEqn.H @@ -34,7 +34,7 @@ pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H index 49e3f70d89..354badc283 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H @@ -36,7 +36,7 @@ tmp> mvConvection fvOptions.constrain(YiEqn); - YiEqn.solve(mesh.solver("Yi")); + YiEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H index 0182e453ba..4c0dfdfc8d 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H @@ -33,7 +33,7 @@ if (pimple.transonic()) + fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -69,7 +69,7 @@ else + fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H index c7f9dbce34..9aa31d0878 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H @@ -37,7 +37,7 @@ tmp> mvConvection fvOptions.constrain(YEqn); - YEqn.solve(mesh.solver("Yi")); + YEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H index 8f8fe35c1a..d2cf6b8d28 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H @@ -46,7 +46,7 @@ while (pimple.correctNonOrthogonal()) - fvm::laplacian(rhorAUf, p_rgh) ); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H index 1510f8e391..f001916f1c 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H @@ -34,7 +34,7 @@ tmp> mvConvection fvOptions.constrain(YEqn); - YEqn.solve(mesh.solver("Yi")); + YEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/lagrangian/sprayFoam/YEqn.H b/applications/solvers/lagrangian/sprayFoam/YEqn.H index 60a27fec85..e2b6358878 100644 --- a/applications/solvers/lagrangian/sprayFoam/YEqn.H +++ b/applications/solvers/lagrangian/sprayFoam/YEqn.H @@ -35,7 +35,7 @@ tmp> mvConvection fvOptions.constrain(YEqn); - YEqn.solve(mesh.solver("Yi")); + YEqn.solve("Yi"); fvOptions.correct(Yi); diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H index cb5fd1a45b..774ef66af7 100644 --- a/applications/solvers/lagrangian/sprayFoam/pEqn.H +++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H @@ -42,7 +42,7 @@ if (pimple.transonic()) + fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { @@ -77,7 +77,7 @@ else + fvOptions(psi, p, rho.name()) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H index 716327bf74..ebf9af9bd7 100644 --- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H @@ -35,7 +35,7 @@ - fvm::laplacian(rhorAUf, p) ); - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); + pEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H index 5cdd9737d0..e434a4870d 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H @@ -108,7 +108,7 @@ solve ( p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); if (pimple.finalNonOrthogonalIter()) diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H index 87ae3d1328..7b95f5ee38 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H @@ -122,7 +122,7 @@ solve ( p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); if (pimple.finalNonOrthogonalIter()) diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H index f0d7e05ed2..f9a54b478b 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H @@ -90,7 +90,7 @@ ( p_rghEqnComp + p_rghEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); if (pimple.finalNonOrthogonalIter()) diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H index e77f66b880..8561b2ba55 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H @@ -54,7 +54,7 @@ - fvm::laplacian(turbulence->nut(), alpha1) ); - alpha1Eqn.solve(mesh.solver("alpha1Diffusion")); + alpha1Eqn.solve("alpha1Diffusion"); alphaPhi += alpha1Eqn.flux(); alpha2 = 1.0 - alpha1; diff --git a/applications/solvers/multiphase/driftFluxFoam/pEqn.H b/applications/solvers/multiphase/driftFluxFoam/pEqn.H index 7a2be2efd0..54ce2ae12c 100644 --- a/applications/solvers/multiphase/driftFluxFoam/pEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/pEqn.H @@ -32,7 +32,7 @@ p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H index e443f26984..eb46d4d864 100644 --- a/applications/solvers/multiphase/interFoam/pEqn.H +++ b/applications/solvers/multiphase/interFoam/pEqn.H @@ -47,7 +47,7 @@ p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H index 50dabd056c..a8a8abf87c 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H @@ -52,7 +52,7 @@ p_rghEqn.setReference(pRefCell, pRefValue); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H index a30c128a8f..78e8134962 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H @@ -230,7 +230,7 @@ // + (alpha2/rho2)*pEqnComp2() // ) + pEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); if (pimple.finalNonOrthogonalIter()) diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H index 773efc099a..97d3508212 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H @@ -36,7 +36,7 @@ while (pimple.correctNonOrthogonal()) p_ghEqn.setReference(p_ghRefCell, p_ghRefValue); - p_ghEqn.solve(mesh.solver(p_gh.select(pimple.finalInnerIter()))); + p_ghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H index 73eb99dd8c..75e071490f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H @@ -24,7 +24,7 @@ ); YiEqn.relax(); - YiEqn.solve(mesh.solver("Yi")); + YiEqn.solve("Yi"); } } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H index 5e488110b0..2113e6b05b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H @@ -373,7 +373,7 @@ while (pimple.correct()) solve ( pEqn, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H index 98da1ded9b..be40ca851e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H @@ -361,7 +361,7 @@ while (pimple.correct()) solve ( pEqn, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H index 1283435363..e67460d2e3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H @@ -20,7 +20,7 @@ ); Y1iEqn.relax(); - Y1iEqn.solve(mesh.solver("Yi")); + Y1iEqn.solve("Yi"); } } @@ -39,7 +39,7 @@ ); Y2iEqn.relax(); - Y2iEqn.solve(mesh.solver("Yi")); + Y2iEqn.solve("Yi"); } } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H index d94526e01f..ff93db349e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H @@ -329,7 +329,7 @@ while (pimple.correct()) solve ( pEqn, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H index c5d0e78697..fe3be3b3c6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H @@ -339,7 +339,7 @@ while (pimple.correct()) solve ( pEqn, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); } diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H index d801fb8fa5..99515c2bcb 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H @@ -29,7 +29,7 @@ p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell)); - p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); + p_rghEqn.solve(pimple.finalInnerIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H index 71d75bd26e..6aeb30f5db 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H @@ -312,7 +312,7 @@ while (pimple.correct()) solve ( pEqnComp1() + pEqnComp2() + pEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); // Correct fluxes and velocities on last non-orthogonal iteration diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H index 0e1b3b7ff6..37247ec519 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H @@ -291,7 +291,7 @@ while (pimple.correct()) solve ( pEqnComp1() + pEqnComp2() + pEqnIncomp, - mesh.solver(p_rgh.select(pimple.finalInnerIter())) + pimple.finalInnerIter() ); if (pimple.finalNonOrthogonalIter()) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index b562eec28b..bd53823bfa 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -959,8 +959,6 @@ void Foam::GeometricField::relax(const scalar alpha) template class PatchField, class GeoMesh> void Foam::GeometricField::relax() { - word name = this->name(); - if ( this->mesh().data::template lookupOrDefault @@ -968,14 +966,14 @@ void Foam::GeometricField::relax() "finalIteration", false ) + && this->mesh().relaxField(this->name() + "Final") ) { - name += "Final"; + relax(this->mesh().fieldRelaxationFactor(this->name() + "Final")); } - - if (this->mesh().relaxField(name)) + else if (this->mesh().relaxField(this->name())) { - relax(this->mesh().fieldRelaxationFactor(name)); + relax(this->mesh().fieldRelaxationFactor(this->name())); } } diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C index 2dd8322f10..913d4f2691 100644 --- a/src/OpenFOAM/matrices/solution/solution.C +++ b/src/OpenFOAM/matrices/solution/solution.C @@ -350,17 +350,6 @@ const Foam::dictionary& Foam::solution::solverDict(const word& name) const } -const Foam::dictionary& Foam::solution::solver(const word& name) const -{ - if (debug) - { - Info<< "Lookup solver for " << name << endl; - } - - return solvers_.subDict(name); -} - - bool Foam::solution::read() { if (regIOobject::read()) diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H index a86a9e8a6b..70792738fd 100644 --- a/src/OpenFOAM/matrices/solution/solution.H +++ b/src/OpenFOAM/matrices/solution/solution.H @@ -140,9 +140,6 @@ public: //- Return the solver controls dictionary for the given field const dictionary& solverDict(const word& name) const; - //- Return the solver controls dictionary for the given field - const dictionary& solver(const word& name) const; - // Read diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C index 2cfb35e8a7..a9e145270a 100644 --- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C +++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C @@ -103,10 +103,7 @@ void Foam::CorrectPhi pcorrEqn.setReference(0, 0); - pcorrEqn.solve - ( - mesh.solver(pcorr.select(pimple.finalNonOrthogonalIter())) - ); + pcorrEqn.solve(pimple.finalNonOrthogonalIter()); if (pimple.finalNonOrthogonalIter()) { @@ -178,10 +175,7 @@ void Foam::CorrectPhi divRhoU ); - pcorrEqn.solve - ( - mesh.solver(pcorr.select(pimple.finalNonOrthogonalIter())) - ); + pcorrEqn.solve(pimple.finalNonOrthogonalIter()); if (pimple.finalNonOrthogonalIter()) { diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index a8a72515d9..5840d2c628 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -673,15 +673,18 @@ void Foam::fvMatrix::relax(const scalar alpha) template void Foam::fvMatrix::relax() { - word name = psi_.select + if ( psi_.mesh().data::template lookupOrDefault ("finalIteration", false) - ); - - if (psi_.mesh().relaxEquation(name)) + && psi_.mesh().relaxEquation(psi_.name() + "Final") + ) { - relax(psi_.mesh().equationRelaxationFactor(name)); + relax(psi_.mesh().equationRelaxationFactor(psi_.name() + "Final")); + } + else if (psi_.mesh().relaxEquation(psi_.name())) + { + relax(psi_.mesh().equationRelaxationFactor(psi_.name())); } } @@ -1332,50 +1335,6 @@ void Foam::checkMethod } -template -Foam::SolverPerformance Foam::solve -( - fvMatrix& fvm, - const dictionary& solverControls -) -{ - return fvm.solve(solverControls); -} - -template -Foam::SolverPerformance Foam::solve -( - const tmp>& tfvm, - const dictionary& solverControls -) -{ - SolverPerformance solverPerf = - const_cast&>(tfvm()).solve(solverControls); - - tfvm.clear(); - - return solverPerf; -} - - -template -Foam::SolverPerformance Foam::solve(fvMatrix& fvm) -{ - return fvm.solve(); -} - -template -Foam::SolverPerformance Foam::solve(const tmp>& tfvm) -{ - SolverPerformance solverPerf = - const_cast&>(tfvm()).solve(); - - tfvm.clear(); - - return solverPerf; -} - - template Foam::tmp> Foam::correction ( diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H index 9186fce8bd..c4ffd86168 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H @@ -402,6 +402,19 @@ public: // Use the given solver controls SolverPerformance solveCoupled(const dictionary&); + //- Solve segregated or coupled returning the solution statistics. + // Solver controls read from fvSolution + SolverPerformance solve(const word& name); + + //- Solve segregated or coupled returning the solution statistics. + // Solver controls read from fvSolution + // Required to avoid ambiguity from char* -> bool conversion + SolverPerformance solve(const char* name); + + //- Solve returning the solution statistics. + // Solver controls read from fvSolution + SolverPerformance solve(const bool final); + //- Solve returning the solution statistics. // Solver controls read from fvSolution SolverPerformance solve(); @@ -552,8 +565,13 @@ void checkMethod //- Solve returning the solution statistics given convergence tolerance // Use the given solver controls template -SolverPerformance solve(fvMatrix&, const dictionary&); +SolverPerformance solve(fvMatrix&, const word&); +//- Solve returning the solution statistics given convergence tolerance +// Use the given solver controls +// Required to avoid ambiguity from char* -> bool conversion +template +SolverPerformance solve(fvMatrix&, const char*); //- Solve returning the solution statistics given convergence tolerance, // deleting temporary matrix after solution. @@ -562,29 +580,47 @@ template SolverPerformance solve ( const tmp>&, - const dictionary& + const word& ); +//- Solve returning the solution statistics given convergence tolerance, +// deleting temporary matrix after solution. +// Use the given solver controls +// Required to avoid ambiguity from char* -> bool conversion +template +SolverPerformance solve +( + const tmp>&, + const char* +); + +//- Solve returning the solution statistics given convergence tolerance +// Solver controls read fvSolution +template +SolverPerformance solve(fvMatrix&, const bool final); + +//- Solve returning the solution statistics given convergence tolerance, +// deleting temporary matrix after solution. +// Solver controls read fvSolution +template +SolverPerformance solve(const tmp>&, const bool final); //- Solve returning the solution statistics given convergence tolerance // Solver controls read fvSolution template SolverPerformance solve(fvMatrix&); - //- Solve returning the solution statistics given convergence tolerance, // deleting temporary matrix after solution. // Solver controls read fvSolution template SolverPerformance solve(const tmp>&); - //- Return the correction form of the given matrix // by subtracting the matrix multiplied by the current field template tmp> correction(const fvMatrix&); - //- Return the correction form of the given temporary matrix // by subtracting the matrix multiplied by the current field template diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index 3511de25b1..7b2ff68d59 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -311,17 +311,44 @@ Foam::SolverPerformance Foam::fvMatrix::fvSolver::solve() template -Foam::SolverPerformance Foam::fvMatrix::solve() +Foam::SolverPerformance Foam::fvMatrix::solve(const word& name) { return solve ( psi_.mesh().solverDict ( - psi_.select - ( - psi_.mesh().data::template lookupOrDefault - ("finalIteration", false) - ) + psi_.mesh().data::template lookupOrDefault + ("finalIteration", false) + ? word(name + "Final") + : name + ) + ); +} + + +template +Foam::SolverPerformance Foam::fvMatrix::solve(const char* name) +{ + return solve(word(name)); +} + + +template +Foam::SolverPerformance Foam::fvMatrix::solve(const bool final) +{ + return solve(psi_.mesh().solverDict(psi_.select(final))); +} + + +template +Foam::SolverPerformance Foam::fvMatrix::solve() +{ + return solve + ( + psi_.mesh().data::template lookupOrDefault + ( + "finalIteration", + false ) ); } @@ -366,4 +393,100 @@ Foam::tmp> Foam::fvMatrix::residual() const } +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +template +Foam::SolverPerformance Foam::solve +( + fvMatrix& fvm, + const word& name +) +{ + return fvm.solve(name); +} + + +template +Foam::SolverPerformance Foam::solve +( + fvMatrix& fvm, + const char* name +) +{ + return fvm.solve(name); +} + + +template +Foam::SolverPerformance Foam::solve +( + const tmp>& tfvm, + const word& name +) +{ + SolverPerformance solverPerf = + const_cast&>(tfvm()).solve(name); + + tfvm.clear(); + + return solverPerf; +} + + +template +Foam::SolverPerformance Foam::solve +( + const tmp>& tfvm, + const char* name +) +{ + SolverPerformance solverPerf = + const_cast&>(tfvm()).solve(name); + + tfvm.clear(); + + return solverPerf; +} + + +template +Foam::SolverPerformance Foam::solve(fvMatrix& fvm, const bool final) +{ + return fvm.solve(final); +} + +template +Foam::SolverPerformance Foam::solve +( + const tmp>& tfvm, + const bool final +) +{ + SolverPerformance solverPerf = + const_cast&>(tfvm()).solve(final); + + tfvm.clear(); + + return solverPerf; +} + + +template +Foam::SolverPerformance Foam::solve(fvMatrix& fvm) +{ + return fvm.solve(); +} + +template +Foam::SolverPerformance Foam::solve(const tmp>& tfvm) +{ + SolverPerformance solverPerf = + const_cast&>(tfvm()).solve(); + + tfvm.clear(); + + return solverPerf; +} + + // ************************************************************************* // diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index be26770267..a179a6ebf3 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -224,7 +224,7 @@ bool Foam::functionObjects::scalarTransport::execute() fvOptions_.constrain(sEqn); - sEqn.solve(mesh_.solverDict(schemesField_)); + sEqn.solve(schemesField_); } } else if (phi.dimensions() == dimVolume/dimTime) @@ -244,7 +244,7 @@ bool Foam::functionObjects::scalarTransport::execute() fvOptions_.constrain(sEqn); - sEqn.solve(mesh_.solverDict(schemesField_)); + sEqn.solve(schemesField_); } } else diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 306faf45f8..594f481ceb 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -296,13 +296,12 @@ void reactingOneDim::solveSpeciesMass() } - YiEqn.solve(regionMesh().solver("Yi")); + YiEqn.solve("Yi"); Yi.max(0.0); Yt += Yi; } Ys_[Ys_.size() - 1] = 1.0 - Yt; - } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 7846432c0d..9c364b9a5c 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -269,11 +269,7 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct() IiEq.relax(); - const solverPerformance ILambdaSol = solve - ( - IiEq, - mesh_.solver("Ii") - ); + const solverPerformance ILambdaSol = solve(IiEq, "Ii"); const scalar initialRes = ILambdaSol.initialResidual()*omega_/dom_.omegaMax(); diff --git a/tutorials/combustion/chemFoam/gri/system/fvSolution b/tutorials/combustion/chemFoam/gri/system/fvSolution index 2dc91054b9..de8f6dd3d3 100644 --- a/tutorials/combustion/chemFoam/gri/system/fvSolution +++ b/tutorials/combustion/chemFoam/gri/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/combustion/chemFoam/h2/system/fvSolution b/tutorials/combustion/chemFoam/h2/system/fvSolution index 2dc91054b9..de8f6dd3d3 100644 --- a/tutorials/combustion/chemFoam/h2/system/fvSolution +++ b/tutorials/combustion/chemFoam/h2/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution index 2dc91054b9..de8f6dd3d3 100644 --- a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution +++ b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution index 2dc91054b9..de8f6dd3d3 100644 --- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution +++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution index 2dc91054b9..de8f6dd3d3 100644 --- a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution +++ b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution index 5aa654a58e..90e577b165 100644 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution @@ -70,7 +70,7 @@ solvers relTol 0; }; - Ii + "Ii.*" { solver GAMG; tolerance 1e-4; diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution index 84800c3ad7..82a6f9862e 100644 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution @@ -60,7 +60,7 @@ solvers relTol 0; }; - Ii + "Ii.*" { solver GAMG; tolerance 1e-4; diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution index 419f0268e3..c959476d57 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution @@ -71,7 +71,7 @@ solvers }; - Ii + "Ii.*" { solver GAMG; tolerance 1e-4; @@ -81,7 +81,7 @@ solvers nPostSweeps 1; } - G + "G.*" { solver PCG; preconditioner DIC; diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution index 783fdbf4f9..7c884e7b02 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution @@ -62,7 +62,7 @@ solvers relTol 0; }; - Ii + "Ii.*" { solver GAMG; tolerance 1e-4; @@ -72,7 +72,7 @@ solvers nPostSweeps 1; } - G + "G.*" { solver PCG; preconditioner DIC; diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution index 633918667c..89bb3b3423 100644 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution @@ -49,7 +49,7 @@ solvers $U; } - Yi + "Yi.*" { solver PBiCG; preconditioner DILU; diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution index 058975a876..ee150c3336 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution @@ -49,7 +49,7 @@ solvers $U; } - Yi + "Yi.*" { solver PBiCGStab; preconditioner DILU; @@ -57,7 +57,7 @@ solvers relTol 0.1; } - G + "G.*" { solver PCG; preconditioner DIC; diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution index 3c3c9f9d8c..354d7d4e71 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution +++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution @@ -51,7 +51,7 @@ solvers relTol 0; } - Yi + "Yi.*" { $hFinal; } diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution index e0e862c192..4561ee7d7b 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution @@ -51,7 +51,7 @@ solvers relTol 0; } - Yi + "Yi.*" { $hFinal; } diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution index b7fee64118..4333d752b4 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution @@ -50,7 +50,7 @@ solvers relTol 0.1; } - Yi + "Yi.*" { $U; relTol 0.1; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution index 40761a51a6..c552bb7ea1 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution @@ -50,7 +50,7 @@ solvers relTol 0.1; } - Yi + "Yi.*" { $U; relTol 0.1; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution index e0e862c192..4561ee7d7b 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution @@ -51,7 +51,7 @@ solvers relTol 0; } - Yi + "Yi.*" { $hFinal; } diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution index e0e862c192..4561ee7d7b 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution @@ -51,7 +51,7 @@ solvers relTol 0; } - Yi + "Yi.*" { $hFinal; } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution index 6c1968e267..4cc4f03ca0 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution @@ -75,14 +75,14 @@ relaxationFactors { fields { - "p.*" 1; - "rho.*" 1; + p 1; + rho 1; } equations { - "U.*" 0.9; - "e.*" 0.7; - "(k|epsilon|omega).*" 0.8; + U 0.9; + e 0.7; + "(k|epsilon|omega)" 0.8; } } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution index 393da22479..9e1378032c 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution @@ -97,10 +97,7 @@ relaxationFactors { equations { - "U.*" 1; - "h.*" 1; - "k.*" 1; - "epsilon.*" 1; + ".*" 1; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution index fac1c44589..3a2b7d22b4 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution @@ -33,7 +33,7 @@ solvers relTol 0.1; } - G + "G.*" { $p_rgh; tolerance 1e-05; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution index 9a717ed538..c31df7e6cb 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0.01; } - Ii + "Ii.*" { solver GAMG; tolerance 1e-4; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution index c3c9c93d0e..06ca79167f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution @@ -44,16 +44,16 @@ relaxationFactors { fields { - "rho.*" 1; - "p_rgh.*" 0.7; + rho 1; + p_rgh 0.7; } equations { - "U.*" 0.3; - "(h|e).*" 0.3; - "k.*" 0.3; - "epsilon.*" 0.3; + U 0.3; + "(h|e)" 0.3; + k 0.3; + epsilon 0.3; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution index fd9c32472b..bcda6fe3c0 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution @@ -44,15 +44,16 @@ relaxationFactors { fields { - "rho.*" 1; - "p_rgh.*" 0.7; + rho 1; + p_rgh 0.7; } + equations { - "U.*" 0.3; - "(h|e).*" 0.3; - "k.*" 0.3; - "epsilon.*" 0.3; + U 0.3; + "(h|e)" 0.3; + k 0.3; + epsilon 0.3; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/fluid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/fluid/fvSolution index 5de159d441..b382ca717b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/fluid/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/fluid/fvSolution @@ -65,8 +65,8 @@ relaxationFactors { equations { - "h.*" 1; - "U.*" 1; + h 1; + U 1; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution index 2ab18c9cbb..6cdedce8d2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution @@ -75,8 +75,8 @@ relaxationFactors { equations { - "h.*" 1; - "U.*" 1; + h 1; + U 1; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution index 0f9ba66a75..d3c959e8e4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution @@ -47,15 +47,15 @@ relaxationFactors { fields { - "rho.*" 1.0; - "p_rgh.*" 0.7; + rho 1.0; + p_rgh 0.7; } equations { - "U.*" 0.3; - "h.*" 0.7; - "(k|epsilon|omega).*" 0.7; - "qr.*" 0.7; + U 0.3; + h 0.7; + "(k|epsilon|omega)" 0.7; + qr 0.7; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution index 009290b85d..f6a0634a7a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution @@ -34,7 +34,7 @@ relaxationFactors { equations { - "h.*" 0.7; + h 0.7; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution index 739c60bf48..30c2ba1f6e 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution @@ -73,8 +73,8 @@ relaxationFactors { equations { - "h.*" 1; - "U.*" 1; + h 1; + U 1; } } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution index 58c9cd98fe..3d08ff8558 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution @@ -68,8 +68,8 @@ relaxationFactors { equations { - "h.*" 1; - "U.*" 1; + h 1; + U 1; } } diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution index 5c2dff431e..f0238eb51a 100644 --- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution +++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution @@ -73,9 +73,7 @@ relaxationFactors { equations { - "Urel.*" 1; - "k.*" 1; - "epsilon.*" 1; + ".*" 1; } } diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution index ab5e5fe556..3e57d94552 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution @@ -62,9 +62,7 @@ relaxationFactors { equations { - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; + ".*" 1; } } diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict index d43b198617..150cccafb5 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict @@ -94,7 +94,7 @@ baffles { p { - type fan; + type fanPressureJump; patchType cyclic; jump uniform 0; value uniform 0; diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution index ab5e5fe556..3e57d94552 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution @@ -62,9 +62,7 @@ relaxationFactors { equations { - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; + ".*" 1; } } diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution index 78a4951e2e..891ae1ad0e 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution @@ -80,7 +80,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution index 8b1218dd8b..276504b1e3 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution @@ -76,7 +76,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution index cf39b51851..b0a4c3a53a 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution @@ -75,11 +75,12 @@ relaxationFactors { p 0.3; } + equations { U 0.7; k 0.7; - "epsilon.*" 0.7; + epsilon 0.7; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution index 761c50a167..bbe8ad89b2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution @@ -50,7 +50,7 @@ solvers relTol 0.1; } - Yi + "Yi.*" { $U; relTol 0.1; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution index c8cbf91d4e..0206b606a7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution @@ -48,7 +48,7 @@ solvers tolerance 1e-05; } - "(k|epsilon)" + "(k|epsilon).*" { $UFinal; } @@ -68,14 +68,7 @@ solvers relTol 0; } - "(h|Yi|O2|N2|H2O)" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-6; - relTol 0; - } - hFinal + "(h|Yi|O2|N2|H2O).*" { solver PBiCGStab; preconditioner DILU; @@ -99,7 +92,7 @@ relaxationFactors { equations { - ".*Final" 1; + ".*" 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index e26a0ef31c..25ba999556 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -62,7 +62,7 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(Yi|O2|N2|H2O).*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution index 8590e35afc..0893d063b6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution @@ -63,7 +63,7 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(Yi|O2|N2|H2O).*" { $hFinal; } @@ -80,7 +80,7 @@ relaxationFactors { equations { - ".*Final" 1; + ".*" 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index 44d19d06be..1a6a494cc6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -63,7 +63,7 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(Yi|O2|N2|H2O).*" { solver PBiCGStab; preconditioner DILU; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution index d79487d9f5..89623aa338 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution @@ -64,14 +64,7 @@ solvers relTol 0; } - "(h|Yi|O2|N2|H2O)" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-6; - relTol 0; - } - hFinal + "(h|Yi|O2|N2|H2O).*" { solver PBiCGStab; preconditioner DILU; @@ -91,7 +84,7 @@ relaxationFactors { equations { - ".*" 1; + ".*" 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index fcaf591adf..5f6050b80a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -57,7 +57,7 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(Yi|O2|N2|H2O).*" { solver PBiCGStab; preconditioner DILU; @@ -99,7 +99,7 @@ relaxationFactors { equations { - ".*" 1; + ".*" 1; } } diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index e90c870116..bf90622935 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -62,23 +62,18 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(h|Yi|O2|N2|H2O)" { solver PBiCGStab; preconditioner DILU; tolerance 1e-6; - relTol 0; - } - - h - { - $Yi; relTol 0.1; } - hFinal + "(h|Yi|O2|N2|H2O)Final" { $Yi; + relTol 0; } } @@ -94,7 +89,7 @@ relaxationFactors { equations { - ".*Final" 1; + ".*" 1; } } diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution index fd3e449a44..135b30ea32 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution @@ -90,10 +90,7 @@ relaxationFactors { equations { - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; - "T.*" 1; + ".*" 1; } } diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution index fd3e449a44..135b30ea32 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution @@ -90,10 +90,7 @@ relaxationFactors { equations { - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; - "T.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/system/fvSolution index 56a18194b5..e4bf43487b 100644 --- a/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/system/fvSolution @@ -104,7 +104,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 8eeaec7bfa..7c6ec798d1 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -93,7 +93,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution index 21e61fd819..afb26b5b8d 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution @@ -73,10 +73,7 @@ relaxationFactors { equations { - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; - "T.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution index ee14d097ce..3eaca6c25f 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution @@ -81,7 +81,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution index bb44c0df6a..d0f7bf3f62 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution index bb44c0df6a..d0f7bf3f62 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution index bb44c0df6a..d0f7bf3f62 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution index bb44c0df6a..d0f7bf3f62 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution index bb44c0df6a..d0f7bf3f62 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution index 1769f9aba9..db8a46ef54 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution @@ -92,7 +92,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution index 805fe5a043..2955a8864c 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution @@ -103,7 +103,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 6c97529f92..cd81a885eb 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -89,7 +89,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index a586596f55..0e5751efa1 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -83,7 +83,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution index cdefd80145..69763f0295 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution @@ -71,7 +71,7 @@ relaxationFactors { equations { - "U.*" 1; + ".*" 1; } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution index f134d3cd0c..3cc9e1e74b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution @@ -67,7 +67,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -97,10 +97,10 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.5; - "e.*" 0.5; - "k.*" 0.5; - "epsilon.*" 0.5; + h 0.5; + e 0.5; + k 0.5; + epsilon 0.5; } } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution index f134d3cd0c..3cc9e1e74b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution @@ -67,7 +67,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -97,10 +97,10 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.5; - "e.*" 0.5; - "k.*" 0.5; - "epsilon.*" 0.5; + h 0.5; + e 0.5; + k 0.5; + epsilon 0.5; } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution index 68f7aad985..d4b41ad475 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution @@ -64,7 +64,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution index c83640ef53..82e9a8c98c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution @@ -67,7 +67,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -97,8 +97,8 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.3; - "e.*" 0.3; + h 0.3; + e 0.3; } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution index f134d3cd0c..3cc9e1e74b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution @@ -67,7 +67,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -97,10 +97,10 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.5; - "e.*" 0.5; - "k.*" 0.5; - "epsilon.*" 0.5; + h 0.5; + e 0.5; + k 0.5; + epsilon 0.5; } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution index 2dfced322f..1538460539 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution @@ -75,7 +75,7 @@ solvers relTol 0; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -105,8 +105,8 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.3; - "e.*" 0.3; + h 0.3; + e 0.3; } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution index ffdb447b86..09976bc10d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution @@ -76,7 +76,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; @@ -114,8 +114,8 @@ relaxationFactors equations { ".*" 1; - "h.*" 0.3; - "e.*" 0.3; + h 0.3; + e 0.3; } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution index 94b2b30d29..4df93fd624 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution @@ -55,7 +55,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution index 216743478b..ceed38fd06 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution @@ -55,7 +55,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution index 320ac8a749..5e353fee62 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution @@ -65,7 +65,7 @@ solvers minIter 1; } - Yi + "Yi.*" { solver smoothSolver; smoother symGaussSeidel;