[cig-commits] [commit] add_thermodynamic_potentials: Minor change (a073d79)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Dec 9 09:53:35 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : add_thermodynamic_potentials
Link : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51
>---------------------------------------------------------------
commit a073d79ce7b0dd295a56cbf651b226d5cf2438ef
Author: Bob Myhill <myhill.bob at gmail.com>
Date: Fri Aug 29 22:16:27 2014 +0200
Minor change
>---------------------------------------------------------------
a073d79ce7b0dd295a56cbf651b226d5cf2438ef
burnman/test_process_solidsolution.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/burnman/test_process_solidsolution.py b/burnman/test_process_solidsolution.py
index 55a6b61..38c8ad7 100644
--- a/burnman/test_process_solidsolution.py
+++ b/burnman/test_process_solidsolution.py
@@ -110,11 +110,8 @@ print ideal_activity
# Non ideal activities
# alpha^T*p*(phi^T*W*phi)
-alpha=np.empty(shape=(n_endmembers))
-phi=np.empty(shape=(n_endmembers))
-for i in range(n_endmembers):
- alpha[i]=base_material[i][2]
- phi[i]=alpha[i]*endmember_proportions[i]
+alpha=np.array([base_material[i][2] for i in range(n_endmembers)])
+phi=np.array([alpha[i]*endmember_proportions[i] for i in range(n_endmembers)])
phi=np.divide(phi, np.sum(phi))
Wh=np.zeros(shape=(n_endmembers,n_endmembers))
More information about the CIG-COMMITS
mailing list