diff --git a/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp index 14ca01b0a7061a9068e4a225c13a7907aa5db227..3570e64df916beb629016f1b75aeb7c6311b7642 100644 --- a/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp +++ b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp @@ -14,7 +14,8 @@ void allocTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, u { int lev = para->getFine(); cudaManager->cudaAllocTurbulenceIntensity(lev, size); - resetTurbulenceIntensity(para, cudaManager, size); + resetVelocityFluctuationsAndMeans(para, cudaManager, size); + para->getParH(lev)->turbulenceIntensity.resize(size); } @@ -43,11 +44,10 @@ void calcVelocityAndFluctuations(Parameter *para, CudaMemoryManager *cudaManager void calcTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, uint tdiff, uint size) { + calcVelocityAndFluctuations(para, cudaManager, tdiff, size); int lev = para->getFine(); - para->getParH(lev)->turbulenceIntensity.resize(size); - real fluc_squared; real v_mean_squared; for (uint i = 0; i < size; i++) { @@ -61,7 +61,7 @@ void calcTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, ui } -void resetTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, uint size) +void resetVelocityFluctuationsAndMeans(Parameter *para, CudaMemoryManager *cudaManager, uint size) { int lev = para->getFine(); diff --git a/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.h b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.h index be36534b21d318ca6dfca8bc837c3b295f88d73e..57e3ed44213b650edca817bbb57a9a0b1f91fdf2 100644 --- a/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.h +++ b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.h @@ -9,7 +9,7 @@ extern "C" void allocTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, uint size); extern "C" void calcVelocityAndFluctuations(Parameter *para, CudaMemoryManager *cudaManager, uint tdiff, uint size); extern "C" void calcTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, uint tdiff, uint size); -extern "C" void resetTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaManager, uint size); +extern "C" void resetVelocityFluctuationsAndMeans(Parameter *para, CudaMemoryManager *cudaManager, uint size); void writeTurbulenceIntensityToFile(Parameter *para, uint timestep, int *vectorOfSparseIndices); diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp index c0b06e78052bcca7fb50a3595da4530666aa76e8..b13b2eae7cf84dd4e265d58c0a301d300336bf91 100644 --- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp +++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp @@ -968,7 +968,7 @@ void Simulation::run() calcTurbulenceIntensity(para.get(), cudaManager.get(), t_diff, para->getParH(para->getFine())->QGeom.kQ); writeTurbulenceIntensityToFile(para.get(), t, para->getParH(para->getFine())->QGeom.k); t_turbulenceIntensity = t; - resetTurbulenceIntensity(para.get(), cudaManager.get(), para->getParH(para->getFine())->QGeom.kQ); + resetVelocityFluctuationsAndMeans(para.get(), cudaManager.get(), para->getParH(para->getFine())->QGeom.kQ); } //////////////////////////////////////////////////////////////////////// dataWriter->writeTimestep(para, t);