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

cleanup

Browse source
This commit is contained in:
Dave Goodwin 2005-07-22 13:33:58 +00:00
parent 61099aa51f
commit 0fa2a3ee9b
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cantera/src/ChemEquil.cpp
View file

@ -662,7 +662,7 @@ converge:
double minDamp = 0.0;
double xTol = 1.e-7;
static vector_fp res_new(nvar); // fix
vector_fp res_new(nvar); // fix
//slope = grad * step;
slope = dot(grad.begin(), grad.end(), step.begin());
@ -768,8 +768,10 @@ converge:
yy = m_p2->value(mix);
resid[m_mm] = xx/xval - 1.0;
resid[m_skip] = yy/yval - 1.0;
addLogEntry(m_p1->symbol(), fp2str(xx)+" ("+fp2str(xval)+")");
addLogEntry(m_p2->symbol(), fp2str(yy)+" ("+fp2str(yval)+")");
string xstr = fp2str(xx)+" ("+fp2str(xval)+")";
addLogEntry(m_p1->symbol(), xstr);
string ystr = fp2str(yy)+" ("+fp2str(yval)+")";
addLogEntry(m_p2->symbol(), ystr);
endLogGroup();
}

3
Cantera/src/GasKinetics.cpp
View file

@ -47,6 +47,9 @@ namespace Cantera {
// m_rxnstoich = new ReactionStoichMgr;
}
GasKinetics::
~GasKinetics() {delete m_kdata;}
/**
* Update temperature-dependent portions of reaction rates and
* falloff functions.

2
Cantera/src/GasKinetics.h
View file

@ -84,7 +84,7 @@ namespace Cantera {
GasKinetics(thermo_t* thermo = 0);
/// Destructor.
virtual ~GasKinetics(){delete m_kdata;}
virtual ~GasKinetics();
virtual int ID() { return cGasKinetics; }

10
configure vendored
View file

@ -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'
#
@ -261,7 +261,7 @@ CXX=${CXX:=g++}
CC=${CC:=gcc}
# C++ compiler flags
CXXFLAGS=${CXXFLAGS:="-O3 -Wall"}
CXXFLAGS=${CXXFLAGS:="-O0 -g -Wall"}
# the C++ flags required for linking. Uncomment if additional flags
# need to be passed to the linker.
@ -305,7 +305,7 @@ F77=${F77:=g77}
# Fortran 77 compiler flags. Note that the Fortran compiler flags must be set
# to produce object code compatible with the C/C++ compiler you are using.
FFLAGS=${FFLAGS:='-O3'}
FFLAGS=${FFLAGS:='-O0 -g'}
# the additional Fortran flags required for linking, if any. Leave commented
# out if no additional flags are required.

6
ext/f2c_libs/arith.h
View file

@ -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