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

merged

parent 18ebba85
# Files to ignore for export
.gitlab-ci.yml export-ignore
.gitignore export-ignore
.gitattributes export-ignore
.gitmodules export-ignore
......
......@@ -15,3 +15,6 @@ ThirdParty
*.pdf
# Kdevelop project files
*.kdev4
# Sublime project files
*.sublime-project
*.sublime-workspace
stages:
- docker-build-env
- docker-build-image
- docker-build-dev
- 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
image: docker:stable
......@@ -13,6 +10,8 @@ before_script:
only:
- master
- /^docker\/.*$/
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker pull ${image_name} || true
- DOCKER_BUILDKIT=1 docker build -t ${image_name} -f ${dockerfile} .
......@@ -22,54 +21,55 @@ before_script:
- docker push ${image_name}:latest
.docker-test-template: &docker_test_template
image: docker:stable
image: ${image_name}
stage: docker-test-image
only:
- master
- /^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_template
stage: docker-build-env
variables:
image_name: nektarpp/nektar-env
dockerfile: pkg/docker/nektar-env/Dockerfile
dockerfile: docker/nektar-env/Dockerfile
only:
refs:
- master
- /^docker\/.*$/
changes:
- pkg/docker/nektar-env/Dockerfile
- docker/nektar-env/Dockerfile
docker-build-nektar:
<<: *docker_build_template
variables:
image_name: nektarpp/nektar
dockerfile: pkg/docker/nektar/Dockerfile
dockerfile: docker/nektar/Dockerfile
docker-build-workbook:
<<: *docker_build_template
variables:
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_template
variables:
image_name: nektarpp/nektar
container_name: nektar
test_dir: solvers/IncNavierStokesSolver/Tests
test_cmd: mpirun -n 3 IncNavierStokesSolver data/ChanFlow_m3_par.xml
script:
- mpirun -n 3 IncNavierStokesSolver $CI_PROJECT_DIR/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml
docker-cleanup-nektar:
stage: docker-cleanup-image
when: on_failure
docker-test-nektar-dev:
<<: *docker_test_template
variables:
image_name: nektarpp/nektar-dev
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
**Library**
- Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750)
- Added detection of 'abort' file to cleanly terminate simulation early (!772)
- Significant overhaul of CMake infrastructure (!770, !804)
- Fix ThridpartyCCM options (!802)
- Fix Windows CRLF tokens in GEO reader and improve comment handling (!805)
......@@ -38,6 +39,8 @@ v5.0.0
- Fix minor bug in ARPACK thirdparty build cmake (!874)
- Added in sum factorisation version for pyramid expnasions and orthogonal
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,
!904, !941)
- Restructure the low energy preconditioner to handle pyramidic and variable
......@@ -54,7 +57,7 @@ v5.0.0
- Fix ability to have periodic boundary conditions that are aligned by a
rotation rather than just a translation (!933)
- 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)
- If only `NEKTAR_BUILD_LIBRARY` is enabled, only libraries up to and including
`MultiRegions` will be built by default (!945)
......@@ -62,7 +65,8 @@ v5.0.0
- Fix missing metadata import from Hdf5 files (!971)
- Fix missing flags for periodic BC in DiffusionLDG (!985)
- 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
integration rule (!998)
- Fix missing ContainsPoint in Pyramid expansion (!1000)
......@@ -71,7 +75,7 @@ v5.0.0
- Combine and generalise demo code in StdRegions and LocalRegions (!993)
- Fix for error output to allow for custom error streams (!944)
- 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 to populate m_elmtToExpId map if not already set up in GetExpIndex (!1019)
- Added flag to skip periodic BCs while filling Dirichlet BCs in
......@@ -82,6 +86,14 @@ v5.0.0
- Fix XML attributes in conditions.cpp to be unordered (!1015)
- Fix issue with HDF5 mesh input in serial (!1049)
- 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**:
- Add feature to read basic 2D geo files as CAD (!731)
......@@ -120,6 +132,7 @@ v5.0.0
- Fix surface extraction, added regression test (!994)
- Fix 2D meshing running out of memory due to missing else (!1012)
- Add support for .msh v4.1 file input (!1054)
- Added penalty term to LDG and LDGNS, slight generalization of LDG (!1080)
**FieldConvert**:
- Add input module for Semtex field files (!777)
......@@ -145,6 +158,7 @@ v5.0.0
- Fixed scaling for compressed xml, fixed error printout for mesh only (!1040)
- Add field conversion from Halfmode to SingleMode (!1032)
- Fix double precision output in .dat format (!1059)
- Add phase sampling feature in FilterFieldConvert (!1068)
**IncNavierStokesSolver**
- Replace steady-state check based on difference of norms by check based on
......@@ -152,7 +166,8 @@ v5.0.0
- Updated SVV to allow for the DGKernel extension (!851)
- Pre-calculate Time invariant portion of Womersley Solution (!814)
- Fix for independent setting of SVV in Homogeneous direction (!936)
- Write flow field based on CFL treshold (!1025)
- Write flow field based on CFL threshold (!1025)
- Fix unsteady Stokes solver (!1074)
**CompressibleFlowSolver**
- Add 3D regression tests (!567)
......@@ -166,6 +181,7 @@ v5.0.0
- Modified pressure outlet BCs to allow for the reference static pressure to be
set from the VALUE fields (!981)
- hp scaling for Laplacian AV (!1013)
- Removed smooth AV (!1072)
**AcousticSolver:**
- Added two new boundary conditions to the APE system: RiemannInvariantBC
......@@ -184,14 +200,22 @@ v5.0.0
**PulseWaveSolver**
- Added two new boundary conditions: AInflow and UInflow
**CardiacEPSolver**
- Converted FentonKarma model to dimensional form and added variants (!1011)
**Documentation**:
- Added an initial developer's guide (!1001)
- Updated user guide to reflect current implementation (!1051)
- Added manpages for key solvers and utilities (!1051)
**Tester**
- Fix build with boost 1.67 (!947)
- Various change to tests to decrease test time (!1053)
- Extend to support MPI tests with multiple executables (!1085)
**Packaging:**
- Add Dockerfiles and gitlab CI configuration for automatic builds (!1021)
- Add Dockerfiles and gitlab CI configuration for automatic builds (!1021,
!1092)
v4.4.2
------
......
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build,
options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release
RelWithDebInfo MinSizeRel.")
......@@ -70,7 +70,7 @@ IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
ENDIF()
# Find default search paths for OS X; adapted from Stack Overflow question
# 1487752
# 1487752.
IF (APPLE)
EXECUTE_PROCESS(COMMAND which port
RESULT_VARIABLE DETECT_MACPORTS
......@@ -162,13 +162,14 @@ OPTION(NEKTAR_BUILD_UNIT_TESTS "Build unit tests." ON)
OPTION(NEKTAR_BUILD_TESTS "Build regression tests." ON)
OPTION(NEKTAR_BUILD_TIMINGS "Build benchmark timing codes." OFF)
OPTION(NEKTAR_BUILD_PYTHON "Build Nektar++ Python bindings" OFF)
OPTION(NEKTAR_BUILD_PACKAGES "Build Nektar++ binary packages" OFF)
MARK_AS_ADVANCED(NEKTAR_BUILD_PACKAGES)
OPTION(NEKTAR_TEST_ALL "Include full set of regression tests to this build." OFF)
OPTION(NEKTAR_TEST_USE_HOSTFILE "Use a hostfile to explicitly specify number of
slots." OFF)
OPTION(NEKTAR_ERROR_ON_WARNINGS "Use -Werror to make warnings stop compilation." ON)
MARK_AS_ADVANCED(NEKTAR_ERROR_ON_WARNINGS)
# Meshing utilities and library
IF (NOT WIN32)
OPTION(NEKTAR_USE_MESHGEN "Build mesh generation utilities." OFF)
......@@ -340,7 +341,3 @@ INSTALL(DIRECTORY ${TPDIST}/include/
)