[cig-commits] [commit] master: Add arithmetic and harmonic averages for G in solidsolution (thanks to Mark Panning for pointing out they were missing) (603e41c)

[cig_noreply at geodynamics.org]

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

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

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

commit 603e41ceb5e6b46ec996b1f3a24b3af06161c28f
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Tue Dec 16 20:58:46 2014 -0800

    Add arithmetic and harmonic averages for G in solidsolution (thanks to Mark Panning for pointing out they were missing)


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

603e41ceb5e6b46ec996b1f3a24b3af06161c28f
 burnman/solidsolution.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index cee8daf..5036cb2 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -86,6 +86,8 @@ 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) ])
 
         # Derived properties
         self.C_v = self.C_p - self.V*temperature*self.alpha*self.alpha*self.K_T