git history cleaned up

git history squashed

sucessful dummy updateThermo

covdep initThermo() included

initThermo() compiled

for cpp test_script

linear model enthalpy tested

linearly dependent entropy

v0 of C++ CovDepSurfPhase Thermo

tested Python interface

branch ready for a pull request

uncommented covdepsurf alias in ThermoFactory

reference coverage, heat capacity, and polynomial model added

include/cantera/thermo/SurfPhase.h

@@ -375,7 +375,7 @@ class SurfPhase : public ThermoPhase
      *
      * This routine normalizes the theta's to 1, before application
      */
-    void setCoverages(const doublereal* theta);
+    virtual void setCoverages(const doublereal* theta);
 
     //! Set the surface site fractions to a specified state.
     /*!
@@ -387,7 +387,7 @@ class SurfPhase : public ThermoPhase
      * @param theta    This is the surface site fraction for the kth species in
      *                 the surface phase. This is a dimensionless quantity.
      */
-    void setCoveragesNoNorm(const doublereal* theta);
+    virtual void setCoveragesNoNorm(const doublereal* theta);
 
     //! Set the coverages from a string of colon-separated name:value pairs.
     /*!

interfaces/cython/cantera/_cantera.pyx

@@ -25,4 +25,4 @@ include "yamlwriter.pyx"
 include "mixture.pyx"
 include "reactor.pyx"
 include "onedim.pyx"
-include "reactionpath.pyx"
+include "reactionpath.pyx"

interfaces/cython/cantera/thermo.pyx

@@ -1578,11 +1578,15 @@ cdef class ThermoPhase(_SolutionBase):
 
 
 cdef class InterfacePhase(ThermoPhase):
-    """ A class representing a surface or edge phase"""
+    """ 
+    A class representing a surface, edge phase, 
+    or coverage-dependent surface
+    """
     def __cinit__(self, *args, **kwargs):
-        if pystr(self.thermo.type()) not in ("Surf", "Edge"):
+        if pystr(self.thermo.type()) in ("Surf", "Edge", "CovDepSurf"):
+            self.surf = <CxxSurfPhase*>(self.thermo)
+        else:
             raise TypeError('Underlying ThermoPhase object is of the wrong type.')
-        self.surf = <CxxSurfPhase*>(self.thermo)
 
     property site_density:
         """
@@ -1630,7 +1634,6 @@ cdef class InterfacePhase(ThermoPhase):
                  " Got {}, expected {}.".format(len(cov), self.n_species))
         self.surf.setCoveragesNoNorm(&data[0])
 
-
 cdef class PureFluid(ThermoPhase):
     """
     A pure substance that can  be a gas, a liquid, a mixed gas-liquid fluid,

src/thermo/ThermoFactory.cpp

@@ -25,6 +25,7 @@
 #include "cantera/thermo/RedlichKwongMFTP.h"
 #include "cantera/thermo/PengRobinson.h"
 #include "cantera/thermo/SurfPhase.h"
+#include "cantera/thermo/CoverageDependentSurfPhase.h"
 #include "cantera/thermo/EdgePhase.h"
 #include "cantera/thermo/MetalPhase.h"
 #include "cantera/thermo/StoichSubstance.h"
@@ -53,6 +54,9 @@ ThermoFactory::ThermoFactory()
     reg("ideal-surface", []() { return new SurfPhase(); });
     addAlias("ideal-surface", "Surface");
     addAlias("ideal-surface", "Surf");
+    reg("coverage-dependent-surface", []() { return new CoverageDependentSurfPhase(); });
+    addAlias("coverage-dependent-surface", "CoverageDependentSurface");
+    addAlias("coverage-dependent-surface", "CovDepSurf");
     reg("edge", []() { return new EdgePhase(); });
     addAlias("edge", "Edge");
     reg("electron-cloud", []() { return new MetalPhase(); });