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

[Reactor] Make ReactorNet uncopyable

Browse source
This commit is contained in:
Ray Speth 2016-11-14 20:34:45 -05:00
parent b7fad42cda
commit 50ad75f2a2
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/cantera/zeroD/ReactorNet.h
View file

@ -24,7 +24,8 @@ class ReactorNet : public FuncEval
{ {
public: public:
ReactorNet(); ReactorNet();
virtual ~ReactorNet(); virtual ~ReactorNet() {};
ReactorNet(const ReactorNet&) = delete;
//! @name Methods to set up a simulation. //! @name Methods to set up a simulation.
//@{ //@{
@ -216,7 +217,7 @@ protected:
void initialize(); void initialize();
std::vector<Reactor*> m_reactors; std::vector<Reactor*> m_reactors;
Integrator* m_integ; std::unique_ptr<Integrator> m_integ;
doublereal m_time; doublereal m_time;
bool m_init; bool m_init;
bool m_integrator_init; //!< True if integrator initialization is current bool m_integrator_init; //!< True if integrator initialization is current

9
src/zeroD/ReactorNet.cpp
View file

@ -15,13 +15,13 @@ namespace Cantera
{ {
ReactorNet::ReactorNet() : ReactorNet::ReactorNet() :
m_integ(0), m_time(0.0), m_init(false), m_integrator_init(false), m_integ(newIntegrator("CVODE")),
m_time(0.0), m_init(false), m_integrator_init(false),
m_nv(0), m_rtol(1.0e-9), m_rtolsens(1.0e-4), m_nv(0), m_rtol(1.0e-9), m_rtolsens(1.0e-4),
m_atols(1.0e-15), m_atolsens(1.0e-6), m_atols(1.0e-15), m_atolsens(1.0e-6),
m_maxstep(0.0), m_maxErrTestFails(0), m_maxstep(0.0), m_maxErrTestFails(0),
m_verbose(false) m_verbose(false)
{ {
m_integ = newIntegrator("CVODE");
suppressErrors(true); suppressErrors(true);
// use backward differencing, with a full Jacobian computed // use backward differencing, with a full Jacobian computed
@ -31,11 +31,6 @@ ReactorNet::ReactorNet() :
m_integ->setIterator(Newton_Iter); m_integ->setIterator(Newton_Iter);
} }
ReactorNet::~ReactorNet()
{
delete m_integ;
}
void ReactorNet::setInitialTime(double time) void ReactorNet::setInitialTime(double time)
{ {
m_time = time; m_time = time;