From patchwork Sun Mar 1 20:24:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 20486 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77C7227BBEB; Sun, 1 Mar 2020 20:26:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3A0BD27BBEA for ; Sun, 1 Mar 2020 20:26:20 +0000 (GMT) Received: from localhost ([::1]:51620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8VAJ-0002gY-O1 for patchwork@mira.cbaines.net; Sun, 01 Mar 2020 15:26:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49500) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8VA6-0002gE-Iz for guix-patches@gnu.org; Sun, 01 Mar 2020 15:26:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8VA3-0007oC-7F for guix-patches@gnu.org; Sun, 01 Mar 2020 15:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8VA2-0007ns-I8 for guix-patches@gnu.org; Sun, 01 Mar 2020 15:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j8VA2-0006JW-FA for guix-patches@gnu.org; Sun, 01 Mar 2020 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39862] [PATCH 2/4] gnu: add dune-uggrid 2.6.0 Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Mar 2020 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39862@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 39862-submit@debbugs.gnu.org id=B39862.158309430924151 (code B ref 39862); Sun, 01 Mar 2020 20:26:02 +0000 Received: (at 39862) by debbugs.gnu.org; 1 Mar 2020 20:25:09 +0000 Received: from localhost ([127.0.0.1]:36993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8V9B-0006HS-0C for submit@debbugs.gnu.org; Sun, 01 Mar 2020 15:25:09 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8V99-0006Gh-5Z for 39862@debbugs.gnu.org; Sun, 01 Mar 2020 15:25:07 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2F782240100 for <39862@debbugs.gnu.org>; Sun, 1 Mar 2020 21:25:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1583094300; bh=Bh24h/JaCr7msRdhOg+K9kn3vwoqezeM8Eb3VPOLZZ4=; h=From:To:Cc:Subject:Date:From; b=rnjQlAcqiIo437PDR6belE6wCNkeS/zzhfK+cDMyVHpvYagr6iA4Ge9CQ/ygO5Fqe uq2tKsWhUbHgWK01LyHLrE1dDR30ej1bS0R6bS0VyEbWt4zpZ45l6En3wYBdSi0LOw S2J8SH89Jwl6/I2zAkRyHToGN2M74wiQIRT8P2DJvHU3clGnsViHxSV1U0418PXXR9 c1QOcadh0vczlKoanzYtfJ4+WQfYJ+IgEpmioE9TgVxQjUdrPZ1dADAu8kvFYQRV8s fmeiZK4C341XxON5Ob3K1zv9fOVGvJJSQhhgbfkBHOMbjC8Pp3TFiwQRGutHzYXuQ0 btAVSfAoGRoOw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48Vvs75ZcQz9rxT; Sun, 1 Mar 2020 21:24:59 +0100 (CET) From: Felix Gruber Date: Sun, 1 Mar 2020 21:24:50 +0100 Message-Id: <20200301202450.899728-1-felgru@posteo.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301194914.899011-1-felgru@posteo.net> References: <20200301194914.899011-1-felgru@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)