aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E <dave.eckold@gmail.com>2021-11-03 18:13:33 +0000
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2021-11-04 11:25:29 +0100
commit213da7e78c0a86d5aab7eb0ac26a60bc5df94d20 (patch)
tree345c6f7942651b4e545b2ae9ed14e1dc02bf1e79 /sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch
parentprofiles/package.mask: mask sci-libs/geom for removal (diff)
downloadsci-213da7e78c0a86d5aab7eb0ac26a60bc5df94d20.tar.gz
sci-213da7e78c0a86d5aab7eb0ac26a60bc5df94d20.tar.bz2
sci-213da7e78c0a86d5aab7eb0ac26a60bc5df94d20.zip
sci-misc/elmer-fem: Fix compile error
Hi This pull request fixes a compile error associated with issue [#274](https://github.com/ElmerCSC/elmerfem/issues/274). I've added the patch attached to this issue as well as the following: - Bumped ebuild EAPI to version 8 - Exposed a useflag for WITH_Mumps - removed the softblock on arpack by changing the ELMER_INSTALL_LIB_DIR to `/usr/$(get_libdir)/elmersolver` This location matches the cmake file from upstream and prevents a collision with system arpack. Signed-off-by: David Eckold <dave.eckold@gmail.com> Package-Manager: Portage-3.0.28, Repoman-3.0.3 Closes: https://github.com/gentoo/sci/pull/1120 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch')
-rw-r--r--sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch70
1 files changed, 70 insertions, 0 deletions
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
+