[cig-commits] [commit] solid_solution_molar_mass: Check for zero shear modulus (92fd624)

[cig_noreply at geodynamics.org]

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

On branch  : solid_solution_molar_mass
Link       : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...fe211b4b277a753e04e153250e4ed8b270dee9b7

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

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

    Check for zero shear modulus


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

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

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 685f999..672ea34 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -98,7 +98,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