trenamed flag - sphere - GPU-based 3D discrete element method algorithm with op… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit d89d5c088a5e20793e75c9faad8591c3ae93903f | |
parent 8546efe646857ae1bf86e1a0d6236663d5e2891f | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 22 Apr 2014 11:09:48 +0200 | |
renamed flag | |
Diffstat: | |
M src/debug.h | 2 +- | |
M src/device.cu | 2 +- | |
2 files changed, 2 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/src/debug.h b/src/debug.h | |
t@@ -35,7 +35,7 @@ const int conv_log_interval = 10; | |
//const int conv_log_interval = 1; | |
// Enable drag force and particle fluid coupling | |
-#define CFDDEMCOUPLING | |
+#define CFD_DEM_COUPLING | |
// Check for nan/inf values in fluid solver kernels | |
#define CHECK_NS_FINITE | |
diff --git a/src/device.cu b/src/device.cu | |
t@@ -862,7 +862,7 @@ __host__ void DEM::startTime() | |
&t_findPorositiesDev); | |
checkForCudaErrorsIter("Post findPorositiesDev", iter); | |
-#ifdef CFDDEMCOUPLING | |
+#ifdef CFD_DEM_COUPLING | |
/*if (params.nu <= 0.0) { | |
std::cerr << "Error! The fluid needs a positive viscosity " | |
"value in order to simulate particle-fluid interaction." |