From 367095f6668b8dd720c41035cc94acf2d697fc6b Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Wed, 28 Jun 2017 14:07:26 +0100 Subject: [PATCH 1/2] BUG: Correction for commit ead256f50 --- .../ddtSchemes/backwardDdtScheme/backwardDdtScheme.H | 2 +- .../finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H index 24812aee91..0d7e9174d9 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H @@ -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 diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index a1ef450c2d..f5e11840b9 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -171,10 +171,11 @@ tmp ddtScheme::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 ddtScheme::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) { From bb2041ef69bf85665244f58a19e135b3caa3125d Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Wed, 28 Jun 2017 14:07:57 +0100 Subject: [PATCH 2/2] BUG: reactionSensitivity - corrected integral calculations --- .../reactionsSensitivityAnalysis.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C index 939de3548f..2efc7fcf46 100644 --- a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C +++ b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C @@ -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 {