From bb2e6897d7864f1235a94d49e2b7e190b35fed90 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Fri, 3 Mar 2006 23:21:06 +0000
Subject: [PATCH] solaris warned about string literals being assigned to char
 *. So, I changed it so that the species name is storred within the object.

---
 ext/tpx/CarbonDioxide.cpp | 8 ++++++--
 ext/tpx/CarbonDioxide.h   | 7 +++++--
 ext/tpx/HFC134a.cpp       | 8 ++++++--
 ext/tpx/HFC134a.h         | 5 ++++-
 ext/tpx/Heptane.cpp       | 8 ++++++--
 ext/tpx/Heptane.h         | 5 ++++-
 ext/tpx/Hydrogen.cpp      | 8 ++++++--
 ext/tpx/Hydrogen.h        | 5 ++++-
 ext/tpx/Methane.cpp       | 8 ++++++--
 ext/tpx/Methane.h         | 5 ++++-
 ext/tpx/Nitrogen.cpp      | 4 ++--
 ext/tpx/Nitrogen.h        | 5 ++++-
 ext/tpx/Oxygen.cpp        | 4 ++--
 ext/tpx/Oxygen.h          | 5 ++++-
 ext/tpx/RedlichKwong.h    | 6 ++++--
 ext/tpx/Sub.h             | 2 ++
 ext/tpx/Water.cpp         | 8 ++++++--
 ext/tpx/Water.h           | 5 ++++-
 ext/tpx/lk.cpp            | 8 ++++++--
 ext/tpx/lk.h              | 2 ++
 20 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/ext/tpx/CarbonDioxide.cpp b/ext/tpx/CarbonDioxide.cpp
index 276fd370c..4f80d2bbe 100755
--- a/ext/tpx/CarbonDioxide.cpp
+++ b/ext/tpx/CarbonDioxide.cpp
@@ -351,8 +351,12 @@ double CarbonDioxide::Pcrit() {return Pc;}
 double CarbonDioxide::Vcrit() {return 1.0/Roc;}
 double CarbonDioxide::Tmin() {return Tmn;}
 double CarbonDioxide::Tmax() {return Tmx;}
-char * CarbonDioxide::name() {return "CarbonDioxide";}
-char * CarbonDioxide::formula() {return "CO2";}
+char * CarbonDioxide::name() {
+ return (char *) m_name.c_str() ;
+}
+char * CarbonDioxide::formula() {
+  return (char *) m_formula.c_str();
+}
 double CarbonDioxide::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/CarbonDioxide.h b/ext/tpx/CarbonDioxide.h
