Skip to content

Commit 0804136

Browse files
prj-prj-
authored
Merge pull request #158 from FreeFem/develop
Version 4.7-1
2 parents eca8ba5 + 8ae3266 commit 0804136

File tree

72 files changed

+3823
-3471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3823
-3471
lines changed

‎3rdparty/ff-petsc/Makefile

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,13 @@ PETSC_DOWNLOAD := --download-metis --download-ptscotch \
6868
--download-hypre --download-parmetis \
6969
--download-superlu --download-suitesparse --download-tetgen \
7070
--download-slepc
71-
# --download-slepc-commit=d3f7cd4a
7271
ifeq ($(FFCMAKE),no)
7372
PETSC_DOWNLOAD := $(PETSC_DOWNLOAD) --download-cmake
7473
endif
7574
PETSC_DOWNLOAD_C := $(PETSC_DOWNLOAD_C) --download-slepc
76-
# --download-slepc-commit=d3f7cd4a
7775
ifeq ($(WIN32DLLTARGET),)
78-
PETSC_DOWNLOAD := $(PETSC_DOWNLOAD) --download-hpddm --download-hpddm-commit=ce6ce80
79-
PETSC_DOWNLOAD_C := $(PETSC_DOWNLOAD_C) --download-hpddm --download-hpddm-commit=ce6ce80
76+
PETSC_DOWNLOAD := $(PETSC_DOWNLOAD) --download-hpddm
77+
PETSC_DOWNLOAD_C := $(PETSC_DOWNLOAD_C) --download-hpddm
8078
endif
8179
endif
8280
ifeq ($(FF_generic_petsc), yes)
@@ -91,17 +89,17 @@ ifeq ($(MPICC)$(MPICXX)$(MPIFC),)
9189
PETSC_DOWNLOAD += --with-cc='$(CC)' --with-cxx='$(CXX)' --download-mpich
9290
PETSC_DOWNLOAD_C += --with-mpi-dir=$(DIR_INSTALL_REAL)
9391
ifneq ($(FC),)
94-
PETSC_DOWNLOAD += --with-fc='$(FC)' --download-scalapack --download-mumps
95-
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL)
92+
PETSC_DOWNLOAD += --with-fc='$(FC)' --download-scalapack --download-mumps --download-slepc-configure-arguments="--download-arpack=https://github.com/prj-/arpack-ng/archive/6d11c37b2dc9110f3f6a434029353ae1c5112227.tar.gz"
93+
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL) # --download-slepc-configure-arguments="--with-arpack-dir=$(DIR_INSTALL_REAL)"
9694
else
9795
COMMON_FLAGS += --with-fc=0
9896
endif
9997
else
10098
COMMON_FLAGS += --with-cc='$(MPICC)' --with-cxx='$(MPICXX)'
10199
ifneq ($(MPIFC),)
102100
COMMON_FLAGS += --with-fc='$(MPIFC)'
103-
PETSC_DOWNLOAD += --download-scalapack --download-mumps
104-
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL)
101+
PETSC_DOWNLOAD += --download-scalapack --download-mumps --download-slepc-configure-arguments="--download-arpack=https://github.com/prj-/arpack-ng/archive/6d11c37b2dc9110f3f6a434029353ae1c5112227.tar.gz"
102+
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL) # --download-slepc-configure-arguments="--with-arpack-dir=$(DIR_INSTALL_REAL)"
105103
else
106104
COMMON_FLAGS += --with-fc=0
107105
PETSC_DOWNLOAD += --download-superlu_dist
@@ -114,6 +112,7 @@ COMMON_FLAGS += --with-shared-libraries=0 \
114112
--with-cc='$(CC)' --with-cxx='$(CXX)' \
115113
CXXFLAGS='-fno-stack-protector' \
116114
CFLAGS='-fno-stack-protector' \
115+
FFLAGS='$(FCFLAGS)' \
117116
--with-mpi-lib='$(MPI_LIB)' \
118117
--with-mpi-include='$(MPI_INC_DIR)' \
119118
--with-mpiexec='/C/Program\ Files/Microsoft\ MPI/Bin/mpiexec'
@@ -123,8 +122,8 @@ PETSC_DOWNLOAD += '--download-metis-cmake-arguments=-G "MSYS Makefiles"' \
123122
'--download-hypre-configure-arguments=--build=x86_64-linux-gnu --host=x86_64-linux-gnu'
124123
ifneq ($(FC),)
125124
COMMON_FLAGS += --with-fc='$(FC)'
126-
PETSC_DOWNLOAD += --download-scalapack --download-mumps
127-
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL)
125+
PETSC_DOWNLOAD += --download-scalapack --download-mumps --download-slepc-configure-arguments="--download-arpack=https://github.com/prj-/arpack-ng/archive/6d11c37b2dc9110f3f6a434029353ae1c5112227.tar.gz"
126+
PETSC_DOWNLOAD_C += --with-scalapack-dir=$(DIR_INSTALL_REAL) --with-mumps-dir=$(DIR_INSTALL_REAL) # --download-slepc-configure-arguments="--with-arpack-dir=$(DIR_INSTALL_REAL)"
128127
else
129128
COMMON_FLAGS += --with-fc=0
130129
endif
@@ -147,8 +146,8 @@ all-local:
147146
@echo " make petsc-slepc "
148147

