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

u?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>gnu</a>/<a href='/guix/log/gnu/packages?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>packages</a>/<a href='/guix/log/gnu/packages/busybox.scm?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>busybox.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/busybox.scm?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-17 16:27:16 +0300'>2019-06-17</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=505459d7cb139eaa3b73b4977d502a3acc400b3b'>gnu: busybox: Don't install to usr.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (busybox)[arguments]: Add a custom phase
to prevent installing to %PREFIX/usr.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-06-17 10:02:45 +0300'>2019-06-17</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=ee0b4733e1a186048983ac6b6ba0bae23b3f567d'>gnu: toybox: Don't install files to usr.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (toybox)[arguments]: Add custom phase to
remove any files installed in $PREFIX/usr.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-06-06 05:59:00 +0200'>2019-06-06</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=fcc7fa472b111e0916d96621bbf68f869358bdd9'>gnu: toybox: Update to 0.8.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (toybox): Update to 0.8.1.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-17 03:37:50 +0100'>2019-02-17</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=51e31aa865e5d1b272673ae94e13ffdc9f4db536'>gnu: toybox: Update to 0.8.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (toybox): Update to 0.8.0.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-12-12 09:27:17 +0200'>2018-12-12</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=42140fd434a333d0565617471b51323d6815ee13'>gnu: Add toybox.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.com (toybox): New variable.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-09-18 14:18:43 +0200'>2018-09-18</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=56c180750c8b7aca5ae82d133caac7c398c688b7'>gnu: busybox: Update to 1.29.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (busybox): Update to 1.29.3.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-07-19 21:29:14 +0300'>2018-07-19</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=e9ab4b40a8bf6ddf7242bc0d67b61148a4078419'>gnu: busybox: Update to 1.29.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (busybox): Update to 1.29.1.
[arguments]: Add custom phase to change the default value of TASKSET.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-06-22 22:00:23 +0200'>2018-06-22</span></td><td><a href='/guix/commit/gnu/packages/busybox.scm?id=f7705d4cb891b262a8b5247ff251dfc409cdeb6a'>gnu: busybox: Return #t from all phases.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/busybox.scm (busybox)[arguments]: Substitute INVOKE for
SYSTEM*.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>