GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[0D] Deprecate zeroD insert

Browse Source
This commit is contained in:
Ingmar Schoegl 2024-01-20 19:12:21 -06:00 committed by Ray Speth
parent c348fef4a9
commit 32f9ea6ec8
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/cantera/zeroD/Reactor.h
View File

@ -46,6 +46,7 @@ class AnyMap;
class Reactor : public ReactorBase
{
public:
Reactor(shared_ptr<Solution> sol, const string& name = "(none)");
using ReactorBase::ReactorBase; // inherit constructors
string type() const override {

5
include/cantera/zeroD/Reservoir.h
View File

@ -18,6 +18,11 @@ namespace Cantera
class Reservoir : public ReactorBase
{
public:
Reservoir(shared_ptr<Solution> sol, const string& name = "(none)") {
m_solution = sol;
m_name = name;
setThermoMgr(*sol->thermo());
}
using ReactorBase::ReactorBase; // inherit constructors
string type() const override {

8
src/zeroD/Reactor.cpp
View File

@ -22,6 +22,14 @@ namespace bmt = boost::math::tools;
namespace Cantera
{
Reactor::Reactor(shared_ptr<Solution> sol, const string& name)
{
m_solution = sol;
m_name = name;
setThermoMgr(*sol->thermo());
setKineticsMgr(*sol->kinetics());
}
void Reactor::setDerivativeSettings(AnyMap& settings)
{
m_kin->setDerivativeSettings(settings);

4
src/zeroD/ReactorBase.cpp
View File

@ -36,8 +36,8 @@ void ReactorBase::setSolution(shared_ptr<Solution> sol) {
void ReactorBase::insert(shared_ptr<Solution> sol)
{
// warn_deprecated("ReactorBase::insert",
// "To be removed after Cantera 3.1. Superseded by 'setSolution'.");
warn_deprecated("ReactorBase::insert",
"To be removed after Cantera 3.1. Superseded by 'setSolution'.");
setSolution(sol);
}

16
test/zeroD/test_zeroD.cpp
View File

@ -19,8 +19,8 @@ TEST(zerodim, simple)
auto sol = newSolution("gri30.yaml", "gri30", "none");
sol->thermo()->setState_TPX(T, P, X);
IdealGasReactor cppReactor;
cppReactor.insert(sol);
IdealGasReactor cppReactor(sol, "simple");
ASSERT_EQ(cppReactor.name(), "simple");
cppReactor.initialize();
ReactorNet network;
network.addReactor(cppReactor);
@ -74,8 +74,7 @@ TEST(zerodim, test_individual_reactor_initialization)
shared_ptr<Solution> sol1 = newSolution("h2o2.yaml");
sol1->thermo()->setState_TPX(T0, P0, X0);
// set up reactor object
Reactor reactor1;
reactor1.insert(sol1);
Reactor reactor1(sol1);
// initialize reactor prior to integration to ensure no impact
reactor1.initialize();
// setup reactor network and integrate
@ -88,8 +87,7 @@ TEST(zerodim, test_individual_reactor_initialization)
sol2->thermo()->setState_TPX(T0, P0, X0);
sol2->thermo()->equilibrate("UV");
// secondary reactor for comparison
Reactor reactor2;
reactor2.insert(sol2);
Reactor reactor2(sol2);
reactor2.initialize(0.0);
// get state of reactors
vector<double> state1(reactor1.neq());
@ -109,8 +107,7 @@ TEST(MoleReactorTestSet, test_mole_reactor_get_state)
double tol = 1e-8;
auto sol = newSolution("h2o2.yaml");
sol->thermo()->setState_TPY(1000.0, OneAtm, "H2:0.5, O2:0.5");
IdealGasConstPressureMoleReactor reactor;
reactor.insert(sol);
IdealGasConstPressureMoleReactor reactor(sol);
reactor.setInitialVolume(0.5);
reactor.setEnergy(false);
reactor.initialize();
@ -189,8 +186,7 @@ TEST(AdaptivePreconditionerTests, test_precon_solver_stats)
// setting up solution object and thermo/kinetics pointers
auto sol = newSolution("h2o2.yaml");
sol->thermo()->setState_TPY(1000.0, OneAtm, "H2:0.5, O2:0.5");
IdealGasMoleReactor reactor;
reactor.insert(sol);
IdealGasMoleReactor reactor(sol);
reactor.setInitialVolume(0.5);
// setup reactor network and integrate
ReactorNet network;