| 1 |
commit: 75bdb13a13345ae3addbad16c9e18e02616131c2 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Sat Jan 30 14:13:08 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Sat Jan 30 14:13:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=75bdb13a |
| 7 |
|
| 8 |
ci-misc/elmer-fem: version bump, EAPI bump, add more USE flags |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 12 |
|
| 13 |
sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild | 52 --------------- |
| 14 |
sci-misc/elmer-fem/elmer-fem-9.0.ebuild | 68 ++++++++++++++++++++ |
| 15 |
sci-misc/elmer-fem/elmer-fem-9999.ebuild | 54 ---------------- |
| 16 |
.../elmer-fem/files/elmer-fem-6.0_p4651-oos.patch | 75 ---------------------- |
| 17 |
.../files/elmer-fem-6.0_p4651-underlinking.patch | 23 ------- |
| 18 |
.../files/elmer-fem-ElmerIce-compile.patch | 58 +++++++++++++++++ |
| 19 |
.../files/elmer-fem-Makefile-install.patch | 13 ---- |
| 20 |
sci-misc/elmer-fem/metadata.xml | 5 ++ |
| 21 |
8 files changed, 131 insertions(+), 217 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild |
| 24 |
deleted file mode 100644 |
| 25 |
index 94d7a8e9f..000000000 |
| 26 |
--- a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild |
| 27 |
+++ /dev/null |
| 28 |
@@ -1,52 +0,0 @@ |
| 29 |
-# Copyright 1999-2021 Gentoo Authors |
| 30 |
-# Distributed under the terms of the GNU General Public License v2 |
| 31 |
- |
| 32 |
-EAPI=5 |
| 33 |
- |
| 34 |
-AUTOTOOLS_AUTORECONF=true |
| 35 |
-FORTRAN_STANDARD=90 |
| 36 |
- |
| 37 |
-inherit autotools-utils fortran-2 multilib |
| 38 |
- |
| 39 |
-ELMER_ROOT="elmerfem" |
| 40 |
-MY_PN=${PN/elmer-/} |
| 41 |
- |
| 42 |
-DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem" |
| 43 |
-HOMEPAGE="https://www.csc.fi/web/elmer" |
| 44 |
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz" |
| 45 |
- |
| 46 |
-LICENSE="GPL-2" |
| 47 |
-SLOT="0" |
| 48 |
-KEYWORDS="~amd64 ~x86" |
| 49 |
-IUSE="mpi debug" |
| 50 |
- |
| 51 |
-RDEPEND=" |
| 52 |
- virtual/blas |
| 53 |
- virtual/lapack |
| 54 |
- sci-libs/arpack |
| 55 |
- sci-libs/elmer-hutiter |
| 56 |
- sci-libs/elmer-eio |
| 57 |
- mpi? ( sys-cluster/mpich2 )" |
| 58 |
-DEPEND="${RDEPEND}" |
| 59 |
-# Note this seems to only configure correctly with the elmer version of umfpack |
| 60 |
-# But this doesn't stop it from compiling / working without it |
| 61 |
- |
| 62 |
-S="${WORKDIR}/fem" |
| 63 |
- |
| 64 |
-PATCHES=( |
| 65 |
- "${FILESDIR}"/${P}-oos.patch |
| 66 |
- "${FILESDIR}"/${P}-underlinking.patch |
| 67 |
-) |
| 68 |
- |
| 69 |
-src_configure() { |
| 70 |
- local myeconfargs=( |
| 71 |
- $(use_with debug) |
| 72 |
- $(usex mpi --with-mpi "") |
| 73 |
- $(usex mpi --with-mpi-dir="${EPREFIX}"/usr "") |
| 74 |
- --with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)" |
| 75 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" |
| 76 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" |
| 77 |
- --with-huti --with-eiof --with-matc |
| 78 |
- ) |
| 79 |
- autotools-utils_src_configure |
| 80 |
-} |
| 81 |
|
| 82 |
diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild |
| 83 |
new file mode 100644 |
| 84 |
index 000000000..8db83bd30 |
| 85 |
--- /dev/null |
| 86 |
+++ b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild |
| 87 |
@@ -0,0 +1,68 @@ |
| 88 |
+# Copyright 1999-2021 Gentoo Authors |
| 89 |
+# Distributed under the terms of the GNU General Public License v2 |
| 90 |
+ |
| 91 |
+EAPI=7 |
| 92 |
+ |
| 93 |
+FORTRAN_STANDARD=90 |
| 94 |
+ |
| 95 |
+inherit fortran-2 flag-o-matic cmake multilib |
| 96 |
+ |
| 97 |
+ELMER_ROOT="elmerfem" |
| 98 |
+MY_PN=${PN/elmer-/} |
| 99 |
+ |
| 100 |
+DESCRIPTION="Finite element programs, libraries, and visualization tools" |
| 101 |
+HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/" |
| 102 |
+SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz" |
| 103 |
+ |
| 104 |
+LICENSE="GPL-2" |
| 105 |
+SLOT="0" |
| 106 |
+KEYWORDS="~amd64 ~x86" |
| 107 |
+ |
| 108 |
+IUSE="ice gui matc mpi test" |
| 109 |
+RESTRICT="!test? ( test )" |
| 110 |
+ |
| 111 |
+RDEPEND=" |
| 112 |
+ virtual/blas |
| 113 |
+ virtual/lapack |
| 114 |
+ !sci-libs/arpack |
| 115 |
+ mpi? ( sys-cluster/openmpi ) |
| 116 |
+ gui? ( x11-libs/qwt:6 ) |
| 117 |
+" |
| 118 |
+DEPEND="${RDEPEND}" |
| 119 |
+# Note this seems to only configure correctly with the elmer version of umfpack |
| 120 |
+# But this doesn't stop it from compiling / working without it |
| 121 |
+ |
| 122 |
+PATCHES=( |
| 123 |
+ "${FILESDIR}/${PN}-ElmerIce-compile.patch" |
| 124 |
+) |
| 125 |
+ |
| 126 |
+S="${WORKDIR}/elmerfem-release-${PV}" |
| 127 |
+ |
| 128 |
+src_prepare() { |
| 129 |
+ cmake_src_prepare |
| 130 |
+ sed -i '/#include <QPainter>/a #include <QPainterPath>' ElmerGUI/Application/twod/renderarea.cpp || die |
| 131 |
+ test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch |
| 132 |
+ test-flag-FC -fallow-invalid-boz && append-fflags -fallow-invalid-boz |
| 133 |
+ # TODO: fix the tests, fails in compile phase: multiple rules to make target |
| 134 |
+ rm -r fem/tests/* || die |
| 135 |
+ touch fem/tests/CMakeLists.txt || die |
| 136 |
+} |
| 137 |
+ |
| 138 |
+src_configure() { |
| 139 |
+ local mycmakeargs=( |
| 140 |
+ -DMPI_Fortran_COMPILE_FLAGS="$FCFLAGS" |
| 141 |
+ -DCMAKE_Fortran_FLAGS="$FCFLAGS" |
| 142 |
+ -DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)" |
| 143 |
+ -DWITH_MPI="$(usex mpi)" |
| 144 |
+ -DWITH_OpenMP="$(usex mpi)" |
| 145 |
+ -DWITH_MATC="$(usex matc)" |
| 146 |
+ -DWITH_ElmerIce="$(usex ice)" |
| 147 |
+ -DWITH_ELMERGUI="$(usex gui)" |
| 148 |
+ -DWITH_QT5="$(usex gui)" |
| 149 |
+ -DWITH_QWT="$(usex gui)" |
| 150 |
+ -DQWT_INCLUDE_DIR="/usr/include/qwt6" |
| 151 |
+ -DQWT_LIBRARY="/usr/$(get_libdir)/libqwt6-qt5.so" |
| 152 |
+ -DBUILD_TESTING="$(usex test)" |
| 153 |
+ ) |
| 154 |
+ cmake_src_configure |
| 155 |
+} |
| 156 |
|
| 157 |
diff --git a/sci-misc/elmer-fem/elmer-fem-9999.ebuild b/sci-misc/elmer-fem/elmer-fem-9999.ebuild |
| 158 |
deleted file mode 100644 |
| 159 |
index 1004db431..000000000 |
| 160 |
--- a/sci-misc/elmer-fem/elmer-fem-9999.ebuild |
| 161 |
+++ /dev/null |
| 162 |
@@ -1,54 +0,0 @@ |
| 163 |
-# Copyright 1999-2021 Gentoo Authors |
| 164 |
-# Distributed under the terms of the GNU General Public License v2 |
| 165 |
- |
| 166 |
-EAPI=5 |
| 167 |
- |
| 168 |
-AUTOTOOLS_AUTORECONF=true |
| 169 |
-FORTRAN_STANDARD=90 |
| 170 |
- |
| 171 |
-inherit autotools-utils fortran-2 multilib subversion |
| 172 |
- |
| 173 |
-ELMER_ROOT="elmerfem" |
| 174 |
-MY_PN=${PN/elmer-/} |
| 175 |
- |
| 176 |
-DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem" |
| 177 |
-HOMEPAGE="https://www.csc.fi/web/elmer" |
| 178 |
-SRC_URI="" |
| 179 |
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}" |
| 180 |
-ESVN_PROJECT="${MY_PN}" |
| 181 |
- |
| 182 |
-LICENSE="GPL-2" |
| 183 |
-SLOT="0" |
| 184 |
-KEYWORDS="" |
| 185 |
-IUSE="mpi debug" |
| 186 |
- |
| 187 |
-RDEPEND=" |
| 188 |
- virtual/blas |
| 189 |
- virtual/lapack |
| 190 |
- sci-libs/arpack |
| 191 |
- sci-libs/elmer-hutiter |
| 192 |
- sci-libs/elmer-eio |
| 193 |
- mpi? ( sys-cluster/mpich2 )" |
| 194 |
-DEPEND="${RDEPEND}" |
| 195 |
-# Note this seems to only configure correctly with the elmer version of umfpack |
| 196 |
-# But this doesn't stop it from compiling / working without it |
| 197 |
- |
| 198 |
-S="${WORKDIR}/fem" |
| 199 |
- |
| 200 |
-PATCHES=( |
| 201 |
- "${FILESDIR}"/${PN}-6.0_p4651-oos.patch |
| 202 |
- "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch |
| 203 |
-) |
| 204 |
- |
| 205 |
-src_configure() { |
| 206 |
- local myeconfargs=( |
| 207 |
- $(use_with debug) |
| 208 |
- $(usex mpi --with-mpi "") |
| 209 |
- $(usex mpi --with-mpi-dir="${EPREFIX}"/usr "") |
| 210 |
- --with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)" |
| 211 |
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" |
| 212 |
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" |
| 213 |
- --with-huti --with-eiof --with-matc |
| 214 |
- ) |
| 215 |
- autotools-utils_src_configure |
| 216 |
-} |
| 217 |
|
| 218 |
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 |
| 219 |
deleted file mode 100644 |
| 220 |
index 00291bc56..000000000 |
| 221 |
--- a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch |
| 222 |
+++ /dev/null |
| 223 |
@@ -1,75 +0,0 @@ |
| 224 |
- src/Makefile.am | 6 +++--- |
| 225 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
| 226 |
- |
| 227 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 228 |
-index 9e48c31..b94705c 100644 |
| 229 |
---- a/src/Makefile.am |
| 230 |
-+++ b/src/Makefile.am |
| 231 |
-@@ -182,11 +182,11 @@ SC2Elmer_SOURCES = SC2Elmer.c |
| 232 |
- |
| 233 |
- if USE_LOCAL_MPIF_H |
| 234 |
- mpif: mpif_stub.h |
| 235 |
-- $(CP) mpif_stub.h mpif.h |
| 236 |
-- $(CP) mpif_stub.h mpif |
| 237 |
-+ $(CP) $(srcdir)/mpif_stub.h mpif.h |
| 238 |
-+ $(CP) $(srcdir)/mpif_stub.h mpif |
| 239 |
- else |
| 240 |
- mpif: mpif_stub.h |
| 241 |
-- $(CP) mpif_stub.h mpif |
| 242 |
-+ $(CP) $(srcdir)/mpif_stub.h mpif |
| 243 |
- endif |
| 244 |
- |
| 245 |
- EXTRA_DIST = \ |
| 246 |
- src/Makefile.am | 25 +++++++++++++------------ |
| 247 |
- 1 file changed, 13 insertions(+), 12 deletions(-) |
| 248 |
- |
| 249 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 250 |
-index 92de7a4..89a2236 100644 |
| 251 |
---- a/src/Makefile.am |
| 252 |
-+++ b/src/Makefile.am |
| 253 |
-@@ -144,32 +144,33 @@ ELMER_SOLVER_DATADIR=$(prefix)/share/elmersolver |
| 254 |
- install-data-local: |
| 255 |
- @echo "Installing solvers to ${ELMER_SOLVER_DATADIR}/lib" |
| 256 |
- |
| 257 |
-- mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib |
| 258 |
-- $(CP) `ls -f *$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib |
| 259 |
-- $(CP) elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib |
| 260 |
-- $(CP) SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib |
| 261 |
-+ mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) |
| 262 |
-+ $(CP) `ls -f $(builddir)/*$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) |
| 263 |
-+ $(CP) $(srcdir)/elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) |
| 264 |
-+ $(CP) $(srcdir)/SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir) |
| 265 |
- |
| 266 |
- @echo "Installing *.mod to ${ELMER_SOLVER_DATADIR}/include" |
| 267 |
- mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include |
| 268 |
-- $(CP) *.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include |
| 269 |
-+ $(CP) $(builddir)/*.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include |
| 270 |
- |
| 271 |
- |
| 272 |
- install-exec-local: |
| 273 |
- @echo "Installing stuff to ${prefix}/bin" |
| 274 |
- $(MKDIR) $(DESTDIR)$(prefix)/bin |
| 275 |
-- $(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 276 |
-- $(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 277 |
-- $(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 278 |
-+ $(CP) $(builddir)/ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 279 |
-+ $(CP) $(builddir)/ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 280 |
-+ $(CP) $(builddir)/GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 281 |
- if USE_WINDOWS_COMPILER |
| 282 |
- $(CP) libelmersolver*$(SHL_EXT) $(DESTDIR)$(prefix)/lib |
| 283 |
- else |
| 284 |
-- $(CP) libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/lib |
| 285 |
-+ mkdir -p $(DESTDIR)$(prefix)/$(libdir) |
| 286 |
-+ $(CP) $(builddir)/libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/$(libdir) |
| 287 |
- $(LN) -sf libelmersolver-$(VERSION)$(SHL_EXT)\ |
| 288 |
-- $(DESTDIR)$(prefix)/lib/libelmersolver$(SHL_EXT) |
| 289 |
-+ $(DESTDIR)$(prefix)/$(libdir)/libelmersolver$(SHL_EXT) |
| 290 |
- endif |
| 291 |
-- $(CP) elmerf90 elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin |
| 292 |
-+ $(CP) $(builddir)/elmerf90 $(builddir)/elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin |
| 293 |
- if USE_MPI |
| 294 |
-- $(CP) ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 295 |
-+ $(CP) $(builddir)/ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 296 |
- endif |
| 297 |
- |
| 298 |
- clean-local: |
| 299 |
|
| 300 |
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 |
| 301 |
deleted file mode 100644 |
| 302 |
index 7c6be1d8c..000000000 |
| 303 |
--- a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch |
| 304 |
+++ /dev/null |
| 305 |
@@ -1,23 +0,0 @@ |
| 306 |
- src/Makefile.am | 4 ++-- |
| 307 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 308 |
- |
| 309 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 310 |
-index b94705c..92de7a4 100644 |
| 311 |
---- a/src/Makefile.am |
| 312 |
-+++ b/src/Makefile.am |
| 313 |
-@@ -122,13 +122,13 @@ if USE_WINDOWS_COMPILER |
| 314 |
- else |
| 315 |
- $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \ |
| 316 |
- -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \ |
| 317 |
-- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) |
| 318 |
-+ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) -lhuti |
| 319 |
- endif |
| 320 |
- |
| 321 |
- GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) |
| 322 |
- $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \ |
| 323 |
- -o GebhardtFactors$(EXE_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \ |
| 324 |
-- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) |
| 325 |
-+ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) -lhuti |
| 326 |
- |
| 327 |
- |
| 328 |
- |
| 329 |
|
| 330 |
diff --git a/sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch b/sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch |
| 331 |
new file mode 100644 |
| 332 |
index 000000000..c8a065e30 |
| 333 |
--- /dev/null |
| 334 |
+++ b/sci-misc/elmer-fem/files/elmer-fem-ElmerIce-compile.patch |
| 335 |
@@ -0,0 +1,58 @@ |
| 336 |
+diff --color -Naur a/elmerice/Solvers/CalvingRemeshMMG.F90 b/elmerice/Solvers/CalvingRemeshMMG.F90 |
| 337 |
+--- a/elmerice/Solvers/CalvingRemeshMMG.F90 2018-12-19 12:34:45.000000000 +0300 |
| 338 |
++++ b/elmerice/Solvers/CalvingRemeshMMG.F90 2020-12-12 22:39:24.040363020 +0300 |
| 339 |
+@@ -71,6 +71,7 @@ |
| 340 |
+ TYPE(ValueList_t), POINTER :: SolverParams |
| 341 |
+ TYPE(Mesh_t),POINTER :: Mesh,GatheredMesh,NewMeshR,FinalMesh |
| 342 |
+ TYPE(Element_t),POINTER :: Element, ParentElem |
| 343 |
++ TYPE(MMG5_DATA_PTR_T),POINTER :: mmgMet |
| 344 |
+ INTEGER :: i,j,k,NNodes,GNBulk, GNBdry, GNNode, NBulk, Nbdry, ierr, & |
| 345 |
+ my_cboss,MyPE, PEs,CCount, counter, GlNode_min, GlNode_max,adjList(4),front_BC_ID, & |
| 346 |
+ my_calv_front,calv_front, ncalv_parts, group_calve, comm_calve, group_world,ecode, NElNodes |
| 347 |
+@@ -426,7 +427,7 @@ |
| 348 |
+ |
| 349 |
+ !> ------------------------------ STEP II -------------------------- |
| 350 |
+ !! remesh function |
| 351 |
+- CALL MMG3D_mmg3dls(mmgMesh,mmgSol,ierr) |
| 352 |
++ CALL MMG3D_mmg3dls(mmgMesh,mmgSol,mmgMet,ierr) |
| 353 |
+ |
| 354 |
+ CALL MMG3D_SaveMesh(mmgMesh,"test_out.mesh",LEN(TRIM("test_out.mesh")),ierr) |
| 355 |
+ |
| 356 |
+diff --color -Naur a/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 b/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 |
| 357 |
+--- a/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 2018-12-19 12:34:45.000000000 +0300 |
| 358 |
++++ b/elmerice/Solvers/MeshAdaptation_2D/MMG2DSolver.F90 2020-12-12 22:42:32.639562150 +0300 |
| 359 |
+@@ -310,14 +310,14 @@ |
| 360 |
+ !------------------------------------------------------------------------------ |
| 361 |
+ TYPE(Element_t),POINTER :: Element |
| 362 |
+ INTEGER, POINTER :: NodeIndexes(:) |
| 363 |
+- INTEGER :: np,nt,na,ier |
| 364 |
++ INTEGER :: np,nt,na,ier,nquad |
| 365 |
+ INTEGER :: ref,corner,required,ridge |
| 366 |
+ INTEGER :: parent,ied |
| 367 |
+ INTEGER :: tt, jj, kk, ll |
| 368 |
+ |
| 369 |
+ |
| 370 |
+ !> a) get the size of the mesh: vertices, triangles, edges |
| 371 |
+- CALL MMG2D_Get_meshSize(mmgMesh,np,nt,na,ier) |
| 372 |
++ CALL MMG2D_Get_meshSize(mmgMesh,np,nt,nquad,na,ier) |
| 373 |
+ IF ( ier == 0 ) CALL FATAL('MMGSolver',& |
| 374 |
+ 'CALL TO MMGS_Get_meshSize FAILED') |
| 375 |
+ IF (DEBUG) PRINT *,'--**-- MMG2D_Get_meshSize DONE' |
| 376 |
+@@ -467,7 +467,7 @@ |
| 377 |
+ TYPE(Element_t),POINTER :: Element |
| 378 |
+ INTEGER, POINTER :: NodeIndexes(:) |
| 379 |
+ |
| 380 |
+- INTEGER :: NVert,NEle,NEdge |
| 381 |
++ INTEGER :: NVert,NEle,NEdge,NQuad |
| 382 |
+ INTEGER :: n |
| 383 |
+ INTEGER :: ier |
| 384 |
+ INTEGER :: ii,tt |
| 385 |
+@@ -476,7 +476,7 @@ |
| 386 |
+ NEle=Mesh%NumberOfBulkElements |
| 387 |
+ NEdge=Mesh%NumberOfBoundaryElements |
| 388 |
+ |
| 389 |
+- CALL MMG2D_Set_meshSize(mmgMesh,NVert,NEle,NEdge,ier) |
| 390 |
++ CALL MMG2D_Set_meshSize(mmgMesh,NVert,NEle,NQuad,NEdge,ier) |
| 391 |
+ IF ( ier == 0 ) CALL FATAL('MMGSolver',& |
| 392 |
+ 'CALL TO MMG2D_Set_meshSize FAILED') |
| 393 |
+ IF (DEBUG) PRINT *,'--**-- MMG2D_Set_meshSize DONE' |
| 394 |
|
| 395 |
diff --git a/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch b/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch |
| 396 |
deleted file mode 100644 |
| 397 |
index d0de4fe8b..000000000 |
| 398 |
--- a/sci-misc/elmer-fem/files/elmer-fem-Makefile-install.patch |
| 399 |
+++ /dev/null |
| 400 |
@@ -1,13 +0,0 @@ |
| 401 |
---- fem/src/Makefile.am.old 2012-11-12 14:50:05.435767716 +0100 |
| 402 |
-+++ fem/src/Makefile.am 2012-11-12 14:51:29.271802187 +0100 |
| 403 |
-@@ -154,8 +154,9 @@ |
| 404 |
- |
| 405 |
- |
| 406 |
- install-exec-local: |
| 407 |
-- @echo "Installing stuff to ${prefix}/bin" |
| 408 |
-+ @echo "Installing stuff to ${DESTDIR}${prefix}/bin" |
| 409 |
- $(MKDIR) $(DESTDIR)$(prefix)/bin |
| 410 |
-+ $(MKDIR) $(DESTDIR)$(prefix)/lib |
| 411 |
- $(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 412 |
- $(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 413 |
- $(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin |
| 414 |
|
| 415 |
diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml |
| 416 |
index 070aa2029..ddc96e650 100644 |
| 417 |
--- a/sci-misc/elmer-fem/metadata.xml |
| 418 |
+++ b/sci-misc/elmer-fem/metadata.xml |
| 419 |
@@ -8,4 +8,9 @@ |
| 420 |
<upstream> |
| 421 |
<remote-id type="sourceforge">svn</remote-id> |
| 422 |
</upstream> |
| 423 |
+ <use> |
| 424 |
+ <flag name="gui">Build the ElmerGUI</flag> |
| 425 |
+ <flag name="matc">Build the Elmer matc library</flag> |
| 426 |
+ <flag name="ice">Build ElmerICE</flag> |
| 427 |
+ </use> |
| 428 |
</pkgmetadata> |
Archives