Merge branch 'master' into feature/FilterFieldConvert
Conflicts: CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 21 additions, 2 deletionsCHANGELOG.md
- CONTRIBUTING.md 1 addition, 0 deletionsCONTRIBUTING.md
- cmake/FindWin32Lapack.cmake 1 addition, 1 deletioncmake/FindWin32Lapack.cmake
- cmake/ThirdPartyBoost.cmake 9 additions, 4 deletionscmake/ThirdPartyBoost.cmake
- cmake/ThirdPartyPETSc.cmake 13 additions, 12 deletionscmake/ThirdPartyPETSc.cmake
- docs/user-guide/command-line/command-line.tex 0 additions, 4 deletionsdocs/user-guide/command-line/command-line.tex
- library/Demos/MultiRegions/Tests/Helmholtz2D_CG_P7_Modes_AllBCs_iter_ml_par3.tst 1 addition, 1 deletion...ons/Tests/Helmholtz2D_CG_P7_Modes_AllBCs_iter_ml_par3.tst
- library/Demos/MultiRegions/Tests/Helmholtz3D_CG_Hex_AllBCs_iter_ml_par3.tst 1 addition, 1 deletion...iRegions/Tests/Helmholtz3D_CG_Hex_AllBCs_iter_ml_par3.tst
- library/Demos/MultiRegions/Tests/Helmholtz3D_CG_Hex_AllBCs_iter_ml_scotch_par3.tst 1 addition, 1 deletion...s/Tests/Helmholtz3D_CG_Hex_AllBCs_iter_ml_scotch_par3.tst
- library/Demos/MultiRegions/Tests/Helmholtz3D_CG_Prism_iter_ml_scotch_par3.tst 1 addition, 1 deletion...egions/Tests/Helmholtz3D_CG_Prism_iter_ml_scotch_par3.tst
- library/FieldUtils/InputModules/InputDat.cpp 4 additions, 1 deletionlibrary/FieldUtils/InputModules/InputDat.cpp
- library/FieldUtils/InputModules/InputFld.cpp 1 addition, 1 deletionlibrary/FieldUtils/InputModules/InputFld.cpp
- library/FieldUtils/InputModules/InputPts.cpp 4 additions, 1 deletionlibrary/FieldUtils/InputModules/InputPts.cpp
- library/FieldUtils/InputModules/InputXml.cpp 5 additions, 10 deletionslibrary/FieldUtils/InputModules/InputXml.cpp
- library/FieldUtils/OutputModules/OutputFld.cpp 2 additions, 2 deletionslibrary/FieldUtils/OutputModules/OutputFld.cpp
- library/FieldUtils/OutputModules/OutputPts.cpp 4 additions, 1 deletionlibrary/FieldUtils/OutputModules/OutputPts.cpp
- library/FieldUtils/OutputModules/OutputTecplot.cpp 4 additions, 1 deletionlibrary/FieldUtils/OutputModules/OutputTecplot.cpp
- library/FieldUtils/OutputModules/OutputVtk.cpp 5 additions, 2 deletionslibrary/FieldUtils/OutputModules/OutputVtk.cpp
- library/FieldUtils/OutputModules/OutputXml.cpp 4 additions, 1 deletionlibrary/FieldUtils/OutputModules/OutputXml.cpp
- library/FieldUtils/ProcessModules/ProcessAddFld.cpp 1 addition, 1 deletionlibrary/FieldUtils/ProcessModules/ProcessAddFld.cpp
Loading
Please register or sign in to comment