Commit e0b35ae3 authored by andy's avatar andy
Browse files

ENH: moved sources to eqn rhs

parent 4b527e3e
......@@ -5,7 +5,8 @@ tmp<fvVectorMatrix> UEqn
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ sources(U)
==
sources(U)
);
UEqn().relax();
......
......@@ -4,7 +4,8 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ sources(U)
==
sources(U)
);
mrfZones.addCoriolis(UEqn());
......
......@@ -5,7 +5,8 @@
fvm::div(phi, Urel)
+ turbulence->divDevReff(Urel)
+ SRF->Su()
+ sources(Urel)
==
sources(Urel)
);
UrelEqn().relax();
......
......@@ -4,7 +4,8 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ sources(U)
==
sources(U)
);
UEqn().relax();
......
......@@ -4,7 +4,8 @@
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ sources(U)
==
sources(U)
);
UEqn().relax();
......
......@@ -4,10 +4,10 @@
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ sources(rho, U)
==
rho.dimensionedInternalField()*g
+ parcels.SU(U)
+ sources(rho, U)
);
sources.constrain(UEqn);
......
......@@ -28,10 +28,10 @@ if (solveSpecies)
fvm::ddt(rho, Yi)
+ mvConvection->fvmDiv(phi, Yi)
- fvm::laplacian(turbulence->muEff(), Yi)
+ sources(Yi)
==
parcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(Yi)
);
sources.constrain(YEqn);
......
......@@ -4,12 +4,12 @@
fvm::ddt(rho, hs)
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
+ sources(rho, hs)
==
DpDt
+ parcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
+ sources(rho, hs)
);
sources.constrain(hsEqn);
......
......@@ -27,9 +27,9 @@
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
+ sources(psi, p, rho.name())
==
parcels.Srho()
+ sources(psi, p, rho.name())
);
while (pimple.correctNonOrthogonal())
......
......@@ -34,9 +34,9 @@ Description
(
fvm::ddt(rho)
+ fvc::div(phi)
+ sources(rho)
==
parcels.Srho(rho)
+ sources(rho)
);
sources.constrain(rhoEqn);
......
......@@ -3,11 +3,11 @@
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ sources(rho, U)
==
rho.dimensionedInternalField()*g
+ coalParcels.SU(U)
+ limestoneParcels.SU(U)
+ sources(rho, U)
);
UEqn.relax();
......
......@@ -27,10 +27,10 @@ tmp<fv::convectionScheme<scalar> > mvConvection
fvm::ddt(rho, Yi)
+ mvConvection->fvmDiv(phi, Yi)
- fvm::laplacian(turbulence->muEff(), Yi)
+ sources(rho, Yi)
==
coalParcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(rho, Yi)
);
YiEqn.relax();
......
......@@ -4,13 +4,13 @@
fvm::ddt(rho, hs)
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
+ sources(rho, 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)
);
hsEqn.relax();
......
......@@ -22,9 +22,9 @@ if (pimple.transonic())
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rAU, p)
+ sources(psi, p, rho.name())
==
coalParcels.Srho()
+ sources(psi, p, rho.name())
);
sources.constrain(pEqn, rho.name());
......@@ -53,9 +53,9 @@ else
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rAU, p)
+ sources(psi, p, rho.name())
==
coalParcels.Srho()
+ sources(psi, p, rho.name())
);
sources.constrain(pEqn, rho.name());
......
......@@ -34,9 +34,9 @@ Description
(
fvm::ddt(rho)
+ fvc::div(phi)
+ sources(rho)
==
coalParcels.Srho(rho)
+ sources(rho)
);
sources.constrain(rhoEqn);
......
......@@ -4,10 +4,10 @@
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ sources(rho, U)
==
rho.dimensionedInternalField()*g
+ parcels.SU(U)
+ sources(rho, U)
);
sources.constrain(UEqn);
......
......@@ -29,10 +29,10 @@ if (solveSpecies)
fvm::ddt(rho, Yi)
+ mvConvection->fvmDiv(phi, Yi)
- fvm::laplacian(turbulence->muEff(), Yi)
+ sources(rho, Yi)
==
parcels.SYi(i, Yi)
+ combustion->R(Yi)
+ sources(rho, Yi)
);
sources.constrain(YiEqn);
......
......@@ -34,12 +34,12 @@
fvm::ddt(rho, hs)
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
+ sources(rho, hs)
==
pWork()
+ parcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
+ sources(rho, hs)
);
sources.constrain(hsEqn);
......
......@@ -27,9 +27,9 @@
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
+ sources(psi, p, rho.name())
==
parcels.Srho()
+ sources(psi, p, rho.name())
);
......
......@@ -34,9 +34,9 @@ Description
(
fvm::ddt(rho)
+ fvc::div(phi)
+ sources(rho)
==
parcels.Srho(rho)
+ sources(rho)
);
sources.constrain(rhoEqn);
......
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