research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

General commit of clib package.

Browse source 
Added checking of arguments.
  Added header info
This commit is contained in:
Harry Moffat 2009-07-11 17:16:09 +00:00
parent c245407535
commit fdfebcec37
24 changed files with 688 additions and 566 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cantera/clib/src/Cabinet.h
View file

@ -1,6 +1,10 @@
/**
* @file Cabinet.h
*/
/*
* $Id$
*/
#ifndef CT_CABINET_H
#define CT_CABINET_H

17
Cantera/clib/src/Storage.cpp
View file

@ -1,20 +1,21 @@
/**
* @file Storage.cpp
*/
/*
* $Id$
*/
// Build as a DLL under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
// Cantera includes
#include "Kinetics.h"
#include "TransportFactory.h"
#include "clib_defs.h"
#include "Storage.h"
using namespace std;
using namespace Cantera;
Storage::Storage() {
addThermo(new ThermoPhase);

7
Cantera/clib/src/Storage.h
View file

@ -1,3 +1,10 @@
/**
* @file Storage.h
*/
/*
* $Id$
*/
#ifndef CTC_STORAGE_H
#define CTC_STORAGE_H

31
Cantera/clib/src/clib_defs.h
View file

@ -1,8 +1,19 @@
/**
* @file clib_defs.h
*/
/*
* $Id$
*/
#ifndef CTC_DEFS_H
#define CTC_DEFS_H
// Build as a DLL under Windows
#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
@ -10,21 +21,35 @@
#define DLL_IMPORT __declspec(dllimport)
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4267)
#pragma warning(disable:4503)
#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
#endif
// Values returned for error conditions
#ifndef ERR
#define ERR -999
#endif
#ifndef DERR
#define DERR -999.999
#endif
namespace Cantera {}
using namespace Cantera;
//using namespace Cantera;
namespace std {}
using namespace std;
//using namespace std;
#endif

9
Cantera/clib/src/ct.cpp
View file

