diff --git a/include/cantera/zeroD/FlowDevice.h b/include/cantera/zeroD/FlowDevice.h index f0aebb596..ca4ae9e22 100644 --- a/include/cantera/zeroD/FlowDevice.h +++ b/include/cantera/zeroD/FlowDevice.h @@ -22,11 +22,7 @@ const int Valve_Type = 3; /** * Base class for 'flow devices' (valves, pressure regulators, etc.) - * connecting reactors. Allowance is made for devices that are closed-loop - * controllers. Several methods for these are defined here that do nothing but - * may be overloaded to set or get the setpoint, gains, etc. The behavior of - * overloaded methods should be consistent with the behavior described here. - * The base-class versions of these methods print a warning if called. + * connecting reactors. * @ingroup reactor0 */ class FlowDevice @@ -66,55 +62,6 @@ public: //! specific enthalpy doublereal enthalpy_mass(); - // /** - // * Setpoint. Default = 0.0. - // */ - // virtual doublereal setpoint() { warn("setpoint"); return 0.0; } - - - // /* Update the internal state, if necessary. By default this method - // * does nothing, but may be overloaded for devices that have a - // * state. - // */ - // virtual void update() {warn("update");} - - - // /* Reset the device. By default this method does nothing, but - // * may be overloaded for devices that have a state that depends on - // * past history. - // */ - // virtual void reset() {warn("reset");} - - // /** - // * Set the setpoint. May be changed at any time. By default, - // * this does nothing. - // */ - // virtual void setSetpoint(doublereal value) {warn("setSetpoint");} - - // /** - // * Set the controller gains. Returns false if the number of - // * gains is too small, or if an illegal value is specified. - // */ - // virtual bool setGains(int n, const doublereal* gains) { - // warn("setGains"); - // return true; - // } - - // /** - // * Get the controller gains. Returns false if the 'gains' - // * array is too small. - // */ - // virtual bool getGains(int n, doublereal* gains) { - // warn("getGains"); - // return true; - // } - - // /** - // * Maximum difference between input and setpoint since - // * last call to 'reset'. - // */ - // virtual doublereal maxError() {warn("maxError"); return 0.0;} - /** * Install a flow device between two reactors. * @param in Upstream reactor. @@ -163,11 +110,6 @@ private: ReactorBase* m_in; ReactorBase* m_out; std::vector m_in2out, m_out2in; - - void warn(const std::string& meth) { - writelog(std::string("Warning: method ") + meth + " of base class " - + " FlowDevice called. Nothing done.\n"); - } }; } diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index 97efc6ed3..50e1400ee 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -170,7 +170,6 @@ double ReactorNet::step(doublereal time) return m_time; } - void ReactorNet::addReactor(ReactorBase* r, bool iown) { r->setNetwork(this); @@ -185,23 +184,6 @@ void ReactorNet::addReactor(ReactorBase* r, bool iown) } } -// void ReactorNet::addSensitivityParam(int n, int stype, int i) { -// m_reactors[n]->addSensitivityParam(int stype, int i); -// m_sensreactor.push_back(n); -// m_nSenseParams++; -// } - -// void ReactorNet::setParameters(int np, double* p) { -// int n, nr; -// for (n = 0; n < np; n++) { -// if (n < m_nSenseParams) { -// nr = m_sensreactor[n]; -// m_reactors[nr]->setParameter(n, p[n]); -// } -// } -// } - - void ReactorNet::eval(doublereal t, doublereal* y, doublereal* ydot, doublereal* p) { @@ -218,8 +200,6 @@ void ReactorNet::eval(doublereal t, doublereal* y, } } - - void ReactorNet::evalJacobian(doublereal t, doublereal* y, doublereal* ydot, doublereal* p, Array2D* j) {