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

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2004-03-18 13:27:27 +00:00
parent b3a93657d0
commit 72ac34ec65
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Cantera/matlab/setup_winmatlab.py
View file

@ -1,35 +1,27 @@
import sys
bindir = '/home/goodwin/ctt/bin'
libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu'
incdir = '/home/goodwin/dv/sf/cantera/build/include'
dflibdir = ''
libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes',
'cvode', 'ctlapack', 'ctmath', 'ctblas', 'tpx']
bindir = '/usr/local/bin'
libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.3.0'
incdir = '/Users/dgg/dv/sf/cantera/build/include'
libs = '-lclib -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -lgcc'
f = open('setup.m','w')
f.write('cd cantera\nbuild_cantera\nexit\n')
f.write('cd cantera\nbuildux\nexit\n')
f.close()
fb = open('cantera/build_cantera.m','w')
fb = open('cantera/buildux.m','w')
fb.write("""
disp('building Cantera..');
mex -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ...
mex 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/wallmethods.cpp private/flowdevicemethods.cpp ...
private/funcmethods.cpp ...
private/onedimmethods.cpp private/surfmethods.cpp private/write.cpp ...
"""+'-I'+incdir+' -L'+libdir+' '+libs+'\n'+"""disp('done.');
""")
s = ''
for lib in libs:
s += ' '+libdir+'/'+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.close()
fp = open('cantera/ctbin.m','w')

17
Cantera/python/Cantera/Reactor.py
View file

@ -156,6 +156,15 @@ class ReactorBase:
self._contents.setMassFractions(y)
return self._contents.moleFractions()
def moleFraction(self, k):
"""Mole fraction of species k."""
if type(k) == types.StringType:
kk = self._contents.speciesIndex(k)
else:
kk = k
x = self.moleFractions()
return x[kk]
def inlets(self):
"""Return the list of flow devices installed on inlets to this reactor."""
return self._inlets
@ -197,7 +206,7 @@ class ReactorBase:
_reactorcount = 0
_reserviorcount = 0
_reservoircount = 0
class Reactor(ReactorBase):
"""
@ -326,14 +335,16 @@ class MassFlowController(FlowDevice):
_valvecount = 0
class Valve(FlowDevice):
def __init__(self, upstream=None, downstream=None, name='', verbose=0):
def __init__(self, upstream=None, downstream=None,
name='', K = 0.0, verbose=0):
global _valvecount
if name == '':
name = 'Valve_'+`_valvecount`
_valvecount += 1
FlowDevice.__init__(self,3,name,verbose)
if upstream and downstream:
self.install(upstream, downstream)
self.install(upstream, downstream)
self.setValveCoeff(K)
def setValveCoeff(self, v):
vv = zeros(1,'d')