From 27314703a0a119c83fa326801809d6682f5e28f9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 27 Feb 2012 18:15:47 +0000 Subject: [PATCH] Fixed qualifiers for functions that are part of the Cantera DLL --- src/clib/clib_defs.h | 41 ++---- src/clib/ct.cpp | 298 +++++++++++++++++--------------------- src/clib/ct.h | 279 ++++++++++++++++++----------------- src/clib/ctbdry.cpp | 22 +-- src/clib/ctbdry.h | 22 +-- src/clib/ctfunc.cpp | 16 +- src/clib/ctfunc.h | 16 +- src/clib/ctmultiphase.cpp | 74 +++++----- src/clib/ctmultiphase.h | 85 +++++------ src/clib/ctonedim.cpp | 132 ++++++++--------- src/clib/ctonedim.h | 132 ++++++++--------- src/clib/ctreactor.cpp | 130 ++++++++--------- src/clib/ctreactor.h | 131 +++++++++-------- src/clib/ctrpath.cpp | 54 +++---- src/clib/ctrpath.h | 50 +++---- src/clib/ctsurf.cpp | 16 +- src/clib/ctsurf.h | 66 ++++----- src/clib/ctxml.cpp | 46 +++--- src/clib/ctxml.h | 47 +++--- src/fortran/fct.cpp | 186 ++++++++++++------------ src/fortran/fctxml.cpp | 47 +++--- src/fortran/flib_defs.h | 24 --- src/fortran/genf.py | 4 +- 23 files changed, 929 insertions(+), 989 deletions(-) delete mode 100644 src/fortran/flib_defs.h diff --git a/src/clib/clib_defs.h b/src/clib/clib_defs.h index c15347cca..568febf7e 100644 --- a/src/clib/clib_defs.h +++ b/src/clib/clib_defs.h @@ -7,39 +7,28 @@ #include "cantera/base/ct_defs.h" #ifdef _WIN32 -// Either build as a DLL under Windows or not. -// the decision relies upon whether the NO_DLL_BUILD define is -// set or not. -#ifdef NO_DLL_BUILD -#define DLL_EXPORT -#define DLL_IMPORT +// Windows (MSVC or MinGW) +# ifdef CANTERA_USE_INTERNAL +# define CANTERA_CAPI extern __declspec(dllexport) +# else +# define CANTERA_CAPI extern __declspec(dllimport) +# endif #else -#define DLL_IMPORT __declspec(dllimport) -#define DLL_EXPORT __declspec(dllexport) -#endif -#else -// On other platforms, we turn off the DLL macros. -#define DLL_EXPORT -#define DLL_IMPORT -#endif - -#ifdef CANTERA_USE_INTERNAL -#define DLL_CPREFIX DLL_EXPORT -#define EEXXTT extern -#else -#define DLL_CPREFIX DLL_IMPORT -#define EEXXTT +// Non-Windows platform +# ifdef CANTERA_USE_INTERNAL +# define CANTERA_CAPI extern +# else +# define CANTERA_CAPI +# endif #endif // Values returned for error conditions #ifndef ERR -#define ERR -999 +# define ERR -999 #endif + #ifndef DERR -#define DERR -999.999 +# define DERR -999.999 #endif -namespace Cantera {} -namespace std {} - #endif diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 5a9479a89..b3ccaa068 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -107,33 +107,7 @@ void writephase(const ThermoPhase& th, bool show_thermo); */ extern "C" { -#ifdef _WIN32 -#ifndef NO_DLL_BUILD - /* - * The microsoft docs says we may need this in some - * cases when building dll's - */ - /* - bool WINAPI DllMain(HINSTANCE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved) { - switch(ul_reason_for_call ) { - case DLL_PROCESS_ATTACH: - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; - } - */ -#endif -#endif - - int DLL_EXPORT ct_appdelete() + int ct_appdelete() { appdelete(); return 0; @@ -141,22 +115,22 @@ extern "C" { //--------------- Phase ---------------------// - size_t DLL_EXPORT phase_nElements(int n) + size_t phase_nElements(int n) { return ThermoCabinet::item(n).nElements(); } - size_t DLL_EXPORT phase_nSpecies(int n) + size_t phase_nSpecies(int n) { return ThermoCabinet::item(n).nSpecies(); } - doublereal DLL_EXPORT phase_temperature(int n) + doublereal phase_temperature(int n) { return ThermoCabinet::item(n).temperature(); } - int DLL_EXPORT phase_setTemperature(int n, double t) + int phase_setTemperature(int n, double t) { try { ThermoCabinet::item(n).setTemperature(t); @@ -166,12 +140,12 @@ extern "C" { return 0; } - doublereal DLL_EXPORT phase_density(int n) + doublereal phase_density(int n) { return ThermoCabinet::item(n).density(); } - int DLL_EXPORT phase_setDensity(int n, double rho) + int phase_setDensity(int n, double rho) { if (rho < 0.0) { return -1; @@ -180,12 +154,12 @@ extern "C" { return 0; } - doublereal DLL_EXPORT phase_molarDensity(int n) + doublereal phase_molarDensity(int n) { return ThermoCabinet::item(n).molarDensity(); } - int DLL_EXPORT phase_setMolarDensity(int n, double ndens) + int phase_setMolarDensity(int n, double ndens) { if (ndens < 0.0) { return -1; @@ -194,24 +168,24 @@ extern "C" { return 0; } - doublereal DLL_EXPORT phase_meanMolecularWeight(int n) + doublereal phase_meanMolecularWeight(int n) { return ThermoCabinet::item(n).meanMolecularWeight(); } - size_t DLL_EXPORT phase_elementIndex(int n, char* nm) + size_t phase_elementIndex(int n, char* nm) { string elnm = string(nm); return ThermoCabinet::item(n).elementIndex(elnm); } - size_t DLL_EXPORT phase_speciesIndex(int n, char* nm) + size_t phase_speciesIndex(int n, char* nm) { string spnm = string(nm); return ThermoCabinet::item(n).speciesIndex(spnm); } - int DLL_EXPORT phase_getMoleFractions(int n, size_t lenx, double* x) + int phase_getMoleFractions(int n, size_t lenx, double* x) { ThermoPhase& p = ThermoCabinet::item(n); if (lenx >= p.nSpecies()) { @@ -222,12 +196,12 @@ extern "C" { } } - doublereal DLL_EXPORT phase_moleFraction(int n, size_t k) + doublereal phase_moleFraction(int n, size_t k) { return ThermoCabinet::item(n).moleFraction(k); } - int DLL_EXPORT phase_getMassFractions(int n, size_t leny, double* y) + int phase_getMassFractions(int n, size_t leny, double* y) { ThermoPhase& p = ThermoCabinet::item(n); if (leny >= p.nSpecies()) { @@ -238,12 +212,12 @@ extern "C" { } } - doublereal DLL_EXPORT phase_massFraction(int n, size_t k) + doublereal phase_massFraction(int n, size_t k) { return ThermoCabinet::item(n).massFraction(k); } - int DLL_EXPORT phase_setMoleFractions(int n, size_t lenx, double* x, int norm) + int phase_setMoleFractions(int n, size_t lenx, double* x, int norm) { ThermoPhase& p = ThermoCabinet::item(n); if (lenx >= p.nSpecies()) { @@ -258,7 +232,7 @@ extern "C" { } } - int DLL_EXPORT phase_setMoleFractionsByName(int n, char* x) + int phase_setMoleFractionsByName(int n, char* x) { try { ThermoPhase& p = ThermoCabinet::item(n); @@ -276,7 +250,7 @@ extern "C" { //catch (...) {return ERR;} } - int DLL_EXPORT phase_setMassFractions(int n, size_t leny, + int phase_setMassFractions(int n, size_t leny, double* y, int norm) { ThermoPhase& p = ThermoCabinet::item(n); @@ -292,7 +266,7 @@ extern "C" { } } - int DLL_EXPORT phase_setMassFractionsByName(int n, char* y) + int phase_setMassFractionsByName(int n, char* y) { try { ThermoPhase& p = ThermoCabinet::item(n); @@ -309,7 +283,7 @@ extern "C" { } } - int DLL_EXPORT phase_getAtomicWeights(int n, + int phase_getAtomicWeights(int n, size_t lenm, double* atw) { ThermoPhase& p = ThermoCabinet::item(n); @@ -322,7 +296,7 @@ extern "C" { } } - int DLL_EXPORT phase_getMolecularWeights(int n, + int phase_getMolecularWeights(int n, size_t lenm, double* mw) { ThermoPhase& p = ThermoCabinet::item(n); @@ -335,7 +309,7 @@ extern "C" { } } - int DLL_EXPORT phase_getName(int n, size_t lennm, char* nm) + int phase_getName(int n, size_t lennm, char* nm) { string name = ThermoCabinet::item(n).name(); size_t lout = min(lennm, name.size()); @@ -344,14 +318,14 @@ extern "C" { return 0; } - int DLL_EXPORT phase_setName(int n, const char* nm) + int phase_setName(int n, const char* nm) { string name = string(nm); ThermoCabinet::item(n).setName(name); return 0; } - int DLL_EXPORT phase_getSpeciesName(int n, size_t k, size_t lennm, char* nm) + int phase_getSpeciesName(int n, size_t k, size_t lennm, char* nm) { try { string spnm = ThermoCabinet::item(n).speciesName(k); @@ -365,7 +339,7 @@ extern "C" { //catch (...) {return ERR;} } - int DLL_EXPORT phase_getElementName(int n, size_t m, size_t lennm, char* nm) + int phase_getElementName(int n, size_t m, size_t lennm, char* nm) { try { string elnm = ThermoCabinet::item(n).elementName(m); @@ -379,7 +353,7 @@ extern "C" { } - doublereal DLL_EXPORT phase_nAtoms(int n, size_t k, size_t m) + doublereal phase_nAtoms(int n, size_t k, size_t m) { try { return ThermoCabinet::item(n).nAtoms(k,m); @@ -388,7 +362,7 @@ extern "C" { } } - int DLL_EXPORT phase_addElement(int n, char* name, doublereal weight) + int phase_addElement(int n, char* name, doublereal weight) { try { ThermoCabinet::item(n).addElement(string(name),weight); @@ -398,7 +372,7 @@ extern "C" { } } - // int DLL_EXPORT phase_addSpecies(int n, char* name, int phase, + // int phase_addSpecies(int n, char* name, int phase, // int ncomp, doublereal* comp, int thermoType, int ncoeffs, // double* coeffs, double minTemp, double maxTemp, double refPressure, // doublereal charge, doublereal weight) { @@ -420,7 +394,7 @@ extern "C" { //-------------- Thermo --------------------// - size_t DLL_EXPORT newThermoFromXML(int mxml) + size_t newThermoFromXML(int mxml) { try { XML_Node& x = XmlCabinet::item(mxml); @@ -431,17 +405,17 @@ extern "C" { } } - size_t DLL_EXPORT th_nSpecies(size_t n) + size_t th_nSpecies(size_t n) { return ThermoCabinet::item(n).nSpecies(); } - int DLL_EXPORT th_eosType(int n) + int th_eosType(int n) { return ThermoCabinet::item(n).eosType(); } - double DLL_EXPORT th_enthalpy_mole(int n) + double th_enthalpy_mole(int n) { try { return ThermoCabinet::item(n).enthalpy_mole(); @@ -450,7 +424,7 @@ extern "C" { } } - double DLL_EXPORT th_intEnergy_mole(int n) + double th_intEnergy_mole(int n) { try { return ThermoCabinet::item(n).intEnergy_mole(); @@ -459,7 +433,7 @@ extern "C" { } } - double DLL_EXPORT th_entropy_mole(int n) + double th_entropy_mole(int n) { try { return ThermoCabinet::item(n).entropy_mole(); @@ -468,7 +442,7 @@ extern "C" { } } - double DLL_EXPORT th_gibbs_mole(int n) + double th_gibbs_mole(int n) { try { return ThermoCabinet::item(n).gibbs_mole(); @@ -477,7 +451,7 @@ extern "C" { } } - double DLL_EXPORT th_cp_mole(int n) + double th_cp_mole(int n) { try { return ThermoCabinet::item(n).cp_mole(); @@ -486,7 +460,7 @@ extern "C" { } } - double DLL_EXPORT th_cv_mole(int n) + double th_cv_mole(int n) { try { return ThermoCabinet::item(n).cv_mole(); @@ -495,7 +469,7 @@ extern "C" { } } - double DLL_EXPORT th_pressure(int n) + double th_pressure(int n) { try { return ThermoCabinet::item(n).pressure(); @@ -504,7 +478,7 @@ extern "C" { } } - double DLL_EXPORT th_enthalpy_mass(int n) + double th_enthalpy_mass(int n) { try { return ThermoCabinet::item(n).enthalpy_mass(); @@ -513,7 +487,7 @@ extern "C" { } } - double DLL_EXPORT th_intEnergy_mass(int n) + double th_intEnergy_mass(int n) { try { return ThermoCabinet::item(n).intEnergy_mass(); @@ -522,7 +496,7 @@ extern "C" { } } - double DLL_EXPORT th_entropy_mass(int n) + double th_entropy_mass(int n) { try { return ThermoCabinet::item(n).entropy_mass(); @@ -531,7 +505,7 @@ extern "C" { } } - double DLL_EXPORT th_gibbs_mass(int n) + double th_gibbs_mass(int n) { try { return ThermoCabinet::item(n).gibbs_mass(); @@ -540,7 +514,7 @@ extern "C" { } } - double DLL_EXPORT th_cp_mass(int n) + double th_cp_mass(int n) { try { return ThermoCabinet::item(n).cp_mass(); @@ -549,7 +523,7 @@ extern "C" { } } - double DLL_EXPORT th_cv_mass(int n) + double th_cv_mass(int n) { try { return ThermoCabinet::item(n).cv_mass(); @@ -558,7 +532,7 @@ extern "C" { } } - double DLL_EXPORT th_electricPotential(int n) + double th_electricPotential(int n) { try { return ThermoCabinet::item(n).electricPotential(); @@ -567,7 +541,7 @@ extern "C" { } } - int DLL_EXPORT th_chemPotentials(int n, size_t lenm, double* murt) + int th_chemPotentials(int n, size_t lenm, double* murt) { ThermoPhase& thrm = ThermoCabinet::item(n); size_t nsp = thrm.nSpecies(); @@ -579,7 +553,7 @@ extern "C" { } } - int DLL_EXPORT th_elementPotentials(int n, size_t lenm, double* lambda) + int th_elementPotentials(int n, size_t lenm, double* lambda) { ThermoPhase& thrm = ThermoCabinet::item(n); size_t nel = thrm.nElements(); @@ -592,7 +566,7 @@ extern "C" { } } - int DLL_EXPORT th_setPressure(int n, double p) + int th_setPressure(int n, double p) { try { if (p < 0.0) throw CanteraError("th_setPressure", @@ -604,7 +578,7 @@ extern "C" { } } - int DLL_EXPORT th_set_HP(int n, double* vals) + int th_set_HP(int n, double* vals) { try { if (vals[1] < 0.0) @@ -620,7 +594,7 @@ extern "C" { } } - int DLL_EXPORT th_set_UV(int n, double* vals) + int th_set_UV(int n, double* vals) { try { if (vals[1] < 0.0) @@ -636,7 +610,7 @@ extern "C" { } } - int DLL_EXPORT th_set_SV(int n, double* vals) + int th_set_SV(int n, double* vals) { try { ThermoCabinet::item(n).setState_SV(vals[0],vals[1]); @@ -646,7 +620,7 @@ extern "C" { } } - int DLL_EXPORT th_set_SP(int n, double* vals) + int th_set_SP(int n, double* vals) { try { ThermoCabinet::item(n).setState_SP(vals[0],vals[1]); @@ -656,7 +630,7 @@ extern "C" { } } - int DLL_EXPORT th_equil(int n, char* XY, int solver, + int th_equil(int n, char* XY, int solver, double rtol, int maxsteps, int maxiter, int loglevel) { try { @@ -668,23 +642,23 @@ extern "C" { } } - doublereal DLL_EXPORT th_refPressure(int n) + doublereal th_refPressure(int n) { return ThermoCabinet::item(n).refPressure(); } - doublereal DLL_EXPORT th_minTemp(int n, int k) + doublereal th_minTemp(int n, int k) { return ThermoCabinet::item(n).minTemp(k); } - doublereal DLL_EXPORT th_maxTemp(int n, int k) + doublereal th_maxTemp(int n, int k) { return ThermoCabinet::item(n).maxTemp(k); } - int DLL_EXPORT th_getEnthalpies_RT(int n, size_t lenm, double* h_rt) + int th_getEnthalpies_RT(int n, size_t lenm, double* h_rt) { try { ThermoPhase& thrm = ThermoCabinet::item(n); @@ -700,7 +674,7 @@ extern "C" { } } - int DLL_EXPORT th_getEntropies_R(int n, size_t lenm, double* s_r) + int th_getEntropies_R(int n, size_t lenm, double* s_r) { try { ThermoPhase& thrm = ThermoCabinet::item(n); @@ -716,7 +690,7 @@ extern "C" { } } - int DLL_EXPORT th_getCp_R(int n, size_t lenm, double* cp_r) + int th_getCp_R(int n, size_t lenm, double* cp_r) { try { ThermoPhase& thrm = ThermoCabinet::item(n); @@ -732,7 +706,7 @@ extern "C" { } } - int DLL_EXPORT th_setElectricPotential(int n, double v) + int th_setElectricPotential(int n, double v) { ThermoCabinet::item(n).setElectricPotential(v); return 0; @@ -741,27 +715,27 @@ extern "C" { //-------------- pure fluids ---------------// #ifdef WITH_PURE_FLUIDS - double DLL_EXPORT th_critTemperature(int n) + double th_critTemperature(int n) { return pfprop(n,0); } - double DLL_EXPORT th_critPressure(int n) + double th_critPressure(int n) { return purefluid(n)->critPressure(); } - double DLL_EXPORT th_critDensity(int n) + double th_critDensity(int n) { return purefluid(n)->critDensity(); } - double DLL_EXPORT th_vaporFraction(int n) + double th_vaporFraction(int n) { return purefluid(n)->vaporFraction(); } - double DLL_EXPORT th_satTemperature(int n, double p) + double th_satTemperature(int n, double p) { try { return purefluid(n)->satTemperature(p); @@ -770,7 +744,7 @@ extern "C" { } } - double DLL_EXPORT th_satPressure(int n, double t) + double th_satPressure(int n, double t) { try { return purefluid(n)->satPressure(t); @@ -779,7 +753,7 @@ extern "C" { } } - int DLL_EXPORT th_setState_Psat(int n, double p, double x) + int th_setState_Psat(int n, double p, double x) { try { purefluid(n)->setState_Psat(p, x); @@ -789,7 +763,7 @@ extern "C" { } } - int DLL_EXPORT th_setState_Tsat(int n, double t, double x) + int th_setState_Tsat(int n, double t, double x) { try { purefluid(n)->setState_Tsat(t, x); @@ -800,42 +774,42 @@ extern "C" { } #else - double DLL_EXPORT th_critTemperature(int n) + double th_critTemperature(int n) { return DERR; } - double DLL_EXPORT th_critPressure(int n) + double th_critPressure(int n) { return DERR; } - double DLL_EXPORT th_critDensity(int n) + double th_critDensity(int n) { return DERR; } - double DLL_EXPORT th_vaporFraction(int n) + double th_vaporFraction(int n) { return DERR; } - double DLL_EXPORT th_satTemperature(int n, double p) + double th_satTemperature(int n, double p) { return DERR; } - double DLL_EXPORT th_satPressure(int n, double t) + double th_satPressure(int n, double t) { return DERR; } - int DLL_EXPORT th_setState_Psat(int n, double p, double x) + int th_setState_Psat(int n, double p, double x) { return DERR; } - int DLL_EXPORT th_setState_Tsat(int n, double t, double x) + int th_setState_Tsat(int n, double t, double x) { return DERR; } @@ -845,7 +819,7 @@ extern "C" { //-------------- Kinetics ------------------// - size_t DLL_EXPORT newKineticsFromXML(int mxml, int iphase, + size_t newKineticsFromXML(int mxml, int iphase, int neighbor1, int neighbor2, int neighbor3, int neighbor4) { @@ -876,7 +850,7 @@ extern "C" { } } - int DLL_EXPORT installRxnArrays(int pxml, int ikin, + int installRxnArrays(int pxml, int ikin, char* default_phase) { try { @@ -891,64 +865,64 @@ extern "C" { } //------------------------------------- - int DLL_EXPORT kin_type(int n) + int kin_type(int n) { return KineticsCabinet::item(n).type(); } - size_t DLL_EXPORT kin_start(int n, int p) + size_t kin_start(int n, int p) { return KineticsCabinet::item(n).kineticsSpeciesIndex(0,p); } - size_t DLL_EXPORT kin_speciesIndex(int n, const char* nm, const char* ph) + size_t kin_speciesIndex(int n, const char* nm, const char* ph) { return KineticsCabinet::item(n).kineticsSpeciesIndex(string(nm), string(ph)); } //--------------------------------------- - size_t DLL_EXPORT kin_nSpecies(int n) + size_t kin_nSpecies(int n) { return KineticsCabinet::item(n).nTotalSpecies(); } - size_t DLL_EXPORT kin_nReactions(int n) + size_t kin_nReactions(int n) { return KineticsCabinet::item(n).nReactions(); } - size_t DLL_EXPORT kin_nPhases(int n) + size_t kin_nPhases(int n) { return KineticsCabinet::item(n).nPhases(); } - size_t DLL_EXPORT kin_phaseIndex(int n, char* ph) + size_t kin_phaseIndex(int n, char* ph) { return KineticsCabinet::item(n).phaseIndex(string(ph)); } - size_t DLL_EXPORT kin_reactionPhaseIndex(int n) + size_t kin_reactionPhaseIndex(int n) { return KineticsCabinet::item(n).reactionPhaseIndex(); } - double DLL_EXPORT kin_reactantStoichCoeff(int n, int k, int i) + double kin_reactantStoichCoeff(int n, int k, int i) { return KineticsCabinet::item(n).reactantStoichCoeff(k,i); } - double DLL_EXPORT kin_productStoichCoeff(int n, int k, int i) + double kin_productStoichCoeff(int n, int k, int i) { return KineticsCabinet::item(n).productStoichCoeff(k,i); } - int DLL_EXPORT kin_reactionType(int n, int i) + int kin_reactionType(int n, int i) { return KineticsCabinet::item(n).reactionType(i); } - int DLL_EXPORT kin_getFwdRatesOfProgress(int n, size_t len, double* fwdROP) + int kin_getFwdRatesOfProgress(int n, size_t len, double* fwdROP) { Kinetics& k = KineticsCabinet::item(n); try { @@ -963,7 +937,7 @@ extern "C" { } } - int DLL_EXPORT kin_getRevRatesOfProgress(int n, size_t len, double* revROP) + int kin_getRevRatesOfProgress(int n, size_t len, double* revROP) { Kinetics& k = KineticsCabinet::item(n); try { @@ -978,12 +952,12 @@ extern "C" { } } - int DLL_EXPORT kin_isReversible(int n, int i) + int kin_isReversible(int n, int i) { return (int) KineticsCabinet::item(n).isReversible(i); } - int DLL_EXPORT kin_getNetRatesOfProgress(int n, size_t len, double* netROP) + int kin_getNetRatesOfProgress(int n, size_t len, double* netROP) { try { Kinetics& k = KineticsCabinet::item(n); @@ -998,7 +972,7 @@ extern "C" { } } - int DLL_EXPORT kin_getFwdRateConstants(int n, size_t len, double* kfwd) + int kin_getFwdRateConstants(int n, size_t len, double* kfwd) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1013,7 +987,7 @@ extern "C" { } } - int DLL_EXPORT kin_getRevRateConstants(int n, int doIrreversible, size_t len, double* krev) + int kin_getRevRateConstants(int n, int doIrreversible, size_t len, double* krev) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1033,7 +1007,7 @@ extern "C" { } - int DLL_EXPORT kin_getActivationEnergies(int n, size_t len, double* E) + int kin_getActivationEnergies(int n, size_t len, double* E) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1049,7 +1023,7 @@ extern "C" { } - int DLL_EXPORT kin_getDelta(int n, int job, size_t len, double* delta) + int kin_getDelta(int n, int job, size_t len, double* delta) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1085,7 +1059,7 @@ extern "C" { } - int DLL_EXPORT kin_getDeltaEntropy(int n, size_t len, double* deltaS) + int kin_getDeltaEntropy(int n, size_t len, double* deltaS) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1101,7 +1075,7 @@ extern "C" { } - int DLL_EXPORT kin_getCreationRates(int n, size_t len, double* cdot) + int kin_getCreationRates(int n, size_t len, double* cdot) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1116,7 +1090,7 @@ extern "C" { } } - int DLL_EXPORT kin_getDestructionRates(int n, size_t len, double* ddot) + int kin_getDestructionRates(int n, size_t len, double* ddot) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1132,7 +1106,7 @@ extern "C" { //catch (...) {return ERR;} } - int DLL_EXPORT kin_getNetProductionRates(int n, size_t len, double* wdot) + int kin_getNetProductionRates(int n, size_t len, double* wdot) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1147,7 +1121,7 @@ extern "C" { } } - int DLL_EXPORT kin_getSourceTerms(int n, size_t len, double* ydot) + int kin_getSourceTerms(int n, size_t len, double* ydot) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1168,17 +1142,17 @@ extern "C" { } } - double DLL_EXPORT kin_multiplier(int n, int i) + double kin_multiplier(int n, int i) { return KineticsCabinet::item(n).multiplier(i); } - size_t DLL_EXPORT kin_phase(int n, size_t i) + size_t kin_phase(int n, size_t i) { return ThermoCabinet::index(KineticsCabinet::item(n).thermo(i)); } - int DLL_EXPORT kin_getEquilibriumConstants(int n, size_t len, double* kc) + int kin_getEquilibriumConstants(int n, size_t len, double* kc) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1193,7 +1167,7 @@ extern "C" { } } - int DLL_EXPORT kin_getReactionString(int n, int i, int len, char* buf) + int kin_getReactionString(int n, int i, int len, char* buf) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1207,7 +1181,7 @@ extern "C" { } } - int DLL_EXPORT kin_setMultiplier(int n, int i, double v) + int kin_setMultiplier(int n, int i, double v) { try { if (v >= 0.0) { @@ -1221,7 +1195,7 @@ extern "C" { } } - int DLL_EXPORT kin_advanceCoverages(int n, double tstep) + int kin_advanceCoverages(int n, double tstep) { try { Kinetics& k = KineticsCabinet::item(n); @@ -1239,7 +1213,7 @@ extern "C" { //------------------- Transport --------------------------- - size_t DLL_EXPORT newTransport(char* model, + size_t newTransport(char* model, int ith, int loglevel) { string mstr = string(model); @@ -1252,7 +1226,7 @@ extern "C" { } } - double DLL_EXPORT trans_viscosity(int n) + double trans_viscosity(int n) { try { return TransportCabinet::item(n).viscosity(); @@ -1261,7 +1235,7 @@ extern "C" { } } - double DLL_EXPORT trans_thermalConductivity(int n) + double trans_thermalConductivity(int n) { try { return TransportCabinet::item(n).thermalConductivity(); @@ -1270,7 +1244,7 @@ extern "C" { } } - int DLL_EXPORT trans_getThermalDiffCoeffs(int n, int ldt, double* dt) + int trans_getThermalDiffCoeffs(int n, int ldt, double* dt) { try { TransportCabinet::item(n).getThermalDiffCoeffs(dt); @@ -1280,7 +1254,7 @@ extern "C" { } } - int DLL_EXPORT trans_getMixDiffCoeffs(int n, int ld, double* d) + int trans_getMixDiffCoeffs(int n, int ld, double* d) { try { TransportCabinet::item(n).getMixDiffCoeffs(d); @@ -1290,7 +1264,7 @@ extern "C" { } } - int DLL_EXPORT trans_getBinDiffCoeffs(int n, int ld, double* d) + int trans_getBinDiffCoeffs(int n, int ld, double* d) { try { TransportCabinet::item(n).getBinaryDiffCoeffs(ld,d); @@ -1300,7 +1274,7 @@ extern "C" { } } - int DLL_EXPORT trans_getMultiDiffCoeffs(int n, int ld, double* d) + int trans_getMultiDiffCoeffs(int n, int ld, double* d) { try { TransportCabinet::item(n).getMultiDiffCoeffs(ld,d); @@ -1310,7 +1284,7 @@ extern "C" { } } - int DLL_EXPORT trans_setParameters(int n, int type, int k, double* d) + int trans_setParameters(int n, int type, int k, double* d) { try { TransportCabinet::item(n).setParameters(type, k, d); @@ -1320,7 +1294,7 @@ extern "C" { } } - int DLL_EXPORT trans_getMolarFluxes(int n, const double* state1, + int trans_getMolarFluxes(int n, const double* state1, const double* state2, double delta, double* fluxes) { try { @@ -1331,7 +1305,7 @@ extern "C" { } } - int DLL_EXPORT trans_getMassFluxes(int n, const double* state1, + int trans_getMassFluxes(int n, const double* state1, const double* state2, double delta, double* fluxes) { try { @@ -1344,7 +1318,7 @@ extern "C" { //-------------------- Functions --------------------------- - int DLL_EXPORT import_phase(int nth, int nxml, char* id) + int import_phase(int nth, int nxml, char* id) { ThermoPhase& thrm = ThermoCabinet::item(nth); XML_Node& node = XmlCabinet::item(nxml); @@ -1357,7 +1331,7 @@ extern "C" { } } - int DLL_EXPORT import_kinetics(int nxml, char* id, + int import_kinetics(int nxml, char* id, int nphases, integer* ith, int nkin) { vector phases; @@ -1376,7 +1350,7 @@ extern "C" { } - int DLL_EXPORT phase_report(int nth, + int phase_report(int nth, int ibuf, char* buf, int show_thermo) { try { @@ -1394,7 +1368,7 @@ extern "C" { } } - int DLL_EXPORT write_phase(int nth, int show_thermo) + int write_phase(int nth, int show_thermo) { try { bool stherm = (show_thermo != 0); @@ -1405,13 +1379,13 @@ extern "C" { } } - int DLL_EXPORT write_HTML_log(char* file) + int write_HTML_log(char* file) { write_logfile(string(file)); return 0; } - int DLL_EXPORT getCanteraError(int buflen, char* buf) + int getCanteraError(int buflen, char* buf) { string e; e = lastErrorMessage(); @@ -1423,26 +1397,26 @@ extern "C" { return int(e.size()); } - int DLL_EXPORT showCanteraErrors() + int showCanteraErrors() { showErrors(); return 0; } - int DLL_EXPORT addCanteraDirectory(size_t buflen, char* buf) + int addCanteraDirectory(size_t buflen, char* buf) { addDirectory(string(buf)); return 0; } - int DLL_EXPORT setLogWriter(void* logger) + int setLogWriter(void* logger) { Logger* logwriter = (Logger*)logger; setLogger(logwriter); return 0; } - int DLL_EXPORT readlog(int n, char* buf) + int readlog(int n, char* buf) { string s; writelog("function readlog is deprecated!"); @@ -1459,7 +1433,7 @@ extern "C" { return 0; } - int DLL_EXPORT clearStorage() + int clearStorage() { try { ThermoCabinet::clear(); @@ -1471,7 +1445,7 @@ extern "C" { } } - int DLL_EXPORT delThermo(int n) + int delThermo(int n) { try { ThermoCabinet::del(n); @@ -1481,19 +1455,19 @@ extern "C" { } } - int DLL_EXPORT delKinetics(int n) + int delKinetics(int n) { KineticsCabinet::del(n); return 0; } - int DLL_EXPORT delTransport(int n) + int delTransport(int n) { TransportCabinet::del(n); return 0; } - int DLL_EXPORT buildSolutionFromXML(char* src, int ixml, char* id, + int buildSolutionFromXML(char* src, int ixml, char* id, int ith, int ikin) { @@ -1529,7 +1503,7 @@ extern "C" { } - int DLL_EXPORT ck_to_cti(char* in_file, char* db_file, + int ck_to_cti(char* in_file, char* db_file, char* tr_file, char* id_tag, int debug, int validate) { bool dbg = (debug != 0); @@ -1538,7 +1512,7 @@ extern "C" { } - int DLL_EXPORT writelogfile(char* logfile) + int writelogfile(char* logfile) { write_logfile(string(logfile)); return 0; diff --git a/src/clib/ct.h b/src/clib/ct.h index 184703025..5db664d60 100644 --- a/src/clib/ct.h +++ b/src/clib/ct.h @@ -14,168 +14,167 @@ extern "C" { - EEXXTT int DLL_CPREFIX ct_appdelete(); + CANTERA_CAPI int ct_appdelete(); + CANTERA_CAPI size_t phase_nElements(int n); + CANTERA_CAPI size_t phase_nSpecies(int n); + CANTERA_CAPI double phase_temperature(int n); + CANTERA_CAPI int phase_setTemperature(int n, double t); + CANTERA_CAPI double phase_density(int n); + CANTERA_CAPI int phase_setDensity(int n, double rho); + CANTERA_CAPI double phase_molarDensity(int n); + CANTERA_CAPI int phase_setMolarDensity(int n, double ndens); + CANTERA_CAPI double phase_meanMolecularWeight(int n); + CANTERA_CAPI double phase_moleFraction(int n, size_t k); + CANTERA_CAPI double phase_massFraction(int n, size_t k); + CANTERA_CAPI int phase_getMoleFractions(int n, size_t lenx, double* x); + CANTERA_CAPI int phase_getMassFractions(int n, size_t leny, double* y); + CANTERA_CAPI int phase_setMoleFractions(int n, size_t lenx, + double* x, int norm); + CANTERA_CAPI int phase_setMassFractions(int n, size_t leny, + double* y, int norm); + CANTERA_CAPI int phase_setMoleFractionsByName(int n, char* x); + CANTERA_CAPI int phase_setMassFractionsByName(int n, char* y); + CANTERA_CAPI int phase_getAtomicWeights(int n, size_t lenm, double* atw); + CANTERA_CAPI int phase_getMolecularWeights(int n, size_t lenm, double* mw); + CANTERA_CAPI int phase_getElementName(int n, size_t k, size_t lennm, char* nm); + CANTERA_CAPI int phase_getSpeciesName(int n, size_t m, size_t lennm, char* nm); + CANTERA_CAPI int phase_getName(int n, size_t lennm, char* nm); + CANTERA_CAPI int phase_setName(int n, const char* nm); + CANTERA_CAPI size_t phase_elementIndex(int n, char* nm); + CANTERA_CAPI size_t phase_speciesIndex(int n, char* nm); + CANTERA_CAPI int phase_report(int nth, + int ibuf, char* buf, int show_thermo); + CANTERA_CAPI int write_phase(int nth, int show_thermo); - EEXXTT size_t DLL_CPREFIX phase_nElements(int n); - EEXXTT size_t DLL_CPREFIX phase_nSpecies(int n); - EEXXTT double DLL_CPREFIX phase_temperature(int n); - EEXXTT int DLL_CPREFIX phase_setTemperature(int n, double t); - EEXXTT double DLL_CPREFIX phase_density(int n); - EEXXTT int DLL_CPREFIX phase_setDensity(int n, double rho); - EEXXTT double DLL_CPREFIX phase_molarDensity(int n); - EEXXTT int DLL_CPREFIX phase_setMolarDensity(int n, double ndens); - EEXXTT double DLL_CPREFIX phase_meanMolecularWeight(int n); - EEXXTT double DLL_CPREFIX phase_moleFraction(int n, size_t k); - EEXXTT double DLL_CPREFIX phase_massFraction(int n, size_t k); - EEXXTT int DLL_CPREFIX phase_getMoleFractions(int n, size_t lenx, double* x); - EEXXTT int DLL_CPREFIX phase_getMassFractions(int n, size_t leny, double* y); - EEXXTT int DLL_CPREFIX phase_setMoleFractions(int n, size_t lenx, - double* x, int norm); - EEXXTT int DLL_CPREFIX phase_setMassFractions(int n, size_t leny, - double* y, int norm); - EEXXTT int DLL_CPREFIX phase_setMoleFractionsByName(int n, char* x); - EEXXTT int DLL_CPREFIX phase_setMassFractionsByName(int n, char* y); - EEXXTT int DLL_CPREFIX phase_getAtomicWeights(int n, size_t lenm, double* atw); - EEXXTT int DLL_CPREFIX phase_getMolecularWeights(int n, size_t lenm, double* mw); - EEXXTT int DLL_CPREFIX phase_getElementName(int n, size_t k, size_t lennm, char* nm); - EEXXTT int DLL_CPREFIX phase_getSpeciesName(int n, size_t m, size_t lennm, char* nm); - EEXXTT int DLL_CPREFIX phase_getName(int n, size_t lennm, char* nm); - EEXXTT int DLL_CPREFIX phase_setName(int n, const char* nm); - EEXXTT size_t DLL_CPREFIX phase_elementIndex(int n, char* nm); - EEXXTT size_t DLL_CPREFIX phase_speciesIndex(int n, char* nm); - EEXXTT int DLL_CPREFIX phase_report(int nth, - int ibuf, char* buf, int show_thermo); - EEXXTT int DLL_EXPORT write_phase(int nth, int show_thermo); + CANTERA_CAPI double phase_nAtoms(int n, size_t k, size_t m); - EEXXTT double DLL_CPREFIX phase_nAtoms(int n, size_t k, size_t m); + CANTERA_CAPI int phase_addElement(int n, char* name, double weight); + CANTERA_CAPI int phase_addSpecies(int n, char* name, int phase, + int ncomp, double* comp, int thermoType, int ncoeffs, + double* coeffs, double minTemp, double maxTemp, double refPressure, + double charge, double weight); - EEXXTT int DLL_CPREFIX phase_addElement(int n, char* name, double weight); - EEXXTT int DLL_CPREFIX phase_addSpecies(int n, char* name, int phase, - int ncomp, double* comp, int thermoType, int ncoeffs, - double* coeffs, double minTemp, double maxTemp, double refPressure, - double charge, double weight); + //int newThermo(char* model); + CANTERA_CAPI size_t newThermoFromXML(int mxml); + CANTERA_CAPI int th_thermoIndex(char* id); + CANTERA_CAPI int th_phase(int n); + CANTERA_CAPI size_t th_nSpecies(size_t n); + CANTERA_CAPI int th_eosType(int n); + CANTERA_CAPI double th_refPressure(int n); + CANTERA_CAPI double th_minTemp(int n, int k=-1); + CANTERA_CAPI double th_maxTemp(int n, int k=-1); + CANTERA_CAPI double th_enthalpy_mole(int n); + CANTERA_CAPI double th_intEnergy_mole(int n); + CANTERA_CAPI double th_entropy_mole(int n); + CANTERA_CAPI double th_gibbs_mole(int n); + CANTERA_CAPI double th_cp_mole(int n); + CANTERA_CAPI double th_cv_mole(int n); + CANTERA_CAPI double th_pressure(int n); + CANTERA_CAPI int th_setPressure(int n, double p); + CANTERA_CAPI double th_enthalpy_mass(int n); + CANTERA_CAPI double th_intEnergy_mass(int n); + CANTERA_CAPI double th_entropy_mass(int n); + CANTERA_CAPI double th_gibbs_mass(int n); + CANTERA_CAPI double th_cp_mass(int n); + CANTERA_CAPI double th_cv_mass(int n); + CANTERA_CAPI double th_electricPotential(int n); + CANTERA_CAPI int th_chemPotentials(int n, size_t lenm, double* murt); + CANTERA_CAPI int th_elementPotentials(int n, size_t lenm, double* lambda); + CANTERA_CAPI int th_getEnthalpies_RT(int n, size_t lenm, double* h_rt); + CANTERA_CAPI int th_getEntropies_R(int n, size_t lenm, double* s_r); + CANTERA_CAPI int th_getCp_R(int n, size_t lenm, double* cp_r); + CANTERA_CAPI int th_setElectricPotential(int n, double v); + CANTERA_CAPI int get_eos(char* fname, char* phase_id); - //int DLL_CPREFIX newThermo(char* model); - EEXXTT size_t DLL_CPREFIX newThermoFromXML(int mxml); - EEXXTT int DLL_CPREFIX th_thermoIndex(char* id); - EEXXTT int DLL_CPREFIX th_phase(int n); - EEXXTT size_t DLL_CPREFIX th_nSpecies(size_t n); - EEXXTT int DLL_CPREFIX th_eosType(int n); - EEXXTT double DLL_CPREFIX th_refPressure(int n); - EEXXTT double DLL_CPREFIX th_minTemp(int n, int k=-1); - EEXXTT double DLL_CPREFIX th_maxTemp(int n, int k=-1); - EEXXTT double DLL_CPREFIX th_enthalpy_mole(int n); - EEXXTT double DLL_CPREFIX th_intEnergy_mole(int n); - EEXXTT double DLL_CPREFIX th_entropy_mole(int n); - EEXXTT double DLL_CPREFIX th_gibbs_mole(int n); - EEXXTT double DLL_CPREFIX th_cp_mole(int n); - EEXXTT double DLL_CPREFIX th_cv_mole(int n); - EEXXTT double DLL_CPREFIX th_pressure(int n); - EEXXTT int DLL_CPREFIX th_setPressure(int n, double p); - EEXXTT double DLL_CPREFIX th_enthalpy_mass(int n); - EEXXTT double DLL_CPREFIX th_intEnergy_mass(int n); - EEXXTT double DLL_CPREFIX th_entropy_mass(int n); - EEXXTT double DLL_CPREFIX th_gibbs_mass(int n); - EEXXTT double DLL_CPREFIX th_cp_mass(int n); - EEXXTT double DLL_CPREFIX th_cv_mass(int n); - EEXXTT double DLL_CPREFIX th_electricPotential(int n); - EEXXTT int DLL_CPREFIX th_chemPotentials(int n, size_t lenm, double* murt); - EEXXTT int DLL_CPREFIX th_elementPotentials(int n, size_t lenm, double* lambda); - EEXXTT int DLL_CPREFIX th_getEnthalpies_RT(int n, size_t lenm, double* h_rt); - EEXXTT int DLL_CPREFIX th_getEntropies_R(int n, size_t lenm, double* s_r); - EEXXTT int DLL_CPREFIX th_getCp_R(int n, size_t lenm, double* cp_r); - EEXXTT int DLL_CPREFIX th_setElectricPotential(int n, double v); - EEXXTT int DLL_CPREFIX get_eos(char* fname, char* phase_id); - - EEXXTT int DLL_CPREFIX th_set_HP(int n, double* vals); - EEXXTT int DLL_CPREFIX th_set_UV(int n, double* vals); - EEXXTT int DLL_CPREFIX th_set_SV(int n, double* vals); - EEXXTT int DLL_CPREFIX th_set_SP(int n, double* vals); - EEXXTT int DLL_CPREFIX th_equil(int n, char* XY, int solver, + CANTERA_CAPI int th_set_HP(int n, double* vals); + CANTERA_CAPI int th_set_UV(int n, double* vals); + CANTERA_CAPI int th_set_SV(int n, double* vals); + CANTERA_CAPI int th_set_SP(int n, double* vals); + CANTERA_CAPI int th_equil(int n, char* XY, int solver, double rtol, int maxsteps, int maxiter, int loglevel); - EEXXTT double DLL_CPREFIX th_critTemperature(int n); - EEXXTT double DLL_CPREFIX th_critPressure(int n); - EEXXTT double DLL_CPREFIX th_critDensity(int n); - EEXXTT double DLL_CPREFIX th_vaporFraction(int n); - EEXXTT double DLL_CPREFIX th_satTemperature(int n, double p); - EEXXTT double DLL_CPREFIX th_satPressure(int n, double t); - EEXXTT int DLL_CPREFIX th_setState_Psat(int n, double p, double x); - EEXXTT int DLL_CPREFIX th_setState_Tsat(int n, double t, double x); + CANTERA_CAPI double th_critTemperature(int n); + CANTERA_CAPI double th_critPressure(int n); + CANTERA_CAPI double th_critDensity(int n); + CANTERA_CAPI double th_vaporFraction(int n); + CANTERA_CAPI double th_satTemperature(int n, double p); + CANTERA_CAPI double th_satPressure(int n, double t); + CANTERA_CAPI int th_setState_Psat(int n, double p, double x); + CANTERA_CAPI int th_setState_Tsat(int n, double t, double x); - EEXXTT size_t DLL_CPREFIX newKineticsFromXML(int mxml, int iphase, + CANTERA_CAPI size_t newKineticsFromXML(int mxml, int iphase, int neighbor1=-1, int neighbor2=-1, int neighbor3=-1, int neighbor4=-1); - EEXXTT int DLL_CPREFIX installRxnArrays(int pxml, int ikin, + CANTERA_CAPI int installRxnArrays(int pxml, int ikin, char* default_phase); - EEXXTT size_t DLL_CPREFIX kin_nSpecies(int n); - EEXXTT size_t DLL_CPREFIX kin_nReactions(int n); - EEXXTT size_t DLL_CPREFIX kin_nPhases(int n); - EEXXTT size_t DLL_CPREFIX kin_phaseIndex(int n, char* ph); - EEXXTT size_t DLL_CPREFIX kin_reactionPhaseIndex(int n); - EEXXTT double DLL_CPREFIX kin_reactantStoichCoeff(int n, int i, int k); - EEXXTT double DLL_CPREFIX kin_productStoichCoeff(int n, int i, int k); - EEXXTT int DLL_CPREFIX kin_reactionType(int n, int i); - EEXXTT int DLL_CPREFIX kin_getFwdRatesOfProgress(int n, size_t len, double* fwdROP); - EEXXTT int DLL_CPREFIX kin_getRevRatesOfProgress(int n, size_t len, double* revROP); - EEXXTT int DLL_CPREFIX kin_getNetRatesOfProgress(int n, size_t len, double* netROP); - EEXXTT int DLL_CPREFIX kin_getEquilibriumConstants(int n, size_t len, double* kc); + CANTERA_CAPI size_t kin_nSpecies(int n); + CANTERA_CAPI size_t kin_nReactions(int n); + CANTERA_CAPI size_t kin_nPhases(int n); + CANTERA_CAPI size_t kin_phaseIndex(int n, char* ph); + CANTERA_CAPI size_t kin_reactionPhaseIndex(int n); + CANTERA_CAPI double kin_reactantStoichCoeff(int n, int i, int k); + CANTERA_CAPI double kin_productStoichCoeff(int n, int i, int k); + CANTERA_CAPI int kin_reactionType(int n, int i); + CANTERA_CAPI int kin_getFwdRatesOfProgress(int n, size_t len, double* fwdROP); + CANTERA_CAPI int kin_getRevRatesOfProgress(int n, size_t len, double* revROP); + CANTERA_CAPI int kin_getNetRatesOfProgress(int n, size_t len, double* netROP); + CANTERA_CAPI int kin_getEquilibriumConstants(int n, size_t len, double* kc); - EEXXTT int DLL_CPREFIX kin_getFwdRateConstants(int n, size_t len, double* kfwd); - EEXXTT int DLL_CPREFIX kin_getRevRateConstants(int n, int doIrreversible, size_t len, double* krev); - EEXXTT int DLL_CPREFIX kin_getActivationEnergies(int n, size_t len, double* E); - EEXXTT int DLL_CPREFIX kin_getDelta(int n, int job, size_t len, double* delta); - EEXXTT int DLL_CPREFIX kin_getCreationRates(int n, size_t len, double* cdot); - EEXXTT int DLL_CPREFIX kin_getDestructionRates(int n, size_t len, double* ddot); - EEXXTT int DLL_CPREFIX kin_getNetProductionRates(int n, size_t len, double* wdot); - EEXXTT int DLL_CPREFIX kin_getSourceTerms(int n, size_t len, double* ydot); - EEXXTT double DLL_CPREFIX kin_multiplier(int n, int i); - EEXXTT int DLL_CPREFIX kin_getReactionString(int n, int i, int len, char* buf); - EEXXTT int DLL_CPREFIX kin_setMultiplier(int n, int i, double v); + CANTERA_CAPI int kin_getFwdRateConstants(int n, size_t len, double* kfwd); + CANTERA_CAPI int kin_getRevRateConstants(int n, int doIrreversible, size_t len, double* krev); + CANTERA_CAPI int kin_getActivationEnergies(int n, size_t len, double* E); + CANTERA_CAPI int kin_getDelta(int n, int job, size_t len, double* delta); + CANTERA_CAPI int kin_getCreationRates(int n, size_t len, double* cdot); + CANTERA_CAPI int kin_getDestructionRates(int n, size_t len, double* ddot); + CANTERA_CAPI int kin_getNetProductionRates(int n, size_t len, double* wdot); + CANTERA_CAPI int kin_getSourceTerms(int n, size_t len, double* ydot); + CANTERA_CAPI double kin_multiplier(int n, int i); + CANTERA_CAPI int kin_getReactionString(int n, int i, int len, char* buf); + CANTERA_CAPI int kin_setMultiplier(int n, int i, double v); - EEXXTT int DLL_CPREFIX kin_isReversible(int n, int i); - EEXXTT int DLL_CPREFIX kin_type(int n); - EEXXTT size_t DLL_CPREFIX kin_start(int n, int p); - EEXXTT size_t DLL_CPREFIX kin_speciesIndex(int n, const char* nm, const char* ph); - EEXXTT int DLL_CPREFIX kin_advanceCoverages(int n, double tstep); - EEXXTT size_t DLL_CPREFIX kin_phase(int n, size_t i); + CANTERA_CAPI int kin_isReversible(int n, int i); + CANTERA_CAPI int kin_type(int n); + CANTERA_CAPI size_t kin_start(int n, int p); + CANTERA_CAPI size_t kin_speciesIndex(int n, const char* nm, const char* ph); + CANTERA_CAPI int kin_advanceCoverages(int n, double tstep); + CANTERA_CAPI size_t kin_phase(int n, size_t i); - EEXXTT size_t DLL_CPREFIX newTransport(char* model, + CANTERA_CAPI size_t newTransport(char* model, int th, int loglevel); - EEXXTT double DLL_CPREFIX trans_viscosity(int n); - EEXXTT double DLL_CPREFIX trans_thermalConductivity(int n); - EEXXTT int DLL_CPREFIX trans_getThermalDiffCoeffs(int n, int ldt, double* dt); - EEXXTT int DLL_CPREFIX trans_getMixDiffCoeffs(int n, int ld, double* d); - EEXXTT int DLL_CPREFIX trans_getBinDiffCoeffs(int n, int ld, double* d); - EEXXTT int DLL_CPREFIX trans_getMultiDiffCoeffs(int n, int ld, double* d); - EEXXTT int DLL_CPREFIX trans_setParameters(int n, int type, int k, double* d); - EEXXTT int DLL_CPREFIX trans_getMolarFluxes(int n, const double* state1, + CANTERA_CAPI double trans_viscosity(int n); + CANTERA_CAPI double trans_thermalConductivity(int n); + CANTERA_CAPI int trans_getThermalDiffCoeffs(int n, int ldt, double* dt); + CANTERA_CAPI int trans_getMixDiffCoeffs(int n, int ld, double* d); + CANTERA_CAPI int trans_getBinDiffCoeffs(int n, int ld, double* d); + CANTERA_CAPI int trans_getMultiDiffCoeffs(int n, int ld, double* d); + CANTERA_CAPI int trans_setParameters(int n, int type, int k, double* d); + CANTERA_CAPI int trans_getMolarFluxes(int n, const double* state1, const double* state2, double delta, double* fluxes); - EEXXTT int DLL_CPREFIX trans_getMassFluxes(int n, const double* state1, + CANTERA_CAPI int trans_getMassFluxes(int n, const double* state1, const double* state2, double delta, double* fluxes); - EEXXTT int DLL_CPREFIX import_phase(int nth, int nxml, char* id); - EEXXTT int DLL_CPREFIX import_kinetics(int nxml, char* id, + CANTERA_CAPI int import_phase(int nth, int nxml, char* id); + CANTERA_CAPI int import_kinetics(int nxml, char* id, int nphases, int* ith, int nkin); - EEXXTT int DLL_CPREFIX import_from_file(int nth, int nkin, char* fname, char* db, + CANTERA_CAPI int import_from_file(int nth, int nkin, char* fname, char* db, char* id, int validate, double threshold); - EEXXTT int DLL_CPREFIX getCanteraError(int buflen, char* buf); - EEXXTT int DLL_CPREFIX showCanteraErrors(); - EEXXTT int DLL_CPREFIX write_HTML_log(char* file); - EEXXTT int DLL_CPREFIX setLogWriter(void* logger); - EEXXTT int DLL_CPREFIX addCanteraDirectory(size_t buflen, char* buf); - EEXXTT int DLL_CPREFIX clearStorage(); - EEXXTT int DLL_CPREFIX delPhase(int n); - EEXXTT int DLL_CPREFIX delThermo(int n); - EEXXTT int DLL_CPREFIX delKinetics(int n); - EEXXTT int DLL_CPREFIX delTransport(int n); - EEXXTT int DLL_CPREFIX readlog(int n, char* buf); - EEXXTT int DLL_CPREFIX buildSolutionFromXML(char* src, int ixml, char* id, + CANTERA_CAPI int getCanteraError(int buflen, char* buf); + CANTERA_CAPI int showCanteraErrors(); + CANTERA_CAPI int write_HTML_log(char* file); + CANTERA_CAPI int setLogWriter(void* logger); + CANTERA_CAPI int addCanteraDirectory(size_t buflen, char* buf); + CANTERA_CAPI int clearStorage(); + CANTERA_CAPI int delPhase(int n); + CANTERA_CAPI int delThermo(int n); + CANTERA_CAPI int delKinetics(int n); + CANTERA_CAPI int delTransport(int n); + CANTERA_CAPI int readlog(int n, char* buf); + CANTERA_CAPI int buildSolutionFromXML(char* src, int ixml, char* id, int ith, int ikin); - EEXXTT int DLL_CPREFIX ck_to_cti(char* in_file, char* db_file, + CANTERA_CAPI int ck_to_cti(char* in_file, char* db_file, char* tr_file, char* id_tag, int debug, int validate); - EEXXTT int DLL_CPREFIX writelogfile(char* logfile); + CANTERA_CAPI int writelogfile(char* logfile); } #endif diff --git a/src/clib/ctbdry.cpp b/src/clib/ctbdry.cpp index 0fee114c1..46c4e4c2d 100644 --- a/src/clib/ctbdry.cpp +++ b/src/clib/ctbdry.cpp @@ -18,7 +18,7 @@ template<> BoundaryCabinet* BoundaryCabinet::__storage = 0; extern "C" { - int DLL_EXPORT bndry_new(int itype) + int bndry_new(int itype) { Bdry1D* s; switch (itype) { @@ -41,18 +41,18 @@ extern "C" { return i; } - int DLL_EXPORT bndry_del(int i) + int bndry_del(int i) { BoundaryCabinet::del(i); return 0; } - double DLL_EXPORT bndry_temperature(int i) + double bndry_temperature(int i) { return BoundaryCabinet::item(i).temperature(); } - int DLL_EXPORT bndry_settemperature(int i, double t) + int bndry_settemperature(int i, double t) { try { BoundaryCabinet::item(i).setTemperature(t); @@ -62,7 +62,7 @@ extern "C" { return 0; } - double DLL_EXPORT bndry_spreadrate(int i) + double bndry_spreadrate(int i) { try { return dynamic_cast(&BoundaryCabinet::item(i))->spreadRate(); @@ -72,7 +72,7 @@ extern "C" { return 0; } - int DLL_EXPORT bndry_setSpreadRate(int i, double v) + int bndry_setSpreadRate(int i, double v) { try { dynamic_cast(&BoundaryCabinet::item(i))->setSpreadRate(v); @@ -82,7 +82,7 @@ extern "C" { return 0; } - int DLL_EXPORT bndry_setmdot(int i, double mdot) + int bndry_setmdot(int i, double mdot) { try { BoundaryCabinet::item(i).setMdot(mdot); @@ -93,12 +93,12 @@ extern "C" { } - double DLL_EXPORT bndry_mdot(int i) + double bndry_mdot(int i) { return BoundaryCabinet::item(i).mdot(); } - int DLL_EXPORT bndry_setxin(int i, double* xin) + int bndry_setxin(int i, double* xin) { try { BoundaryCabinet::item(i).setMoleFractions(xin); @@ -108,7 +108,7 @@ extern "C" { return 0; } - int DLL_EXPORT bndry_setxinbyname(int i, char* xin) + int bndry_setxinbyname(int i, char* xin) { try { BoundaryCabinet::item(i).setMoleFractions(string(xin)); @@ -118,7 +118,7 @@ extern "C" { return 0; } - int DLL_EXPORT surf_setkinetics(int i, int j) + int surf_setkinetics(int i, int j) { try { ReactingSurf1D* srf = diff --git a/src/clib/ctbdry.h b/src/clib/ctbdry.h index 95dc7999a..b721a207a 100755 --- a/src/clib/ctbdry.h +++ b/src/clib/ctbdry.h @@ -8,16 +8,16 @@ extern "C" { - EEXXTT int DLL_CPREFIX bndry_new(int itype); - EEXXTT int DLL_CPREFIX bndry_del(int i); - EEXXTT double DLL_CPREFIX bndry_temperature(int i); - EEXXTT int DLL_CPREFIX bndry_settemperature(int i, double t); - EEXXTT double DLL_CPREFIX bndry_spreadrate(int i); - EEXXTT int DLL_CPREFIX bndry_setSpreadRate(int i, double v); - EEXXTT int DLL_CPREFIX bndry_setmdot(int i, double mdot); - EEXXTT double DLL_CPREFIX bndry_mdot(int i); - EEXXTT int DLL_CPREFIX bndry_setxin(int i, double* xin); - EEXXTT int DLL_CPREFIX bndry_setxinbyname(int i, char* xin); - EEXXTT int DLL_CPREFIX bndry_setkinetics(int i, int j); + CANTERA_CAPI int bndry_new(int itype); + CANTERA_CAPI int bndry_del(int i); + CANTERA_CAPI double bndry_temperature(int i); + CANTERA_CAPI int bndry_settemperature(int i, double t); + CANTERA_CAPI double bndry_spreadrate(int i); + CANTERA_CAPI int bndry_setSpreadRate(int i, double v); + CANTERA_CAPI int bndry_setmdot(int i, double mdot); + CANTERA_CAPI double bndry_mdot(int i); + CANTERA_CAPI int bndry_setxin(int i, double* xin); + CANTERA_CAPI int bndry_setxinbyname(int i, char* xin); + CANTERA_CAPI int bndry_setkinetics(int i, int j); } #endif diff --git a/src/clib/ctfunc.cpp b/src/clib/ctfunc.cpp index d559fc299..ff9f6418a 100644 --- a/src/clib/ctfunc.cpp +++ b/src/clib/ctfunc.cpp @@ -22,7 +22,7 @@ extern "C" { // functions - int DLL_EXPORT func_new(int type, size_t n, size_t lenp, double* params) + int func_new(int type, size_t n, size_t lenp, double* params) { func_t* r=0; size_t m = lenp; @@ -93,42 +93,42 @@ extern "C" { } - int DLL_EXPORT func_del(int i) + int func_del(int i) { FuncCabinet::del(i); return 0; } - int DLL_EXPORT func_copy(int i) + int func_copy(int i) { return FuncCabinet::newCopy(i); } - int DLL_EXPORT func_assign(int i, int j) + int func_assign(int i, int j) { return FuncCabinet::assign(i,j); } - double DLL_EXPORT func_value(int i, double t) + double func_value(int i, double t) { return FuncCabinet::item(i).eval(t); } - int DLL_EXPORT func_derivative(int i) + int func_derivative(int i) { func_t* r = 0; r = &FuncCabinet::item(i).derivative(); return FuncCabinet::add(r); } - int DLL_EXPORT func_duplicate(int i) + int func_duplicate(int i) { func_t* r = 0; r = &FuncCabinet::item(i).duplicate(); return FuncCabinet::add(r); } - int DLL_EXPORT func_write(int i, size_t lennm, const char* arg, char* nm) + int func_write(int i, size_t lennm, const char* arg, char* nm) { try { std::string a = std::string(arg); diff --git a/src/clib/ctfunc.h b/src/clib/ctfunc.h index a27bf7e4e..00b6bab40 100755 --- a/src/clib/ctfunc.h +++ b/src/clib/ctfunc.h @@ -7,14 +7,14 @@ #include "clib_defs.h" extern "C" { - EEXXTT int DLL_CPREFIX func_new(int type, size_t n, size_t lenp, double* p); - EEXXTT int DLL_CPREFIX func_del(int i); - EEXXTT int DLL_CPREFIX func_copy(int i); - EEXXTT int DLL_CPREFIX func_assign(int i, int j); - EEXXTT double DLL_CPREFIX func_value(int i, double t); - EEXXTT int DLL_CPREFIX func_derivative(int i); - EEXXTT int DLL_CPREFIX func_duplicate(int i); - EEXXTT int DLL_CPREFIX func_write(int i, size_t lennm, const char* arg, char* nm); + CANTERA_CAPI int func_new(int type, size_t n, size_t lenp, double* p); + CANTERA_CAPI int func_del(int i); + CANTERA_CAPI int func_copy(int i); + CANTERA_CAPI int func_assign(int i, int j); + CANTERA_CAPI double func_value(int i, double t); + CANTERA_CAPI int func_derivative(int i); + CANTERA_CAPI int func_duplicate(int i); + CANTERA_CAPI int func_write(int i, size_t lennm, const char* arg, char* nm); } #endif diff --git a/src/clib/ctmultiphase.cpp b/src/clib/ctmultiphase.cpp index 3369bb99c..4ba96e752 100644 --- a/src/clib/ctmultiphase.cpp +++ b/src/clib/ctmultiphase.cpp @@ -60,61 +60,61 @@ int _equilflag(const char* xy); extern "C" { - int DLL_EXPORT mix_new() + int mix_new() { MultiPhase* m = new MultiPhase; return mixCabinet::add(m); } - int DLL_EXPORT mix_del(int i) + int mix_del(int i) { mixCabinet::del(i); return 0; } - int DLL_EXPORT mix_copy(int i) + int mix_copy(int i) { return mixCabinet::newCopy(i); } - int DLL_EXPORT mix_assign(int i, int j) + int mix_assign(int i, int j) { return mixCabinet::assign(i,j); } - int DLL_EXPORT mix_addPhase(int i, int j, double moles) + int mix_addPhase(int i, int j, double moles) { mixCabinet::item(i).addPhase(&Cabinet::item(j), moles); return 0; } - int DLL_EXPORT mix_init(int i) + int mix_init(int i) { mixCabinet::item(i).init(); return 0; } - size_t DLL_EXPORT mix_nElements(int i) + size_t mix_nElements(int i) { return mixCabinet::item(i).nElements(); } - size_t DLL_EXPORT mix_elementIndex(int i, char* name) + size_t mix_elementIndex(int i, char* name) { return mixCabinet::item(i).elementIndex(string(name)); } - size_t DLL_EXPORT mix_nSpecies(int i) + size_t mix_nSpecies(int i) { return mixCabinet::item(i).nSpecies(); } - size_t DLL_EXPORT mix_speciesIndex(int i, int k, int p) + size_t mix_speciesIndex(int i, int k, int p) { return mixCabinet::item(i).speciesIndex(k, p); } - doublereal DLL_EXPORT mix_nAtoms(int i, int k, int m) + doublereal mix_nAtoms(int i, int k, int m) { bool ok = (checkSpecies(i,k) && checkElement(i,m)); if (ok) { @@ -124,12 +124,12 @@ extern "C" { } } - size_t DLL_EXPORT mix_nPhases(int i) + size_t mix_nPhases(int i) { return mixCabinet::item(i).nPhases(); } - doublereal DLL_EXPORT mix_phaseMoles(int i, int n) + doublereal mix_phaseMoles(int i, int n) { if (!checkPhase(i, n)) { return DERR; @@ -137,7 +137,7 @@ extern "C" { return mixCabinet::item(i).phaseMoles(n); } - int DLL_EXPORT mix_setPhaseMoles(int i, int n, double v) + int mix_setPhaseMoles(int i, int n, double v) { if (!checkPhase(i, n)) { return ERR; @@ -149,7 +149,7 @@ extern "C" { return 0; } - int DLL_EXPORT mix_setMoles(int i, size_t nlen, double* n) + int mix_setMoles(int i, size_t nlen, double* n) { try { if (nlen < mixCabinet::item(i).nSpecies()) { @@ -163,7 +163,7 @@ extern "C" { } - int DLL_EXPORT mix_setMolesByName(int i, char* n) + int mix_setMolesByName(int i, char* n) { try { mixCabinet::item(i).setMolesByName(string(n)); @@ -173,7 +173,7 @@ extern "C" { } } - int DLL_EXPORT mix_setTemperature(int i, double t) + int mix_setTemperature(int i, double t) { if (t < 0.0) { return -1; @@ -182,27 +182,27 @@ extern "C" { return 0; } - doublereal DLL_EXPORT mix_temperature(int i) + doublereal mix_temperature(int i) { return mixCabinet::item(i).temperature(); } - doublereal DLL_EXPORT mix_minTemp(int i) + doublereal mix_minTemp(int i) { return mixCabinet::item(i).minTemp(); } - doublereal DLL_EXPORT mix_maxTemp(int i) + doublereal mix_maxTemp(int i) { return mixCabinet::item(i).maxTemp(); } - doublereal DLL_EXPORT mix_charge(int i) + doublereal mix_charge(int i) { return mixCabinet::item(i).charge(); } - doublereal DLL_EXPORT mix_phaseCharge(int i, int p) + doublereal mix_phaseCharge(int i, int p) { if (!checkPhase(i,p)) { return DERR; @@ -210,7 +210,7 @@ extern "C" { return mixCabinet::item(i).phaseCharge(p); } - int DLL_EXPORT mix_setPressure(int i, double p) + int mix_setPressure(int i, double p) { if (p < 0.0) { return -1; @@ -219,12 +219,12 @@ extern "C" { return 0; } - doublereal DLL_EXPORT mix_pressure(int i) + doublereal mix_pressure(int i) { return mixCabinet::item(i).pressure(); } - doublereal DLL_EXPORT mix_speciesMoles(int i, int k) + doublereal mix_speciesMoles(int i, int k) { if (!checkSpecies(i,k)) { return DERR; @@ -232,7 +232,7 @@ extern "C" { return mixCabinet::item(i).speciesMoles(k); } - doublereal DLL_EXPORT mix_elementMoles(int i, int m) + doublereal mix_elementMoles(int i, int m) { if (!checkElement(i,m)) { return DERR; @@ -241,7 +241,7 @@ extern "C" { } - doublereal DLL_EXPORT mix_equilibrate(int i, char* XY, + doublereal mix_equilibrate(int i, char* XY, doublereal rtol, int maxsteps, int maxiter, int loglevel) { @@ -254,7 +254,7 @@ extern "C" { } - doublereal DLL_EXPORT mix_vcs_equilibrate(int i, char* XY, int estimateEquil, + doublereal mix_vcs_equilibrate(int i, char* XY, int estimateEquil, int printLvl, int solver, doublereal rtol, int maxsteps, int maxiter, int loglevel) @@ -275,7 +275,7 @@ extern "C" { } } - int DLL_EXPORT mix_getChemPotentials(int i, size_t lenmu, double* mu) + int mix_getChemPotentials(int i, size_t lenmu, double* mu) { try { if (lenmu < mixCabinet::item(i).nSpecies()) { @@ -288,7 +288,7 @@ extern "C" { } } - int DLL_EXPORT mix_getValidChemPotentials(int i, double bad_mu, + int mix_getValidChemPotentials(int i, double bad_mu, int standard, size_t lenmu, double* mu) { bool st = (standard == 1); @@ -303,37 +303,37 @@ extern "C" { } } - double DLL_EXPORT mix_enthalpy(int i) + double mix_enthalpy(int i) { return mixCabinet::item(i).enthalpy(); } - double DLL_EXPORT mix_entropy(int i) + double mix_entropy(int i) { return mixCabinet::item(i).entropy(); } - double DLL_EXPORT mix_gibbs(int i) + double mix_gibbs(int i) { return mixCabinet::item(i).gibbs(); } - double DLL_EXPORT mix_cp(int i) + double mix_cp(int i) { return mixCabinet::item(i).cp(); } - double DLL_EXPORT mix_volume(int i) + double mix_volume(int i) { return mixCabinet::item(i).volume(); } - size_t DLL_EXPORT mix_speciesPhaseIndex(int i, int k) + size_t mix_speciesPhaseIndex(int i, int k) { return mixCabinet::item(i).speciesPhaseIndex(k); } - double DLL_EXPORT mix_moleFraction(int i, int k) + double mix_moleFraction(int i, int k) { return mixCabinet::item(i).moleFraction(k); } diff --git a/src/clib/ctmultiphase.h b/src/clib/ctmultiphase.h index 6335da077..d2a31f6eb 100644 --- a/src/clib/ctmultiphase.h +++ b/src/clib/ctmultiphase.h @@ -8,50 +8,51 @@ extern "C" { - EEXXTT int DLL_CPREFIX mix_new(); - EEXXTT int DLL_CPREFIX mix_del(int i); - EEXXTT int DLL_CPREFIX mix_copy(int i); - EEXXTT int DLL_CPREFIX mix_assign(int i, int j); - EEXXTT int DLL_CPREFIX mix_addPhase(int i, int j, double moles); - EEXXTT int DLL_CPREFIX mix_init(int i); - EEXXTT size_t DLL_CPREFIX mix_nElements(int i); - EEXXTT size_t DLL_CPREFIX mix_elementIndex(int i, char* name); - EEXXTT size_t DLL_CPREFIX mix_speciesIndex(int i, int k, int p); - EEXXTT size_t DLL_CPREFIX mix_nSpecies(int i); - EEXXTT int DLL_CPREFIX mix_setTemperature(int i, double t); - EEXXTT double DLL_CPREFIX mix_temperature(int i); - EEXXTT double DLL_CPREFIX mix_minTemp(int i); - EEXXTT double DLL_CPREFIX mix_maxTemp(int i); - EEXXTT double DLL_CPREFIX mix_charge(int i); - EEXXTT double DLL_CPREFIX mix_phaseCharge(int i, int p); - EEXXTT int DLL_CPREFIX mix_setPressure(int i, double p); - EEXXTT double DLL_CPREFIX mix_pressure(int i); - EEXXTT double DLL_CPREFIX mix_nAtoms(int i, int k, int m); - EEXXTT size_t DLL_CPREFIX mix_nPhases(int i); - EEXXTT double DLL_CPREFIX mix_phaseMoles(int i, int n); - EEXXTT int DLL_CPREFIX mix_setPhaseMoles(int i, int n, double v); - EEXXTT int DLL_CPREFIX mix_setMoles(int i, size_t nlen, double* n); - EEXXTT int DLL_CPREFIX mix_setMolesByName(int i, char* n); - EEXXTT double DLL_CPREFIX mix_speciesMoles(int i, int k); - EEXXTT double DLL_CPREFIX mix_elementMoles(int i, int m); - EEXXTT double DLL_CPREFIX mix_equilibrate(int i, char* XY, - double err, int maxsteps, int maxiter, int loglevel); - EEXXTT double DLL_EXPORT mix_vcs_equilibrate(int i, char* XY, int estimateEquil, - int printLvl, int solver, - double rtol, int maxsteps, - int maxiter, int loglevel); - EEXXTT int DLL_CPREFIX mix_getChemPotentials(int i, size_t lenmu, double* mu); - EEXXTT int DLL_CPREFIX mix_getValidChemPotentials(int i, double bad_mu, - int standard, size_t lenmu, double* mu); + CANTERA_CAPI int mix_new(); + CANTERA_CAPI int mix_del(int i); + CANTERA_CAPI int mix_copy(int i); + CANTERA_CAPI int mix_assign(int i, int j); + CANTERA_CAPI int mix_addPhase(int i, int j, double moles); + CANTERA_CAPI int mix_init(int i); + CANTERA_CAPI size_t mix_nElements(int i); + CANTERA_CAPI size_t mix_elementIndex(int i, char* name); + CANTERA_CAPI size_t mix_speciesIndex(int i, int k, int p); + CANTERA_CAPI size_t mix_nSpecies(int i); + CANTERA_CAPI int mix_setTemperature(int i, double t); + CANTERA_CAPI double mix_temperature(int i); + CANTERA_CAPI double mix_minTemp(int i); + CANTERA_CAPI double mix_maxTemp(int i); + CANTERA_CAPI double mix_charge(int i); + CANTERA_CAPI double mix_phaseCharge(int i, int p); + CANTERA_CAPI int mix_setPressure(int i, double p); + CANTERA_CAPI double mix_pressure(int i); + CANTERA_CAPI double mix_nAtoms(int i, int k, int m); + CANTERA_CAPI size_t mix_nPhases(int i); + CANTERA_CAPI double mix_phaseMoles(int i, int n); + CANTERA_CAPI int mix_setPhaseMoles(int i, int n, double v); + CANTERA_CAPI int mix_setMoles(int i, size_t nlen, double* n); + CANTERA_CAPI int mix_setMolesByName(int i, char* n); + CANTERA_CAPI double mix_speciesMoles(int i, int k); + CANTERA_CAPI double mix_elementMoles(int i, int m); + CANTERA_CAPI double mix_equilibrate(int i, char* XY, double err, + int maxsteps, int maxiter, int loglevel); + CANTERA_CAPI double mix_vcs_equilibrate(int i, char* XY, int estimateEquil, + int printLvl, int solver, + double rtol, int maxsteps, + int maxiter, int loglevel); + CANTERA_CAPI int mix_getChemPotentials(int i, size_t lenmu, double* mu); + CANTERA_CAPI int mix_getValidChemPotentials(int i, double bad_mu, + int standard, size_t lenmu, + double* mu); - EEXXTT double DLL_CPREFIX mix_enthalpy(int i); - EEXXTT double DLL_CPREFIX mix_entropy(int i); - EEXXTT double DLL_CPREFIX mix_gibbs(int i); - EEXXTT double DLL_CPREFIX mix_cp(int i); - EEXXTT double DLL_CPREFIX mix_volume(int i); + CANTERA_CAPI double mix_enthalpy(int i); + CANTERA_CAPI double mix_entropy(int i); + CANTERA_CAPI double mix_gibbs(int i); + CANTERA_CAPI double mix_cp(int i); + CANTERA_CAPI double mix_volume(int i); - EEXXTT size_t DLL_CPREFIX mix_speciesPhaseIndex(int i, int k); - EEXXTT double DLL_CPREFIX mix_moleFraction(int i, int k); + CANTERA_CAPI size_t mix_speciesPhaseIndex(int i, int k); + CANTERA_CAPI double mix_moleFraction(int i, int k); } #endif diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp index 28d75b6c0..87d8db053 100644 --- a/src/clib/ctonedim.cpp +++ b/src/clib/ctonedim.cpp @@ -47,7 +47,7 @@ static Bdry1D* _bdry(int i) extern "C" { - int DLL_EXPORT domain_clear() + int domain_clear() { try { DomainCabinet::clear(); @@ -57,33 +57,33 @@ extern "C" { } } - int DLL_EXPORT domain_del(int i) + int domain_del(int i) { DomainCabinet::del(i); return 0; } - int DLL_EXPORT domain_type(int i) + int domain_type(int i) { return DomainCabinet::item(i).domainType(); } - size_t DLL_EXPORT domain_index(int i) + size_t domain_index(int i) { return DomainCabinet::item(i).domainIndex(); } - size_t DLL_EXPORT domain_nComponents(int i) + size_t domain_nComponents(int i) { return DomainCabinet::item(i).nComponents(); } - size_t DLL_EXPORT domain_nPoints(int i) + size_t domain_nPoints(int i) { return DomainCabinet::item(i).nPoints(); } - int DLL_EXPORT domain_componentName(int i, int n, int sz, char* buf) + int domain_componentName(int i, int n, int sz, char* buf) { try { string nm = DomainCabinet::item(i).componentName(n); @@ -96,7 +96,7 @@ extern "C" { } } - size_t DLL_EXPORT domain_componentIndex(int i, char* name) + size_t domain_componentIndex(int i, char* name) { try { size_t n = DomainCabinet::item(i).componentIndex(string(name)); @@ -106,7 +106,7 @@ extern "C" { } } - double DLL_EXPORT domain_grid(int i, int n) + double domain_grid(int i, int n) { try { return DomainCabinet::item(i).grid(n); @@ -115,7 +115,7 @@ extern "C" { } } - int DLL_EXPORT domain_setBounds(int i, int n, double lower, double upper) + int domain_setBounds(int i, int n, double lower, double upper) { try { DomainCabinet::item(i).setBounds(n, lower, upper); @@ -125,7 +125,7 @@ extern "C" { } } - double DLL_EXPORT domain_upperBound(int i, int n) + double domain_upperBound(int i, int n) { try { return DomainCabinet::item(i).upperBound(n); @@ -134,7 +134,7 @@ extern "C" { } } - double DLL_EXPORT domain_lowerBound(int i, int n) + double domain_lowerBound(int i, int n) { try { return DomainCabinet::item(i).lowerBound(n); @@ -143,7 +143,7 @@ extern "C" { } } - int DLL_EXPORT domain_setTolerances(int i, int n, double rtol, + int domain_setTolerances(int i, int n, double rtol, double atol, int itime) { try { @@ -154,7 +154,7 @@ extern "C" { } } - double DLL_EXPORT domain_rtol(int i, int n) + double domain_rtol(int i, int n) { try { return DomainCabinet::item(i).rtol(n); @@ -163,7 +163,7 @@ extern "C" { } } - double DLL_EXPORT domain_atol(int i, int n) + double domain_atol(int i, int n) { try { return DomainCabinet::item(i).atol(n); @@ -172,7 +172,7 @@ extern "C" { } } - int DLL_EXPORT domain_setupGrid(int i, size_t npts, double* grid) + int domain_setupGrid(int i, size_t npts, double* grid) { try { DomainCabinet::item(i).setupGrid(npts, grid); @@ -182,7 +182,7 @@ extern "C" { } } - int DLL_EXPORT domain_setID(int i, char* id) + int domain_setID(int i, char* id) { try { string s = string(id); @@ -194,7 +194,7 @@ extern "C" { } - int DLL_EXPORT domain_setDesc(int i, char* desc) + int domain_setDesc(int i, char* desc) { try { string s = string(desc); @@ -206,7 +206,7 @@ extern "C" { } - int DLL_EXPORT inlet_new() + int inlet_new() { try { Inlet1D* i = new Inlet1D(); @@ -216,7 +216,7 @@ extern "C" { } } - int DLL_EXPORT surf_new() + int surf_new() { try { Surf1D* i = new Surf1D(); @@ -226,7 +226,7 @@ extern "C" { } } - int DLL_EXPORT reactingsurf_new() + int reactingsurf_new() { try { //writelog("in reactingsurf_new\n"); @@ -238,7 +238,7 @@ extern "C" { } } - int DLL_EXPORT symm_new() + int symm_new() { try { Symm1D* i = new Symm1D(); @@ -248,7 +248,7 @@ extern "C" { } } - int DLL_EXPORT outlet_new() + int outlet_new() { try { Outlet1D* i = new Outlet1D(); @@ -258,7 +258,7 @@ extern "C" { } } - int DLL_EXPORT outletres_new() + int outletres_new() { try { OutletRes1D* i = new OutletRes1D(); @@ -268,7 +268,7 @@ extern "C" { } } - int DLL_EXPORT bdry_setMdot(int i, double mdot) + int bdry_setMdot(int i, double mdot) { try { _bdry(i)->setMdot(mdot); @@ -278,7 +278,7 @@ extern "C" { } } - int DLL_EXPORT bdry_setTemperature(int i, double t) + int bdry_setTemperature(int i, double t) { try { _bdry(i)->setTemperature(t); @@ -288,7 +288,7 @@ extern "C" { } } - int DLL_EXPORT bdry_setMoleFractions(int i, char* x) + int bdry_setMoleFractions(int i, char* x) { try { _bdry(i)->setMoleFractions(string(x)); @@ -298,7 +298,7 @@ extern "C" { } } - double DLL_EXPORT bdry_temperature(int i) + double bdry_temperature(int i) { try { return _bdry(i)->temperature(); @@ -307,7 +307,7 @@ extern "C" { } } - double DLL_EXPORT bdry_massFraction(int i, int k) + double bdry_massFraction(int i, int k) { try { return _bdry(i)->massFraction(k); @@ -316,7 +316,7 @@ extern "C" { } } - double DLL_EXPORT bdry_mdot(int i) + double bdry_mdot(int i) { try { return _bdry(i)->mdot(); @@ -325,7 +325,7 @@ extern "C" { } } - int DLL_EXPORT reactingsurf_setkineticsmgr(int i, int j) + int reactingsurf_setkineticsmgr(int i, int j) { try { ReactingSurf1D* srf = (ReactingSurf1D*)_bdry(i); @@ -338,7 +338,7 @@ extern "C" { } } - int DLL_EXPORT reactingsurf_enableCoverageEqs(int i, int onoff) + int reactingsurf_enableCoverageEqs(int i, int onoff) { try { ReactingSurf1D* srf = (ReactingSurf1D*)_bdry(i); @@ -351,7 +351,7 @@ extern "C" { } } - int DLL_EXPORT inlet_setSpreadRate(int i, double v) + int inlet_setSpreadRate(int i, double v) { try { Inlet1D* inlt = (Inlet1D*)_bdry(i); @@ -366,7 +366,7 @@ extern "C" { //------------------ stagnation flow domains -------------------- - int DLL_EXPORT stflow_new(int iph, int ikin, int itr, int itype) + int stflow_new(int iph, int ikin, int itr, int itype) { try { IdealGasPhase* ph = dynamic_cast(&ThermoCabinet::item(iph)); @@ -389,7 +389,7 @@ extern "C" { } - int DLL_EXPORT stflow_setTransport(int i, int itr, int iSoret) + int stflow_setTransport(int i, int itr, int iSoret) { bool withSoret = false; if (iSoret > 0) { @@ -403,7 +403,7 @@ extern "C" { } } - int DLL_EXPORT stflow_enableSoret(int i, int iSoret) + int stflow_enableSoret(int i, int iSoret) { bool withSoret = false; if (iSoret > 0) { @@ -417,7 +417,7 @@ extern "C" { } } - int DLL_EXPORT stflow_setPressure(int i, double p) + int stflow_setPressure(int i, double p) { try { _stflow(i)->setPressure(p); @@ -427,7 +427,7 @@ extern "C" { } } - int DLL_EXPORT stflow_setFixedTempProfile(int i, size_t n, double* pos, + int stflow_setFixedTempProfile(int i, size_t n, double* pos, size_t m, double* temp) { try { @@ -444,7 +444,7 @@ extern "C" { } - int DLL_EXPORT stflow_solveSpeciesEqs(int i, int flag) + int stflow_solveSpeciesEqs(int i, int flag) { try { if (flag > 0) { @@ -459,7 +459,7 @@ extern "C" { } - int DLL_EXPORT stflow_solveEnergyEqn(int i, int flag) + int stflow_solveEnergyEqn(int i, int flag) { try { if (flag > 0) { @@ -476,7 +476,7 @@ extern "C" { //------------------- Sim1D -------------------------------------- - int DLL_EXPORT sim1D_new(size_t nd, int* domains) + int sim1D_new(size_t nd, int* domains) { vector d; try { @@ -495,7 +495,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_clear() + int sim1D_clear() { try { SimCabinet::clear(); @@ -505,13 +505,13 @@ extern "C" { } } - int DLL_EXPORT sim1D_del(int i) + int sim1D_del(int i) { SimCabinet::del(i); return 0; } - int DLL_EXPORT sim1D_setValue(int i, int dom, int comp, + int sim1D_setValue(int i, int dom, int comp, int localPoint, double value) { try { @@ -522,7 +522,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setProfile(int i, int dom, int comp, + int sim1D_setProfile(int i, int dom, int comp, size_t np, double* pos, size_t nv, double* v) { try { @@ -538,7 +538,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setFlatProfile(int i, int dom, int comp, double v) + int sim1D_setFlatProfile(int i, int dom, int comp, double v) { try { SimCabinet::item(i).setFlatProfile(dom, comp, v); @@ -548,7 +548,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_showSolution(int i, char* fname) + int sim1D_showSolution(int i, char* fname) { string fn = string(fname); if (fn == "-") { @@ -561,7 +561,7 @@ extern "C" { return 0; } - int DLL_EXPORT sim1D_setTimeStep(int i, double stepsize, size_t ns, integer* nsteps) + int sim1D_setTimeStep(int i, double stepsize, size_t ns, integer* nsteps) { try { SimCabinet::item(i).setTimeStep(stepsize, ns, nsteps); @@ -571,7 +571,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_getInitialSoln(int i) + int sim1D_getInitialSoln(int i) { try { SimCabinet::item(i).getInitialSoln(); @@ -581,7 +581,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_solve(int i, int loglevel, int refine_grid) + int sim1D_solve(int i, int loglevel, int refine_grid) { try { bool r = (refine_grid == 0 ? false : true); @@ -592,7 +592,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_refine(int i, int loglevel) + int sim1D_refine(int i, int loglevel) { try { SimCabinet::item(i).refine(loglevel); @@ -602,7 +602,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setRefineCriteria(int i, int dom, double ratio, + int sim1D_setRefineCriteria(int i, int dom, double ratio, double slope, double curve, double prune) { try { @@ -613,7 +613,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_save(int i, char* fname, char* id, + int sim1D_save(int i, char* fname, char* id, char* desc) { try { @@ -627,7 +627,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_restore(int i, char* fname, char* id) + int sim1D_restore(int i, char* fname, char* id) { try { string sname = string(fname); @@ -639,7 +639,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_writeStats(int i, int printTime) + int sim1D_writeStats(int i, int printTime) { try { SimCabinet::item(i).writeStats(printTime); @@ -649,7 +649,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_domainIndex(int i, char* name) + int sim1D_domainIndex(int i, char* name) { try { return (int) SimCabinet::item(i).domainIndex(string(name)); @@ -658,7 +658,7 @@ extern "C" { } } - double DLL_EXPORT sim1D_value(int i, int idom, int icomp, int localPoint) + double sim1D_value(int i, int idom, int icomp, int localPoint) { try { return SimCabinet::item(i).value(idom, icomp, localPoint); @@ -667,7 +667,7 @@ extern "C" { } } - double DLL_EXPORT sim1D_workValue(int i, int idom, int icomp, int localPoint) + double sim1D_workValue(int i, int idom, int icomp, int localPoint) { try { return SimCabinet::item(i).workValue(idom, icomp, localPoint); @@ -676,7 +676,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_eval(int i, double rdt, int count) + int sim1D_eval(int i, double rdt, int count) { try { SimCabinet::item(i).eval(rdt, count); @@ -686,7 +686,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setMaxJacAge(int i, int ss_age, int ts_age) + int sim1D_setMaxJacAge(int i, int ss_age, int ts_age) { try { SimCabinet::item(i).setJacAge(ss_age, ts_age); @@ -696,7 +696,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_timeStepFactor(int i, double tfactor) + int sim1D_timeStepFactor(int i, double tfactor) { try { SimCabinet::item(i).setTimeStepFactor(tfactor); @@ -706,7 +706,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setTimeStepLimits(int i, double tsmin, double tsmax) + int sim1D_setTimeStepLimits(int i, double tsmin, double tsmax) { try { if (tsmin > 0.0) { @@ -721,7 +721,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_setFixedTemperature(int i, double temp) + int sim1D_setFixedTemperature(int i, double temp) { try { SimCabinet::item(i).setFixedTemperature(temp); @@ -731,7 +731,7 @@ extern "C" { } } - int DLL_EXPORT sim1D_evalSSJacobian(int i) + int sim1D_evalSSJacobian(int i) { try { SimCabinet::item(i).evalSSJacobian(); @@ -741,7 +741,7 @@ extern "C" { } } - double DLL_EXPORT sim1D_jacobian(int i, int m, int n) + double sim1D_jacobian(int i, int m, int n) { try { return SimCabinet::item(i).jacobian(m,n); @@ -750,7 +750,7 @@ extern "C" { } } - size_t DLL_EXPORT sim1D_size(int i) + size_t sim1D_size(int i) { try { return SimCabinet::item(i).size(); diff --git a/src/clib/ctonedim.h b/src/clib/ctonedim.h index 5d564a28c..d369f8b59 100644 --- a/src/clib/ctonedim.h +++ b/src/clib/ctonedim.h @@ -14,85 +14,85 @@ extern "C" { - EEXXTT int DLL_CPREFIX domain_clear(); - EEXXTT int DLL_CPREFIX domain_del(int i); - EEXXTT int DLL_CPREFIX domain_type(int i); - EEXXTT size_t DLL_CPREFIX domain_index(int i); - EEXXTT size_t DLL_CPREFIX domain_nComponents(int i); - EEXXTT size_t DLL_CPREFIX domain_nPoints(int i); - EEXXTT int DLL_CPREFIX domain_componentName(int i, int n, int sz, char* nameout); - EEXXTT size_t DLL_CPREFIX domain_componentIndex(int i, char* name); - EEXXTT int DLL_CPREFIX domain_setBounds(int i, int n, double lower, + CANTERA_CAPI int domain_clear(); + CANTERA_CAPI int domain_del(int i); + CANTERA_CAPI int domain_type(int i); + CANTERA_CAPI size_t domain_index(int i); + CANTERA_CAPI size_t domain_nComponents(int i); + CANTERA_CAPI size_t domain_nPoints(int i); + CANTERA_CAPI int domain_componentName(int i, int n, int sz, char* nameout); + CANTERA_CAPI size_t domain_componentIndex(int i, char* name); + CANTERA_CAPI int domain_setBounds(int i, int n, double lower, double upper); - EEXXTT double DLL_EXPORT domain_lowerBound(int i, int n); - EEXXTT double DLL_EXPORT domain_upperBound(int i, int n); - EEXXTT int DLL_CPREFIX domain_setTolerances(int i, int n, double rtol, + CANTERA_CAPI double domain_lowerBound(int i, int n); + CANTERA_CAPI double domain_upperBound(int i, int n); + CANTERA_CAPI int domain_setTolerances(int i, int n, double rtol, double atol, int itime); - EEXXTT double DLL_CPREFIX domain_rtol(int i, int n); - EEXXTT double DLL_CPREFIX domain_atol(int i, int n); - EEXXTT int DLL_CPREFIX domain_setupGrid(int i, size_t npts, double* grid); - EEXXTT int DLL_CPREFIX domain_setID(int i, char* id); - EEXXTT int DLL_CPREFIX domain_setDesc(int i, char* desc); - EEXXTT double DLL_CPREFIX domain_grid(int i, int n); + CANTERA_CAPI double domain_rtol(int i, int n); + CANTERA_CAPI double domain_atol(int i, int n); + CANTERA_CAPI int domain_setupGrid(int i, size_t npts, double* grid); + CANTERA_CAPI int domain_setID(int i, char* id); + CANTERA_CAPI int domain_setDesc(int i, char* desc); + CANTERA_CAPI double domain_grid(int i, int n); - EEXXTT int DLL_CPREFIX bdry_setMdot(int i, double mdot); - EEXXTT int DLL_CPREFIX bdry_setTemperature(int i, double t); - EEXXTT int DLL_CPREFIX bdry_setMoleFractions(int i, char* x); - EEXXTT double DLL_CPREFIX bdry_temperature(int i); - EEXXTT double DLL_CPREFIX bdry_massFraction(int i, int k); - EEXXTT double DLL_CPREFIX bdry_mdot(int i); + CANTERA_CAPI int bdry_setMdot(int i, double mdot); + CANTERA_CAPI int bdry_setTemperature(int i, double t); + CANTERA_CAPI int bdry_setMoleFractions(int i, char* x); + CANTERA_CAPI double bdry_temperature(int i); + CANTERA_CAPI double bdry_massFraction(int i, int k); + CANTERA_CAPI double bdry_mdot(int i); - EEXXTT int DLL_CPREFIX reactingsurf_setkineticsmgr(int i, int j); - EEXXTT int DLL_CPREFIX reactingsurf_enableCoverageEqs(int i, int onoff); + CANTERA_CAPI int reactingsurf_setkineticsmgr(int i, int j); + CANTERA_CAPI int reactingsurf_enableCoverageEqs(int i, int onoff); - EEXXTT int DLL_CPREFIX inlet_new(); - EEXXTT int DLL_CPREFIX outlet_new(); - EEXXTT int DLL_CPREFIX outletres_new(); - EEXXTT int DLL_CPREFIX symm_new(); - EEXXTT int DLL_CPREFIX surf_new(); - EEXXTT int DLL_CPREFIX reactingsurf_new(); + CANTERA_CAPI int inlet_new(); + CANTERA_CAPI int outlet_new(); + CANTERA_CAPI int outletres_new(); + CANTERA_CAPI int symm_new(); + CANTERA_CAPI int surf_new(); + CANTERA_CAPI int reactingsurf_new(); - EEXXTT int DLL_CPREFIX inlet_setSpreadRate(int i, double v); + CANTERA_CAPI int inlet_setSpreadRate(int i, double v); - EEXXTT int DLL_CPREFIX stflow_new(int iph, int ikin, int itr, int itype=1); - EEXXTT int DLL_CPREFIX stflow_setTransport(int i, int itr, int iSoret); - EEXXTT int DLL_CPREFIX stflow_enableSoret(int i, int iSoret); - EEXXTT int DLL_CPREFIX stflow_setPressure(int i, double p); - EEXXTT int DLL_CPREFIX stflow_setFixedTempProfile(int i, size_t n, double* pos, + CANTERA_CAPI int stflow_new(int iph, int ikin, int itr, int itype=1); + CANTERA_CAPI int stflow_setTransport(int i, int itr, int iSoret); + CANTERA_CAPI int stflow_enableSoret(int i, int iSoret); + CANTERA_CAPI int stflow_setPressure(int i, double p); + CANTERA_CAPI int stflow_setFixedTempProfile(int i, size_t n, double* pos, size_t m, double* temp); - EEXXTT int DLL_CPREFIX stflow_solveSpeciesEqs(int i, int flag); - EEXXTT int DLL_CPREFIX stflow_solveEnergyEqn(int i, int flag); + CANTERA_CAPI int stflow_solveSpeciesEqs(int i, int flag); + CANTERA_CAPI int stflow_solveEnergyEqn(int i, int flag); - EEXXTT int DLL_CPREFIX sim1D_clear(); - EEXXTT int DLL_CPREFIX sim1D_new(size_t nd, int* domains); - EEXXTT int DLL_CPREFIX sim1D_del(int i); - EEXXTT int DLL_CPREFIX sim1D_setValue(int i, int dom, int comp, int localPoint, double value); - EEXXTT int DLL_CPREFIX sim1D_setProfile(int i, int dom, int comp, + CANTERA_CAPI int sim1D_clear(); + CANTERA_CAPI int sim1D_new(size_t nd, int* domains); + CANTERA_CAPI int sim1D_del(int i); + CANTERA_CAPI int sim1D_setValue(int i, int dom, int comp, int localPoint, double value); + CANTERA_CAPI int sim1D_setProfile(int i, int dom, int comp, size_t np, double* pos, size_t nv, double* v); - EEXXTT int DLL_CPREFIX sim1D_setFlatProfile(int i, int dom, int comp, double v); - EEXXTT int DLL_CPREFIX sim1D_showSolution(int i, char* fname); - EEXXTT int DLL_CPREFIX sim1D_setTimeStep(int i, double stepsize, size_t ns, integer* nsteps); - EEXXTT int DLL_CPREFIX sim1D_getInitialSoln(int i); - EEXXTT int DLL_CPREFIX sim1D_solve(int i, int loglevel, int refine_grid); - EEXXTT int DLL_CPREFIX sim1D_refine(int i, int loglevel); - EEXXTT int DLL_CPREFIX sim1D_setRefineCriteria(int i, int dom, double ratio, + CANTERA_CAPI int sim1D_setFlatProfile(int i, int dom, int comp, double v); + CANTERA_CAPI int sim1D_showSolution(int i, char* fname); + CANTERA_CAPI int sim1D_setTimeStep(int i, double stepsize, size_t ns, integer* nsteps); + CANTERA_CAPI int sim1D_getInitialSoln(int i); + CANTERA_CAPI int sim1D_solve(int i, int loglevel, int refine_grid); + CANTERA_CAPI int sim1D_refine(int i, int loglevel); + CANTERA_CAPI int sim1D_setRefineCriteria(int i, int dom, double ratio, double slope, double curve, double prune); - EEXXTT int DLL_CPREFIX sim1D_save(int i, char* fname, char* id, + CANTERA_CAPI int sim1D_save(int i, char* fname, char* id, char* desc); - EEXXTT int DLL_CPREFIX sim1D_restore(int i, char* fname, char* id); - EEXXTT int DLL_CPREFIX sim1D_writeStats(int i, int printTime = 1); - EEXXTT int DLL_CPREFIX sim1D_domainIndex(int i, char* name); - EEXXTT double DLL_CPREFIX sim1D_value(int i, int idom, int icomp, int localPoint); - EEXXTT double DLL_CPREFIX sim1D_workValue(int i, int idom, + CANTERA_CAPI int sim1D_restore(int i, char* fname, char* id); + CANTERA_CAPI int sim1D_writeStats(int i, int printTime = 1); + CANTERA_CAPI int sim1D_domainIndex(int i, char* name); + CANTERA_CAPI double sim1D_value(int i, int idom, int icomp, int localPoint); + CANTERA_CAPI double sim1D_workValue(int i, int idom, int icomp, int localPoint); - EEXXTT int DLL_CPREFIX sim1D_eval(int i, double rdt, int count); - EEXXTT int DLL_CPREFIX sim1D_setMaxJacAge(int i, int ss_age, int ts_age); - EEXXTT int DLL_CPREFIX sim1D_timeStepFactor(int i, double tfactor); - EEXXTT int DLL_CPREFIX sim1D_setTimeStepLimits(int i, double tsmin, double tsmax); - EEXXTT int DLL_CPREFIX sim1D_setFixedTemperature(int i, double temp); - EEXXTT int DLL_CPREFIX sim1D_evalSSJacobian(int i); - EEXXTT double DLL_CPREFIX sim1D_jacobian(int i, int m, int n); - EEXXTT size_t DLL_CPREFIX sim1D_size(int i); + CANTERA_CAPI int sim1D_eval(int i, double rdt, int count); + CANTERA_CAPI int sim1D_setMaxJacAge(int i, int ss_age, int ts_age); + CANTERA_CAPI int sim1D_timeStepFactor(int i, double tfactor); + CANTERA_CAPI int sim1D_setTimeStepLimits(int i, double tsmin, double tsmax); + CANTERA_CAPI int sim1D_setFixedTemperature(int i, double temp); + CANTERA_CAPI int sim1D_evalSSJacobian(int i); + CANTERA_CAPI double sim1D_jacobian(int i, int m, int n); + CANTERA_CAPI size_t sim1D_size(int i); } diff --git a/src/clib/ctreactor.cpp b/src/clib/ctreactor.cpp index 390e7ba26..e8964159d 100644 --- a/src/clib/ctreactor.cpp +++ b/src/clib/ctreactor.cpp @@ -34,7 +34,7 @@ extern "C" { // reactor - int DLL_EXPORT reactor_new(int type) + int reactor_new(int type) { ReactorBase* r=0; if (type == ReactorType) { @@ -51,41 +51,41 @@ extern "C" { return ReactorCabinet::add(r); } - int DLL_EXPORT reactor_del(int i) + int reactor_del(int i) { ReactorCabinet::del(i); return 0; } - int DLL_EXPORT reactor_copy(int i) + int reactor_copy(int i) { return ReactorCabinet::newCopy(i); } - int DLL_EXPORT reactor_assign(int i, int j) + int reactor_assign(int i, int j) { return ReactorCabinet::assign(i,j); } - int DLL_EXPORT reactor_setInitialVolume(int i, double v) + int reactor_setInitialVolume(int i, double v) { ReactorCabinet::item(i).setInitialVolume(v); return 0; } - int DLL_EXPORT reactor_setInitialTime(int i, double t) + int reactor_setInitialTime(int i, double t) { ReactorCabinet::item(i).setInitialTime(t); return 0; } - int DLL_EXPORT reactor_setThermoMgr(int i, int n) + int reactor_setThermoMgr(int i, int n) { ReactorCabinet::item(i).setThermoMgr(ThermoCabinet::item(n)); return 0; } - int DLL_EXPORT reactor_setKineticsMgr(int i, int n) + int reactor_setKineticsMgr(int i, int n) { ReactorBase* r = &ReactorCabinet::item(i); if (r->type() >= ReactorType) { @@ -94,7 +94,7 @@ extern "C" { return 0; } - int DLL_EXPORT reactor_advance(int i, double t) + int reactor_advance(int i, double t) { try { ReactorCabinet::item(i).advance(t); @@ -104,57 +104,57 @@ extern "C" { } } - double DLL_EXPORT reactor_step(int i, double t) + double reactor_step(int i, double t) { return ReactorCabinet::item(i).step(t); } - double DLL_EXPORT reactor_time(int i) + double reactor_time(int i) { return ReactorCabinet::item(i).time(); } - double DLL_EXPORT reactor_mass(int i) + double reactor_mass(int i) { return ReactorCabinet::item(i).mass(); } - double DLL_EXPORT reactor_volume(int i) + double reactor_volume(int i) { return ReactorCabinet::item(i).volume(); } - double DLL_EXPORT reactor_density(int i) + double reactor_density(int i) { return ReactorCabinet::item(i).density(); } - double DLL_EXPORT reactor_temperature(int i) + double reactor_temperature(int i) { return ReactorCabinet::item(i).temperature(); } - double DLL_EXPORT reactor_enthalpy_mass(int i) + double reactor_enthalpy_mass(int i) { return ReactorCabinet::item(i).enthalpy_mass(); } - double DLL_EXPORT reactor_intEnergy_mass(int i) + double reactor_intEnergy_mass(int i) { return ReactorCabinet::item(i).intEnergy_mass(); } - double DLL_EXPORT reactor_pressure(int i) + double reactor_pressure(int i) { return ReactorCabinet::item(i).pressure(); } - double DLL_EXPORT reactor_massFraction(int i, int k) + double reactor_massFraction(int i, int k) { return ReactorCabinet::item(i).massFraction(k); } - int DLL_EXPORT reactor_setEnergy(int i, int eflag) + int reactor_setEnergy(int i, int eflag) { ReactorBase* r = &ReactorCabinet::item(i); if (r->type() >= ReactorType) { @@ -163,7 +163,7 @@ extern "C" { return 0; } - int DLL_EXPORT flowReactor_setMassFlowRate(int i, double mdot) + int flowReactor_setMassFlowRate(int i, double mdot) { ReactorBase* r = &ReactorCabinet::item(i); if (r->type() >= ReactorType) { @@ -172,7 +172,7 @@ extern "C" { return 0; } - size_t DLL_EXPORT reactor_nSensParams(int i) + size_t reactor_nSensParams(int i) { ReactorBase* r = &ReactorCabinet::item(i); if (r->type() >= ReactorType) { @@ -183,7 +183,7 @@ extern "C" { } } - int DLL_EXPORT reactor_addSensitivityReaction(int i, int rxn) + int reactor_addSensitivityReaction(int i, int rxn) { ReactorBase* r = &ReactorCabinet::item(i); ((Reactor*)r)->addSensitivityReaction(rxn); @@ -193,13 +193,13 @@ extern "C" { // reactor networks - int DLL_EXPORT reactornet_new() + int reactornet_new() { ReactorNet* r = new ReactorNet(); return NetworkCabinet::add(r); } - int DLL_EXPORT reactornet_del(int i) + int reactornet_del(int i) { try { NetworkCabinet::del(i); @@ -209,41 +209,41 @@ extern "C" { } } - int DLL_EXPORT reactornet_copy(int i) + int reactornet_copy(int i) { return NetworkCabinet::newCopy(i); } - int DLL_EXPORT reactornet_assign(int i, int j) + int reactornet_assign(int i, int j) { return NetworkCabinet::assign(i,j); } - int DLL_EXPORT reactornet_setInitialTime(int i, double t) + int reactornet_setInitialTime(int i, double t) { NetworkCabinet::item(i).setInitialTime(t); return 0; } - int DLL_EXPORT reactornet_setMaxTimeStep(int i, double maxstep) + int reactornet_setMaxTimeStep(int i, double maxstep) { NetworkCabinet::item(i).setMaxTimeStep(maxstep); return 0; } - int DLL_EXPORT reactornet_setTolerances(int i, double rtol, double atol) + int reactornet_setTolerances(int i, double rtol, double atol) { NetworkCabinet::item(i).setTolerances(rtol, atol); return 0; } - int DLL_EXPORT reactornet_setSensitivityTolerances(int i, double rtol, double atol) + int reactornet_setSensitivityTolerances(int i, double rtol, double atol) { NetworkCabinet::item(i).setSensitivityTolerances(rtol, atol); return 0; } - int DLL_EXPORT reactornet_addreactor(int i, int n) + int reactornet_addreactor(int i, int n) { try { NetworkCabinet::item(i).addReactor(&ReactorCabinet::item(n)); @@ -253,7 +253,7 @@ extern "C" { } } - int DLL_EXPORT reactornet_advance(int i, double t) + int reactornet_advance(int i, double t) { try { NetworkCabinet::item(i).advance(t); @@ -263,7 +263,7 @@ extern "C" { } } - double DLL_EXPORT reactornet_step(int i, double t) + double reactornet_step(int i, double t) { try { return NetworkCabinet::item(i).step(t); @@ -272,22 +272,22 @@ extern "C" { } } - double DLL_EXPORT reactornet_time(int i) + double reactornet_time(int i) { return NetworkCabinet::item(i).time(); } - double DLL_EXPORT reactornet_rtol(int i) + double reactornet_rtol(int i) { return NetworkCabinet::item(i).rtol(); } - double DLL_EXPORT reactornet_atol(int i) + double reactornet_atol(int i) { return NetworkCabinet::item(i).atol(); } - double DLL_EXPORT reactornet_sensitivity(int i, char* v, int p, int r) + double reactornet_sensitivity(int i, char* v, int p, int r) { return NetworkCabinet::item(i).sensitivity(v, p, r); } @@ -295,7 +295,7 @@ extern "C" { // flow devices - int DLL_EXPORT flowdev_new(int type) + int flowdev_new(int type) { FlowDevice* r; switch (type) { @@ -314,13 +314,13 @@ extern "C" { return FlowDeviceCabinet::add(r); } - int DLL_EXPORT flowdev_del(int i) + int flowdev_del(int i) { FlowDeviceCabinet::del(i); return 0; } - int DLL_EXPORT flowdev_install(int i, int n, int m) + int flowdev_install(int i, int n, int m) { try { bool ok = FlowDeviceCabinet::item(i).install(ReactorCabinet::item(n), @@ -334,7 +334,7 @@ extern "C" { } } - int DLL_EXPORT flowdev_setMaster(int i, int n) + int flowdev_setMaster(int i, int n) { if (FlowDeviceCabinet::item(i).type() == PressureController_Type) { dynamic_cast(FlowDeviceCabinet::item(i)).setMaster( @@ -343,30 +343,30 @@ extern "C" { return 0; } - double DLL_EXPORT flowdev_massFlowRate(int i, double time) + double flowdev_massFlowRate(int i, double time) { return FlowDeviceCabinet::item(i).massFlowRate(time); } - int DLL_EXPORT flowdev_setMassFlowRate(int i, double mdot) + int flowdev_setMassFlowRate(int i, double mdot) { FlowDeviceCabinet::item(i).setMassFlowRate(mdot); return 0; } - int DLL_EXPORT flowdev_setParameters(int i, int n, double* v) + int flowdev_setParameters(int i, int n, double* v) { FlowDeviceCabinet::item(i).setParameters(n, v); return 0; } - int DLL_EXPORT flowdev_setFunction(int i, int n) + int flowdev_setFunction(int i, int n) { FlowDeviceCabinet::item(i).setFunction(&FuncCabinet::item(n)); return 0; } - int DLL_EXPORT flowdev_ready(int i) + int flowdev_ready(int i) { bool ok = FlowDeviceCabinet::item(i).ready(); if (ok) { @@ -379,37 +379,37 @@ extern "C" { ///////////// Walls /////////////////////// - int DLL_EXPORT wall_new(int type) + int wall_new(int type) { Wall* r; r = new Wall(); return WallCabinet::add(r); } - int DLL_EXPORT wall_del(int i) + int wall_del(int i) { WallCabinet::del(i); return 0; } - int DLL_EXPORT wall_copy(int i) + int wall_copy(int i) { return WallCabinet::newCopy(i); } - int DLL_EXPORT wall_assign(int i, int j) + int wall_assign(int i, int j) { return WallCabinet::assign(i,j); } - int DLL_EXPORT wall_install(int i, int n, int m) + int wall_install(int i, int n, int m) { WallCabinet::item(i).install(ReactorCabinet::item(n), ReactorCabinet::item(m)); return 0; } - int DLL_EXPORT wall_setkinetics(int i, int n, int m) + int wall_setkinetics(int i, int n, int m) { Kinetics* left=0, *right=0; if (n > 0) @@ -424,64 +424,64 @@ extern "C" { return 0; } - double DLL_EXPORT wall_vdot(int i, double t) + double wall_vdot(int i, double t) { return WallCabinet::item(i).vdot(t); } - double DLL_EXPORT wall_Q(int i, double t) + double wall_Q(int i, double t) { return WallCabinet::item(i).Q(t); } - double DLL_EXPORT wall_area(int i) + double wall_area(int i) { return WallCabinet::item(i).area(); } - int DLL_EXPORT wall_setArea(int i, double v) + int wall_setArea(int i, double v) { WallCabinet::item(i).setArea(v); return 0; } - int DLL_EXPORT wall_setThermalResistance(int i, double rth) + int wall_setThermalResistance(int i, double rth) { WallCabinet::item(i).setThermalResistance(rth); return 0; } - int DLL_EXPORT wall_setHeatTransferCoeff(int i, double u) + int wall_setHeatTransferCoeff(int i, double u) { WallCabinet::item(i).setHeatTransferCoeff(u); return 0; } - int DLL_EXPORT wall_setHeatFlux(int i, int n) + int wall_setHeatFlux(int i, int n) { WallCabinet::item(i).setHeatFlux(&FuncCabinet::item(n)); return 0; } - int DLL_EXPORT wall_setExpansionRateCoeff(int i, double k) + int wall_setExpansionRateCoeff(int i, double k) { WallCabinet::item(i).setExpansionRateCoeff(k); return 0; } - int DLL_EXPORT wall_setVelocity(int i, int n) + int wall_setVelocity(int i, int n) { WallCabinet::item(i).setVelocity(&FuncCabinet::item(n)); return 0; } - int DLL_EXPORT wall_setEmissivity(int i, double epsilon) + int wall_setEmissivity(int i, double epsilon) { WallCabinet::item(i).setEmissivity(epsilon); return 0; } - int DLL_EXPORT wall_ready(int i) + int wall_ready(int i) { if (WallCabinet::item(i).ready()) { return 1; @@ -490,7 +490,7 @@ extern "C" { } } - int DLL_EXPORT wall_addSensitivityReaction(int i, int lr, int rxn) + int wall_addSensitivityReaction(int i, int lr, int rxn) { WallCabinet::item(i).addSensitivityReaction(lr, rxn); return 0; diff --git a/src/clib/ctreactor.h b/src/clib/ctreactor.h index 60a8a6cfa..4b5156c04 100644 --- a/src/clib/ctreactor.h +++ b/src/clib/ctreactor.h @@ -8,75 +8,74 @@ extern "C" { - EEXXTT int DLL_CPREFIX reactor_new(int type); - EEXXTT int DLL_CPREFIX reactor_del(int i); - EEXXTT int DLL_CPREFIX reactor_copy(int i); - EEXXTT int DLL_CPREFIX reactor_assign(int i, int j); - EEXXTT int DLL_CPREFIX reactor_setInitialVolume(int i, double v); - EEXXTT int DLL_CPREFIX reactor_setInitialTime(int i, double t); - EEXXTT int DLL_CPREFIX reactor_setEnergy(int i, int eflag); - EEXXTT int DLL_CPREFIX reactor_setThermoMgr(int i, int n); - EEXXTT int DLL_CPREFIX reactor_setKineticsMgr(int i, int n); - EEXXTT int DLL_CPREFIX reactor_advance(int i, double t); - EEXXTT double DLL_CPREFIX reactor_step(int i, double t); - EEXXTT double DLL_CPREFIX reactor_time(int i); - EEXXTT double DLL_CPREFIX reactor_mass(int i); - EEXXTT double DLL_CPREFIX reactor_volume(int i); - EEXXTT double DLL_CPREFIX reactor_density(int i); - EEXXTT double DLL_CPREFIX reactor_temperature(int i); - EEXXTT double DLL_CPREFIX reactor_enthalpy_mass(int i); - EEXXTT double DLL_CPREFIX reactor_intEnergy_mass(int i); - EEXXTT double DLL_CPREFIX reactor_pressure(int i); - EEXXTT double DLL_CPREFIX reactor_massFraction(int i, int k); - EEXXTT size_t DLL_CPREFIX reactor_nSensParams(int i); - EEXXTT int DLL_CPREFIX reactor_addSensitivityReaction(int i, int rxn); - EEXXTT int DLL_CPREFIX flowReactor_setMassFlowRate(int i, double mdot); + CANTERA_CAPI int reactor_new(int type); + CANTERA_CAPI int reactor_del(int i); + CANTERA_CAPI int reactor_copy(int i); + CANTERA_CAPI int reactor_assign(int i, int j); + CANTERA_CAPI int reactor_setInitialVolume(int i, double v); + CANTERA_CAPI int reactor_setInitialTime(int i, double t); + CANTERA_CAPI int reactor_setEnergy(int i, int eflag); + CANTERA_CAPI int reactor_setThermoMgr(int i, int n); + CANTERA_CAPI int reactor_setKineticsMgr(int i, int n); + CANTERA_CAPI int reactor_advance(int i, double t); + CANTERA_CAPI double reactor_step(int i, double t); + CANTERA_CAPI double reactor_time(int i); + CANTERA_CAPI double reactor_mass(int i); + CANTERA_CAPI double reactor_volume(int i); + CANTERA_CAPI double reactor_density(int i); + CANTERA_CAPI double reactor_temperature(int i); + CANTERA_CAPI double reactor_enthalpy_mass(int i); + CANTERA_CAPI double reactor_intEnergy_mass(int i); + CANTERA_CAPI double reactor_pressure(int i); + CANTERA_CAPI double reactor_massFraction(int i, int k); + CANTERA_CAPI size_t reactor_nSensParams(int i); + CANTERA_CAPI int reactor_addSensitivityReaction(int i, int rxn); + CANTERA_CAPI int flowReactor_setMassFlowRate(int i, double mdot); - EEXXTT int DLL_CPREFIX reactornet_new(); - EEXXTT int DLL_CPREFIX reactornet_del(int i); - EEXXTT int DLL_CPREFIX reactornet_copy(int i); - EEXXTT int DLL_CPREFIX reactornet_assign(int i, int j); - EEXXTT int DLL_CPREFIX reactornet_setInitialTime(int i, double t); - EEXXTT int DLL_CPREFIX reactornet_setMaxTimeStep(int i, double maxstep); - EEXXTT int DLL_CPREFIX reactornet_setTolerances(int i, double rtol, double atol); - EEXXTT int DLL_CPREFIX reactornet_setSensitivityTolerances(int i, double rtol, double atol); - EEXXTT int DLL_CPREFIX reactornet_addreactor(int i, int n); - EEXXTT int DLL_CPREFIX reactornet_advance(int i, double t); - EEXXTT double DLL_CPREFIX reactornet_step(int i, double t); - EEXXTT double DLL_CPREFIX reactornet_time(int i); - EEXXTT double DLL_CPREFIX reactornet_rtol(int i); - EEXXTT double DLL_CPREFIX reactornet_atol(int i); - EEXXTT double DLL_CPREFIX reactornet_sensitivity(int i, char* v, int p, int r); + CANTERA_CAPI int reactornet_new(); + CANTERA_CAPI int reactornet_del(int i); + CANTERA_CAPI int reactornet_copy(int i); + CANTERA_CAPI int reactornet_assign(int i, int j); + CANTERA_CAPI int reactornet_setInitialTime(int i, double t); + CANTERA_CAPI int reactornet_setMaxTimeStep(int i, double maxstep); + CANTERA_CAPI int reactornet_setTolerances(int i, double rtol, double atol); + CANTERA_CAPI int reactornet_setSensitivityTolerances(int i, double rtol, double atol); + CANTERA_CAPI int reactornet_addreactor(int i, int n); + CANTERA_CAPI int reactornet_advance(int i, double t); + CANTERA_CAPI double reactornet_step(int i, double t); + CANTERA_CAPI double reactornet_time(int i); + CANTERA_CAPI double reactornet_rtol(int i); + CANTERA_CAPI double reactornet_atol(int i); + CANTERA_CAPI double reactornet_sensitivity(int i, char* v, int p, int r); - EEXXTT int DLL_CPREFIX flowdev_new(int type); - EEXXTT int DLL_CPREFIX flowdev_del(int i); - EEXXTT int DLL_CPREFIX flowdev_install(int i, int n, int m); - EEXXTT int DLL_CPREFIX flowdev_setMaster(int i, int n); - EEXXTT double DLL_CPREFIX flowdev_massFlowRate(int i, double time); - EEXXTT int DLL_CPREFIX flowdev_setMassFlowRate(int i, double mdot); - EEXXTT int DLL_CPREFIX flowdev_setParameters(int i, int n, double* v); - EEXXTT int DLL_CPREFIX flowdev_setFunction(int i, int n); - EEXXTT int DLL_CPREFIX flowdev_ready(int i); - - EEXXTT int DLL_CPREFIX wall_new(int type); - EEXXTT int DLL_CPREFIX wall_del(int i); - EEXXTT int DLL_CPREFIX wall_copy(int i); - EEXXTT int DLL_CPREFIX wall_assign(int i, int j); - EEXXTT int DLL_CPREFIX wall_install(int i, int n, int m); - EEXXTT int DLL_CPREFIX wall_setkinetics(int i, int n, int m); - EEXXTT double DLL_CPREFIX wall_vdot(int i, double t); - EEXXTT double DLL_CPREFIX wall_Q(int i, double t); - EEXXTT double DLL_CPREFIX wall_area(int i); - EEXXTT int DLL_CPREFIX wall_setArea(int i, double v); - EEXXTT int DLL_CPREFIX wall_setThermalResistance(int i, double rth); - EEXXTT int DLL_CPREFIX wall_setHeatTransferCoeff(int i, double u); - EEXXTT int DLL_CPREFIX wall_setHeatFlux(int i, int n); - EEXXTT int DLL_CPREFIX wall_setExpansionRateCoeff(int i, double k); - EEXXTT int DLL_CPREFIX wall_setVelocity(int i, int n); - EEXXTT int DLL_CPREFIX wall_setEmissivity(int i, double epsilon); - EEXXTT int DLL_CPREFIX wall_ready(int i); - EEXXTT int DLL_CPREFIX wall_addSensitivityReaction(int i, int lr, int rxn); + CANTERA_CAPI int flowdev_new(int type); + 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); + CANTERA_CAPI double flowdev_massFlowRate(int i, double time); + CANTERA_CAPI int flowdev_setMassFlowRate(int i, double mdot); + CANTERA_CAPI int flowdev_setParameters(int i, int n, double* v); + CANTERA_CAPI int flowdev_setFunction(int i, int n); + CANTERA_CAPI int flowdev_ready(int i); + CANTERA_CAPI int wall_new(int type); + CANTERA_CAPI int wall_del(int i); + CANTERA_CAPI int wall_copy(int i); + CANTERA_CAPI int wall_assign(int i, int j); + CANTERA_CAPI int wall_install(int i, int n, int m); + CANTERA_CAPI int wall_setkinetics(int i, int n, int m); + CANTERA_CAPI double wall_vdot(int i, double t); + CANTERA_CAPI double wall_Q(int i, double t); + CANTERA_CAPI double wall_area(int i); + CANTERA_CAPI int wall_setArea(int i, double v); + CANTERA_CAPI int wall_setThermalResistance(int i, double rth); + CANTERA_CAPI int wall_setHeatTransferCoeff(int i, double u); + CANTERA_CAPI int wall_setHeatFlux(int i, int n); + CANTERA_CAPI int wall_setExpansionRateCoeff(int i, double k); + CANTERA_CAPI int wall_setVelocity(int i, int n); + CANTERA_CAPI int wall_setEmissivity(int i, double epsilon); + CANTERA_CAPI int wall_ready(int i); + CANTERA_CAPI int wall_addSensitivityReaction(int i, int lr, int rxn); } #endif diff --git a/src/clib/ctrpath.cpp b/src/clib/ctrpath.cpp index 2e8550515..db8f29712 100644 --- a/src/clib/ctrpath.cpp +++ b/src/clib/ctrpath.cpp @@ -20,101 +20,101 @@ typedef Cabinet KineticsCabinet; extern "C" { - int DLL_EXPORT rdiag_new() + int rdiag_new() { ReactionPathDiagram* d = new ReactionPathDiagram(); return DiagramCabinet::add(d); } - int DLL_EXPORT rdiag_del(int i) + int rdiag_del(int i) { DiagramCabinet::del(i); return 0; } - int DLL_EXPORT rdiag_copy(int i) + int rdiag_copy(int i) { return DiagramCabinet::newCopy(i); } - int DLL_EXPORT rdiag_assign(int i, int j) + int rdiag_assign(int i, int j) { return DiagramCabinet::assign(i,j); } - int DLL_EXPORT rdiag_detailed(int i) + int rdiag_detailed(int i) { DiagramCabinet::item(i).show_details = true; return 0; } - int DLL_EXPORT rdiag_brief(int i) + int rdiag_brief(int i) { DiagramCabinet::item(i).show_details = false; return 0; } - int DLL_EXPORT rdiag_setThreshold(int i, double v) + int rdiag_setThreshold(int i, double v) { DiagramCabinet::item(i).threshold = v; return 0; } - int DLL_EXPORT rdiag_setBoldColor(int i, char* color) + int rdiag_setBoldColor(int i, char* color) { DiagramCabinet::item(i).bold_color = string(color); return 0; } - int DLL_EXPORT rdiag_setNormalColor(int i, char* color) + int rdiag_setNormalColor(int i, char* color) { DiagramCabinet::item(i).normal_color = string(color); return 0; } - int DLL_EXPORT rdiag_setDashedColor(int i, char* color) + int rdiag_setDashedColor(int i, char* color) { DiagramCabinet::item(i).dashed_color = string(color); return 0; } - int DLL_EXPORT rdiag_setDotOptions(int i, char* opt) + int rdiag_setDotOptions(int i, char* opt) { DiagramCabinet::item(i).dot_options = string(opt); return 0; } - int DLL_EXPORT rdiag_setFont(int i, char* font) + int rdiag_setFont(int i, char* font) { DiagramCabinet::item(i).setFont(string(font)); return 0; } - int DLL_EXPORT rdiag_setBoldThreshold(int i, double v) + int rdiag_setBoldThreshold(int i, double v) { DiagramCabinet::item(i).bold_min = v; return 0; } - int DLL_EXPORT rdiag_setNormalThreshold(int i, double v) + int rdiag_setNormalThreshold(int i, double v) { DiagramCabinet::item(i).dashed_max = v; return 0; } - int DLL_EXPORT rdiag_setLabelThreshold(int i, double v) + int rdiag_setLabelThreshold(int i, double v) { DiagramCabinet::item(i).label_min = v; return 0; } - int DLL_EXPORT rdiag_setScale(int i, double v) + int rdiag_setScale(int i, double v) { DiagramCabinet::item(i).scale = v; return 0; } - int DLL_EXPORT rdiag_setFlowType(int i, int iflow) + int rdiag_setFlowType(int i, int iflow) { if (iflow == 0) { DiagramCabinet::item(i).flow_type = OneWayFlow; @@ -124,32 +124,32 @@ extern "C" { return 0; } - int DLL_EXPORT rdiag_setArrowWidth(int i, double v) + int rdiag_setArrowWidth(int i, double v) { DiagramCabinet::item(i).arrow_width = v; return 0; } - int DLL_EXPORT rdiag_setTitle(int i, char* title) + int rdiag_setTitle(int i, char* title) { DiagramCabinet::item(i).title = string(title); return 0; } - int DLL_EXPORT rdiag_add(int i, int n) + int rdiag_add(int i, int n) { DiagramCabinet::item(i).add(DiagramCabinet::item(n)); return 0; } - int DLL_EXPORT rdiag_findMajor(int i, double threshold, + int rdiag_findMajor(int i, double threshold, size_t lda, double* a) { DiagramCabinet::item(i).findMajorPaths(threshold, lda, a); return 0; } - int DLL_EXPORT rdiag_write(int i, int fmt, char* fname) + int rdiag_write(int i, int fmt, char* fname) { ofstream f(fname); if (fmt == 0) { @@ -161,32 +161,32 @@ extern "C" { return 0; } - int DLL_EXPORT rdiag_displayOnly(int i, int k) + int rdiag_displayOnly(int i, int k) { DiagramCabinet::item(i).displayOnly(k); return 0; } - int DLL_EXPORT rbuild_new() + int rbuild_new() { ReactionPathBuilder* d = new ReactionPathBuilder(); return BuilderCabinet::add(d); } - int DLL_EXPORT rbuild_del(int i) + int rbuild_del(int i) { BuilderCabinet::del(i); return 0; } - int DLL_EXPORT rbuild_init(int i, char* logfile, int k) + int rbuild_init(int i, char* logfile, int k) { ofstream flog(logfile); BuilderCabinet::item(i).init(flog, KineticsCabinet::item(k)); return 0; } - int DLL_EXPORT rbuild_build(int i, int k, char* el, char* dotfile, + int rbuild_build(int i, int k, char* el, char* dotfile, int idiag, int iquiet) { ofstream fdot(dotfile); diff --git a/src/clib/ctrpath.h b/src/clib/ctrpath.h index bcd88c07d..f79b55acb 100644 --- a/src/clib/ctrpath.h +++ b/src/clib/ctrpath.h @@ -8,32 +8,32 @@ extern "C" { - EEXXTT int DLL_CPREFIX rdiag_new(); - EEXXTT int DLL_CPREFIX rdiag_del(int i); - EEXXTT int DLL_CPREFIX rdiag_detailed(int i); - EEXXTT int DLL_CPREFIX rdiag_brief(int i); - EEXXTT int DLL_CPREFIX rdiag_setThreshold(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setBoldColor(int i, char* color); - EEXXTT int DLL_CPREFIX rdiag_setNormalColor(int i, char* color); - EEXXTT int DLL_CPREFIX rdiag_setDashedColor(int i, char* color); - EEXXTT int DLL_CPREFIX rdiag_setDotOptions(int i, char* opt); - EEXXTT int DLL_CPREFIX rdiag_setBoldThreshold(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setNormalThreshold(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setLabelThreshold(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setScale(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setFlowType(int i, int iflow); - EEXXTT int DLL_CPREFIX rdiag_setArrowWidth(int i, double v); - EEXXTT int DLL_CPREFIX rdiag_setTitle(int i, char* title); - EEXXTT int DLL_CPREFIX rdiag_write(int i, int fmt, char* fname); - EEXXTT int DLL_CPREFIX rdiag_add(int i, int n); - EEXXTT int DLL_CPREFIX rdiag_findMajor(int i, double threshold, size_t lda, double* a); - EEXXTT int DLL_CPREFIX rdiag_setFont(int i, char* font); - EEXXTT int DLL_CPREFIX rdiag_displayOnly(int i, int k); + CANTERA_CAPI int rdiag_new(); + CANTERA_CAPI int rdiag_del(int i); + CANTERA_CAPI int rdiag_detailed(int i); + CANTERA_CAPI int rdiag_brief(int i); + CANTERA_CAPI int rdiag_setThreshold(int i, double v); + CANTERA_CAPI int rdiag_setBoldColor(int i, char* color); + CANTERA_CAPI int rdiag_setNormalColor(int i, char* color); + CANTERA_CAPI int rdiag_setDashedColor(int i, char* color); + CANTERA_CAPI int rdiag_setDotOptions(int i, char* opt); + CANTERA_CAPI int rdiag_setBoldThreshold(int i, double v); + CANTERA_CAPI int rdiag_setNormalThreshold(int i, double v); + CANTERA_CAPI int rdiag_setLabelThreshold(int i, double v); + CANTERA_CAPI int rdiag_setScale(int i, double v); + CANTERA_CAPI int rdiag_setFlowType(int i, int iflow); + CANTERA_CAPI int rdiag_setArrowWidth(int i, double v); + CANTERA_CAPI int rdiag_setTitle(int i, char* title); + CANTERA_CAPI int rdiag_write(int i, int fmt, char* fname); + CANTERA_CAPI int rdiag_add(int i, int n); + CANTERA_CAPI int rdiag_findMajor(int i, double threshold, size_t lda, double* a); + CANTERA_CAPI int rdiag_setFont(int i, char* font); + CANTERA_CAPI int rdiag_displayOnly(int i, int k); - EEXXTT int DLL_CPREFIX rbuild_new(); - EEXXTT int DLL_CPREFIX rbuild_del(int i); - EEXXTT int DLL_CPREFIX rbuild_init(int i, char* logfile, int k); - EEXXTT int DLL_CPREFIX rbuild_build(int i, int k, char* el, char* dotfile, + CANTERA_CAPI int rbuild_new(); + CANTERA_CAPI int rbuild_del(int i); + CANTERA_CAPI int rbuild_init(int i, char* logfile, int k); + CANTERA_CAPI int rbuild_build(int i, int k, char* el, char* dotfile, int idiag, int iquiet); } diff --git a/src/clib/ctsurf.cpp b/src/clib/ctsurf.cpp index 9d55d143c..9415fb9f5 100644 --- a/src/clib/ctsurf.cpp +++ b/src/clib/ctsurf.cpp @@ -26,48 +26,48 @@ inline InterfaceKinetics* _surfkin(int n) extern "C" { - int DLL_EXPORT surf_setsitedensity(int i, double s0) + int surf_setsitedensity(int i, double s0) { _surfphase(i)->setSiteDensity(s0); return 0; } - double DLL_EXPORT surf_sitedensity(int i) + double surf_sitedensity(int i) { return _surfphase(i)->siteDensity(); } - int DLL_EXPORT surf_setcoverages(int i, double* c) + int surf_setcoverages(int i, double* c) { _surfphase(i)->setCoverages(c); return 0; } - int DLL_EXPORT surf_setcoveragesbyname(int i, char* c) + int surf_setcoveragesbyname(int i, char* c) { _surfphase(i)->setCoveragesByName(string(c)); return 0; } - int DLL_EXPORT surf_getcoverages(int i, double* c) + int surf_getcoverages(int i, double* c) { _surfphase(i)->getCoverages(c); return 0; } - int DLL_EXPORT surf_setconcentrations(int i, double* c) + int surf_setconcentrations(int i, double* c) { _surfphase(i)->setConcentrations(c); return 0; } - int DLL_EXPORT surf_getconcentrations(int i, double* c) + int surf_getconcentrations(int i, double* c) { _surfphase(i)->getConcentrations(c); return 0; } - // int DLL_EXPORT surface_setcoverages(int i, double* c) { + // int surface_setcoverages(int i, double* c) { // _surface(i)->setCoverages(c); // return 0; // } diff --git a/src/clib/ctsurf.h b/src/clib/ctsurf.h index 17e914957..bfd4e15cf 100644 --- a/src/clib/ctsurf.h +++ b/src/clib/ctsurf.h @@ -15,45 +15,45 @@ extern "C" { - EEXXTT int DLL_CPREFIX surface_new(int ikin); - EEXXTT int DLL_CPREFIX surface_del(int i); + CANTERA_CAPI int surface_new(int ikin); + CANTERA_CAPI int surface_del(int i); - EEXXTT int DLL_CPREFIX surfphase_new(); - EEXXTT int DLL_CPREFIX surf_del(int i); - EEXXTT int DLL_CPREFIX surf_copy(int i); - EEXXTT int DLL_CPREFIX surf_assign(int i, int j); - EEXXTT int DLL_CPREFIX surf_addspecies(int i, char* nm, double sz); - EEXXTT int DLL_CPREFIX surf_nspecies(int i); - EEXXTT int DLL_CPREFIX surf_freezespecies(int i); - EEXXTT int DLL_CPREFIX surf_setcoverages(int i, double* c); - EEXXTT int DLL_CPREFIX surf_getcoverages(int i, double* c); - EEXXTT int DLL_CPREFIX surf_setconcentrations(int i, double* c); - EEXXTT int DLL_CPREFIX surf_getconcentrations(int i, double* c); - EEXXTT int DLL_CPREFIX surf_setsitedensity(int i, double s0); - EEXXTT double DLL_CPREFIX surf_sitedensity(int i); - EEXXTT int DLL_CPREFIX surf_doc(int i, char* key, char* value); + CANTERA_CAPI int surfphase_new(); + CANTERA_CAPI int surf_del(int i); + CANTERA_CAPI int surf_copy(int i); + CANTERA_CAPI int surf_assign(int i, int j); + CANTERA_CAPI int surf_addspecies(int i, char* nm, double sz); + CANTERA_CAPI int surf_nspecies(int i); + CANTERA_CAPI int surf_freezespecies(int i); + CANTERA_CAPI int surf_setcoverages(int i, double* c); + CANTERA_CAPI int surf_getcoverages(int i, double* c); + CANTERA_CAPI int surf_setconcentrations(int i, double* c); + CANTERA_CAPI int surf_getconcentrations(int i, double* c); + CANTERA_CAPI int surf_setsitedensity(int i, double s0); + CANTERA_CAPI double surf_sitedensity(int i); + CANTERA_CAPI int surf_doc(int i, char* key, char* value); - EEXXTT int DLL_CPREFIX surfkin_new(int iph, int ith1, int ith2); - EEXXTT int DLL_CPREFIX surfkin_del(int i); - EEXXTT int DLL_CPREFIX surfkin_addreaction(int i, int nr, int* r, + CANTERA_CAPI int surfkin_new(int iph, int ith1, int ith2); + CANTERA_CAPI int surfkin_del(int i); + CANTERA_CAPI int surfkin_addreaction(int i, int nr, int* r, int* rst, int* ro, int np, int* p, int* pst, int nrate, double* rateParams); - EEXXTT int DLL_CPREFIX surfkin_nreactions(int i); - EEXXTT int DLL_CPREFIX surfkin_getratesofprogress(int i, double* rop); - EEXXTT int DLL_CPREFIX surfkin_getnetproductionrates(int i, double* sdot); - EEXXTT int DLL_CPREFIX surfkin_integrate(int i, double dt); - EEXXTT int DLL_CPREFIX surfkin_save(int i, char* fname, char* id, char* comment); + CANTERA_CAPI int surfkin_nreactions(int i); + CANTERA_CAPI int surfkin_getratesofprogress(int i, double* rop); + CANTERA_CAPI int surfkin_getnetproductionrates(int i, double* sdot); + CANTERA_CAPI int surfkin_integrate(int i, double dt); + CANTERA_CAPI int surfkin_save(int i, char* fname, char* id, char* comment); - EEXXTT int DLL_CPREFIX surface_settolerances(int i, int nr, + CANTERA_CAPI int surface_settolerances(int i, int nr, double* rtol, int na, double* atol); - EEXXTT int DLL_CPREFIX surface_fixspecies(int i, int k, double c=-1.0); - EEXXTT int DLL_CPREFIX surface_solvespecies(int i, int k); - EEXXTT int DLL_CPREFIX surface_setmultiplier(int i, int k, double f); - EEXXTT double DLL_CPREFIX surface_multiplier(int i, int k); - EEXXTT double DLL_CPREFIX surface_temperature(int i); - EEXXTT int DLL_CPREFIX surface_settemperature(int i, double t); - EEXXTT int DLL_CPREFIX surface_setcoverages(int i, double* c); - EEXXTT int DLL_EXPORT surf_setcoveragesbyname(int i, char* c); + CANTERA_CAPI int surface_fixspecies(int i, int k, double c=-1.0); + CANTERA_CAPI int surface_solvespecies(int i, int k); + CANTERA_CAPI int surface_setmultiplier(int i, int k, double f); + CANTERA_CAPI double surface_multiplier(int i, int k); + CANTERA_CAPI double surface_temperature(int i); + CANTERA_CAPI int surface_settemperature(int i, double t); + CANTERA_CAPI int surface_setcoverages(int i, double* c); + CANTERA_CAPI int surf_setcoveragesbyname(int i, char* c); } #endif diff --git a/src/clib/ctxml.cpp b/src/clib/ctxml.cpp index 4621faeed..be18299fc 100644 --- a/src/clib/ctxml.cpp +++ b/src/clib/ctxml.cpp @@ -19,7 +19,7 @@ template<> XmlCabinet* XmlCabinet::__storage = 0; extern "C" { - int DLL_EXPORT xml_new(const char* name = 0) + int xml_new(const char* name = 0) { XML_Node* x; if (!name) { @@ -30,7 +30,7 @@ extern "C" { return XmlCabinet::add(x); } - int DLL_EXPORT xml_get_XML_File(const char* file, int debug) + int xml_get_XML_File(const char* file, int debug) { try { XML_Node* x = get_XML_File(std::string(file), debug); @@ -40,7 +40,7 @@ extern "C" { } } - int DLL_EXPORT xml_clear() + int xml_clear() { try { XmlCabinet::clear(); @@ -51,29 +51,29 @@ extern "C" { } } - int DLL_EXPORT xml_del(int i) + int xml_del(int i) { XmlCabinet::del(i); return 0; } - int DLL_EXPORT xml_removeChild(int i, int j) + int xml_removeChild(int i, int j) { XmlCabinet::item(i).removeChild(&XmlCabinet::item(j)); return 0; } - int DLL_EXPORT xml_copy(int i) + int xml_copy(int i) { return XmlCabinet::newCopy(i); } - int DLL_EXPORT xml_assign(int i, int j) + int xml_assign(int i, int j) { return XmlCabinet::assign(i,j); } - int DLL_EXPORT xml_build(int i, const char* file) + int xml_build(int i, const char* file) { try { writelog("WARNING: xml_build called. Use get_XML_File instead."); @@ -91,7 +91,7 @@ extern "C" { } } - int DLL_EXPORT xml_preprocess_and_build(int i, const char* file, int debug) + int xml_preprocess_and_build(int i, const char* file, int debug) { try { get_CTML_Tree(&XmlCabinet::item(i), string(file), debug); @@ -103,7 +103,7 @@ extern "C" { - int DLL_EXPORT xml_attrib(int i, const char* key, char* value) + int xml_attrib(int i, const char* key, char* value) { try { string ky = string(key); @@ -120,7 +120,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_addAttrib(int i, const char* key, const char* value) + int xml_addAttrib(int i, const char* key, const char* value) { try { string ky = string(key); @@ -133,7 +133,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_addComment(int i, const char* comment) + int xml_addComment(int i, const char* comment) { try { string c = string(comment); @@ -145,7 +145,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_tag(int i, char* tag) + int xml_tag(int i, char* tag) { try { XML_Node& node = XmlCabinet::item(i); @@ -157,7 +157,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_value(int i, char* value) + int xml_value(int i, char* value) { try { XML_Node& node = XmlCabinet::item(i); @@ -169,7 +169,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_child(int i, const char* loc) + int xml_child(int i, const char* loc) { try { XML_Node& node = XmlCabinet::item(i); @@ -181,7 +181,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_child_bynumber(int i, int m) + int xml_child_bynumber(int i, int m) { try { XML_Node& node = XmlCabinet::item(i); @@ -193,7 +193,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_findID(int i, const char* id) + int xml_findID(int i, const char* id) { try { XML_Node& node = XmlCabinet::item(i); @@ -209,7 +209,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_findByName(int i, const char* nm) + int xml_findByName(int i, const char* nm) { try { XML_Node& node = XmlCabinet::item(i); @@ -225,7 +225,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_nChildren(int i) + int xml_nChildren(int i) { try { XML_Node& node = XmlCabinet::item(i); @@ -235,7 +235,7 @@ extern "C" { } } - int DLL_EXPORT xml_addChild(int i, const char* name, const char* value) + int xml_addChild(int i, const char* name, const char* value) { try { XML_Node& node = XmlCabinet::item(i); @@ -248,7 +248,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_addChildNode(int i, int j) + int xml_addChildNode(int i, int j) { try { XML_Node& node = XmlCabinet::item(i); @@ -261,7 +261,7 @@ extern "C" { return 0; } - int DLL_EXPORT xml_write(int i, const char* file) + int xml_write(int i, const char* file) { try { ofstream f(file); @@ -279,7 +279,7 @@ extern "C" { return 0; } - int DLL_EXPORT ctml_getFloatArray(int i, size_t n, doublereal* data, int iconvert) + int ctml_getFloatArray(int i, size_t n, doublereal* data, int iconvert) { try { XML_Node& node = XmlCabinet::item(i); diff --git a/src/clib/ctxml.h b/src/clib/ctxml.h index 421c29a72..85b26f0e3 100644 --- a/src/clib/ctxml.h +++ b/src/clib/ctxml.h @@ -13,30 +13,29 @@ #endif extern "C" { - - EEXXTT int DLL_CPREFIX xml_new(const char* name); - EEXXTT int DLL_CPREFIX xml_get_XML_File(const char* file, int debug = 0); - EEXXTT int DLL_CPREFIX xml_del(int i); - EEXXTT int DLL_CPREFIX xml_clear(); - EEXXTT int DLL_CPREFIX xml_copy(int i); - EEXXTT int DLL_CPREFIX xml_assign(int i, int j); - EEXXTT int DLL_CPREFIX xml_build(int i, const char* file); - EEXXTT int DLL_CPREFIX xml_preprocess_and_build(int i, const char* file, int debug); - EEXXTT int DLL_CPREFIX xml_attrib(int i, const char* key, char* value); - EEXXTT int DLL_CPREFIX xml_addAttrib(int i, const char* key, const char* value); - EEXXTT int DLL_CPREFIX xml_addComment(int i, const char* comment); - EEXXTT int DLL_CPREFIX xml_value(int i, char* value); - EEXXTT int DLL_CPREFIX xml_tag(int i, char* tag); - EEXXTT int DLL_CPREFIX xml_child(int i, const char* loc); - EEXXTT int DLL_CPREFIX xml_child_bynumber(int i, int m); - EEXXTT int DLL_CPREFIX xml_findID(int i, const char* id); - EEXXTT int DLL_CPREFIX xml_findByName(int i, const char* nm); - EEXXTT int DLL_CPREFIX xml_nChildren(int i); - EEXXTT int DLL_CPREFIX xml_addChild(int i, const char* name, const char* value); - EEXXTT int DLL_CPREFIX xml_addChildNode(int i, int j); - EEXXTT int DLL_CPREFIX xml_write(int i, const char* file); - EEXXTT int DLL_CPREFIX xml_removeChild(int i, int j); - EEXXTT int DLL_CPREFIX ctml_getFloatArray(int i, size_t n, double* data, int iconvert=0); + CANTERA_CAPI int xml_new(const char* name); + CANTERA_CAPI int xml_get_XML_File(const char* file, int debug = 0); + CANTERA_CAPI int xml_del(int i); + CANTERA_CAPI int xml_clear(); + CANTERA_CAPI int xml_copy(int i); + CANTERA_CAPI int xml_assign(int i, int j); + CANTERA_CAPI int xml_build(int i, const char* file); + CANTERA_CAPI int xml_preprocess_and_build(int i, const char* file, int debug); + CANTERA_CAPI int xml_attrib(int i, const char* key, char* value); + CANTERA_CAPI int xml_addAttrib(int i, const char* key, const char* value); + CANTERA_CAPI int xml_addComment(int i, const char* comment); + CANTERA_CAPI int xml_value(int i, char* value); + CANTERA_CAPI int xml_tag(int i, char* tag); + CANTERA_CAPI int xml_child(int i, const char* loc); + CANTERA_CAPI int xml_child_bynumber(int i, int m); + CANTERA_CAPI int xml_findID(int i, const char* id); + CANTERA_CAPI int xml_findByName(int i, const char* nm); + CANTERA_CAPI int xml_nChildren(int i); + CANTERA_CAPI int xml_addChild(int i, const char* name, const char* value); + CANTERA_CAPI int xml_addChildNode(int i, int j); + CANTERA_CAPI int xml_write(int i, const char* file); + CANTERA_CAPI int xml_removeChild(int i, int j); + CANTERA_CAPI int ctml_getFloatArray(int i, size_t n, double* data, int iconvert=0); } #endif diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index ce9044446..331211b6f 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -17,7 +17,7 @@ #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/thermo/PureFluidPhase.h" -#include "flib_defs.h" +#include "clib/clib_defs.h" using namespace Cantera; @@ -26,6 +26,8 @@ typedef Cabinet ThermoCabinet; typedef Cabinet KineticsCabinet; typedef Cabinet TransportCabinet; +typedef integer status_t; + inline XML_Node* _xml(const integer* n) { return &XmlCabinet::item(*n); @@ -95,7 +97,7 @@ extern "C" { //--------------- Phase ---------------------// - status_t DLL_EXPORT phase_getname_(const integer* n, char* nm, + status_t phase_getname_(const integer* n, char* nm, ftnlen lennm) { try { @@ -112,84 +114,84 @@ extern "C" { } } - integer DLL_EXPORT phase_nelements_(const integer* n) + integer phase_nelements_(const integer* n) { return _fph(n)->nElements(); } - integer DLL_EXPORT phase_nspecies_(const integer* n) + integer phase_nspecies_(const integer* n) { return _fph(n)->nSpecies(); } - doublereal DLL_EXPORT phase_temperature_(const integer* n) + doublereal phase_temperature_(const integer* n) { return _fph(n)->temperature(); } - status_t DLL_EXPORT phase_settemperature_(const integer* n, doublereal* t) + status_t phase_settemperature_(const integer* n, doublereal* t) { _fph(n)->setTemperature(*t); return 0; } - doublereal DLL_EXPORT phase_density_(const integer* n) + doublereal phase_density_(const integer* n) { return _fph(n)->density(); } - status_t DLL_EXPORT phase_setdensity_(const integer* n, doublereal* rho) + status_t phase_setdensity_(const integer* n, doublereal* rho) { _fph(n)->setDensity(*rho); return 0; } - doublereal DLL_EXPORT phase_molardensity_(const integer* n) + doublereal phase_molardensity_(const integer* n) { return _fph(n)->molarDensity(); } - doublereal DLL_EXPORT phase_meanmolecularweight_(const integer* n) + doublereal phase_meanmolecularweight_(const integer* n) { return _fph(n)->meanMolecularWeight(); } - integer DLL_EXPORT phase_elementindex_(const integer* n, char* nm, ftnlen lennm) + integer phase_elementindex_(const integer* n, char* nm, ftnlen lennm) { std::string elnm = f2string(nm, lennm); return _fph(n)->elementIndex(elnm) + 1; } - integer DLL_EXPORT phase_speciesindex_(const integer* n, char* nm, ftnlen lennm) + integer phase_speciesindex_(const integer* n, char* nm, ftnlen lennm) { std::string spnm = f2string(nm, lennm); return _fph(n)->speciesIndex(spnm) + 1; } - status_t DLL_EXPORT phase_getmolefractions_(const integer* n, doublereal* x) + status_t phase_getmolefractions_(const integer* n, doublereal* x) { _fph(n)->getMoleFractions(x); return 0; } - doublereal DLL_EXPORT phase_molefraction_(const integer* n, integer* k) + doublereal phase_molefraction_(const integer* n, integer* k) { return _fph(n)->moleFraction(*k-1); } - status_t DLL_EXPORT phase_getmassfractions_(const integer* n, doublereal* y) + status_t phase_getmassfractions_(const integer* n, doublereal* y) { ThermoPhase* p = _fph(n); p->getMassFractions(y); return 0; } - doublereal DLL_EXPORT phase_massfraction_(const integer* n, integer* k) + doublereal phase_massfraction_(const integer* n, integer* k) { return _fph(n)->massFraction(*k-1); } - status_t DLL_EXPORT phase_setmolefractions_(const integer* n, double* x, const integer* norm) + status_t phase_setmolefractions_(const integer* n, double* x, const integer* norm) { ThermoPhase* p = _fph(n); if (*norm) { @@ -200,7 +202,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT phase_setmolefractionsbyname_(const integer* n, char* x, ftnlen lx) + status_t phase_setmolefractionsbyname_(const integer* n, char* x, ftnlen lx) { try { ThermoPhase* p = _fph(n); @@ -218,7 +220,7 @@ extern "C" { } } - status_t DLL_EXPORT phase_setmassfractions_(const integer* n, doublereal* y, const integer* norm) + status_t phase_setmassfractions_(const integer* n, doublereal* y, const integer* norm) { ThermoPhase* p = _fph(n); if (*norm) { @@ -229,7 +231,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT phase_setmassfractionsbyname_(const integer* n, char* y, ftnlen leny) + status_t phase_setmassfractionsbyname_(const integer* n, char* y, ftnlen leny) { try { ThermoPhase* p = _fph(n); @@ -247,7 +249,7 @@ extern "C" { } } - status_t DLL_EXPORT phase_getatomicweights_(const integer* n, doublereal* atw) + status_t phase_getatomicweights_(const integer* n, doublereal* atw) { ThermoPhase* p = _fph(n); const vector_fp& wt = p->atomicWeights(); @@ -255,7 +257,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT phase_getmolecularweights_(const integer* n, doublereal* mw) + status_t phase_getmolecularweights_(const integer* n, doublereal* mw) { ThermoPhase* p = _fph(n); const vector_fp& wt = p->molecularWeights(); @@ -264,7 +266,7 @@ extern "C" { } - status_t DLL_EXPORT phase_getspeciesname_(const integer* n, integer* k, char* nm, ftnlen lennm) + status_t phase_getspeciesname_(const integer* n, integer* k, char* nm, ftnlen lennm) { try { std::string spnm = _fph(n)->speciesName(*k-1); @@ -280,7 +282,7 @@ extern "C" { } } - status_t DLL_EXPORT phase_getelementname_(const integer* n, integer* m, char* nm, ftnlen lennm) + status_t phase_getelementname_(const integer* n, integer* m, char* nm, ftnlen lennm) { try { std::string elnm = _fph(n)->elementName(*m-1); @@ -297,7 +299,7 @@ extern "C" { } - doublereal DLL_EXPORT phase_natoms_(const integer* n, integer* k, integer* m) + doublereal phase_natoms_(const integer* n, integer* k, integer* m) { try { return _fph(n)->nAtoms(*k-1,*m-1); @@ -312,7 +314,7 @@ extern "C" { //-------------- Thermo --------------------// - integer DLL_EXPORT newthermofromxml_(integer* mxml) + integer newthermofromxml_(integer* mxml) { try { XML_Node* x = _xml(mxml); @@ -324,17 +326,17 @@ extern "C" { } } - integer DLL_EXPORT th_nspecies_(const integer* n) + integer th_nspecies_(const integer* n) { return _fth(n)->nSpecies(); } - integer DLL_EXPORT th_eostype_(const integer* n) + integer th_eostype_(const integer* n) { return _fth(n)->eosType(); } - doublereal DLL_EXPORT th_enthalpy_mole_(const integer* n) + doublereal th_enthalpy_mole_(const integer* n) { try { return _fth(n)->enthalpy_mole(); @@ -344,7 +346,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_intenergy_mole_(const integer* n) + doublereal th_intenergy_mole_(const integer* n) { try { return _fth(n)->intEnergy_mole(); @@ -354,7 +356,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_entropy_mole_(const integer* n) + doublereal th_entropy_mole_(const integer* n) { try { return _fth(n)->entropy_mole(); @@ -364,7 +366,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_gibbs_mole_(const integer* n) + doublereal th_gibbs_mole_(const integer* n) { try { return _fth(n)->gibbs_mole(); @@ -374,7 +376,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_cp_mole_(const integer* n) + doublereal th_cp_mole_(const integer* n) { try { return _fth(n)->cp_mole(); @@ -384,7 +386,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_cv_mole_(const integer* n) + doublereal th_cv_mole_(const integer* n) { try { return _fth(n)->cv_mole(); @@ -394,7 +396,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_pressure_(const integer* n) + doublereal th_pressure_(const integer* n) { try { return _fth(n)->pressure(); @@ -404,7 +406,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_enthalpy_mass_(const integer* n) + doublereal th_enthalpy_mass_(const integer* n) { try { return _fth(n)->enthalpy_mass(); @@ -414,7 +416,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_intenergy_mass_(const integer* n) + doublereal th_intenergy_mass_(const integer* n) { try { return _fth(n)->intEnergy_mass(); @@ -424,7 +426,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_entropy_mass_(const integer* n) + doublereal th_entropy_mass_(const integer* n) { try { return _fth(n)->entropy_mass(); @@ -434,7 +436,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_gibbs_mass_(const integer* n) + doublereal th_gibbs_mass_(const integer* n) { try { return _fth(n)->gibbs_mass(); @@ -444,7 +446,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_cp_mass_(const integer* n) + doublereal th_cp_mass_(const integer* n) { try { return _fth(n)->cp_mass(); @@ -454,7 +456,7 @@ extern "C" { } } - doublereal DLL_EXPORT th_cv_mass_(const integer* n) + doublereal th_cv_mass_(const integer* n) { try { return _fth(n)->cv_mass(); @@ -464,14 +466,14 @@ extern "C" { } } - status_t DLL_EXPORT th_chempotentials_(const integer* n, doublereal* murt) + status_t th_chempotentials_(const integer* n, doublereal* murt) { thermo_t* thrm = _fth(n); thrm->getChemPotentials(murt); return 0; } - status_t DLL_EXPORT th_setpressure_(const integer* n, doublereal* p) + status_t th_setpressure_(const integer* n, doublereal* p) { try { _fth(n)->setPressure(*p); @@ -482,7 +484,7 @@ extern "C" { } } - status_t DLL_EXPORT th_set_hp_(const integer* n, doublereal* v1, doublereal* v2) + status_t th_set_hp_(const integer* n, doublereal* v1, doublereal* v2) { try { _fth(n)->setState_HP(*v1, *v2); @@ -493,7 +495,7 @@ extern "C" { } } - status_t DLL_EXPORT th_set_uv_(const integer* n, doublereal* v1, doublereal* v2) + status_t th_set_uv_(const integer* n, doublereal* v1, doublereal* v2) { try { _fth(n)->setState_UV(*v1, *v2); @@ -504,7 +506,7 @@ extern "C" { } } - status_t DLL_EXPORT th_set_sv_(const integer* n, doublereal* v1, doublereal* v2) + status_t th_set_sv_(const integer* n, doublereal* v1, doublereal* v2) { try { _fth(n)->setState_SV(*v1, *v2); @@ -515,7 +517,7 @@ extern "C" { } } - status_t DLL_EXPORT th_set_sp_(const integer* n, doublereal* v1, doublereal* v2) + status_t th_set_sp_(const integer* n, doublereal* v1, doublereal* v2) { try { _fth(n)->setState_SP(*v1, *v2); @@ -526,7 +528,7 @@ extern "C" { } } - status_t DLL_EXPORT th_equil_(const integer* n, char* XY, ftnlen lenxy) + status_t th_equil_(const integer* n, char* XY, ftnlen lenxy) { try { equilibrate(*_fth(n), f2string(XY,lenxy).c_str()); @@ -537,37 +539,37 @@ extern "C" { } } - doublereal DLL_EXPORT th_refpressure_(const integer* n) + doublereal th_refpressure_(const integer* n) { return _fth(n)->refPressure(); } - doublereal DLL_EXPORT th_mintemp_(const integer* n, integer* k) + doublereal th_mintemp_(const integer* n, integer* k) { return _fth(n)->minTemp(*k-1); } - doublereal DLL_EXPORT th_maxtemp_(const integer* n, integer* k) + doublereal th_maxtemp_(const integer* n, integer* k) { return _fth(n)->maxTemp(*k-1); } - status_t DLL_EXPORT th_getenthalpies_rt_(const integer* n, doublereal* h_rt) + status_t th_getenthalpies_rt_(const integer* n, doublereal* h_rt) { thermo_t* thrm = _fth(n); thrm->getEnthalpy_RT(h_rt); return 0; } - status_t DLL_EXPORT th_getentropies_r_(const integer* n, doublereal* s_r) + status_t th_getentropies_r_(const integer* n, doublereal* s_r) { thermo_t* thrm = _fth(n); thrm->getEntropy_R(s_r); return 0; } - status_t DLL_EXPORT th_getcp_r_(const integer* n, integer* lenm, doublereal* cp_r) + status_t th_getcp_r_(const integer* n, integer* lenm, doublereal* cp_r) { thermo_t* thrm = _fth(n); thrm->getCp_R(cp_r); @@ -577,7 +579,7 @@ extern "C" { //-------------- Kinetics ------------------// - integer DLL_EXPORT newkineticsfromxml_(integer* mxml, integer* iphase, + integer newkineticsfromxml_(integer* mxml, integer* iphase, const integer* neighbor1, const integer* neighbor2, const integer* neighbor3, const integer* neighbor4) { @@ -610,7 +612,7 @@ extern "C" { } } - // status_t DLL_EXPORT installRxnArrays_(integer* pxml, integer* ikin, + // status_t installRxnArrays_(integer* pxml, integer* ikin, // char* default_phase) { // try { // XML_Node* p = _xml(pxml); @@ -623,17 +625,17 @@ extern "C" { // } //------------------------------------- - integer DLL_EXPORT kin_type_(const integer* n) + integer kin_type_(const integer* n) { return _fkin(n)->type(); } - integer DLL_EXPORT kin_start_(const integer* n, integer* p) + integer kin_start_(const integer* n, integer* p) { return _fkin(n)->start(*p)+1; } - integer DLL_EXPORT kin_speciesindex_(const integer* n, const char* nm, const char* ph, + integer kin_speciesindex_(const integer* n, const char* nm, const char* ph, ftnlen lennm, ftnlen lenph) { return _fkin(n)->kineticsSpeciesIndex(f2string(nm, lennm), f2string(ph, lenph))+1; @@ -641,43 +643,43 @@ extern "C" { //--------------------------------------- - integer DLL_EXPORT kin_ntotalspecies_(const integer* n) + integer kin_ntotalspecies_(const integer* n) { return _fkin(n)->nTotalSpecies(); } - integer DLL_EXPORT kin_nreactions_(const integer* n) + integer kin_nreactions_(const integer* n) { return _fkin(n)->nReactions(); } - integer DLL_EXPORT kin_nphases_(const integer* n) + integer kin_nphases_(const integer* n) { return _fkin(n)->nPhases(); } - integer DLL_EXPORT kin_phaseindex_(const integer* n, const char* ph, + integer kin_phaseindex_(const integer* n, const char* ph, ftnlen lenph) { return _fkin(n)->phaseIndex(f2string(ph, lenph)); } - doublereal DLL_EXPORT kin_reactantstoichcoeff_(const integer* n, integer* k, integer* i) + doublereal kin_reactantstoichcoeff_(const integer* n, integer* k, integer* i) { return _fkin(n)->reactantStoichCoeff(*k-1,*i-1); } - doublereal DLL_EXPORT kin_productstoichcoeff_(const integer* n, integer* k, integer* i) + doublereal kin_productstoichcoeff_(const integer* n, integer* k, integer* i) { return _fkin(n)->productStoichCoeff(*k-1,*i-1); } - integer DLL_EXPORT kin_reactiontype_(const integer* n, integer* i) + integer kin_reactiontype_(const integer* n, integer* i) { return _fkin(n)->reactionType(*i-1); } - status_t DLL_EXPORT kin_getfwdratesofprogress_(const integer* n, doublereal* fwdROP) + status_t kin_getfwdratesofprogress_(const integer* n, doublereal* fwdROP) { Kinetics* k = _fkin(n); try { @@ -689,7 +691,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_getrevratesofprogress_(const integer* n, doublereal* revROP) + status_t kin_getrevratesofprogress_(const integer* n, doublereal* revROP) { Kinetics* k = _fkin(n); try { @@ -701,12 +703,12 @@ extern "C" { } } - integer DLL_EXPORT kin_isreversible_(const integer* n, integer* i) + integer kin_isreversible_(const integer* n, integer* i) { return (int)_fkin(n)->isReversible(*i); } - status_t DLL_EXPORT kin_getnetratesofprogress_(const integer* n, doublereal* netROP) + status_t kin_getnetratesofprogress_(const integer* n, doublereal* netROP) { try { Kinetics* k = _fkin(n); @@ -718,7 +720,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_getcreationrates_(const integer* n, doublereal* cdot) + status_t kin_getcreationrates_(const integer* n, doublereal* cdot) { try { Kinetics* k = _fkin(n); @@ -730,7 +732,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_getdestructionrates_(const integer* n, doublereal* ddot) + status_t kin_getdestructionrates_(const integer* n, doublereal* ddot) { try { Kinetics* k = _fkin(n); @@ -742,7 +744,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_getnetproductionrates_(const integer* n, doublereal* wdot) + status_t kin_getnetproductionrates_(const integer* n, doublereal* wdot) { try { Kinetics* k = _fkin(n); @@ -754,12 +756,12 @@ extern "C" { } } - doublereal DLL_EXPORT kin_multiplier_(const integer* n, integer* i) + doublereal kin_multiplier_(const integer* n, integer* i) { return _fkin(n)->multiplier(*i); } - status_t DLL_EXPORT kin_getequilibriumconstants_(const integer* n, doublereal* kc) + status_t kin_getequilibriumconstants_(const integer* n, doublereal* kc) { try { Kinetics* k = _fkin(n); @@ -771,7 +773,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_getreactionstring_(const integer* n, integer* i, char* buf, ftnlen lenbuf) + status_t kin_getreactionstring_(const integer* n, integer* i, char* buf, ftnlen lenbuf) { try { Kinetics* k = _fkin(n); @@ -788,7 +790,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_setmultiplier_(const integer* n, integer* i, doublereal* v) + status_t kin_setmultiplier_(const integer* n, integer* i, doublereal* v) { try { _fkin(n)->setMultiplier(*i-1,*v); @@ -799,7 +801,7 @@ extern "C" { } } - status_t DLL_EXPORT kin_advancecoverages_(const integer* n, doublereal* tstep) + status_t kin_advancecoverages_(const integer* n, doublereal* tstep) { try { Kinetics* k = _fkin(n); @@ -818,7 +820,7 @@ extern "C" { //------------------- Transport --------------------------- - integer DLL_EXPORT newtransport_(char* model, + integer newtransport_(char* model, integer* ith, integer* loglevel, ftnlen lenmodel) { std::string mstr = f2string(model, lenmodel); @@ -832,7 +834,7 @@ extern "C" { } } - doublereal DLL_EXPORT trans_viscosity_(const integer* n) + doublereal trans_viscosity_(const integer* n) { try { return _ftrans(n)->viscosity(); @@ -842,7 +844,7 @@ extern "C" { } } - doublereal DLL_EXPORT trans_thermalconductivity_(const integer* n) + doublereal trans_thermalconductivity_(const integer* n) { try { return _ftrans(n)->thermalConductivity(); @@ -852,7 +854,7 @@ extern "C" { } } - status_t DLL_EXPORT trans_getthermaldiffcoeffs_(const integer* n, doublereal* dt) + status_t trans_getthermaldiffcoeffs_(const integer* n, doublereal* dt) { try { _ftrans(n)->getThermalDiffCoeffs(dt); @@ -863,7 +865,7 @@ extern "C" { } } - status_t DLL_EXPORT trans_getmixdiffcoeffs_(const integer* n, doublereal* d) + status_t trans_getmixdiffcoeffs_(const integer* n, doublereal* d) { try { _ftrans(n)->getMixDiffCoeffs(d); @@ -874,7 +876,7 @@ extern "C" { } } - status_t DLL_EXPORT trans_getbindiffcoeffs_(const integer* n, integer* ld, doublereal* d) + status_t trans_getbindiffcoeffs_(const integer* n, integer* ld, doublereal* d) { try { _ftrans(n)->getBinaryDiffCoeffs(*ld,d); @@ -885,7 +887,7 @@ extern "C" { } } - status_t DLL_EXPORT trans_getmultidiffcoeffs_(const integer* n, integer* ld, doublereal* d) + status_t trans_getmultidiffcoeffs_(const integer* n, integer* ld, doublereal* d) { try { _ftrans(n)->getMultiDiffCoeffs(*ld,d); @@ -896,7 +898,7 @@ extern "C" { } } - status_t DLL_EXPORT trans_setparameters_(const integer* n, integer* type, integer* k, doublereal* d) + status_t trans_setparameters_(const integer* n, integer* type, integer* k, doublereal* d) { try { _ftrans(n)->setParameters(*type, *k, d); @@ -909,7 +911,7 @@ extern "C" { //-------------------- Functions --------------------------- - // status_t DLL_EXPORT import_phase_(const integer* nth, const integer* nxml, char* id, ftnlen lenid) { + // status_t import_phase_(const integer* nth, const integer* nxml, char* id, ftnlen lenid) { // thermo_t* thrm = th(nth); // XML_Node* node = _xml(nxml); // string idstr = f2string(id, lenid); @@ -920,7 +922,7 @@ extern "C" { // catch (CanteraError) { handleError(); return -1; } // } - // status_t DLL_EXPORT import_kinetics_(const integer* nxml, char* id, + // status_t import_kinetics_(const integer* nxml, char* id, // const integer* nphases, integer* ith, const integer* nkin, ftnlen lenid) { // vector phases; // for (int i = 0; i < nphases; i++) { @@ -937,7 +939,7 @@ extern "C" { // } - status_t DLL_EXPORT ctphase_report_(const integer* nth, + status_t ctphase_report_(const integer* nth, char* buf, integer* show_thermo, ftnlen buflen) { try { @@ -958,7 +960,7 @@ extern "C" { } } - status_t DLL_EXPORT ctgetcanteraerror_(char* buf, ftnlen buflen) + status_t ctgetcanteraerror_(char* buf, ftnlen buflen) { std::string e; // = ""; //if (nErrors() > 0) @@ -971,14 +973,14 @@ extern "C" { return 0; } - status_t DLL_EXPORT ctaddcanteradirectory_(integer* buflen, char* buf) + status_t ctaddcanteradirectory_(integer* buflen, char* buf) { addDirectory(std::string(buf)); return 0; } - status_t DLL_EXPORT ctbuildsolutionfromxml(char* src, integer* ixml, char* id, + status_t ctbuildsolutionfromxml(char* src, integer* ixml, char* id, integer* ith, integer* ikin, ftnlen lensrc, ftnlen lenid) { diff --git a/src/fortran/fctxml.cpp b/src/fortran/fctxml.cpp index 7502ce24b..6f62b98ce 100644 --- a/src/fortran/fctxml.cpp +++ b/src/fortran/fctxml.cpp @@ -5,8 +5,7 @@ // Copyright 2001 California Institute of Technology -#include "flib_defs.h" - +#include "clib/clib_defs.h" #include "cantera/base/ctml.h" #include @@ -21,6 +20,8 @@ using Cantera::CanteraError; typedef Cabinet XmlCabinet; template<> XmlCabinet* XmlCabinet::__storage = 0; +typedef integer status_t; + inline XML_Node* _xml(const integer* i) { return &XmlCabinet::item(*i); @@ -35,7 +36,7 @@ std::string f2string(const char* s, ftnlen n); extern "C" { - integer DLL_EXPORT fxml_new_(const char* name, ftnlen namelen) + integer fxml_new_(const char* name, ftnlen namelen) { XML_Node* x; if (!name) { @@ -46,7 +47,7 @@ extern "C" { return XmlCabinet::add(x); } - status_t DLL_EXPORT fxml_get_xml_file_(const char* file, ftnlen filelen) + status_t fxml_get_xml_file_(const char* file, ftnlen filelen) { try { XML_Node* x = Cantera::get_XML_File(f2string(file, filelen)); @@ -58,7 +59,7 @@ extern "C" { } } - status_t DLL_EXPORT fxml_clear_() + status_t fxml_clear_() { try { XmlCabinet::clear(); @@ -70,29 +71,29 @@ extern "C" { } } - status_t DLL_EXPORT fxml_del_(const integer* i) + status_t fxml_del_(const integer* i) { XmlCabinet::del(*i); return 0; } - status_t DLL_EXPORT fxml_removechild_(const integer* i, const integer* j) + status_t fxml_removechild_(const integer* i, const integer* j) { _xml(i)->removeChild(_xml(j)); return 0; } - status_t DLL_EXPORT fxml_copy_(const integer* i) + status_t fxml_copy_(const integer* i) { return XmlCabinet::newCopy(*i); } - status_t DLL_EXPORT fxml_assign_(const integer* i, const integer* j) + status_t fxml_assign_(const integer* i, const integer* j) { return XmlCabinet::assign(*i,*j); } - status_t DLL_EXPORT fxml_attrib_(const integer* i, const char* key, + status_t fxml_attrib_(const integer* i, const char* key, char* value, ftnlen keylen, ftnlen valuelen) { try { @@ -110,7 +111,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_addattrib_(const integer* i, + status_t fxml_addattrib_(const integer* i, const char* key, const char* value, ftnlen keylen, ftnlen valuelen) { try { @@ -124,7 +125,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_addcomment_(const integer* i, const char* comment, + status_t fxml_addcomment_(const integer* i, const char* comment, ftnlen commentlen) { try { @@ -137,7 +138,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_tag_(const integer* i, char* tag, ftnlen taglen) + status_t fxml_tag_(const integer* i, char* tag, ftnlen taglen) { try { XML_Node& node = *_xml(i); @@ -149,7 +150,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_value_(const integer* i, char* value, ftnlen valuelen) + status_t fxml_value_(const integer* i, char* value, ftnlen valuelen) { try { XML_Node& node = *_xml(i); @@ -161,7 +162,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_child_(const integer* i, const char* loc, ftnlen loclen) + status_t fxml_child_(const integer* i, const char* loc, ftnlen loclen) { try { XML_Node& node = *_xml(i); @@ -173,7 +174,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_child_bynumber_(const integer* i, const integer* m) + status_t fxml_child_bynumber_(const integer* i, const integer* m) { try { XML_Node& node = *_xml(i); @@ -185,7 +186,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_findid_(const integer* i, const char* id, ftnlen idlen) + status_t fxml_findid_(const integer* i, const char* id, ftnlen idlen) { try { XML_Node& node = *_xml(i); @@ -201,7 +202,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_findbyname_(const integer* i, const char* nm, ftnlen nmlen) + status_t fxml_findbyname_(const integer* i, const char* nm, ftnlen nmlen) { try { XML_Node& node = *_xml(i); @@ -217,7 +218,7 @@ extern "C" { return 0; } - integer DLL_EXPORT fxml_nchildren_(const integer* i) + integer fxml_nchildren_(const integer* i) { try { XML_Node& node = *_xml(i); @@ -228,7 +229,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_addchild_(const integer* i, const char* name, + status_t fxml_addchild_(const integer* i, const char* name, const char* value, ftnlen namelen, ftnlen valuelen) { try { @@ -242,7 +243,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_addchildnode_(const integer* i, const integer* j) + status_t fxml_addchildnode_(const integer* i, const integer* j) { try { XML_Node& node = *_xml(i); @@ -255,7 +256,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT fxml_write_(const integer* i, const char* file, ftnlen filelen) + status_t fxml_write_(const integer* i, const char* file, ftnlen filelen) { try { std::string ff(file, filelen); @@ -274,7 +275,7 @@ extern "C" { return 0; } - status_t DLL_EXPORT ctml_getfloatarray_(const integer* i, const integer* n, + status_t ctml_getfloatarray_(const integer* i, const integer* n, doublereal* data, const integer* iconvert) { try { diff --git a/src/fortran/flib_defs.h b/src/fortran/flib_defs.h deleted file mode 100644 index 470a46978..000000000 --- a/src/fortran/flib_defs.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef FCTC_DEFS_H -#define FCTC_DEFS_H - -// Build as a DLL under Windows -#ifdef _WIN32 -#define DLL_IMPORT __declspec(dllimport) -#define DLL_EXPORT __declspec(dllexport) -#else -#define DLL_EXPORT -#define DLL_IMPORT -#endif - -// Values returned for error conditions -#define ERR -999 -#define DERR -999.999 - -#include "cantera/base/config.h" - -typedef integer status_t; - -namespace Cantera {} -namespace std {} - -#endif diff --git a/src/fortran/genf.py b/src/fortran/genf.py index 9b48328e1..ea7b20bac 100644 --- a/src/fortran/genf.py +++ b/src/fortran/genf.py @@ -151,7 +151,7 @@ for line in lines: extern = 1 if extern: if not infunc: - if line.find('DLL_EXPORT') > 0: + if line.find('CANTERA_CAPI') > 0: infunc = 1 funcline = line elif infunc: @@ -185,7 +185,7 @@ for line in lines: extern = 1 if extern: if not infunc: - if line.find('DLL_EXPORT') > 0: + if line.find('CANTERA_CAPI') > 0: infunc = 1 funcline = line elif infunc: