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

More changes for solaris compile

Browse source
This commit is contained in:
Harry Moffat 2010-02-09 20:39:03 +00:00
parent a5ea91b56a
commit 039696dcc6
3 changed files with 1292 additions and 1288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -47,16 +47,18 @@ inline Domain1D* _domain(int i) {
static StFlow* _stflow(int i) {
Domain1D* d = _domain(i);
if (d->domainType() == cFlowType) return (StFlow*)d;
else
else {
throw CanteraError("_stflow","wrong domain type");
}
return 0;
}
static Bdry1D* _bdry(int i) {
Domain1D* d = _domain(i);
if (d->isConnector()) return (Bdry1D*)d;
else
throw CanteraError("_bdry","wrong domain type: "
+int2str(d->domainType()));
if (! d->isConnector()) {
throw CanteraError("_bdry","wrong domain type: " +int2str(d->domainType()));
}
return (Bdry1D*)d;
}
inline ThermoPhase* _phase(int n) {

3
Cantera/fortran/src/fct.cpp
View file

@ -33,7 +33,7 @@
// Assert that there is storage
// for the templated classes' static member
// (needed to compile on solaris)
template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage;
//template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage;
inline XML_Node* _xml(const integer* n) {
return Cabinet<XML_Node>::cabinet()->item(*n);
@ -93,6 +93,7 @@ extern "C" {
catch (CanteraError) {
handleError(); return -1;
}
return -1;
}
//--------------- Phase ---------------------//