[Thermo] Check dynamic_cast to PDSS_Water

Resolves #6
Cantera · May 3, 2016 · aa5f26b · aa5f26b
1 parent ca2a330
commit aa5f26b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp
@@ -236,7 +236,7 @@ HMWSoln& HMWSoln::operator=(const HMWSoln& b)
 
         m_waterProps = 0;
         if (b.m_waterProps) {
-            m_waterProps.reset(new WaterProps(dynamic_cast<PDSS_Water*>(m_waterSS)));
+            m_waterProps.reset(new WaterProps(&dynamic_cast<PDSS_Water&>(*m_waterSS)));
         }
 
         m_tmpV = b.m_tmpV;

diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp
@@ -1149,7 +1149,7 @@ void HMWSoln::initThermoXML(XML_Node& phaseNode, const std::string& id_)
 
     // Initialize the water property calculator. It will share the internal eos
     // water calculator.
-    m_waterProps.reset(new WaterProps(dynamic_cast<PDSS_Water*>(m_waterSS)));
+    m_waterProps.reset(new WaterProps(&dynamic_cast<PDSS_Water&>(*m_waterSS)));
 
     // Fill in parameters for the calculation of the stoichiometric Ionic
     // Strength. The default is that stoich charge is the same as the regular

diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp
@@ -386,7 +386,7 @@ void PDSS_HKFT::initThermo()
 {
     PDSS::initThermo();
 
-    m_waterSS = dynamic_cast<PDSS_Water*>(m_tp->providePDSS(0));
+    m_waterSS = &dynamic_cast<PDSS_Water&>(*m_tp->providePDSS(0));
 
     // Section to initialize m_Z_pr_tr and m_Y_pr_tr
     m_temp = 273.15 + 25.;
@@ -448,7 +448,7 @@ void PDSS_HKFT::initAllPtrs(VPStandardStateTP* vptp_ptr, VPSSMgr* vpssmgr_ptr,
                             SpeciesThermo* spthermo_ptr)
 {
     PDSS::initAllPtrs(vptp_ptr, vpssmgr_ptr, spthermo_ptr);
-    m_waterSS = dynamic_cast<PDSS_Water*>(m_tp->providePDSS(0));
+    m_waterSS = &dynamic_cast<PDSS_Water&>(*m_tp->providePDSS(0));
     m_waterProps.reset(new WaterProps(m_waterSS));
 }
 

diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp
@@ -53,7 +53,7 @@ VPSSMgr_Water_HKFT& VPSSMgr_Water_HKFT::operator=(const VPSSMgr_Water_HKFT& b)
         return *this;
     }
     VPSSMgr::operator=(b);
-    m_waterSS = dynamic_cast<PDSS_Water*>(m_vptp_ptr->providePDSS(0));
+    m_waterSS = &dynamic_cast<PDSS_Water&>(*m_vptp_ptr->providePDSS(0));
     m_tlastRef = -1.0;
     return *this;
 }