From 542c890db6b04372fe01c900f9589496198b034a Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Fri, 21 May 2004 22:33:14 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/src/transport/MMCollisionInt.cpp   | 7 ++++---
 Cantera/src/transport/MMCollisionInt.h     | 2 +-
 Cantera/src/transport/TransportFactory.cpp | 2 +-
 Makefile.in                                | 3 +++
 tools/src/finish_install.py.in             | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Cantera/src/transport/MMCollisionInt.cpp b/Cantera/src/transport/MMCollisionInt.cpp
index e615fcc65..f872482e8 100755
--- a/Cantera/src/transport/MMCollisionInt.cpp
+++ b/Cantera/src/transport/MMCollisionInt.cpp
@@ -410,7 +410,7 @@ namespace Cantera {
                 values.begin());        }
 
 
-    void MMCollisionInt::fit_omega22(int degree, 
+    void MMCollisionInt::fit_omega22(ostream& logfile, int degree, 
         doublereal deltastar, doublereal* o22) 
     {
 
@@ -429,8 +429,9 @@ namespace Cantera {
         rmserr = polyfit(n, logT, values.begin(), 
             w.begin(), degree, ndeg, 0.0, o22);
         if (rmserr > 0.01) {
-            cerr << "Warning: RMS error = " << rmserr << " for omega_22 fit "
-                 << "with delta* = " << deltastar << endl;
+            char p[100];
+            sprintf(p, "Warning: RMS error = %12.6g in omega_22 fit with delta* = %12.6g\n", rmserr, deltastar);
+            m_xml->XML_comment(logfile, p);
         }
     }
 
diff --git a/Cantera/src/transport/MMCollisionInt.h b/Cantera/src/transport/MMCollisionInt.h
index d0b8b4c8e..2cfd4a7b0 100755
--- a/Cantera/src/transport/MMCollisionInt.h
+++ b/Cantera/src/transport/MMCollisionInt.h
@@ -67,7 +67,7 @@ namespace Cantera {
         void fit(ostream& logfile, int degree, doublereal deltastar,
             doublereal* astar, doublereal* bstar, doublereal* cstar);
 
-        void fit_omega22(int degree, doublereal deltastar, doublereal* om22);
+        void fit_omega22(ostream& logfile, int degree, doublereal deltastar, doublereal* om22);
         doublereal omega11(double tstar, double deltastar) {
             return omega22(tstar, deltastar)/astar(tstar, deltastar); 
         }    
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index 8fc746476..94ae9d300 100755
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -510,7 +510,7 @@ namespace Cantera {
                     vector_fp co22(degree+1);
                     m_integrals->fit(logfile, degree, dstar,  
                         ca.begin(), cb.begin(), cc.begin());
-                    m_integrals->fit_omega22(degree, dstar,
+                    m_integrals->fit_omega22(logfile, degree, dstar,
                         co22.begin());
                     tr.omega22_poly.push_back(co22);
                     tr.astar_poly.push_back(ca);
diff --git a/Makefile.in b/Makefile.in
index ce015961c..dee4f91bb 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,6 +216,9 @@ test: example_codes datafiles
 run-matlab-demo:
 	cd Cantera/matlab; @MAKE@ run-demo
 
+run-python-demo:
+	cd Cantera/python; @MAKE@ run-demo
+
 datafiles:
 	cd data/inputs; @MAKE@
 
diff --git a/tools/src/finish_install.py.in b/tools/src/finish_install.py.in
index 04fb30536..b03a6a3e2 100644
--- a/tools/src/finish_install.py.in
+++ b/tools/src/finish_install.py.in
@@ -85,6 +85,7 @@ fm.write("""ctpath;\n""")
 fm.write("""cd demos/matlab;\n""")
 fm.write("""run_examples;\n""")
 fm.close()
+
 print """
 
 Cantera has been successfully installed.