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

Remove unnecessary and bogus 'inline' declarations

Browse source
This commit is contained in:
Ray Speth 2015-11-12 11:54:20 -05:00
parent 94185c7fbd
commit 66a3b5b48a
7 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/fortran/fct.cpp
View file

@ -26,12 +26,12 @@ typedef Cabinet<Transport> TransportCabinet;
typedef integer status_t;
inline XML_Node* _xml(const integer* n)
XML_Node* _xml(const integer* n)
{
return &XmlCabinet::item(*n);
}
inline ThermoPhase* _fph(const integer* n)
ThermoPhase* _fph(const integer* n)
{
return &ThermoCabinet::item(*n);
}
@ -41,12 +41,12 @@ static Kinetics* _fkin(const integer* n)
return &KineticsCabinet::item(*n);
}
inline ThermoPhase* _fth(const integer* n)
ThermoPhase* _fth(const integer* n)
{
return &ThermoCabinet::item(*n);
}
inline Transport* _ftrans(const integer* n)
Transport* _ftrans(const integer* n)
{
return &TransportCabinet::item(*n);
}

2
src/fortran/fctxml.cpp
View file

@ -23,7 +23,7 @@ template<> XmlCabinet* XmlCabinet::s_storage = 0;
typedef integer status_t;
inline XML_Node* _xml(const integer* i)
XML_Node* _xml(const integer* i)
{
return &XmlCabinet::item(*i);
}

3
src/thermo/VPStandardStateTP.cpp
View file

@ -123,7 +123,6 @@ void VPStandardStateTP::getStandardChemPotentials(doublereal* g) const
}
}
inline
void VPStandardStateTP::getEnthalpy_RT(doublereal* hrt) const
{
updateStandardStateThermo();
@ -142,14 +141,12 @@ void VPStandardStateTP::getEntropy_R(doublereal* srt) const
m_VPSS_ptr->getEntropy_R(srt);
}
inline
void VPStandardStateTP::getGibbs_RT(doublereal* grt) const
{
updateStandardStateThermo();
m_VPSS_ptr->getGibbs_RT(grt);
}
inline
void VPStandardStateTP::getPureGibbs(doublereal* g) const
{
updateStandardStateThermo();

4
src/tpx/CarbonDioxide.cpp
View file

@ -116,7 +116,7 @@ double CarbonDioxide::C(int j,double Tinverse, double T2inverse, double T3invers
}
}
inline double CarbonDioxide::Cprime(int j, double T2inverse, double T3inverse, double T4inverse)
double CarbonDioxide::Cprime(int j, double T2inverse, double T3inverse, double T4inverse)
{
switch (j) {
case 0:
@ -148,7 +148,7 @@ inline double CarbonDioxide::Cprime(int j, double T2inverse, double T3inverse, d
}
}
inline double CarbonDioxide::I(int j, double ergho, double Gamma)
double CarbonDioxide::I(int j, double ergho, double Gamma)
{
switch (j) {
case 0:

4
src/tpx/Heptane.cpp
View file

@ -95,7 +95,7 @@ double Heptane::C(int j,double Tinverse, double T2inverse, double T3inverse, dou
}
}
inline double Heptane::Cprime(int j, double T2inverse, double T3inverse, double T4inverse)
double Heptane::Cprime(int j, double T2inverse, double T3inverse, double T4inverse)
{
switch (j) {
case 0:
@ -115,7 +115,7 @@ inline double Heptane::Cprime(int j, double T2inverse, double T3inverse, double
}
}
inline double Heptane::I(int j, double ergho, double Gamma)
double Heptane::I(int j, double ergho, double Gamma)
{
switch (j) {
case 0:

8
src/tpx/Water.cpp
View file

@ -69,13 +69,13 @@ static const double G[]= {4.6E4,1.011249E3,8.3893E-1,-2.19989E-4,2.466619E-7,
static const double taua[] = {1.544912, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5};
inline double water::C(int i)
double water::C(int i)
{
double tau = Ta/T;
return (i == 0 ? R*T : R*T*(tau - tauc)*pow(tau - taua[i],i-1));
}
inline double water::Cprime(int i)
double water::Cprime(int i)
{
double tau = Ta/T;
return (i == 0 ? R : (i == 1 ? -R*tauc :
@ -83,7 +83,7 @@ inline double water::Cprime(int i)
+ (i-1)*tau*(tau - tauc))));
}
inline double water::I(int j)
double water::I(int j)
{
double factor, sum, rho_aj;
rho_aj = (j == 0 ? Roa1 : Roaj);
@ -98,7 +98,7 @@ inline double water::I(int j)
return Rho*sum;
}
inline double water::H(int j)
double water::H(int j)
{
double factor, sum, rho_aj;
rho_aj = (j == 0 ? Roa1 : Roaj);

2
src/transport/MultiTransport.cpp
View file

@ -24,7 +24,7 @@ namespace Cantera
* @param tr Reduced temperature \f$ \epsilon/kT \f$
* @param sqtr square root of tr.
*/
inline doublereal Frot(doublereal tr, doublereal sqtr)
doublereal Frot(doublereal tr, doublereal sqtr)
{
const doublereal c1 = 0.5*sqrt(Pi)*Pi;
const doublereal c2 = 0.25*Pi*Pi + 2.0;