[cig-commits] [commit] add_thermodynamic_potentials: Changed zero equality for endmember occupancy to tolerance (d702f2c)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51

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

commit d702f2c6ac0978c14725f177ea141ce2bb7bb8b5
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Sep 3 23:55:19 2014 +0200

    Changed zero equality for endmember occupancy to tolerance


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

d702f2c6ac0978c14725f177ea141ce2bb7bb8b5
 burnman/solutionmodel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/burnman/solutionmodel.py b/burnman/solutionmodel.py
index 93022b5..56549b6 100644
--- a/burnman/solutionmodel.py
+++ b/burnman/solutionmodel.py
@@ -90,7 +90,7 @@ class IdealSolution ( SolutionModel ):
         self.endmember_configurational_entropies=np.zeros(shape=(self.n_endmembers))
         for idx, endmember_occupancy in enumerate(self.endmember_occupancies):
             for occ in range(self.n_occupancies):
-                if endmember_occupancy[occ] != 0.: 
+                if endmember_occupancy[occ] > 1e-10: 
                     self.endmember_configurational_entropies[idx] = \
                         self.endmember_configurational_entropies[idx] - \
                         R*self.site_multiplicities[occ]*endmember_occupancy[occ]*np.log(endmember_occupancy[occ])