@ -1,4 +1,5 @@
/**
* @file ct.cpp
* Cantera interface library. This library of functions is designed
* to encapsulate Cantera functionality and make it available for
* use in languages and applications other than C++. A set of
@ -15,12 +16,14 @@
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ct.h"
// Cantera includes
#include "equil.h" //"ChemEquil.h"
#include "equil.h"
#include "KineticsFactory.h"
#include "TransportFactory.h"
#include "ctml.h"
//#include "importCTML.h"
#include "importKinetics.h"
#include "ThermoFactory.h"
#include "ck2ct.h"
@ -28,9 +31,7 @@
#include "Cabinet.h"
#include "InterfaceKinetics.h"
#include "PureFluidPhase.h"
//#include "xml.h"
#include "clib_defs.h"
using namespace std;
using namespace Cantera;

277
Cantera/clib/src/ct.h
View file

@ -1,170 +1,183 @@
/**
* @file ct.h
*/
/*
* $Id$
*/
#ifndef CTC_CT_H
#define CTC_CT_H
#include "clib_defs.h"
#ifdef CANTERA_USE_INTERNAL
#include "config.h"
#else
#include "cantera/config.h"
#endif
extern "C" {
int DLL_IMPORT ct_appdelete();
EEXXTT int DLL_CPREFIX ct_appdelete();
int DLL_IMPORT phase_nElements(int n);
int DLL_IMPORT phase_nSpecies(int n);
double DLL_IMPORT phase_temperature(int n);
int DLL_IMPORT phase_setTemperature(int n, double t);
double DLL_IMPORT phase_density(int n);
int DLL_IMPORT phase_setDensity(int n, double rho);
double DLL_IMPORT phase_molarDensity(int n);
int DLL_IMPORT phase_setMolarDensity(int n, double ndens);
double DLL_IMPORT phase_meanMolecularWeight(int n);
double DLL_IMPORT phase_moleFraction(int n, int k);
double DLL_IMPORT phase_massFraction(int n, int k);
int DLL_IMPORT phase_getMoleFractions(int n, int lenx, double* x);
int DLL_IMPORT phase_getMassFractions(int n, int leny, double* y);
int DLL_IMPORT phase_setMoleFractions(int n, int lenx,
EEXXTT int DLL_CPREFIX phase_nElements(int n);
EEXXTT int 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, int k);
EEXXTT double DLL_CPREFIX phase_massFraction(int n, int k);
EEXXTT int DLL_CPREFIX phase_getMoleFractions(int n, int lenx, double* x);
EEXXTT int DLL_CPREFIX phase_getMassFractions(int n, int leny, double* y);
EEXXTT int DLL_CPREFIX phase_setMoleFractions(int n, int lenx,
double* x, int norm);
int DLL_IMPORT phase_setMassFractions(int n, int leny,
EEXXTT int DLL_CPREFIX phase_setMassFractions(int n, int leny,
double* y, int norm);
int DLL_IMPORT phase_setMoleFractionsByName(int n, char* x);
int DLL_IMPORT phase_setMassFractionsByName(int n, char* y);
int DLL_IMPORT phase_getAtomicWeights(int n, int lenm, double* atw);
int DLL_IMPORT phase_getMolecularWeights(int n, int lenm, double* mw);
int DLL_IMPORT phase_getElementName(int n, int k, int lennm, char* nm);
int DLL_IMPORT phase_getSpeciesName(int n, int m, int lennm, char* nm);
int DLL_IMPORT phase_getName(int n, int lennm, char* nm);
int DLL_IMPORT phase_setName(int n, const char* nm);
int DLL_IMPORT phase_elementIndex(int n, char* nm);
int DLL_IMPORT phase_speciesIndex(int n, char* nm);
int DLL_IMPORT phase_report(int nth,
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, int lenm, double* atw);
EEXXTT int DLL_CPREFIX phase_getMolecularWeights(int n, int lenm, double* mw);
EEXXTT int DLL_CPREFIX phase_getElementName(int n, int k, int lennm, char* nm);
EEXXTT int DLL_CPREFIX phase_getSpeciesName(int n, int m, int lennm, char* nm);
EEXXTT int DLL_CPREFIX phase_getName(int n, int lennm, char* nm);
EEXXTT int DLL_CPREFIX phase_setName(int n, const char* nm);
EEXXTT int DLL_CPREFIX phase_elementIndex(int n, char* nm);
EEXXTT int DLL_CPREFIX phase_speciesIndex(int n, char* nm);
EEXXTT int DLL_CPREFIX phase_report(int nth,
int ibuf, char* buf, int show_thermo);
int DLL_EXPORT write_phase(int nth, int show_thermo);
EEXXTT int DLL_EXPORT write_phase(int nth, int show_thermo);
double DLL_IMPORT phase_nAtoms(int n, int k, int m);
EEXXTT double DLL_CPREFIX phase_nAtoms(int n, int k, int m);
int DLL_IMPORT phase_addElement(int n, char* name, double weight);
int DLL_IMPORT phase_addSpecies(int n, char* name, int phase,
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 DLL_IMPORT newThermo(char* model);
int DLL_IMPORT newThermoFromXML(int mxml);
int DLL_IMPORT th_thermoIndex(char* id);
int DLL_IMPORT th_phase(int n);
int DLL_IMPORT th_nSpecies(int n);
int DLL_IMPORT th_eosType(int n);
double DLL_IMPORT th_refPressure(int n);
double DLL_IMPORT th_minTemp(int n, int k=-1);
double DLL_IMPORT th_maxTemp(int n, int k=-1);
double DLL_IMPORT th_enthalpy_mole(int n);
double DLL_IMPORT th_intEnergy_mole(int n);
double DLL_IMPORT th_entropy_mole(int n);
double DLL_IMPORT th_gibbs_mole(int n);
double DLL_IMPORT th_cp_mole(int n);
double DLL_IMPORT th_cv_mole(int n);
double DLL_IMPORT th_pressure(int n);
int DLL_IMPORT th_setPressure(int n, double p);
double DLL_IMPORT th_enthalpy_mass(int n);
double DLL_IMPORT th_intEnergy_mass(int n);
double DLL_IMPORT th_entropy_mass(int n);
double DLL_IMPORT th_gibbs_mass(int n);
double DLL_IMPORT th_cp_mass(int n);
double DLL_IMPORT th_cv_mass(int n);
double DLL_IMPORT th_electricPotential(int n);
int DLL_IMPORT th_chemPotentials(int n, int lenm, double* murt);
int DLL_IMPORT th_elementPotentials(int n, int lenm, double* lambda);
int DLL_IMPORT th_getEnthalpies_RT(int n, int lenm, double* h_rt);
int DLL_IMPORT th_getEntropies_R(int n, int lenm, double* s_r);
int DLL_IMPORT th_getCp_R(int n, int lenm, double* cp_r);
int DLL_IMPORT th_setElectricPotential(int n, double v);
int DLL_IMPORT get_eos(char* fname, char* phase_id);
//int DLL_CPREFIX newThermo(char* model);
EEXXTT int DLL_CPREFIX newThermoFromXML(int mxml);
EEXXTT int DLL_CPREFIX th_thermoIndex(char* id);
EEXXTT int DLL_CPREFIX th_phase(int n);
EEXXTT int DLL_CPREFIX th_nSpecies(int 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, int lenm, double* murt);
EEXXTT int DLL_CPREFIX th_elementPotentials(int n, int lenm, double* lambda);
EEXXTT int DLL_CPREFIX th_getEnthalpies_RT(int n, int lenm, double* h_rt);
EEXXTT int DLL_CPREFIX th_getEntropies_R(int n, int lenm, double* s_r);
EEXXTT int DLL_CPREFIX th_getCp_R(int n, int 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);
int DLL_IMPORT th_set_HP(int n, double* vals);
int DLL_IMPORT th_set_UV(int n, double* vals);
int DLL_IMPORT th_set_SV(int n, double* vals);
int DLL_IMPORT th_set_SP(int n, double* vals);
int DLL_IMPORT th_equil(int n, char* XY, int solver,
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,
double rtol, int maxsteps, int maxiter, int loglevel);
double DLL_IMPORT th_critTemperature(int n);
double DLL_IMPORT th_critPressure(int n);
double DLL_IMPORT th_critDensity(int n);
double DLL_IMPORT th_vaporFraction(int n);
double DLL_IMPORT th_satTemperature(int n, double p);
double DLL_IMPORT th_satPressure(int n, double t);
int DLL_IMPORT th_setState_Psat(int n, double p, double x);
int DLL_IMPORT th_setState_Tsat(int n, double t, double x);
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);
int DLL_IMPORT newKineticsFromXML(int mxml, int iphase,
EEXXTT int DLL_CPREFIX newKineticsFromXML(int mxml, int iphase,
int neighbor1=-1, int neighbor2=-1, int neighbor3=-1,
int neighbor4=-1);
int DLL_IMPORT installRxnArrays(int pxml, int ikin,
EEXXTT int DLL_CPREFIX installRxnArrays(int pxml, int ikin,
char* default_phase);
int DLL_IMPORT kin_nSpecies(int n);
int DLL_IMPORT kin_nReactions(int n);
int DLL_IMPORT kin_nPhases(int n);
int DLL_IMPORT kin_phaseIndex(int n, char* ph);
int DLL_IMPORT kin_reactionPhaseIndex(int n);
double DLL_IMPORT kin_reactantStoichCoeff(int n, int i, int k);
double DLL_IMPORT kin_productStoichCoeff(int n, int i, int k);
int DLL_IMPORT kin_reactionType(int n, int i);
int DLL_IMPORT kin_getFwdRatesOfProgress(int n, int len, double* fwdROP);
int DLL_IMPORT kin_getRevRatesOfProgress(int n, int len, double* revROP);
int DLL_IMPORT kin_getNetRatesOfProgress(int n, int len, double* netROP);
int DLL_IMPORT kin_getEquilibriumConstants(int n, int len, double* kc);
EEXXTT int DLL_CPREFIX kin_nSpecies(int n);
EEXXTT int DLL_CPREFIX kin_nReactions(int n);
EEXXTT int DLL_CPREFIX kin_nPhases(int n);
EEXXTT int DLL_CPREFIX kin_phaseIndex(int n, char* ph);
EEXXTT int 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, int len, double* fwdROP);
EEXXTT int DLL_CPREFIX kin_getRevRatesOfProgress(int n, int len, double* revROP);
EEXXTT int DLL_CPREFIX kin_getNetRatesOfProgress(int n, int len, double* netROP);
EEXXTT int DLL_CPREFIX kin_getEquilibriumConstants(int n, int len, double* kc);
int DLL_IMPORT kin_getFwdRateConstants(int n, int len, double* kfwd);
int DLL_IMPORT kin_getRevRateConstants(int n, int doIrreversible, int len, double* krev);
int DLL_IMPORT kin_getActivationEnergies(int n, int len, double* E);
int DLL_IMPORT kin_getDelta(int n, int job, int len, double* delta);
int DLL_IMPORT kin_getCreationRates(int n, int len, double* cdot);
int DLL_IMPORT kin_getDestructionRates(int n, int len, double* ddot);
int DLL_IMPORT kin_getNetProductionRates(int n, int len, double* wdot);
int DLL_IMPORT kin_getSourceTerms(int n, int len, double* ydot);
double DLL_IMPORT kin_multiplier(int n, int i);
int DLL_IMPORT kin_getReactionString(int n, int i, int len, char* buf);
int DLL_IMPORT kin_setMultiplier(int n, int i, double v);
EEXXTT int DLL_CPREFIX kin_getFwdRateConstants(int n, int len, double* kfwd);
EEXXTT int DLL_CPREFIX kin_getRevRateConstants(int n, int doIrreversible, int len, double* krev);
EEXXTT int DLL_CPREFIX kin_getActivationEnergies(int n, int len, double* E);
EEXXTT int DLL_CPREFIX kin_getDelta(int n, int job, int len, double* delta);
EEXXTT int DLL_CPREFIX kin_getCreationRates(int n, int len, double* cdot);
EEXXTT int DLL_CPREFIX kin_getDestructionRates(int n, int len, double* ddot);
EEXXTT int DLL_CPREFIX kin_getNetProductionRates(int n, int len, double* wdot);
EEXXTT int DLL_CPREFIX kin_getSourceTerms(int n, int 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);
int DLL_IMPORT kin_isReversible(int n, int i);
int DLL_IMPORT kin_type(int n);
int DLL_IMPORT kin_start(int n, int p);
int DLL_IMPORT kin_speciesIndex(int n, const char* nm, const char* ph);
int DLL_IMPORT kin_advanceCoverages(int n, double tstep);
int DLL_IMPORT kin_phase(int n, int i);
EEXXTT int DLL_CPREFIX kin_isReversible(int n, int i);
EEXXTT int DLL_CPREFIX kin_type(int n);
EEXXTT int DLL_CPREFIX kin_start(int n, int p);
EEXXTT int DLL_CPREFIX kin_speciesIndex(int n, const char* nm, const char* ph);
EEXXTT int DLL_CPREFIX kin_advanceCoverages(int n, double tstep);
EEXXTT int DLL_CPREFIX kin_phase(int n, int i);
int DLL_IMPORT newTransport(char* model,
EEXXTT int DLL_CPREFIX newTransport(char* model,
int th, int loglevel);
double DLL_IMPORT trans_viscosity(int n);
double DLL_IMPORT trans_thermalConductivity(int n);
int DLL_IMPORT trans_getThermalDiffCoeffs(int n, int ldt, double* dt);
int DLL_IMPORT trans_getMixDiffCoeffs(int n, int ld, double* d);
int DLL_IMPORT trans_getBinDiffCoeffs(int n, int ld, double* d);
int DLL_IMPORT trans_getMultiDiffCoeffs(int n, int ld, double* d);
int DLL_IMPORT trans_setParameters(int n, int type, int k, double* d);
int DLL_IMPORT trans_getMolarFluxes(int n, const double* state1,
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,
const double* state2, double delta, double* fluxes);
int DLL_IMPORT import_phase(int nth, int nxml, char* id);
int DLL_IMPORT import_kinetics(int nxml, char* id,
EEXXTT int DLL_CPREFIX import_phase(int nth, int nxml, char* id);
EEXXTT int DLL_CPREFIX import_kinetics(int nxml, char* id,
int nphases, int* ith, int nkin);
int DLL_IMPORT import_from_file(int nth, int nkin, char* fname, char* db,
EEXXTT int DLL_CPREFIX import_from_file(int nth, int nkin, char* fname, char* db,
char* id, int validate, double threshold);
int DLL_IMPORT getCanteraError(int buflen, char* buf);
int DLL_IMPORT showCanteraErrors();
int DLL_IMPORT write_HTML_log(char* file);
int DLL_IMPORT setLogWriter(void* logger);
int DLL_IMPORT addCanteraDirectory(int buflen, char* buf);
int DLL_IMPORT clearStorage();
int DLL_IMPORT delPhase(int n);
int DLL_IMPORT delThermo(int n);
int DLL_IMPORT delKinetics(int n);
int DLL_IMPORT delTransport(int n);
int DLL_IMPORT readlog(int n, char* buf);
int DLL_IMPORT buildSolutionFromXML(char* src, int ixml, char* id,
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(int 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,
int ith, int ikin);
int DLL_IMPORT ck_to_cti(char* in_file, char* db_file,
EEXXTT int DLL_CPREFIX ck_to_cti(char* in_file, char* db_file,
char* tr_file, char* id_tag, int debug, int validate);
int DLL_IMPORT writelogfile(char* logfile);
EEXXTT int DLL_CPREFIX writelogfile(char* logfile);
}
#endif

25
Cantera/clib/src/ctbdry.cpp
View file

@ -1,15 +1,18 @@
/**
* @file ctbdry.cpp
*/
/*
* $Id$
*/
#define CANTERA_USE_INTERNAL
#include "ctbdry.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
@ -20,9 +23,9 @@
#include "Cabinet.h"
#include "Storage.h"
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace std;
using namespace Cantera;
Cabinet<Bdry1D>* Cabinet<Bdry1D>::__storage = 0;

31
Cantera/clib/src/ctbdry.h
View file

@ -1,20 +1,27 @@
/**
* @file ctbdry.h
*/
/*
* $Id$
*/
#ifndef CTC_BDRY_H
#define CTC_BDRY_H
#include "clib_defs.h"
extern "C" {
extern "C" {
int DLL_IMPORT bndry_new(int itype);
int DLL_IMPORT bndry_del(int i);
double DLL_IMPORT bndry_temperature(int i);
int DLL_IMPORT bndry_settemperature(int i, double t);
double DLL_IMPORT bndry_spreadrate(int i);
int DLL_IMPORT bndry_setSpreadRate(int i, double v);
int DLL_IMPORT bndry_setmdot(int i, double mdot);
double DLL_IMPORT bndry_mdot(int i);
int DLL_IMPORT bndry_setxin(int i, double* xin);
int DLL_IMPORT bndry_setxinbyname(int i, char* xin);
int DLL_IMPORT bndry_setkinetics(int i, int j);
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);
}
#endif

32
Cantera/clib/src/ctfunc.cpp
View file

@ -1,3 +1,17 @@
/**
* @file ctfunc.cpp
*/
/*
* $Id$
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ctfunc.h"
#include "Func1.h"
#include "ctexceptions.h"
@ -6,22 +20,6 @@ using namespace Cantera;
#include "Cabinet.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
typedef Func1 func_t;
@ -157,7 +155,7 @@ extern "C" {
string w = _func(i)->write(a);
int ws = w.size();
int lout = (lennm > ws ? ws : lennm);
copy(w.c_str(), w.c_str() + lout, nm);
std::copy(w.c_str(), w.c_str() + lout, nm);
nm[lout] = '\0';
return 0;
}

23
Cantera/clib/src/ctfunc.h
View file

@ -1,17 +1,24 @@
/**
* @file ctfunc.h
*/
/*
* $Id$
*/
#ifndef CTC_FUNC1_H
#define CTC_FUNC1_H
#include "clib_defs.h"
extern "C" {
int DLL_IMPORT func_new(int type, int n, int lenp, double* p);
int DLL_IMPORT func_del(int i);
int DLL_IMPORT func_copy(int i);
int DLL_IMPORT func_assign(int i, int j);
double DLL_IMPORT func_value(int i, double t);
int DLL_IMPORT func_derivative(int i);
int DLL_IMPORT func_duplicate(int i);
int DLL_EXPORT func_write(int i, int lennm, const char* arg, char* nm);
EEXXTT int DLL_CPREFIX func_new(int type, int n, int 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, int lennm, const char* arg, char* nm);
}
#endif

28
Cantera/clib/src/ctmultiphase.cpp
View file

@ -1,3 +1,13 @@
/**
* @file ctmultiphase.cpp
*/
/*
* $Id$
*/
#define CANTERA_USE_INTERNAL
#include "ctmultiphase.h"
// Cantera includes
#include "equil.h"
@ -8,22 +18,8 @@
#include "Cabinet.h"
#include "Storage.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace std;
using namespace Cantera;
typedef MultiPhase mix_t;

81
Cantera/clib/src/ctmultiphase.h
View file

@ -1,3 +1,10 @@
/**
* @file ctmultiphase.h
*/
/*
* $Id$
*/
#ifndef CTC_MULTIPHASE_H
#define CTC_MULTIPHASE_H
@ -5,50 +12,50 @@
extern "C" {
int DLL_IMPORT mix_new();
int DLL_IMPORT mix_del(int i);
int DLL_IMPORT mix_copy(int i);
int DLL_IMPORT mix_assign(int i, int j);
int DLL_IMPORT mix_addPhase(int i, int j, double moles);
int DLL_IMPORT mix_init(int i);
int DLL_IMPORT mix_nElements(int i);
int DLL_IMPORT mix_elementIndex(int i, char* name);
int DLL_IMPORT mix_speciesIndex(int i, int k, int p);
int DLL_IMPORT mix_nSpecies(int i);
int DLL_IMPORT mix_setTemperature(int i, double t);
double DLL_IMPORT mix_temperature(int i);
double DLL_IMPORT mix_minTemp(int i);
double DLL_IMPORT mix_maxTemp(int i);
double DLL_IMPORT mix_charge(int i);
double DLL_IMPORT mix_phaseCharge(int i, int p);
int DLL_IMPORT mix_setPressure(int i, double p);
double DLL_IMPORT mix_pressure(int i);
double DLL_IMPORT mix_nAtoms(int i, int k, int m);
double DLL_IMPORT mix_nPhases(int i);
double DLL_IMPORT mix_phaseMoles(int i, int n);
int DLL_IMPORT mix_setPhaseMoles(int i, int n, double v);
int DLL_IMPORT mix_setMoles(int i, int nlen, double* n);
int DLL_IMPORT mix_setMolesByName(int i, char* n);
double DLL_IMPORT mix_speciesMoles(int i, int k);
double DLL_IMPORT mix_elementMoles(int i, int m);
double DLL_IMPORT mix_equilibrate(int i, char* XY,
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 int DLL_CPREFIX mix_nElements(int i);
EEXXTT int DLL_CPREFIX mix_elementIndex(int i, char* name);
EEXXTT int DLL_CPREFIX mix_speciesIndex(int i, int k, int p);
EEXXTT int 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 double 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, int 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);
double DLL_EXPORT mix_vcs_equilibrate(int i, char* XY, int estimateEquil,
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);
int DLL_IMPORT mix_getChemPotentials(int i, int lenmu, double* mu);
int DLL_IMPORT mix_getValidChemPotentials(int i, double bad_mu,
EEXXTT int DLL_CPREFIX mix_getChemPotentials(int i, int lenmu, double* mu);
EEXXTT int DLL_CPREFIX mix_getValidChemPotentials(int i, double bad_mu,
int standard, int lenmu, double* mu);
double DLL_IMPORT mix_enthalpy(int i);
double DLL_IMPORT mix_entropy(int i);
double DLL_IMPORT mix_gibbs(int i);
double DLL_IMPORT mix_cp(int i);
double DLL_IMPORT mix_volume(int i);
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);
int DLL_IMPORT mix_speciesPhaseIndex(int k);
double DLL_IMPORT mix_moleFraction(int k);
EEXXTT int DLL_CPREFIX mix_speciesPhaseIndex(int i, int k);
EEXXTT double DLL_CPREFIX mix_moleFraction(int i, int k);
}
#endif

55
Cantera/clib/src/ctnum.h
View file

@ -1,3 +1,10 @@
/**
* @file ctnum.h
*/
/*
* $Id$
*/
#ifndef CTC_CTNUM_H
#define CTC_CTNUM_H
@ -5,31 +12,31 @@
extern "C" {
int DLL_IMPORT newMatrix(int m, int n);
int DLL_IMPORT delMatrix(int i);
int DLL_IMPORT matrix_copy(int i);
int DLL_IMPORT matrix_assign(int i, int j);
int DLL_IMPORT matrix_nRows(int i);
int DLL_IMPORT matrix_nColumns(int i);
int DLL_IMPORT matrix_resize(int i, int m, int n, double v);
int DLL_IMPORT matrix_appendColumn(int i, double* c);
double DLL_IMPORT matrix_value(int i, int m, int n);
double DLL_IMPORT matrix_setvalue(int i, int m, int n, double v);
int DLL_IMPORT matrix_solve(int i1, int i2);
int DLL_IMPORT matrix_multiply(int ma, int mb, int mp);
int DLL_IMPORT matrix_invert(int ma);
EEXXTT int DLL_CPREFIX newMatrix(int m, int n);
EEXXTT int DLL_CPREFIX delMatrix(int i);
EEXXTT int DLL_CPREFIX matrix_copy(int i);
EEXXTT int DLL_CPREFIX matrix_assign(int i, int j);
EEXXTT int DLL_CPREFIX matrix_nRows(int i);
EEXXTT int DLL_CPREFIX matrix_nColumns(int i);
EEXXTT int DLL_CPREFIX matrix_resize(int i, int m, int n, double v);
EEXXTT int DLL_CPREFIX matrix_appendColumn(int i, double* c);
EEXXTT double DLL_CPREFIX matrix_value(int i, int m, int n);
EEXXTT double DLL_CPREFIX matrix_setvalue(int i, int m, int n, double v);
EEXXTT int DLL_CPREFIX matrix_solve(int i1, int i2);
EEXXTT int DLL_CPREFIX matrix_multiply(int ma, int mb, int mp);
EEXXTT int DLL_CPREFIX matrix_invert(int ma);
int DLL_IMPORT bmatrix_new(int n, int kl, int ku);
int DLL_IMPORT bmatrix_del(int i);
int DLL_IMPORT bmatrix_copy(int i);
int DLL_IMPORT bmatrix_assign(int i, int j);
int DLL_IMPORT bmatrix_nRows(int i);
int DLL_IMPORT bmatrix_nColumns(int i);
int DLL_IMPORT bmatrix_resize(int i, int m, int n, double v);
double DLL_IMPORT bmatrix_value(int i, int m, int n);
double DLL_IMPORT bmatrix_setvalue(int i, int m, int n, double v);
int DLL_IMPORT bmatrix_solve(int ma, int mb);
int DLL_IMPORT bmatrix_multiply(int ma, int mb, int mp);
EEXXTT int DLL_CPREFIX bmatrix_new(int n, int kl, int ku);
EEXXTT int DLL_CPREFIX bmatrix_del(int i);
EEXXTT int DLL_CPREFIX bmatrix_copy(int i);
EEXXTT int DLL_CPREFIX bmatrix_assign(int i, int j);
EEXXTT int DLL_CPREFIX bmatrix_nRows(int i);
EEXXTT int DLL_CPREFIX bmatrix_nColumns(int i);
EEXXTT int DLL_CPREFIX bmatrix_resize(int i, int m, int n, double v);
EEXXTT double DLL_CPREFIX bmatrix_value(int i, int m, int n);
EEXXTT double DLL_CPREFIX bmatrix_setvalue(int i, int m, int n, double v);
EEXXTT int DLL_CPREFIX bmatrix_solve(int ma, int mb);
EEXXTT int DLL_CPREFIX bmatrix_multiply(int ma, int mb, int mp);
}

31
Cantera/clib/src/ctonedim.cpp
View file

@ -1,3 +1,10 @@
/**
* @file ctonedim.cpp
*/
/*
* $Id$
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
@ -5,6 +12,9 @@
#pragma warning(disable:4800)
#endif
#define CANTERA_USE_INTERNAL
#include "ctonedim.h"
// Cantera includes
#include "config.h"
@ -13,27 +23,14 @@
#include "Inlet1D.h"
#include "DenseMatrix.h"
// local includes
#include "Cabinet.h"
#include "Storage.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace std;
using namespace Cantera;
template<> Cabinet<Sim1D>* Cabinet<Sim1D>::__storage = 0;
template<> Cabinet<Domain1D>* Cabinet<Domain1D>::__storage = 0;

144
Cantera/clib/src/ctonedim.h
View file

@ -1,90 +1,102 @@
/**
* @file ctonedim.h
*/
/*
* $Id$
*/
#ifndef CTC_ONEDIM_H
#define CTC_ONEDIM_H
#include "clib_defs.h"
#ifdef CANTERA_USE_INTERNAL
#include "config.h"
#else
#include "cantera/config.h"
#endif
extern "C" {
int DLL_IMPORT domain_clear();
int DLL_IMPORT domain_del(int i);
int DLL_IMPORT domain_type(int i);
int DLL_IMPORT domain_index(int i);
int DLL_IMPORT domain_nComponents(int i);
int DLL_IMPORT domain_nPoints(int i);
int DLL_IMPORT domain_componentName(int i, int n, int sz, char* nameout);
int DLL_IMPORT domain_componentIndex(int i, char* name);
int DLL_IMPORT domain_setBounds(int i, int n, double lower,
EEXXTT int DLL_CPREFIX domain_clear();
EEXXTT int DLL_CPREFIX domain_del(int i);
EEXXTT int DLL_CPREFIX domain_type(int i);
EEXXTT int DLL_CPREFIX domain_index(int i);
EEXXTT int DLL_CPREFIX domain_nComponents(int i);
EEXXTT int DLL_CPREFIX domain_nPoints(int i);
EEXXTT int DLL_CPREFIX domain_componentName(int i, int n, int sz, char* nameout);
EEXXTT int DLL_CPREFIX domain_componentIndex(int i, char* name);
EEXXTT int DLL_CPREFIX domain_setBounds(int i, int n, double lower,
double upper);
double DLL_EXPORT domain_lowerBound(int i, int n);
double DLL_EXPORT domain_upperBound(int i, int n);
int DLL_IMPORT domain_setTolerances(int i, int n, double rtol,
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,
double atol, int itime);
double DLL_IMPORT domain_rtol(int i, int n);
double DLL_IMPORT domain_atol(int i, int n);
int DLL_IMPORT domain_setupGrid(int i, int npts, double* grid);
int DLL_IMPORT domain_setID(int i, char* id);
int DLL_IMPORT domain_setDesc(int i, char* desc);
double DLL_IMPORT domain_grid(int i, int n);
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, int 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);
int DLL_IMPORT bdry_setMdot(int i, double mdot);
int DLL_IMPORT bdry_setTemperature(int i, double t);
int DLL_IMPORT bdry_setMoleFractions(int i, char* x);
double DLL_IMPORT bdry_temperature(int i);
double DLL_IMPORT bdry_massFraction(int i, int k);
double DLL_IMPORT bdry_mdot(int i);
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);
int DLL_IMPORT reactingsurf_setkineticsmgr(int i, int j);
int DLL_IMPORT reactingsurf_enableCoverageEqs(int i, int onoff);
EEXXTT int DLL_CPREFIX reactingsurf_setkineticsmgr(int i, int j);
EEXXTT int DLL_CPREFIX reactingsurf_enableCoverageEqs(int i, int onoff);
int DLL_IMPORT inlet_new();
int DLL_IMPORT outlet_new();
int DLL_IMPORT outletres_new();
int DLL_IMPORT symm_new();
int DLL_IMPORT surf_new();
int DLL_IMPORT reactingsurf_new();
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();
int DLL_IMPORT inlet_setSpreadRate(int i, double v);
EEXXTT int DLL_CPREFIX inlet_setSpreadRate(int i, double v);
int DLL_IMPORT stflow_new(int iph, int ikin, int itr, int itype=1);
int DLL_IMPORT stflow_setTransport(int i, int itr, int iSoret);
int DLL_IMPORT stflow_enableSoret(int i, int iSoret);
int DLL_IMPORT stflow_setPressure(int i, double p);
int DLL_IMPORT stflow_setFixedTempProfile(int i, int n, double* pos,
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, int n, double* pos,
int m, double* temp);
int DLL_IMPORT stflow_solveSpeciesEqs(int i, int flag);
int DLL_IMPORT stflow_solveEnergyEqn(int i, int flag);
EEXXTT int DLL_CPREFIX stflow_solveSpeciesEqs(int i, int flag);
EEXXTT int DLL_CPREFIX stflow_solveEnergyEqn(int i, int flag);
int DLL_IMPORT sim1D_clear();
int DLL_IMPORT sim1D_new(int nd, int* domains);
int DLL_IMPORT sim1D_del(int i);
int DLL_IMPORT sim1D_setValue(int i, int dom, int comp, int localPoint, double value);
int DLL_IMPORT sim1D_setProfile(int i, int dom, int comp,
EEXXTT int DLL_CPREFIX sim1D_clear();
EEXXTT int DLL_CPREFIX sim1D_new(int 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,
int np, double* pos, int nv, double* v);
int DLL_IMPORT sim1D_setFlatProfile(int i, int dom, int comp, double v);
int DLL_IMPORT sim1D_showSolution(int i, char* fname);
int DLL_IMPORT sim1D_setTimeStep(int i, double stepsize, int ns, integer* nsteps);
int DLL_IMPORT sim1D_getInitialSoln(int i);
int DLL_IMPORT sim1D_solve(int i, int loglevel, int refine_grid);
int DLL_IMPORT sim1D_refine(int i, int loglevel);
int DLL_IMPORT sim1D_setRefineCriteria(int i, int dom, double ratio,
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, int 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,
double slope, double curve, double prune);
int DLL_IMPORT sim1D_save(int i, char* fname, char* id,
EEXXTT int DLL_CPREFIX sim1D_save(int i, char* fname, char* id,
char* desc);
int DLL_IMPORT sim1D_restore(int i, char* fname, char* id);
int DLL_IMPORT sim1D_writeStats(int i);
int DLL_IMPORT sim1D_domainIndex(int i, char* name);
double DLL_IMPORT sim1D_value(int i, int idom, int icomp, int localPoint);
double DLL_IMPORT sim1D_workValue(int i, int idom,
EEXXTT int DLL_CPREFIX sim1D_restore(int i, char* fname, char* id);
EEXXTT int DLL_CPREFIX sim1D_writeStats(int i);
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,
int icomp, int localPoint);
int DLL_IMPORT sim1D_eval(int i, double rdt, int count);
int DLL_IMPORT sim1D_setMaxJacAge(int i, int ss_age, int ts_age);
int DLL_IMPORT sim1D_timeStepFactor(int i, double tfactor);
int DLL_IMPORT sim1D_setTimeStepLimits(int i, double tsmin, double tsmax);
int DLL_IMPORT sim1D_setFixedTemperature(int i, double temp);
int DLL_IMPORT sim1D_evalSSJacobian(int i);
double DLL_IMPORT sim1D_jacobian(int i, int m, int n);
int DLL_IMPORT sim1D_size(int i);
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 int DLL_CPREFIX sim1D_size(int i);
}

32
Cantera/clib/src/ctreactor.cpp
View file

@ -1,3 +1,18 @@
/**
* @file ctreactor.cpp
*/
/*
* $Id$
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ctreactor.h"
// Cantera includes
#include "Reactor.h"
@ -11,23 +26,6 @@
#include "Cabinet.h"
#include "Storage.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace CanteraZeroD;
typedef ReactorBase reactor_t;

137
Cantera/clib/src/ctreactor.h
View file

@ -1,3 +1,10 @@
/**
* @file ctreactor.h
*/
/*
* $Id$
*/
#ifndef CTC_REACTOR_H
#define CTC_REACTOR_H
@ -5,74 +12,74 @@
extern "C" {
int DLL_IMPORT reactor_new(int type);
int DLL_IMPORT reactor_del(int i);
int DLL_IMPORT reactor_copy(int i);
int DLL_IMPORT reactor_assign(int i, int j);
int DLL_IMPORT reactor_setInitialVolume(int i, double v);
int DLL_IMPORT reactor_setInitialTime(int i, double t);
int DLL_IMPORT reactor_setEnergy(int i, int eflag);
int DLL_IMPORT reactor_setThermoMgr(int i, int n);
int DLL_IMPORT reactor_setKineticsMgr(int i, int n);
int DLL_IMPORT reactor_advance(int i, double t);
double DLL_IMPORT reactor_step(int i, double t);
double DLL_IMPORT reactor_time(int i);
double DLL_IMPORT reactor_mass(int i);
double DLL_IMPORT reactor_volume(int i);
double DLL_IMPORT reactor_density(int i);
double DLL_IMPORT reactor_temperature(int i);
double DLL_IMPORT reactor_enthalpy_mass(int i);
double DLL_IMPORT reactor_intEnergy_mass(int i);
double DLL_IMPORT reactor_pressure(int i);
double DLL_IMPORT reactor_massFraction(int i, int k);
int DLL_IMPORT reactor_nSensParams(int i);
int DLL_IMPORT reactor_addSensitivityReaction(int i, int rxn);
int DLL_IMPORT flowReactor_setMassFlowRate(int i, double mdot);
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 int 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);
int DLL_IMPORT reactornet_new();
int DLL_IMPORT reactornet_del(int i);
int DLL_IMPORT reactornet_copy(int i);
int DLL_IMPORT reactornet_assign(int i, int j);
int DLL_IMPORT reactornet_setInitialTime(int i, double t);
int DLL_IMPORT reactornet_setMaxTimeStep(int i, double maxstep);
int DLL_IMPORT reactornet_setTolerances(int i, double rtol, double atol);
int DLL_IMPORT reactornet_setSensitivityTolerances(int i, double rtol, double atol);
int DLL_IMPORT reactornet_addreactor(int i, int n);
int DLL_IMPORT reactornet_advance(int i, double t);
double DLL_IMPORT reactornet_step(int i, double t);
double DLL_IMPORT reactornet_time(int i);
double DLL_IMPORT reactornet_rtol(int i);
double DLL_IMPORT reactornet_atol(int i);
double DLL_IMPORT reactornet_sensitivity(int i, char* v, int p, int r);
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);
int DLL_IMPORT flowdev_new(int type);
int DLL_IMPORT flowdev_del(int i);
int DLL_IMPORT flowdev_install(int i, int n, int m);
int DLL_IMPORT flowdev_setMaster(int i, int n);
double DLL_IMPORT flowdev_massFlowRate(int i, double time);
int DLL_IMPORT flowdev_setMassFlowRate(int i, double mdot);
int DLL_IMPORT flowdev_setParameters(int i, int n, double* v);
int DLL_IMPORT flowdev_setFunction(int i, int n);
int DLL_IMPORT flowdev_ready(int i);
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);
int DLL_IMPORT wall_new(int type);
int DLL_IMPORT wall_del(int i);
int DLL_IMPORT wall_copy(int i);
int DLL_IMPORT wall_assign(int i, int j);
int DLL_IMPORT wall_install(int i, int n, int m);
int DLL_IMPORT wall_setkinetics(int i, int n, int m);
double DLL_IMPORT wall_vdot(int i, double t);
double DLL_IMPORT wall_Q(int i, double t);
double DLL_IMPORT wall_area(int i);
int DLL_IMPORT wall_setArea(int i, double v);
int DLL_IMPORT wall_setThermalResistance(int i, double rth);
int DLL_IMPORT wall_setHeatTransferCoeff(int i, double u);
int DLL_IMPORT wall_setHeatFlux(int i, int n);
int DLL_IMPORT wall_setExpansionRateCoeff(int i, double k);
int DLL_IMPORT wall_setVelocity(int i, int n);
int DLL_IMPORT wall_setEmissivity(int i, double epsilon);
int DLL_IMPORT wall_ready(int i);
int DLL_IMPORT wall_addSensitivityReaction(int i, int lr, int rxn);
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);
}

25
Cantera/clib/src/ctrpath.cpp
View file

@ -1,16 +1,12 @@
/**
* @file ctrpath.cpp
*/
/*
* $Id$
*/
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
#define CANTERA_USE_INTERNAL
#include "ctrpath.h"
// Cantera includes
@ -19,9 +15,8 @@
#include "Cabinet.h"
#include "Storage.h"
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace Cantera;
using namespace std;
typedef ReactionPathDiagram diag_t;
typedef ReactionPathBuilder builder_t;

57
Cantera/clib/src/ctrpath.h
View file

@ -1,3 +1,10 @@
/**
* @file ctrpath.h
*/
/*
* $Id$
*/
#ifndef CTC_RXNPATH_H
#define CTC_RXNPATH_H
@ -5,32 +12,32 @@
extern "C" {
int DLL_IMPORT rdiag_new();
int DLL_IMPORT rdiag_del(int i);
int DLL_IMPORT rdiag_detailed(int i);
int DLL_IMPORT rdiag_brief(int i);
int DLL_IMPORT rdiag_setThreshold(int i, double v);
int DLL_IMPORT rdiag_setBoldColor(int i, char* color);
int DLL_IMPORT rdiag_setNormalColor(int i, char* color);
int DLL_IMPORT rdiag_setDashedColor(int i, char* color);
int DLL_IMPORT rdiag_setDotOptions(int i, char* opt);
int DLL_IMPORT rdiag_setBoldThreshold(int i, double v);
int DLL_IMPORT rdiag_setNormalThreshold(int i, double v);
int DLL_IMPORT rdiag_setLabelThreshold(int i, double v);
int DLL_IMPORT rdiag_setScale(int i, double v);
int DLL_IMPORT rdiag_setFlowType(int i, int iflow);
int DLL_IMPORT rdiag_setArrowWidth(int i, double v);
int DLL_IMPORT rdiag_setTitle(int i, char* title);
int DLL_IMPORT rdiag_write(int i, int fmt, char* fname);
int DLL_IMPORT rdiag_add(int i, int n);
int DLL_IMPORT rdiag_findMajor(int i, double threshold, int lda, double* a);
int DLL_IMPORT rdiag_setFont(int i, char* font);
int DLL_IMPORT rdiag_displayOnly(int i, int k);
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, int lda, double* a);
EEXXTT int DLL_CPREFIX rdiag_setFont(int i, char* font);
EEXXTT int DLL_CPREFIX rdiag_displayOnly(int i, int k);
int DLL_IMPORT rbuild_new();
int DLL_IMPORT rbuild_del(int i);
int DLL_IMPORT rbuild_init(int i, char* logfile, int k);
int DLL_IMPORT rbuild_build(int i, int k, char* el, char* dotfile,
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,
int idiag, int iquiet);
}

7
Cantera/clib/src/ctstagn.h
View file

@ -1,3 +1,10 @@
/**
* @file ctstagn.h
*/
/*
* $Id$
*/
#ifndef CTC_STAGN_H
#define CTC_STAGN_H

29
Cantera/clib/src/ctsurf.cpp
View file

@ -1,9 +1,21 @@
/**
* @file ctsurf.cpp
*/
/*
* $Id$
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
// clib header information
#define CANTERA_USE_INTERNAL
#include "ctsurf.h"
// Cantera includes
#include "SurfPhase.h"
#include "InterfaceKinetics.h"
@ -12,22 +24,9 @@
#include "Cabinet.h"
#include "Storage.h"
// Build as a DLL under Windows
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
using namespace std;
using namespace Cantera;
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
//Cabinet<Surf1D>* Cabinet<Surf1D>::__storage = 0;

83
Cantera/clib/src/ctsurf.h
View file

@ -1,54 +1,63 @@
/**
* @file ctsurf.h
*/
/*
* $Id$
*/
#ifndef CTC_SURF_H
#define CTC_SURF_H
// Cantera includes
//#include "surface.h"
//#include "Cabinet.h"
//#include "Storage.h"
#include "clib_defs.h"
#ifdef CANTERA_USE_INTERNAL
#include "config.h"
#else
#include "cantera/config.h"
#endif
extern "C" {
int DLL_IMPORT surface_new(int ikin);
int DLL_IMPORT surface_del(int i);
EEXXTT int DLL_CPREFIX surface_new(int ikin);
EEXXTT int DLL_CPREFIX surface_del(int i);
int DLL_IMPORT surfphase_new();
int DLL_IMPORT surf_del(int i);
int DLL_IMPORT surf_copy(int i);
int DLL_IMPORT surf_assign(int i, int j);
int DLL_IMPORT surf_addspecies(int i, char* nm, double sz);
int DLL_IMPORT surf_nspecies(int i);
int DLL_IMPORT surf_freezespecies(int i);
int DLL_IMPORT surf_setcoverages(int i, double* c);
int DLL_IMPORT surf_getcoverages(int i, double* c);
int DLL_IMPORT surf_setconcentrations(int i, double* c);
int DLL_IMPORT surf_getconcentrations(int i, double* c);
int DLL_IMPORT surf_setsitedensity(int i, double s0);
double DLL_IMPORT surf_sitedensity(int i);
int DLL_IMPORT surf_doc(int i, char* key, char* value);
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);
int DLL_IMPORT surfkin_new(int iph, int ith1, int ith2);
int DLL_IMPORT surfkin_del(int i);
int DLL_IMPORT surfkin_addreaction(int i, int nr, int* r,
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,
int* rst, int* ro, int np, int* p, int* pst,
int nrate, double* rateParams);
int DLL_IMPORT surfkin_nreactions(int i);
int DLL_IMPORT surfkin_getratesofprogress(int i, double* rop);
int DLL_IMPORT surfkin_getnetproductionrates(int i, double* sdot);
int DLL_IMPORT surfkin_integrate(int i, double dt);
int DLL_IMPORT surfkin_save(int i, char* fname, char* id, char* comment);
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);
int DLL_IMPORT surface_settolerances(int i, int nr,
EEXXTT int DLL_CPREFIX surface_settolerances(int i, int nr,
double* rtol, int na, double* atol);
int DLL_IMPORT surface_fixspecies(int i, int k, double c=-1.0);
int DLL_IMPORT surface_solvespecies(int i, int k);
int DLL_IMPORT surface_setmultiplier(int i, int k, double f);
double DLL_IMPORT surface_multiplier(int i, int k);
double DLL_IMPORT surface_temperature(int i);
int DLL_IMPORT surface_settemperature(int i, double t);
int DLL_IMPORT surface_setcoverages(int i, double* c);
int DLL_EXPORT surf_setcoveragesbyname(int i, char* c);
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);
}
#endif

30
Cantera/clib/src/ctxml.cpp
View file

@ -1,28 +1,30 @@
// Build as a DLL under Windows
/**
* @file ctxml.cpp
*/
/*
* $Id$
*/
#ifdef WIN32
#ifdef NO_DLL_BUILD
#define DLL_EXPORT
#else
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#endif
#define CANTERA_USE_INTERNAL
#include "ctxml.h"
// Cantera includes
#include "ctml.h"
//#include "importCTML.h"
#include "Cabinet.h"
#include "Storage.h"
#include <string.h>
// Values returned for error conditions
#define ERR -999
#define DERR -999.999
using namespace std;
using namespace Cantera;
// Assign storage for the static member of the Templated Cabinet class
// class Cabinet<XML_Node>;
@ -45,7 +47,7 @@ extern "C" {
int DLL_EXPORT xml_get_XML_File(const char* file, int debug) {
try {
XML_Node* x = get_XML_File(string(file), debug);
XML_Node* x = get_XML_File(std::string(file), debug);
return Cabinet<XML_Node>::cabinet(false)->add(x);
}
catch (CanteraError) { return -1; }

59
Cantera/clib/src/ctxml.h
View file

@ -1,33 +1,46 @@
/**
* @file ctxml.h
*/
/*
* $Id$
*/
#ifndef CTC_XML_H
#define CTC_XML_H
#include "clib_defs.h"
#ifdef CANTERA_USE_INTERNAL
#include "config.h"
#else
#include "cantera/config.h"
#endif
extern "C" {
int DLL_IMPORT xml_new(const char* name);
int DLL_IMPORT xml_get_XML_File(const char* file, int debug = 0);
int DLL_IMPORT xml_del(int i);
int DLL_IMPORT xml_clear();
int DLL_IMPORT xml_copy(int i);
int DLL_IMPORT xml_assign(int i, int j);
int DLL_IMPORT xml_build(int i, const char* file);
int DLL_IMPORT xml_preprocess_and_build(int i, const char* file, int debug);
int DLL_IMPORT xml_attrib(int i, const char* key, char* value);
int DLL_IMPORT xml_addAttrib(int i, const char* key, const char* value);
int DLL_IMPORT xml_addComment(int i, const char* comment);
int DLL_IMPORT xml_value(int i, char* value);
int DLL_IMPORT xml_tag(int i, char* tag);
int DLL_IMPORT xml_child(int i, const char* loc);
int DLL_IMPORT xml_child_bynumber(int i, int m);
int DLL_IMPORT xml_findID(int i, const char* id);
int DLL_IMPORT xml_findByName(int i, const char* nm);
int DLL_IMPORT xml_nChildren(int i);
int DLL_IMPORT xml_addChild(int i, const char* name, const char* value);
int DLL_IMPORT xml_addChildNode(int i, int j);
int DLL_IMPORT xml_write(int i, const char* file);
int DLL_IMPORT xml_removeChild(int i, int j);
int DLL_IMPORT ctml_getFloatArray(int i, int n, double* data, int iconvert=0);
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, int n, double* data, int iconvert=0);
}
#endif