Skip to content
Snippets Groups Projects
Commit f0eb9231 authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: cleaned up logic in constant rate devolatilisation

parent ef3400c6
Branches
Tags
No related merge requests found
...@@ -110,6 +110,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate ...@@ -110,6 +110,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate
scalarField& dMassDV scalarField& dMassDV
) const ) const
{ {
bool done = true;
forAll(volatileData_, i) forAll(volatileData_, i)
{ {
const label id = volatileToGasMap_[i]; const label id = volatileToGasMap_[i];
...@@ -117,9 +118,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate ...@@ -117,9 +118,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate
const scalar massVolatile = mass*YGasEff[id]; const scalar massVolatile = mass*YGasEff[id];
// Combustion allowed once all volatile components evolved // Combustion allowed once all volatile components evolved
canCombust = done = done && (massVolatile <= residualCoeff_*massVolatile0);
canCombust
&& (massVolatile <= residualCoeff_*massVolatile0);
// Model coefficients // Model coefficients
const scalar A0 = volatileData_[i].second(); const scalar A0 = volatileData_[i].second();
...@@ -127,6 +126,8 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate ...@@ -127,6 +126,8 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate
// Mass transferred from particle to carrier gas phase // Mass transferred from particle to carrier gas phase
dMassDV = min(dt*A0*massVolatile0, massVolatile); dMassDV = min(dt*A0*massVolatile0, massVolatile);
} }
canCombust = done;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment