[cig-commits] [commit] add_thermodynamic_potentials: Bug fix (25dfc72)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/d958221adcd0d4af987ef016dcfb3d766359d6b1...25dfc72def186ba22c20054e7fba8c0e0078c398

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

commit 25dfc72def186ba22c20054e7fba8c0e0078c398
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Dec 10 22:03:30 2014 -0800

    Bug fix


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

25dfc72def186ba22c20054e7fba8c0e0078c398
 burnman/solidsolution.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index c999cba..ad7b74a 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -64,7 +64,7 @@ class SolidSolution(Mineral):
         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
         self.V = sum([ self.base_material[i][0].V * self.molar_fraction[i] for i in range(self.n_endmembers) ]) + self.excess_volume
-        self.C_p = sum([ self.base_material[i][0].V * self.molar_fraction[i] for i in range(self.n_endmembers) ])
+        self.C_p = sum([ self.base_material[i][0].C_p * self.molar_fraction[i] for i in range(self.n_endmembers) ])
         #self.alpha = 
         #self.isothermal_bulk_modulus =