minor cleanup
This commit is contained in:
parent
7c57748518
commit
37c3df28d6
5 changed files with 504 additions and 307 deletions
|
|
@ -73,10 +73,10 @@ namespace Cantera {
|
|||
void State::setMassFractions(const doublereal* y) {
|
||||
doublereal norm = 0.0, sum = 0.0;
|
||||
int k;
|
||||
cblas_dcopy(m_kk, y, 1, m_y.begin(), 1);
|
||||
//cblas_dcopy(m_kk, y, 1, m_y.begin(), 1);
|
||||
for (k = 0; k != m_kk; ++k) {
|
||||
norm += y[k];
|
||||
//m_y[k] = y[k];
|
||||
m_y[k] = y[k];
|
||||
}
|
||||
//scale(y, y + m_kk, m_y.begin(), 1.0/norm);
|
||||
scale(m_kk, 1.0/norm, m_y.begin());
|
||||
|
|
|
|||
791
config/configure
vendored
791
config/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -183,7 +183,9 @@ buildbin=$ctroot/build/bin/$builddir
|
|||
AC_SUBST(buildbin)
|
||||
|
||||
# add definitions to config.h
|
||||
AC_DEFINE_UNQUOTED(DARWIN,$OS_IS_DARWIN)
|
||||
if test "x${OS_IS_DARWIN}" = "x1"; then
|
||||
AC_DEFINE_UNQUOTED(DARWIN,$OS_IS_DARWIN)
|
||||
fi
|
||||
if test "x${OS_IS_CYGWIN}" = "x1"; then
|
||||
AC_DEFINE_UNQUOTED(CYGWIN,$OS_IS_CYGWIN)
|
||||
fi
|
||||
|
|
|
|||
6
configure
vendored
6
configure
vendored
|
|
@ -76,13 +76,13 @@ USE_NUMERIC=${USE_NUMERIC:="default"}
|
|||
|
||||
# If numarray was installed using the --home option, set this to the
|
||||
# home directory for numarray.
|
||||
#NUMARRAY_HOME=${NUMARRAY_HOME:="$HOME/python_modules"}
|
||||
NUMARRAY_HOME=${NUMARRAY_HOME:="$HOME/python_modules"}
|
||||
|
||||
# If you want to install the Cantera Python package somewhere other
|
||||
# than the default 'site-packages' directory within the Python library
|
||||
# directory, then set this to the desired directory. This is useful when
|
||||
# you do not have write access to the Python library directory.
|
||||
#CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"}
|
||||
CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"}
|
||||
|
||||
# Set this to 'y' when site packages must be put in system directories
|
||||
# but Cantera tutorials must be put in user space. An alternative to
|
||||
|
|
@ -229,7 +229,7 @@ ENABLE_TPX='y'
|
|||
# (The settings shown here are appropriate if you are using the ATLAS
|
||||
# libraries.)
|
||||
#
|
||||
#BLAS_LAPACK_LIBS='-llapack -lblas'
|
||||
BLAS_LAPACK_LIBS='-llapack -lblas'
|
||||
#'-llapack -lf77blas -lcblas -latlas'
|
||||
#BLAS_LAPACK_DIR='/usr/lib'
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
#define IEEE_MC68k
|
||||
#define Arith_Kind_ASL 2
|
||||
#define Double_Align
|
||||
#define NANCHECK
|
||||
#define IEEE_8087
|
||||
#define Arith_Kind_ASL 1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue