tadd latex labels - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit 41f960f604e07ec961ae9fa30468295627f7eb4e
(DIR) parent 1afc9f2c50d345630db1786a339a60bdd2998b96
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 9 Sep 2014 15:11:46 +0200
add latex labels
Diffstat:
M python/shear-results-forces.py | 28 +++++++++++++++++++++-------
M python/shear-results.py | 4 +++-
2 files changed, 24 insertions(+), 8 deletions(-)
---
(DIR) diff --git a/python/shear-results-forces.py b/python/shear-results-forces.py
t@@ -11,6 +11,7 @@ import numpy
import sphere
from permeabilitycalculator import *
import matplotlib.pyplot as plt
+from matplotlib.ticker import MaxNLocator
#steps = [5, 10, 100]
steps = [3]
t@@ -61,9 +62,12 @@ for step in steps:
xdisp[s,:] += sim.xyzsum[:,0]/nsteps_avg
+ '''
for i in numpy.arange(sim.np):
f_pf[s,i] += \
sim.f_sum[i].dot(sim.f_sum[i])/nsteps_avg
+ '''
+ f_pf[s,:] += sim.f_sum[:,2]
dev_p[s,:] += \
numpy.average(numpy.average(sim.p_f, axis=0), axis=0)\
t@@ -80,9 +84,10 @@ for s in numpy.arange(len(steps)):
ax2 = plt.subplot((s+1)*100 + 32, sharey=ax1)
ax3 = plt.subplot((s+1)*100 + 33, sharey=ax1)
- ax1.plot(xdisp[s], zpos_p[s], '.')
- ax2.plot(f_pf[s], zpos_p[s], '.')
- ax3.plot(dev_p[s], zpos_c[s])
+ ax1.plot(xdisp[s], zpos_p[s], '+')
+ ax2.plot(f_pf[s], zpos_p[s], '+')
+ ax3.plot(dev_p[s]/1000.0, zpos_c[s])
+
max_z = numpy.max(zpos_p)
ax1.set_ylim([0, max_z])
ax2.set_ylim([0, max_z])
t@@ -93,18 +98,27 @@ for s in numpy.arange(len(steps)):
#plt.loglog(dpdz[c], K[c], 'o-', label='$c$ = %.2f' % (cvals[c]))
ax1.set_ylabel('Vertical position $z$ [m]')
- #ax1.set_xlabel('Horizontal particle displacement [m]')
- #ax2.set_xlabel('Average fluid pressure $\\bar{p_f}$ [Pa]')
- #ax3.set_xlabel('Average fluid-particle interaction force '
- #+ '$||\\bar{\\boldsymbol{f_{pf}}}||$ [N]')
+ ax1.set_xlabel('$x^3_p$ [m]')
+ ax2.set_xlabel('$\\boldsymbol{f}_\\text{pf}$ [N]')
+ ax3.set_xlabel('$\\bar{p_\\text{f}}$ [kPa]')
plt.setp(ax2.get_yticklabels(), visible=False)
plt.setp(ax3.get_yticklabels(), visible=False)
+
+ ax1.get_xaxis().set_major_locator(MaxNLocator(nbins=4))
+ ax2.get_xaxis().set_major_locator(MaxNLocator(nbins=4))
+ ax3.get_xaxis().set_major_locator(MaxNLocator(nbins=4))
+
+ plt.setp(ax1.xaxis.get_majorticklabels(), rotation=90)
+ plt.setp(ax2.xaxis.get_majorticklabels(), rotation=90)
+ plt.setp(ax3.xaxis.get_majorticklabels(), rotation=90)
#ax1.grid()
#ax2.grid()
#ax1.legend(loc='lower right', prop={'size':18})
#ax2.legend(loc='lower right', prop={'size':18})
plt.tight_layout()
+plt.subplots_adjust(wspace = .001)
+plt.MaxNLocator(nbins=4)
filename = 'shear-10kPa-forces.pdf'
plt.savefig(filename)
shutil.copyfile(filename, '/home/adc/articles/own/2-org/' + filename)
(DIR) diff --git a/python/shear-results.py b/python/shear-results.py
t@@ -2,6 +2,8 @@
import matplotlib
matplotlib.use('Agg')
matplotlib.rcParams.update({'font.size': 18, 'font.family': 'serif'})
+matplotlib.rc('text', usetex=True)
+matplotlib.rcParams['text.latex.preamble']=[r"\usepackage{amsmath}"]
import shutil
import os
t@@ -104,7 +106,7 @@ ax3.set_xlabel('Shear strain $\\gamma$ [-]')
ax1.set_ylabel('Shear friction $\\tau/\\sigma\'$ [-]')
ax2.set_ylabel('Dilation $\\Delta h/(2r)$ [-]')
-ax3.set_ylabel('Fluid pressure $p_f$ [Pa]')
+ax3.set_ylabel('Fluid pressure $p_\\text{f}$ [Pa]')
plt.setp(ax1.get_xticklabels(), visible=False)
plt.setp(ax2.get_xticklabels(), visible=False)