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

Moved some function implementations out of InterfaceKinetics.h

Browse source 
This gets rid of some (mostly spurious) warnings generated by MSVC
This commit is contained in:
Ray Speth 2013-01-11 22:56:33 +00:00
parent 33653e7f43
commit 50327a665f
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/cantera/kinetics/InterfaceKinetics.h
View file

@ -133,31 +133,21 @@ public:
* @param fwdROP vector of rates of progress.
* length = number of reactions, Units are kmol m-2 s-1.
*/
virtual void getFwdRatesOfProgress(doublereal* fwdROP) {
updateROP();
std::copy(m_ropf.begin(), m_ropf.end(), fwdROP);
}
virtual void getFwdRatesOfProgress(doublereal* fwdROP);
//! Return the reverse rates of progress for each reaction
/*!
* @param revROP vector of rates of progress.
* length = number of reactions, Units are kmol m-2 s-1.
*/
virtual void getRevRatesOfProgress(doublereal* revROP) {
updateROP();
std::copy(m_ropr.begin(), m_ropr.end(), revROP);
}
virtual void getRevRatesOfProgress(doublereal* revROP);
//! Return the net rates of progress for each reaction
/*!
* @param netROP vector of rates of progress.
* length = number of reactions, Units are kmol m-2 s-1.
*/
virtual void getNetRatesOfProgress(doublereal* netROP) {
updateROP();
std::copy(m_ropnet.begin(), m_ropnet.end(), netROP);
}
virtual void getNetRatesOfProgress(doublereal* netROP);
//! Get the equilibrium constants of all reactions, whether
//! the reaction is reversible or not.

18
src/kinetics/InterfaceKinetics.cpp
View file

@ -215,6 +215,7 @@ void InterfaceKinetics::setElectricPotential(int n, doublereal V)
thermo(n).setElectricPotential(V);
m_redo_rates = true;
}
//====================================================================================================================
// Update properties that depend on temperature
/*
@ -393,6 +394,23 @@ void InterfaceKinetics::checkPartialEquil()
}
}
void InterfaceKinetics::getFwdRatesOfProgress(doublereal* fwdROP)
{
updateROP();
std::copy(m_ropf.begin(), m_ropf.end(), fwdROP);
}
void InterfaceKinetics::getRevRatesOfProgress(doublereal* revROP)
{
updateROP();
std::copy(m_ropr.begin(), m_ropr.end(), revROP);
}
void InterfaceKinetics::getNetRatesOfProgress(doublereal* netROP)
{
updateROP();
std::copy(m_ropnet.begin(), m_ropnet.end(), netROP);
}
/**
* Get the equilibrium constants of all reactions, whether