[cig-commits] [commit] small_fixes: order in error (f410b39)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Dec 12 19:15:30 PST 2014


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

On branch  : small_fixes
Link       : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...e1a05f1cfee565f016a5099ceba865f58517f9c8

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

commit f410b398a34cd8f5c34a2fe0adca87742fbb6b11
Author: sannecottaar <sanne.cottaar at gmail.com>
Date:   Fri Dec 12 19:12:18 2014 -0800

    order in error


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

f410b398a34cd8f5c34a2fe0adca87742fbb6b11
 misc/pyrolite_uncertainty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/pyrolite_uncertainty.py b/misc/pyrolite_uncertainty.py
index 2a63aca..2e2c17f 100644
--- a/misc/pyrolite_uncertainty.py
+++ b/misc/pyrolite_uncertainty.py
@@ -444,7 +444,7 @@ if whattodo=="plotone":
     rho, vp, vs, vphi, K, G = \
             burnman.velocities_from_rock(rock, pressure, temperature, burnman.averaging_schemes.HashinShtrikmanAverage())
 
-    err_rho, err_vphi, err_vs = burnman.compare_l2(depths/np.mean(depths), vs/np.mean(seis_vs), vphi/np.mean(seis_vphi), \
+    err_vs, err_vphi, err_rho = burnman.compare_l2(depths/np.mean(depths), vs/np.mean(seis_vs), vphi/np.mean(seis_vphi), \
         rho/np.mean(seis_rho), seis_vs/np.mean(seis_vs), seis_vphi/np.mean(seis_vphi), seis_rho/np.mean(seis_rho))
     error = np.sum([err_rho, err_vphi, err_vs])
 



More information about the CIG-COMMITS mailing list