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

updated Windows build procedure

Browse source
This commit is contained in:
Dave Goodwin 2003-12-22 14:30:59 +00:00
parent 0da002eeb1
commit aa607d8832
13 changed files with 1554 additions and 3892 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cantera/clib/src/ct.h
View file

@ -77,13 +77,13 @@ extern "C" {
int DLL_IMPORT th_equil(int n, int XY);
double DLL_IMPORT th_critTemperature(int n);
double DLL_EXPORT th_critPressure(int n);
double DLL_EXPORT th_critDensity(int n);
double DLL_EXPORT th_vaporFraction(int n);
double DLL_EXPORT th_satTemperature(int n, double p);
double DLL_EXPORT th_satPressure(int n, double t);
int DLL_EXPORT th_setState_satLiquid(int n);
int DLL_EXPORT th_setState_satVapor(int n);
double DLL_IMPORT th_critPressure(int n);
double DLL_IMPORT th_critDensity(int n);
double DLL_IMPORT th_vaporFraction(int n);
double DLL_IMPORT th_satTemperature(int n, double p);
double DLL_IMPORT th_satPressure(int n, double t);
int DLL_IMPORT th_setState_satLiquid(int n);
int DLL_IMPORT th_setState_satVapor(int n);
int DLL_IMPORT newKineticsFromXML(int mxml, int iphase,
int neighbor1=-1, int neighbor2=-1, int neighbor3=-1,

2
Cantera/clib/src/ctonedim.cpp
View file

@ -301,7 +301,7 @@ extern "C" {
int DLL_EXPORT reactingsurf_enableCoverageEqs(int i, int onoff) {
try {
ReactingSurf1D* srf = (ReactingSurf1D*)_bdry(i);
srf->enableCoverageEquations(onoff);
srf->enableCoverageEquations(bool(onoff));
return 0;
}

4
Cantera/matlab/cantera/buildwin.m
View file

@ -1,6 +1,7 @@
disp('building Cantera...');
mex private/ctmethods.cpp private/ctfunctions.cpp ...
mex -I../../../build/include private/ctmethods.cpp ...
private/ctfunctions.cpp ...
private/xmlmethods.cpp private/phasemethods.cpp ...
private/thermomethods.cpp private/kineticsmethods.cpp ...
private/transportmethods.cpp private/reactormethods.cpp ...
@ -11,6 +12,7 @@ mex private/ctmethods.cpp private/ctfunctions.cpp ...
../../../lib/cantera.lib ../../../lib/recipes.lib ...
../../../lib/cvode.lib ../../../lib/ctlapack.lib ...
../../../lib/ctmath.lib ../../../lib/ctblas.lib ...
../../../lib/tpx.lib ...
../../../lib/dformd.lib ../../../lib/dfconsol.lib ...
../../../lib/dfport.lib
disp('done.');

2
Cantera/matlab/cantera/private/transportmethods.cpp
View file

@ -2,7 +2,7 @@
#include "mex.h"
#include "../../../clib/src/ct.h"
#include "ctmatutils.h"
#include <fstream.h>
#include <fstream>
void reportError();

8
Cantera/matlab/setup_matlab.py
View file

@ -1,10 +1,10 @@
import sys
bindir = '/home/goodwin/bin'
libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu'
incdir = '/home/goodwin/dv/sf/cantera/build/include'
libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -L/usr/lib/gcc-lib/i386-redhat-linux/2.96 -L/usr/lib/gcc-lib/i386-redhat-linux/2.96/../../.. -lg2c -lm'
bindir = 'd:/dgg/ct153/bin'
libdir = 'd:/dgg/dv/sf/cantera/build/lib/i686-pc-cygwin'
incdir = 'd:/dgg/dv/sf/cantera/build/include'
libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -L/usr/lib/gcc-lib/i686-pc-cygwin/2.95.2-6 -L/usr/lib/mingw -lcygwin -luser32 -lkernel32 -ladvapi32 -lshell32'
f = open('setup.m','w')
f.write('cd cantera\nbuildux\nexit\n')

2
Cantera/src/BandMatrix.cpp
View file

@ -14,7 +14,7 @@
//#include <iostream>
//#include <vector>
using namespace std;
//using namespace std;
#include "BandMatrix.h"
#include "ctlapack.h"

2
Cantera/src/DenseMatrix.cpp
View file

@ -125,7 +125,7 @@ namespace Cantera {
*/
int invert(DenseMatrix& A, int nn) {
integer n = (nn > 0 ? nn : A.nRows());
integer info;
integer info=0;
ct_dgetrf(n, n, A.begin(), A.nRows(), A.ipiv().begin(), info);
if (info != 0)
throw CanteraError("invert",

18
Cantera/src/config.h
View file

@ -1,4 +1,4 @@
/* ../config.h. Generated by configure. */
/* ../config.h. Generated automatically by configure. */
//
// Run the 'configure' script to generate 'config.h' from this input file.
//
@ -9,11 +9,11 @@
//------------------------ Fortran settings -------------------//
// define types doublereal, integer, and ftnlen to match the
// define types doublereal, integer, and ftnlen to match the
// corresponding Fortran data types on your system. The defaults
// are OK for most systems
typedef double doublereal; // Fortran double precision
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
@ -22,7 +22,7 @@ typedef int ftnlen; // Fortran hidden string length type
// adding a hidden argement with the length of the string. Some
// compilers add the hidden length argument immediately after the
// CHARACTER variable being passed, while others put all of the hidden
// length arguments at the end of the argument list. Define this if
// length arguments at the end of the argument list. Define this if
// the lengths are at the end of the argument list. This is usually the
// case for most unix Fortran compilers, but is (by default) false for
// Visual Fortran under Windows.
@ -37,7 +37,7 @@ typedef int ftnlen; // Fortran hidden string length type
//-------- LAPACK / BLAS ---------
// Define if you are using LAPACK and BLAS from the Intel Math Kernel
// Library
// Library
/* #undef HAVE_INTEL_MKL */
#define LAPACK_FTN_STRING_LEN_AT_END
@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type
//--------------------- Python ------------------------------------
// used to run Python to process .cti files
#define PYTHON_EXE "/home/goodwin/bin/python"
#define PYTHON_EXE "c:/python23/python"
//--------------------- Cantera -----------------------------------
//--------------------- Cantera -----------------------------------
// used to find data files
#define CANTERA_ROOT "/home/goodwin/cantera"
// used to find data files
#define CANTERA_ROOT "d:/dgg/ct153/cantera"

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

@ -274,7 +274,7 @@ namespace Cantera {
doublereal* x = xg + loc();
doublereal* r = rg + loc();
integer* diag = diagg + loc();
integer *db;
// integer *db;
r[0] = x[0];
diag[0] = 0;

2
Makefile.in
View file

@ -171,8 +171,10 @@ finish-install:
@INSTALL@ README*.txt @prefix@/cantera
@INSTALL@ License.* @prefix@/cantera
@INSTALL@ tools/src/finish_install.py tools/bin
ifeq ($(os_is_win),0)
(PYTHONPATH=''; @PYTHON_CMD@ tools/bin/finish_install.py @prefix@ @PYTHON_CMD@)
chmod +x @ct_bindir@/ctnew
endif
#@INSTALL@ bin/ctmkmf @ct_bindir@/ctnew
#@INSTALL@ bin/cxx_examples @ct_demodir@/c++

18
config.h
View file

@ -1,4 +1,4 @@
/* ../config.h. Generated by configure. */
/* ../config.h. Generated automatically by configure. */
//
// Run the 'configure' script to generate 'config.h' from this input file.
//
@ -9,11 +9,11 @@
//------------------------ Fortran settings -------------------//
// define types doublereal, integer, and ftnlen to match the
// define types doublereal, integer, and ftnlen to match the
// corresponding Fortran data types on your system. The defaults
// are OK for most systems
typedef double doublereal; // Fortran double precision
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
@ -22,7 +22,7 @@ typedef int ftnlen; // Fortran hidden string length type
// adding a hidden argement with the length of the string. Some
// compilers add the hidden length argument immediately after the
// CHARACTER variable being passed, while others put all of the hidden
// length arguments at the end of the argument list. Define this if
// length arguments at the end of the argument list. Define this if
// the lengths are at the end of the argument list. This is usually the
// case for most unix Fortran compilers, but is (by default) false for
// Visual Fortran under Windows.
@ -37,7 +37,7 @@ typedef int ftnlen; // Fortran hidden string length type
//-------- LAPACK / BLAS ---------
// Define if you are using LAPACK and BLAS from the Intel Math Kernel
// Library
// Library
/* #undef HAVE_INTEL_MKL */
#define LAPACK_FTN_STRING_LEN_AT_END
@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type
//--------------------- Python ------------------------------------
// used to run Python to process .cti files
#define PYTHON_EXE "/home/goodwin/bin/python"
#define PYTHON_EXE "c:/python23/python"
//--------------------- Cantera -----------------------------------
//--------------------- Cantera -----------------------------------
// used to find data files
#define CANTERA_ROOT "/home/goodwin/cantera"
// used to find data files
#define CANTERA_ROOT "d:/dgg/ct153/cantera"

5320
config/configure vendored
View file

File diff suppressed because it is too large Load diff

52
config/configure.in
View file

@ -47,6 +47,10 @@ if test "x${prefix}" = "xNONE"; then
fi
fi
if test "x${OS_IS_WIN}" = "x1"; then
prefix=`cygpath -a -w "${prefix}" | sed 's/\\\/\\//g'`
fi
echo "Cantera will be installed in ${prefix}"
AC_SUBST(prefix)
@ -113,6 +117,10 @@ AC_SUBST(CANTERA_DATADIR)
ctroot=`(cd ..;pwd)`
if test "x${OS_IS_WIN}" = "x1"; then
ctroot=`cygpath -a -w "${ctroot}" | sed 's/\\\/\\//g'`
fi
if test -z "$username"; then username=$USER; fi
AC_SUBST(username)
@ -324,6 +332,9 @@ if test -z "$PYTHON_CMD"; then
AC_PATH_PROGS(PYTHON_CMD, python2 python, "none")
fi
if test "$PYTHON_CMD" != "none"; then
if test "$OS_IS_WIN" = "1"; then
PYTHON_CMD=`cygpath -a -w "$PYTHON_CMD" | sed 's/\\\/\\//g'`
fi
if test "$BUILD_PYTHON_INTERFACE" != "n"; then
BUILD_PYTHON=1; BUILD_CLIB=1
fi
@ -349,6 +360,10 @@ if test "$BUILD_MATLAB_TOOLBOX" != "n"; then
if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
fi
fi
if test "$OS_IS_WIN" = "1"; then
MATLAB_CMD=`cygpath -a -w "$MATLAB_CMD" | sed 's/\\\/\\//g'`
echo "Windows MATLAB command: ${MATLAB_CMD}"
fi
AC_SUBST(BUILD_MATLAB)
AC_SUBST(MATLAB_CMD)
AC_SUBST(BUILD_CLIB)
@ -510,38 +525,15 @@ AC_OUTPUT(../Cantera/Makefile \
../test_problems/diamondSurf/Makefile )
# )
cp -f ../config.h ../Cantera/src
echo
if test "x${OS_IS_WIN}" = 0; then
echo "Now type '${MAKE}' to build Cantera"
else
echo "Now start Visual Studio, open workspace 'win32/cantera.dsw',"
echo "and build project 'all'. When this finishes, type 'make-win'"
echo "to build the Python and MATLAB interfaces."
fi
echo
# $Log: configure.in,v