all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Felix Gruber <felgru@posteo.net>
To: 39862@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>
Subject: [bug#39862] [PATCH 2/4] gnu: add dune-uggrid 2.6.0
Date: Sun,  1 Mar 2020 21:24:50 +0100	[thread overview]
Message-ID: <20200301202450.899728-1-felgru@posteo.net> (raw)
In-Reply-To: <20200301194914.899011-1-felgru@posteo.net>

* gnu/packages/maths.scm (dune-uggrid): New variable.
* gnu/packages/maths.scm (dune-grid): [propagated-inputs]: Add
dune-uggrid dependency, so that the UGGrid class in dune-grid can be
used by packages that have dune-grid as input.
* gnu/packages/maths.scm (dune-functions): [arguments]: enable tests
that previously weren't built as they require dune-uggrid.
---
 gnu/packages/maths.scm | 53 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index effba8956f..f78ed51454 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4646,6 +4646,42 @@ This package contains the basic DUNE geometry classes.")
     ;; GPL version 2 with "runtime exception"
     (license license:gpl2)))
 
+(define-public dune-uggrid
+  (package
+    (name "dune-uggrid")
+    (version "2.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dune-project.org/download/"
+                           version "/dune-uggrid-" version ".tar.gz"))
+       (sha256
+        (base32
+         "05l7a1gb78mny49anyxk6rjvn66rhgm30y72v5cjg0m5kfgr1a1f"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'build 'build-tests
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (apply invoke "make" "build_tests" make-flags))))))
+    (inputs
+     `(("dune-common" ,dune-common)
+       ("openmpi" ,openmpi)))
+    (native-inputs
+     `(("gfortran" ,gfortran)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://dune-project.org/")
+    (synopsis "Distributed and Unified Numerics Environment")
+    (description "DUNE, the Distributed and Unified Numerics Environment is a
+modular toolbox for solving @dfn{partial differential equations} (PDEs) with
+grid-based methods.  It supports the easy implementation of methods like
+@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite
+Differences} (FD).
+
+This package contains the DUNE UG grid classes.")
+    (license license:lgpl2.1)))
+
 (define-public dune-grid
   (package
     (name "dune-grid")
@@ -4675,6 +4711,8 @@ This package contains the basic DUNE geometry classes.")
        ("openblas" ,openblas)
        ("openmpi" ,openmpi)
        ("python" ,python)))
+    (propagated-inputs
+     `(("dune-uggrid" ,dune-uggrid)))
     (native-inputs
      `(("gfortran" ,gfortran)
        ("pkg-config" ,pkg-config)))
@@ -4888,7 +4926,20 @@ operating on statically typed trees of objects.")
         (base32
          "1an8gb477n8j0kzpbrv7nr1snh8pxip0gsxq6w63jc83gg3dj200"))))
     (build-system cmake-build-system)
-    (arguments `(#:tests? #f)) ; FIXME: tests require dune-uugrid
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-tests
+           (lambda _
+             (setenv "ARGS"
+                     ;; unable to load GMSH file in this test
+                     "--exclude-regex gridviewfunctionspacebasistest")
+            #t))
+         (add-after 'build 'build-tests
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (apply invoke "make" "build_tests" make-flags)))
+         (add-before 'check 'mpi-setup
+           ,%openmpi-setup))))
     (inputs
      `(("dune-common" ,dune-common)
        ("dune-istl" ,dune-istl)
-- 
2.25.1

  parent reply	other threads:[~2020-03-01 20:26 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-01 19:49 [bug#39862] [PATCH 0/4] update Dune finite element packages Felix Gruber
2020-03-01 20:23 ` [bug#39862] [PATCH 1/4] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-01 20:24 ` Felix Gruber [this message]
2020-03-01 20:25 ` [bug#39862] [PATCH 3/4] gnu: Add dune-subgrid Felix Gruber
2020-03-01 20:25 ` [bug#39862] [PATCH 4/4] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-02 14:53 ` [bug#39862] [PATCH 0/4] update Dune finite element packages zimoun
2020-03-02 21:56   ` Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 0/6] Update " Felix Gruber
2020-03-12 10:46       ` Ludovic Courtès
2020-03-10 19:29     ` [bug#39862] [PATCH v2 1/6] gnu: dune-*: set up MPI for tests Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 2/6] gnu: add dune-uggrid 2.6.0 Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 3/6] gnu: Add dune-subgrid Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 4/6] gnu: dune-istl: Build with suitesparse Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 5/6] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-10 19:29     ` [bug#39862] [PATCH v2 6/6] gnu: define dune-*-openmpi packages Felix Gruber
2020-03-12 12:42       ` Ludovic Courtès
2020-03-12 21:05         ` [bug#39862] [PATCH v3 0/2] Add " Felix Gruber
2020-03-12 21:05         ` [bug#39862] [PATCH v3 1/2] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-12 21:05         ` [bug#39862] [PATCH v3 2/2] gnu: define dune-*-openmpi packages Felix Gruber
2020-03-13  9:42           ` Ludovic Courtès
2020-03-13 17:26             ` Felix Gruber
2020-03-13 21:28               ` Ludovic Courtès
2020-03-13 17:30             ` [bug#39862] [PATCH v4 1/2] gnu: dune-*: remove openmpi dependency Felix Gruber
2020-03-14 16:55               ` bug#39862: " Ludovic Courtès
2020-03-13 17:30             ` [bug#39862] [PATCH v4 2/2] gnu: define dune-*-openmpi packages Felix Gruber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200301202450.899728-1-felgru@posteo.net \
    --to=felgru@posteo.net \
    --cc=39862@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.