pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

elmerfem: build fix



Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Wed Feb 19 23:55:52 2025 +0900
Changeset:	1da53fed46c1d871b2843ad54006aa063121fe68

Modified Files:
	elmerfem/Makefile
	elmerfem/distinfo
Added Files:
	elmerfem/patches/patch-fem_src_modules_DCRComplexSolve.F90

Log Message:
elmerfem: build fix

- add include math/blas
- change from x11/qwt6-qt4 to wip/qwt6-qt4
- Add local variable i so that it does not mix with the i in
  the outer scope.
      https://github.com/ElmerCSC/elmerfem/commit/
      96a33930ee23e785f33bcb257398f1ccca8fdf99.patch
- Fix a compilation error by adding i to local scope
      https://github.com/ElmerCSC/elmerfem/commit/
      8f9f2c703b020dc6d21cbaa1cb8b05abbbd7ded1.patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1da53fed46c1d871b2843ad54006aa063121fe68

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 elmerfem/Makefile                                  |  3 +-
 elmerfem/distinfo                                  |  1 +
 .../patch-fem_src_modules_DCRComplexSolve.F90      | 75 ++++++++++++++++++++++
 3 files changed, 78 insertions(+), 1 deletion(-)

diffs:
diff --git a/elmerfem/Makefile b/elmerfem/Makefile
index eda27f8700..6ed9417f80 100644
--- a/elmerfem/Makefile
+++ b/elmerfem/Makefile
@@ -31,9 +31,10 @@ SUBST_FILES.rpath=	${CMAKE_BUILD_DIR}/fem/src/CMakeFiles/Solver_TGT.dir/link.txt
 SUBST_SED.rpath=	"s|-O|-Wl,-R${PREFIX}/lib/elmersolver -O|"
 
 .include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
 .include "../../mk/mpi.buildlink3.mk"
-.include "../../x11/qwt6-qt4/buildlink3.mk"
+.include "../../wip/qwt6-qt4/buildlink3.mk"
 
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/elmerfem/distinfo b/elmerfem/distinfo
index 38bd9b3b67..62eafdd516 100644
--- a/elmerfem/distinfo
+++ b/elmerfem/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (elmerfem/release-9.0.tar.gz) = a3615ca55caa28bb8c2f3ecbb561663f70b53afaad671f772faf93b80b04afcf
 SHA512 (elmerfem/release-9.0.tar.gz) = 0affb0420b674ebf4d089c4039ba78dd29650f0daf956eab59bd7bea1c466ba6dfdf17c1ca6c953f36bbf95ed127dc9e6e025ee3edb1d2a56e55e61e24e97254
 Size (elmerfem/release-9.0.tar.gz) = 64060003 bytes
+SHA1 (patch-fem_src_modules_DCRComplexSolve.F90) = 374863211b038abf507818641ec4b6cafc9c904a
diff --git a/elmerfem/patches/patch-fem_src_modules_DCRComplexSolve.F90 b/elmerfem/patches/patch-fem_src_modules_DCRComplexSolve.F90
new file mode 100644
index 0000000000..9983c266f5
--- /dev/null
+++ b/elmerfem/patches/patch-fem_src_modules_DCRComplexSolve.F90
@@ -0,0 +1,75 @@
+$NetBSD$
+
+- Add local variable i so that it does not mix with the i in
+  the outer scope.
+  https://github.com/ElmerCSC/elmerfem/commit/96a33930ee23e785f33bcb257398f1ccca8fdf99.patch
+
+- Fix a compilation error by adding i to local scope
+  https://github.com/ElmerCSC/elmerfem/commit/8f9f2c703b020dc6d21cbaa1cb8b05abbbd7ded1.patch
+
+--- fem/src/modules/DCRComplexSolve.F90.orig	2025-01-30 13:10:50.203031489 +0000
++++ 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 :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -485,7 +485,8 @@ CONTAINS
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
+-
++      INTEGER :: i
++      
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+       IF ( FirstTime ) THEN
+@@ -1067,7 +1068,7 @@ contains
+    SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -1367,7 +1368,7 @@ contains
+    SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -1419,7 +1420,7 @@ contains
+    SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -1720,7 +1721,7 @@ CONTAINS
+    SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -1772,7 +1773,7 @@ CONTAINS
+    SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: i, n, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material


Home | Main Index | Thread Index | Old Index