From b784b32f1230f3800f30f35a03b32cafb15d10c1 Mon Sep 17 00:00:00 2001 From: Luc Berger-Vergiat Date: Tue, 23 Oct 2018 17:02:48 -0600 Subject: [PATCH 1/2] MueLu: fixing conchas_milestone_zoltan2 test The xml is using the non kokkos factories but forgot to specify the CoarseMapFacotry that led to a path divergence between kokkos and non kokkos factories. --- packages/muelu/test/scaling/conchas_milestone_zoltan2.xml | 6 ++++++ .../test/scaling/conchas_milestone_zoltan2_complex.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml b/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml index 8e197a88ea..06b6de2b61 100644 --- a/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml +++ b/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml @@ -38,6 +38,11 @@ + + + + + @@ -207,6 +212,7 @@ + diff --git a/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml b/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml index 6d3ac9005f..ca2ab718ba 100644 --- a/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml +++ b/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml @@ -38,6 +38,11 @@ + + + + + @@ -206,6 +211,7 @@ + -- GitLab From b675853d7da5f10d8bd6c05b1ddd1a6de7bb82a6 Mon Sep 17 00:00:00 2001 From: Luc Berger-Vergiat Date: Tue, 23 Oct 2018 17:22:38 -0600 Subject: [PATCH 2/2] MueLu: also fixing xml file of ImportPerformance test for complex run I just switched from Chebyshev smoother to symmetric Gauss-Seidel --- packages/muelu/test/scaling/import.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/muelu/test/scaling/import.xml b/packages/muelu/test/scaling/import.xml index f2d3427dbd..6ec04980e1 100644 --- a/packages/muelu/test/scaling/import.xml +++ b/packages/muelu/test/scaling/import.xml @@ -13,12 +13,10 @@ - + - > - - - + + -- GitLab