From aad776eba784fd50aff902d5b2ee150b32a9aacd Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 5 Jan 2009 23:20:43 +0000 Subject: [PATCH] Added .h files. --- Cantera/src/equil/BasisOptimize.cpp | 1 + Cantera/src/equil/ChemEquil.cpp | 1 + Cantera/src/equil/MultiPhase.cpp | 6 ++++++ Cantera/src/equil/equilibrate.cpp | 1 + 4 files changed, 9 insertions(+) diff --git a/Cantera/src/equil/BasisOptimize.cpp b/Cantera/src/equil/BasisOptimize.cpp index 42b88afdd..b98d36ff4 100644 --- a/Cantera/src/equil/BasisOptimize.cpp +++ b/Cantera/src/equil/BasisOptimize.cpp @@ -9,6 +9,7 @@ */ #include "ct_defs.h" +#include "global.h" #include "ThermoPhase.h" #include "MultiPhase.h" diff --git a/Cantera/src/equil/ChemEquil.cpp b/Cantera/src/equil/ChemEquil.cpp index 5f871d25a..75bed2006 100755 --- a/Cantera/src/equil/ChemEquil.cpp +++ b/Cantera/src/equil/ChemEquil.cpp @@ -25,6 +25,7 @@ #include "DenseMatrix.h" #include "ct_defs.h" +#include "global.h" #include "sort.h" #include "PropertyCalculator.h" #include "ctexceptions.h" diff --git a/Cantera/src/equil/MultiPhase.cpp b/Cantera/src/equil/MultiPhase.cpp index 4d00b24dd..162ba4362 100644 --- a/Cantera/src/equil/MultiPhase.cpp +++ b/Cantera/src/equil/MultiPhase.cpp @@ -15,6 +15,7 @@ #include "ThermoPhase.h" #include "DenseMatrix.h" #include "stringUtils.h" +#include "global.h" using namespace std; @@ -367,6 +368,11 @@ namespace Cantera { void MultiPhase::setPhaseMoleFractions(const index_t n, const doublereal* const x) { phase_t* p = m_phase[n]; p->setState_TPX(m_temp, m_press, x); + int nsp = p->nSpecies(); + int istart = m_spstart[n]; + for (int k = 0; k < nsp; k++) { + m_moleFractions[istart+k] = x[k]; + } } // Set the species moles using a map. The map \a xMap maps diff --git a/Cantera/src/equil/equilibrate.cpp b/Cantera/src/equil/equilibrate.cpp index d3ae15d9b..2f7d3864a 100644 --- a/Cantera/src/equil/equilibrate.cpp +++ b/Cantera/src/equil/equilibrate.cpp @@ -8,6 +8,7 @@ #include "ChemEquil.h" #include "MultiPhaseEquil.h" #include "vcs_MultiPhaseEquil.h" +#include "global.h" namespace Cantera {