diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e2b7ed80151fdc14ee3cdf7f0ade56649324ece..bcd29f2731ebf3b35f2edacd7d8af628cf3da61c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,47 +118,47 @@
intel_15_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_15_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_15_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_15_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_15_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_15_hybrid_dbg:
<<: *build_hybrid_dbg_definition
@@ -170,99 +170,99 @@ intel_15_hybrid_dbg:
intel_15_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_16_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_16_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
- only:
- - triggers
tags:
- docker
- intel
- cuda
+ only:
+ - triggers
intel_17_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_17_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
- only:
- - triggers
tags:
- docker
- intel
+ only:
+ - triggers
intel_17_hybrid:
<<: *build_hybrid_definition
@@ -302,42 +302,42 @@ intel_17_hybrid_dbg_sp:
gcc_4.7_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.7_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.7_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.7_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.7_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.7_hybrid_dbg:
<<: *build_hybrid_dbg_definition
@@ -348,140 +348,140 @@ gcc_4.7_hybrid_dbg:
gcc_4.7_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.8_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_4.9_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_5_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
gcc_5_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
gcc_5_hybrid:
<<: *build_hybrid_definition
@@ -500,45 +500,45 @@ gcc_5_serial_dbg:
gcc_5_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
gcc_5_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
gcc_5_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
gcc_6_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_6_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
gcc_6_hybrid:
<<: *build_hybrid_definition
@@ -573,277 +573,277 @@ gcc_6_hybrid_dbg_sp:
clang_3.4_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.4_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.4_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.4_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.5_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.5_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.5_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.5_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.6_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.6_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.6_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.6_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.7_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.7_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.7_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.7_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.8_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
- only:
- - triggers
tags:
- docker
- cuda
+ only:
+ - triggers
clang_3.9_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_3.9_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_4.0_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_4.0_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
- only:
- - triggers
tags:
- docker
+ only:
+ - triggers
clang_4.0_hybrid:
<<: *build_hybrid_definition
@@ -957,11 +957,11 @@ coverage:
###############################################################################
## ##
-## Windows Builds ##
+## Windows Builds ##
## ##
###############################################################################
-
-
+
+
.win_build_template: &win_build_definition
tags:
- win
@@ -977,8 +977,8 @@ coverage:
- cmake -LAH -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -G "$CMAKE_GENERATOR" ..
- MSBuild.exe walberla.sln /property:Configuration=$BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
- ctest -LE $CTEST_EXCLUDE_LABELS -C $BUILD_CONFIGURATION --output-on-failure -j 4
-
-
+
+
msvc-12_Hybrid_Dbg:
<<: *win_build_definition
variables:
@@ -988,7 +988,7 @@ msvc-12_Hybrid_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
-
+
msvc-12_Hybrid_SP_Dbg:
<<: *win_build_definition
variables:
@@ -1000,7 +1000,7 @@ msvc-12_Hybrid_SP_Dbg:
WALBERLA_DOUBLE_ACCURACY: "OFF"
only:
- triggers
-
+
msvc-12_Hybrid:
<<: *win_build_definition
variables:
@@ -1011,8 +1011,8 @@ msvc-12_Hybrid:
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
-
+ - triggers
+
msvc-12_Serial_Dbg:
<<: *win_build_definition
variables:
@@ -1024,7 +1024,7 @@ msvc-12_Serial_Dbg:
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
-
+
msvc-12_Serial:
<<: *win_build_definition
variables:
@@ -1036,7 +1036,7 @@ msvc-12_Serial:
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
-
+
msvc-12_MpiOnly_Dbg:
<<: *win_build_definition
variables:
@@ -1048,7 +1048,7 @@ msvc-12_MpiOnly_Dbg:
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
-
+
msvc-12_MpiOnly:
<<: *win_build_definition
variables:
@@ -1060,7 +1060,7 @@ msvc-12_MpiOnly:
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
-
+
msvc-14_Hybrid_Dbg:
<<: *win_build_definition
variables:
@@ -1070,7 +1070,9 @@ msvc-14_Hybrid_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
-
+ only:
+ - triggers
+
msvc-14_Hybrid_SP_Dbg:
<<: *win_build_definition
variables:
@@ -1080,7 +1082,9 @@ msvc-14_Hybrid_SP_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "OFF"
-
+ only:
+ - triggers
+
msvc-14_Hybrid:
<<: *win_build_definition
variables:
@@ -1090,7 +1094,9 @@ msvc-14_Hybrid:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
-
+ only:
+ - triggers
+
msvc-14_Serial_Dbg:
<<: *win_build_definition
variables:
@@ -1100,7 +1106,9 @@ msvc-14_Serial_Dbg:
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
-
+ only:
+ - triggers
+
msvc-14_Serial:
<<: *win_build_definition
variables:
@@ -1112,7 +1120,7 @@ msvc-14_Serial:
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
-
+
msvc-14_MpiOnly_Dbg:
<<: *win_build_definition
variables:
@@ -1122,7 +1130,9 @@ msvc-14_MpiOnly_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
-
+ only:
+ - triggers
+
msvc-14_MpiOnly:
<<: *win_build_definition
variables:
@@ -1132,5 +1142,80 @@ msvc-14_MpiOnly:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ only:
+ - triggers
+
+
+msvc-14.1_Hybrid_Dbg:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "DebugOptimized"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+
+msvc-14.1_Hybrid_SP_Dbg:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "DebugOptimized"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ WALBERLA_DOUBLE_ACCURACY: "OFF"
+
+msvc-14.1_Hybrid:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "Release"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+
+msvc-14.1_Serial_Dbg:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "DebugOptimized"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "OFF"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+
+msvc-14.1_Serial:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "Release"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "OFF"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ only:
+ - triggers
+
+msvc-14.1_MpiOnly_Dbg:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "DebugOptimized"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+
+msvc-14.1_MpiOnly:
+ <<: *win_build_definition
+ variables:
+ CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+ BUILD_CONFIGURATION: "Release"
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
\ No newline at end of file
diff --git a/src/core/logging/Initialization.cpp b/src/core/logging/Initialization.cpp
index b0a50017aeab801da79e196baecb153a9ec4baeb..420cbbb1ecbe9fdddbe08f8037b34bccf97843f0 100644
--- a/src/core/logging/Initialization.cpp
+++ b/src/core/logging/Initialization.cpp
@@ -23,6 +23,7 @@
#include "Logging.h"
#include <boost/algorithm/string.hpp>
+
#include <algorithm>
#include <sstream>
#include <string>
@@ -139,7 +140,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
if( loggingBlock.isDefined( "logLevel" ) )
{
std::string type = loggingBlock.getParameter< std::string >( "logLevel" );
- std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+ boost::algorithm::to_lower( type );
if( type.compare("warning") == 0 ){
logging::Logging::instance()->setLogLevel( logging::Logging::WARNING );
@@ -158,7 +159,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
if( loggingBlock.isDefined( "streamLogLevel" ) )
{
std::string type = loggingBlock.getParameter< std::string >( "streamLogLevel" );
- std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+ boost::algorithm::to_lower( type );
if( type.compare("warning") == 0 ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::WARNING );
@@ -177,7 +178,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
if( loggingBlock.isDefined( "fileLogLevel" ) )
{
std::string type = loggingBlock.getParameter< std::string >( "fileLogLevel" );
- std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+ boost::algorithm::to_lower( type );
if( type.compare("warning") == 0 ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::WARNING );
diff --git a/tests/geometry/VoxelFileTest.cpp b/tests/geometry/VoxelFileTest.cpp
index f75f7277fbf72dc7994f9a52dd3d371a1f2e67b5..3918b08dec89c888e5dc760e3c5f5c51245f4221 100644
--- a/tests/geometry/VoxelFileTest.cpp
+++ b/tests/geometry/VoxelFileTest.cpp
@@ -243,7 +243,7 @@ void runTests(const std::string & filename, size_t xSize, size_t ySize, size_t z
WALBERLA_CHECK_EQUAL( ySize, geometryFile.ySize() );
WALBERLA_CHECK_EQUAL( zSize, geometryFile.zSize() );
- numDefaultConstructedElements = std::count( data.begin(), data.end(), 7 );
+ numDefaultConstructedElements = std::count( data.begin(), data.end(), numeric_cast<T>(7) );
WALBERLA_CHECK_EQUAL( numCells, numDefaultConstructedElements );
data.clear();