From 4818c87344d8d5076ec9dd2808061cdd4a1b38b9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 17 Jun 2017 20:43:16 -0400 Subject: [PATCH] [Thermo] Remove unused members of MargulesVPSSTP --- include/cantera/thermo/MargulesVPSSTP.h | 16 ---------------- src/thermo/MargulesVPSSTP.cpp | 4 ---- 2 files changed, 20 deletions(-) diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index fc1bd9655..4592ea340 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -444,10 +444,6 @@ protected: //! excess Gibbs free energy expression mutable vector_fp m_HE_c_ij; - //! Enthalpy term for the quaternary mole fraction interaction of the - //! excess Gibbs free energy expression - mutable vector_fp m_HE_d_ij; - //! Entropy term for the binary mole fraction interaction of the //! excess Gibbs free energy expression mutable vector_fp m_SE_b_ij; @@ -456,10 +452,6 @@ protected: //! excess Gibbs free energy expression mutable vector_fp m_SE_c_ij; - //! Entropy term for the quaternary mole fraction interaction of the - //! excess Gibbs free energy expression - mutable vector_fp m_SE_d_ij; - //! Enthalpy term for the binary mole fraction interaction of the //! excess Gibbs free energy expression mutable vector_fp m_VHE_b_ij; @@ -468,10 +460,6 @@ protected: //! excess Gibbs free energy expression mutable vector_fp m_VHE_c_ij; - //! Enthalpy term for the quaternary mole fraction interaction of the - //! excess Gibbs free energy expression - mutable vector_fp m_VHE_d_ij; - //! Entropy term for the binary mole fraction interaction of the //! excess Gibbs free energy expression mutable vector_fp m_VSE_b_ij; @@ -480,10 +468,6 @@ protected: //! excess Gibbs free energy expression mutable vector_fp m_VSE_c_ij; - //! Entropy term for the quaternary mole fraction interaction of the - //! excess Gibbs free energy expression - mutable vector_fp m_VSE_d_ij; - //! vector of species indices representing species A in the interaction /*! * Each Margules excess Gibbs free energy term involves two species, A and diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 17d61fc89..ff3ceccb5 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -473,16 +473,12 @@ void MargulesVPSSTP::resizeNumInteractions(const size_t num) numBinaryInteractions_ = num; m_HE_b_ij.resize(num, 0.0); m_HE_c_ij.resize(num, 0.0); - m_HE_d_ij.resize(num, 0.0); m_SE_b_ij.resize(num, 0.0); m_SE_c_ij.resize(num, 0.0); - m_SE_d_ij.resize(num, 0.0); m_VHE_b_ij.resize(num, 0.0); m_VHE_c_ij.resize(num, 0.0); - m_VHE_d_ij.resize(num, 0.0); m_VSE_b_ij.resize(num, 0.0); m_VSE_c_ij.resize(num, 0.0); - m_VSE_d_ij.resize(num, 0.0); m_pSpecies_A_ij.resize(num, npos); m_pSpecies_B_ij.resize(num, npos);