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

[Reactor] Deprecating magic numbers.

Browse source 
* add deprecation warning for int ReactorBase::type() (to be changed after Cantera 2.5)
 * introduce temporary std::string ReactorBase::typeStr() (to be renamed after Cantera 2.5)
 * deprecate all functions using the old call and introduce associated temporary functions
This commit is contained in:
Ingmar Schoegl 2019-06-26 16:10:01 -05:00 • committed by Ray Speth
parent 77295b2103
commit d263566670
37 changed files with 279 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/cantera/clib/ctreactor.h
View file

@ -14,7 +14,8 @@
extern "C" {
#endif
CANTERA_CAPI int reactor_new(int type);
CANTERA_CAPI int reactor_new2(const char* type);
CANTERA_CAPI int reactor_new(int type); //!< @deprecated To be changed after Cantera 2.5.
CANTERA_CAPI int reactor_del(int i);
CANTERA_CAPI int reactor_setInitialVolume(int i, double v);
CANTERA_CAPI int reactor_setChemistry(int i, int cflag);
@ -47,7 +48,8 @@ extern "C" {
CANTERA_CAPI double reactornet_atol(int i);
CANTERA_CAPI double reactornet_sensitivity(int i, const char* v, int p, int r);
CANTERA_CAPI int flowdev_new(int type);
CANTERA_CAPI int flowdev_new2(const char* type);
CANTERA_CAPI int flowdev_new(int type); //!< @deprecated To be changed after Cantera 2.5.
CANTERA_CAPI int flowdev_del(int i);
CANTERA_CAPI int flowdev_install(int i, int n, int m);
CANTERA_CAPI int flowdev_setMaster(int i, int n);
@ -56,7 +58,8 @@ extern "C" {
CANTERA_CAPI int flowdev_setParameters(int i, int n, const double* v);
CANTERA_CAPI int flowdev_setFunction(int i, int n);
CANTERA_CAPI int wall_new(int type);
CANTERA_CAPI int wall_new2(const char* type);
CANTERA_CAPI int wall_new(int type); //!< @deprecated To be changed after Cantera 2.5.
CANTERA_CAPI int wall_del(int i);
CANTERA_CAPI int wall_install(int i, int n, int m);
CANTERA_CAPI double wall_vdot(int i, double t);

11
include/cantera/zeroD/ConstPressureReactor.h
View file

@ -24,7 +24,18 @@ class ConstPressureReactor : public Reactor
public:
ConstPressureReactor() {}
virtual std::string typeStr() const {
return "ConstPressureReactor";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("ConstPressureReactor::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"ConstPressureReactor::typeStr() during transition");
return ConstPressureReactorType;
}

19
include/cantera/zeroD/FlowDevice.h
View file

@ -15,6 +15,8 @@ namespace Cantera
class Func1;
class ReactorBase;
//! Magic numbers
//! @deprecated To be removed after Cantera 2.5.
const int MFC_Type = 1;
const int PressureController_Type = 2;
const int Valve_Type = 3;
@ -33,8 +35,21 @@ public:
FlowDevice(const FlowDevice&) = delete;
FlowDevice& operator=(const FlowDevice&) = delete;
//! String indicating the flow device implemented. Usually
//! corresponds to the name of the derived class.
virtual std::string typeStr() const {
return "FlowDevice";
}
//! Return an integer indicating the type of flow device
int type() {
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("FlowDevice::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"FlowDevice::typeStr() during transition.");
return m_type;
}
@ -100,7 +115,7 @@ protected:
doublereal m_mdot;
Func1* m_func;
vector_fp m_coeffs;
int m_type;
int m_type; //!< @deprecated To be removed after Cantera 2.5.
private:
size_t m_nspin, m_nspout;

3
include/cantera/zeroD/FlowDeviceFactory.h
View file

@ -46,6 +46,8 @@ public:
* @param name the name of the flow device type.
* @param type the type identifier of the flow device.
* Integer type identifiers are used by clib and matlab interfaces.
*
* @deprecated To be removed after Cantera 2.5.
*/
void reg_type(const std::string& name, const int type) {
m_types[type] = name;
@ -53,6 +55,7 @@ public:
protected:
//! Map containing flow device type identifier / type name pairs.
//! @deprecated To be removed after Cantera 2.5.
std::unordered_map<int, std::string> m_types;
private:

11
include/cantera/zeroD/FlowReactor.h
View file

@ -17,7 +17,18 @@ class FlowReactor : public Reactor
public:
FlowReactor();
virtual std::string typeStr() const {
return "FlowReactor";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("FlowReactor::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"FlowReactor::typeStr() during transition");
return FlowReactorType;
}

12
include/cantera/zeroD/IdealGasConstPressureReactor.h
View file

@ -23,7 +23,19 @@ class IdealGasConstPressureReactor : public ConstPressureReactor
public:
IdealGasConstPressureReactor() {}
virtual std::string typeStr() const {
return "IdealGasConstPressureReactor";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("IdealGasConstPressureReactor::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"IdealGasConstPressureReactor::typeStr() during "
"transition");
return IdealGasConstPressureReactorType;
}

11
include/cantera/zeroD/IdealGasReactor.h
View file

@ -21,7 +21,18 @@ class IdealGasReactor : public Reactor
public:
IdealGasReactor() {}
virtual std::string typeStr() const {
return "IdealGasReactor";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("IdealGasReactor::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"IdealGasReactor::typeStr() during transition");
return IdealGasReactorType;
}

19
include/cantera/zeroD/Reactor.h
View file

@ -39,7 +39,18 @@ class Reactor : public ReactorBase
public:
Reactor();
virtual std::string typeStr() const {
return "Reactor";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("Reactor::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"Reactor::typeStr() during transition");
return ReactorType;
}
@ -53,10 +64,9 @@ public:
setKineticsMgr(contents);
}
void setKineticsMgr(Kinetics& kin);
virtual void setKineticsMgr(Kinetics& kin);
//! Enable or disable changes in reactor composition due to chemical reactions.
void setChemistry(bool cflag = true) {
virtual void setChemistry(bool cflag = true) {
m_chem = cflag;
}
@ -65,8 +75,7 @@ public:
return m_chem;
}
//! Set the energy equation on or off.
void setEnergy(int eflag = 1) {
virtual void setEnergy(int eflag = 1) {
if (eflag > 0) {
m_energy = true;
} else {

29
include/cantera/zeroD/ReactorBase.h
View file

@ -15,7 +15,10 @@ class FlowDevice;
class WallBase;
class ReactorNet;
class ReactorSurface;
class Kinetics;
//! Magic numbers
//! @deprecated To be removed after Cantera 2.5.
const int ReservoirType = 1;
const int ReactorType = 2;
const int FlowReactorType = 3;
@ -49,8 +52,19 @@ public:
ReactorBase(const ReactorBase&) = delete;
ReactorBase& operator=(const ReactorBase&) = delete;
//! String indicating the reactor model implemented. Usually
//! corresponds to the name of the derived class.
virtual std::string typeStr() const {
return "ReactorBase";
}
//! Return a constant indicating the type of this Reactor
//! @deprecated To be changed after Cantera 2.5.
virtual int type() const {
warn_deprecated("ReactorBase::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"ReactorBase::typeStr() during transition");
return 0;
}
@ -77,6 +91,21 @@ public:
//! the substance is modified.
virtual void setThermoMgr(thermo_t& thermo);
//! Specify chemical kinetics governing the reactor.
virtual void setKineticsMgr(Kinetics& kin) {
throw NotImplementedError("ReactorBase::setKineticsMgr");
}
//! Enable or disable changes in reactor composition due to chemical reactions.
virtual void setChemistry(bool cflag = true) {
throw NotImplementedError("ReactorBase::setChemistry");
}
//! Set the energy equation on or off.
virtual void setEnergy(int eflag = 1) {
throw NotImplementedError("ReactorBase::setEnergy");
}
//! Connect an inlet FlowDevice to this reactor
void addInlet(FlowDevice& inlet);

3
include/cantera/zeroD/ReactorFactory.h
View file

@ -46,6 +46,8 @@ public:
* @param name the name of the reactor type.
* @param type the type identifier of the reactor.
* Integer type identifiers are used by clib and matlab interfaces.
*
* @deprecated To be removed after Cantera 2.5.
*/
void reg_type(const std::string& name, const int type) {
m_types[type] = name;
@ -53,6 +55,7 @@ public:
protected:
//! Map containing reactor type identifier / reactor type name pairs.
//! @deprecated To be removed after Cantera 2.5.
std::unordered_map<int, std::string> m_types;
private:

12
include/cantera/zeroD/Reservoir.h
View file

@ -15,7 +15,19 @@ class Reservoir : public ReactorBase
{
public:
Reservoir() {}
virtual std::string typeStr() const {
return "Reservoir";
}
/*!
* @deprecated To be changed after Cantera 2.5.
*/
virtual int type() const {
warn_deprecated("Reservoir::type()",
"To be changed after Cantera 2.5. "
"Return string instead of magic number; use "
"Reservoir::typeStr() during transition");
return ReservoirType;
}
virtual void initialize(doublereal t0 = 0.0) {}

2
include/cantera/zeroD/Wall.h
View file

@ -17,6 +17,8 @@ class Kinetics;
class SurfPhase;
class Func1;
//! Magic numbers
//! @deprecated To be removed after Cantera 2.5.
const int WallType = 1;
/**

3
include/cantera/zeroD/WallFactory.h
View file

@ -46,6 +46,8 @@ public:
* @param name the name of the wall type.
* @param type the type identifier of the wall.
* Integer type identifiers are used by clib and matlab interfaces.
*
* @deprecated To be removed after Cantera 2.5.
*/
void reg_type(const std::string& name, const int type) {
m_types[type] = name;
@ -53,6 +55,7 @@ public:
protected:
//! Map containing wall type identifier / wall type name pairs.
//! @deprecated To be removed after Cantera 2.5.
std::unordered_map<int, std::string> m_types;
private:

12
include/cantera/zeroD/flowControllers.h
View file

@ -20,6 +20,10 @@ class MassFlowController : public FlowDevice
public:
MassFlowController();
virtual std::string typeStr() const {
return "MassFlowController";
}
virtual bool ready() {
return FlowDevice::ready() && m_mdot >= 0.0;
}
@ -40,6 +44,10 @@ class PressureController : public FlowDevice
public:
PressureController();
virtual std::string typeStr() const {
return "PressureController";
}
virtual bool ready() {
return FlowDevice::ready() && m_master != 0 && m_coeffs.size() == 1;
}
@ -76,6 +84,10 @@ class Valve : public FlowDevice
public:
Valve();
virtual std::string typeStr() const {
return "Valve";
}
virtual bool ready() {
return FlowDevice::ready() && (m_coeffs.size() == 1 || m_func);
}

6
interfaces/cython/cantera/_cantera.pxd
View file

@ -495,15 +495,16 @@ cdef extern from "cantera/zerodim.h" namespace "Cantera":
cdef cppclass CxxFlowDevice "Cantera::FlowDevice"
# factories
cdef CxxReactorBase* newReactor(string) except +translate_exception
cdef CxxFlowDevice* newFlowDevice(string) except +translate_exception
cdef CxxWallBase* newWall(string) except +translate_exception
# reactors
cdef cppclass CxxReactorBase "Cantera::ReactorBase":
CxxReactorBase()
string typeStr()
void setThermoMgr(CxxThermoPhase&) except +translate_exception
void restoreState() except +translate_exception
void syncState() except +translate_exception
@ -581,6 +582,7 @@ cdef extern from "cantera/zerodim.h" namespace "Cantera":
cdef cppclass CxxFlowDevice "Cantera::FlowDevice":
CxxFlowDevice()
string typeStr()
double massFlowRate(double) except +translate_exception
cbool install(CxxReactorBase&, CxxReactorBase&) except +translate_exception
void setFunction(CxxFunc1*)

12
interfaces/cython/cantera/reactor.pyx
View file

@ -49,6 +49,11 @@ cdef class ReactorBase:
self._thermo._references[self._weakref_proxy] = True
self.rbase.setThermoMgr(deref(solution.thermo))
property type:
"""The type of the reactor."""
def __get__(self):
return pystr(self.rbase.typeStr())
property name:
"""The name of the reactor."""
def __get__(self):
@ -532,7 +537,7 @@ cdef class WallBase:
self._right_reactor = right
property type:
""" The left surface of this wall. """
"""The type of the wall."""
def __get__(self):
return pystr(self.wall.type())
@ -684,6 +689,11 @@ cdef class FlowDevice:
def __dealloc__(self):
del self.dev
property type:
"""The type of the flow device."""
def __get__(self):
return pystr(self.dev.typeStr())
def _install(self, ReactorBase upstream, ReactorBase downstream):
"""
Install the device between the *upstream* (source) and *downstream*

5
interfaces/cython/cantera/test/test_reactor.py
View file

@ -77,6 +77,10 @@ class TestReactor(utilities.CanteraTest):
self.r1.name = 'hello'
self.assertEqual(self.r1.name, 'hello')
def test_types(self):
self.make_reactors()
self.assertEqual(self.r1.type, self.reactorClass.__name__)
def test_component_index(self):
self.make_reactors(n_reactors=1)
self.net.step()
@ -438,6 +442,7 @@ class TestReactor(utilities.CanteraTest):
mfc = ct.MassFlowController(reservoir, self.r1)
mfc.set_mass_flow_rate(lambda t: 0.1 if 0.2 <= t < 1.2 else 0.0)
self.assertEqual(mfc.type, type(mfc).__name__)
self.assertEqual(len(reservoir.inlets), 0)
self.assertEqual(len(reservoir.outlets), 1)
self.assertEqual(reservoir.outlets[0], mfc)

18
interfaces/matlab/toolbox/@FlowDevice/FlowDevice.m
View file

@ -13,21 +13,29 @@ function x = FlowDevice(typ)
% See also: :mat:func:`MassFlowController`, :mat:func:`Valve`
%
% :param typ:
% Type of :mat:func:`FlowDevice` to be created. ``typ=1`` for
% :mat:func:`MassFlowController` and ``typ=3`` for
% Type of :mat:func:`FlowDevice` to be created. ``typ='MassFlowController'``
% for :mat:func:`MassFlowController`, ``typ='PressureController'`` for
% :mat:func:`PressureController` and ``typ='Valve'`` for
% :mat:func:`Valve`
% :return:
% Instance of class :mat:func:`FlowDevice`
%
if nargin == 0
typ = 1;
typ = 'MassFlowController';
end
x.index = flowdevicemethods(0, typ);
if isa(typ, 'double')
warning('Definition via integer type to be deprecated after Cantera 2.5')
device_types = {'MassFlowController', 'PressureController', 'Valve'};
typ = device_types(typ);
end
x.type = char(typ);
x.index = flowdevicemethods(0, x.type);
if x.index < 0
error(geterr);
end
x.type = typ;
x.upstream = -1;
x.downstream = -1;
x = class(x, 'FlowDevice');

2
interfaces/matlab/toolbox/@FlowDevice/setFunction.m
View file

@ -10,7 +10,7 @@ function setFunction(f, mf)
% Instance of class :mat:func:`Func`
%
if f.type == 1
if strcmp(f.type, 'MassFlowController')
k = flowdevicemethods(5, f.index, func_hndl(mf));
if k < 0
error(geterr);

2
interfaces/matlab/toolbox/@FlowDevice/setMassFlowRate.m
View file

@ -9,7 +9,7 @@ function setMassFlowRate(f, mdot)
% :param mdot:
% Mass flow rate
%
if f.type == 1
if strcmp(f.type, 'MassFlowController')
k = flowdevicemethods(3, f.index, mdot);
if k < 0
error(geterr);

2
interfaces/matlab/toolbox/@FlowDevice/setValveCoeff.m
View file

@ -16,7 +16,7 @@ function setValveCoeff(f, k)
% Value of the valve coefficient. Units: kg/Pa-s
%
if f.type ~= 3
if ~strcmp(f.type, 'Valve')
error('Valve coefficient can only be set for valves')
end
ok = flowdevicemethods(4, f.index, k);

29
interfaces/matlab/toolbox/@Reactor/Reactor.m
View file

@ -18,14 +18,14 @@ function x = Reactor(contents, typ)
% Instance of class :mat:func:`Solution` representing the contents of the
% reactor
% :param typ:
% Integer, reactor type. Options are:
% Character array, reactor type. Options are:
%
% 1. Reservoir
% 2. Reactor
% 3. Flow Reactor
% 4. Constant Pressure Reactor
% 5. Ideal Gas Reactor
% 6. Ideal Gas Constant Pressure Reactor
% 'Reservoir'
% 'Reactor'
% 'FlowReactor'
% 'ConstPressureReactor'
% 'IdealGasReactor'
% 'IdealGasConstPressureReactor'
%
% :return:
% Instance of class :mat:func:`Reactor`
@ -33,14 +33,23 @@ function x = Reactor(contents, typ)
if nargin == 0
contents = 0;
typ = 2;
typ = 'Reactor';
elseif nargin == 1
typ = 2;
typ = 'Reactor';
elseif nargin > 2
error('too many arguments');
end
x.index = reactormethods(0, typ);
if isa(typ, 'double')
warning('Definition via integer type to be deprecated after Cantera 2.5')
reactor_types = {'Reservoir' 'Reactor' 'FlowReactor' ...
'ConstPressureReactor' 'IdealGasReactor' ...
'IdealGasConstPressureReactor'};
typ = reactor_types(typ);
end
x.type = char(typ);
x.index = reactormethods(0, x.type);
if x.index < 0
error(geterr);
end

4
interfaces/matlab/toolbox/@Reactor/insert.m
View file

@ -9,4 +9,6 @@ function insert(r, gas)
r.contents = gas;
setThermoMgr(r, gas);
setKineticsMgr(r, gas);
if ~strcmp(r.type, 'Reservoir')
setKineticsMgr(r, gas);
end

8
interfaces/matlab/toolbox/@Wall/Wall.m
View file

@ -57,11 +57,11 @@ function x = Wall(left, right, area, k, u, q, v)
% :return:
% Instance of class :mat:func:`Wall`
% This is a dummy argument, it is not actually used by wall_new in ctreactor.cpp
typ = 1;
x.index = wallmethods(0, typ);
% At the moment, only one wall type is implemented
typ = 'Wall';
x.type = char(typ);
x.index = wallmethods(0, x.type);
if x.index < 0
error(geterr);
end

2
interfaces/matlab/toolbox/ConstPressureReactor.m
View file

@ -23,4 +23,4 @@ function r = ConstPressureReactor(contents)
if nargin == 0
contents = 0;
end
r = Reactor(contents, 4);
r = Reactor(contents, 'ConstPressureReactor');

2
interfaces/matlab/toolbox/FlowReactor.m
View file

@ -21,4 +21,4 @@ function r = FlowReactor(contents)
if nargin == 0
contents = 0;
end
r = Reactor(contents, 3);
r = Reactor(contents, 'FlowReactor');

2
interfaces/matlab/toolbox/IdealGasConstPressureReactor.m
View file

@ -25,4 +25,4 @@ function r = IdealGasConstPressureReactor(contents)
if nargin == 0
contents = 0;
end
r = Reactor(contents, 6);
r = Reactor(contents, 'IdealGasConstPressureReactor');

2
interfaces/matlab/toolbox/IdealGasReactor.m
View file

@ -22,4 +22,4 @@ function r = IdealGasReactor(contents)
if nargin == 0
contents = 0;
end
r = Reactor(contents, 5);
r = Reactor(contents, 'IdealGasReactor');

2
interfaces/matlab/toolbox/MassFlowController.m
View file

@ -19,7 +19,7 @@ function m = MassFlowController(upstream, downstream)
% Instance of class :mat:func:`FlowDevice`
%
m = FlowDevice(1);
m = FlowDevice('MassFlowController');
if nargin == 2
install(m, upstream, downstream)
end

2
interfaces/matlab/toolbox/Reservoir.m
View file

@ -27,4 +27,4 @@ function r = Reservoir(contents)
if nargin == 0
contents = 0;
end
r = Reactor(contents, 1);
r = Reactor(contents, 'Reservoir');

2
interfaces/matlab/toolbox/Valve.m
View file

@ -30,7 +30,7 @@ function v = Valve(upstream, downstream)
% Instance of class :mat:func:`FlowDevice`
%
v = FlowDevice(3);
v = FlowDevice('Valve');
if nargin == 2
install(v, upstream, downstream)
end

58
src/clib/ctreactor.cpp
View file

@ -35,7 +35,22 @@ extern "C" {
// reactor
//! @deprecated To be changed after Cantera 2.5.
int reactor_new(int type)
{
warn_deprecated("reactor_new(int)",
"To be changed after Cantera 2.5. "
"Argument changed to string instead of int; use"
"reactor_new2(char*) during transition.");
try {
ReactorBase* r = ReactorFactory::factory()->newReactor(type);
return ReactorCabinet::add(r);
} catch (...) {
return handleAllExceptions(-1, ERR);
}
}
int reactor_new2(const char* type)
{
try {
ReactorBase* r = ReactorFactory::factory()->newReactor(type);
@ -78,10 +93,7 @@ extern "C" {
int reactor_setKineticsMgr(int i, int n)
{
try {
// @todo This should not fail silently
if (ReactorCabinet::item(i).type() >= ReactorType) {
ReactorCabinet::get<Reactor>(i).setKineticsMgr(KineticsCabinet::item(n));
}
ReactorCabinet::item(i).setKineticsMgr(KineticsCabinet::item(n));
return 0;
} catch (...) {
return handleAllExceptions(-1, ERR);
@ -163,10 +175,7 @@ extern "C" {
int reactor_setChemistry(int i, int cflag)
{
try {
// @todo This should not fail silently
if (ReactorCabinet::item(i).type() >= ReactorType) {
ReactorCabinet::get<Reactor>(i).setChemistry(cflag != 0);
}
ReactorCabinet::get<Reactor>(i).setChemistry(cflag != 0);
return 0;
} catch (...) {
return handleAllExceptions(-1, ERR);
@ -176,10 +185,7 @@ extern "C" {
int reactor_setEnergy(int i, int eflag)
{
try {
// @todo This should not fail silently
if (ReactorCabinet::item(i).type() >= ReactorType) {
ReactorCabinet::get<Reactor>(i).setEnergy(eflag);
}
ReactorCabinet::get<Reactor>(i).setEnergy(eflag);
return 0;
} catch (...) {
return handleAllExceptions(-1, ERR);
@ -345,6 +351,20 @@ extern "C" {
// flow devices
int flowdev_new(int type)
{
warn_deprecated("flowdev_new(int)",
"To be changed after Cantera 2.5. "
"Argument changed to string instead of int; use"
"flowdev_new2(char*) during transition.");
try {
FlowDevice* f = FlowDeviceFactory::factory()->newFlowDevice(type);
return FlowDeviceCabinet::add(f);
} catch (...) {
return handleAllExceptions(-1, ERR);
}
}
int flowdev_new2(const char* type)
{
try {
FlowDevice* f = FlowDeviceFactory::factory()->newFlowDevice(type);
@ -431,6 +451,20 @@ extern "C" {
///////////// Walls ///////////////////////
int wall_new(int type)
{
warn_deprecated("wall_new(int)",
"To be changed after Cantera 2.5. "
"Argument changed to string instead of int; use"
"wall_new2(char*) during transition.");
try {
WallBase* w = WallFactory::factory()->newWall(type);
return WallCabinet::add(w);
} catch (...) {
return handleAllExceptions(-1, ERR);
}
}
int wall_new2(const char* type)
{
try {
WallBase* w = WallFactory::factory()->newWall(type);

9
src/matlab/flowdevicemethods.cpp
View file

@ -1,5 +1,5 @@
// This file is part of Cantera. See License.txt in the top-level directory or
// at http://www.cantera.org/license.txt for license and copyright information.
// at https://cantera.org/license.txt for license and copyright information.
#include "ctmatutils.h"
#include "cantera/clib/ctreactor.h"
@ -10,8 +10,6 @@ void flowdevicemethods(int nlhs, mxArray* plhs[],
{
int m, iok = 0, n;
int job = getInt(prhs[1]);
int i = getInt(prhs[2]);
double r = Undef;
double v = Undef;
if (nrhs > 3) {
@ -20,7 +18,9 @@ void flowdevicemethods(int nlhs, mxArray* plhs[],
// constructor
if (job == 0) {
n = flowdev_new(i);
char* type = getString(prhs[2]);
n = flowdev_new2(type);
plhs[0] = mxCreateNumericMatrix(1,1,mxDOUBLE_CLASS,mxREAL);
double* h = mxGetPr(plhs[0]);
*h = double(n);
@ -32,6 +32,7 @@ void flowdevicemethods(int nlhs, mxArray* plhs[],
// options that do not return a value
int i = getInt(prhs[2]);
if (job < 20) {
switch (job) {
case 1:

9
src/matlab/reactormethods.cpp
View file

@ -3,7 +3,7 @@
*/
// This file is part of Cantera. See License.txt in the top-level directory or
// at http://www.cantera.org/license.txt for license and copyright information.
// at https://cantera.org/license.txt for license and copyright information.
#include "cantera/clib/ctreactor.h"
#include "cantera/clib/ct.h"
@ -14,7 +14,6 @@ void reactormethods(int nlhs, mxArray* plhs[],
{
int iok = 0, n;
int job = getInt(prhs[1]);
int i = getInt(prhs[2]);
double r = Undef;
double v = Undef;
if (nrhs > 3) {
@ -23,7 +22,9 @@ void reactormethods(int nlhs, mxArray* plhs[],
// constructor
if (job == 0) {
n = reactor_new(i);
char* type = getString(prhs[2]);
n = reactor_new2(type);
plhs[0] = mxCreateNumericMatrix(1,1,mxDOUBLE_CLASS,mxREAL);
double* h = mxGetPr(plhs[0]);
*h = double(n);
@ -34,6 +35,8 @@ void reactormethods(int nlhs, mxArray* plhs[],
}
// options that do not return a value
int i = getInt(prhs[2]);
if (job < 20) {
switch (job) {
case 1:

8
src/matlab/wallmethods.cpp
View file

@ -3,7 +3,7 @@
*/
// This file is part of Cantera. See License.txt in the top-level directory or
// at http://www.cantera.org/license.txt for license and copyright information.
// at https://cantera.org/license.txt for license and copyright information.
#include "cantera/clib/ctreactor.h"
#include "cantera/clib/ct.h"
@ -14,7 +14,6 @@ void wallmethods(int nlhs, mxArray* plhs[],
{
int m, iok = 0, n;
int job = getInt(prhs[1]);
int i = getInt(prhs[2]);
double r = Undef;
double v = Undef;
if (nrhs > 3) {
@ -23,7 +22,8 @@ void wallmethods(int nlhs, mxArray* plhs[],
// constructor
if (job == 0) {
n = wall_new(i);
char* type = getString(prhs[2]);
n = wall_new2(type);
plhs[0] = mxCreateNumericMatrix(1,1,mxDOUBLE_CLASS,mxREAL);
double* h = mxGetPr(plhs[0]);
*h = double(n);
@ -34,6 +34,8 @@ void wallmethods(int nlhs, mxArray* plhs[],
}
// options that do not return a value
int i = getInt(prhs[2]);
if (job < 20) {
switch (job) {
case 1:

2
src/zeroD/ReactorNet.cpp
View file

@ -91,7 +91,7 @@ void ReactorNet::initialize()
writelog("Reactor {:d}: {:d} variables.\n", n, nv);
writelog(" {:d} sensitivity params.\n", r.nSensParams());
}
if (r.type() == FlowReactorType && m_reactors.size() > 1) {
if (r.typeStr() == "FlowReactor" && m_reactors.size() > 1) {
throw CanteraError("ReactorNet::initialize",
"FlowReactors must be used alone.");
}

2
test_problems/clib_test/clib_test.c
View file

@ -72,7 +72,7 @@ int main(int argc, char** argv)
assert(ret == 0);
printf("\ntime Temperature\n");
int reactor = reactor_new(5);
int reactor = reactor_new2("IdealGasReactor");
int net = reactornet_new();
ret = reactor_setThermoMgr(reactor, thermo);
assert(ret == 0);