[cig-commits] [commit] master: Use harmonic mean for now (2c49c97)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/79ecc7fdbc1d15104c8d2d8ff5389e424714175f...911aa89d9079e32f4cee0d042a9ab7ec493c74c1

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

commit 2c49c97704bf7904d8416e2924b897769925b262
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Sun Dec 28 22:11:01 2014 -0800

    Use harmonic mean for now


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

2c49c97704bf7904d8416e2924b897769925b262
 burnman/solidsolution.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 5036cb2..e1e9e32 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -86,8 +86,7 @@ class SolidSolution(Mineral):
         self.C_p = sum([ self.base_material[i][0].C_p * self.molar_fraction[i] for i in range(self.n_endmembers) ])
         self.alpha = (1./self.V) * sum([ self.base_material[i][0].alpha * self.base_material[i][0].V * self.molar_fraction[i] for i in range(self.n_endmembers) ])
         self.K_T = self.V * 1./(sum([ self.base_material[i][0].V / (self.base_material[i][0].K_T)  * self.molar_fraction[i] for i in range(self.n_endmembers) ]))
-#        self.G = self.V * 1./(sum([ self.base_material[i][0].V / (self.base_material[i][0].G)  * self.molar_fraction[i] for i in range(self.n_endmembers) ]))
-#        self.G = (1./self.V) * sum([ self.base_material[i][0].G * self.base_material[i][0].V * self.molar_fraction[i] for i in range(self.n_endmembers) ])
+        self.G = self.V * 1./(sum([ self.base_material[i][0].V / (self.base_material[i][0].G)  * self.molar_fraction[i] for i in range(self.n_endmembers) ]))
 
         # Derived properties
         self.C_v = self.C_p - self.V*temperature*self.alpha*self.alpha*self.K_T