From 0c2269a3573a30e07a39fe0d3e3fdba90ac96b18 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Wed, 14 Feb 2007 17:43:31 +0000
Subject: [PATCH] Made the function reportParams() in the SpeciesThermo class a
 const function. Added "None" to TransportBase.h. I think I had taken it out
 inadvertently from one of the other .h files. It's needed here to specify no
 transport. (maybe time for using enums)

---
 Cantera/src/GeneralSpeciesThermo.cpp  | 2 +-
 Cantera/src/GeneralSpeciesThermo.h    | 2 +-
 Cantera/src/NasaThermo.h              | 2 +-
 Cantera/src/ShomateThermo.h           | 2 +-
 Cantera/src/SimpleThermo.h            | 2 +-
 Cantera/src/SpeciesThermo.h           | 3 +--
 Cantera/src/SpeciesThermoMgr.h        | 5 ++---
 Cantera/src/transport/TransportBase.h | 1 +
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Cantera/src/GeneralSpeciesThermo.cpp b/Cantera/src/GeneralSpeciesThermo.cpp
index 0b6d24e11..bb576392f 100644
--- a/Cantera/src/GeneralSpeciesThermo.cpp
+++ b/Cantera/src/GeneralSpeciesThermo.cpp
@@ -178,7 +178,7 @@ namespace Cantera {
 		 doublereal * const c, 
 		 doublereal &minTemp, 
 		 doublereal &maxTemp, 
-		 doublereal &refPressure) {
+		 doublereal &refPressure) const {
 	SpeciesThermoInterpType *sp = m_sp[index];
 	int n;
 	sp->reportParameters(n, type, minTemp, maxTemp, 
diff --git a/Cantera/src/GeneralSpeciesThermo.h b/Cantera/src/GeneralSpeciesThermo.h
index 90a76ed09..62c8a65cc 100644
--- a/Cantera/src/GeneralSpeciesThermo.h
+++ b/Cantera/src/GeneralSpeciesThermo.h
@@ -89,7 +89,7 @@ namespace Cantera {
 				  doublereal * const c, 
 				  doublereal &minTemp, 
 				  doublereal &maxTemp,
-				  doublereal &refPressure);
+				  doublereal &refPressure) const;
 
  protected:
 
diff --git a/Cantera/src/NasaThermo.h b/Cantera/src/NasaThermo.h
index bbd24ca0d..d768f930e 100755
--- a/Cantera/src/NasaThermo.h
+++ b/Cantera/src/NasaThermo.h
@@ -317,7 +317,7 @@ namespace Cantera {
 			      doublereal * const c, 
 			      doublereal &minTemp, 
 			      doublereal &maxTemp, 
-			      doublereal &refPressure) {
+			      doublereal &refPressure) const {
       type = reportType(index);
       if (type == NASA) {
 	int grp = m_group_map[index];
diff --git a/Cantera/src/ShomateThermo.h b/Cantera/src/ShomateThermo.h
index 275b8d83b..aeb56aa7d 100755
--- a/Cantera/src/ShomateThermo.h
+++ b/Cantera/src/ShomateThermo.h
@@ -184,7 +184,7 @@ namespace Cantera {
 				  doublereal * const c, 
 				  doublereal &minTemp, 
 				  doublereal &maxTemp, 
-				  doublereal &refPressure) {
+				  doublereal &refPressure) const {
 	    type = reportType(index);
 	    if (type == SHOMATE) {
 	      int grp = m_group_map[index];
diff --git a/Cantera/src/SimpleThermo.h b/Cantera/src/SimpleThermo.h
index 527770451..9f347db76 100644
--- a/Cantera/src/SimpleThermo.h
+++ b/Cantera/src/SimpleThermo.h
@@ -100,7 +100,7 @@ namespace Cantera {
 				  doublereal * const c, 
 				  doublereal &minTemp, 
 				  doublereal &maxTemp, 
-				  doublereal &refPressure) {
+				  doublereal &refPressure) const {
 	    type = reportType(index);
             int loc = m_loc[index];
 	    if (type == SIMPLE) {
diff --git a/Cantera/src/SpeciesThermo.h b/Cantera/src/SpeciesThermo.h
index 18e646a66..0d3ecdea0 100755
--- a/Cantera/src/SpeciesThermo.h
+++ b/Cantera/src/SpeciesThermo.h
@@ -249,13 +249,12 @@ namespace Cantera {
      * @param maxTemp   output - Maximum temperature
      * @param refPressure output - reference pressure (Pa).
      *
-     * @todo should be a const function.
      */
     virtual void reportParams(int index, int &type, 
 			      doublereal * const c, 
 			      doublereal &minTemp, 
 			      doublereal &maxTemp, 
-			      doublereal &refPressure) =0;
+			      doublereal &refPressure) const =0;
 
     //! Modify parameters for the standard state
     /*!
diff --git a/Cantera/src/SpeciesThermoMgr.h b/Cantera/src/SpeciesThermoMgr.h
index d034859e4..63b2c16a4 100755
--- a/Cantera/src/SpeciesThermoMgr.h
+++ b/Cantera/src/SpeciesThermoMgr.h
@@ -292,13 +292,12 @@ namespace Cantera {
      * @param maxTemp   output - Maximum temperature
      * @param refPressure output - reference pressure (Pa).
      *
-     * @todo should be a const function.
      */
     virtual void reportParams(int index, int &type, 
 			      doublereal * const c, 
 			      doublereal &minTemp, 
 			      doublereal &maxTemp, 
-			      doublereal &refPressure) {
+			      doublereal &refPressure) const {
       int ctype = reportType(index);
       if (ctype == m_thermo1.ID) {
 	m_thermo1.reportParams(index, type, c, minTemp, maxTemp, 
@@ -450,7 +449,7 @@ namespace Cantera {
 			      doublereal * const c, 
 			      doublereal &minTemp, 
 			      doublereal &maxTemp, 
-			     doublereal &refPressure) {
+			     doublereal &refPressure) const {
      m_thermo[index]->reportParameters(index, type, c, minTemp, maxTemp, refPressure);
    }
 
diff --git a/Cantera/src/transport/TransportBase.h b/Cantera/src/transport/TransportBase.h
index c2c1efbd4..66e8273fe 100755
--- a/Cantera/src/transport/TransportBase.h
+++ b/Cantera/src/transport/TransportBase.h
@@ -25,6 +25,7 @@ namespace Cantera {
     const int CK_Mode = 10;
 
     // types of transport models that can be constructed
+    const int None                 = 199;
     const int cMulticomponent      = 200;
     const int CK_Multicomponent    = 202;
     const int cMixtureAveraged     = 210;