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

[fortran] Switch to smart clib cabinets

Browse Source
This commit is contained in:
Ingmar Schoegl 2023-02-28 22:25:02 -06:00
parent ff9544f77e
commit 7efc12d4f0
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/fortran/fct.cpp
View File

@ -16,7 +16,7 @@
#include "cantera/thermo/ThermoFactory.h" #include "cantera/thermo/ThermoFactory.h"
#include "cantera/base/NoExitLogger.h" #include "cantera/base/NoExitLogger.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/extensions/Cabinet.h" #include "clib/clib_utils.h"
#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#include "cantera/clib/clib_defs.h" #include "cantera/clib/clib_defs.h"
@ -24,9 +24,9 @@
using namespace Cantera; using namespace Cantera;
typedef Cabinet<ThermoPhase> ThermoCabinet; typedef SharedCabinet<ThermoPhase> ThermoCabinet;
typedef Cabinet<Kinetics> KineticsCabinet; typedef SharedCabinet<Kinetics> KineticsCabinet;
typedef Cabinet<Transport> TransportCabinet; typedef SharedCabinet<Transport> TransportCabinet;
typedef integer status_t; typedef integer status_t;
@ -51,6 +51,11 @@ ThermoPhase* _fth(const integer* n)
return &ThermoCabinet::item(*n); return &ThermoCabinet::item(*n);
} }
shared_ptr<ThermoPhase> _fthermo(const integer* n)
{
return ThermoCabinet::at(*n);
}
Transport* _ftrans(const integer* n) Transport* _ftrans(const integer* n)
{ {
return &TransportCabinet::item(*n); return &TransportCabinet::item(*n);
@ -362,8 +367,8 @@ extern "C" {
integer th_newfromfile_(char* filename, char* phasename, ftnlen lenf, ftnlen lenp) integer th_newfromfile_(char* filename, char* phasename, ftnlen lenf, ftnlen lenp)
{ {
try { try {
ThermoPhase* th = newPhase(f2string(filename, lenf), auto th = newThermo(f2string(filename, lenf),
f2string(phasename, lenp)); f2string(phasename, lenp));
return ThermoCabinet::add(th); return ThermoCabinet::add(th);
} catch (...) { } catch (...) {
return handleAllExceptions(-1, ERR); return handleAllExceptions(-1, ERR);
@ -676,23 +681,23 @@ extern "C" {
const integer* neighbor4, ftnlen nlen, ftnlen plen) const integer* neighbor4, ftnlen nlen, ftnlen plen)
{ {
try { try {
std::vector<ThermoPhase*> phases; vector<shared_ptr<ThermoPhase>> phases;
phases.push_back(_fth(reactingPhase)); phases.push_back(_fthermo(reactingPhase));
if (*neighbor1 >= 0) { if (*neighbor1 >= 0) {
phases.push_back(_fth(neighbor1)); phases.push_back(_fthermo(neighbor1));
if (*neighbor2 >= 0) { if (*neighbor2 >= 0) {
phases.push_back(_fth(neighbor2)); phases.push_back(_fthermo(neighbor2));
if (*neighbor3 >= 0) { if (*neighbor3 >= 0) {
phases.push_back(_fth(neighbor3)); phases.push_back(_fthermo(neighbor3));
if (*neighbor4 >= 0) { if (*neighbor4 >= 0) {
phases.push_back(_fth(neighbor4)); phases.push_back(_fthermo(neighbor4));
} }
} }
} }
} }
auto kin = newKinetics(phases, f2string(filename, nlen), auto kin = newKinetics(phases, f2string(filename, nlen),
f2string(phasename, plen)); f2string(phasename, plen));
return KineticsCabinet::add(kin.release()); return KineticsCabinet::add(kin);
} catch (...) { } catch (...) {
return handleAllExceptions(999, ERR); return handleAllExceptions(999, ERR);
} }
@ -943,8 +948,8 @@ extern "C" {
{ {
try { try {
std::string mstr = f2string(model, lenmodel); std::string mstr = f2string(model, lenmodel);
ThermoPhase* t = _fth(ith); auto t = _fthermo(ith);
Transport* tr = newTransportMgr(mstr, t, *loglevel); auto tr = newTransport(t, mstr);
return TransportCabinet::add(tr); return TransportCabinet::add(tr);
} catch (...) { } catch (...) {
return handleAllExceptions(-1, ERR); return handleAllExceptions(-1, ERR);
@ -954,8 +959,8 @@ extern "C" {
integer trans_newdefault_(integer* ith, integer* loglevel, ftnlen lenmodel) integer trans_newdefault_(integer* ith, integer* loglevel, ftnlen lenmodel)
{ {
try { try {
ThermoPhase* t = _fth(ith); auto t = _fthermo(ith);
Transport* tr = newDefaultTransportMgr(t, *loglevel); auto tr = newTransport(t, "default");
return TransportCabinet::add(tr); return TransportCabinet::add(tr);
} catch (...) { } catch (...) {
return handleAllExceptions(-1, ERR); return handleAllExceptions(-1, ERR);