diff --git a/src/gpu/core/GPU/GPU_Interface.h b/src/gpu/core/GPU/GPU_Interface.h index ba70027c48f138a74a0516dcdb9119c772c40787..4e6b6fc3e21ed68ae3323f7cbe75a924824b8447 100644 --- a/src/gpu/core/GPU/GPU_Interface.h +++ b/src/gpu/core/GPU/GPU_Interface.h @@ -35,17 +35,6 @@ #include <cuda.h> #include <cuda_runtime.h> -#include <curand.h> - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments" -#pragma clang diagnostic ignored "-Wunused-but-set-parameter" -#endif -#include <curand_kernel.h> -#ifdef __clang__ -#pragma clang diagnostic pop -#endif struct LBMSimulationParameter; class Parameter; diff --git a/src/gpu/core/GPU/Random.cu b/src/gpu/core/GPU/Random.cu deleted file mode 100644 index 603cd14c42e9afdfa9912883a316742edc31f106..0000000000000000000000000000000000000000 --- a/src/gpu/core/GPU/Random.cu +++ /dev/null @@ -1,59 +0,0 @@ -/* Device code */ -#include "LBM/LB.h" -#include "lbm/constants/D3Q27.h" -#include <basics/constants/NumericConstants.h> - -using namespace vf::basics::constant; -using namespace vf::lbm::dir; - -//random numbers -#include <curand.h> -#include <curand_kernel.h> - - -////////////////////////////////////////////////////////////////////////////// -__global__ void initRandom(curandState* state) -{ - //////////////////////////////////////////////////////////////////////////////// - const unsigned x = threadIdx.x; // Globaler x-Index - const unsigned y = blockIdx.x; // Globaler y-Index - const unsigned z = blockIdx.y; // Globaler z-Index - - const unsigned nx = blockDim.x; - const unsigned ny = gridDim.x; - - const unsigned k = nx*(ny*z + y) + x; - ////////////////////////////////////////////////////////////////////////// - - curand_init(k, k, 0, &state[k]); - - ////////////////////////////////////////////////////////////////////////// -} -////////////////////////////////////////////////////////////////////////////// - - - - - -////////////////////////////////////////////////////////////////////////////// -__global__ void generateRandomValues(curandState* state, real* randArray) -{ - //////////////////////////////////////////////////////////////////////////////// - const unsigned x = threadIdx.x; // Globaler x-Index - const unsigned y = blockIdx.x; // Globaler y-Index - const unsigned z = blockIdx.y; // Globaler z-Index - - const unsigned nx = blockDim.x; - const unsigned ny = gridDim.x; - - const unsigned k = nx*(ny*z + y) + x; - ////////////////////////////////////////////////////////////////////////// - - randArray[k] = (real)curand_uniform(&state[k]); - - ////////////////////////////////////////////////////////////////////////// -} -////////////////////////////////////////////////////////////////////////////// - - -