exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing merge errors

Browse source
This commit is contained in:
Henrik Rusche 2016-05-30 10:40:08 +02:00
parent 820e8d7d95
commit ff0871caf9
13 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/solvers/compressible/rhoPimpleFoam/UEqn.H
View file

@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
UEqn().relax UEqn().relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
volScalarField rUA = 1.0/UEqn().A(); volScalarField rUA = 1.0/UEqn().A();

2
applications/solvers/compressible/rhoPimpleFoam/hEqn.H
View file

@ -10,7 +10,7 @@
hEqn.relax 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())))); hEqn.solve(mesh.solutionDict().solver((h.select(pimple.finalIter()))));

2
applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
View file

@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
UEqn().relax UEqn().relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
mrfZones.addCoriolis(rho, UEqn()); mrfZones.addCoriolis(rho, UEqn());

2
applications/solvers/compressible/sonicDyMFoam/UEqn.H
View file

@ -7,7 +7,7 @@
UEqn.relax UEqn.relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));

2
applications/solvers/compressible/sonicDyMFoam/eEqn.H
View file

@ -19,7 +19,7 @@
eEqn.relax eEqn.relax
( (
mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter()))
); );
eEqn.solve(); eEqn.solve();

2
applications/solvers/compressible/sonicFoam/UEqn.H
View file

@ -7,7 +7,7 @@
UEqn.relax UEqn.relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));

2
applications/solvers/compressible/sonicFoam/eEqn.H
View file

@ -16,7 +16,7 @@
eEqn.relax eEqn.relax
( (
mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter()))
); );
eEqn.solve(); eEqn.solve();

8
applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
View file

@ -4,7 +4,7 @@
surfaceScalarField psisf = fvc::interpolate(psis); surfaceScalarField psisf = fvc::interpolate(psis);
surfaceScalarField rhof = fvc::interpolate(rho); 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); surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
// --- PISO loop // --- PISO loop
@ -21,6 +21,12 @@
p.storePrevIter(); p.storePrevIter();
volScalarField divPhid
(
"divPhid",
fvc::div(phid)
);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn

7
applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
View file

@ -7,6 +7,7 @@
// 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); surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
// --- PISO loop
while (pimple.correct()) while (pimple.correct())
{ {
U = rUA*UEqn.H(); U = rUA*UEqn.H();
@ -25,6 +26,12 @@
p.storePrevIter(); p.storePrevIter();
volScalarField divPhid
(
"divPhid",
fvc::div(phid)
);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn

6
applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
View file

@ -20,6 +20,12 @@
p.storePrevIter(); p.storePrevIter();
volScalarField divPhid
(
"divPhid",
fvc::div(phid)
);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn

2
applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
View file

@ -8,7 +8,7 @@
UEqn.relax UEqn.relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));

2
applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
View file

@ -16,7 +16,7 @@
UEqn.relax UEqn.relax
( (
mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
); );
if (pimple.momentumPredictor()) if (pimple.momentumPredictor())

2
src/finiteArea/faMatrices/faMatrix/faMatrix.C
View file

@ -548,7 +548,7 @@ void faMatrix<Type>::relax(const scalar alpha)
template<class Type> template<class Type>
void faMatrix<Type>::relax() void faMatrix<Type>::relax()
{ {
if (psi_.mesh().solutionDict().relax(psi_.name())) if (psi_.mesh().solutionDict().relaxEquation(psi_.name()))
{ {
relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name())); relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name()));
} }