149148
DIRPKG=../pkg
150-
VERSION=3.13.5
151-
VERSION_SLEPC=3.13.3
149+
VERSION=3.14.0
150+
VERSION_SLEPC=3.013.4
152151
PACKAGE=../pkg/petsc-lite-$(VERSION).tar.gz
153152
SRCDIR=petsc-$(VERSION)
154153
MPI_DIR:=$(shell dirname $(MPI_INC_DIR))
@@ -296,9 +295,8 @@ WHERE-all:Makefile Make-petsc-download.mk
296295
endif
297296
$(SRCDIR)/tag-tar:$(PACKAGE)
298297
-tar xzf $(PACKAGE)
299-
patch -p1 < petsc-hpddm.patch
300298
ifeq ($(WIN32DLLTARGET),)
301-
patch -p1 < petsc-metis.patch
299+
cd petsc-$(VERSION) && patch -p1 < ../petsc-metis.patch && cd -
302300
endif
303301
touch $@
304302
$(PACKAGE):

‎3rdparty/ff-petsc/petsc-hpddm.patch

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎3rdparty/ff-petsc/petsc-metis.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/petsc-3.13.5/config/BuildSystem/config/packages/metis.py b/petsc-3.13.5/config/BuildSystem/config/packages/metis.py
1+
diff --git a/config/BuildSystem/config/packages/metis.py b/config/BuildSystem/config/packages/metis.py
22
index 136526da05..2d1c4d3271 100644
3-
--- a/petsc-3.13.5/config/BuildSystem/config/packages/metis.py
4-
+++ b/petsc-3.13.5/config/BuildSystem/config/packages/metis.py
3+
--- a/config/BuildSystem/config/packages/metis.py
4+
+++ b/config/BuildSystem/config/packages/metis.py
55
@@ -44,6 +44,12 @@ class Configure(config.package.CMakePackage):
66
if self.framework.argDB['download-metis-use-doubleprecision']:
77
args.append('-DMETIS_USE_DOUBLEPRECISION=1')

‎3rdparty/getall

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,34 +174,34 @@ download('TetGen','http://www.tetgen.org/1.5/src/tetgen1.5.1-beta1.tar.gz',
174174
'http://www.tetgen.org/1.5/src/',
175175
'tetgen1.5.1-beta1.tar.gz',
176176
'3d55c197bcbfc611b7ced6f343643756');
177-
download('mmg','https://github.com/MmgTools/mmg/archive/90371befa5271afd427d7bdbdec0a68284730805.zip',
177+
download('mmg','https://github.com/MmgTools/mmg/archive/f353d07ea55da617965806a39de8a6d76f3e020f.zip',
178178
'https://github.com/MmgTools',
179179
'mmg.zip',
180-
'ee8e6592dc206af065c4fdfa28fd0d39');
181-
download('parmmg','https://github.com/MmgTools/ParMmg/archive/771743b153aba05f690ca7ee920d6fa2380dbb10.zip',
180+
'031e09d35c433e1a5b2900c207cba344');
181+
download('parmmg','https://github.com/MmgTools/ParMmg/archive/f78f4e3e1019137787588aab7a8052fbc60dada2.zip',
182182
'https://github.com/MmgTools',
183183
'parmmg.zip',
184-
'd085aaabf1c976a4ec7b7bc0c9191a6e');
185-
download('PETSc','https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-lite-3.13.5.tar.gz',
186-
'https://www.mcs.anl.gov/petsc/mirror/release-snapshots',
187-
'petsc-lite-3.13.5.tar.gz',
188-
'41ef2cfbf21a755105ab81cacd0f7124');
184+
'9a76fef6be1ab66af3a813409a0388c9');
185+
download('PETSc','https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-lite-3.14.0.tar.gz',
186+
'https://www.mcs.anl.gov/petsc/mirror/release-snapshots/',
187+
'petsc-lite-3.14.0.tar.gz',
188+
'fb9f43e559e317160cb88265a3975bb5');
189189

190-
download('htool','https://github.com/htool-ddm/htool/archive/71818cbf11b109c0c5a9bd3cdbcde76225a2e0b7.zip',
190+
download('htool','https://github.com/htool-ddm/htool/archive/e008e87bded5626d73fa7655487aee48268e2149.zip',
191191
'https://github.com/htool-ddm/',
192192
'htool.zip',
193-
'9b349a67632d6110143ce174bd18d8b4');
193+
'7ee614df188cf501c03c5f27d1569b1c');
194194

195195

