diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ffc02bef3634a9fc383292984560f8f0041dffc..efb8d9dd58ca1e9d91c5226595df1ba79d1dc293 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,6 +124,8 @@ gcc_9_rebuild: msvc_16: stage: build + when: manual + tags: - win - gpu @@ -198,6 +200,7 @@ msvc_16_unit_tests: - gpu needs: ["msvc_16"] + when: manual before_script: - cd $CI_PROJECT_DIR/build @@ -437,6 +440,8 @@ vf_to_phoenix: stage: deploy needs: ["gcc_9_python"] + when: manual + variables: SSH_KEY: "$SSH_PRIVATE_KEY" HOST: "phoenix.hlr.rz.tu-bs.de" @@ -456,6 +461,8 @@ cppcheck_to_elladan: stage: deploy needs: ["cppcheck"] + when: manual + variables: SSH_KEY: "$SSH_PRIVATE_KEY_ELLADAN" HOST: "elladan.irmb.bau.tu-bs.de" @@ -469,6 +476,8 @@ gcov_to_elladan: stage: deploy needs: ["gcov_gcc_9"] + when: manual + variables: SSH_KEY: "$SSH_PRIVATE_KEY_ELLADAN" HOST: "elladan.irmb.bau.tu-bs.de" @@ -485,6 +494,8 @@ sonar-scanner: refs: - develop + when: manual + variables: SONAR_HOST_URL: "http://finrod.irmb.bau.tu-bs.de/sonarqube" diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu index 45259f9ac16210ecf698ee8a59471acf10892e90..bc86f1a90fb7a61c8679b261eae5176572d059c6 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu @@ -180,9 +180,9 @@ extern "C" __global__ void LB_Kernel_Kum_AA2016_Comp_Bulk_SP_27(real omega, (mfbbc-mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0]/(pow(c2o1,level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1]/(pow(c2o1,level)); //zero; - real fz = forces[2]/(pow(c2o1,level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); // zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); // zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); // zero; vvx += fx; vvy += fy; vvz += fz; @@ -5611,9 +5611,9 @@ extern "C" __global__ void LB_Kernel_Kum_New_Comp_SRT_SP_27( (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); - real fy = forces[1] / (pow(c2o1, level)); - real fz = forces[2] / (pow(c2o1, level)); + real fx = forces[0] / (pow((double)c2o1, (double)level)); + real fy = forces[1] / (pow((double)c2o1, (double)level)); + real fz = forces[2] / (pow((double)c2o1, (double)level)); vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu index 1f232b76522dc03b8641ae3066bc47a98af4a164..8bfdfb3b9421baa4290cd305542520b28aa5fd17 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu @@ -255,9 +255,9 @@ extern "C" __global__ void Cumulant_One_preconditioned_errorDiffusion_chim_Comp_ (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; @@ -1170,9 +1170,9 @@ extern "C" __global__ void Cumulant_One_preconditioned_chim_Comp_SP_27( (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; @@ -1943,9 +1943,9 @@ extern "C" __global__ void Cumulant_One_chim_Comp_SP_27( (mfbbc - mfbba)) * OOrho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu index fab34f1dd10b155cf694eaa719ba82057a7b3eb1..71d839609ec400fac4addb22224f18a69a5a9035 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu @@ -30,7 +30,7 @@ extern "C" __global__ void LB_PostProcessor_F3_2018_Fehlberg(real omega, { //////////////////////////////////////////////////////////////////////////////// const unsigned x = threadIdx.x; // Globaler x-Index - const unsigned y = blockIdx.x; // Globaler y-Index + const unsigned y = blockIdx.x; // Globaler y-Index const unsigned z = blockIdx.y; // Globaler z-Index const unsigned nx = blockDim.x; @@ -214,9 +214,9 @@ extern "C" __global__ void LB_PostProcessor_F3_2018_Fehlberg(real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); // zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); // zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu index dfc8271ed9f79baa5cf1bee8928619c75362bed7..39c63e152c7a5ab88d8d416591a737d56a5d23b3 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu @@ -110,9 +110,9 @@ extern "C" __global__ void InitParticles( real* coordX, } - real localX = randArray[k] / (real)(pow(c2o1,level)); - real localY = randArray[k] / (real)(pow(c2o1,level)); - real localZ = randArray[k] / (real)(pow(c2o1,level)); + real localX = randArray[k] / (real)(pow((double)c2o1, (double)level)); + real localY = randArray[k] / (real)(pow((double)c2o1, (double)level)); + real localZ = randArray[k] / (real)(pow((double)c2o1, (double)level)); real globalX = coordinateX + localX; real globalY = coordinateY + localY; @@ -878,9 +878,9 @@ extern "C" __global__ void MoveParticles( real* coordX, real localY = coordParticleYlocal[kTimeStepOld]; real localZ = coordParticleZlocal[kTimeStepOld]; - x = (localX * (real)(pow(c2o1,level))) - c1o2; //-c1o4; - y = (localY * (real)(pow(c2o1,level))) - c1o2; //-c1o4; - z = (localZ * (real)(pow(c2o1,level))) - c1o2; //-c1o4; + x = (localX * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; + y = (localY * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; + z = (localZ * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vx1 = (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); @@ -961,9 +961,9 @@ extern "C" __global__ void MoveParticles( real* coordX, y = tempY; z = tempZ; - localX = (x + c1o2) / (real)(pow(c2o1,level)); - localY = (y + c1o2) / (real)(pow(c2o1,level)); - localZ = (z + c1o2) / (real)(pow(c2o1,level)); + localX = (x + c1o2) / (real)(pow((double)c2o1, (double)level)); + localY = (y + c1o2) / (real)(pow((double)c2o1, (double)level)); + localZ = (z + c1o2) / (real)(pow((double)c2o1, (double)level)); coordParticleXlocal[kTimeStep] = localX; coordParticleYlocal[kTimeStep] = localY; coordParticleZlocal[kTimeStep] = localZ; @@ -1743,9 +1743,9 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX, real localY = coordParticleYlocal[kTimeStepOld]; real localZ = coordParticleZlocal[kTimeStepOld]; - x = (localX * (real)(pow(c2o1,level))) - c1o2; //-c1o4; - y = (localY * (real)(pow(c2o1,level))) - c1o2; //-c1o4; - z = (localZ * (real)(pow(c2o1,level))) - c1o2; //-c1o4; + x = (localX * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; + y = (localY * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; + z = (localZ * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz; vx1 = (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); @@ -1826,9 +1826,9 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX, y = tempY; z = tempZ; - localX = (x + c1o2) / (real)(pow(c2o1,level)); - localY = (y + c1o2) / (real)(pow(c2o1,level)); - localZ = (z + c1o2) / (real)(pow(c2o1,level)); + localX = (x + c1o2) / (real)(pow((double)c2o1, (double)level)); + localY = (y + c1o2) / (real)(pow((double)c2o1, (double)level)); + localZ = (z + c1o2) / (real)(pow((double)c2o1, (double)level)); coordParticleXlocal[kTimeStep] = localX; coordParticleYlocal[kTimeStep] = localY; coordParticleZlocal[kTimeStep] = localZ; diff --git a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu index f449e0d4923c0b8e1e472cbb2e70b562a7280d30..e4e6d9fb2b4582afb95b97826bedacd96bd80eb7 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu @@ -311,9 +311,9 @@ extern "C" __global__ void LB_Kernel_WaleBySoniMalav_Cum_AA2016_Comp_SP_27( //////////////////////////////////////////////////////////////////////////////////// //the force be with you { - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu index e17a5263565b2e134eb868b5b6271bfc0ff3590c..246ec79658674c8383012f97776ca60554883158 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu @@ -206,9 +206,9 @@ extern "C" __global__ void LB_Kernel_Cumulant_D3Q27All4( real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15/CumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15/CumulantK15Comp_Device.cu index 183d83a6c89ca0470275302842fa267e8576cc81..4fb90b7093e9608cb5dce616e56f79d90f540067 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15/CumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15/CumulantK15Comp_Device.cu @@ -202,9 +202,9 @@ extern "C" __global__ void LB_Kernel_CumulantK15Comp(real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu index dfda290109dad41ed6822e2dbf95ba17264e9ae2..1a0efdf8e4e70633f4b0052763813e0639e387d3 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu @@ -202,9 +202,9 @@ extern "C" __global__ void LB_Kernel_CumulantK15BulkComp(real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17/CumulantK17Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17/CumulantK17Comp_Device.cu index 9d5f512bdef702973bea90cec587b7d29dfc1a2c..9ccd7dcb4ede3a493fe6c2621b03a515544bec96 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17/CumulantK17Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17/CumulantK17Comp_Device.cu @@ -204,9 +204,9 @@ extern "C" __global__ void LB_Kernel_CumulantK17Comp(real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu index 653fd9f7bbbf98afa5e993d90ee5ee8a8ed5a71c..147b814a3c603637c8bb721e3fe96a7b6f2ce8ba 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu @@ -172,9 +172,9 @@ extern "C" __global__ void LB_Kernel_CumulantK17BulkComp(real omega, (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK18/CumulantK18Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK18/CumulantK18Comp_Device.cu index f882ecc2aa4eadb2c95b171e95c776877da28753..2249e5857cb8c5d28b53658c25bbb9c3fc3e62c0 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK18/CumulantK18Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK18/CumulantK18Comp_Device.cu @@ -204,9 +204,9 @@ extern "C" __global__ void LB_Kernel_CumulantK18Comp( (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK20/CumulantK20Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK20/CumulantK20Comp_Device.cu index 3324d52e9470d9c226c561297ee2a1347a743738..9edae07fabf8f2c18fb86055574b153e960d8dec 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK20/CumulantK20Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/Advection/Compressible/CumulantK20/CumulantK20Comp_Device.cu @@ -203,9 +203,9 @@ extern "C" __global__ void LB_Kernel_CumulantK20Comp( (mfbbc - mfbba)) / rho; //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx; vvy += fy; vvz += fz; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/Advection/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/Advection/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu index 2b6c98b388facf63bbbe9a9ede746269a3116fb7..945d8706415cfc66bde65390894f8729b3ef6dce 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/Advection/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/Advection/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu @@ -160,9 +160,9 @@ extern "C" __global__ void LB_Kernel_PM_Cum_One_Comp_SP_27(real omega, //vvz = (two * vvz) / (two + 134.4 + 0.0068287 * sqrtf(vx2 + vy2 + vz2)); //////////////////////////////////////////////////////////////////////////////////// //the force be with you - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu index 3308121db745108efc31053ebbff0b707edaf8bf..a23d1c480b31befbe1ece6b83b20fa415c94a0e7 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu @@ -434,9 +434,9 @@ extern "C" __global__ void LB_Kernel_WaleCumulantK15Comp( //////////////////////////////////////////////////////////////////////////////////// //the force be with you { - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; 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 7e685897a543a83e9fe1e5fdaee9e125140c81df..7f93133cb660c0af5a5d35ab6be37686b14f0e4c 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 @@ -307,9 +307,9 @@ extern "C" __global__ void LB_Kernel_WaleBySoniMalavCumulantK15Comp( //////////////////////////////////////////////////////////////////////////////////// //the force be with you { - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu index 6e9939b792e0644cb20feb207a7df49fc2c8d9d5..91e91bc0ff5e1582eab279c77e9fa0b419ce06ea 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu @@ -435,9 +435,9 @@ extern "C" __global__ void LB_Kernel_WaleCumulantK17Comp( //////////////////////////////////////////////////////////////////////////////////// //the force be with you { - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu index 1f371fea7470f156a8685972775b4e0c8ca4525f..b0e0b65064e2395f5049eeb2df3b8260125fbf4e 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/Advection/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu @@ -454,9 +454,9 @@ extern "C" __global__ void LB_Kernel_WaleCumulantK17DebugComp( //////////////////////////////////////////////////////////////////////////////////// //the force be with you { - real fx = forces[0] / (pow(c2o1, level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // - real fy = forces[1] / (pow(c2o1, level)); //zero; - real fz = forces[2] / (pow(c2o1, level)); //zero; + real fx = forces[0] / (pow((double)c2o1, (double)level)); //zero;//0.0032653/(pow(two,level)); //0.000000005;//(two/1600000.0) / 120.0; // + real fy = forces[1] / (pow((double)c2o1, (double)level)); //zero; + real fz = forces[2] / (pow((double)c2o1, (double)level)); //zero; vvx += fx*c1o2; vvy += fy*c1o2; vvz += fz*c1o2;