diff options
Diffstat (limited to 'sci-misc/elmer-fem/files')
7 files changed, 174 insertions, 111 deletions
diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch deleted file mode 100644 index 00291bc56..000000000 --- a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch +++ /dev/null @@ -1,75 +0,0 @@ - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9e48c31..b94705c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -182,11 +182,11 @@ SC2Elmer_SOURCES = SC2Elmer.c - - if USE_LOCAL_MPIF_H - mpif: mpif_stub.h -- $(CP) mpif_stub.h mpif.h -- $(CP) mpif_stub.h mpif -+ $(CP) $(srcdir)/mpif_stub.h mpif.h -+ $(CP) $(srcdir)/mpif_stub.h mpif - else - mpif: mpif_stub.h -- $(CP) mpif_stub.h mpif -+ $(CP) $(srcdir)/mpif_stub.h mpif - endif - - EXTRA_DIST = \ - src/Makefile.am | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 92de7a4..89a2236 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -144,32 +144,33 @@ ELMER_SOLVER_DATADIR=$(prefix)/share/elmersolver - install-data-local: - @echo "Installing solvers to ${ELMER_SOLVER_DATADIR}/lib" - -- mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib -- $(CP) `ls -f *$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib -- $(CP) elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib -- $(CP) SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib -+ mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) -+ $(CP) `ls -f $(builddir)/*$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) -+ $(CP) $(srcdir)/elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) -+ $(CP) $(srcdir)/SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) - - @echo "Installing *.mod to ${ELMER_SOLVER_DATADIR}/include" - mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include -- $(CP) *.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include -+ $(CP) $(builddir)/*.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include - - - install-exec-local: - @echo "Installing stuff to ${prefix}/bin" - $(MKDIR) $(DESTDIR)$(prefix)/bin -- $(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin -- $(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin -- $(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin -+ $(CP) $(builddir)/ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin -+ $(CP) $(builddir)/ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin -+ $(CP) $(builddir)/GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin - if USE_WINDOWS_COMPILER - $(CP) libelmersolver*$(SHL_EXT) $(DESTDIR)$(prefix)/lib - else -- $(CP) libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/lib -+ mkdir -p $(DESTDIR)$(prefix)/$(libdir) -+ $(CP) $(builddir)/libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/$(libdir) - $(LN) -sf libelmersolver-$(VERSION)$(SHL_EXT)\ -- $(DESTDIR)$(prefix)/lib/libelmersolver$(SHL_EXT) -+ $(DESTDIR)$(prefix)/$(libdir)/libelmersolver$(SHL_EXT) - endif -- $(CP) elmerf90 elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin -+ $(CP) $(builddir)/elmerf90 $(builddir)/elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin - if USE_MPI -- $(CP) ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin -+ $(CP) $(builddir)/ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin - endif - - clean-local: diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch deleted file mode 100644 index 7c6be1d8c..000000000 --- a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch +++ /dev/null @@ -1,23 +0,0 @@ - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index b94705c..92de7a4 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -122,13 +122,13 @@ if USE_WINDOWS_COMPILER - else - $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \ - -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \ -- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) -+ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) -lhuti - endif - - GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) - $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \ - -o GebhardtFactors$(EXE_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \ -- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) -+ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) -lhuti - - - diff --git a/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch b/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch new file mode 100644 index 000000000..13eaf1c5f --- /dev/null +++ b/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch @@ -0,0 +1,35 @@ +From 48e9430ccb858ca5bda28b967a0c84b51e2404b2 Mon Sep 17 00:00:00 2001 +From: "E. Albiter" <ealbiter@gmail.com> +Date: Fri, 15 Oct 2021 13:12:48 -0500 +Subject: [PATCH] Compatibility with Qwt 6.2. Fix for #293 + +--- + ElmerGUI/Application/src/convergenceview.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h +index 377b644b99..4259eb730e 100755 +--- a/ElmerGUI/Application/src/convergenceview.h ++++ b/ElmerGUI/Application/src/convergenceview.h +@@ -51,8 +51,8 @@ + #include <qwt_plot_curve.h>
+ #include <qwt_plot_grid.h>
+ #include <qwt_legend.h>
+-/*#include <qwt_data.h> <-- deprecated in Qwt6, using qwt_compat.h instead*/
+-#include <qwt_compat.h>
++/*#include <qwt_data.h> <-- deprecated in Qwt6, using qwt_compat.h instead
++#include <qwt_compat.h> <-- Removed in Qwt 6.2 */
+ #include <qwt_text.h>
+ #include <qwt_scale_engine.h>
+
+@@ -76,8 +76,8 @@ class CurveData +
+ private:
+ int d_count;
+- QwtArray<double> d_x;
+- QwtArray<double> d_y;
++ QVector<double> d_x;
++ QVector<double> d_y;
+ };
+
+ class Curve
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/files/elmer-fem-ElmerIce-compile.patch b/sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch new file mode 100644 index 000000000..c8a065e30 --- /dev/null +++ b/sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch @@ -0,0 +1,58 @@ +diff --color -Naur a/elmerice/Solvers/CalvingRemeshMMG.F90 b/elmerice/Solvers/CalvingRemeshMMG.F90 +--- a/elmerice/Solvers/CalvingRemeshMMG.F90 2018-12-19 12:34:45.000000000 +0300 ++++ b/elmerice/Solvers/CalvingRemeshMMG.F90 2020-12-12 22:39:24.040363020 +0300 +@@ -71,6 +71,7 @@ + TYPE(ValueList_t), POINTER :: SolverParams + TYPE(Mesh_t),POINTER :: Mesh,GatheredMesh,NewMeshR,FinalMesh + TYPE(Element_t),POINTER :: Element, ParentElem ++ TYPE(MMG5_DATA_PTR_T),POINTER :: mmgMet + INTEGER :: i,j,k,NNodes,GNBulk, GNBdry, GNNode, NBulk, Nbdry, ierr, & + my_cboss,MyPE, PEs,CCount, counter, GlNode_min, GlNode_max,adjList(4),front_BC_ID, & + my_calv_front,calv_front, ncalv_parts, group_calve, comm_calve, group_world,ecode, NElNodes +@@ -426,7 +427,7 @@ + + !> ------------------------------ STEP II -------------------------- + !! remesh function +- CALL MMG3D_mmg3dls(mmgMesh,mmgSol,ierr) ++ CALL MMG3D_mmg3dls(mmgMesh,mmgSol,mmgMet,ierr) + + CALL MMG3D_SaveMesh(mmgMesh,"test_out.mesh",LEN(TRIM("test_out.mesh")),ierr) + +diff --color -Naur a/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 b/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 +--- a/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 2018-12-19 12:34:45.000000000 +0300 ++++ b/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 2020-12-12 22:42:32.639562150 +0300 +@@ -310,14 +310,14 @@ + !------------------------------------------------------------------------------ + TYPE(Element_t),POINTER :: Element + INTEGER, POINTER :: NodeIndexes(:) +- INTEGER :: np,nt,na,ier ++ INTEGER :: np,nt,na,ier,nquad + INTEGER :: ref,corner,required,ridge + INTEGER :: parent,ied + INTEGER :: tt, jj, kk, ll + + + !> a) get the size of the mesh: vertices, triangles, edges +- CALL MMG2D_Get_meshSize(mmgMesh,np,nt,na,ier) ++ CALL MMG2D_Get_meshSize(mmgMesh,np,nt,nquad,na,ier) + IF ( ier == 0 ) CALL FATAL('MMGSolver',& + 'CALL TO MMGS_Get_meshSize FAILED') + IF (DEBUG) PRINT *,'--**-- MMG2D_Get_meshSize DONE' +@@ -467,7 +467,7 @@ + TYPE(Element_t),POINTER :: Element + INTEGER, POINTER :: NodeIndexes(:) + +- INTEGER :: NVert,NEle,NEdge ++ INTEGER :: NVert,NEle,NEdge,NQuad + INTEGER :: n + INTEGER :: ier + INTEGER :: ii,tt +@@ -476,7 +476,7 @@ + NEle=Mesh%NumberOfBulkElements + NEdge=Mesh%NumberOfBoundaryElements + +- CALL MMG2D_Set_meshSize(mmgMesh,NVert,NEle,NEdge,ier) ++ CALL MMG2D_Set_meshSize(mmgMesh,NVert,NEle,NQuad,NEdge,ier) + IF ( ier == 0 ) CALL FATAL('MMGSolver',& + 'CALL TO MMG2D_Set_meshSize FAILED') + IF (DEBUG) PRINT *,'--**-- MMG2D_Set_meshSize DONE' diff --git a/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch b/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch deleted file mode 100644 index d0de4fe8b..000000000 --- a/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fem/src/Makefile.am.old 2012-11-12 14:50:05.435767716 +0100 -+++ fem/src/Makefile.am 2012-11-12 14:51:29.271802187 +0100 -@@ -154,8 +154,9 @@ - - - install-exec-local: -- @echo "Installing stuff to ${prefix}/bin" -+ @echo "Installing stuff to ${DESTDIR}${prefix}/bin" - $(MKDIR) $(DESTDIR)$(prefix)/bin -+ $(MKDIR) $(DESTDIR)$(prefix)/lib - $(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin - $(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin - $(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin diff --git a/sci-misc/elmer-fem/files/elmer-fem-rpath.patch b/sci-misc/elmer-fem/files/elmer-fem-rpath.patch new file mode 100644 index 000000000..27249fef9 --- /dev/null +++ b/sci-misc/elmer-fem/files/elmer-fem-rpath.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt.orig 2022-08-24 21:50:59.940905698 -0500 ++++ b/CMakeLists.txt 2022-08-24 21:51:08.610804464 -0500 +@@ -479,7 +479,7 @@ + + # Set up rpaths to point ELMER_INSTALL_LIB_DIR + IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +- SET(ELMERSOLVER_RPATH_STRING "\$ORIGIN/../${ELMER_INSTALL_LIB_DIR}") ++ SET(ELMERSOLVER_RPATH_STRING "${ELMER_INSTALL_LIB_DIR}") + SET(ELMERLIB_RPATH_STRING "\$ORIGIN/") + ELSEIF(APPLE) + SET(ELMERSOLVER_RPATH_STRING "@loader_path/../${ELMER_INSTALL_LIB_DIR}") |