From 553bd2167bfd6dfb1e79bce3948032f677711ac2 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 5 Feb 2016 09:53:41 -0500 Subject: [PATCH] fix metis tests On my machine with 64bit ints and 32bit metis I am getting the 32bit results and so the tests fail. Fix this by always comparing against all possible outputs. Also include additional output for metis_04. --- ...domain_01.with_metis=true.mpirun=3.output} | 0 ...main_01.with_metis=true.mpirun=3.output.2} | 0 ...main_01.with_metis=true.mpirun=3.output.3} | 0 ...bit_indices=off.output => metis_01.output} | 0 ...indices=off.output.2 => metis_01.output.2} | 0 ...it_indices=on.output => metis_01.output.3} | 0 ...it_indices=off.output => metis_01a.output} | 0 ...t_indices=on.output => metis_01a.output.2} | 0 ...ndices=off.output.2 => metis_01a.output.3} | 0 ...bit_indices=off.output => metis_02.output} | 0 ...indices=off.output.2 => metis_02.output.2} | 0 ...it_indices=on.output => metis_02.output.3} | 0 ...bit_indices=off.output => metis_03.output} | 0 ...indices=off.output.2 => metis_03.output.2} | 0 ...it_indices=on.output => metis_03.output.3} | 0 ...bit_indices=off.output => metis_04.output} | 0 tests/metis/metis_04.output.2 | 40 +++++++++++++++++++ ...it_indices=on.output => metis_04.output.3} | 0 18 files changed, 40 insertions(+) rename tests/dofs/{locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output => locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output} (100%) rename tests/dofs/{locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2 => locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.2} (100%) rename tests/dofs/{locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=on.mpirun=3.output => locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.3} (100%) rename tests/metis/{metis_01.with_64bit_indices=off.output => metis_01.output} (100%) rename tests/metis/{metis_01.with_64bit_indices=off.output.2 => metis_01.output.2} (100%) rename tests/metis/{metis_01.with_64bit_indices=on.output => metis_01.output.3} (100%) rename tests/metis/{metis_01a.with_64bit_indices=off.output => metis_01a.output} (100%) rename tests/metis/{metis_01a.with_64bit_indices=on.output => metis_01a.output.2} (100%) rename tests/metis/{metis_01a.with_64bit_indices=off.output.2 => metis_01a.output.3} (100%) rename tests/metis/{metis_02.with_64bit_indices=off.output => metis_02.output} (100%) rename tests/metis/{metis_02.with_64bit_indices=off.output.2 => metis_02.output.2} (100%) rename tests/metis/{metis_02.with_64bit_indices=on.output => metis_02.output.3} (100%) rename tests/metis/{metis_03.with_64bit_indices=off.output => metis_03.output} (100%) rename tests/metis/{metis_03.with_64bit_indices=off.output.2 => metis_03.output.2} (100%) rename tests/metis/{metis_03.with_64bit_indices=on.output => metis_03.output.3} (100%) rename tests/metis/{metis_04.with_64bit_indices=off.output => metis_04.output} (100%) create mode 100644 tests/metis/metis_04.output.2 rename tests/metis/{metis_04.with_64bit_indices=on.output => metis_04.output.3} (100%) diff --git a/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output b/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output similarity index 100% rename from tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output rename to tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output diff --git a/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2 b/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.2 similarity index 100% rename from tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=off.mpirun=3.output.2 rename to tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.2 diff --git a/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=on.mpirun=3.output b/tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.3 similarity index 100% rename from tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.with_64bit_indices=on.mpirun=3.output rename to tests/dofs/locally_relevant_dofs_per_subdomain_01.with_metis=true.mpirun=3.output.3 diff --git a/tests/metis/metis_01.with_64bit_indices=off.output b/tests/metis/metis_01.output similarity index 100% rename from tests/metis/metis_01.with_64bit_indices=off.output rename to tests/metis/metis_01.output diff --git a/tests/metis/metis_01.with_64bit_indices=off.output.2 b/tests/metis/metis_01.output.2 similarity index 100% rename from tests/metis/metis_01.with_64bit_indices=off.output.2 rename to tests/metis/metis_01.output.2 diff --git a/tests/metis/metis_01.with_64bit_indices=on.output b/tests/metis/metis_01.output.3 similarity index 100% rename from tests/metis/metis_01.with_64bit_indices=on.output rename to tests/metis/metis_01.output.3 diff --git a/tests/metis/metis_01a.with_64bit_indices=off.output b/tests/metis/metis_01a.output similarity index 100% rename from tests/metis/metis_01a.with_64bit_indices=off.output rename to tests/metis/metis_01a.output diff --git a/tests/metis/metis_01a.with_64bit_indices=on.output b/tests/metis/metis_01a.output.2 similarity index 100% rename from tests/metis/metis_01a.with_64bit_indices=on.output rename to tests/metis/metis_01a.output.2 diff --git a/tests/metis/metis_01a.with_64bit_indices=off.output.2 b/tests/metis/metis_01a.output.3 similarity index 100% rename from tests/metis/metis_01a.with_64bit_indices=off.output.2 rename to tests/metis/metis_01a.output.3 diff --git a/tests/metis/metis_02.with_64bit_indices=off.output b/tests/metis/metis_02.output similarity index 100% rename from tests/metis/metis_02.with_64bit_indices=off.output rename to tests/metis/metis_02.output diff --git a/tests/metis/metis_02.with_64bit_indices=off.output.2 b/tests/metis/metis_02.output.2 similarity index 100% rename from tests/metis/metis_02.with_64bit_indices=off.output.2 rename to tests/metis/metis_02.output.2 diff --git a/tests/metis/metis_02.with_64bit_indices=on.output b/tests/metis/metis_02.output.3 similarity index 100% rename from tests/metis/metis_02.with_64bit_indices=on.output rename to tests/metis/metis_02.output.3 diff --git a/tests/metis/metis_03.with_64bit_indices=off.output b/tests/metis/metis_03.output similarity index 100% rename from tests/metis/metis_03.with_64bit_indices=off.output rename to tests/metis/metis_03.output diff --git a/tests/metis/metis_03.with_64bit_indices=off.output.2 b/tests/metis/metis_03.output.2 similarity index 100% rename from tests/metis/metis_03.with_64bit_indices=off.output.2 rename to tests/metis/metis_03.output.2 diff --git a/tests/metis/metis_03.with_64bit_indices=on.output b/tests/metis/metis_03.output.3 similarity index 100% rename from tests/metis/metis_03.with_64bit_indices=on.output rename to tests/metis/metis_03.output.3 diff --git a/tests/metis/metis_04.with_64bit_indices=off.output b/tests/metis/metis_04.output similarity index 100% rename from tests/metis/metis_04.with_64bit_indices=off.output rename to tests/metis/metis_04.output diff --git a/tests/metis/metis_04.output.2 b/tests/metis/metis_04.output.2 new file mode 100644 index 0000000000..a9e9959c71 --- /dev/null +++ b/tests/metis/metis_04.output.2 @@ -0,0 +1,40 @@ + +DEAL:: procs = 1 +DEAL::0 0 0 0 0 0 0 +DEAL:: procs = 2 +DEAL::0 1 0 1 0 1 0 +DEAL:: procs = 3 +DEAL::0 1 0 2 2 1 1 +DEAL:: procs = 4 +DEAL::0 2 0 3 1 2 1 +DEAL:: procs = 5 +DEAL::1 3 0 2 2 4 3 +DEAL:: procs = 6 +DEAL::1 3 0 5 1 4 2 +DEAL:: procs = 7 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 8 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 9 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 10 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 11 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 12 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 13 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 14 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 15 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 16 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 17 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 18 +DEAL::2 4 0 6 1 5 3 +DEAL:: procs = 19 +DEAL::2 4 0 6 1 5 3 +DEAL::OK diff --git a/tests/metis/metis_04.with_64bit_indices=on.output b/tests/metis/metis_04.output.3 similarity index 100% rename from tests/metis/metis_04.with_64bit_indices=on.output rename to tests/metis/metis_04.output.3 -- 2.39.5