From 72ac34ec65b41b77a711acc67607e3be64720d98 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Thu, 18 Mar 2004 13:27:27 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/matlab/setup_winmatlab.py | 26 +++++++++-----------------
 Cantera/python/Cantera/Reactor.py | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Cantera/matlab/setup_winmatlab.py b/Cantera/matlab/setup_winmatlab.py
index fb6fc6f38..7f6c14517 100644
--- a/Cantera/matlab/setup_winmatlab.py
+++ b/Cantera/matlab/setup_winmatlab.py
@@ -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')
diff --git a/Cantera/python/Cantera/Reactor.py b/Cantera/python/Cantera/Reactor.py
index 5f49e3eaa..3a274cf16 100644
--- a/Cantera/python/Cantera/Reactor.py
+++ b/Cantera/python/Cantera/Reactor.py
@@ -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')