Commit ec3bdab6 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

parents fe75b519 07c71f6d
......@@ -5,12 +5,14 @@ tmp<fvVectorMatrix> UEqn
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
==
sources(U)
);
sources.apply(UEqn());
UEqn().relax();
sources.constrain(UEqn());
volScalarField rAU(1.0/UEqn().A());
if (pimple.momentumPredictor())
......
......@@ -4,11 +4,13 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
==
sources(U)
);
mrfZones.addCoriolis(UEqn());
sources.apply(UEqn());
sources.constrain(UEqn());
UEqn().relax();
......
......@@ -5,10 +5,12 @@
fvm::div(phi, Urel)
+ turbulence->divDevReff(Urel)
+ SRF->Su()
==
sources(Urel)
);
sources.apply(UrelEqn());
UrelEqn().relax();
sources.constrain(UrelEqn());
solve(UrelEqn() == -fvc::grad(p));
......@@ -4,10 +4,12 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
==
sources(U)
);
sources.apply(UEqn());
UEqn().relax();
sources.constrain(UEqn());
solve(UEqn() == -fvc::grad(p));
......@@ -4,12 +4,14 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
==
sources(U)
);
sources.apply(UEqn());
UEqn().relax();
sources.constrain(UEqn());
// Include the porous media resistance and solve the momentum equation
// either implicit in the tensorial resistance or transport using by
// including the spherical part of the resistance in the momentum diagonal
......
......@@ -7,9 +7,10 @@
==
rho.dimensionedInternalField()*g
+ parcels.SU(U)
+ sources(rho, U)
);
sources.apply(UEqn);
sources.constrain(UEqn);
pZones.addResistance(UEqn);
......
......@@ -31,9 +31,10 @@ if (solveSpecies)
==
parcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(Yi)
);
sources.apply(YEqn);
sources.constrain(YEqn);
YEqn.solve(mesh.solver("Yi"));
......
......@@ -9,9 +9,10 @@
+ parcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
+ sources(rho, hs)
);
sources.apply(hsEqn);
sources.constrain(hsEqn);
hsEqn.solve();
......
......@@ -29,10 +29,9 @@
+ fvc::div(phi)
==
parcels.Srho()
+ sources(psi, p, rho.name())
);
sources.apply(pDDtEqn);
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
......@@ -41,6 +40,8 @@
- fvm::laplacian(rho*rAU, p)
);
sources.constrain(pDDtEqn, rho.name());
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
......
......@@ -36,9 +36,10 @@ Description
+ fvc::div(phi)
==
parcels.Srho(rho)
+ sources(rho)
);
sources.apply(rhoEqn);
sources.constrain(rhoEqn);
rhoEqn.solve();
......
......@@ -76,7 +76,7 @@ Info<< "Time scales min/max:" << endl;
(
DpDt
+ parcels.hsTrans()/(mesh.V()*runTime.deltaT())
// + energySource.Su()
// + sources(rho, hs)
+ combustion->Sh()()
)
/rho
......
......@@ -7,12 +7,13 @@
rho.dimensionedInternalField()*g
+ coalParcels.SU(U)
+ limestoneParcels.SU(U)
+ sources(rho, U)
);
sources.apply(UEqn);
UEqn.relax();
sources.constrain(UEqn);
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
......
......@@ -30,11 +30,13 @@ tmp<fv::convectionScheme<scalar> > mvConvection
==
coalParcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(rho, Yi)
);
sources.apply(YiEqn);
YiEqn.relax();
sources.constrain(YiEqn);
YiEqn.solve(mesh.solver("Yi"));
Yi.max(0.0);
......
......@@ -6,15 +6,17 @@
- fvm::laplacian(turbulence->alphaEff(), hs)
==
DpDt
+ combustion->Sh()
+ coalParcels.Sh(hs)
+ limestoneParcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
+ coalParcels.Sh(hs)
+ limestoneParcels.Sh(hs)
+ radiation->Shs(thermo)
+ sources(rho, hs)
);
sources.apply(hsEqn);
hsEqn.relax();
sources.constrain(hsEqn);
hsEqn.solve();
thermo.correct();
......
......@@ -24,9 +24,10 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
==
coalParcels.Srho()
+ sources(psi, p, rho.name())
);
sources.apply(pEqn);
sources.constrain(pEqn, rho.name());
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
......@@ -39,8 +40,8 @@ if (pimple.transonic())
else
{
phi =
fvc::interpolate(rho)*
(
fvc::interpolate(rho)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
......@@ -54,9 +55,10 @@ else
- fvm::laplacian(rho*rAU, p)
==
coalParcels.Srho()
+ sources(psi, p, rho.name())
);
sources.apply(pEqn);
sources.constrain(pEqn, rho.name());
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
......
......@@ -36,9 +36,10 @@ Description
+ fvc::div(phi)
==
coalParcels.Srho(rho)
+ sources(rho)
);
sources.apply(rhoEqn);
sources.constrain(rhoEqn);
rhoEqn.solve();
}
......
......@@ -7,9 +7,10 @@
==
rho.dimensionedInternalField()*g
+ parcels.SU(U)
+ sources(rho, U)
);
sources.apply(UEqn);
sources.constrain(UEqn);
pZones.addResistance(UEqn);
......
......@@ -32,9 +32,10 @@ if (solveSpecies)
==
parcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(rho, Yi)
);
sources.apply(YiEqn);
sources.constrain(YiEqn);
YiEqn.solve(mesh.solver("Yi"));
......
......@@ -39,9 +39,10 @@
+ parcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
+ sources(rho, hs)
);
sources.apply(hsEqn);
sources.constrain(hsEqn);
hsEqn.solve();
......
......@@ -29,9 +29,9 @@
+ fvc::div(phi)
==
parcels.Srho()
+ sources(psi, p, rho.name())
);
sources.apply(pDDtEqn);
while (pimple.correctNonOrthogonal())
{
......@@ -41,6 +41,8 @@
- fvm::laplacian(rho*rAU, p)
);
sources.constrain(pDDtEqn, rho.name());
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment