minor cleanup

Cantera/cxx/include/Interface.h

@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include "thermo"
 #include "kernel/SurfPhase.h"
 #include "kernel/InterfaceKinetics.h"
 #include "kernel/importKinetics.h"

Cantera/cxx/include/Metal.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "kernel/MetalPhase.h"
-#include "kernel/importCTML.h"
+#include "kernel/importKinetics.h"
 
 namespace Cantera {
 

Cantera/cxx/include/importPhase.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "kernel/ThermoPhase.h"
-#include "kernel/importCTML.h"
+#include "kernel/ThermoFactory.h"
 
 namespace Cantera {
 

Cantera/cxx/include/thermo.h

@@ -10,5 +10,6 @@
 #define CT_THERMO_INCL
 
 #include "kernel/ThermoFactory.h"
+#include "importPhase.h"
 
 #endif

Cantera/src/FILES

@@ -1,11 +0,0 @@
-CMD='cvs remove'
-$CMD BasisOptimize.cpp
-$CMD ChemEquil.cpp
-$CMD ChemEquil.h
-$CMD MultiPhase.cpp
-$CMD MultiPhase.h
-$CMD MultiPhaseEquil.cpp
-$CMD MultiPhaseEquil.h
-$CMD PropertyCalculator.h
-$CMD equil.h
-$CMD equilibrate.cpp

Cantera/src/kinetics/ReactionStoichMgr.cpp

@@ -19,7 +19,6 @@
 #include "ReactionStoichMgr.h"
 #include "StoichManager.h"
 #include "ctexceptions.h"
-#include "diagnostics.h"
 #include "ReactionData.h"
 
 using namespace std;

test_problems/surfkin/Interface.h

@@ -1,108 +0,0 @@
-/*
- * $Id$
- */
-#ifndef CXX_INTERFACE_H
-#define CXX_INTERFACE_H
-
-#include <string>
-#ifdef SRCDIRTREE
-#include "SurfPhase.h"
-#include "InterfaceKinetics.h"
-#include "importCTML.h"
-#else
-#include "kernel/SurfPhase.h"
-#include "kernel/InterfaceKinetics.h"
-#include "kernel/importCTML.h"
-#endif
-
-namespace Cantera {
-
-    /**
-     * The class interface inherits from both SurfPhase and
-     * InterferFaceKinetics
-     */
-    class Interface : 
-        public SurfPhase, public InterfaceKinetics
-    {
-    public:
-	/**
-	 *
-	 * Constructor for the interface class:
-	 *
-	 *  infile = name of the file to get information about the
-	 *           surface.
-	 *  id = name of the surface phase.
-	 *  phases = Pointer to the list of volume phases that participate
-	 *           in the interface
-	 *
-	 */
-        Interface(std::string infile, std::string id, std::vector<ThermoPhase*> phases) 
-            : m_ok(false), m_r(0) {
-            std::string path = findInputFile(infile);
-            std::ifstream fin(path.c_str());
-            if (!fin) {
-                throw CanteraError("Interface","could not open "
-                    +path+" for reading.");
-            }
-   
-
-	    /*
-	     * Create a top level xml node
-	     */
-            m_r = new XML_Node("-");
-	    /*
-	     * Fill the XML_Node with all of the information in the
-	     * xml file
-	     */
-            m_r->build(fin);
-
-
-	    /*
-	     * Find the start of the surface phase data in the xml file
-	     * Store a pointer to the position in the tree.
-	     */
-            XML_Node* x = get_XML_Node("#" + id, m_r);
-            if (!x) {
-	      throw CanteraError("Interface","error in find_XML");
-	    }
-
-	    /*
-	     * Import the values of the surface into the current object.
-	     * Note, since the current object inherits from SurfPhase
-	     * object, it contains all of the surfphase fields of the 
-	     * object. This operation fills all of those fields.
-	     */
-            importPhase(*x, this);
-            
-            phases.push_back(this);
-            importKinetics(*x, phases, this);
-            m_ok = true;
-        }
-
-	/**
-	 * Destructor for the Interface class. This is a virtual function, meaning
-	 * that after, it finishes with this class, it will call the destructor
-	 * functions for the two classes that Interface inherits from.
-	 */
-        virtual ~Interface() {
-	  /*
-	   * We created the XML data tree structure for the Interface object
-	   * in the constructor. Here, we delete the top level. of the structure.
-	   * I believe this delete all of the daughter elements as well.
-	   */
-	  delete m_r;
-	}
-
-        bool operator!() { return !m_ok;}
-        bool ready() const { return m_ok; }
-
-    protected:
-        bool m_ok;
-        XML_Node* m_r;
-
-    private:
-    };
-}
-
-
-#endif