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

[clib] Switch KineticsCabinet to smart pointers

Browse Source
This commit is contained in:
Ingmar Schoegl 2023-03-01 08:10:33 -06:00
parent 9c2348cf67
commit 25b3ce392b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/clib/ct.cpp
View File

@ -28,7 +28,7 @@ using namespace std;
using namespace Cantera; using namespace Cantera;
typedef Cabinet<ThermoPhase> ThermoCabinet; typedef Cabinet<ThermoPhase> ThermoCabinet;
typedef Cabinet<Kinetics> KineticsCabinet; typedef SharedCabinet<Kinetics> KineticsCabinet;
typedef SharedCabinet<Transport> TransportCabinet; typedef SharedCabinet<Transport> TransportCabinet;
typedef SharedCabinet<Solution> SolutionCabinet; typedef SharedCabinet<Solution> SolutionCabinet;
@ -1008,8 +1008,8 @@ extern "C" {
} }
} }
} }
unique_ptr<Kinetics> kin = newKinetics(phases, filename, phasename); shared_ptr<Kinetics> kin = newKinetics(phases, filename, phasename);
return KineticsCabinet::add(kin.release()); return KineticsCabinet::add(kin);
} catch (...) { } catch (...) {
return handleAllExceptions(-1, ERR); return handleAllExceptions(-1, ERR);
} }

2
src/clib/ctonedim.cpp
View File

@ -25,7 +25,7 @@ template<> SimCabinet* SimCabinet::s_storage = 0;
template<> DomainCabinet* DomainCabinet::s_storage = 0; template<> DomainCabinet* DomainCabinet::s_storage = 0;
typedef Cabinet<ThermoPhase> ThermoCabinet; typedef Cabinet<ThermoPhase> ThermoCabinet;
typedef Cabinet<Kinetics> KineticsCabinet; typedef SharedCabinet<Kinetics> KineticsCabinet;
typedef SharedCabinet<Transport> TransportCabinet; typedef SharedCabinet<Transport> TransportCabinet;
template<> ThermoCabinet* ThermoCabinet::s_storage; // defined in ct.cpp template<> ThermoCabinet* ThermoCabinet::s_storage; // defined in ct.cpp
template<> KineticsCabinet* KineticsCabinet::s_storage; // defined in ct.cpp template<> KineticsCabinet* KineticsCabinet::s_storage; // defined in ct.cpp