TDACChemistryModel: Removed CPU time accumulation between ISAT operations

Resolves feature request https://bugs.openfoam.org/view.php?id=3392
Patch contributed by Francesco Contino
This commit is contained in:
Henry Weller
2019-11-20 12:48:23 +00:00
parent 612164005d
commit f66ea31584

View File

@ -647,8 +647,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
// (it will either expand the current data or add a new stored point).
else
{
// Store total time waiting to attribute to add or grow
scalar timeTmp = clockTime_.timeIncrement();
searchISATCpuTime_ += clockTime_.timeIncrement();
if (reduced)
{
@ -656,9 +655,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
mechRed_->reduceMechanism(pi, Ti, c, celli);
nActiveSpecies += mechRed_->NsSimp();
nAvg++;
scalar timeIncr = clockTime_.timeIncrement();
reduceMechCpuTime_ += timeIncr;
timeTmp += timeIncr;
}
// Calculate the chemical source terms
@ -695,9 +692,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
}
{
scalar timeIncr = clockTime_.timeIncrement();
solveChemistryCpuTime_ += timeIncr;
timeTmp += timeIncr;
}
// If tabulation is used, we add the information computed here to
@ -724,12 +719,12 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
if (growOrAdd)
{
this->setTabulationResultsAdd(celli);
addNewLeafCpuTime_ += clockTime_.timeIncrement() + timeTmp;
addNewLeafCpuTime_ += clockTime_.timeIncrement();
}
else
{
this->setTabulationResultsGrow(celli);
growCpuTime_ += clockTime_.timeIncrement() + timeTmp;
growCpuTime_ += clockTime_.timeIncrement();
}
}