Commit 7e3933e1 authored by Zhenguo Yan's avatar Zhenguo Yan

merged

parent 18ebba85
# Files to ignore for export # Files to ignore for export
.gitlab-ci.yml export-ignore
.gitignore export-ignore .gitignore export-ignore
.gitattributes export-ignore .gitattributes export-ignore
.gitmodules export-ignore .gitmodules export-ignore
......
...@@ -15,3 +15,6 @@ ThirdParty ...@@ -15,3 +15,6 @@ ThirdParty
*.pdf *.pdf
# Kdevelop project files # Kdevelop project files
*.kdev4 *.kdev4
# Sublime project files
*.sublime-project
*.sublime-workspace
stages: stages:
- docker-build-env - docker-build-env
- docker-build-image - docker-build-image
- docker-build-dev
- docker-test-image - docker-test-image
- docker-cleanup-image
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
.docker_build_template: &docker_build_template .docker_build_template: &docker_build_template
image: docker:stable image: docker:stable
...@@ -13,6 +10,8 @@ before_script: ...@@ -13,6 +10,8 @@ before_script:
only: only:
- master - master
- /^docker\/.*$/ - /^docker\/.*$/
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- docker pull ${image_name} || true - docker pull ${image_name} || true
- DOCKER_BUILDKIT=1 docker build -t ${image_name} -f ${dockerfile} . - DOCKER_BUILDKIT=1 docker build -t ${image_name} -f ${dockerfile} .
...@@ -22,54 +21,55 @@ before_script: ...@@ -22,54 +21,55 @@ before_script:
- docker push ${image_name}:latest - docker push ${image_name}:latest
.docker-test-template: &docker_test_template .docker-test-template: &docker_test_template
image: docker:stable image: ${image_name}
stage: docker-test-image stage: docker-test-image
only: only:
- master - master
- /^docker\/.*$/ - /^docker\/.*$/
script:
- docker pull ${image_name} || true
- docker create --name ${container_name}-$CI_COMMIT_SHORT_SHA -t ${image_name}:latest
- docker cp $(pwd)/${test_dir} ${container_name}-$CI_COMMIT_SHORT_SHA:/docker-entrypoint
- docker start ${container_name}-$CI_COMMIT_SHORT_SHA
- docker exec ${container_name}-$CI_COMMIT_SHORT_SHA ${test_cmd}
- docker rm -f ${container_name}-$CI_COMMIT_SHORT_SHA
docker-build-env: docker-build-env:
<<: *docker_build_template <<: *docker_build_template
stage: docker-build-env stage: docker-build-env
variables: variables:
image_name: nektarpp/nektar-env image_name: nektarpp/nektar-env
dockerfile: pkg/docker/nektar-env/Dockerfile dockerfile: docker/nektar-env/Dockerfile
only: only:
refs: refs:
- master - master
- /^docker\/.*$/ - /^docker\/.*$/
changes: changes:
- pkg/docker/nektar-env/Dockerfile - docker/nektar-env/Dockerfile
docker-build-nektar: docker-build-nektar:
<<: *docker_build_template <<: *docker_build_template
variables: variables:
image_name: nektarpp/nektar image_name: nektarpp/nektar
dockerfile: pkg/docker/nektar/Dockerfile dockerfile: docker/nektar/Dockerfile
docker-build-workbook: docker-build-workbook:
<<: *docker_build_template <<: *docker_build_template
variables: variables:
image_name: nektarpp/nektar-workbook image_name: nektarpp/nektar-workbook
dockerfile: pkg/docker/nektar-workbook/Dockerfile dockerfile: docker/nektar-workbook/Dockerfile
docker-build-dev:
<<: *docker_build_template
stage: docker-build-dev
variables:
image_name: nektarpp/nektar-dev
dockerfile: docker/nektar-dev/Dockerfile
docker-test-nektar: docker-test-nektar:
<<: *docker_test_template <<: *docker_test_template
variables: variables:
image_name: nektarpp/nektar image_name: nektarpp/nektar
container_name: nektar script:
test_dir: solvers/IncNavierStokesSolver/Tests - mpirun -n 3 IncNavierStokesSolver $CI_PROJECT_DIR/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml
test_cmd: mpirun -n 3 IncNavierStokesSolver data/ChanFlow_m3_par.xml
docker-cleanup-nektar: docker-test-nektar-dev:
stage: docker-cleanup-image <<: *docker_test_template
when: on_failure variables:
image_name: nektarpp/nektar-dev
script: script:
- docker rm -f nektar-$CI_COMMIT_SHORT_SHA - cd $CI_PROJECT_DIR/templates/executable
- ./test.sh /usr/local/lib64/nektar++/cmake 3
...@@ -6,6 +6,7 @@ v5.0.0 ...@@ -6,6 +6,7 @@ v5.0.0
**Library** **Library**
- Added in sum factorisation version for pyramid expansions and orthogonal - Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750) expansion in pyramids (!750)
- Added detection of 'abort' file to cleanly terminate simulation early (!772)
- Significant overhaul of CMake infrastructure (!770, !804) - Significant overhaul of CMake infrastructure (!770, !804)
- Fix ThridpartyCCM options (!802) - Fix ThridpartyCCM options (!802)
- Fix Windows CRLF tokens in GEO reader and improve comment handling (!805) - Fix Windows CRLF tokens in GEO reader and improve comment handling (!805)
...@@ -38,6 +39,8 @@ v5.0.0 ...@@ -38,6 +39,8 @@ v5.0.0
- Fix minor bug in ARPACK thirdparty build cmake (!874) - Fix minor bug in ARPACK thirdparty build cmake (!874)
- Added in sum factorisation version for pyramid expnasions and orthogonal - Added in sum factorisation version for pyramid expnasions and orthogonal
expansion in pyramids (!750) expansion in pyramids (!750)
- Adjust boost third-party compilation to account for different toolset
choices (!886)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900, - Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900,
!904, !941) !904, !941)
- Restructure the low energy preconditioner to handle pyramidic and variable - Restructure the low energy preconditioner to handle pyramidic and variable
...@@ -54,7 +57,7 @@ v5.0.0 ...@@ -54,7 +57,7 @@ v5.0.0
- Fix ability to have periodic boundary conditions that are aligned by a - Fix ability to have periodic boundary conditions that are aligned by a
rotation rather than just a translation (!933) rotation rather than just a translation (!933)
- Added a coupling interface to exchange data between solvers at run time - Added a coupling interface to exchange data between solvers at run time
and a DummySolver to test the implementations (!853, !931, !950, !973) and a DummySolver to test the implementations (!853, !931, !950, !973, !1017)
- Fix compilation issue with newer Boost versions and clang (!940) - Fix compilation issue with newer Boost versions and clang (!940)
- If only `NEKTAR_BUILD_LIBRARY` is enabled, only libraries up to and including - If only `NEKTAR_BUILD_LIBRARY` is enabled, only libraries up to and including
`MultiRegions` will be built by default (!945) `MultiRegions` will be built by default (!945)
...@@ -62,7 +65,8 @@ v5.0.0 ...@@ -62,7 +65,8 @@ v5.0.0
- Fix missing metadata import from Hdf5 files (!971) - Fix missing metadata import from Hdf5 files (!971)
- Fix missing flags for periodic BC in DiffusionLDG (!985) - Fix missing flags for periodic BC in DiffusionLDG (!985)
- Add the moving reference frame as a forcing (!987) - Add the moving reference frame as a forcing (!987)
- Added rtree for element bounding box lookup to accelerate interpolation (!996) - Added rtree for element bounding box lookup to accelerate interpolation (!996,
!1066)
- Fix integration weights on prisms and pyramids if not using the default - Fix integration weights on prisms and pyramids if not using the default
integration rule (!998) integration rule (!998)
- Fix missing ContainsPoint in Pyramid expansion (!1000) - Fix missing ContainsPoint in Pyramid expansion (!1000)
...@@ -71,7 +75,7 @@ v5.0.0 ...@@ -71,7 +75,7 @@ v5.0.0
- Combine and generalise demo code in StdRegions and LocalRegions (!993) - Combine and generalise demo code in StdRegions and LocalRegions (!993)
- Fix for error output to allow for custom error streams (!944) - Fix for error output to allow for custom error streams (!944)
- Fixed bug in ReOrientQuadFacePhysMap (!1003) - Fixed bug in ReOrientQuadFacePhysMap (!1003)
- Add NekPy Python interface (!962, !990, !989, !1004) - Add NekPy Python interface (!962, !990, !989, !1004, !1014, !1061, !1070)
- Fix edge case for ThirdPartyScotch and FindScoth (!1009) - Fix edge case for ThirdPartyScotch and FindScoth (!1009)
- Fix to populate m_elmtToExpId map if not already set up in GetExpIndex (!1019) - Fix to populate m_elmtToExpId map if not already set up in GetExpIndex (!1019)
- Added flag to skip periodic BCs while filling Dirichlet BCs in - Added flag to skip periodic BCs while filling Dirichlet BCs in
...@@ -82,6 +86,14 @@ v5.0.0 ...@@ -82,6 +86,14 @@ v5.0.0
- Fix XML attributes in conditions.cpp to be unordered (!1015) - Fix XML attributes in conditions.cpp to be unordered (!1015)
- Fix issue with HDF5 mesh input in serial (!1049) - Fix issue with HDF5 mesh input in serial (!1049)
- Add estimate of filters CPU time (!1044) - Add estimate of filters CPU time (!1044)
- Update CompressibleFlowSolver/Examples/Test_IsentropicVortex1.xml example (!1045)
- Add error if HDG used with periodic BCs (!1071)
- Fix issues related to leading factors, arithmetic order and associativity of
exponential operator in expression evaluator (!1066)
- Remove use of `using namespace std` in header files (!1066)
- Add error messages for use of ARPACK in serial (!1079)
- Generalise ContainsPoint routine (!1078)
- Homogenized fallthrough to fix issues with gcc 7.4.0 (!1084)
**NekMesh**: **NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731) - Add feature to read basic 2D geo files as CAD (!731)
...@@ -120,6 +132,7 @@ v5.0.0 ...@@ -120,6 +132,7 @@ v5.0.0
- Fix surface extraction, added regression test (!994) - Fix surface extraction, added regression test (!994)
- Fix 2D meshing running out of memory due to missing else (!1012) - Fix 2D meshing running out of memory due to missing else (!1012)
- Add support for .msh v4.1 file input (!1054) - Add support for .msh v4.1 file input (!1054)
- Added penalty term to LDG and LDGNS, slight generalization of LDG (!1080)
**FieldConvert**: **FieldConvert**:
- Add input module for Semtex field files (!777) - Add input module for Semtex field files (!777)
...@@ -145,6 +158,7 @@ v5.0.0 ...@@ -145,6 +158,7 @@ v5.0.0
- Fixed scaling for compressed xml, fixed error printout for mesh only (!1040) - Fixed scaling for compressed xml, fixed error printout for mesh only (!1040)