fix merge conflicts after rebase
Showing
- apps/cpu/CouetteFlow/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/CouetteFlow/CMakeLists.txt
- apps/cpu/FlowAroundCylinder/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/FlowAroundCylinder/CMakeLists.txt
- apps/cpu/HerschelBulkleyModel/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/HerschelBulkleyModel/CMakeLists.txt
- apps/cpu/HerschelBulkleySphere/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/HerschelBulkleySphere/CMakeLists.txt
- apps/cpu/rheometer/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/rheometer/CMakeLists.txt
- apps/cpu/sphere/CMakeLists.txt 1 addition, 5 deletionsapps/cpu/sphere/CMakeLists.txt
- src/cpu/VirtualFluids.h 1 addition, 0 deletionssrc/cpu/VirtualFluids.h
- src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h 1 addition, 1 deletionsrc/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
- src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h 110 additions, 122 deletions...VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
- src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp 1 addition, 1 deletion.../VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
- src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp 0 additions, 4 deletions...ore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp 21 additions, 41 deletions...sCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp 137 additions, 140 deletions...re/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
- src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp 0 additions, 5 deletionssrc/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
- src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp 32 additions, 46 deletions...ualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
- src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp 33 additions, 13 deletionssrc/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
- src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h 33 additions, 0 deletionssrc/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h
- src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp 33 additions, 0 deletions...VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
- src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.h 34 additions, 1 deletion...u/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.h
- src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp 0 additions, 11 deletions.../VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
Loading
Please register or sign in to comment