From 112d9b5093592a568bc91c2f7e1328d746d0723a Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 13 Jun 2013 22:50:26 +0000 Subject: [PATCH] Remove unusable KINETICS_WITH_INTERMEDIATE_ZEROED_PHASES macro --- include/cantera/kinetics/InterfaceKinetics.h | 30 -------------------- src/kinetics/InterfaceKinetics.cpp | 27 ------------------ 2 files changed, 57 deletions(-) diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 6accc1d0c..169eeea77 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -613,36 +613,6 @@ protected: */ std::vector > m_rxnPhaseIsProduct; -#ifdef KINETICS_WITH_INTERMEDIATE_ZEROED_PHASES - //! Vector of ints indicating whether zeroed phase is an intermediate for - //! the formation of another phase - /*! - * If a phase is zeroed out but it is an intermediate, then the phase can - * be formed whether it is stable or not, but the destruction rate of - * species in that phase can't exceed the formation rate for species in - * that phase. - * - * length = number of phases in the object. By default all phases are not - * intermediates - */ - std::vector m_phaseIsIntermediate; - int m_numIntermediatePhases; - - //! Reaction rate reduction factor for intermediates - /*! - * Individual reaction rates are reduced to accommodate the requirements of intermediate - * zero phases. - * - * length = number of reactions in the object. By default all phases are - * not intermediates. - */ - std::vector m_rxnRateFactorPhaseIntermediates; - - //! Work vector having length number of species - std::vector m_speciesTmpP; - std::vector m_speciesTmpD; -#endif - int m_ioFlag; }; } diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index ab6e3ce2c..c18048f24 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -606,33 +606,6 @@ void InterfaceKinetics::updateROP() m_ROP_ok = true; } -#ifdef KINETICS_WITH_INTERMEDIATE_ZEROED_PHASES -//================================================================================================= -InterfaceKinetics::adjustRatesForIntermediatePhases() -{ - doublereal sFac = 1.0; - - getCreatingRates(DATA_PTR(m_speciestmpP)); - getDestructionRates(DATA_PTR(m_speciestmpD)); - - for (iphase = 0; iphase < nphases; iphase++) { - if (m_intermediatePhases(iphase)) { - for (isp = 0; isp < nspecies; isp++) { - if (m_speciesTmpD[ispI] > m_speciesTmpP[I]) { - sFac = m_speciesTmpD[ispI]/ m_speciesTmpP[I]; - } - // Loop over reactions that are reactants for the species in the phase - // reducing their rates. - - - } - } - - } - -} -#endif - void InterfaceKinetics::getDeltaGibbs(doublereal* deltaG) { /*