diff --git a/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu b/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu index 776ebc6dcfdfe6281dcd2b558552d5a6965a58dd..5bf7380eb7a8181884649bae177ca54a8a357ce9 100644 --- a/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu +++ b/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.cu @@ -325,7 +325,7 @@ void ActuatorFarm::initBladeForces(CudaMemoryManager* cudaManager) cudaManager->cudaCopyBladeForcesHtoD(this); } -void ActuatorFarm::initBladeIndices(Parameter* para, CudaMemoryManager* cudaManager) +void ActuatorFarm::initBladeIndices(CudaMemoryManager* cudaManager) { cudaManager->cudaAllocBladeIndices(this); @@ -440,7 +440,7 @@ std::string ActuatorFarm::getFilename(Parameter* para, uint t) const return para->getOutputPath() + this->outputName + "_t_" + std::to_string(t); } -void ActuatorFarm::write(const std::string &filename) +void ActuatorFarm::write(const std::string& filename) const { std::vector<std::string> dataNames = { "bladeVelocitiesX", diff --git a/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h b/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h index c94e9f885f2c6815880d14cc83f03d1811a6798d..d89be8fffaed41ff472550fe4fb83b4e23295c2e 100644 --- a/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h +++ b/src/gpu/core/PreCollisionInteractor/Actuator/ActuatorFarm.h @@ -2,15 +2,14 @@ #define ActuatorFarm_H #include "PreCollisionInteractor/PreCollisionInteractor.h" -#include "basics/constants/NumericConstants.h" -#include "basics/DataTypes.h" +#include <basics/DataTypes.h> +#include <basics/constants/NumericConstants.h> #include <stdexcept> class Parameter; class GridProvider; using namespace vf::basics::constant; - class ActuatorFarm : public PreCollisionInteractor { public: @@ -63,7 +62,7 @@ public: this->tOut = tOut; } - void write(const std::string& filename); + void write(const std::string& filename) const; real getDensity() const { return this->density; }; real getDeltaT() const { return this->deltaT; }; @@ -143,7 +142,7 @@ private: void initBladeCoords(CudaMemoryManager* cudaManager); void initBladeVelocities(CudaMemoryManager* cudaManager); void initBladeForces(CudaMemoryManager* cudaManager); - void initBladeIndices(Parameter* para, CudaMemoryManager* cudaManager); + void initBladeIndices(CudaMemoryManager* cudaManager); std::string getFilename(Parameter* para, uint t) const; void swapDeviceArrays();