From 097300b0ff96ce8cf31c4aa00d02408079eb723e Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 18 May 2020 13:51:38 +0000 Subject: [PATCH] Fix some tests failing without LAPAPCK support and with -Werror --- tests/boost/point_adaptor_01.cc | 1 + tests/boost/rtree_02.cc | 4 +++- ...=true.with_p4est=true.with_lapack=true.mpirun=1.output} | 0 ...=true.with_p4est=true.with_lapack=true.mpirun=2.output} | 0 ...ctor_memory_02.output => vector_memory_02.debug.output} | 0 tests/dofs/dof_test.cc | 2 +- ...put => grid_generator_open_torus.with_lapack=on.output} | 0 tests/grid/grid_test.cc | 2 +- ...put => grid_tools_aspect_ratio.with_lapack=true.output} | 0 ...014_04_peak.with_trilinos=true.with_lapack=true.output} | 0 tests/mpi/no_flux_constraints_02.cc | 3 ++- tests/mpi/no_flux_constraints_03.cc | 7 ++++--- ...ep-37.with_lapack=true.with_p4est=true.mpirun=1.output} | 0 ...ep-37.with_lapack=true.with_p4est=true.mpirun=7.output} | 0 ...=true.mpirun=3.with_p4est=true.with_lapack=true.output} | 0 15 files changed, 12 insertions(+), 7 deletions(-) rename tests/cuda/{precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output => precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output} (100%) rename tests/cuda/{precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output => precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output} (100%) rename tests/cuda/{vector_memory_02.output => vector_memory_02.debug.output} (100%) rename tests/grid/{grid_generator_open_torus.output => grid_generator_open_torus.with_lapack=on.output} (100%) rename tests/grid/{grid_tools_aspect_ratio.output => grid_tools_aspect_ratio.with_lapack=true.output} (100%) rename tests/hp/{laplace_mitchell2014_04_peak.with_trilinos=true.output => laplace_mitchell2014_04_peak.with_trilinos=true.with_lapack=true.output} (100%) rename tests/mpi/{step-37.with_p4est=true.mpirun=1.output => step-37.with_lapack=true.with_p4est=true.mpirun=1.output} (100%) rename tests/mpi/{step-37.with_p4est=true.mpirun=7.output => step-37.with_lapack=true.with_p4est=true.mpirun=7.output} (100%) rename tests/mpi/{step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.output => step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.with_lapack=true.output} (100%) diff --git a/tests/boost/point_adaptor_01.cc b/tests/boost/point_adaptor_01.cc index de2f407eca..402969359d 100644 --- a/tests/boost/point_adaptor_01.cc +++ b/tests/boost/point_adaptor_01.cc @@ -19,6 +19,7 @@ #include #include +#include #include "../tests.h" diff --git a/tests/boost/rtree_02.cc b/tests/boost/rtree_02.cc index 837f232cef..3f73309c11 100644 --- a/tests/boost/rtree_02.cc +++ b/tests/boost/rtree_02.cc @@ -26,6 +26,8 @@ #include +#include + #include "../tests.h" namespace bgi = boost::geometry::index; @@ -64,4 +66,4 @@ main() else deallog << "OK." << std::endl; } -} \ No newline at end of file +} diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output b/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output similarity index 100% rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=1.output rename to tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=1.output diff --git a/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output b/tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output similarity index 100% rename from tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.mpirun=2.output rename to tests/cuda/precondition_03.with_trilinos=true.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=2.output diff --git a/tests/cuda/vector_memory_02.output b/tests/cuda/vector_memory_02.debug.output similarity index 100% rename from tests/cuda/vector_memory_02.output rename to tests/cuda/vector_memory_02.debug.output diff --git a/tests/dofs/dof_test.cc b/tests/dofs/dof_test.cc index a5a6c417f6..7d5751e84d 100644 --- a/tests/dofs/dof_test.cc +++ b/tests/dofs/dof_test.cc @@ -157,7 +157,7 @@ CurvedLine::get_new_point_on_quad( // z-value of the midpoint is either // 0 or 1, then the z-values of all // vertices of the quad is like that - if ((middle(2) == 0) || (middle(2) == 1)) + if (dim == 3 && (middle(dim - 1) == 0) || (middle(dim - 1) == 1)) return middle; double x = middle(0), y = middle(1); diff --git a/tests/grid/grid_generator_open_torus.output b/tests/grid/grid_generator_open_torus.with_lapack=on.output similarity index 100% rename from tests/grid/grid_generator_open_torus.output rename to tests/grid/grid_generator_open_torus.with_lapack=on.output diff --git a/tests/grid/grid_test.cc b/tests/grid/grid_test.cc index 6480431430..1506bab7cc 100644 --- a/tests/grid/grid_test.cc +++ b/tests/grid/grid_test.cc @@ -133,7 +133,7 @@ CurvedLine::get_new_point_on_quad( // z-value of the midpoint is either // 0 or 1, then the z-values of all // vertices of the quad is like that - if ((middle(2) == 0) || (middle(2) == 1)) + if (dim == 3 && (middle(dim - 1) == 0) || (middle(dim - 1) == 1)) return middle; double x = middle(0), y = middle(1); diff --git a/tests/grid/grid_tools_aspect_ratio.output b/tests/grid/grid_tools_aspect_ratio.with_lapack=true.output similarity index 100% rename from tests/grid/grid_tools_aspect_ratio.output rename to tests/grid/grid_tools_aspect_ratio.with_lapack=true.output diff --git a/tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.output b/tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.with_lapack=true.output similarity index 100% rename from tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.output rename to tests/hp/laplace_mitchell2014_04_peak.with_trilinos=true.with_lapack=true.output diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc index 843204a5a4..c7fb6d7384 100644 --- a/tests/mpi/no_flux_constraints_02.cc +++ b/tests/mpi/no_flux_constraints_02.cc @@ -139,7 +139,7 @@ test() { // sort and merge the constraint matrices on proc 0, generate a checksum // and output that into the deallog - system( + int return_value = system( (std::string("cat ") + base + "cm_?.dot|sort -n|uniq >" + base + "cm") .c_str()); { @@ -150,6 +150,7 @@ test() deallog << "checksum: " << checksum(str.begin(), str.end()) << std::endl; } + (void)return_value; // delete the file created by processor 0 std::remove((base + "cm").c_str()); } diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc index 10d6d5c37d..1ce610bcc2 100644 --- a/tests/mpi/no_flux_constraints_03.cc +++ b/tests/mpi/no_flux_constraints_03.cc @@ -113,9 +113,9 @@ test() { // sort and merge the constraint matrices on proc 0, generate a checksum // and output that into the deallog - system((std::string("cat ") + base + "cm_*.dot | sort -n | uniq > " + - base + "cm") - .c_str()); + int return_value = system((std::string("cat ") + base + + "cm_*.dot | sort -n | uniq > " + base + "cm") + .c_str()); { std::ifstream file((base + "cm").c_str()); std::stringstream ss; @@ -124,6 +124,7 @@ test() deallog << "checksum: " << checksum(str.begin(), str.end()) << std::endl; } + (void)return_value; // delete the file created by processor 0 std::remove((base + "cm").c_str()); } diff --git a/tests/mpi/step-37.with_p4est=true.mpirun=1.output b/tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=1.output similarity index 100% rename from tests/mpi/step-37.with_p4est=true.mpirun=1.output rename to tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=1.output diff --git a/tests/mpi/step-37.with_p4est=true.mpirun=7.output b/tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=7.output similarity index 100% rename from tests/mpi/step-37.with_p4est=true.mpirun=7.output rename to tests/mpi/step-37.with_lapack=true.with_p4est=true.mpirun=7.output diff --git a/tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.output b/tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.with_lapack=true.output similarity index 100% rename from tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.output rename to tests/mpi/step-39-block.with_trilinos=true.mpirun=3.with_p4est=true.with_lapack=true.output -- 2.39.5