196-
download('hpddm','https://github.com/hpddm/hpddm/archive/ce6ce80b62e9bc71efedf8b9cb6ffb00dfd6e44e.zip',
196+
download('hpddm','https://github.com/hpddm/hpddm/archive/882ec1041ed3e112237ceb6986ea0e79d335ade5.zip',
197197
'https://github.com/hpddm',
198198
'hpddm.zip',
199-
'340f81270d5e16faa86a0372d10ce417');
199+
'490275da4e47760a86e4747abd0306e7');
200200

201-
download('bemtool','https://github.com/PierreMarchand20/BemTool/archive/c608875aca175b3bb424c50a9c13131aa7e2b257.zip',
201+
download('bemtool','https://github.com/PierreMarchand20/BemTool/archive/d327ef63c5abe88b13197c433a019e0db10eb426.zip',
202202
'https://github.com/PierreMarchand20/BemTool',
203203
'bemtool.zip',
204-
'55b1890ce0d688c8694550857f2670da');
204+
'70fcbea1f1bd2e8c8d9c44f59626f934');
205205

206206
download('Boost','https://www.ljll.math.upmc.fr/~tournier/boost_for_bemtool.tar.gz',
207207
'https://www.boost.org',

‎3rdparty/parmmg/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ FAIT.done:tag-tar
2929
-DCMAKE_C_FLAGS="$(CFLAGS) -fPIC" \
3030
-DCMAKE_CXX_COMPILER="$(CXX)" \
3131
-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CXX11FLAGS) -fPIC" \
32+
-DCMAKE_Fortran_COMPILER="$(FC)" \
3233
-DMPI_C_COMPILER="$(MPICC)" \
3334
-DMPI_CXX_COMPILER="$(MPICXX)" \
3435
-DMPI_Fortran_COMPILER="$(MPIFC)" \

‎AutoGeneratedFile.tar.gz

10.3 KB
Binary file not shown.

‎CHANGELOG.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,24 @@
2323
# Changelog
2424
All notable changes to this project will be documented in this file.
2525

26-
## [Unreleased]
27-
### Added
28-
26+
## [4.7-1]
2927
### Changed
30-
31-
### Deprecated
28+
- change the language definition to use type as a construction function with named arguments for bem plugin
29+
- PETSc version 3.14.0
30+
- ARPACK compiled by SLEPc
31+
- Mmg version 5.5.0
32+
- -std=c++14 instead of -std=c++11 when possible
3233

3334
### Removed
34-
35+
- plugins thresholdings, symmetrizeCSR, and fflapack and associed example
3536

3637
### Fixed
37-
38+
- problem compilation with gfortran-10 of arpack and mumps (add -fallow-argument-mismatch flags)
3839

3940
## [4.7]
4041
### Added
42+
43+
- new way to build matrix beetween 2d Finite element 2d and Curve finite element to do mortar (Thank to Axel ) , see first example `examples/tutorial/mortar-DN-4-v4.5.edp`
4144
- add `Ns` normal vector in R^3 on meshS (normal of the surface) of current point (to day Ns of [x,y,0] plan is [0,0,-1]) no be compatibe to exterior normal.
4245
- add `Tl` tangent vector in R^3 on meshL (tangent vector of the line/curve) of current point
4346
- compile ffmaster / ffslave example under windows (thanks to johann@ifado.de)
@@ -337,14 +340,15 @@ All notable changes to this project will be documented in this file.
337340
### Changed
338341
- The main distribution is now on Github
339342
340-
[Unreleased]: https://github.com/FreeFem/FreeFem-sources/compare/v4.7..develop
343+
[Unreleased]: https://github.com/FreeFem/FreeFem-sources/compare/v4.7-1..develop
344+
[4.7-1]: https://github.com/FreeFem/FreeFem-sources/compare/v4.7...v4.7-1
341345
[4.7]: https://github.com/FreeFem/FreeFem-sources/compare/v4.6...v4.7
342346
[4.6]: https://github.com/FreeFem/FreeFem-sources/compare/v4.5...v4.6
343347
[4.5]: https://github.com/FreeFem/FreeFem-sources/compare/v4.4-3...v4.5
344348
[4.4-3]: https://github.com/FreeFem/FreeFem-sources/compare/v4.4-2...v4.4-3
345349
[4.4-2]: https://github.com/FreeFem/FreeFem-sources/compare/v4.4...v4.4-2
346350
[4.4]: https://github.com/FreeFem/FreeFem-sources/compare/v4.2.1...v4.4
347-
[4.2.1]: https://github.com/FreeFem/FreeFem-sources/compare/v4.0...v4.2.1
351+
[4.2.1]: https://github.com/FreeFem/FreeFem-sources/compare/v4.1...v4.2.1
348352
[4.1]: https://github.com/FreeFem/FreeFem-sources/compare/v4.0...v4.1
349353
[4.0]: https://github.com/FreeFem/FreeFem-sources/compare/3.62...v4.0
350354
[3.62]: https://github.com/FreeFem/FreeFem-sources/compare/3.61...3.62

0 commit comments

Comments
 (0)