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 2004-08-05 16:42:59 +00:00
parent cf17527579
commit 7db7af9902
7 changed files with 1589 additions and 3855 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cantera/matlab/setup_winmatlab.py
View file

@ -1,16 +1,16 @@
import sys
bindir = '/Applications/Cantera/bin'
libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.4.0'
incdir = '/Users/dgg/dv/sf/cantera/build/include'
bindir = '/home/goodwin/ct154g/bin'
libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu'
incdir = '/home/goodwin/dv/sf/cantera/build/include'
dflibdir = ''
bllibstr = "-lctlapack -lctblas"
bllibs = bllibstr.replace('-l',' ')
bllist = bllibs.split()
bldir = "/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.4.0"
bldir = "/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu"
libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes',
'cvode', 'ctmath', 'tpx']

2
Cantera/src/SpeciesThermoFactory.cpp
View file

@ -20,7 +20,7 @@
#include "SpeciesThermo.h"
#include "NasaThermo.h"
#include "ShomateThermo.h"
#include "PolyThermoMgr.h"
//#include "PolyThermoMgr.h"
#include "SimpleThermo.h"
#include "SpeciesThermoMgr.h"

2
Cantera/src/oneD/StFlow.cpp
View file

@ -125,7 +125,7 @@ namespace Cantera {
{
m_type = cFlowType;
m_boundary.resize(2,0);
//m_boundary.resize(2,0);
m_points = points;
m_thermo = ph;

4
Cantera/src/oneD/StFlow.h
View file

@ -20,7 +20,7 @@
#include "../IdealGasPhase.h"
#include "../Kinetics.h"
#include "../funcs.h"
#include "../flowBoundaries.h"
//#include "../flowBoundaries.h"
namespace Cantera {
@ -443,7 +443,7 @@ namespace Cantera {
vector_fp m_zfix;
vector_fp m_tfix;
vector<FlowBdry::Boundary*> m_boundary;
// vector<FlowBdry::Boundary*> m_boundary;
doublereal m_efctr;

5415
config/configure vendored
View file

File diff suppressed because it is too large Load diff

6
config/configure.in
View file

@ -442,7 +442,11 @@ fi
AC_SUBST(BUILD_F90)
AC_SUBST(F90)
AC_SUBST(F90FLAGS)
# AC_SUBST(F77FLAGS)
if test "x$F77FLAGS" = "x"; then
F77FLAGS=$FFLAGS
fi
AC_SUBST(F77FLAGS)
BUILD_CLIB=1
#

7
configure vendored
View file

@ -106,7 +106,7 @@ PYTHON_SITE_PACKAGE_TOPDIR=${PYTHON_SITE_PACKAGE_TOPDIR:="/usr/local"}
# Matlab script. If this is set to "y" but Matlab is not found, the
# Matlab toolbox will not be built.
BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="n"}
@ -114,7 +114,6 @@ BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"}
# Set this to "y" if you want to build the Fortran 90/95 interface.
# A Fortran 90/95 compiler is required.
# UNDER DEVELOPMENT - UNSTABLE!!
BUILD_F90_INTERFACE=${BUILD_F90_INTERFACE:="y"}
@ -268,10 +267,6 @@ F77=${F77:=g77}
# from the options for the Fortran 90/95 compiler (if any).
FFLAGS=${FFLAGS:='-O2'}
# additional flags required to compile fixed-format F77 procedures
# in the 'ext' directory
#F77FLAGS=${F77FLAGS:='-w -dusty -fixed -save'}
# the additional Fortran flags required for linking, if any
#LFORT_FLAGS="-lF77 -lFI77"