diff options
author | 2021-01-30 15:13:08 +0100 | |
---|---|---|
committer | 2021-01-30 15:13:38 +0100 | |
commit | 75bdb13a13345ae3addbad16c9e18e02616131c2 (patch) | |
tree | 6e44f41563627540895dbf50a1ec3521a8fc1b94 /sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch | |
parent | sci-libs/iRODS: version bump, EAPI bump (diff) | |
download | sci-75bdb13a13345ae3addbad16c9e18e02616131c2.tar.gz sci-75bdb13a13345ae3addbad16c9e18e02616131c2.tar.bz2 sci-75bdb13a13345ae3addbad16c9e18e02616131c2.zip |
ci-misc/elmer-fem: version bump, EAPI bump, add more USE flags
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Diffstat (limited to 'sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch')
-rw-r--r-- | sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch | 58 |
1 files changed, 58 insertions, 0 deletions
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' |