diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index 4bd6b17dc60..6f9d289fff7 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -17,6 +17,7 @@ #include "cantera/base/NoExitLogger.h" #include "cantera/base/stringUtils.h" #include "clib/Cabinet.h" +#include "clib/Cabinet3.h" #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/clib/clib_defs.h" @@ -26,13 +27,14 @@ using namespace Cantera; typedef Cabinet ThermoCabinet; typedef Cabinet KineticsCabinet; -typedef Cabinet TransportCabinet; +typedef Cabinet3 TransportCabinet; typedef integer status_t; template<> ThermoCabinet* ThermoCabinet::s_storage; // defined in ct.cpp template<> KineticsCabinet* KineticsCabinet::s_storage; // defined in ct.cpp template<> TransportCabinet* TransportCabinet::s_storage; // defined in ct.cpp +template<> int TransportCabinet::count; namespace { @@ -944,7 +946,7 @@ extern "C" { try { std::string mstr = f2string(model, lenmodel); ThermoPhase* t = _fth(ith); - Transport* tr = newTransportMgr(mstr, t, *loglevel); + auto tr = newTransport(t, mstr); return TransportCabinet::add(tr); } catch (...) { return handleAllExceptions(-1, ERR); @@ -955,7 +957,7 @@ extern "C" { { try { ThermoPhase* t = _fth(ith); - Transport* tr = newDefaultTransportMgr(t, *loglevel); + auto tr = newTransport(t, "default"); return TransportCabinet::add(tr); } catch (...) { return handleAllExceptions(-1, ERR);