From 34192d2b89cddb2a0d3ffa886dfad9a6c9169e78 Mon Sep 17 00:00:00 2001 From: Hkorb <henry.korb@geo.uu.se> Date: Thu, 16 Sep 2021 18:15:36 +0200 Subject: [PATCH] more compiler fixes --- src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu | 2 +- src/gpu/VirtualFluids_GPU/Visitor/Probe.cu | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu index a3994dc00..e69d91d9c 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu +++ b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu @@ -423,7 +423,7 @@ void ActuatorLine::initBoundingSphere(Parameter* para, CudaMemoryManager* cudaMa if(dist < 0.6*this->diameter) nodesInSphere.push_back(j); } - this->numberOfIndices = nodesInSphere.size(); + this->numberOfIndices = uint(nodesInSphere.size()); cudaManager->cudaAllocSphereIndices(this); std::copy(nodesInSphere.begin(), nodesInSphere.end(), this->boundingSphereIndicesH); cudaManager->cudaCopySphereIndicesHtoD(this); diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu index 5d317082b..b4395b98b 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu +++ b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu @@ -137,7 +137,7 @@ void Probe::init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager* } probeParams[level] = new ProbeStruct; - probeParams[level]->nPoints = probeIndices_level.size(); + probeParams[level]->nPoints = uint(probeIndices_level.size()); probeParams[level]->pointCoordsX = pointCoordsX_level.data(); probeParams[level]->pointCoordsY = pointCoordsY_level.data(); probeParams[level]->pointCoordsZ = pointCoordsZ_level.data(); @@ -173,9 +173,9 @@ void Probe::init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager* std::copy(this->postProcessingVariables.begin(), this->postProcessingVariables.end(), probeParams[level]->quantitiesH); cudaManager->cudaCopyProbeQuantitiesHtoD(this, level); - for(int arr=0; arr<probeParams[level]->nArrays; arr++) + for(uint arr=0; arr<probeParams[level]->nArrays; arr++) { - for( int point=0; point<probeParams[level]->nPoints; point++) + for( uint point=0; point<probeParams[level]->nPoints; point++) { probeParams[level]->quantitiesArrayH[arr*probeParams[level]->nPoints+point] = 0.0f; } @@ -225,7 +225,7 @@ void Probe::setProbePointsFromList(std::vector<real> &_pointCoordsX, std::vector this->pointCoordsX = _pointCoordsX; this->pointCoordsY = _pointCoordsY; this->pointCoordsZ = _pointCoordsZ; - this->nProbePoints = _pointCoordsX.size(); + this->nProbePoints = uint(_pointCoordsX.size()); printf("Added list of %u points \n", this->nProbePoints ); } -- GitLab