Commit 0b6c1005 authored by mattijs's avatar mattijs
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

parents 34361577 79ef5bd3
......@@ -101,7 +101,7 @@ public:
{
if (is.good() && !is.eof())
{
this->ddtPhiCoeff_ = readScalar(is);
is >> this->ddtPhiCoeff_;
}
// Ensure the old-old-time cell volumes are available
......
......@@ -171,10 +171,11 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
)
);
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff.ref();
if (ddtPhiCoeff_ < 0)
{
tddtCouplingCoeff.ref() =- min
ddtCouplingCoeff -= min
(
mag(phiCorr)
/(mag(phi) + dimensionedScalar("small", phi.dimensions(), SMALL)),
......@@ -183,14 +184,11 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
}
else
{
tddtCouplingCoeff.ref() =
ddtCouplingCoeff =
dimensionedScalar("ddtPhiCoeff", dimless, ddtPhiCoeff_);
}
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff.ref();
surfaceScalarField::Boundary& ccbf =
ddtCouplingCoeff.boundaryFieldRef();
surfaceScalarField::Boundary& ccbf = ddtCouplingCoeff.boundaryFieldRef();
forAll(U.boundaryField(), patchi)
{
......
......@@ -110,12 +110,12 @@ calculateSpeciesRR
if (RR[0] > 0.0)
{
production_[speciei][reactioni] = RR[0];
productionInt_[speciei][reactioni] =+ dt*RR[0];
productionInt_[speciei][reactioni] += dt*RR[0];
}
else if (RR[0] < 0.0)
{
consumption_[speciei][reactioni] = RR[0];
consumptionInt_[speciei][reactioni] =+ dt*RR[0];
consumptionInt_[speciei][reactioni] += dt*RR[0];
}
else
{
......
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