From fe929f17e98b577171f58ca520b5145be41730ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Thu, 16 Mar 2023 19:48:40 +0100
Subject: [PATCH] Adjust sequential and both parallel cases in
 istl-solver-playground

Do same thing, independent of paralellel, distributed, or
sequential.
This fixes the test in the sequential case.
---
 src/istl-solver-playground.hh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/istl-solver-playground.hh b/src/istl-solver-playground.hh
index 0ff3abd5..11693cf5 100644
--- a/src/istl-solver-playground.hh
+++ b/src/istl-solver-playground.hh
@@ -66,7 +66,11 @@ std::shared_ptr<OOCOMM> loadSystem(std::shared_ptr<Mat>& m,
   std::shared_ptr<OOCOMM> oocomm;
   if(distributed){
     oocomm = std::make_shared<OOCOMM>(MPI_COMM_WORLD);
-    loadMatrixMarket(*m, matrixfilename, *oocomm);
+    if(matrixfilename != "laplacian"){
+      loadMatrixMarket(*m, matrixfilename, *oocomm);
+    }else{
+      setupLaplacian(*m, config.get("N", 20));
+    }
     if(config.get("random_rhs", false)){
       rhs->resize(m->N());
       srand(42);
@@ -98,16 +102,22 @@ template<class Mat, class Vec>
 void loadSystem(std::shared_ptr<Mat>& m,
                 std::shared_ptr<Vec>& rhs,
                 const Dune::ParameterTree& config){
-  std::string matrixfilename = config.get<std::string>("matrix");
+  // generate Laplacian or load matrix
+  std::string matrixfilename = config.get<std::string>("matrix", "laplacian");
+  if(matrixfilename == "laplacian"){
+    setupLaplacian(*m, config.get("N", 20));
+  }else{
+    loadMatrixMarket(*m, matrixfilename);
+  }
+  // use random values or load right-hand side
   std::string rhsfilename;
-  if(!config.get("random_rhs", false))
-    rhsfilename = config.get<std::string>("rhs");
-  loadMatrixMarket(*m, matrixfilename);
   if(config.get("random_rhs", false)){
     rhs->resize(m->N());
     fillRandom(*rhs);
-  }else
+  }else{
+    rhsfilename = config.get<std::string>("rhs");
     loadMatrixMarket(*rhs, rhsfilename);
+  }
 }
 #endif
 
-- 
2.39.2

 class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/AUTHORS?id=55c1e6bedaabd45d48e2af467c6559068c26e5c9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2015-07-19 21:49:58 +0200'>2015-07-19</span></td><td><a href='/guix/commit/AUTHORS?id=a5b2570a1c10f1fbdcbbc173378ce0bdb090250d'>AUTHORS: Remove the hand-made list of people.</a><span class='msg-avail'>...<span class='msg-tooltip'>* AUTHORS: Remove the list of people, and add a note saying that this file is
  meant to be generated.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2015-07-04 12:13:01 +0300'>2015-07-04</span></td><td><a href='/guix/commit/AUTHORS?id=e7c48ee9519aa5cd094f3326a4caeccba072e9fd'>Clean up 'THANKS' and 'AUTHORS'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
  and Alexander Shendi.  Remove Federico Beffa, Marek Benc, John
  Darrington, rekado, Cyrill Schenkel and Andy Wingo because they are
  placed in AUTHORS.  Move Amirouche Boubekki and Alex Kost to ...
* AUTHORS: ... here.  Add Arne Babenhauserheide, Ian Denhardt, Kevin
  Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
  Fix some names and emails.
</span></span></td><td>Alex Kost</td></tr>
<tr><td><span title='2015-06-27 20:26:06 +0300'>2015-06-27</span></td><td><a href='/guix/commit/AUTHORS?id=1d642af9872949633b1084f53352f3c851f41810'>Add Claes Wallin to 'AUTHORS'.</a></td><td>Alex Kost</td></tr>
<tr><td><span title='2015-04-26 21:38:37 -0400'>2015-04-26</span></td><td><a href='/guix/commit/AUTHORS?id=6bc24063155d897c6c80a192e48bd9f61cb9014e'>gnu: Add guile-minikanren.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/guile.scm (guile-minikanren): New variable.
</span></span></td><td>Christopher Allan Webber</td></tr>
<tr><td><span title='2015-04-05 23:15:20 +0200'>2015-04-05</span></td><td><a href='/guix/commit/AUTHORS?id=bc45ceb5ffb445ca26a6cd5ac34f39d0dedd8504'>Add Andy to 'AUTHORS'.</a></td><td>Ludovic Courtès</td></tr>