tRemoved debug breakpoints - 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 97655b72d1ebcae4699b58c4cf8a177799f072fc
(DIR) parent 3ceeb70036d6ca8e691766b94ae4971dda4a47cf
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Tue, 23 Oct 2012 10:42:14 +0200
Removed debug breakpoints
Diffstat:
M src/device.cu | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
---
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -17,6 +17,8 @@
#include "contactsearch.cuh"
#include "integration.cuh"
+//#include "cuPrintf.cu"
+
// Wrapper function for initializing the CUDA components.
// Called from main.cpp
//extern "C"
t@@ -91,21 +93,6 @@ __global__ void checkConstantValues(int* dev_equal,
// Values ok (0)
*dev_equal = 0;
- if (dev_grid->nd != 3) {
- *dev_equal = 3;
- return;
- } else if (devC_grid.nd != 3) {
- *dev_equal = 4;
- return;
- } else if (devC_grid.num[0] != 4) {
- *dev_equal = 6;
- return;
- } else if (dev_grid->num[0] != 4) {
- *dev_equal = 5;
- return;
- }
-
-
// Compare values between global- and constant
// memory structures
if (dev_grid->nd != devC_grid.nd ||
t@@ -157,6 +144,8 @@ __global__ void checkConstantValues(int* dev_equal,
__host__ void checkConstantMemory(Grid* grid, Params* params)
{
+ //cudaPrintfInit();
+
// Allocate space in global device memory
Grid* dev_grid;
Params* dev_params;
t@@ -184,6 +173,8 @@ __host__ void checkConstantMemory(Grid* grid, Params* params)
cudaFree(dev_params);
cudaFree(dev_equal);
+ //cudaPrintfDisplay(stdout, true);
+
// Are the values equal?
if (*equal != 0) {