Katropton: Resolve conflicts created while merging origin/master into feature_block
Showing
- CMake/FindEIGEN.cmake 46 additions, 3 deletionsCMake/FindEIGEN.cmake
- CMake/msys2.cmake 19 additions, 0 deletionsCMake/msys2.cmake
- CMakeLists.txt 9 additions, 3 deletionsCMakeLists.txt
- flow/benchmark/onera.py 22 additions, 3 deletionsflow/benchmark/onera.py
- flow/cases/n0012.py 1 addition, 0 deletionsflow/cases/n0012.py
- flow/cases/n0012_3.py 1 addition, 0 deletionsflow/cases/n0012_3.py
- flow/cases/n64A410.py 1 addition, 0 deletionsflow/cases/n64A410.py
- flow/cases/rae2822.py 4 additions, 0 deletionsflow/cases/rae2822.py
- flow/cases/wbht.py 4 additions, 0 deletionsflow/cases/wbht.py
- flow/cases/wht.py 1 addition, 0 deletionsflow/cases/wht.py
- flow/default.py 23 additions, 22 deletionsflow/default.py
- flow/scripts/config.py 20 additions, 4 deletionsflow/scripts/config.py
- flow/src/wAdjoint.cpp 49 additions, 91 deletionsflow/src/wAdjoint.cpp
- flow/src/wBoundary.cpp 6 additions, 6 deletionsflow/src/wBoundary.cpp
- flow/src/wF0Ps.cpp 3 additions, 6 deletionsflow/src/wF0Ps.cpp
- flow/src/wF0Ps.h 4 additions, 4 deletionsflow/src/wF0Ps.h
- flow/src/wFpeLSFunction.h 0 additions, 1 deletionflow/src/wFpeLSFunction.h
- flow/src/wKutta.cpp 3 additions, 3 deletionsflow/src/wKutta.cpp
- flow/src/wKuttaElement.cpp 11 additions, 15 deletionsflow/src/wKuttaElement.cpp
- flow/src/wNewton.cpp 69 additions, 118 deletionsflow/src/wNewton.cpp
Loading
Please register or sign in to comment