tdo not intialize cuda and check values for contact listing. Improve plot - 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 1918ebef82d58787fd8bfa91f264d77d41dc67e6
(DIR) parent f1a6e0aa288415dd17d8eeb6f6b1ba45dfa1ef6a
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 2 Oct 2014 21:27:40 +0200
do not intialize cuda and check values for contact listing. Improve plot
Diffstat:
M python/shear-results.py | 2 +-
M src/main.cpp | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
---
(DIR) diff --git a/python/shear-results.py b/python/shear-results.py
t@@ -148,7 +148,7 @@ ax3.set_ylabel('Fluid pressure $p_\\text{f}$ [kPa]')
ax4.set_ylabel('Particle contact force $||\\boldsymbol{f}_\\text{p}||$ [N]')
#ax1.set_xlim([200,300])
-ax3.set_ylim([550,650])
+ax3.set_ylim([595,608])
plt.setp(ax1.get_xticklabels(), visible=False)
plt.setp(ax2.get_xticklabels(), visible=False)
(DIR) diff --git a/src/main.cpp b/src/main.cpp
t@@ -171,17 +171,21 @@ int main(const int argc, const char *argv[])
std::cout << argv[0] << ": processing input file: " << argvi <<
std::endl;
+ if (print_contacts == 1) {
+ DEM dem(argvi, verbose, 0, 0, 0, 0, fluid, device);
+ dem.printContacts();
+ exit(0);
+ }
+
if (nfiles == 1) {
// Create DEM class, read data from input binary, check values,
// init cuda, transfer const mem
DEM dem(argvi, verbose, checkVals, dry, 1, 1, fluid, device);
- if (print_contacts == 1)
- dem.printContacts();
// Render image if requested
- else if (render == 1)
+ if (render == 1)
dem.render(method, max_val, lower_cutoff);
// Otherwise, start iterating through time