Merge branch 'master' into feature/CollapseExpList
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 22 additions, 21 deletions.gitlab-ci.yml
- .gitlab-ci/build-and-test.sh 27 additions, 1 deletion.gitlab-ci/build-and-test.sh
- CHANGELOG.md 13 additions, 1 deletionCHANGELOG.md
- CMakeLists.txt 8 additions, 21 deletionsCMakeLists.txt
- cmake/NektarCommon.cmake 14 additions, 1 deletioncmake/NektarCommon.cmake
- cmake/ThirdPartyBoost.cmake 7 additions, 5 deletionscmake/ThirdPartyBoost.cmake
- cmake/ThirdPartyHDF5.cmake 0 additions, 4 deletionscmake/ThirdPartyHDF5.cmake
- cmake/ThirdPartyPython.cmake 20 additions, 0 deletionscmake/ThirdPartyPython.cmake
- cmake/ThirdPartyZlib.cmake 18 additions, 8 deletionscmake/ThirdPartyZlib.cmake
- cmake/thirdparty-patches/CMakeLists_CCM.txt 1 addition, 1 deletioncmake/thirdparty-patches/CMakeLists_CCM.txt
- cmake/thirdparty-patches/ccmio-warning.patch 46 additions, 8 deletionscmake/thirdparty-patches/ccmio-warning.patch
- cmake/thirdparty-patches/numpy-deprecated-api-warnings.patch 74 additions, 0 deletionscmake/thirdparty-patches/numpy-deprecated-api-warnings.patch
- docker/nektar-env/Dockerfile_centos_default 3 additions, 0 deletionsdocker/nektar-env/Dockerfile_centos_default
- docker/nektar-env/Dockerfile_ubuntu_full_py3 13 additions, 0 deletionsdocker/nektar-env/Dockerfile_ubuntu_full_py3
- docker/nektar-env/centos7_default_packages.txt 1 addition, 1 deletiondocker/nektar-env/centos7_default_packages.txt
- docker/nektar-env/focal_default_packages.txt 1 addition, 0 deletionsdocker/nektar-env/focal_default_packages.txt
- docker/nektar-env/focal_full_packages.txt 3 additions, 3 deletionsdocker/nektar-env/focal_full_packages.txt
- docs/refs.bib 44 additions, 0 deletionsdocs/refs.bib
- docs/user-guide/installation/source.tex 152 additions, 70 deletionsdocs/user-guide/installation/source.tex
- docs/user-guide/solvers/img/concentration.pdf 0 additions, 0 deletionsdocs/user-guide/solvers/img/concentration.pdf
Loading
Please register or sign in to comment