[cig-commits] [commit] add_thermodynamic_potentials: Minor change (e7001f9)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Dec 9 09:54:09 PST 2014


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

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

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

commit e7001f94f8acdef059f54a0c834184ea31908c82
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Fri Aug 29 22:29:21 2014 +0200

    Minor change


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

e7001f94f8acdef059f54a0c834184ea31908c82
 burnman/test_process_solidsolution.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/burnman/test_process_solidsolution.py b/burnman/test_process_solidsolution.py
index ce78a34..e966f33 100644
--- a/burnman/test_process_solidsolution.py
+++ b/burnman/test_process_solidsolution.py
@@ -144,9 +144,9 @@ Ws=np.zeros(shape=(n_endmembers,n_endmembers))
 Wv=np.zeros(shape=(n_endmembers,n_endmembers))
 for i in range(n_endmembers):
     for j in range(i+1, n_endmembers):
-        Wh[i][j]=2*excess_enthalpy[i][j-i-1]/(alpha[i]+alpha[j])
-        Ws[i][j]=2*excess_entropy[i][j-i-1]/(alpha[i]+alpha[j])
-        Wv[i][j]=2*excess_volume[i][j-i-1]/(alpha[i]+alpha[j])
+        Wh[i][j]=2.*excess_enthalpy[i][j-i-1]/(alpha[i]+alpha[j])
+        Ws[i][j]=2.*excess_entropy[i][j-i-1]/(alpha[i]+alpha[j])
+        Wv[i][j]=2.*excess_volume[i][j-i-1]/(alpha[i]+alpha[j])
 
 print ''
 print 'Nonideal contribution to gibbs'



More information about the CIG-COMMITS mailing list