diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index ca7a1c9c605f..7d42a1de33cd 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -1,112 +1,114 @@ # Created by: Pedro Giffuni PORTNAME= elmerfem DISTVERSIONPREFIX= release- DISTVERSION= 9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= henrik@gulbra.net COMMENT= Multiphysical simulation software LICENSE= GPLv2 LIB_DEPENDS= libblas.so:math/blas \ + libhdf5.so:science/hdf5 \ libmetis.so:math/metis \ libmpich.so:net/mpich \ + libnetcdf.so:science/netcdf \ libopenblas.so:math/openblas \ libparpack.so:math/arpack-ng USES= cmake compiler:c++11-lang fortran -USE_LDCONFIG= ${PREFIX}/lib/elmersolver USE_GITHUB= yes GH_ACCOUNT= ElmerCSC +USE_LDCONFIG= ${PREFIX}/lib/elmersolver CMAKE_ARGS= -DELMER_FEM_REVISION:STRING=${GH_TAGNAME} ALL_TARGET= # empty LDFLAGS+= -L${LOCALBASE}/lib PORTSCOUT= limit:^release-[1-9] CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev .endif OPTIONS_DEFINE= GUI OCC OPTIONS_DEFAULT= GUI OCC OPTIONS_SUB= yes GUI_DESC= Build with ElmerGUI (Graphical User Interface) OCC_DESC= Use OpenCASCADE for CAD import in ElmerGUI GUI_LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 GUI_USES= gl jpeg qt:5 xorg GUI_USE= gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,} GUI_CMAKE_BOOL= WITH_ELMERGUI WITH_PARAVIEW GUI_CMAKE_ON= -DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \ -DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \ -DDESIRED_QT_VERSION=5 \ -DWITH_QT5:BOOL=TRUE \ -DQT_FOUND:BOOL=TRUE OCC_IMPLIES= GUI OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \ libtiff.so:graphics/tiff \ libTKernel.so:cad/opencascade \ libvtksys-9.1.so:math/vtk9 OCC_USES= python OCC_CMAKE_BOOL= WITH_OCC OCC_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 _LIBSTAGEDIR= ${STAGEDIR}/${PREFIX}/lib/elmersolver _PYVERSION= ${PYTHON_VER}${PYTHON_ABIVER} _QT5_LIBS= buildtools_build concurrent core declarative gui location \ network opengl printsupport qmake_build script sensors \ sql svg webchannel webkit widgets xml .include .if ${ARCH} == "amd64" CFLAGS_${ARCH}= -fPIC CXXFLAGS_${ARCH}= -fPIC FCFLAGS+= -fPIC FFLAGS+= -fPIC .endif .if ${GCC_DEFAULT} >= 10 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)). # in theory, this should set FCFLAGS, but the port does not conform FFLAGS+= -fallow-argument-mismatch .endif post-patch: @${RM} ${WRKSRC}/cmake/Modules/CMakeParseArguments.cmake @${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0 @${REINPLACE_CMD} -e 's,"metis.*/metis\.h",,' \ ${WRKSRC}/elmergrid/src/egparallel.c post-patch-OCC-on: @${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" @${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" post-install: ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver ${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0 ${LN} -sf libfhuti.so ${_LIBSTAGEDIR}/libfhuti.so.0 ${LN} -sf libmatc.so ${_LIBSTAGEDIR}/libmatc.so.0 ${LN} -sf libmpi_stubs.so ${_LIBSTAGEDIR}/libmpi_stubs.so.0 @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid do-test: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} .include diff --git a/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90 b/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90 new file mode 100644 index 000000000000..515d7d578f3e --- /dev/null +++ b/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90 @@ -0,0 +1,58 @@ +--- fem/src/modules/DCRComplexSolve.F90.orig 2020-11-10 19:52:44 UTC ++++ fem/src/modules/DCRComplexSolve.F90 +@@ -433,6 +433,7 @@ CONTAINS + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -485,6 +486,7 @@ CONTAINS + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -1074,6 +1076,7 @@ contains + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -1374,6 +1377,7 @@ contains + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -1426,6 +1430,7 @@ contains + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -1727,6 +1732,7 @@ CONTAINS + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------ +@@ -1779,6 +1785,7 @@ CONTAINS + !------------------------------------------------------------------------------ + LOGICAL :: FirstTime = .TRUE., stat + REAL(KIND=dp), POINTER :: Hwrk(:,:,:) ++ INTEGER :: i + + SAVE FirstTime, Hwrk + !------------------------------------------------------------------------------