 |
tfix simulation names - sphere - GPU-based 3D discrete element method algorithm… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit d1cb80136671adac63c1c26cf3de6b016e3cd375 |
|
parent 650db723c333740a197689e865e8a2302278078d |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 28 Apr 2015 15:27:32 +0200 |
|
|
|
fix simulation names |
|
|
|
Diffstat: |
|
M python/halfshear-darcy-internals.py | 8 ++++++-- |
|
M python/wip-varA-cont.sh | 6 +++--- |
|
|
|
2 files changed, 9 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/python/halfshear-darcy-internals.py b/python/halfshear-darcy-inter… |
|
t@@ -180,7 +180,10 @@ for sigma0 in sigma0_list: |
|
|
|
#ax[3].plot(f_pf_nonzero, zpos_p_nonzero, ',', alpha=0.5, |
|
#color='#888888') |
|
- ax[3].plot(f_pf_mean_nonzero, zpos_c_nonzero, label='$\gamma$ … |
|
+ #ax[3].plot(f_pf_mean_nonzero, zpos_c_nonzero, label='$\gamma$… |
|
+ #(shear_strain_start[s])) |
|
+ ax[3].plot(f_pf_mean_nonzero/(4.0*numpy.pi*sim.radius[0]**2)/1… |
|
+ zpos_c_nonzero, label='$\gamma$ = %.3f' % |
|
(shear_strain_start[s])) |
|
|
|
else: |
|
t@@ -208,7 +211,8 @@ for sigma0 in sigma0_list: |
|
ax[0].set_xlabel('$\\bar{\\boldsymbol{x}}^x_\\text{p}$ [m]') |
|
ax[1].set_xlabel('$\\bar{k}$ [m$^{2}$]') |
|
ax[2].set_xlabel('$\\bar{p_\\text{f}}$ [kPa]') |
|
- ax[3].set_xlabel('$\\boldsymbol{f}^z_\\text{i}$ [N]') |
|
+ #ax[3].set_xlabel('$\\boldsymbol{f}^z_\\text{i}$ [N]') |
|
+ ax[3].set_xlabel('$\\bar{\sigma}^z_\\text{i}$ [kPa]') |
|
|
|
# align x labels |
|
#labely = -0.3 |
|
diff --git a/python/wip-varA-cont.sh b/python/wip-varA-cont.sh |
|
t@@ -39,9 +39,9 @@ nvidia-smi |
|
rm CMakeCache.txt |
|
cmake . && make |
|
cd python |
|
-python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2.0e-16-mu=2.08e-07-… |
|
-python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2.0e-16-mu=2.08e-07-… |
|
-python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2.0e-16-mu=2.08e-07-… |
|
+python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2e-16-mu=2.08e-07-ss… |
|
+python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2e-16-mu=2.08e-07-ss… |
|
+python continue_sim.py halfshear-darcy-sigma0=10000.0-k_c=2e-16-mu=2.08e-07-ss… |
|
wait |
|
|
|
#cp $WORKDIR/output/* $ORIGDIR/output/ |
