[cig-commits] [commit] master: Check for zero shear modulus (8afad1d)

[cig_noreply at geodynamics.org]

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

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

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

commit 8afad1dc5de8b88e444481436d39aa4c40cefb00
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Sun Dec 28 22:21:45 2014 -0800

    Check for zero shear modulus


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

8afad1dc5de8b88e444481436d39aa4c40cefb00
 burnman/solidsolution.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index e1e9e32..f8e950b 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -86,7 +86,12 @@ 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) ]))
+ 
+        G_list = [ self.base_material[i][0].G for i in range(self.n_endmembers) ]
+        if 0.0 in G_list:
+            self.G = 0.0
+        else:
+            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