research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Reactor] Allow Reactor to function without requiring a Kinetics object

Browse source
This commit is contained in:
Ray Speth 2016-10-22 15:48:45 -04:00
parent 04f9596cc5
commit 28202f9fa2
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/zeroD/Reactor.cpp
View file

@ -80,7 +80,7 @@ void Reactor::getSurfaceInitialConditions(double* y)
void Reactor::initialize(doublereal t0) void Reactor::initialize(doublereal t0)
{ {
if (!m_thermo || !m_kin) { if (!m_thermo || (m_chem && !m_kin)) {
throw CanteraError("Reactor::initialize", "Reactor contents not set" throw CanteraError("Reactor::initialize", "Reactor contents not set"
" for reactor '" + m_name + "'."); " for reactor '" + m_name + "'.");
} }
@ -106,7 +106,7 @@ void Reactor::initialize(doublereal t0)
m_nv += S->thermo()->nSpecies(); m_nv += S->thermo()->nSpecies();
size_t nt = S->kinetics()->nTotalSpecies(); size_t nt = S->kinetics()->nTotalSpecies();
maxnt = std::max(maxnt, nt); maxnt = std::max(maxnt, nt);
if (&m_kin->thermo(0) != &S->kinetics()->thermo(0)) { if (m_chem && &m_kin->thermo(0) != &S->kinetics()->thermo(0)) {
throw CanteraError("Reactor::initialize", throw CanteraError("Reactor::initialize",
"First phase of all kinetics managers must be the gas."); "First phase of all kinetics managers must be the gas.");
} }
@ -307,7 +307,7 @@ double Reactor::evalSurfaces(double t, double* ydot)
void Reactor::addSensitivityReaction(size_t rxn) void Reactor::addSensitivityReaction(size_t rxn)
{ {
if (rxn >= m_kin->nReactions()) { if (!m_chem || rxn >= m_kin->nReactions()) {
throw CanteraError("Reactor::addSensitivityReaction", throw CanteraError("Reactor::addSensitivityReaction",
"Reaction number out of range ({})", rxn); "Reaction number out of range ({})", rxn);
} }
@ -429,7 +429,9 @@ void Reactor::applySensitivity(double* params)
S->setSensitivityParameters(params); S->setSensitivityParameters(params);
} }
m_thermo->invalidateCache(); m_thermo->invalidateCache();
m_kin->invalidateCache(); if (m_kin) {
m_kin->invalidateCache();
}
} }
void Reactor::resetSensitivity(double* params) void Reactor::resetSensitivity(double* params)
@ -448,7 +450,9 @@ void Reactor::resetSensitivity(double* params)
S->resetSensitivityParameters(); S->resetSensitivityParameters();
} }
m_thermo->invalidateCache(); m_thermo->invalidateCache();
m_kin->invalidateCache(); if (m_kin) {
m_kin->invalidateCache();
}
} }
} }