From 4ffe7926c936ba646406303efa15c4c7e37c67fa Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Fri, 19 Feb 2021 15:49:04 +0000 Subject: [PATCH] Outcomment a lof of unsed variables. --- .../GPU/EnstrophyAnalyzer.cu | 57 ++++++------ .../GPU/KineticEnergyAnalyzer.cu | 3 + src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu | 89 ++++++++++--------- src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu | 52 ++++++----- .../VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu | 14 ++- src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu | 80 +++++++++-------- .../VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu | 18 ++-- src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu | 4 +- .../VirtualFluids_GPU/GPU/ThinWallBCs27.cu | 2 +- .../VirtualFluids_GPU/GPU/VelocityBCs27.cu | 2 +- .../VirtualFluids_GPU/GPU/WaleCumulant27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu | 25 +++--- .../VirtualFluids_GPU/Input/ConfigFile.cpp | 8 +- .../Compressible/MRT/MRTCompSP27_Device.cu | 4 +- .../BGKPlus/BGKPlusIncompSP27_Device.cu | 4 +- .../CumulantK15/CumulantK15Incomp_Device.cu | 6 +- .../MRT/MRTIncompSP27_Device.cu | 4 +- .../Mod27/ADIncomp27/ADIncomp27_Device.cu | 2 +- .../Mod7/ADIncomp7/ADIncomp7_Device.cu | 8 +- .../WaleBySoniMalavCumulantK15Comp_Device.cu | 3 +- .../KernelFactory/KernelFactoryImp.cpp | 2 +- 21 files changed, 212 insertions(+), 179 deletions(-) diff --git a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu index 9724f9b18..5380ce071 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu @@ -88,6 +88,9 @@ bool EnstrophyAnalyzer::run(uint iter) //std::cout << "Enstrophy " << EnstrophyTmp << " " << numberOfFluidNodes << std::endl; this->enstrophyTimeSeries.push_back( EnstrophyTmp / real(numberOfFluidNodes) ); + + //TODO: Should this function probably return nothing? + return true; } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -165,8 +168,8 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ uint kMz4 = neighborY[neighborX[kMz3WSB]]; if( geo[ kMz4 ] != GEO_FLUID && maxOrderZ > 6 ) maxOrderZ = 6; ////////////////////////////////////////////////////////////////////////// //getVeloX// - real veloXNeighborPx = veloX[kPx]; - real veloXNeighborMx = veloX[kMx]; + //real veloXNeighborPx = veloX[kPx]; + //real veloXNeighborMx = veloX[kMx]; real veloXNeighborPy = veloX[kPy]; real veloXNeighborMy = veloX[kMy]; real veloXNeighborPz = veloX[kPz]; @@ -174,8 +177,8 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ //getVeloY// real veloYNeighborPx = veloY[kPx]; real veloYNeighborMx = veloY[kMx]; - real veloYNeighborPy = veloY[kPy]; - real veloYNeighborMy = veloY[kMy]; + //real veloYNeighborPy = veloY[kPy]; + //real veloYNeighborMy = veloY[kMy]; real veloYNeighborPz = veloY[kPz]; real veloYNeighborMz = veloY[kMz]; //getVeloZ// @@ -183,12 +186,12 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ real veloZNeighborMx = veloZ[kMx]; real veloZNeighborPy = veloZ[kPy]; real veloZNeighborMy = veloZ[kMy]; - real veloZNeighborPz = veloZ[kPz]; - real veloZNeighborMz = veloZ[kMz]; + //real veloZNeighborPz = veloZ[kPz]; + //real veloZNeighborMz = veloZ[kMz]; ////////////////////////////////////////////////////////////////////////////// //getVeloX// - real veloXNeighborPx2 = veloX[kPx2]; - real veloXNeighborMx2 = veloX[kMx2]; + //real veloXNeighborPx2 = veloX[kPx2]; + //real veloXNeighborMx2 = veloX[kMx2]; real veloXNeighborPy2 = veloX[kPy2]; real veloXNeighborMy2 = veloX[kMy2]; real veloXNeighborPz2 = veloX[kPz2]; @@ -196,8 +199,8 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ //getVeloY// real veloYNeighborPx2 = veloY[kPx2]; real veloYNeighborMx2 = veloY[kMx2]; - real veloYNeighborPy2 = veloY[kPy2]; - real veloYNeighborMy2 = veloY[kMy2]; + //real veloYNeighborPy2 = veloY[kPy2]; + //real veloYNeighborMy2 = veloY[kMy2]; real veloYNeighborPz2 = veloY[kPz2]; real veloYNeighborMz2 = veloY[kMz2]; //getVeloZ// @@ -205,12 +208,12 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ real veloZNeighborMx2 = veloZ[kMx2]; real veloZNeighborPy2 = veloZ[kPy2]; real veloZNeighborMy2 = veloZ[kMy2]; - real veloZNeighborPz2 = veloZ[kPz2]; - real veloZNeighborMz2 = veloZ[kMz2]; + //real veloZNeighborPz2 = veloZ[kPz2]; + //real veloZNeighborMz2 = veloZ[kMz2]; ////////////////////////////////////////////////////////////////////////////// //getVeloX// - real veloXNeighborPx3 = veloX[kPx3]; - real veloXNeighborMx3 = veloX[kMx3]; + //real veloXNeighborPx3 = veloX[kPx3]; + //real veloXNeighborMx3 = veloX[kMx3]; real veloXNeighborPy3 = veloX[kPy3]; real veloXNeighborMy3 = veloX[kMy3]; real veloXNeighborPz3 = veloX[kPz3]; @@ -218,8 +221,8 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ //getVeloY// real veloYNeighborPx3 = veloY[kPx3]; real veloYNeighborMx3 = veloY[kMx3]; - real veloYNeighborPy3 = veloY[kPy3]; - real veloYNeighborMy3 = veloY[kMy3]; + //real veloYNeighborPy3 = veloY[kPy3]; + //real veloYNeighborMy3 = veloY[kMy3]; real veloYNeighborPz3 = veloY[kPz3]; real veloYNeighborMz3 = veloY[kMz3]; //getVeloZ// @@ -227,12 +230,12 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ real veloZNeighborMx3 = veloZ[kMx3]; real veloZNeighborPy3 = veloZ[kPy3]; real veloZNeighborMy3 = veloZ[kMy3]; - real veloZNeighborPz3 = veloZ[kPz3]; - real veloZNeighborMz3 = veloZ[kMz3]; + //real veloZNeighborPz3 = veloZ[kPz3]; + //real veloZNeighborMz3 = veloZ[kMz3]; ////////////////////////////////////////////////////////////////////////////// //getVeloX// - real veloXNeighborPx4 = veloX[kPx4]; - real veloXNeighborMx4 = veloX[kMx4]; + //real veloXNeighborPx4 = veloX[kPx4]; + //real veloXNeighborMx4 = veloX[kMx4]; real veloXNeighborPy4 = veloX[kPy4]; real veloXNeighborMy4 = veloX[kMy4]; real veloXNeighborPz4 = veloX[kPz4]; @@ -240,8 +243,8 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ //getVeloY// real veloYNeighborPx4 = veloY[kPx4]; real veloYNeighborMx4 = veloY[kMx4]; - real veloYNeighborPy4 = veloY[kPy4]; - real veloYNeighborMy4 = veloY[kMy4]; + //real veloYNeighborPy4 = veloY[kPy4]; + //real veloYNeighborMy4 = veloY[kMy4]; real veloYNeighborPz4 = veloY[kPz4]; real veloYNeighborMz4 = veloY[kMz4]; //getVeloZ// @@ -249,18 +252,18 @@ __host__ __device__ void enstrophyFunction(real* veloX, real* veloY, real* veloZ real veloZNeighborMx4 = veloZ[kMx4]; real veloZNeighborPy4 = veloZ[kPy4]; real veloZNeighborMy4 = veloZ[kMy4]; - real veloZNeighborPz4 = veloZ[kPz4]; - real veloZNeighborMz4 = veloZ[kMz4]; + //real veloZNeighborPz4 = veloZ[kPz4]; + //real veloZNeighborMz4 = veloZ[kMz4]; ////////////////////////////////////////////////////////////////////////////// - real dxvx = c0o1; + //real dxvx = c0o1; real dyvx = c0o1; real dzvx = c0o1; real dxvy = c0o1; - real dyvy = c0o1; + //real dyvy = c0o1; real dzvy = c0o1; real dxvz = c0o1; real dyvz = c0o1; - real dzvz = c0o1; + //real dzvz = c0o1; ////////////////////////////////////////////////////////////////////////// //maxOrderX = 2; diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu index ea22c0295..e6e5c9b11 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu @@ -89,6 +89,9 @@ bool KineticEnergyAnalyzer::run(uint iter) //std::cout << "EKin " << EKin << " " << numberOfFluidNodes << std::endl; this->kineticEnergyTimeSeries.push_back( EKin / real(numberOfFluidNodes) ); + + //TODO: Should this function probably return nothing? + return true; } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu index d60aecd5c..149daf632 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu @@ -170,7 +170,7 @@ extern "C" __global__ void QInflowScaleByPressDevice27( real* rhoBC, real f1_BS = (D.f[dirBS ])[k1bs ]; real f1_BN = (D.f[dirBN ])[k1bn ]; real f1_TS = (D.f[dirTS ])[k1ts ]; - real f1_ZERO = (D.f[dirZERO])[k1zero]; + //real f1_ZERO = (D.f[dirZERO])[k1zero]; real f1_TNE = (D.f[dirTNE ])[k1tne ]; real f1_TSW = (D.f[dirTSW ])[k1tsw ]; real f1_TSE = (D.f[dirTSE ])[k1tse ]; @@ -198,7 +198,7 @@ extern "C" __global__ void QInflowScaleByPressDevice27( real* rhoBC, real f_BS = (D.f[dirBS ])[kbs ]; real f_BN = (D.f[dirBN ])[kbn ]; real f_TS = (D.f[dirTS ])[kts ]; - real f_ZERO = (D.f[dirZERO])[kzero]; + //real f_ZERO = (D.f[dirZERO])[kzero]; real f_TNE = (D.f[dirTNE ])[ktne ]; real f_TSW = (D.f[dirTSW ])[ktsw ]; real f_TSE = (D.f[dirTSE ])[ktse ]; @@ -208,7 +208,8 @@ extern "C" __global__ void QInflowScaleByPressDevice27( real* rhoBC, real f_BSE = (D.f[dirBSE ])[kbse ]; real f_BNW = (D.f[dirBNW ])[kbnw ]; ////////////////////////////////////////////////////////////////////////// - real vx1, vx2, vx3, drho, drho1; + // real vx1, vx2, vx3; + real drho, drho1; ////////////////////////////////////////////////////////////////////////// //Dichte drho1 = f1_TSE + f1_TNW + f1_TNE + f1_TSW + f1_BSE + f1_BNW + f1_BNE + f1_BSW + @@ -2856,7 +2857,7 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, //////////////////////////////////////////////////////////////////////////////// //index unsigned int KQK = k_Q[k]; - unsigned int kzero= KQK; + //unsigned int kzero= KQK; unsigned int ke = KQK; unsigned int kw = neighborX[KQK]; unsigned int kn = KQK; @@ -2886,7 +2887,7 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, //////////////////////////////////////////////////////////////////////////////// //index1 unsigned int K1QK = k_N[k]; - unsigned int k1zero= K1QK; + //unsigned int k1zero= K1QK; unsigned int k1e = K1QK; unsigned int k1w = neighborX[K1QK]; unsigned int k1n = K1QK; @@ -2994,7 +2995,7 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, real f1_BS = (D.f[dirBS ])[k1bs ]; real f1_BN = (D.f[dirBN ])[k1bn ]; real f1_TS = (D.f[dirTS ])[k1ts ]; - real f1_ZERO = (D.f[dirZERO])[k1zero]; + //real f1_ZERO = (D.f[dirZERO])[k1zero]; real f1_TNE = (D.f[dirTNE ])[k1tne ]; real f1_TSW = (D.f[dirTSW ])[k1tsw ]; real f1_TSE = (D.f[dirTSE ])[k1tse ]; @@ -3022,7 +3023,7 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, real f_BS = (D.f[dirBS ])[kbs ]; real f_BN = (D.f[dirBN ])[kbn ]; real f_TS = (D.f[dirTS ])[kts ]; - real f_ZERO = (D.f[dirZERO])[kzero]; + //real f_ZERO = (D.f[dirZERO])[kzero]; real f_TNE = (D.f[dirTNE ])[ktne ]; real f_TSW = (D.f[dirTSW ])[ktsw ]; real f_TSE = (D.f[dirTSE ])[ktse ]; @@ -3034,15 +3035,15 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, ////////////////////////////////////////////////////////////////////////// //real vx1, vx2, vx3, drho; - real vx1, vx2, vx3, drho, drho1; + //real vx1, vx2, vx3, drho, drho1; ////////////////////////////////////////////////////////////////////////// //Dichte - drho1 = f1_TSE + f1_TNW + f1_TNE + f1_TSW + f1_BSE + f1_BNW + f1_BNE + f1_BSW + - f1_BN + f1_TS + f1_TN + f1_BS + f1_BE + f1_TW + f1_TE + f1_BW + f1_SE + f1_NW + f1_NE + f1_SW + - f1_T + f1_B + f1_N + f1_S + f1_E + f1_W + ((D.f[dirZERO])[k1zero]); - drho = f_TSE + f_TNW + f_TNE + f_TSW + f_BSE + f_BNW + f_BNE + f_BSW + - f_BN + f_TS + f_TN + f_BS + f_BE + f_TW + f_TE + f_BW + f_SE + f_NW + f_NE + f_SW + - f_T + f_B + f_N + f_S + f_E + f_W + ((D.f[dirZERO])[kzero]); + // drho1 = f1_TSE + f1_TNW + f1_TNE + f1_TSW + f1_BSE + f1_BNW + f1_BNE + f1_BSW + + // f1_BN + f1_TS + f1_TN + f1_BS + f1_BE + f1_TW + f1_TE + f1_BW + f1_SE + f1_NW + f1_NE + f1_SW + + // f1_T + f1_B + f1_N + f1_S + f1_E + f1_W + ((D.f[dirZERO])[k1zero]); + // drho = f_TSE + f_TNW + f_TNE + f_TSW + f_BSE + f_BNW + f_BNE + f_BSW + + // f_BN + f_TS + f_TN + f_BS + f_BE + f_TW + f_TE + f_BW + f_SE + f_NW + f_NE + f_SW + + // f_T + f_B + f_N + f_S + f_E + f_W + ((D.f[dirZERO])[kzero]); ////////////////////////////////////////////////////////////////////////// //Ux @@ -3067,7 +3068,7 @@ extern "C" __global__ void QPressNoRhoDevice27( real* rhoBC, ////real omega = om1; // real cusq = c3o2*(vx1*vx1+vx2*vx2+vx3*vx3); // ////////////////////////////////////////////////////////////////////////// - ////Täst MK + ////T�st MK ////if(vx1 < zero) vx1 = zero; // ////////////////////////////////////////////////////////////////////////// // real fZERO = c8over27* (drho1-(one + drho1)*(cusq)) ; @@ -3753,34 +3754,34 @@ extern "C" __global__ void QPressDeviceEQZ27(real* rhoBC, D.f[dirBNW ] = &DD[dirTSE *size_Mat]; } //////////////////////////////////////////////////////////////////////////////// - Distributions27 kDistTest; - kDistTest.f[dirE ] = &kTestRE[dirE *kQ]; - kDistTest.f[dirW ] = &kTestRE[dirW *kQ]; - kDistTest.f[dirN ] = &kTestRE[dirN *kQ]; - kDistTest.f[dirS ] = &kTestRE[dirS *kQ]; - kDistTest.f[dirT ] = &kTestRE[dirT *kQ]; - kDistTest.f[dirB ] = &kTestRE[dirB *kQ]; - kDistTest.f[dirNE ] = &kTestRE[dirNE *kQ]; - kDistTest.f[dirSW ] = &kTestRE[dirSW *kQ]; - kDistTest.f[dirSE ] = &kTestRE[dirSE *kQ]; - kDistTest.f[dirNW ] = &kTestRE[dirNW *kQ]; - kDistTest.f[dirTE ] = &kTestRE[dirTE *kQ]; - kDistTest.f[dirBW ] = &kTestRE[dirBW *kQ]; - kDistTest.f[dirBE ] = &kTestRE[dirBE *kQ]; - kDistTest.f[dirTW ] = &kTestRE[dirTW *kQ]; - kDistTest.f[dirTN ] = &kTestRE[dirTN *kQ]; - kDistTest.f[dirBS ] = &kTestRE[dirBS *kQ]; - kDistTest.f[dirBN ] = &kTestRE[dirBN *kQ]; - kDistTest.f[dirTS ] = &kTestRE[dirTS *kQ]; - kDistTest.f[dirZERO] = &kTestRE[dirZERO*kQ]; - kDistTest.f[dirTNE ] = &kTestRE[dirTNE *kQ]; - kDistTest.f[dirTSW ] = &kTestRE[dirTSW *kQ]; - kDistTest.f[dirTSE ] = &kTestRE[dirTSE *kQ]; - kDistTest.f[dirTNW ] = &kTestRE[dirTNW *kQ]; - kDistTest.f[dirBNE ] = &kTestRE[dirBNE *kQ]; - kDistTest.f[dirBSW ] = &kTestRE[dirBSW *kQ]; - kDistTest.f[dirBSE ] = &kTestRE[dirBSE *kQ]; - kDistTest.f[dirBNW ] = &kTestRE[dirBNW *kQ]; + // Distributions27 kDistTest; + // kDistTest.f[dirE ] = &kTestRE[dirE *kQ]; + // kDistTest.f[dirW ] = &kTestRE[dirW *kQ]; + // kDistTest.f[dirN ] = &kTestRE[dirN *kQ]; + // kDistTest.f[dirS ] = &kTestRE[dirS *kQ]; + // kDistTest.f[dirT ] = &kTestRE[dirT *kQ]; + // kDistTest.f[dirB ] = &kTestRE[dirB *kQ]; + // kDistTest.f[dirNE ] = &kTestRE[dirNE *kQ]; + // kDistTest.f[dirSW ] = &kTestRE[dirSW *kQ]; + // kDistTest.f[dirSE ] = &kTestRE[dirSE *kQ]; + // kDistTest.f[dirNW ] = &kTestRE[dirNW *kQ]; + // kDistTest.f[dirTE ] = &kTestRE[dirTE *kQ]; + // kDistTest.f[dirBW ] = &kTestRE[dirBW *kQ]; + // kDistTest.f[dirBE ] = &kTestRE[dirBE *kQ]; + // kDistTest.f[dirTW ] = &kTestRE[dirTW *kQ]; + // kDistTest.f[dirTN ] = &kTestRE[dirTN *kQ]; + // kDistTest.f[dirBS ] = &kTestRE[dirBS *kQ]; + // kDistTest.f[dirBN ] = &kTestRE[dirBN *kQ]; + // kDistTest.f[dirTS ] = &kTestRE[dirTS *kQ]; + // kDistTest.f[dirZERO] = &kTestRE[dirZERO*kQ]; + // kDistTest.f[dirTNE ] = &kTestRE[dirTNE *kQ]; + // kDistTest.f[dirTSW ] = &kTestRE[dirTSW *kQ]; + // kDistTest.f[dirTSE ] = &kTestRE[dirTSE *kQ]; + // kDistTest.f[dirTNW ] = &kTestRE[dirTNW *kQ]; + // kDistTest.f[dirBNE ] = &kTestRE[dirBNE *kQ]; + // kDistTest.f[dirBSW ] = &kTestRE[dirBSW *kQ]; + // kDistTest.f[dirBSE ] = &kTestRE[dirBSE *kQ]; + // kDistTest.f[dirBNW ] = &kTestRE[dirBNW *kQ]; // //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // //real f1_E,f1_W,f1_N,f1_S,f1_T,f1_B,f1_NE,f1_SW,f1_SE,f1_NW,f1_TE,f1_BW,f1_BE,f1_TW,f1_TN,f1_BS,f1_BN,f1_TS,f1_ZERO,f1_TNE,f1_TSW,f1_TSE,f1_TNW,f1_BNE,f1_BSW,f1_BSE,f1_BNW; // //f1_W = (D.f[dirE ])[k1e ]; @@ -3852,7 +3853,7 @@ extern "C" __global__ void QPressDeviceEQZ27(real* rhoBC, ////real omega = om1; // real cusq = c3o2*(vx1*vx1+vx2*vx2+vx3*vx3); // ////////////////////////////////////////////////////////////////////////// - ////Täst MK + ////T�st MK ////if(vx1 < zero) vx1 = zero; // ////////////////////////////////////////////////////////////////////////// ////becomes higher with neighbor source and lower with local source diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu index 76d07fb26..f6fdc6794 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu @@ -813,6 +813,10 @@ extern "C" __global__ void scaleCF_0817_comp_27( real* DC, // drho_NWB * (c9o64 + c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) + // drho_SEB * (c9o64 - c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) + // drho_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff); + + // TODO: variable "dxyz" is used before its value is set + dxyz = 1; + // https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/12 press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vvx = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz); vvy = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz); @@ -4251,12 +4255,12 @@ extern "C" __global__ void scaleCF_AA2016_comp_27(real* DC, real NeqOn = c1o1; real drho, rho; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - real OxxPyyPzz; - real OxyyPxzz; - real OxyyMxzz; - real Oxyz ; - real O4, O5, O6; - real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; + //real OxxPyyPzz; + //real OxyyPxzz; + //real OxyyMxzz; + //real Oxyz ; + //real O4, O5, O6; + //real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -11123,23 +11127,23 @@ extern "C" __global__ void scaleCF_RhoSq_3rdMom_comp_27(real* DC, real x,y,z; ////////////////////////////////////////////////////////////////////////////////////// real mfcbb, mfabb, mfbcb, mfbab, mfbbc, mfbba, mfccb, mfaab, mfcab, mfacb, mfcbc, mfaba, mfcba, mfabc, mfbcc, mfbaa, mfbca, mfbac, mfbbb, mfccc, mfaac, mfcac, mfacc, mfcca, mfaaa, mfcaa, mfaca; - real wadjust; - real qudricLimitP = 0.01f;// * 0.0001f; - real qudricLimitM = 0.01f;// * 0.0001f; - real qudricLimitD = 0.01f;// * 0.001f; - real omega = omCoarse; + //real wadjust; + //real qudricLimitP = 0.01f;// * 0.0001f; + //real qudricLimitM = 0.01f;// * 0.0001f; + //real qudricLimitD = 0.01f;// * 0.001f; + //real omega = omCoarse; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, vvx, vvy, vvz, vx2, vy2, vz2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; real NeqOn = c1o1; real drho, rho; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - real OxxPyyPzz; - real OxyyPxzz; - real OxyyMxzz; - real Oxyz ; - real O4, O5, O6; - real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; + //real OxxPyyPzz; + //real OxyyPxzz; + //real OxyyMxzz; + //real Oxyz ; + //real O4, O5, O6; + //real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -27820,6 +27824,10 @@ extern "C" __global__ void scaleCF_Fix_comp_27( real* DC, // drho_NWB * (c9o64 + c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) + // drho_SEB * (c9o64 - c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) + // drho_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff); + + // TODO: variable "dxyz" is used before its value is set + dxyz = 1; + // https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/12 press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vvx = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz); vvy = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz); @@ -43368,8 +43376,8 @@ extern "C" __global__ void scaleCFThSMG7( real* DC, //real omegaD_C = two / (six * diffusivity_fine/two + one); //real omegaD_F = two / (six * diffusivity_fine + one); - real omegaD_C = c3o1 - sqrt(c3o1); //Quick and Dörrrty - real omegaD_F = c3o1 - sqrt(c3o1); //Quick and Dörrrty + real omegaD_C = c3o1 - sqrt(c3o1); //Quick and D�rrrty + real omegaD_F = c3o1 - sqrt(c3o1); //Quick and D�rrrty real Lam = -(c1o2-c1o1/omegaD_C); real nue_d = Lam/c3o1; //real ae = zero; @@ -44590,8 +44598,8 @@ extern "C" __global__ void scaleCFThS7( real* DC, //real omegaD_C = two / (six * diffusivity_fine/two + one); //real omegaD_F = two / (six * diffusivity_fine + one); - real omegaD_C = c3o1 - sqrt(c3o1); //Quick and Dörrrty - real omegaD_F = c3o1 - sqrt(c3o1); //Quick and Dörrrty + real omegaD_C = c3o1 - sqrt(c3o1); //Quick and D�rrrty + real omegaD_F = c3o1 - sqrt(c3o1); //Quick and D�rrrty real Lam = -(c1o2-c1o1/omegaD_C); real nue_d = Lam/c3o1; //real ae = zero; @@ -45770,7 +45778,7 @@ extern "C" __global__ void scaleCFThS27( real* DC, real f27E,f27W,f27N,f27S,f27T,f27B,f27NE,f27SW,f27SE,f27NW,f27TE,f27BW,f27BE,f27TW,f27TN,f27BS,f27BN,f27TS,f27ZERO,f27TNE,f27TSW,f27TSE,f27TNW,f27BNE,f27BSW,f27BSE,f27BNW; real Mx,My,Mz/*,Mxx,Myy,Mzz,M0*/; real Conc_C_SWB, Conc_C_SWT, Conc_C_SET, Conc_C_SEB, Conc_C_NWB, Conc_C_NWT, Conc_C_NET, Conc_C_NEB; - real Conc_F_SWB, Conc_F_SWT, Conc_F_SET, Conc_F_SEB, Conc_F_NWB, Conc_F_NWT, Conc_F_NET, Conc_F_NEB; + //real Conc_F_SWB, Conc_F_SWT, Conc_F_SET, Conc_F_SEB, Conc_F_NWB, Conc_F_NWT, Conc_F_NET, Conc_F_NEB; real omegaD_C = c2o1 / (c6o1 * diffusivity_fine/c2o1 + c1o1); real omegaD_F = c2o1 / (c6o1 * diffusivity_fine + c1o1); diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu index afec3d0bf..11dc25dfe 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu @@ -165,7 +165,8 @@ extern "C" __global__ void scaleCF_comp_D3Q27F3_2018(real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + // real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP; real /*pressMPP,*/drhoMPP,vx1MPP,vx2MPP,vx3MPP; @@ -833,6 +834,10 @@ extern "C" __global__ void scaleCF_comp_D3Q27F3_2018(real* DC, // drho_NWB * (c9o64 + c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) + // drho_SEB * (c9o64 - c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) + // drho_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff); + + // TODO: variable "dxyz" is used before its value is set + dxyz = 1; + // https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/12 press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vvx = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz); vvy = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz); @@ -4509,7 +4514,8 @@ extern "C" __global__ void scaleCF_comp_D3Q27F3( real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + // real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP; real /*pressMPP,*/drhoMPP,vx1MPP,vx2MPP,vx3MPP; @@ -5174,6 +5180,10 @@ extern "C" __global__ void scaleCF_comp_D3Q27F3( real* DC, // drho_NWB * (c9o64 + c3o16 * xoff - c9o16 * yoff + c3o16 * zoff) + // drho_SEB * (c9o64 - c9o16 * xoff + c3o16 * yoff + c3o16 * zoff) + // drho_SWB * (c27o64 + c9o16 * xoff + c9o16 * yoff + c9o16 * zoff); + + // TODO: variable "dxyz" is used before its value is set + dxyz = 1; + // https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/12 press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vvx = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz); vvy = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz); diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu index f20da3b37..90b778ec2 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu @@ -154,7 +154,8 @@ extern "C" __global__ void scaleFC_0817_comp_27( real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + //real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*pressMMM,*/drhoMMM,vx1MMM,vx2MMM,vx3MMM; real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP; @@ -770,10 +771,10 @@ extern "C" __global__ void scaleFC_0817_comp_27( real* DC, //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; - real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein + //real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein real O3 = c2o1 - o; - real residu, residutmp; - residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; + //real residu, residutmp; + //residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; real NeqOn = c1o1;//zero;//one; //.... one = on ..... zero = off //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1367,23 +1368,23 @@ extern "C" __global__ void scaleFC_AA2016_comp_27(real* DC, real d0, dx, dy, dz, dxy, dxz, dyz/*, dxyz*/; ////////////////////////////////////////////////////////////////////////////////////// real mfcbb, mfabb, mfbcb, mfbab, mfbbc, mfbba, mfccb, mfaab, mfcab, mfacb, mfcbc, mfaba, mfcba, mfabc, mfbcc, mfbaa, mfbca, mfbac, mfbbb, mfccc, mfaac, mfcac, mfacc, mfcca, mfaaa, mfcaa, mfaca; - real wadjust; - real qudricLimitP = 0.01f;// * 0.0001f; - real qudricLimitM = 0.01f;// * 0.0001f; - real qudricLimitD = 0.01f;// * 0.001f; - real omega = omFine; + //real wadjust; + //real qudricLimitP = 0.01f;// * 0.0001f; + //real qudricLimitM = 0.01f;// * 0.0001f; + //real qudricLimitD = 0.01f;// * 0.001f; + //real omega = omFine; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, vvx, vvy, vvz, vx2, vy2, vz2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; real NeqOn = c1o1; real drho, rho; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - real OxxPyyPzz; - real OxyyPxzz; - real OxyyMxzz; - real Oxyz ; - real O4, O5, O6; - real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; + //real OxxPyyPzz; + //real OxyyPxzz; + //real OxyyMxzz; + //real Oxyz; + //real O4, O5, O6; + //real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// if(k<kFC) @@ -5556,23 +5557,23 @@ extern "C" __global__ void scaleFC_RhoSq_3rdMom_comp_27(real* DC, real d0, dx, dy, dz, dxy, dxz, dyz/*, dxyz*/; ////////////////////////////////////////////////////////////////////////////////////// real mfcbb, mfabb, mfbcb, mfbab, mfbbc, mfbba, mfccb, mfaab, mfcab, mfacb, mfcbc, mfaba, mfcba, mfabc, mfbcc, mfbaa, mfbca, mfbac, mfbbb, mfccc, mfaac, mfcac, mfacc, mfcca, mfaaa, mfcaa, mfaca; - real wadjust; - real qudricLimitP = 0.01f;// * 0.0001f; - real qudricLimitM = 0.01f;// * 0.0001f; - real qudricLimitD = 0.01f;// * 0.001f; - real omega = omFine; + //real wadjust; + //real qudricLimitP = 0.01f;// * 0.0001f; + //real qudricLimitM = 0.01f;// * 0.0001f; + //real qudricLimitD = 0.01f;// * 0.001f; + //real omega = omFine; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, vvx, vvy, vvz, vx2, vy2, vz2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; real NeqOn = c1o1; real drho, rho; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - real OxxPyyPzz; - real OxyyPxzz; - real OxyyMxzz; - real Oxyz ; - real O4, O5, O6; - real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; + //real OxxPyyPzz; + //real OxyyPxzz; + //real OxyyMxzz; + //real Oxyz; + //real O4, O5, O6; + //real CUMcbb, CUMbcb, CUMbbc, CUMcca, CUMcac, CUMacc, CUMbcc, CUMcbc, CUMccb, CUMccc; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// if(k<kFC) @@ -10502,10 +10503,10 @@ extern "C" __global__ void scaleFC_RhoSq_comp_27(real* DC, //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, vvx, vvy, vvz, vx2, vy2, vz2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; - real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein + //real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein real O3 = c2o1 - o; - real residu, residutmp; - residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; + //real residu, residutmp; + //residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; real NeqOn = c1o1;//zero;//one; //.... one = on ..... zero = off //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -13196,7 +13197,8 @@ extern "C" __global__ void scaleFC_Fix_comp_27( real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + // real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*press_SWT,*/drho_SWT,vx1_SWT,vx2_SWT,vx3_SWT; real /*press_NWT,*/drho_NWT,vx1_NWT,vx2_NWT,vx3_NWT; @@ -14481,10 +14483,10 @@ extern "C" __global__ void scaleFC_Fix_comp_27( real* DC, //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; - real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein + //real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein real O3 = c2o1 - o; - real residu, residutmp; - residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; + //real residu, residutmp; + //residutmp = c0o1;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; real NeqOn = c1o1;//zero;//one; //.... one = on ..... zero = off //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -19972,8 +19974,8 @@ extern "C" __global__ void scaleFCThSMG7( real* DC, //real omegaD_C = two / (six * diffusivity_coarse + one); //real omegaD_F = two / (six * diffusivity_coarse*two + one); - real omegaD_C = c3o1 - sqrt(c3o1); //Quick and Dörrrty - real omegaD_F = c3o1 - sqrt(c3o1); //Quick and Dörrrty + real omegaD_C = c3o1 - sqrt(c3o1); //Quick and D�rrrty + real omegaD_F = c3o1 - sqrt(c3o1); //Quick and D�rrrty real Lam = -(c1o2-c1o1/omegaD_C); real nue_d = Lam/c3o1; //real ae = zero; @@ -20844,8 +20846,8 @@ extern "C" __global__ void scaleFCThS7( real* DC, //real omegaD_C = two / (six * diffusivity_coarse + one); //real omegaD_F = two / (six * diffusivity_coarse*two + one); - real omegaD_C = c3o1 - sqrt(c3o1); //Quick and Dörrrty - real omegaD_F = c3o1 - sqrt(c3o1); //Quick and Dörrrty + real omegaD_C = c3o1 - sqrt(c3o1); //Quick and D�rrrty + real omegaD_F = c3o1 - sqrt(c3o1); //Quick and D�rrrty real Lam = -(c1o2-c1o1/omegaD_C); real nue_d = Lam/c3o1; //real ae = zero; @@ -21691,7 +21693,7 @@ extern "C" __global__ void scaleFCThS27( real* DC, real f27E,f27W,f27N,f27S,f27T,f27B,f27NE,f27SW,f27SE,f27NW,f27TE,f27BW,f27BE,f27TW,f27TN,f27BS,f27BN,f27TS,f27ZERO,f27TNE,f27TSW,f27TSE,f27TNW,f27BNE,f27BSW,f27BSE,f27BNW; real Mx,My,Mz/*,Mxx,Myy,Mzz,M0*/; - real Conc_C_C; + //real Conc_C_C; real Conc_F_SWB, Conc_F_SWT, Conc_F_SET, Conc_F_SEB, Conc_F_NWB, Conc_F_NWT, Conc_F_NET, Conc_F_NEB; real omegaD_C = c2o1 / (c6o1 * diffusivity_coarse + c1o1); @@ -21704,7 +21706,7 @@ extern "C" __global__ void scaleFCThS27( real* DC, //real ae = diffusivity_fine/nue_d - one; //real ae_F = (diffusivity_fine/two)/nue_d - one; - real x, y, z; + // real x, y, z; real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu index 42744480c..b2437ce3f 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu @@ -176,7 +176,8 @@ extern "C" __global__ void scaleFC_comp_D3Q27F3_2018(real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + // real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*pressMMM,*/drhoMMM,vx1MMM,vx2MMM,vx3MMM; real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP; @@ -799,10 +800,10 @@ extern "C" __global__ void scaleFC_comp_D3Q27F3_2018(real* DC, //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; - real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein + //real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein real O3 = c2o1 - o; - real residu, residutmp; - residutmp = c0;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; + //real residu, residutmp; + //residutmp = c0;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; real NeqOn = c1o1;//zero;//one; //.... one = on ..... zero = off //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1422,7 +1423,8 @@ extern "C" __global__ void scaleFC_comp_D3Q27F3( real* DC, real xoff, yoff, zoff; real xoff_sq, yoff_sq, zoff_sq; - real vvx, vvy, vvz, vx2, vy2, vz2, drho; + // real drho; + real vvx, vvy, vvz, vx2, vy2, vz2; real press;//,drho,vx1,vx2,vx3; real /*pressMMM,*/drhoMMM,vx1MMM,vx2MMM,vx3MMM; real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP; @@ -2045,10 +2047,10 @@ extern "C" __global__ void scaleFC_comp_D3Q27F3( real* DC, //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real m0, m1, m2, oMdrho; real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz; - real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein + //real qudricLimit = c1o100;//ganz schlechte Idee -> muss global sein real O3 = c2o1 - o; - real residu, residutmp; - residutmp = c0;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; + //real residu, residutmp; + //residutmp = c0;///*-*/ c2o9 * (1./o - c1o2) * eps_new * eps_new; real NeqOn = c1o1;//zero;//one; //.... one = on ..... zero = off //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu index c984b883e..30540769f 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu @@ -1717,7 +1717,7 @@ extern "C" __global__ void QSlipGeomDeviceComp27(real* DD, real VeloZ = vx3; real fac = c0o1;//0.5; real phi = c0o1; - real alpha = c1o100; + //real alpha = c1o100; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real kxyFromfcNEQ = -(c3o1 * om1 / (c1o1-om1))*((f_SW+f_BSW+f_TSW-f_NW-f_BNW-f_TNW-f_SE-f_BSE-f_TSE+f_NE+f_BNE+f_TNE ) / (c1o1 + drho) - ((vx1*vx2))); real kyzFromfcNEQ = -(c3o1 * om1 / (c1o1-om1))*((f_BS+f_BSE+f_BSW-f_TS-f_TSE-f_TSW-f_BN-f_BNE-f_BNW+f_TN+f_TNE+f_TNW ) / (c1o1 + drho) - ((vx2*vx3))); @@ -2602,7 +2602,7 @@ extern "C" __global__ void QSlipNormDeviceComp27(real* DD, real VeloY = vx2; real VeloZ = vx3; real fac = c1o100;//0.5; - real phi = c0o1; + //real phi = c0o1; real alpha = c1o100; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// real kxyFromfcNEQ = -(c3o1 * om1 / (c1o1-om1))*((f_SW+f_BSW+f_TSW-f_NW-f_BNW-f_TNW-f_SE-f_BSE-f_TSE+f_NE+f_BNE+f_TNE ) / (c1o1 + drho) - ((vx1*vx2))); diff --git a/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu index a2c6ab0fa..78e6f08dc 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu @@ -933,7 +933,7 @@ extern "C" __global__ void QThinWallsPartTwo27( //////////////////////////////////////////////////////////////////////////////// //index uint KQK = k_Q[k]; - uint kzero= KQK; + //uint kzero= KQK; uint ke = KQK; uint kw = neighborX[KQK]; uint kn = KQK; diff --git a/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu index e7841bd76..f3288175c 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu @@ -2870,7 +2870,7 @@ extern "C" __global__ void QVelDeviceCompZeroPress1h27( int inx, //////////////////////////////////////////////////////////////////////////////// //index unsigned int KQK = k_Q[k]; - unsigned int kzero= KQK; + //unsigned int kzero= KQK; unsigned int ke = KQK; unsigned int kw = neighborX[KQK]; unsigned int kn = KQK; diff --git a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu index e4e6d9fb2..d39e229c4 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu @@ -177,8 +177,8 @@ extern "C" __global__ void LB_Kernel_WaleBySoniMalav_Cum_AA2016_Comp_SP_27( //////////////////////////////////////////////////////////////////////////////////// ///////////////////// WALE model /////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// - - float tauTotal, wOper; // total relaxation time and operator for the WALE model + //float tauTotal; + float wOper; // total relaxation time and operator for the WALE model float dxux, dyuy, dzuz, dyux, dxuy, dzux, dxuz, dzuy, dyuz; // 9 velocity gradients required for computing the strain rate tensor and vorticity tensor // gradients wrt X-axis diff --git a/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu b/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu index 3f91015c2..44319be27 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu @@ -98,8 +98,8 @@ extern "C" __global__ void WallFunction27(int inx, { //////////////////////////////////////////////////////////////////////////////// real VeloX = vx[k]; - real VeloY = vy[k]; - real VeloZ = vz[k]; //(16.0*(u0*2.0)*bbx*bby*(grid_nx-bbx)*(grid_ny-bby))/(grid_nx*grid_nx*grid_ny*grid_ny) + //real VeloY = vy[k]; + //real VeloZ = vz[k]; //(16.0*(u0*2.0)*bbx*bby*(grid_nx-bbx)*(grid_ny-bby))/(grid_nx*grid_nx*grid_ny*grid_ny) //////////////////////////////////////////////////////////////////////////////// //real *q_dirE, *q_dirW, *q_dirN, *q_dirS, *q_dirT, *q_dirB, // *q_dirNE, *q_dirSW, *q_dirSE, *q_dirNW, *q_dirTE, *q_dirBW, @@ -193,23 +193,24 @@ extern "C" __global__ void WallFunction27(int inx, f_TNW = (D.f[dirBSE ])[kbse ]; f_TSE = (D.f[dirBNW ])[kbnw ]; //////////////////////////////////////////////////////////////////////////////// - real vx1, vx2, vx3, drho, feq, q; + // real vx2, vx3, feq, q; + real vx1, drho; drho = f_TSE + f_TNW + f_TNE + f_TSW + f_BSE + f_BNW + f_BNE + f_BSW + f_BN + f_TS + f_TN + f_BS + f_BE + f_TW + f_TE + f_BW + f_SE + f_NW + f_NE + f_SW + f_T + f_B + f_N + f_S + f_E + f_W + ((D.f[dirZERO])[kzero]); - vx1 = (((f_TSE - f_BNW) - (f_TNW - f_BSE)) + ((f_TNE - f_BSW) - (f_TSW - f_BNE)) + - ((f_BE - f_TW) + (f_TE - f_BW)) + ((f_SE - f_NW) + (f_NE - f_SW)) + - (f_E - f_W)) / (c1o1 + drho); + vx1 = (((f_TSE - f_BNW) - (f_TNW - f_BSE)) + ((f_TNE - f_BSW) - (f_TSW - f_BNE)) + + ((f_BE - f_TW) + (f_TE - f_BW)) + ((f_SE - f_NW) + (f_NE - f_SW)) + + (f_E - f_W)) / (c1o1 + drho); - vx2 = ((-(f_TSE - f_BNW) + (f_TNW - f_BSE)) + ((f_TNE - f_BSW) - (f_TSW - f_BNE)) + - ((f_BN - f_TS) + (f_TN - f_BS)) + (-(f_SE - f_NW) + (f_NE - f_SW)) + - (f_N - f_S)) / (c1o1 + drho); + // vx2 = ((-(f_TSE - f_BNW) + (f_TNW - f_BSE)) + ((f_TNE - f_BSW) - (f_TSW - f_BNE)) + + // ((f_BN - f_TS) + (f_TN - f_BS)) + (-(f_SE - f_NW) + (f_NE - f_SW)) + + // (f_N - f_S)) / (c1o1 + drho); - vx3 = (((f_TSE - f_BNW) + (f_TNW - f_BSE)) + ((f_TNE - f_BSW) + (f_TSW - f_BNE)) + - (-(f_BN - f_TS) + (f_TN - f_BS)) + ((f_TE - f_BW) - (f_BE - f_TW)) + - (f_T - f_B)) / (c1o1 + drho); + // vx3 = (((f_TSE - f_BNW) + (f_TNW - f_BSE)) + ((f_TNE - f_BSW) + (f_TSW - f_BNE)) + + // (-(f_BN - f_TS) + (f_TN - f_BS)) + ((f_TE - f_BW) - (f_BE - f_TW)) + + // (f_T - f_B)) / (c1o1 + drho); //real cu_sq=c3o2*(vx1*vx1+vx2*vx2+vx3*vx3) * (one + drho); diff --git a/src/gpu/VirtualFluids_GPU/Input/ConfigFile.cpp b/src/gpu/VirtualFluids_GPU/Input/ConfigFile.cpp index 613af04d7..cfe4da2c7 100644 --- a/src/gpu/VirtualFluids_GPU/Input/ConfigFile.cpp +++ b/src/gpu/VirtualFluids_GPU/Input/ConfigFile.cpp @@ -58,7 +58,7 @@ void ConfigFile::get_token_and_value(void) } if (i==0) { - // It didn’t find a token, in this case. + // It didn�t find a token, in this case. m_token=""; m_value=""; return; @@ -78,7 +78,7 @@ void ConfigFile::get_token_and_value(void) return; } } - // Get the token’s value. + // Get the token�s value. i=0; char c = eat_white_and_comments(false); if ( c != '\n' ) @@ -139,6 +139,7 @@ char ConfigFile::eat_white_and_comments(bool traverse_newlines) bool in_comment; in_comment = false; while (!(m_in.get(ch)).fail()) + { if (ch == '#') in_comment = true; else if (ch == '\n') @@ -155,7 +156,8 @@ char ConfigFile::eat_white_and_comments(bool traverse_newlines) m_in.putback(ch); return 0; } - return 0; + } + return 0; } void ConfigFile::makeLower(std::string &instring) { diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/MRT/MRTCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/MRT/MRTCompSP27_Device.cu index 133084ecf..87984a4d9 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/MRT/MRTCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/MRT/MRTCompSP27_Device.cu @@ -192,8 +192,8 @@ extern "C" __global__ void LB_Kernel_MRT_Comp_SP_27(real omega, vy2 = vvy*vvy; vz2 = vvz*vvz; //////////////////////////////////////////////////////////////////////////////////// - real wadjust; - real qudricLimit = 0.01f; + //real wadjust; + //real qudricLimit = 0.01f; //////////////////////////////////////////////////////////////////////////////////// //Hin //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu index e0e48ab32..e82de30a7 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu @@ -178,8 +178,8 @@ extern "C" __global__ void LB_Kernel_BGK_Plus_Incomp_SP_27(real omega, vy2 = vvy*vvy; vz2 = vvz*vvz; //////////////////////////////////////////////////////////////////////////////////// - real wadjust; - real qudricLimit = 0.01f; + //real wadjust; + //real qudricLimit = 0.01f; //////////////////////////////////////////////////////////////////////////////////// //Hin //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu index 829a9e0c3..4b316f864 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu @@ -208,7 +208,7 @@ extern "C" __global__ void LB_Kernel_CumulantK15Incomp(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ @@ -305,8 +305,8 @@ extern "C" __global__ void LB_Kernel_CumulantK15Incomp(real omega, vy2 = vvy*vvy; vz2 = vvz*vvz; //////////////////////////////////////////////////////////////////////////////////// - real wadjust; - real qudricLimit = 0.01f; + //real wadjust; + //real qudricLimit = 0.01f; //real s9 = minusomega; //test //s9 = 0.; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/MRT/MRTIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/MRT/MRTIncompSP27_Device.cu index 6dd208964..97b5e96aa 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/MRT/MRTIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Incompressible/MRT/MRTIncompSP27_Device.cu @@ -187,8 +187,8 @@ extern "C" __global__ void LB_Kernel_MRT_Incomp_SP_27(real omega, vy2 = vvy*vvy; vz2 = vvz*vvz; //////////////////////////////////////////////////////////////////////////////////// - real wadjust; - real qudricLimit = 0.01f; + //real wadjust; + //real qudricLimit = 0.01f; //////////////////////////////////////////////////////////////////////////////////// //Hin //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu index 6eebbebc4..1da2b22d1 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu @@ -184,7 +184,7 @@ extern "C" __global__ void LB_Kernel_AD_Incomp_27(real diffusivity, real fTN = (D.f[dirBS])[kbs]; real fTS = (D.f[dirBN])[kb];//kbn real fBN = (D.f[dirTS])[ks];//kts - real fZERO = (D.f[dirZERO])[k];//kzero + //real fZERO = (D.f[dirZERO])[k];//kzero real fBSW = (D.f[dirTNE])[k];//ktne real fBNE = (D.f[dirTSW])[ksw];//ktsw real fBNW = (D.f[dirTSE])[ks];//ktse diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu index e981d3c25..f019f7c75 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu @@ -144,7 +144,7 @@ extern "C" __global__ void LB_Kernel_AD_Incomp_7(real diffusivity, real fTN = (D.f[dirBS])[kbs]; real fTS = (D.f[dirBN])[kb];//kbn real fBN = (D.f[dirTS])[ks];//kts - real fZERO = (D.f[dirZERO])[k];//kzero + //real fZERO = (D.f[dirZERO])[k];//kzero real fBSW = (D.f[dirTNE])[k];//ktne real fBNE = (D.f[dirTSW])[ksw];//ktsw real fBNW = (D.f[dirTSE])[ks];//ktse @@ -192,7 +192,7 @@ extern "C" __global__ void LB_Kernel_AD_Incomp_7(real diffusivity, real vx = ((fTNE - fBSW) + (fBNE - fTSW) + (fTSE - fBNW) + (fBSE - fTNW) + (fNE - fSW) + (fSE - fNW) + (fTE - fBW) + (fBE - fTW) + (fE - fW)); real vy = ((fTNE - fBSW) + (fBNE - fTSW) + (fBNW - fTSE) + (fTNW - fBSE) + (fNE - fSW) + (fNW - fSE) + (fTN - fBS) + (fBN - fTS) + (fN - fS)); real vz = ((fTNE - fBSW) + (fTSW - fBNE) + (fTSE - fBNW) + (fTNW - fBSE) + (fTE - fBW) + (fTW - fBE) + (fTN - fBS) + (fTS - fBN) + (fT - fB)); - ////dörrrrrty !!!!!!!!!!!!! + ////d�rrrrrty !!!!!!!!!!!!! // real vx = ten * ((fTNE-fBSW)+(fBNE-fTSW)+(fTSE-fBNW)+(fBSE-fTNW) +(fNE-fSW)+(fSE-fNW)+(fTE-fBW)+(fBE-fTW)+(fE-fW)); // real vy = ten * ((fTNE-fBSW)+(fBNE-fTSW)+(fBNW-fTSE)+(fTNW-fBSE) +(fNE-fSW)+(fNW-fSE)+(fTN-fBS)+(fBN-fTS)+(fN-fS)); // real vz = ten * ((fTNE-fBSW)+(fTSW-fBNE)+(fTSE-fBNW)+(fTNW-fBSE) +(fTE-fBW)+(fTW-fBE)+(fTN-fBS)+(fTS-fBN)+(fT-fB)); @@ -219,10 +219,10 @@ extern "C" __global__ void LB_Kernel_AD_Incomp_7(real diffusivity, //////////////////////////////////////////////////////////////////////////////// //TRT Yoshida Kernel - based on Ying - real cs2 = c1o4; + //real cs2 = c1o4; real Lam = diffusivity*c4o1;//diffusivity/(one)/cs2; real omegaD = -c1o1 / (Lam + c1o2); - real ae = c0o1; + //real ae = c0o1; //////////////////////////////////////////////////////////////////////////////// real ConcD = f7ZERO + f7E + f7W + f7N + f7S + f7T + f7B; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu index 7f93133cb..7d3e1fab7 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu @@ -174,7 +174,8 @@ extern "C" __global__ void LB_Kernel_WaleBySoniMalavCumulantK15Comp( ///////////////////// WALE model /////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// - float tauTotal, wOper; // total relaxation time and operator for the WALE model + // float tauTotal; + float wOper; // total relaxation time and operator for the WALE model float dxux, dyuy, dzuz, dyux, dxuy, dzux, dxuz, dzuy, dyuz; // 9 velocity gradients required for computing the strain rate tensor and vorticity tensor // gradients wrt X-axis diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp index b6cd8b1b6..1a5870d82 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp +++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp @@ -63,7 +63,7 @@ std::vector<std::shared_ptr<Kernel>> KernelFactoryImp::makeKernels(std::shared_p if (para->getMaxLevel() > 0) if (para->getMultiKernelOn()) - for (int i = 0; i < para->getMultiKernelLevel().size(); i++) + for (std::size_t i = 0; i < para->getMultiKernelLevel().size(); i++) setKernelAtLevel(kernels, para, para->getMultiKernel().at(i), para->getMultiKernelLevel().at(i)); return kernels; } -- GitLab