[cig-commits] [commit] inversion, master, validate_MT_params: Bug fix (214f301)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

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

    Bug fix


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

214f301213eefdb32a7876ba99eb558c6c120f12
 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 =