diff --git a/src/basics/Core/VectorTypes.h b/src/basics/Core/VectorTypes.h index 0256a960ddf53a6d4fb8efee8b54e5d4679987f1..3109112b299e5ac169d9f536a4d4e66b7970cff2 100644 --- a/src/basics/Core/VectorTypes.h +++ b/src/basics/Core/VectorTypes.h @@ -4,9 +4,13 @@ #ifdef __CUDACC__ #include <cuda_runtime.h> #else +#ifndef __host__ #define __host__ +#endif +#ifndef __device__ #define __device__ #endif +#endif #include <cmath> @@ -19,7 +23,7 @@ struct BASICS_EXPORT Vec3 { real x{ c0o1 }, y{ c0o1 }, z{ c0o1 }; __host__ __device__ Vec3(real x, real y, real z) : x(x), y(y), z(z) {} - __host__ __device__ Vec3() = default; + Vec3() = default; __host__ __device__ real length() { return std::sqrt(x * x + y * y + z * z); } diff --git a/src/gpu/GridGenerator/grid/BoundaryConditions/Side.h b/src/gpu/GridGenerator/grid/BoundaryConditions/Side.h index 717b965d04e8922f8f34f6ade54bde274368906e..7e05d26a5e94d72c7087874bf029a041b0ae55fb 100644 --- a/src/gpu/GridGenerator/grid/BoundaryConditions/Side.h +++ b/src/gpu/GridGenerator/grid/BoundaryConditions/Side.h @@ -218,6 +218,8 @@ public: return SPtr<Side>(new PZ()); case SideType::GEOMETRY: return SPtr<Side>(new Geometry()); + default: + throw std::runtime_error("SideFactory::make() - SideType not valid."); } } }; diff --git a/src/gpu/GridGenerator/utilities/cuda/cudaDefines.h b/src/gpu/GridGenerator/utilities/cuda/cudaDefines.h index bc00947394452b7a4647faf82765180733bb8212..b20401ef493c16d413f41db91c42c102e63d7d2f 100644 --- a/src/gpu/GridGenerator/utilities/cuda/cudaDefines.h +++ b/src/gpu/GridGenerator/utilities/cuda/cudaDefines.h @@ -30,13 +30,13 @@ static void printCudaInformation(int i) { else printf("Disabled\n"); printf(" --- Memory Information for device %d ---\n", i); - printf("Total global mem: %llu\n", prop.totalGlobalMem); - printf("Total constant Mem: %zd\n", prop.totalConstMem); - printf("Max mem pitch: %zd\n", prop.memPitch); - printf("Texture Alignment: %zd\n", prop.textureAlignment); - printf("max Texture 1D: %ld\n", prop.maxTexture1D); - printf("max Texture 2D: %ld, %ld\n", prop.maxTexture2D[0], prop.maxTexture2D[1]); - printf("max Texture 3D: %ld, %ld, %ld\n", prop.maxTexture3D[0], prop.maxTexture3D[1], prop.maxTexture3D[2]); + printf("Total global mem: %zu\n", prop.totalGlobalMem); + printf("Total constant Mem: %zu\n", prop.totalConstMem); + printf("Max mem pitch: %zu\n", prop.memPitch); + printf("Texture Alignment: %zu\n", prop.textureAlignment); + printf("max Texture 1D: %d\n", prop.maxTexture1D); + printf("max Texture 2D: %d, %d\n", prop.maxTexture2D[0], prop.maxTexture2D[1]); + printf("max Texture 3D: %d, %d, %d\n", prop.maxTexture3D[0], prop.maxTexture3D[1], prop.maxTexture3D[2]); printf(" --- MP Information for device %d ---\n", i); printf("Multiprocessor count: %d\n", prop.multiProcessorCount); @@ -58,8 +58,8 @@ static void printCudaInformation(int i) { size_t free; size_t total; cudaMemGetInfo(&free, &total); - printf("Free: %llu Bytes, Total: %llu Bytes\n", free, total); - printf("Free: %llu MB, Total: %llu MB\n", free / 1000 / 1000, total / 1000 / 1000); + printf("Free: %zu Bytes, Total: %zu Bytes\n", free, total); + printf("Free: %zu MB, Total: %zu MB\n", free / 1000 / 1000, total / 1000 / 1000); //cudaDeviceSetLimit(cudaLimitMallocHeapSize, free); }