From b159a8f20b35727913a6cc6c2d31f9e00b5c7568 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 15 Mar 2012 19:52:44 +0000 Subject: [PATCH] Removed declarations for non-existent C interface functions --- src/clib/ct.h | 18 ------------------ src/clib/ctbdry.h | 2 -- src/clib/ctmultiphase.h | 3 --- src/clib/ctonedim.h | 7 ------- src/clib/ctreactor.h | 1 - src/clib/ctrpath.h | 1 - src/clib/ctsurf.h | 39 --------------------------------------- 7 files changed, 71 deletions(-) diff --git a/src/clib/ct.h b/src/clib/ct.h index 59b7b7ca1..44904f5d9 100644 --- a/src/clib/ct.h +++ b/src/clib/ct.h @@ -5,13 +5,7 @@ #define CTC_CT_H #include "clib_defs.h" - -#ifdef CANTERA_USE_INTERNAL #include "cantera/base/config.h" -#else -#include "cantera/base/config.h" -#endif - extern "C" { CANTERA_CAPI int ct_appdelete(); @@ -49,15 +43,8 @@ extern "C" { CANTERA_CAPI double 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); - //int newThermo(char* model); CANTERA_CAPI int 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); @@ -84,8 +71,6 @@ extern "C" { 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); - 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); @@ -156,15 +141,12 @@ extern "C" { 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); - CANTERA_CAPI int import_from_file(int nth, int nkin, char* fname, char* db, - char* id, int validate, double threshold); 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); diff --git a/src/clib/ctbdry.h b/src/clib/ctbdry.h index b721a207a..73036bc77 100644 --- a/src/clib/ctbdry.h +++ b/src/clib/ctbdry.h @@ -7,7 +7,6 @@ #include "clib_defs.h" extern "C" { - CANTERA_CAPI int bndry_new(int itype); CANTERA_CAPI int bndry_del(int i); CANTERA_CAPI double bndry_temperature(int i); @@ -18,6 +17,5 @@ extern "C" { 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/ctmultiphase.h b/src/clib/ctmultiphase.h index d2a31f6eb..608da3c5d 100644 --- a/src/clib/ctmultiphase.h +++ b/src/clib/ctmultiphase.h @@ -7,7 +7,6 @@ #include "clib_defs.h" extern "C" { - CANTERA_CAPI int mix_new(); CANTERA_CAPI int mix_del(int i); CANTERA_CAPI int mix_copy(int i); @@ -44,7 +43,6 @@ extern "C" { CANTERA_CAPI int mix_getValidChemPotentials(int i, double bad_mu, int standard, size_t lenmu, double* mu); - CANTERA_CAPI double mix_enthalpy(int i); CANTERA_CAPI double mix_entropy(int i); CANTERA_CAPI double mix_gibbs(int i); @@ -53,6 +51,5 @@ extern "C" { 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.h b/src/clib/ctonedim.h index d369f8b59..e82ff26fb 100644 --- a/src/clib/ctonedim.h +++ b/src/clib/ctonedim.h @@ -5,15 +5,9 @@ #define CTC_ONEDIM_H #include "clib_defs.h" - -#ifdef CANTERA_USE_INTERNAL #include "cantera/base/config.h" -#else -#include "cantera/base/config.h" -#endif extern "C" { - CANTERA_CAPI int domain_clear(); CANTERA_CAPI int domain_del(int i); CANTERA_CAPI int domain_type(int i); @@ -95,5 +89,4 @@ extern "C" { CANTERA_CAPI size_t sim1D_size(int i); } - #endif diff --git a/src/clib/ctreactor.h b/src/clib/ctreactor.h index 4b5156c04..10e9d1ebe 100644 --- a/src/clib/ctreactor.h +++ b/src/clib/ctreactor.h @@ -7,7 +7,6 @@ #include "clib_defs.h" extern "C" { - CANTERA_CAPI int reactor_new(int type); CANTERA_CAPI int reactor_del(int i); CANTERA_CAPI int reactor_copy(int i); diff --git a/src/clib/ctrpath.h b/src/clib/ctrpath.h index f79b55acb..901b865c8 100644 --- a/src/clib/ctrpath.h +++ b/src/clib/ctrpath.h @@ -7,7 +7,6 @@ #include "clib_defs.h" extern "C" { - CANTERA_CAPI int rdiag_new(); CANTERA_CAPI int rdiag_del(int i); CANTERA_CAPI int rdiag_detailed(int i); diff --git a/src/clib/ctsurf.h b/src/clib/ctsurf.h index bfd4e15cf..377228bb9 100644 --- a/src/clib/ctsurf.h +++ b/src/clib/ctsurf.h @@ -4,55 +4,16 @@ #ifndef CTC_SURF_H #define CTC_SURF_H - #include "clib_defs.h" - -#ifdef CANTERA_USE_INTERNAL #include "cantera/base/config.h" -#else -#include "cantera/base/config.h" -#endif extern "C" { - - CANTERA_CAPI int surface_new(int ikin); - CANTERA_CAPI int surface_del(int i); - - 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); - - 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); - 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); - - CANTERA_CAPI int surface_settolerances(int i, int nr, - double* rtol, int na, double* atol); - 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); }