misc cleanup
This commit is contained in:
parent
3fe92fcefb
commit
b35121c673
4 changed files with 13 additions and 13 deletions
|
|
@ -168,12 +168,12 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
/// Return a const reference to phase n.
|
||||
const phase_t& phase(index_t n) const {
|
||||
if (!m_init) init();
|
||||
m_phase[n]->setState_TPX(m_temp,
|
||||
m_press, m_moleFractions.begin() + m_spstart[n]);
|
||||
return *m_phase[n];
|
||||
}
|
||||
//const phase_t& phase(index_t n) const {
|
||||
// if (!m_init) init();
|
||||
// m_phase[n]->setState_TPX(m_temp,
|
||||
// m_press, m_moleFractions.begin() + m_spstart[n]);
|
||||
// return *m_phase[n];
|
||||
//}
|
||||
|
||||
/// Moles of species \c k.
|
||||
doublereal speciesMoles(index_t k) {
|
||||
|
|
|
|||
6
config/configure
vendored
6
config/configure
vendored
|
|
@ -3397,8 +3397,8 @@ echo "${ECHO_T}${has_sstream}" >&6
|
|||
# Fortran
|
||||
#---------------------------------
|
||||
|
||||
if test -z $build_with_f2c; then
|
||||
ac_ext=f
|
||||
# if test -z $build_with_f2c; then
|
||||
ac_ext=f
|
||||
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
|
||||
|
|
@ -3617,7 +3617,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
# to procedures that have an underscore in the name
|
||||
if test -n "$G77"; then
|
||||
FFLAGS=$FFLAGS' -fno-second-underscore'
|
||||
fi
|
||||
#fi
|
||||
|
||||
|
||||
ac_ext=f
|
||||
|
|
|
|||
|
|
@ -647,14 +647,14 @@ AC_MSG_RESULT(${has_sstream})
|
|||
# Fortran
|
||||
#---------------------------------
|
||||
|
||||
if test -z $build_with_f2c; then
|
||||
AC_PROG_F77()
|
||||
# if test -z $build_with_f2c; then
|
||||
AC_PROG_F77()
|
||||
|
||||
# if G77 is defined, then add a flag to turn off adding a second underscore
|
||||
# to procedures that have an underscore in the name
|
||||
if test -n "$G77"; then
|
||||
FFLAGS=$FFLAGS' -fno-second-underscore'
|
||||
fi
|
||||
#fi
|
||||
|
||||
dnl Checks for libraries.
|
||||
AC_F77_LIBRARY_LDFLAGS()
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -361,7 +361,7 @@ CT_SHARED_LIB=${CT_SHARED_LIB:=clib}
|
|||
RPFONT=${RPFONT:="Helvetica"}
|
||||
|
||||
|
||||
CANTERA_VERSION=${CANTERA_VERSION:="1.5.4"}
|
||||
CANTERA_VERSION=${CANTERA_VERSION:="1.5.5"}
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue