tno debug output, verifying tests - 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 4921c307b7d147d7cf0aada20db557ccb6ba01a0
(DIR) parent 2e8ed2ac27a09fd1d8cd08617169d289e1808081
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Mon, 9 Jun 2014 14:59:08 +0200
no debug output, verifying tests
Diffstat:
M src/debug.h | 4 ++--
M src/navierstokes.cuh | 2 +-
M tests/cfd_tests.py | 4 ++--
M tests/io_tests_fluid.py | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
---
(DIR) diff --git a/src/debug.h b/src/debug.h
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@@ -3004,7 +3004,7 @@ __global__ void findInteractionForce(
const Float3 f_pf = f_d + f_p + f_v;
#ifdef CHECK_NS_FINITE
- //*
+ /*
printf("\nfindInteractionForce %d [%d,%d,%d]\n"
"\tV_p = %f Re=%f Cd=%f chi=%f\n"
"\tf_d = %+e %+e %+e\n"
(DIR) diff --git a/tests/cfd_tests.py b/tests/cfd_tests.py
t@@ -43,7 +43,7 @@ orig.run(verbose=False)
#orig.run(verbose=True)
py.readlast(verbose = False)
ideal_grad_p_z = numpy.linspace(orig.p_f[0,0,0], orig.p_f[0,0,-1], orig.num[2])
-#py.writeVTKall()
+py.writeVTKall()
compareNumpyArraysClose(numpy.zeros((1,orig.num[2])),\
ideal_grad_p_z - py.p_f[0,0,:],\
"Pressure gradient:\t", tolerance=1.0e-1)
t@@ -220,4 +220,4 @@ py.readlast(verbose = False)
#raise Exception("Failed")
'''
-cleanup(orig)
+#cleanup(orig)
(DIR) diff --git a/tests/io_tests_fluid.py b/tests/io_tests_fluid.py
t@@ -22,9 +22,9 @@ py.readbin("../input/" + orig.sid + ".bin", verbose=False)
compare(orig, py, "Python IO:")
# Test C++ IO routines
-#orig.run(verbose=True, hideinputfile=True)
-orig.run(dry=True)
-orig.run(verbose=True, hideinputfile=False, cudamemcheck=True)
+orig.run(verbose=True, hideinputfile=True)
+#orig.run(dry=True)
+#orig.run(verbose=True, hideinputfile=False, cudamemcheck=True)
cpp = sphere.sim(fluid=True)
cpp.readbin("../output/" + orig.sid + ".output00000.bin", verbose=False)
compare(orig, cpp, "C++ IO: ")