From ff0871caf91f74506d05c3c4d007b55e41f44d1a Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Mon, 30 May 2016 10:40:08 +0200 Subject: [PATCH] Fixing merge errors --- applications/solvers/compressible/rhoPimpleFoam/UEqn.H | 2 +- applications/solvers/compressible/rhoPimpleFoam/hEqn.H | 2 +- .../solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H | 2 +- applications/solvers/compressible/sonicDyMFoam/UEqn.H | 2 +- applications/solvers/compressible/sonicDyMFoam/eEqn.H | 2 +- applications/solvers/compressible/sonicFoam/UEqn.H | 2 +- applications/solvers/compressible/sonicFoam/eEqn.H | 2 +- .../solvers/compressible/steadyCompressibleFoam/pEqn.H | 8 +++++++- .../solvers/compressible/steadyCompressibleMRFFoam/pEqn.H | 7 +++++++ .../solvers/compressible/steadyCompressibleSRFFoam/pEqn.H | 6 ++++++ applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H | 2 +- .../solvers/multiphase/twoLiquidMixingFoam/UEqn.H | 2 +- src/finiteArea/faMatrices/faMatrix/faMatrix.C | 2 +- 13 files changed, 30 insertions(+), 11 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H index 734329af4..c34c947da 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H @@ -9,7 +9,7 @@ tmp UEqn UEqn().relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); volScalarField rUA = 1.0/UEqn().A(); diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H index 60e38e90d..b0021019f 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H @@ -10,7 +10,7 @@ hEqn.relax ( - mesh.solutionDict().relaxationFactor(h.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(h.select(pimple.finalIter())) ); hEqn.solve(mesh.solutionDict().solver((h.select(pimple.finalIter())))); diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H index 3e1b83048..d51ba7546 100644 --- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H @@ -9,7 +9,7 @@ tmp UEqn UEqn().relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); mrfZones.addCoriolis(rho, UEqn()); diff --git a/applications/solvers/compressible/sonicDyMFoam/UEqn.H b/applications/solvers/compressible/sonicDyMFoam/UEqn.H index bdcc54f6e..9d9beaccb 100644 --- a/applications/solvers/compressible/sonicDyMFoam/UEqn.H +++ b/applications/solvers/compressible/sonicDyMFoam/UEqn.H @@ -7,7 +7,7 @@ UEqn.relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicDyMFoam/eEqn.H b/applications/solvers/compressible/sonicDyMFoam/eEqn.H index cbe3c5eda..c2e5f375c 100644 --- a/applications/solvers/compressible/sonicDyMFoam/eEqn.H +++ b/applications/solvers/compressible/sonicDyMFoam/eEqn.H @@ -19,7 +19,7 @@ eEqn.relax ( - mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter())) ); eEqn.solve(); diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H index bdcc54f6e..9d9beaccb 100644 --- a/applications/solvers/compressible/sonicFoam/UEqn.H +++ b/applications/solvers/compressible/sonicFoam/UEqn.H @@ -7,7 +7,7 @@ UEqn.relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H index 413758c7f..9f1cbe174 100644 --- a/applications/solvers/compressible/sonicFoam/eEqn.H +++ b/applications/solvers/compressible/sonicFoam/eEqn.H @@ -16,7 +16,7 @@ eEqn.relax ( - mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter())) ); eEqn.solve(); diff --git a/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H index 5b3df948f..2a46da754 100644 --- a/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H +++ b/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H @@ -4,7 +4,7 @@ surfaceScalarField psisf = fvc::interpolate(psis); surfaceScalarField rhof = fvc::interpolate(rho); - // Needs to be outside of loop since p is changing, but psi and rho are not + // Needs to be outside of loop since p is changing, but psi and rho are not. surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p); // --- PISO loop @@ -21,6 +21,12 @@ p.storePrevIter(); + volScalarField divPhid + ( + "divPhid", + fvc::div(phid) + ); + while (pimple.correctNonOrthogonal()) { fvScalarMatrix pEqn diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H index 1d30e61e4..ff35bebaa 100644 --- a/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H +++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H @@ -7,6 +7,7 @@ // Needs to be outside of loop since p is changing, but psi and rho are not. surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p); + // --- PISO loop while (pimple.correct()) { U = rUA*UEqn.H(); @@ -25,6 +26,12 @@ p.storePrevIter(); + volScalarField divPhid + ( + "divPhid", + fvc::div(phid) + ); + while (pimple.correctNonOrthogonal()) { fvScalarMatrix pEqn diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H index 3a8a1162b..59e03e2c4 100644 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H @@ -20,6 +20,12 @@ p.storePrevIter(); + volScalarField divPhid + ( + "divPhid", + fvc::div(phid) + ); + while (pimple.correctNonOrthogonal()) { fvScalarMatrix pEqn diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H index 07f87de6a..0c599154d 100644 --- a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H +++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H @@ -8,7 +8,7 @@ UEqn.relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H index 07bfa0493..0c7ea9900 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H @@ -16,7 +16,7 @@ UEqn.relax ( - mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter())) ); if (pimple.momentumPredictor()) diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C index cf27c2ef3..ae1ce299e 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C @@ -548,7 +548,7 @@ void faMatrix::relax(const scalar alpha) template void faMatrix::relax() { - if (psi_.mesh().solutionDict().relax(psi_.name())) + if (psi_.mesh().solutionDict().relaxEquation(psi_.name())) { relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name())); }