aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild (renamed from sci-misc/elmer-fem/elmer-fem-9.0.ebuild)15
-rw-r--r--sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch70
-rw-r--r--sci-misc/elmer-fem/metadata.xml1
-rw-r--r--sci-misc/europa-bin/Manifest2
-rw-r--r--sci-misc/europa-bin/europa-bin-1.1.0.ebuild (renamed from sci-misc/europa-bin/europa-bin-1.0.0.ebuild)0
5 files changed, 81 insertions, 7 deletions
diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
index b576bbdb6..6d810ed14 100644
--- a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
@@ -1,30 +1,31 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
FORTRAN_STANDARD=90
-inherit fortran-2 flag-o-matic cmake multilib
+inherit fortran-2 flag-o-matic cmake
ELMER_ROOT="elmerfem"
MY_PN=${PN/elmer-/}
DESCRIPTION="Finite element programs, libraries, and visualization tools"
-HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/"
+HOMEPAGE="https://www.csc.fi/web/elmer https://www.elmerfem.org/blog/"
SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ice gui matc mpi post test"
+IUSE="ice gui matc mumps mpi post test"
RESTRICT="!test? ( test )"
RDEPEND="
virtual/blas
virtual/lapack
- !sci-libs/arpack
+ sci-libs/arpack
+ mumps? ( sci-libs/mumps )
mpi? ( sys-cluster/openmpi )
post? (
dev-lang/tcl:0=
@@ -37,6 +38,7 @@ DEPEND="${RDEPEND}"
# But this doesn't stop it from compiling / working without it
PATCHES=(
+ "${FILESDIR}/${PN}-DCRComplexSolve-compile-error.patch"
"${FILESDIR}/${PN}-ElmerIce-compile.patch"
)
@@ -56,10 +58,11 @@ src_configure() {
local mycmakeargs=(
-DMPI_Fortran_COMPILE_FLAGS="$FCFLAGS"
-DCMAKE_Fortran_FLAGS="$FCFLAGS"
- -DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)"
+ -DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)/elmersolver"
-DWITH_MPI="$(usex mpi)"
-DWITH_OpenMP="$(usex mpi)"
-DWITH_MATC="$(usex matc)"
+ -DWITH_Mumps="$(usex mumps)"
-DWITH_ElmerIce="$(usex ice)"
-DWITH_ELMERPOST="$(usex post)"
-DWITH_ELMERGUI="$(usex gui)"
diff --git a/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch b/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch
new file mode 100644
index 000000000..6f9cdf289
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch
@@ -0,0 +1,70 @@
+From 8ea87194fb50ff052a75212f9d2a2ae217edad95 Mon Sep 17 00:00:00 2001
+From: Mathias <mathias@localhost.localdomain>
+Date: Sun, 2 May 2021 12:06:15 +0200
+Subject: [PATCH] fixed DCRComplexSolve compile error
+
+---
+ fem/src/modules/DCRComplexSolve.F90 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90
+index cfa71dee..b6bb59bc 100644
+--- a/fem/src/modules/DCRComplexSolve.F90
++++ b/fem/src/modules/DCRComplexSolve.F90
+@@ -426,7 +426,7 @@ CONTAINS
+ SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+ REAL(KIND=dp) :: Tensor(:,:,:)
+- INTEGER :: n, NodeIndexes(:)
++ INTEGER :: n, i, j, NodeIndexes(:)
+ LOGICAL :: IsScalar
+ CHARACTER(LEN=*) :: Name
+ TYPE(ValueList_t), POINTER :: Material
+@@ -485,7 +485,7 @@ CONTAINS
+ SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+ REAL(KIND=dp) :: Tensor(:,:)
+- INTEGER :: n, NodeIndexes(:)
++ INTEGER :: n, i, NodeIndexes(:)
+ LOGICAL :: IsScalar
+ CHARACTER(LEN=*) :: Name
+ TYPE(ValueList_t), POINTER :: Material
+@@ -543,7 +543,7 @@ CONTAINS
+ REAL(KIND=dp) :: DiffCoef(3,3), Velo(3)
+ COMPLEX(KIND=dp) :: LSTIFF(2*n,2*n), LFORCE(2*n), A
+ LOGICAL :: Stat
+- INTEGER :: i,p,q,t,dim, NBasis, CoordSys
++ INTEGER :: i,j,p,q,t,dim, NBasis, CoordSys
+ TYPE(GaussIntegrationPoints_t) :: IntegStuff
+
+ REAL(KIND=dp) :: X,Y,Z,Metric(3,3),SqrtMetric,Symb(3,3,3),dSymb(3,3,3,3)
+@@ -678,7 +678,7 @@ CONTAINS
+ C1(3), C0
+ COMPLEX(KIND=dp) :: LSTIFF(n,n), LFORCE(n), A
+ LOGICAL :: Stat
+- INTEGER :: i,p,q,t,dim,CoordSys
++ INTEGER :: i,j,p,q,t,dim,CoordSys
+ TYPE(GaussIntegrationPoints_t) :: IntegStuff
+ !------------------------------------------------------------------------------
+ dim = CoordinateSystemDimension()
+@@ -1374,7 +1374,7 @@ contains
+ SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+ REAL(KIND=dp) :: Tensor(:,:,:)
+- INTEGER :: n, NodeIndexes(:)
++ INTEGER :: n, i, NodeIndexes(:)
+ LOGICAL :: IsScalar
+ CHARACTER(LEN=*) :: Name
+ TYPE(ValueList_t), POINTER :: Material
+@@ -1426,7 +1426,7 @@ contains
+ SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+ REAL(KIND=dp) :: Tensor(:,:)
+- INTEGER :: n, NodeIndexes(:)
++ INTEGER :: n, i, NodeIndexes(:)
+ LOGICAL :: IsScalar
+ CHARACTER(LEN=*) :: Name
+ TYPE(ValueList_t), POINTER :: Material
+--
+2.31.1
+
diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
index 341020564..feab34b47 100644
--- a/sci-misc/elmer-fem/metadata.xml
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -12,6 +12,7 @@
<flag name="gui">Build the ElmerGUI</flag>
<flag name="matc">Build the Elmer matc library</flag>
<flag name="ice">Build ElmerICE</flag>
+ <flag name="mumps">Build with Mumps</flag>
<flag name="post">Build ElmerPOST</flag>
</use>
</pkgmetadata>
diff --git a/sci-misc/europa-bin/Manifest b/sci-misc/europa-bin/Manifest
index 24c662f60..be216e648 100644
--- a/sci-misc/europa-bin/Manifest
+++ b/sci-misc/europa-bin/Manifest
@@ -1 +1 @@
-DIST europa-bin-1.0.0.tar.xz 47742444 BLAKE2B 6729c49f48d399fa4b80661c1efada0b6268ccf83eb548e73af708e375d3377e847d3fa52219007ee0aec0ce16bd0df839ea88c09cb2cfe7bad1979d24611f68 SHA512 f0c37d162246eddc7c2c19878aae0128afdae82b2ac2584a4a441fb12ef19429387ea62230fc50928d10b89add747b1c8b42637eaf63d58fa3c43a20ad02e7c7
+DIST europa-bin-1.1.0.tar.xz 47742444 BLAKE2B 6729c49f48d399fa4b80661c1efada0b6268ccf83eb548e73af708e375d3377e847d3fa52219007ee0aec0ce16bd0df839ea88c09cb2cfe7bad1979d24611f68 SHA512 f0c37d162246eddc7c2c19878aae0128afdae82b2ac2584a4a441fb12ef19429387ea62230fc50928d10b89add747b1c8b42637eaf63d58fa3c43a20ad02e7c7
diff --git a/sci-misc/europa-bin/europa-bin-1.0.0.ebuild b/sci-misc/europa-bin/europa-bin-1.1.0.ebuild
index ad502cfac..ad502cfac 100644
--- a/sci-misc/europa-bin/europa-bin-1.0.0.ebuild
+++ b/sci-misc/europa-bin/europa-bin-1.1.0.ebuild