songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs 2017-06-28 15:07:04 +01:00
commit 15de34427c
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
View File

@ -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

10
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
View File

@ -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)
{

4
src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
View File

@ -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
{