From 566f9ef846094be0843fc41158522d87ee92dab2 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Wed, 2 Jan 2008 23:35:27 +0000 Subject: [PATCH] compiler errors in an alternate ifdef block. --- Cantera/src/equil/vcs_inest.cpp | 8 ++++---- Cantera/src/equil/vcs_setMolesLinProg.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cantera/src/equil/vcs_inest.cpp b/Cantera/src/equil/vcs_inest.cpp index b1857811c..ec43793e7 100644 --- a/Cantera/src/equil/vcs_inest.cpp +++ b/Cantera/src/equil/vcs_inest.cpp @@ -72,13 +72,13 @@ namespace VCSnonideal { vcs_setMolesLinProg(); #else - std::vector ax(ne*nspecies, 0.0); - std::vector bb(ne, 0.0); + std::vector ax(m_numElemConstraints*nspecies, 0.0); + std::vector bb(m_numElemConstraints, 0.0); std::vector 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++; diff --git a/Cantera/src/equil/vcs_setMolesLinProg.cpp b/Cantera/src/equil/vcs_setMolesLinProg.cpp index 4a6e14c56..03cd68f88 100644 --- a/Cantera/src/equil/vcs_setMolesLinProg.cpp +++ b/Cantera/src/equil/vcs_setMolesLinProg.cpp @@ -43,6 +43,7 @@ static void printProgress(const vector &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 }