Skip to content
Snippets Groups Projects
Commit b1cecb31 authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

Merge branch 'GCC9' into 'master'

added GCC9 to ci

See merge request walberla/walberla!213
parents 36b9c2f3 e11ba79f
Branches
No related merge requests found
...@@ -745,6 +745,97 @@ gcc_8_mpionly: ...@@ -745,6 +745,97 @@ gcc_8_mpionly:
gcc_8_hybrid: gcc_8_hybrid:
<<: *build_definition <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
variables:
<<: *build_hybrid_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_8_serial_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
variables:
<<: *build_serial_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_8_mpionly_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
variables:
<<: *build_mpionly_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_8_hybrid_dbg:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
variables:
<<: *build_hybrid_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_8_hybrid_dbg_sp:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
variables:
<<: *build_hybrid_dbg_sp_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_9_serial:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables:
<<: *build_serial_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_9_mpionly:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables:
<<: *build_mpionly_variables
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_ENABLE_GUI: 0
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_9_hybrid:
<<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
stage: pretest stage: pretest
variables: variables:
<<: *build_hybrid_variables <<: *build_hybrid_variables
...@@ -756,9 +847,9 @@ gcc_8_hybrid: ...@@ -756,9 +847,9 @@ gcc_8_hybrid:
tags: tags:
- docker - docker
gcc_8_serial_dbg: gcc_9_serial_dbg:
<<: *build_definition <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables: variables:
<<: *build_serial_dbg_variables <<: *build_serial_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF" WALBERLA_BUILD_WITH_CUDA: "OFF"
...@@ -769,9 +860,9 @@ gcc_8_serial_dbg: ...@@ -769,9 +860,9 @@ gcc_8_serial_dbg:
tags: tags:
- docker - docker
gcc_8_mpionly_dbg: gcc_9_mpionly_dbg:
<<: *build_definition <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables: variables:
<<: *build_mpionly_dbg_variables <<: *build_mpionly_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF" WALBERLA_BUILD_WITH_CUDA: "OFF"
...@@ -782,9 +873,9 @@ gcc_8_mpionly_dbg: ...@@ -782,9 +873,9 @@ gcc_8_mpionly_dbg:
tags: tags:
- docker - docker
gcc_8_hybrid_dbg: gcc_9_hybrid_dbg:
<<: *build_definition <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables: variables:
<<: *build_hybrid_dbg_variables <<: *build_hybrid_dbg_variables
WALBERLA_BUILD_WITH_CUDA: "OFF" WALBERLA_BUILD_WITH_CUDA: "OFF"
...@@ -795,9 +886,9 @@ gcc_8_hybrid_dbg: ...@@ -795,9 +886,9 @@ gcc_8_hybrid_dbg:
tags: tags:
- docker - docker
gcc_8_hybrid_dbg_sp: gcc_9_hybrid_dbg_sp:
<<: *build_definition <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
variables: variables:
<<: *build_hybrid_dbg_sp_variables <<: *build_hybrid_dbg_sp_variables
WALBERLA_BUILD_WITH_CUDA: "OFF" WALBERLA_BUILD_WITH_CUDA: "OFF"
...@@ -1786,4 +1877,4 @@ benchmark_gcc8: ...@@ -1786,4 +1877,4 @@ benchmark_gcc8:
benchmark_clang8: benchmark_clang8:
<<: *benchmark_definition <<: *benchmark_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
\ No newline at end of file
...@@ -260,8 +260,8 @@ class BlockID : public IBlockID { ...@@ -260,8 +260,8 @@ class BlockID : public IBlockID {
public: public:
inline BlockID() : id_( uint_c(0) ) {} inline BlockID() = default;
inline BlockID( const BlockID& id ) : id_( id.id_ ) {} inline BlockID( const BlockID& id ) = default;
inline BlockID( const uint_t id ) : id_( id ) {} inline BlockID( const uint_t id ) : id_( id ) {}
inline BlockID( const uint_t treeIndex, const uint_t treeIdMarker ); inline BlockID( const uint_t treeIndex, const uint_t treeIdMarker );
inline BlockID( const BlockID& id, const uint_t branchId ); inline BlockID( const BlockID& id, const uint_t branchId );
...@@ -302,7 +302,7 @@ public: ...@@ -302,7 +302,7 @@ public:
private: private:
uint_t id_; uint_t id_ = uint_c(0);
}; // class BlockID }; // class BlockID
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment