From 7d15ee51b9c94610c47713e1476069038b745457 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 11 Jul 2009 17:24:00 +0000 Subject: [PATCH] Changes to the setup_winmatlab files. Note, this is not complete yet. --- Cantera/matlab/cantera/build_cantera_static.m | 33 +++++++++++ Cantera/matlab/setup_winmatlab.py.in | 56 +++++++++++++++++++ Cantera/matlab/setup_winmatlab_static.py | 56 +++++++++++++++++++ Cantera/matlab/setup_winmatlab_static.py.in | 56 +++++++++++++++++++ 4 files changed, 201 insertions(+) create mode 100755 Cantera/matlab/cantera/build_cantera_static.m create mode 100644 Cantera/matlab/setup_winmatlab.py.in create mode 100755 Cantera/matlab/setup_winmatlab_static.py create mode 100755 Cantera/matlab/setup_winmatlab_static.py.in diff --git a/Cantera/matlab/cantera/build_cantera_static.m b/Cantera/matlab/cantera/build_cantera_static.m new file mode 100755 index 000000000..f74fca90a --- /dev/null +++ b/Cantera/matlab/cantera/build_cantera_static.m @@ -0,0 +1,33 @@ + +disp('building Cantera as a statically linked mex application ...'); +mex -v -Ic:/vc_env/cant17/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 ... + private/reactornetmethods.cpp ... + private/wallmethods.cpp private/flowdevicemethods.cpp ... + private/funcmethods.cpp ... + private/mixturemethods.cpp ... + private/onedimmethods.cpp private/surfmethods.cpp ... + c:/vc_env/cant17/build/lib/i686-pc-win32/clibstatic.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/oneD.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/zeroD.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/transport.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/equil.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/kinetics.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/thermo.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/numerics.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/converters.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/base.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctcxx.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/tpx.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/NVEC_SER.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/CVODES.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/SUNDIALS_SHARED.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctmath.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctlapack.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctblas.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctf2c.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctlapack.lib ... + c:/vc_env/cant17/build/lib/i686-pc-win32/ctblas.lib ... + diff --git a/Cantera/matlab/setup_winmatlab.py.in b/Cantera/matlab/setup_winmatlab.py.in new file mode 100644 index 000000000..618f19a2a --- /dev/null +++ b/Cantera/matlab/setup_winmatlab.py.in @@ -0,0 +1,56 @@ + +import sys + +bindir = '@ct_bindir@' +libdir = '@buildlib@' +incdir = '@buildinc@' +dflibdir = '' + +bllibstr = "-lctlapack -lctblas" +bllibs = bllibstr.replace('-l',' ') +bllist = bllibs.split() + +bldir = "@buildlib@" + +libs = ['clib'] + +f = open('setup.m','w') +f.write('cd cantera\nbuild_cantera\nexit\n') +f.close() + +fb = open('cantera/build_cantera.m','w') +fb.write(""" +disp('building Cantera..'); +mex -g -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ... + private/xmlmethods.cpp private/phasemethods.cpp ... + private/thermomethods.cpp private/kineticsmethods.cpp ... + private/transportmethods.cpp private/reactormethods.cpp ... + private/reactornetmethods.cpp ... + private/wallmethods.cpp private/flowdevicemethods.cpp ... + private/funcmethods.cpp ... + private/mixturemethods.cpp ... + private/onedimmethods.cpp private/surfmethods.cpp ... +""") +s = '' +for lib in libs: + s += ' '+libdir+'/'+lib+'.lib ...\n' +fb.write(s) +if bllist: + s = '' + for lib in bllist: + s += ' '+bldir+'/'+lib+'.lib ...\n' + fb.write(s) +# fb.write(' "'+dflibdir+'/dformd.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfconsol.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfport.lib" \n') + +fb.write(' \n') + +fb.close() + +fp = open('cantera/ctbin.m','w') +fp.write("""function path = ctbin +path = '"""+bindir+"""'; +""") +fp.close() + diff --git a/Cantera/matlab/setup_winmatlab_static.py b/Cantera/matlab/setup_winmatlab_static.py new file mode 100755 index 000000000..a0c860588 --- /dev/null +++ b/Cantera/matlab/setup_winmatlab_static.py @@ -0,0 +1,56 @@ + +import sys + +bindir = 'C:/cygwin/usr/local/cantera/bin' +libdir = 'c:/vc_env/cant17/build/lib/i686-pc-win32' +incdir = 'c:/vc_env/cant17/build/include' +dflibdir = '' + +bllibstr = "-lctlapack -lctblas" +bllibs = bllibstr.replace('-l',' ') +bllist = bllibs.split() + +bldir = "c:/vc_env/cant17/build/lib/i686-pc-win32" + +libs = ['clib', 'oneD', 'zeroD', 'transport', 'equil', 'kinetics', 'thermo', 'numerics', 'converters', 'base', + 'ctcxx', 'tpx', 'NVEC_SER', 'CVODES', 'SUNDIALS_SHARED', 'ctmath', 'ctlapack', 'ctblas', 'ctf2c'] + +f = open('setup.m','w') +f.write('cd cantera\nbuild_cantera\nexit\n') +f.close() + +fb = open('cantera/build_cantera.m','w') +fb.write(""" +disp('building Cantera..'); +mex -v -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ... + private/xmlmethods.cpp private/phasemethods.cpp ... + private/thermomethods.cpp private/kineticsmethods.cpp ... + private/transportmethods.cpp private/reactormethods.cpp ... + private/reactornetmethods.cpp ... + private/wallmethods.cpp private/flowdevicemethods.cpp ... + private/funcmethods.cpp ... + private/mixturemethods.cpp ... + private/onedimmethods.cpp private/surfmethods.cpp ... +""") +s = '' +for lib in libs: + s += ' '+libdir+'/'+lib+'.lib ...\n' +fb.write(s) +if bllist: + s = '' + for lib in bllist: + s += ' '+bldir+'/'+lib+'.lib ...\n' + fb.write(s) +# fb.write(' "'+dflibdir+'/dformd.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfconsol.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfport.lib" \n') +fb.write(' \n') + +fb.close() + +fp = open('cantera/ctbin.m','w') +fp.write("""function path = ctbin +path = '"""+bindir+"""'; +""") +fp.close() + diff --git a/Cantera/matlab/setup_winmatlab_static.py.in b/Cantera/matlab/setup_winmatlab_static.py.in new file mode 100755 index 000000000..a0c860588 --- /dev/null +++ b/Cantera/matlab/setup_winmatlab_static.py.in @@ -0,0 +1,56 @@ + +import sys + +bindir = 'C:/cygwin/usr/local/cantera/bin' +libdir = 'c:/vc_env/cant17/build/lib/i686-pc-win32' +incdir = 'c:/vc_env/cant17/build/include' +dflibdir = '' + +bllibstr = "-lctlapack -lctblas" +bllibs = bllibstr.replace('-l',' ') +bllist = bllibs.split() + +bldir = "c:/vc_env/cant17/build/lib/i686-pc-win32" + +libs = ['clib', 'oneD', 'zeroD', 'transport', 'equil', 'kinetics', 'thermo', 'numerics', 'converters', 'base', + 'ctcxx', 'tpx', 'NVEC_SER', 'CVODES', 'SUNDIALS_SHARED', 'ctmath', 'ctlapack', 'ctblas', 'ctf2c'] + +f = open('setup.m','w') +f.write('cd cantera\nbuild_cantera\nexit\n') +f.close() + +fb = open('cantera/build_cantera.m','w') +fb.write(""" +disp('building Cantera..'); +mex -v -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ... + private/xmlmethods.cpp private/phasemethods.cpp ... + private/thermomethods.cpp private/kineticsmethods.cpp ... + private/transportmethods.cpp private/reactormethods.cpp ... + private/reactornetmethods.cpp ... + private/wallmethods.cpp private/flowdevicemethods.cpp ... + private/funcmethods.cpp ... + private/mixturemethods.cpp ... + private/onedimmethods.cpp private/surfmethods.cpp ... +""") +s = '' +for lib in libs: + s += ' '+libdir+'/'+lib+'.lib ...\n' +fb.write(s) +if bllist: + s = '' + for lib in bllist: + s += ' '+bldir+'/'+lib+'.lib ...\n' + fb.write(s) +# fb.write(' "'+dflibdir+'/dformd.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfconsol.lib" ...\n') +# fb.write(' "'+dflibdir+'/dfport.lib" \n') +fb.write(' \n') + +fb.close() + +fp = open('cantera/ctbin.m','w') +fp.write("""function path = ctbin +path = '"""+bindir+"""'; +""") +fp.close() +