tadded first simple test, removed debug output - 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 bb71a4317cabd515effe5065fc30065c8b32d3cf
(DIR) parent e772cad25f722b8f37f9372ece530db5dbbd0b57
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 18 Jun 2014 09:53:09 +0200
added first simple test, removed debug output
Diffstat:
M src/debug.h | 8 ++++----
M src/navierstokes.cuh | 4 ++--
M tests/CMakeLists.txt | 4 +++-
R tests/cfd_simple.py -> tests/cfd_d… | 0
4 files changed, 9 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/src/debug.h b/src/debug.h
t@@ -21,8 +21,8 @@ const unsigned int nijacnorm = 10;
const int write_res_log = 0;
// Report epsilon values during Jacobi iterations to stdout
-#define REPORT_EPSILON
-#define REPORT_MORE_EPSILON
+//#define REPORT_EPSILON
+//#define REPORT_MORE_EPSILON
// Report the number of iterations it took before convergence to logfile
// 'output/<sid>-conv.dat'
t@@ -40,10 +40,10 @@ const int conv_log_interval = 4;
#define CHECK_NS_FINITE
// Enable reporting of velocity prediction components to stdout
-#define REPORT_V_P_COMPONENTS
+//#define REPORT_V_P_COMPONENTS
// Enable reporting of forcing function terms to stdout
-#define REPORT_FORCING_TERMS
+//#define REPORT_FORCING_TERMS
// Choose solver model (see Zhou et al. 2010 "Discrete particle simulation of
// particle-fluid flow: model formulations and their applicability", table. 1.
(DIR) diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh
t@@ -3257,8 +3257,8 @@ __global__ void findFaceDivTau(
(v_z_zp - 2.0*v_z + v_z_zn)/(dz*dz));
__syncthreads();
- printf("div_tau [%d,%d,%d] = %f, %f, %f\n", x,y,z,
- div_tau_x, div_tau_y, div_tau_z);
+ //printf("div_tau [%d,%d,%d] = %f, %f, %f\n", x,y,z,
+ //div_tau_x, div_tau_y, div_tau_z);
dev_ns_div_tau_x[faceidx] = div_tau_x;
dev_ns_div_tau_y[faceidx] = div_tau_y;
dev_ns_div_tau_z[faceidx] = div_tau_z;
(DIR) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
t@@ -1,4 +1,3 @@
-
find_package(PythonInterp REQUIRED)
add_test(io_tests ${PYTHON_EXECUTABLE}
t@@ -24,3 +23,6 @@ add_test(cfd_tests ${PYTHON_EXECUTABLE}
add_test(cfd_tests_neumann ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_BINARY_DIR}/cfd_tests_neumann.py)
+
+add_test(cfd_dirichlet_homogeneous ${PYTHON_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/cfd_dirichlet_homogeneous.py)
(DIR) diff --git a/tests/cfd_simple.py b/tests/cfd_dirichlet_homogeneous.py