Skip to content
Permalink
Browse files

Rationalised the handling of "Final" solver and relaxation factor set…

…tings

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.
  • Loading branch information...
Henry Weller
Henry Weller committed Nov 17, 2018
1 parent ae28cb3 commit ee443e201f65dd90d74c863cc381c0463ed34c0d
Showing with 376 additions and 325 deletions.
  1. +1 −1 applications/solvers/DNS/dnsFoam/dnsFoam.C
  2. +2 −2 applications/solvers/combustion/PDRFoam/pEqn.H
  3. +2 −2 applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H
  4. +2 −2 applications/solvers/combustion/XiFoam/pEqn.H
  5. +2 −6 applications/solvers/combustion/chemFoam/YEqn.H
  6. +1 −1 applications/solvers/combustion/fireFoam/YEEqn.H
  7. +1 −1 applications/solvers/combustion/fireFoam/pEqn.H
  8. +1 −1 applications/solvers/combustion/reactingFoam/YEqn.H
  9. +2 −2 applications/solvers/combustion/reactingFoam/pEqn.H
  10. +2 −2 applications/solvers/combustion/reactingFoam/pcEqn.H
  11. +1 −1 applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
  12. +2 −2 applications/solvers/compressible/rhoPimpleFoam/pEqn.H
  13. +2 −2 applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
  14. +2 −2 applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
  15. +1 −1 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
  16. +1 −1 applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
  17. +1 −1 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
  18. +1 −1 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
  19. +0 −1 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
  20. +1 −1 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
  21. +1 −1 applications/solvers/incompressible/icoFoam/icoFoam.C
  22. +1 −1 applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
  23. +1 −1 applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
  24. +1 −1 applications/solvers/incompressible/pimpleFoam/pEqn.H
  25. +1 −1 applications/solvers/incompressible/pisoFoam/pEqn.H
  26. +1 −1 applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
  27. +1 −1 applications/solvers/lagrangian/DPMFoam/pEqn.H
  28. +1 −1 applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
  29. +2 −2 applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
  30. +1 −1 applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
  31. +1 −1 applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
  32. +1 −1 applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
  33. +1 −1 applications/solvers/lagrangian/sprayFoam/YEqn.H
  34. +2 −2 applications/solvers/lagrangian/sprayFoam/pEqn.H
  35. +1 −1 applications/solvers/multiphase/cavitatingFoam/pEqn.H
  36. +1 −1 applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H
  37. +1 −1 applications/solvers/multiphase/compressibleInterFoam/pEqn.H
  38. +1 −1 applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H
  39. +1 −1 applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
  40. +1 −1 applications/solvers/multiphase/driftFluxFoam/pEqn.H
  41. +1 −1 applications/solvers/multiphase/interFoam/pEqn.H
  42. +1 −1 applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
  43. +1 −1 applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
  44. +1 −1 applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
  45. +1 −1 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
  46. +1 −1 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
  47. +1 −1 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H
  48. +2 −2 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H
  49. +1 −1 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
  50. +1 −1 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
  51. +1 −1 applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
  52. +1 −1 applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
  53. +1 −1 applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
  54. +4 −6 src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
  55. +0 −11 src/OpenFOAM/matrices/solution/solution.C
  56. +0 −3 src/OpenFOAM/matrices/solution/solution.H
  57. +2 −8 src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
  58. +8 −49 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
  59. +41 −5 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
  60. +129 −6 src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
  61. +2 −2 src/functionObjects/solvers/scalarTransport/scalarTransport.C
  62. +1 −2 src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
  63. +1 −5 ...hermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
  64. +1 −1 tutorials/combustion/chemFoam/gri/system/fvSolution
  65. +1 −1 tutorials/combustion/chemFoam/h2/system/fvSolution
  66. +1 −1 tutorials/combustion/chemFoam/ic8h18/system/fvSolution
  67. +1 −1 tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
  68. +1 −1 tutorials/combustion/chemFoam/nc7h16/system/fvSolution
  69. +1 −1 tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
  70. +1 −1 tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
  71. +2 −2 tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
  72. +2 −2 tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
  73. +1 −1 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution
  74. +2 −2 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution
  75. +1 −1 tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution
  76. +1 −1 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
  77. +1 −1 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution
  78. +1 −1 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution
  79. +1 −1 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
  80. +1 −1 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
  81. +5 −5 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
  82. +1 −4 tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
  83. +1 −1 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
  84. +1 −1 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
  85. +6 −6 tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution
  86. +7 −6 tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution
  87. +2 −2 tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/fluid/fvSolution
  88. +2 −2 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
  89. +6 −6 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
  90. +1 −1 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution
  91. +2 −2 tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution
  92. +2 −2 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
  93. +1 −3 tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
  94. +1 −3 tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
  95. +1 −1 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
  96. +1 −3 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
  97. +1 −1 tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/fvSolution
  98. +1 −1 tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
  99. +2 −1 tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
  100. +1 −1 tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
  101. +3 −10 tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
  102. +1 −1 tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
  103. +2 −2 tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
  104. +1 −1 tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
  105. +2 −9 tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
  106. +2 −2 tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
  107. +4 −9 tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
  108. +1 −4 tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
  109. +1 −4 tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
  110. +1 −1 tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/system/fvSolution
  111. +1 −1 tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
  112. +1 −4 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
  113. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
  114. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
  115. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
  116. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
  117. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
  118. +1 −1 tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
  119. +1 −1 tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
  120. +1 −1 tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
  121. +1 −1 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
  122. +1 −1 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
  123. +1 −1 tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
  124. +5 −5 tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
  125. +5 −5 tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
  126. +1 −1 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
  127. +3 −3 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
  128. +5 −5 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
  129. +3 −3 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
  130. +3 −3 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution
  131. +1 −1 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
  132. +1 −1 .../multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
  133. +1 −1 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -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();

@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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");
}
}
}
@@ -36,7 +36,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YiEqn);

YiEqn.solve(mesh.solver("Yi"));
YiEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{
@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YiEqn);

YiEqn.solve(mesh.solver("Yi"));
YiEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -52,7 +52,7 @@ if (Y.size())

fvOptions.constrain(YiEqn);

YiEqn.solve(mesh.solver("Yi"));
YiEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{
@@ -1,4 +1,3 @@
fvMesh& mesh = solidRegions[i];
solidThermo& thermo = thermos[i];

tmp<volScalarField> trho = thermo.rho();
@@ -17,7 +17,7 @@

fvOptions.constrain(hEqn);

hEqn.solve(mesh.solver(h.select(pimples.finalIter())));
hEqn.solve(pimples.finalIter());

fvOptions.correct(h);
}
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -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())
{
@@ -34,7 +34,7 @@

pEqn.setReference(pRefCell, pRefValue);

pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
pEqn.solve(pimple.finalInnerIter());

if (pimple.finalNonOrthogonalIter())
{
@@ -36,7 +36,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YiEqn);

YiEqn.solve(mesh.solver("Yi"));
YiEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{
@@ -37,7 +37,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YEqn);

YEqn.solve(mesh.solver("Yi"));
YEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{
@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YEqn);

YEqn.solve(mesh.solver("Yi"));
YEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -35,7 +35,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection

fvOptions.constrain(YEqn);

YEqn.solve(mesh.solver("Yi"));
YEqn.solve("Yi");

fvOptions.correct(Yi);

@@ -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())
{

0 comments on commit ee443e2

Please sign in to comment.
You can’t perform that action at this time.