Refactoring of CPU code
3 unresolved threads
3 unresolved threads
Huge refactoring step
Merge request reports
Activity
Filter activity
22 22 #SET(CMAKE_BUILD_TYPE DEBUG) 23 23 #ENDIF() 24 24 25 SET(USE_METIS ON CACHE BOOL "include METIS library support") 26 SET(USE_VTK OFF CACHE BOOL "include VTK library support") 27 SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support") 25 SET(VFCPU_USE_METIS ON CACHE BOOL "include METIS library support") 26 SET(VFCPU_USE_VTK OFF CACHE BOOL "include VTK library support") 27 SET(VFCPU_USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support") 28 28 29 SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support") 29 SET(VFCPU_USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support") 30 SET(VFCPU_USE_DEM_COUPLING OFF CACHE BOOL "PE plugin") 30 31 31 SET(USE_LIGGGHTS OFF CACHE BOOL "include LIGGGHTS library support") 32 SET(VFCPU_ENABLE_LiggghtsCoupling ON CACHE BOOL "enable coupling with LIGGGHTS library") changed this line in version 3 of the diff
14 IF(${USE_CATALYST}) 14 IF(${VFCPU_USE_CATALYST}) 15 15 list(APPEND VF_LIBRARIES optimized vtkPVPythonCatalyst debug vtkPVPythonCatalyst) 16 16 list(APPEND VF_LIBRARIES optimized vtkParallelMPI debug vtkParallelMPI ) 17 17 ENDIF() 18 18 19 IF(${VFCPU_USE_DEM_COUPLING}) 20 INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../DemCoupling/DemCoupling.cmake) 21 ENDIF() 22 19 23 if(BUILD_USE_OPENMP) 20 24 list(APPEND VF_LIBRARIES OpenMP::OpenMP_CXX) 21 25 endif() 22 26 23 IF(${USE_LIGGGHTS}) 27 IF(${VFCPU_USE_LIGGGHTS}) changed this line in version 3 of the diff
121 #include <BoundaryConditions/NoSlipBCStrategy.h> 122 #include <BoundaryConditions/NonEqDensityBCStrategy.h> 123 #include <BoundaryConditions/NonReflectingOutflowBCStrategy.h> 124 #include <BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.h> 125 #include <BoundaryConditions/NonReflectingInflowBCStrategy.h> 126 #include <BoundaryConditions/SlipBC.h> 127 #include <BoundaryConditions/SlipBCStrategy.h> 128 #include <BoundaryConditions/ThinWallBCSet.h> 129 #include <BoundaryConditions/ThinWallNoSlipBCStrategy.h> 130 #include <BoundaryConditions/VelocityBC.h> 131 #include <BoundaryConditions/VelocityBCStrategy.h> 132 #include <BoundaryConditions/VelocityWithDensityBCStrategy.h> 133 #include <BoundaryConditions/SimpleVelocityBCStrategy.h> 134 #include <BoundaryConditions/SimpleSlipBCStrategy.h> 135 136 #include <NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h> changed this line in version 4 of the diff
added 1 commit
- d89f898e - add pressure boundary condition for multiphase flow
added 1 commit
- aa015165 - move modules headers from VirtualFluids.h to specific headers
-
Your code has some warning which still needs to be fixed:
MultiphaseScaleDistributionLBMKernel
` [ 88%] Building CXX object src/cpu/MultiphaseFlow/CMakeFiles/MultiphaseFlow.dir/LBM/MultiphaseScaleDistributionLBMKernel.cpp.o /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp: In member function 'virtual void MultiphaseScaleDistributionLBMKernel::calculate(int)': /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:230:11: warning: unused variable 'phiOld' [-Wunused-variable] 230 | real phiOld = (*phaseField)(x1, x2, x3); | ^~~~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:257:10: warning: unused variable 'x1p' [-Wunused-variable] 257 | int x1p = x1 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:258:10: warning: unused variable 'x2p' [-Wunused-variable] 258 | int x2p = x2 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:259:10: warning: unused variable 'x3p' [-Wunused-variable] 259 | int x3p = x3 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:601:17: warning: unused variable 'feqL' [-Wunused-variable] 601 | real feqL = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:602:17: warning: unused variable 'feqG' [-Wunused-variable] 602 | real feqG = D3Q27System::getIncompFeqForDirection(fdir, 0, (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir])); | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:612:17: warning: unused variable 'eqBC' [-Wunused-variable] 612 | real eqBC= D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, vx, vy, vz); | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:613:17: warning: unused variable 'eqG' [-Wunused-variable] 613 | real eqG = D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz); | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:463:10: warning: unused variable 'x1p' [-Wunused-variable] 463 | int x1p = x1 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:464:10: warning: unused variable 'x2p' [-Wunused-variable] 464 | int x2p = x2 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:465:10: warning: unused variable 'x3p' [-Wunused-variable] 465 | int x3p = x3 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:1692:9: warning: unused variable 'x1p' [-Wunused-variable] 1692 | int x1p = x1 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:1693:9: warning: unused variable 'x2p' [-Wunused-variable] 1693 | int x2p = x2 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:1694:9: warning: unused variable 'x3p' [-Wunused-variable] 1694 | int x3p = x3 + 1; | ^~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3000:11: warning: unused variable 'rhoToPhi' [-Wunused-variable] 3000 | real rhoToPhi = (rhoH - rhoL) / (phiH - phiL); | ^~~~~~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3020:11: warning: unused variable 'mu' [-Wunused-variable] 3020 | real mu = 2 * beta * phi[DIR_000] * (phi[DIR_000] - 1) * (2 * phi[DIR_000] - 1) - kappa * nabla2_phi(); | ^~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3321:12: warning: unused variable 'scaleSharpener' [-Wunused-variable] 3321 | real scaleSharpener = 1.0; | ^~~~~~~~~~~~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3754:11: warning: unused variable 'MMxx' [-Wunused-variable] 3754 | real MMxx = mfcaa - c1o3 * mfaaa; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3755:11: warning: unused variable 'MMyy' [-Wunused-variable] 3755 | real MMyy = mfaca - c1o3 * mfaaa; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3756:11: warning: unused variable 'MMzz' [-Wunused-variable] 3756 | real MMzz = mfaac - c1o3 * mfaaa; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3757:11: warning: unused variable 'MMxy' [-Wunused-variable] 3757 | real MMxy = mfbba; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3758:11: warning: unused variable 'MMxz' [-Wunused-variable] 3758 | real MMxz = mfbab; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:3759:11: warning: unused variable 'MMyz' [-Wunused-variable] 3759 | real MMyz = mfabb; | ^~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp:190:7: warning: variable 'omegaDRho' set but not used [-Wunused-but-set-variable] 190 | real omegaDRho = 1.0;// 1.25;// 1.3; | ^~~~~~~~~ `MultiphaseSharpInterfaceLBMKernel
``` [ 89%] Building CXX object src/cpu/MultiphaseFlow/CMakeFiles/MultiphaseFlow.dir/LBM/MultiphaseSharpInterfaceLBMKernel.cpp.o /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp: In member function 'virtual void MultiphaseSharpInterfaceLBMKernel::calculate(int)': /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp:227:11: warning: unused variable 'phiOld' [-Wunused-variable] 227 | real phiOld = (*phaseField)(x1, x2, x3); | ^~~~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp:708:11: warning: unused variable 'rhoToPhi' [-Wunused-variable] 708 | real rhoToPhi = (rhoH - rhoL) / (phiH - phiL); | ^~~~~~~~ /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp:187:7: warning: variable 'omegaDRho' set but not used [-Wunused-but-set-variable] 187 | real omegaDRho = 1.0;// 1.25;// 1.3; ```WriteSharpInterfaceQuantitiesSimulationObserver
`[ 90%] Building CXX object src/cpu/MultiphaseFlow/CMakeFiles/MultiphaseFlow.dir/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp.o /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp: In member function 'void WriteSharpInterfaceQuantitiesSimulationObserver::addDataMQ(SPtr)': /workspaces/VirtualFluids_dev/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp:270:26: warning: unused variable 'rhoToPhi' [-Wunused-variable] 270 | real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);`Edited by Sören Peters added 1 commit
- fd65247e - change boundary conditions in sharp interface to velocity bounce back / fix unused variables
mentioned in commit 3f83442a
Please register or sign in to reply