fix for GCC 11

3 files changed, 130 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fdc895e6891..ee02e672ad76 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elmerfem
 	pkgdesc = A finite element software for multiphysical problems
 	pkgver = 9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.elmerfem.org
 	arch = x86_64
 	license = GPL
@@ -12,18 +12,18 @@ pkgbase = elmerfem
 	depends = qt5-script
 	depends = netcdf-fortran
 	depends = mmg
-	depends = vtk
 	depends = qwt
 	depends = glu
 	conflicts = elmerfem-git
 	options = !emptydirs
 	options = !makeflags
 	source = https://github.com/ElmerCSC/elmerfem/archive/release-9.0.tar.gz
-	source = ElmerIce.patch
 	source = elmerfem.desktop
+	source = ElmerIce.patch
+	source = DCRComplexSolve.patch
 	sha256sums = 08c5bf261e87ff37456c1aa0372db3c83efabe4473ea3ea0b8ec66f5944d1aa0
-	sha256sums = 90287c988ac4f5beedf5221e81f624799ec3253c63a30695e1873044ac5a6515
 	sha256sums = f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca
+	sha256sums = 90287c988ac4f5beedf5221e81f624799ec3253c63a30695e1873044ac5a6515
+	sha256sums = fe117a9d803b7a12525d144fae936e1d3d7a3444c5b5a5697f95f772486a2db0
 
 pkgname = elmerfem
-
diff --git a/DCRComplexSolve.patch b/DCRComplexSolve.patch
new file mode 100644
index 000000000000..c78ca67e3ca5
--- /dev/null
+++ b/DCRComplexSolve.patch
@@ -0,0 +1,115 @@
+--- fem/src/modules/DCRComplexSolve.F90	2020-11-10 22:52:44.000000000 +0300
++++ fem/src/modules/DCRComplexSolve.F90	2021-08-07 22:32:57.521006907 +0300
+@@ -426,7 +426,7 @@
+    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,6 +485,8 @@
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1061,13 +1063,13 @@
+ 
+ !------------------------------------------------------------------------------
+ 
+-contains
++   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
+@@ -1127,7 +1129,6 @@
+ 
+      INTEGER :: i,j,k,l,n,t,DIM,En,Pn
+      LOGICAL :: stat, GotIt
+-!     REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
+ 
+      REAL(KIND=dp) :: Grad(3,3), Normal(3), EdgeLength, Jump, JumpReal, JumpImag, &
+                       GradReal(3,3),GradImag(3,3)
+@@ -1148,17 +1149,6 @@
+ 
+      TYPE(GaussIntegrationPoints_t), TARGET :: IntegStuff
+ 
+-!     LOGICAL :: First = .TRUE.
+-!     SAVE Hwrk, First
+-!------------------------------------------------------------------------------
+-
+-!    Initialize:
+-!    -----------
+-
+-!     IF ( First ) THEN
+-!        First = .FALSE.
+-!        NULLIFY( Hwrk )
+-!     END IF
+ 
+      SELECT CASE( CurrentCoordinateSystem() )
+         CASE( AxisSymmetric, CylindricSymmetric )
+@@ -1361,13 +1351,13 @@
+        Temperature, Pressure )
+ !------------------------------------------------------------------------------
+ 
+-contains
++   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 +1409,7 @@
+    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
+@@ -1497,9 +1487,6 @@
+      LOGICAL :: notScalar = .TRUE.
+      TYPE( ValueList_t ), POINTER :: Material
+      TYPE(GaussIntegrationPoints_t), TARGET :: IntegStuff
+-
+-!     LOGICAL :: First = .TRUE.
+-!     SAVE Hwrk, First
+ !------------------------------------------------------------------------------
+ 
+ !    Initialize:
+@@ -1720,7 +1707,7 @@
+    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 +1759,7 @@
+    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
diff --git a/PKGBUILD b/PKGBUILD
index b479f8716d1b..41c2d234d350 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,29 @@
 
 pkgname=elmerfem
 pkgver=9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A finite element software for multiphysical problems"
 arch=('x86_64')
 url="http://www.elmerfem.org"
 license=('GPL')
-depends=('arpack' 'blas' 'qt5-script' 'netcdf-fortran' 'mmg' 'vtk' 'qwt' 'glu')
+depends=('arpack' 'blas' 'qt5-script' 'netcdf-fortran' 'mmg' 'qwt' 'glu')
 makedepends=('gcc-fortran' 'cmake')
 conflicts=('elmerfem-git')
 options=(!emptydirs !makeflags)
 source=("https://github.com/ElmerCSC/$pkgname/archive/release-$pkgver.tar.gz"
+        "$pkgname.desktop"
         "ElmerIce.patch"
-        "$pkgname.desktop")
+        "DCRComplexSolve.patch")
 sha256sums=('08c5bf261e87ff37456c1aa0372db3c83efabe4473ea3ea0b8ec66f5944d1aa0'
+            'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca'
             '90287c988ac4f5beedf5221e81f624799ec3253c63a30695e1873044ac5a6515'
-            'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca')
+            'fe117a9d803b7a12525d144fae936e1d3d7a3444c5b5a5697f95f772486a2db0')
 
 prepare() {
   cd "$srcdir/$pkgname-release-$pkgver"
   mkdir ../build
   patch -p0 < "$srcdir/ElmerIce.patch"
+  patch -p0 < "$srcdir/DCRComplexSolve.patch"
   sed -i '/#include <QPainter>/a #include <QPainterPath>' ElmerGUI/Application/twod/renderarea.cpp
 }
 
@@ -44,6 +47,7 @@ build() {
     -DWITH_QT5=ON \
     -DWITH_ScatteredDataInterpolator=ON \
     -DWITH_VTK=ON \
+    -DWITH_MKL=OFF \
     -DOpenGL_GL_PREFERENCE=GLVND
   make all
 }
@@ -60,7 +64,8 @@ package() {
   install -dv share/{applications,pixmaps,licenses/$pkgname}
 
   # Icon and desktop files
-  install -D -m644 "$srcdir/$pkgname-release-$pkgver/ElmerGUI/Application/images/logo.png" share/pixmaps/$pkgname.png
+  install -D -m644 "$srcdir/$pkgname-release-$pkgver/ElmerGUI/Application/images/logo.png" \
+    share/pixmaps/$pkgname.png
   install -D -m644 "$srcdir/$pkgname.desktop" share/applications
 
   # Clean up and move stuff in place