tremove blank line, add slow shear experiments for article2 - sphere - GPU-base… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit ce2e6a70b5dfc9d7dcde99723a4449759389a68a | |
parent 4032f0705e116464014078e8e0eb5779e4de7042 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 25 May 2015 14:51:47 +0200 | |
remove blank line, add slow shear experiments for article2 | |
Diffstat: | |
A python/halfshear-darcy-slow.sh | 50 +++++++++++++++++++++++++++++… | |
M src/sphere.cpp | 2 +- | |
2 files changed, 51 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/python/halfshear-darcy-slow.sh b/python/halfshear-darcy-slow.sh | |
t@@ -0,0 +1,50 @@ | |
+#!/bin/sh | |
+#PBS -N hs-slow | |
+#PBS -l nodes=1:ppn=3 | |
+#PBS -l walltime=48:00:00 | |
+#PBS -q qfermi | |
+#PBS -M [email protected] | |
+#PBS -m abe | |
+ | |
+# Grendel CUDA | |
+source /com/gcc/4.6.4/load.sh | |
+CUDAPATH=/com/cuda/5.5.22 | |
+export PATH=$HOME/bin:$PATH | |
+export PATH=$CUDAPATH/bin:$PATH | |
+export LD_LIBRARY_PATH=$CUDAPATH/lib64:$CUDAPATH/lib:$LD_LIBRARY_PATH | |
+ | |
+# Manually installed Python modules | |
+export PYTHONPATH=$HOME/.local/lib/python:$PYTHONPATH | |
+export PYTHONPATH=$HOME/.local/lib64/python:$PYTHONPATH | |
+ | |
+# Manually installed Python | |
+#export PATH=/home/adc/.local/bin:$PATH | |
+ | |
+# Shared Python2.7 | |
+PYTHON=/com/python/2.7.6 | |
+export PYTHONPATH=$PYTHON/lib:$PYTHONPATH | |
+export PATH=$PYTHON/bin:$PATH | |
+ | |
+echo "`whoami`@`hostname`" | |
+echo "Start at `date`" | |
+ | |
+ORIGDIR=/home/adc/code/sphere | |
+#WORKDIR=/scratch/$PBS_JOBID | |
+WORKDIR=$ORIGDIR | |
+ | |
+#cp -r $ORIGDIR/* $WORKDIR | |
+ | |
+cd $WORKDIR | |
+nvidia-smi | |
+rm CMakeCache.txt | |
+cmake . && make | |
+cd python | |
+# $ python shear-starter.py <DEVICE> <FLUID> <C_PHI> <C_GRAD_P> <SIGMA_0> | |
+python halfshear-darcy-starter.py 0 1 1.0 3.5e-15 20000.0 1.797e-9 1.0 & | |
+python halfshear-darcy-starter.py 1 1 1.0 3.5e-12 20000.0 1.797e-6 1.0 & | |
+python halfshear-darcy-starter.py 2 1 1.0 7.0e-12 20000.0 1.797e-6 1.0 & | |
+wait | |
+ | |
+#cp $WORKDIR/output/* $ORIGDIR/output/ | |
+ | |
+echo "End at `date`" | |
diff --git a/src/sphere.cpp b/src/sphere.cpp | |
t@@ -844,7 +844,7 @@ void DEM::forcechains(const std::string format, const int … | |
cout << f_n | |
<< i << '\t' << j << endl; | |
} else { | |
- | |
+- | |
// Gnuplot output | |
// Save contact pairs if they are above the lower limit | |
// and not fixed at their horizontal velocity |