diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..fc8c490ee32179c76654e60687b344235b879fb6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,19 @@ +--- + +before_script: + - echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1 -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/modules/dune-python-venv"' >> /duneci/cmake-flags/enable_virtualenv + +variables: + CORES: 2 + +debian:10--gcc: + image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-gcc-8-17 + script: duneci-standard-test + tags: + - "perftool" + +debian:10--clang: + image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17 + script: duneci-standard-test + tags: + - "perftool" diff --git a/LICENSE.md b/LICENSE.md index d08379ca22b230be7bb3f803794463deee43d94f..d1dd6e9da84a7db3918dcd10f5dd667db24521e5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,8 +1,8 @@ Copyright holders: ------------------ -* 2014 -- 2015 Dominic Kempf -* 2014 -- 2015 Timo Koch +* 2014 -- 2018 Dominic Kempf +* 2014 -- 2018 Timo Koch * 2015 Rene Milk * 2015 Linus Seelinger diff --git a/dune/testtools/test/cmakediscard/CMakeLists.txt b/dune/testtools/test/cmakediscard/CMakeLists.txt index 30959c39d1c60e75d08e1800d07a0fbde9c03d7f..4d8fe415d5fdffde9af09f8669be11422d10fd8d 100644 --- a/dune/testtools/test/cmakediscard/CMakeLists.txt +++ b/dune/testtools/test/cmakediscard/CMakeLists.txt @@ -3,20 +3,20 @@ set(MYOTHERPARAM 1) dune_add_system_test(SOURCE test.cc INIFILE discard.mini - BASENAME dt1 + BASENAME discardtest1 CREATED_TARGETS ct1 ) -# How do we assert the new beahviour of adding 77 tests upon skipping? +# How do we assert the new behaviour of adding 77 tests upon skipping? #dune_assert(LIST_LENGTH ct1 1 MESSAGE "Error in discard test 1") set(MYOTHERPARAM 0) dune_add_system_test(SOURCE test.cc INIFILE discard2.mini - BASENAME dt2 + BASENAME discardtest2 CREATED_TARGETS ct2 ) -# How do we assert the new beahviour of adding 77 tests upon skipping? +# How do we assert the new behaviour of adding 77 tests upon skipping? # dune_assert(LIST_LENGTH ct2 0 MESSAGE "Error in discard test 2") diff --git a/dune/testtools/test/constructiontest/CMakeLists.txt b/dune/testtools/test/constructiontest/CMakeLists.txt index 9bfc2d53bd243904c24371ae44f1285c3cdf5b79..d4801ca2d19e9ab8ec1a4ba25d1dccd0af040318 100644 --- a/dune/testtools/test/constructiontest/CMakeLists.txt +++ b/dune/testtools/test/constructiontest/CMakeLists.txt @@ -1,6 +1,6 @@ if(dune-grid_FOUND) dune_add_test(SOURCES constructiontest.cc - MPI_RANKS 1 2 + MPI_RANKS 1 TIMEOUT 10) dune_symlink_to_source_files(FILES ini test.msh) endif() diff --git a/dune/testtools/test/constructiontest/ini/ug_structured_simplical.ini b/dune/testtools/test/constructiontest/ini/ug_structured_simplical.ini index 7f333a4c4b81a909d21a6dc9d74b6d4bcce36cb0..aa99c45c04574d77128766d98dbaae0875d3294f 100644 --- a/dune/testtools/test/constructiontest/ini/ug_structured_simplical.ini +++ b/dune/testtools/test/constructiontest/ini/ug_structured_simplical.ini @@ -2,5 +2,5 @@ elements = 16 16 lowerleft = -1. -1. upperright = 1. 1. -elementType = simplical +elementType = simplicial refinement = 1 diff --git a/dune/testtools/test/constructiontest/ini/yasp.ini b/dune/testtools/test/constructiontest/ini/yasp.ini index 7037b9e491cef186f049fdd38e329c7ead09d1ee..0e818936c206d23d262f40b3b3fc8fcb6d6f9591 100644 --- a/dune/testtools/test/constructiontest/ini/yasp.ini +++ b/dune/testtools/test/constructiontest/ini/yasp.ini @@ -2,6 +2,6 @@ cells = 16 16 extension = 1. 1. lowerleft = -1. -1. -coordinates0 = -1. -0.75 0. 0.75 1. -coordinates1 = -1. -0.75 0. 0.75 1. +coordinates0 = -1. -0.75 -0.5 -0.1 0. 0.1 0.5 0.75 1. +coordinates1 = -1. -0.75 -0.5 -0.1 0. 0.1 0.5 0.75 1. refinement = 1 diff --git a/dune/testtools/tutorial/source.cc b/dune/testtools/tutorial/source.cc index d2d4e41ab9ce57d160831c5b0626b2ca4697a5de..efb2f066433b1dd6ac5dc3fda904708dfa3687cc 100644 --- a/dune/testtools/tutorial/source.cc +++ b/dune/testtools/tutorial/source.cc @@ -49,7 +49,7 @@ int main(int argc, char** argv) try return 0; } // Error handler ///////////////// -catch (Dune::Exception e) { +catch (Dune::Exception& e) { std::cerr << e << std::endl; return 1; }