tFluid simulation only happens if periodic=1 - 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 0f90cd8e5447961a6dbb0162feba9e635a39f818
(DIR) parent 5c10dece10e2b7eb6aebc93258c423f586a83dd6
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Thu, 2 May 2013 10:36:14 +0200
Fluid simulation only happens if periodic=1
Diffstat:
M CMakeLists.txt | 10 +++++-----
M python/sphere.py | 2 +-
M src/device.cu | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/CMakeLists.txt b/CMakeLists.txt
t@@ -24,13 +24,13 @@ find_package(OpenMP)
enable_testing()
# Set build type = Debug
-set(CMAKE_BUILD_TYPE Debug)
-if (CUDA_FOUND)
- set(CUDA_NVCC_FLAGS -g;-G)
-endif()
+#set(CMAKE_BUILD_TYPE Debug)
+#if (CUDA_FOUND)
+# set(CUDA_NVCC_FLAGS -g;-G)
+#endif()
# Set build type = Release
-#set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_BUILD_TYPE Release)
# Add source directory to project.
add_subdirectory(src)
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -1783,7 +1783,7 @@ class Spherebin:
fig.savefig('../img_out/' + self.sid + '-ts-x1x3-slipangles.png')
fig.clf()
- def plotRho(self):
+ def plotdensities(self):
x=2
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -819,7 +819,7 @@ __host__ void DEM::startTime()
}
// Process fluid and particle interaction in each cell
- if (params.nu > 0.0) {
+ if (params.nu > 0.0 && grid.periodic == 1) {
if (PROFILING == 1)
startTimer(&kernel_tic);
latticeBoltzmannD3Q19<<< dimGridFluid, dimBlockFluid>>> (