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

bb5ab6c3dd'>root</a>/<a href='/guix/log/nix?id=ff65fa90d268bbe3f868be4cb5d9e2bb5ab6c3dd'>nix</a>/<a href='/guix/log/nix/libstore?id=ff65fa90d268bbe3f868be4cb5d9e2bb5ab6c3dd'>libstore</a>/<a href='/guix/log/nix/libstore/optimise-store.cc?id=ff65fa90d268bbe3f868be4cb5d9e2bb5ab6c3dd'>optimise-store.cc</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/nix/libstore/optimise-store.cc?id=ff65fa90d268bbe3f868be4cb5d9e2bb5ab6c3dd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-25 12:29:22 +0200'>2020-06-25</span></td><td><a href='/guix/commit/nix/libstore/optimise-store.cc?id=b930f0ba2115f71c323d4bf3d72efb763f716296'>daemon: Correctly handle EMLINK corner case when deduplicating.</a><span class='msg-avail'>...<span class='msg-tooltip'>Suggested by Caleb Ristvedt &lt;caleb.ristvedt@cune.org&gt;.

* nix/libstore/optimise-store.cc (LocalStore::optimisePath_): Save errno
from 'rename' before calling 'unlink'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/nix/libstore/optimise-store.cc?id=59e80445882f8b0379e54916f89510c0deda6698'>Remove traces of "GuixSD".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Remove
mentions of "GuixSD".
* gnu/bootloader/grub.scm (install-grub-efi): Likewise.
* gnu/build/vm.scm (make-iso9660-image): Change default #:volume-id to
"Guix_image".
(initialize-hard-disk): Search for the "Guix_image" label.
* gnu/ci.scm (system-test-jobs, tarball-jobs): Remove "GuixSD".
* gnu/installer/newt/welcome.scm (run-welcome-page): Likewise.
* gnu/packages/audio.scm (supercollider)[description]: Likewise.
* gnu/packages/curl.scm (curl): Likewise.
* gnu/packages/emacs.scm (emacs): Likewise.
* gnu/packages/gnome.scm (network-manager): Likewise.
* gnu/packages/julia.scm (julia): Likewise.
* gnu/packages/linux.scm (alsa-plugins): Likewise.
(powertop, wireless-regdb): Likewise.
* gnu/packages/package-management.scm (guix): Likewise.
* gnu/packages/polkit.scm (polkit): Likewise.
* gnu/packages/tex.scm (texlive-bin): Likewise.
* gnu/services/base.scm (file-systems-&gt;fstab): Likewise.
* gnu/services/cups.scm (%cups-activation): Likewise.
* gnu/services/mail.scm (%dovecot-activation): Likewise.
* gnu/services/messaging.scm (prosody-configuration)[log]: Likewise.
* gnu/system/examples/vm-image.tmpl (vm-image-motd): Likewise.
* gnu/system/install.scm (installation-os)[file-systems]: Change root
file system label to "Guix_image".
* gnu/system/mapped-devices.scm (check-device-initrd-modules):
Remove "GuixSD".
* gnu/system/vm.scm (system-docker-image): Likewise.
(system-disk-image)[root-label]: Change to "Guix_image".
* gnu/tests/install.scm (run-install): Remove "GuixSD".
* guix/modules.scm (guix-module-name?): Likewise.
* nix/libstore/optimise-store.cc: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-16 16:28:07 +0100'>2018-12-16</span></td><td><a href='/guix/commit/nix/libstore/optimise-store.cc?id=8327e733966cc4a93dfaadd1a761ca1088078baa'>daemon: Use unbranded phrases in comments and messages.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc, nix/libstore/globals.cc,
nix/libstore/gc.cc, nix/libstore/local-store.cc,
nix/libstore/optimise-store.cc, nix/libstore/store-api.cc,
nix/libutil/archive.cc, nix/nix-daemon/nix-daemon.cc: Replace "Nix
store" by "store", and "Nix daemon" by "build daemon".
</span></span></td><td>Ludovic Courtès</td></tr>