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

minor cleanup

Browse source
This commit is contained in:
Dave Goodwin 2006-11-14 08:40:59 +00:00
parent 3b2065d2a6
commit 655cfd351d
3 changed files with 3186 additions and 4908 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Cantera/src/MultiPhaseEquil.cpp
View file

@ -7,16 +7,16 @@
#include <iostream>
using namespace std;
#if DARWIN == 1
#define ISNAN __isnand
#else
#ifdef WIN32
#include <float.h>
#define ISNAN _isnan
#else
#define ISNAN isnan
#endif
#endif
//#if DARWIN == 1
//#define ISNAN __isnand
//#else
//#ifdef WIN32
//#include <float.h>
//#define ISNAN _isnan
//#else
//#define ISNAN isnan
//#endif
//#endif
namespace Cantera {
@ -736,10 +736,10 @@ namespace Cantera {
}
}
sum -= psum / (fabs(m_mix->phaseMoles(ip)) + TINY);
if (ISNAN(sum)) {
cout << " sum is nan. " << endl;
cout << psum << " " << m_mix->phaseMoles(ip) << endl;
}
// if (ISNAN(sum)) {
// cout << " sum is nan. " << endl;
// cout << psum << " " << m_mix->phaseMoles(ip) << endl;
// }
}
}
rfctr = term1 + csum + sum;
@ -747,16 +747,16 @@ namespace Cantera {
fctr = 1.0;
else
fctr = 1.0/(term1 + csum + sum);
if (ISNAN(fctr)) {
cout << "fctr is nan." << endl;
cout << term1 << " " << csum << " " << sum << " " << TINY << endl;
}
// if (ISNAN(fctr)) {
// cout << "fctr is nan." << endl;
// cout << term1 << " " << csum << " " << sum << " " << TINY << endl;
//}
}
dxi[j] = -fctr*dg_rt;
if (ISNAN(dxi[j])) {
cout << "nan detected. " << endl;
cout << fctr << " " << dg_rt << endl;
}
//if (ISNAN(dxi[j])) {
// cout << "nan detected. " << endl;
// cout << fctr << " " << dg_rt << endl;
//}
index_t m;
for (m = 0; m < m_nel; m++) {

8040
configure vendored
View file

File diff suppressed because it is too large Load diff

10
configure.in
View file

@ -310,8 +310,8 @@ CVODE_LIBS='-lcvode'
IDA_LIBS=''
if test "x$SUNDIALS_HOME" = "x"; then
SUNDIALS_LIB_DIR=/usr/local/sundials/lib
SUNDIALS_INC_DIR=/usr/local/include/sundials
SUNDIALS_LIB_DIR=/usr/local/lib
SUNDIALS_INC_DIR=/usr/local/include
else
SUNDIALS_LIB_DIR=$SUNDIALS_HOME/lib
SUNDIALS_INC_DIR=$SUNDIALS_HOME/include
@ -706,12 +706,10 @@ if test -n "$BLAS_LAPACK_DIR"
then LOCAL_LIB_DIRS=$LOCAL_LIB_DIRS' -L'$BLAS_LAPACK_DIR
fi
if test -n "$SUNDIALS_HOME"
then LOCAL_LIB_DIRS=$LOCAL_LIB_DIRS' -L'$SUNDIALS_HOME/lib
if test ${use_sundials} = 1; then
LOCAL_LIB_DIRS=$LOCAL_LIB_DIRS' -L'$SUNDIALS_LIB_DIR
fi
AC_SUBST(LOCAL_LIB_DIRS)
AC_SUBST(LOCAL_LIBS)