[cig-commits] [commit] update_examples: Reverted changes to solidsolution.py (315226f)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : update_examples
Link       : https://github.com/geodynamics/burnman/compare/bf39df300a99fe98a6add654cf40cc69ed4206af...315226f591a5794325c8c13b2db9571ce90ac130

>---------------------------------------------------------------

commit 315226f591a5794325c8c13b2db9571ce90ac130
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Dec 31 23:38:12 2014 +0000

    Reverted changes to solidsolution.py


>---------------------------------------------------------------

315226f591a5794325c8c13b2db9571ce90ac130
 burnman/solidsolution.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index ff90993..1b785c7 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -81,14 +81,9 @@ class SolidSolution(Mineral):
         self.partial_gibbs = np.array([self.base_material[i][0].gibbs for i in range(self.n_endmembers)]) + self.excess_partial_gibbs
         self.gibbs= sum([ self.base_material[i][0].gibbs * self.molar_fraction[i] for i in range(self.n_endmembers) ]) + self.excess_gibbs
 
-        if self.solution_model.__class__.__name__ == 'IdealSolution':
-            self.excess_enthalpy = 0.
-            self.excess_entropy = 0.
-            self.excess_volume = 0.
-        else:
-            self.excess_enthalpy = self.solution_model.excess_enthalpy( pressure, temperature, self.molar_fraction)
-            self.excess_entropy = self.solution_model.excess_entropy( pressure, temperature, self.molar_fraction)
-            self.excess_volume = self.solution_model.excess_volume( pressure, temperature, self.molar_fraction)
+        self.excess_enthalpy = self.solution_model.excess_enthalpy( pressure, temperature, self.molar_fraction)
+        self.excess_entropy = self.solution_model.excess_entropy( pressure, temperature, self.molar_fraction)
+        self.excess_volume = self.solution_model.excess_volume( pressure, temperature, self.molar_fraction)
 
         self.H = sum([ self.base_material[i][0].H * self.molar_fraction[i] for i in range(self.n_endmembers) ]) + self.excess_enthalpy
         self.S = sum([ self.base_material[i][0].S * self.molar_fraction[i] for i in range(self.n_endmembers) ]) + self.excess_entropy