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

[Reactor] Remove unused reactor connectivity calculation

Browse source
This commit is contained in:
Ray Speth 2014-07-18 15:14:12 +00:00
parent 1b1703cc56
commit 884dd36b9c
2 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/cantera/zeroD/ReactorNet.h
View file

@ -218,15 +218,6 @@ public:
}
protected:
void connect(size_t i, size_t j) {
m_connect[j*m_reactors.size() + i] = 1;
m_connect[i*m_reactors.size() + j] = 1;
}
bool connected(size_t i, size_t j) {
return (m_connect[m_reactors.size()*i + j] == 1);
}
/**
* Initialize the reactor network. Called automatically the first time
* advance or step is called.
@ -264,7 +255,6 @@ protected:
//! output.
std::vector<size_t> m_sensIndex;
vector_int m_connect;
vector_fp m_ydot;
std::vector<bool> m_iown;

36
src/zeroD/ReactorNet.cpp
View file

@ -82,43 +82,7 @@ void ReactorNet::initialize()
}
}
m_connect.resize(m_reactors.size()*m_reactors.size(), 0);
m_ydot.resize(m_nv,0.0);
size_t i, j, nin, nout, nw;
ReactorBase* r, *rj;
for (i = 0; i < m_reactors.size(); i++) {
r = m_reactors[i];
for (j = 0; j < m_reactors.size(); j++) {
if (i == j) {
connect(i,j);
} else {
rj = m_reactors[j];
nin = rj->nInlets();
for (n = 0; n < nin; n++) {
if (&rj->inlet(n).out() == r) {
connect(i,j);
}
}
nout = rj->nOutlets();
for (n = 0; n < nout; n++) {
if (&rj->outlet(n).in() == r) {
connect(i,j);
}
}
nw = rj->nWalls();
for (n = 0; n < nw; n++) {
if (&rj->wall(n).left() == rj
&& &rj->wall(n).right() == r) {
connect(i,j);
} else if (&rj->wall(n).left() == r
&& &rj->wall(n).right() == rj) {
connect(i,j);
}
}
}
}
}
m_atol.resize(neq());
fill(m_atol.begin(), m_atol.end(), m_atols);
m_integ->setTolerances(m_rtol, neq(), DATA_PTR(m_atol));