*** empty log message ***

Cantera/src/CVode.cpp

@@ -264,8 +264,8 @@ namespace Cantera {
             CVDiag(m_cvode_mem);
         }
         else if (m_type == GMRES) {
-            CVSpgmr(m_cvode_mem, NONE, MODIFIED_GS, 0, 0.0,
-                NULL, NULL, NULL);
+	  CVSpgmr(m_cvode_mem, NONE, MODIFIED_GS, 0, 0.0,
+	    NULL, NULL, NULL);
         }
         else {
             throw CVodeErr("unsupported option");

Cantera/src/transport/DustyGasTransport.cpp

@@ -60,6 +60,23 @@ namespace Cantera {
           m_gastran(0)
     {}
 
+        void DustyGasTransport::setParameters(int type, int k, doublereal* p) {
+            switch(type) {
+            case 0:
+                setPorosity(p[0]); break;
+            case 1:
+                setTortuosity(p[0]); break;
+            case 2:
+                setMeanPoreRadius(p[0]); break;
+            case 3:
+                setMeanParticleDiameter(p[0]); break;
+            case 4:
+                setPermeability(p[0]); break;
+            default:
+                throw CanteraError("DustyGasTransport::init",
+                    "unknown parameter");
+            }
+        }
 
     void DustyGasTransport::initialize(ThermoPhase* phase, Transport* gastr) {
 

Cantera/src/transport/DustyGasTransport.h

@@ -43,30 +43,17 @@ namespace Cantera {
     public:
 
 
+        /// default constructor
+      DustyGasTransport(thermo_t* thermo=0);
         virtual ~DustyGasTransport() {}
 
         // overloaded base class methods
         virtual int model() { return cDustyGasTransport; }
 
-        virtual void setParameters(int type, int k, doublereal* p) {
-            switch(type) {
-            case 0:
-                setPorosity(p[0]); break;
-            case 1:
-                setTortuosity(p[0]); break;
-            case 2:
-                setMeanPoreRadius(p[0]); break;
-            case 3:
-                setMeanParticleDiameter(p[0]); break;
-            case 4:
-                setPermeability(p[0]); break;
-            default:
-                throw CanteraError("DustyGasTransport::init",
-                    "unknown parameter");
-            }
-        }
+        virtual void setParameters(int type, int k, doublereal* p);
 
-        virtual void getBinaryDiffCoeffs(int ld, doublereal* d);
+
+        //virtual void getBinaryDiffCoeffs(int ld, doublereal* d);
         virtual void getMultiDiffCoeffs(int ld, doublereal* d);
 
 
@@ -103,7 +90,6 @@ namespace Cantera {
         /**
          * @internal
          */
-        virtual bool init(TransportParams& tr);
 
         void updateTransport_T();
         void updateTransport_C();
@@ -116,8 +102,6 @@ namespace Cantera {
         void updateMultiDiffCoeffs();
         void updateKnudsenDiffCoeffs();
         void eval_H_matrix();
-        /// default constructor
-        DustyGasTransport(thermo_t* thermo=0);
         void initialize(ThermoPhase* phase, Transport* gastr);
     private:
 

Cantera/src/transport/TransportFactory.cpp

@@ -245,10 +245,10 @@ namespace Cantera {
             tr->setThermo(*phase);
             break;
         case cDustyGasTransport:
-            tr = new DustyGasTransport;
-            gastr = new MixTransport;
-            dtr = (DustyGasTransport*)tr;
-            dtr->initialize(phase, gastr);
+	  tr = new DustyGasTransport;
+	  gastr = new MixTransport;
+	  dtr = (DustyGasTransport*)tr;
+	  dtr->initialize(phase, gastr);
             break;
         default:
             throw CanteraError("newTransport","unknown transport model");

Makefile.in

@@ -7,7 +7,7 @@
 ########################################################################
 
 export_dir = $(HOME)/sfdist
-version = 1.4
+version = 1.5.1
 ct = $(export_dir)/cantera-$(version)
 build_ck = @BUILD_CK@
 build_clib = @BUILD_CLIB@
@@ -17,7 +17,6 @@ os_is_win = @OS_IS_WIN@
 
 LIBDIR=@LIB_DIR@
 
-# removed utils temporarily
 all: kernel cxxlib hdr-collect clib python matlab utils
 
 win: python matlab
@@ -185,10 +184,9 @@ depends:
 
 export:
 	@INSTALL@ -d $(export_dir)
-	if (test -d $(ct)); then rm -r -f $(ct); fi
+	if (test -d $(export_dir)/cantera); then rm -r -f $(export_dir)/cantera; fi
 	cd $(export_dir); cvs export  -D 1/01/2010 cantera
-	cd $(export-dir); mv cantera $(ct)
-	cd $(ct); rm -r -f Cantera/matlab/cantera/@Thermo
+	cd $(export_dir); mv cantera cantera-$(version)
 
 pack: export
 	(cd $(export_dir); \
@@ -196,11 +194,6 @@ pack: export
           tar cvf cantera-$(version).tar cantera-$(version)/*; \
 	  gzip cantera-$(version).tar)
 
-post: pack
-	(cd $(export_dir); \
-	$(HOME)/ctpost cantera-$(version).tar.gz 1.3.5/src)
-
-
 info:
 	echo '#define CANTERA_ROOT "@prefix@/cantera"' > include/ctdir.h
 

tools/doc/Cantera.cfg

@@ -23,7 +23,7 @@ PROJECT_NAME           = Cantera
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.4
+PROJECT_NUMBER         = 1.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put.