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

compiler errors in an alternate ifdef block.

Browse source
This commit is contained in:
Harry Moffat 2008-01-02 23:35:27 +00:00
parent 9dee9afb8b
commit 566f9ef846
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cantera/src/equil/vcs_inest.cpp
View file

@ -72,13 +72,13 @@ namespace VCSnonideal {
vcs_setMolesLinProg();
#else
std::vector<double> ax(ne*nspecies, 0.0);
std::vector<double> bb(ne, 0.0);
std::vector<double> ax(m_numElemConstraints*nspecies, 0.0);
std::vector<double> bb(m_numElemConstraints, 0.0);
std::vector<double> cc(nspecies, 0.0);
int neActive = 0;
jj = 0;
for (j = 0; j < ne; j++) {
for (j = 0; j < m_numElemConstraints; j++) {
if (ElActive[j]) {
neActive++;
bb[jj] = gai[j];
@ -88,7 +88,7 @@ namespace VCSnonideal {
for (kspec = 0; kspec < nspecies; ++kspec) {
cc[kspec] = -ff[kspec];
jj = 0;
for (j = 0; j < ne; ++j) {
for (j = 0; j < m_numElemConstraints; ++j) {
if (ElActive[j]) {
ax[jj + kspec * neActive] = FormulaMatrix[j][kspec];
jj++;

3
Cantera/src/equil/vcs_setMolesLinProg.cpp
View file

@ -43,6 +43,7 @@ static void printProgress(const vector<string> &spName,
}
#endif
#ifdef ALTLINPROG
//! Estimate the initial mole numbers.
/*!
* This is done by running
@ -226,6 +227,6 @@ int VCS_SOLVE::vcs_setMolesLinProg() {
}
return retn;
}
#endif
}