*** empty log message ***

Cantera/matlab/cantera/buildux.m

@@ -5,5 +5,5 @@ mex private/ctmethods.cpp private/ctfunctions.cpp ...
     private/thermomethods.cpp private/kineticsmethods.cpp ...
     private/transportmethods.cpp private/reactormethods.cpp ...
     private/wallmethods.cpp private/flowdevicemethods.cpp ...
-     -L/home/goodwin/dv/cantera-1.4/lib -lct14 -loneD -lzeroD -ltransport -lconverters -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas   -L/usr/lib/gcc-lib/i386-redhat-linux/2.96 -L/usr/lib/gcc-lib/i386-redhat-linux/2.96/../../.. -lg2c -lm
+     -L/Users/dgg/dv/sf/cantera/lib -lct14 -loneD -lzeroD -ltransport -lconverters -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas  -lg2c -lgcc
 disp('done.');

Cantera/src/ChemEquil.cpp

@@ -33,6 +33,19 @@ using namespace std;
 
 namespace Cantera {
 
+    int _equilflag(char* xy) {
+        string flag = string(xy);
+        if (flag == "TP") return TP;
+        else if (flag == "TV") return TV;
+        else if (flag == "HP") return HP;
+        else if (flag == "UV") return UV;
+        else if (flag == "SP") return SP;
+        else if (flag == "SV") return SV;
+        else if (flag == "UP") return UP;
+        else throw CanteraError("_equilflag","unknown property pair "+flag);
+        }
+
+
     //-----------------------------------------------------------
     //                 construction / destruction 
     //-----------------------------------------------------------

Cantera/src/ChemEquil.h

@@ -32,6 +32,8 @@ using namespace std;
 
 namespace Cantera {
 
+    static int _equilflag(char* xy);
+
     /**
      *  Chemical equilibrium options. Used internally by class ChemEquil.
      */
@@ -142,29 +144,6 @@ namespace Cantera {
     };
 
 
-    //-----------------------------------------------------------
-    //                 exceptions
-    //-----------------------------------------------------------
-
-//     class ChemEquilError : public CanteraError {
-//     public:
-//         ChemEquilError(string msg = "") {
-//             if (msg == "")
-//                 m_msg += "Exception thrown in class ChemEquil.\n";
-//             else
-//                 m_msg += msg;
-//         }
-//     };
-
-
-//     class IllegalPropertyPair : public ChemEquilError {
-//     public:
-//         IllegalPropertyPair(int XY) {
-//             m_msg += "Illegal property pair flag: " + int2str(XY) + "\n";
-//         }
-//     };
-
-
     //-----------------------------------------------------------
     //              convenience functions
     //-----------------------------------------------------------
@@ -176,13 +155,17 @@ namespace Cantera {
      */
     inline void equilibrate(thermo_t& s, int XY) {
         ChemEquil e;
-        //try {
         e.equilibrate(s,XY);
-            //}
+    }
-            //catch (CanteraError) {
+
-            //throw CanteraError("equilibrate",
+    /**
-            //    "equilibrium error ");
+     * Set a mixture to a state of chemical equilibrium. The flag 'XY'
-            //}
+     * determines the two properties that will be held fixed in the
+     * calculation.
+     */
+    inline void equilibrate(thermo_t& s, char* XY) {
+        ChemEquil e;
+        e.equilibrate(s,_equilflag(XY));
     }
 
 }

Makefile.in

@@ -19,7 +19,7 @@ LIBDIR=@LIB_DIR@
 # removed utils temporarily
 all: kernel movelibs clib python matlab 
 
-install: hdr-install kernel-install data-install python-install matlab-install finish-install
+install: hdr-install kernel-install data-install python-install matlab-install tools-install finish-install
 
 demos: example_codes
 
@@ -49,11 +49,13 @@ kernel-install:
 
 data-install:
 	@INSTALL@ -d @prefix@/cantera/data
-	@INSTALL@ -d @prefix@/cantera/templates
 	@INSTALL@ -m 644 data/inputs/*.xml @prefix@/cantera/data
-	@INSTALL@ -m 644 tools/src/*.mak @prefix@/cantera/templates
+
 	#@INSTALL@ -m 644 tools/templates/gaslib.cpp @prefix@/cantera/templates
 
+tools-install:
+	cd tools; make install
+
 hdr-install:
 	@INSTALL@ -d @prefix@/include/cantera
 	@INSTALL@ -d @prefix@/include/kernel
@@ -85,6 +87,8 @@ ifeq ($(build_python),1)
 	@INSTALL@ -d @prefix@/cantera/tutorials/python
 	@INSTALL@ Cantera/python/tutorial/*.py \
                 @prefix@/cantera/tutorials/python
+	chown -R @username@ @prefix@/cantera/demos/python
+	chown -R @username@ @prefix@/cantera/tutorials/python
 endif
 
 matlab:
@@ -99,12 +103,15 @@ ifeq ($(build_matlab),1)
 	@INSTALL@ Cantera/matlab/cantera/examples/*.m @prefix@/cantera/demos/matlab
 	@INSTALL@ -d @prefix@/cantera/tutorials/matlab
 	@INSTALL@ Cantera/matlab/cantera/tutorial/*.m @prefix@/cantera/tutorials/matlab
+	chown -R @username@ @prefix@/cantera/demos/matlab
+	chown -R @username@ @prefix@/cantera/tutorials/matlab
 endif
 
 finish-install:
 	@INSTALL@ -d @prefix@/bin
 	@INSTALL@ -d @prefix@/cantera/demos/c++
 	@INSTALL@ examples/cxx/*.cpp @prefix@/cantera/demos/c++
+	@INSTALL@ -d @prefix@/cantera/demos/f77
 	@PYTHON_CMD@ tools/bin/finish_install.py @prefix@ @PYTHON_CMD@
 #@INSTALL@ bin/ctmkmf @prefix@/bin/ctnew
 #@INSTALL@ bin/cxx_examples @prefix@/cantera/demos/c++
@@ -124,9 +131,8 @@ uninstall:
 	rm -f @prefix@/lib/lib@CT_SHARED_LIB@.a
 
 clean:
-	$(RM) *.*~ lib/Cantera.a lib/libckreader.a lib/*.a lib/*.so bin/ck2ctml bin/ctsetup bin/cxx_examples
+	$(RM) *.*~ lib/Cantera.a lib/*.a lib/*.so bin/ck2ctml bin/ctsetup bin/cxx_examples
 	cd Cantera; @MAKE@ clean
-	cd CKReader; @MAKE@ clean
 	cd tools; @MAKE@ clean
 	cd ext; @MAKE@ clean
 	cd test_problems; @MAKE@ clean
@@ -136,7 +142,6 @@ docs:
 	cd tools/doxygen/Cantera; doxygen Cantera.cfg
 
 depends:
-	cd CKReader; @MAKE@ depends
 	cd Cantera; @MAKE@ depends
 	cd tools; @MAKE@ depends