-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master.dev' into 'master'
Release 2.8.0 See merge request piclas/piclas!661
- Loading branch information
Showing
454 changed files
with
14,716 additions
and
8,060 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,3 +77,6 @@ CMakeFiles/ | |
|
||
# doxygen build folder | ||
doxygen/ | ||
|
||
# unit test | ||
unitTests/bin/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -186,7 +186,7 @@ build: | |
stage: build | ||
script: | ||
- mkdir -p build ; cd build | ||
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie | ||
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie | ||
#- cmake .. -DLIBS_BUILD_HDF5=OFF -DPICLAS_BUILD_POSTI=ON -DPOSTI_BUILD_SUPERB=ON -DPICLAS_READIN_CONSTANTS=ON ; $GENERATOR -j all | ||
- cmake -GNinja .. -DLIBS_BUILD_HDF5=OFF -DPICLAS_BUILD_POSTI=ON -DPOSTI_BUILD_SUPERB=ON -DPICLAS_READIN_CONSTANTS=ON ; ninja -j0 all | ||
|
||
|
@@ -207,7 +207,7 @@ build_maxwell: | |
stage: build | ||
script: | ||
- mkdir -p build_maxwell ; cd build_maxwell | ||
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie | ||
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie | ||
- cmake .. -DPICLAS_DEBUG_MEMORY=ON -DPICLAS_PARTICLES=OFF -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON ; $GENERATOR -j $NCORES all | ||
|
||
build_poisson: | ||
|
@@ -229,11 +229,11 @@ build_poisson: | |
stage: build | ||
script: | ||
- mkdir -p build_poisson_release ; cd build_poisson_release | ||
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie | ||
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie | ||
- cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all | ||
- cd .. | ||
- mkdir -p build_poisson_debug ; cd build_poisson_debug | ||
- git clone [email protected]:reggie2.0/reggie2.0.git reggie | ||
- cp -r ../build_poisson_release/reggie . | ||
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all | ||
|
||
build_hopr: | ||
|
@@ -252,6 +252,38 @@ build_hopr: | |
rules: | ||
- if: '$DO_WEEKLY' | ||
|
||
build_no_git: | ||
tags: | ||
- withmodules-concurrent | ||
stage: build | ||
script: | ||
- echo " Installing branch $CI_COMMIT_REF_NAME without git" | ||
- git clone --depth=1 --branch=$CI_COMMIT_REF_NAME [email protected]:piclas/piclas.git piclas-no-git | ||
- rm -rf piclas-no-git/.git* ; cd piclas-no-git ; ls -la | ||
- mkdir build_ ; cd build_ ; | ||
- cmake .. -DLIBS_BUILD_HDF5=OFF | ||
- $GENERATOR -j $NCORES all | ||
rules: | ||
- if: '$DO_WEEKLY' | ||
|
||
build_no_git_libs: | ||
tags: | ||
- withmodules-concurrent | ||
stage: build | ||
script: | ||
- echo " Installing branch $CI_COMMIT_REF_NAME without git but with external libs" | ||
- git clone --depth=1 --branch=$CI_COMMIT_REF_NAME [email protected]:piclas/piclas.git piclas-no-git-but-libs | ||
- rm -rf piclas-no-git-but-libs/.git* ; cd piclas-no-git-but-libs ; ls -la | ||
- mkdir build_ ; cd build_ | ||
- cmake .. -DLIBS_BUILD_HDF5=ON -DLIBS_BUILD_MATH_LIB=ON -DLIBS_BUILD_MATH_LIB_VENDOR=OpenBLAS | ||
- echo " Compiling with -DLIBS_BUILD_HDF5=ON -DLIBS_BUILD_MATH_LIB=ON -DLIBS_BUILD_MATH_LIB_VENDOR=OpenBLAS ..." | ||
- $GENERATOR -j $NCORES all &> output.txt | ||
- tail -n 20 output.txt | ||
- rm output.txt | ||
- ls bin/piclas | ||
rules: | ||
- if: '$DO_WEEKLY' | ||
|
||
# ---------------------------------------------------------------------------------------------------------------------------------------------------- | ||
# Stage "reggie_checkin": Run most simple reggie with previous builds on check-in | ||
# ---------------------------------------------------------------------------------------------------------------------------------------------------- | ||
|
@@ -641,12 +673,7 @@ github: | |
script: | ||
- if [ -z "${DO_DEPLOY}" ]; then exit ; fi | ||
- rm -rf piclas_github || true ; | ||
- git clone -b master --single-branch git@gitlab.com:piclas/piclas.git piclas_github ; | ||
- git clone -b master --single-branch git@piclas.boltzplatz.eu:piclas/piclas.git piclas_github ; | ||
- cd piclas_github ; | ||
## - git checkout --orphan orphan_branch v1.0.0 ; # tag v1.0.0 points to f754d8e1e207cb959a81bfb9013bc0f12476c62b | ||
## - git commit -m 'truncated history before v1.0.0' ; | ||
## - git rebase --onto orphan_branch v1.0.0 master ; | ||
## - git branch -D orphan_branch ; | ||
- git remote add piclas-framework [email protected]:piclas-framework/piclas.git ; | ||
- git push --force --follow-tags piclas-framework master ; | ||
# - git push --mirror [email protected]:iagcopple/piclas-framework.git ; cd ../ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.