index 018c55649..ed3467616 100755
--- a/ext/tpx/CarbonDioxide.h
+++ b/ext/tpx/CarbonDioxide.h
@@ -17,8 +17,11 @@ namespace tpx {
 
 class CarbonDioxide : public Substance{
 public:
-    CarbonDioxide(){}
-        virtual ~CarbonDioxide() {}
+    CarbonDioxide() {
+      m_name="CarbonDioxide";
+      m_formula="CO2";
+     }
+    virtual ~CarbonDioxide() {}
 
     double MolWt();
     double Tcrit();
diff --git a/ext/tpx/HFC134a.cpp b/ext/tpx/HFC134a.cpp
index d1ae9916b..091563ada 100755
--- a/ext/tpx/HFC134a.cpp
+++ b/ext/tpx/HFC134a.cpp
@@ -169,8 +169,12 @@ namespace tpx {
     double HFC134a::Vcrit() {return 1.0/511.95;}
     double HFC134a::Tmin() {return Tmn;}
     double HFC134a::Tmax() {return Tmx;}
-    char * HFC134a::name() {return "HFC-134a";}
-    char * HFC134a::formula() {return "C2F4H2";}
+    char * HFC134a::name() {
+      return (char *) m_name.c_str();
+    }
+    char * HFC134a::formula() {
+      return (char *) m_formula.c_str();
+    }
     double HFC134a::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/HFC134a.h b/ext/tpx/HFC134a.h
index 6c203a5be..25ab1573b 100755
--- a/ext/tpx/HFC134a.h
+++ b/ext/tpx/HFC134a.h
@@ -6,7 +6,10 @@
 namespace tpx {
     class HFC134a : public Substance {
     public:
-	HFC134a(){}
+	HFC134a(){
+          m_name = "HFC-134a";
+          m_formula = "C2F4H2";
+        }
         ~HFC134a(){}
 
 	double MolWt();
diff --git a/ext/tpx/Heptane.cpp b/ext/tpx/Heptane.cpp
index 62b81eed9..36a9580f8 100755
--- a/ext/tpx/Heptane.cpp
+++ b/ext/tpx/Heptane.cpp
@@ -305,7 +305,11 @@ double Heptane::Pcrit() {return Pc;}
 double Heptane::Vcrit() {return 1.0/Roc;}
 double Heptane::Tmin() {return Tmn;}
 double Heptane::Tmax() {return Tmx;}
-char * Heptane::name() {return "Heptane";}
-char * Heptane::formula() {return "C7H16";}
+char * Heptane::name() {
+return (char *) m_name.c_str();
+}
+char * Heptane::formula() {
+return (char *) m_formula.c_str();
+}
 double Heptane::MolWt() {return M;}
 }
diff --git a/ext/tpx/Heptane.h b/ext/tpx/Heptane.h
index 121732552..b561dc727 100755
--- a/ext/tpx/Heptane.h
+++ b/ext/tpx/Heptane.h
@@ -18,7 +18,10 @@ namespace tpx {
 
 class Heptane : public Substance{
 public:
-    Heptane(){}
+    Heptane(){
+      m_name = "Heptane";
+      m_formula = "C7H16";
+    }
         virtual ~Heptane() {}
 
     double MolWt();
diff --git a/ext/tpx/Hydrogen.cpp b/ext/tpx/Hydrogen.cpp
index 6b27576dc..246077368 100755
--- a/ext/tpx/Hydrogen.cpp
+++ b/ext/tpx/Hydrogen.cpp
@@ -251,8 +251,12 @@ return exp(result)*Pt;
  double hydrogen::Vcrit() {return 1.0/Roc;}
  double hydrogen::Tmin() {return Tmn;}
  double hydrogen::Tmax() {return Tmx;}
- char * hydrogen::name() {return "hydrogen";}
- char * hydrogen::formula() {return "H2";}
+ char * hydrogen::name() {
+   return (char *) m_name.c_str();
+ }
+ char * hydrogen::formula() {
+   return (char *) m_formula.c_str();
+ }
  double hydrogen::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/Hydrogen.h b/ext/tpx/Hydrogen.h
index 65d3a1af1..7a8a2e588 100755
--- a/ext/tpx/Hydrogen.h
+++ b/ext/tpx/Hydrogen.h
@@ -7,7 +7,10 @@ namespace tpx {
 
 class hydrogen : public Substance{
 public:
-	hydrogen(){}
+	hydrogen(){
+          m_name = "hydrogen";
+          m_formula = "H2";
+        }
         virtual ~hydrogen() {}
 
 	double MolWt();
diff --git a/ext/tpx/Methane.cpp b/ext/tpx/Methane.cpp
index 383af185e..9b30446d3 100755
--- a/ext/tpx/Methane.cpp
+++ b/ext/tpx/Methane.cpp
@@ -205,8 +205,12 @@ return result;
  double methane::Vcrit() {return 1.0/Roc;}
  double methane::Tmin() {return Tmn;}
  double methane::Tmax() {return Tmx;}
- char * methane::name() {return "methane";}
- char * methane::formula() {return "CH4";}
+ char * methane::name() {
+    return (char *) m_name.c_str();
+ }
+ char * methane::formula() {
+    return (char *) m_formula.c_str();
+ }
  double methane::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/Methane.h b/ext/tpx/Methane.h
index 8923b77bd..bb22606f0 100755
--- a/ext/tpx/Methane.h
+++ b/ext/tpx/Methane.h
@@ -7,7 +7,10 @@ namespace tpx {
 
     class methane : public Substance{
     public:
-        methane(){}
+        methane() {
+          m_name = "methane";
+          m_formula = "CH4";
+        }
         virtual ~methane() {}
 
         double MolWt();
diff --git a/ext/tpx/Nitrogen.cpp b/ext/tpx/Nitrogen.cpp
index b628b9e58..dfa4a1844 100755
--- a/ext/tpx/Nitrogen.cpp
+++ b/ext/tpx/Nitrogen.cpp
@@ -215,7 +215,7 @@ namespace tpx {
     double nitrogen::Vcrit() {return 1.0/Roc;}
     double nitrogen::Tmin() {return Tmn;}
     double nitrogen::Tmax() {return Tmx;}
-    char * nitrogen::name() {return "nitrogen";}
-    char * nitrogen::formula() {return "N2";}
+    char * nitrogen::name() {return (char *) m_name.c_str();}
+    char * nitrogen::formula() {return (char *) m_formula.c_str();}
     double nitrogen::MolWt() {return M;}    
 }
diff --git a/ext/tpx/Nitrogen.h b/ext/tpx/Nitrogen.h
index 20013c560..bb2e33270 100755
--- a/ext/tpx/Nitrogen.h
+++ b/ext/tpx/Nitrogen.h
@@ -8,7 +8,10 @@ namespace tpx {
 
     class nitrogen : public Substance{
     public:
-        nitrogen() {}
+        nitrogen() { 
+         m_name = "nitrogen";
+         m_formula = "N2";
+        }	
         virtual ~nitrogen() {}
 
         double MolWt();
diff --git a/ext/tpx/Oxygen.cpp b/ext/tpx/Oxygen.cpp
index 807202df5..2b3d4aeaf 100755
--- a/ext/tpx/Oxygen.cpp
+++ b/ext/tpx/Oxygen.cpp
@@ -204,8 +204,8 @@ double oxygen::ldens(){
  double oxygen::Vcrit() {return 1.0/Roc;}
  double oxygen::Tmin() {return Tmn;}
  double oxygen::Tmax() {return Tmx;}
- char * oxygen::name() {return "oxygen";}
- char * oxygen::formula() {return "O2";}
+ char * oxygen::name() {return (char *) m_name.c_str();}
+ char * oxygen::formula() {return (char *) m_formula.c_str();}
  double oxygen::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/Oxygen.h b/ext/tpx/Oxygen.h
index fc8d1c7e2..d73ad3365 100755
--- a/ext/tpx/Oxygen.h
+++ b/ext/tpx/Oxygen.h
@@ -7,7 +7,10 @@ namespace tpx {
 
 class oxygen : public Substance{
 public:
-	oxygen(){}
+	oxygen(){
+         m_name="oxygen";
+         m_formula="O2";
+        }
         virtual ~oxygen() {}
 
 	double MolWt();
diff --git a/ext/tpx/RedlichKwong.h b/ext/tpx/RedlichKwong.h
index e7361f91b..6fd264a88 100644
--- a/ext/tpx/RedlichKwong.h
+++ b/ext/tpx/RedlichKwong.h
@@ -14,6 +14,8 @@ namespace tpx {
 
 	RedlichKwong() : Substance() {
             setParameters(1.0, 1.0, 1.0);
+            m_name = "Redlich-Kwong";
+            m_formula = "-";
         }
 
         void setParameters(double Tc, double Pc, double MolWt) {
@@ -38,8 +40,8 @@ namespace tpx {
 	double Vcrit() {return 0.3592725*GasConstant*T/(m_mw*m_pcrit);}
 	double Tmin() {return 0.0;}
 	double Tmax() {return 1.0e10;}
-	char * name() {return "Redlich-Kwong";}
-	char * formula() {return "-";}
+	char * name() {return (char *) m_name.c_str() ; }
+	char * formula() {return (char *) m_formula.c_str() ; }
 	
 	double Pp();
 	double up();
diff --git a/ext/tpx/Sub.h b/ext/tpx/Sub.h
index 68312f39c..3fd40eef8 100755
--- a/ext/tpx/Sub.h
+++ b/ext/tpx/Sub.h
@@ -200,6 +200,8 @@ namespace tpx {
 	int Err;
         double m_energy_offset;
         double m_entropy_offset;
+        string m_name;
+        string m_formula;
 
         //	virtual double Xm(int k) { return 1.0;}
         //virtual int Species() { return 1;}
diff --git a/ext/tpx/Water.cpp b/ext/tpx/Water.cpp
index b60ebdf08..c7bc4a21c 100755
--- a/ext/tpx/Water.cpp
+++ b/ext/tpx/Water.cpp
@@ -168,8 +168,12 @@ double water::Pcrit() {return Pc;}
 double water::Vcrit() {return 1.0/Roc;}
 double water::Tmin() {return Tmn;}
 double water::Tmax() {return Tmx;}
-char * water::name() {return "water";}
-char * water::formula() {return "H2O";}
+char * water::name() {
+  return (char *) m_name.c_str();
+}
+char * water::formula() {
+  return (char *) m_formula.c_str();
+}
 double water::MolWt() {return M;}
 
 }
diff --git a/ext/tpx/Water.h b/ext/tpx/Water.h
index 0465d11d9..364c5d504 100755
--- a/ext/tpx/Water.h
+++ b/ext/tpx/Water.h
@@ -7,7 +7,10 @@ namespace tpx {
 
 class water : public Substance{
 public:
-	water() {}
+	water() {
+          m_name = "water";
+          m_formula = "H2O";
+         }
         ~water() {}
 
 	double MolWt();
diff --git a/ext/tpx/lk.cpp b/ext/tpx/lk.cpp
index 63f635ffc..b2e1772ab 100755
--- a/ext/tpx/lk.cpp
+++ b/ext/tpx/lk.cpp
@@ -130,7 +130,11 @@ namespace tpx {
     double leekesler::Vcrit() {return 0.2901*8314.3*Tcr/(Pcr*Mw);}
     double leekesler::Tmin() {return -100.0;}
     double leekesler::Tmax() {return 10000.0;}
-    char * leekesler::name() {return "Lee-Kesler";}
-    char * leekesler::formula() {return "---";}
+    char * leekesler::name() {
+        return (char *) m_name.c_str();
+    }
+    char * leekesler::formula() {
+        return (char *) m_formula.c_str();
+    }
     double leekesler::MolWt() {return Mw;}
 }
diff --git a/ext/tpx/lk.h b/ext/tpx/lk.h
index 11c2a05bb..a48045a00 100755
--- a/ext/tpx/lk.h
+++ b/ext/tpx/lk.h
@@ -16,6 +16,8 @@ namespace tpx {
 		Pcr = pc;
 		Mw = wt;
 		Isr = itype;   // simple fluid or reference 
+                m_name = "Lee-Kesler";
+                m_formula = "---";
 	}
 	~leekesler() {}