*** empty log message ***

Cantera/matlab/cantera/private/thermomethods.cpp

@@ -80,13 +80,11 @@ static void thermoget( int nlhs, mxArray *plhs[],
             case 0:
                 vv = newThermoFromXML(n); break;
             case 2:
-                vv = th_enthalpy_mole(n);
-                break;
+                vv = th_enthalpy_mole(n); break;
             case 3:
                 vv = th_intEnergy_mole(n); break;
             case 4: 
-                vv = th_entropy_mole(n);
-                break;
+                vv = th_entropy_mole(n); break;
             case 5:
                 vv = th_gibbs_mole(n); break;
             case 6:
@@ -115,7 +113,22 @@ static void thermoget( int nlhs, mxArray *plhs[],
                 vv = th_maxTemp(n); break;
             case 18:
                 vv = double(th_eosType(n)); break;
-                
+#ifdef INCL_PURE_FLUIDS
+            case 19:
+                vv  = th_critTemperature(n); break;
+            case 20:
+                vv = th_critPressure(n); break;
+            case 21:
+                vv = th_critDensity(n); break;
+            case 22:
+                vv = th_vaporFraction(n); break;
+            case 23:
+                double p = getDouble(prhs[3]); 
+                vv = th_satTemperature(n, p); break;
+            case 24:
+                double t = getDouble(prhs[3]);
+                vv = th_satPressure(n, t); break;
+#endif
             default:
                 ok = false;
             }

Cantera/matlab/setup_winmatlab.py

@@ -1,27 +1,35 @@
 
 import sys
 
-bindir = '/usr/local/bin'
-libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.2.0'
-incdir = '/Users/dgg/dv/sf/cantera/build/include'
-libs   = '-lclib  -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx  -lg2c -lgcc'
+bindir = '/home/goodwin/ct153d/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']
 
 f = open('setup.m','w')
-f.write('cd cantera\nbuildux\nexit\n')
+f.write('cd cantera\nbuild_cantera\nexit\n')
 f.close()
 
-fb = open('cantera/buildux.m','w')
+fb = open('cantera/build_cantera.m','w')
 fb.write("""
 disp('building Cantera..');
-mex private/ctmethods.cpp private/ctfunctions.cpp ...
+mex -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/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')

Cantera/src/InterfaceKinetics.cpp

@@ -431,7 +431,6 @@ namespace Cantera {
             //    r.reactants, ordr);
             //}
 
-
 //         if (r.reactionType == ELEMENTARY_RXN)      
 //             addElementaryReaction(r);
 //         if (r.reactionType == SURFACE_RXN)