[cig-commits] [commit] inversion, master, validate_MT_params: Overlay screengrabs (bee7cac)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit bee7caced7f46ed22934b856431a44d05229bb8b
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Wed Sep 3 11:11:05 2014 -0700

    Overlay screengrabs


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

bee7caced7f46ed22934b856431a44d05229bb8b
 configurational_entropy.png | Bin 0 -> 97173 bytes
 dicats.png                  | Bin 0 -> 152691 bytes
 solidsolution_benchmarks.py |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configurational_entropy.png b/configurational_entropy.png
new file mode 100644
index 0000000..83d0ec5
Binary files /dev/null and b/configurational_entropy.png differ
diff --git a/dicats.png b/dicats.png
new file mode 100644
index 0000000..4c83d45
Binary files /dev/null and b/dicats.png differ
diff --git a/solidsolution_benchmarks.py b/solidsolution_benchmarks.py
index 21c8917..d3778d2 100644
--- a/solidsolution_benchmarks.py
+++ b/solidsolution_benchmarks.py
@@ -143,8 +143,8 @@ for idx, model in enumerate(opx_models):
 
 
 
-#fig1 = mpimg.imread('configurational_entropy.png')  # Uncomment these two lines if you want to overlay the plot on a screengrab from SLB2011
-#plt.imshow(fig1, extent=[0.0, 1.0,0.,17.0], aspect='auto')
+fig1 = mpimg.imread('configurational_entropy.png')  # Uncomment these two lines if you want to overlay the plot on a screengrab from SLB2011
+plt.imshow(fig1, extent=[0.0, 1.0,0.,17.0], aspect='auto')
 plt.plot( comp, opx_entropies[0], 'r--', linewidth=3.)
 plt.plot( comp, opx_entropies[1], 'b--', linewidth=3.)
 plt.plot( comp, opx_entropies[2], 'g--', linewidth=3.)
@@ -232,8 +232,8 @@ for i,c in enumerate(comp):
    gibbs[i] = cpx.excess_gibbs
 
 
-#fig1 = mpimg.imread('dicats.png')  # Uncomment these two lines if you want to overlay the plot on a screengrab from SLB2011
-#plt.imshow(fig1, extent=[0.0, 1.0,-2.,8.0], aspect='auto')
+fig1 = mpimg.imread('dicats.png')  # Uncomment these two lines if you want to overlay the plot on a screengrab from SLB2011
+plt.imshow(fig1, extent=[0.0, 1.0,-2.,8.0], aspect='auto')
 
 plt.plot( comp, gibbs/1000., 'b--', linewidth=3.)
 plt.xlim(0.0,1.0)