diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index 33d3800fd..a12975d57 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -25,8 +25,6 @@ #include #include -void get_wdot(const doublereal* rop, doublereal* wdot); - namespace Cantera { @@ -211,11 +209,7 @@ public: */ virtual void getNetProductionRates(doublereal* net) { updateROP(); - //#ifdef HWMECH - //get_wdot(&m_kdata->m_ropnet[0], net); - //#else m_rxnstoich.getNetProductionRates(m_kk, &m_ropnet[0], net); - //#endif } /** diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index ff7e13d8b..529c5d4fe 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -26,8 +26,6 @@ #include #include -void get_wdot(const doublereal* rop, doublereal* wdot); - namespace Cantera { diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h index fbfcb6fd0..adc920c7e 100644 --- a/include/cantera/kinetics/ReactionPath.h +++ b/include/cantera/kinetics/ReactionPath.h @@ -20,8 +20,6 @@ namespace Cantera enum flow_t { NetFlow, OneWayFlow }; -Group parseGroupString(std::string str, std::vector& esyms); - // forward references class Path; diff --git a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h index 2ecbabb3d..3cb79dd05 100644 --- a/include/cantera/numerics/Integrator.h +++ b/include/cantera/numerics/Integrator.h @@ -215,9 +215,6 @@ private: // defined in ODE_integrators.cpp Integrator* newIntegrator(const std::string& itype); -// defined in ODE_integrators.cpp -void deleteIntegrator(Integrator* cv); - } // namespace #endif diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp index 58702953f..aca21803a 100644 --- a/src/base/ctml.cpp +++ b/src/base/ctml.cpp @@ -28,18 +28,6 @@ namespace ctml std::string FP_Format = "%23.15E"; std::string INT_Format = "%8d"; -//==================================================================================================================== -//! Convert a floating point value from a string to a double -/*! - * @param val String value input - * - * @return Returns a double - */ -static doublereal fpValue(std::string val) -{ - return atof(stripws(val).c_str()); -} - //==================================================================================================================== // This function adds a child node with the name, "integer", with a value // consisting of a single integer diff --git a/src/numerics/ODE_integrators.cpp b/src/numerics/ODE_integrators.cpp index 03f68ff0e..169080327 100644 --- a/src/numerics/ODE_integrators.cpp +++ b/src/numerics/ODE_integrators.cpp @@ -26,8 +26,4 @@ Integrator* newIntegrator(const std::string& itype) return 0; } -void deleteIntegrator(Integrator* cv) -{ - delete cv; -} } diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index a54d2ca2a..a9053c907 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -41,7 +41,7 @@ ReactorNet::~ReactorNet() } m_r.clear(); m_reactors.clear(); - deleteIntegrator(m_integ); + delete m_integ; } void ReactorNet::initialize()