Skip to content

Commit

Permalink
Merge pull request #294 from FreeFem/release-v4.14
Browse files Browse the repository at this point in the history
Release version 4.14
  • Loading branch information
prj- authored Dec 3, 2023
2 parents cfb7acc + 22df5a9 commit 853ffcc
Show file tree
Hide file tree
Showing 78 changed files with 2,491 additions and 516 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ AppDir/
3rdparty/mmg3d/mmg3d4/
3rdparty/mmg3d/tag-tar-158547
3rdparty/mshmet/ff-flags
3rdparty/mshmet/mshmet.2012.04.25/
3rdparty/mshmet/src/FAIRE
3rdparty/mshmet/src/FAIT
3rdparty/mshmet/src/sourceslib/compil.date
3rdparty/mshmet/src/tag-tar
3rdparty/mumps-seq/FAIRE-4.10.0
3rdparty/mumps-seq/Makefile.inc
3rdparty/mumps/FAIRE-4.10.0
Expand Down Expand Up @@ -270,6 +273,7 @@ plugin/seq/ff-c++
plugin/seq/ff-get-dep
plugin/seq/ff-pkg-download
plugin/seq/ffmaster
plugin/seq/ffmaster.dSYM
plugin/seq/include/
plugin/seq/load.link
*speedtest.out
Expand Down
11 changes: 5 additions & 6 deletions 3rdparty/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ ipopt/patch-IpBlas \
ff-petsc/Makefile \
ff-petsc/Makefile-PETSc.inc \
ff-petsc/Makefile.complex \
ff-petsc/petsc-3.11.2.patch \
getall

# FFCS: See [[file:../../../configure.ac::tools_problems_all_platforms]] for reasons why some tools may be deactivated
Expand Down Expand Up @@ -118,7 +117,7 @@ install-other: tag-install-other
tag-install-other:
if test -n "$(TOOL_COMPILE_hpddm)"; then $(MAKE) install-hpddm; else true; fi
if test -n "$(TOOL_COMPILE_htool)"; then $(MAKE) install-htool; else true; fi
if test -n "$(TOOL_COMPILE_bem)"; then $(MAKE) install-boost install-bemtool; else true; fi
if test -n "$(TOOL_COMPILE_bemtool)"; then $(MAKE) install-boost install-bemtool; else true; fi
touch tag-install-other

WHERE-OTHER: lib/WHERE.hpddm lib/WHERE.htool lib/WHERE.bemtool lib/WHERE.boost
Expand Down Expand Up @@ -169,12 +168,12 @@ lib/WHERE.htool: ./getall

# begin BEMTOOL
install-bemtool: ./getall
if test -n "$(TOOL_COMPILE_bem)"; then ./getall -o bemtool -a; $(MAKE) include/BemTool/done.tag lib/WHERE.bemtool; else true;fi
if test -n "$(TOOL_COMPILE_bemtool)"; then ./getall -o bemtool -a; $(MAKE) include/BemTool/done.tag lib/WHERE.bemtool; else true;fi
reinstall-bemtool:./getall
-rm lib/WHERE.bemtool
-rm ./pkg/bemtool.zip
-rm -rf include/BemTool
-test -n "$(TOOL_COMPILE_bem)" && $(MAKE) install-bemtool || true
-test -n "$(TOOL_COMPILE_bemtool)" && $(MAKE) install-bemtool || true
include/BemTool/done.tag: ./pkg/bemtool.zip
-if test -f ./pkg/bemtool.zip; then \
cd include; rm -rf BemTool BemTool-*; unzip -q ../pkg/bemtool.zip; mv BemTool-* BemTool; touch BemTool/done.tag; \
Expand All @@ -188,12 +187,12 @@ lib/WHERE.bemtool: ./getall

# begin BOOST
install-boost: ./getall
if test -n "$(TOOL_COMPILE_bem)"; then ./getall -o Boost -a; $(MAKE) boost/done.tag lib/WHERE.boost; else true; fi
if test -n "$(TOOL_COMPILE_bemtool)"; then ./getall -o Boost -a; $(MAKE) boost/done.tag lib/WHERE.boost; else true; fi
reinstall-boost: ./getall
-rm lib/WHERE.boost
-rm ./pkg/boost_for_bemtool.tar.gz
-rm -rf boost
-test -n "$(TOOL_COMPILE_bem)" && $(MAKE) install-boost || true
-test -n "$(TOOL_COMPILE_bemtool)" && $(MAKE) install-boost || true
boost/done.tag: ./pkg/boost_for_bemtool.tar.gz
if test -f ./pkg/boost_for_bemtool.tar.gz; then \
rm -rf boost boost_*; tar xzf pkg/boost_for_bemtool.tar.gz; mv boost_for_bemtool boost; \
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/ff-petsc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ $(SRCDIR)/tag-make-real:$(SRCDIR)/tag-conf-real

$(SRCDIR)/tag-install-real :$(SRCDIR)/tag-make-real
cd $(SRCDIR) && $(MAKE) PETSC_DIR=$(PETSC_DIR) PETSC_ARCH=fr install-lib
cd $(SRCDIR) && $(MAKE) PETSC_DIR=$(PETSC_DIR) PETSC_ARCH=fr check
cd $(SRCDIR) && export HWLOC_HIDE_ERRORS=2 && $(MAKE) PETSC_DIR=$(PETSC_DIR) PETSC_ARCH=fr check
test -e $(DIR_INSTALL_REAL)/include/petsc.h
test -e $(DIR_INSTALL_REAL)/lib/petsc/conf/petscvariables
touch $@
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/ff-petsc/petsc-cmake-seq.patch
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ diff --color -Naur petsc-3.19.0-p1/config/BuildSystem/config/packages/PTScotch.p
@@ -9,6 +9,8 @@
self.download = ['git://https://gitlab.inria.fr/scotch/scotch.git',
'https://gitlab.inria.fr/scotch/scotch/-/archive/'+self.gitcommit+'/scotch-'+self.gitcommit+'.tar.gz',
'http://ftp.mcs.anl.gov/pub/petsc/externalpackages/scotch-'+self.gitcommit+'.tar.gz']
'https://web.cels.anl.gov/projects/petsc/download/externalpackages/scotch-'+self.gitcommit+'.tar.gz']
+ self.download_macos = ['https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.2/scotch-v6.1.2.tar.gz',
+ 'http://ftp.mcs.anl.gov/pub/petsc/externalpackages/scotch-v6.1.2.tar.gz']
+ 'http://web.cels.anl.gov/projects/petsc/download/externalpackages/scotch-v6.1.2.tar.gz']
self.downloaddirnames = ['scotch','petsc-pkg-scotch']
self.liblist = [['libptesmumps.a','libptscotchparmetisv3.a','libptscotch.a','libptscotcherr.a','libesmumps.a','libscotch.a','libscotcherr.a'],['libptesmumps.a','libptscotchparmetis.a','libptscotch.a','libptscotcherr.a','libesmumps.a','libscotch.a','libscotcherr.a'],
['libptesmumps.a','libptscotchparmetis.a','libptscotch.a','libptscotcherr.a','libesmumps.a','libscotch.a','libscotcherr.a']]
Expand Down
12 changes: 6 additions & 6 deletions 3rdparty/getall
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ download('parmmg','https://github.com/prj-/ParMmg/archive/9cb2f7a22ef590d196d028
'https://github.com/prj-',
'parmmg.zip',
'32035de70272121137c0869e8c49e4bd');
download('PETSc','https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-3.19.2.tar.gz',
'https://www.mcs.anl.gov/petsc/mirror/release-snapshots/',
'petsc-3.19.2.tar.gz',
'9d53f784ca2ab37bf25b7991ceefa1d9');
download('PETSc','https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.20.2.tar.gz',
'https://web.cels.anl.gov/projects/petsc/download/release-snapshots/',
'petsc-3.20.2.tar.gz',
'1e170a5f096433ca21aa643c80c749eb');

download('htool','https://github.com/htool-ddm/htool/archive/946875d79d0036afb4dc2c0c13c165a607d830df.zip',
'https://github.com/htool-ddm/',
Expand All @@ -187,10 +187,10 @@ download('hpddm','https://codeload.github.com/hpddm/hpddm/zip/7113b9a6b77fceee3f
'hpddm.zip',
'6910b7b974f0b60d9c247c666e7f3862');

download('bemtool','https://github.com/PierreMarchand20/BemTool/archive/435b9d8ea86228b9ec4b526fc915aa35a7a8bec6.zip',
download('bemtool','https://github.com/PierreMarchand20/BemTool/archive/629c44513698405b58c50650cba69419474062ad.zip',
'https://github.com/PierreMarchand20/BemTool',
'bemtool.zip',
'3f9c95580efeb4d2b8f1fa977f7fd395');
'869832f5cbec4dfb2c16e2d94bad0b7d');

download('Boost','https://www.ljll.math.upmc.fr/~tournier/boost_for_bemtool.tar.gz',
'https://www.boost.org',
Expand Down
Binary file modified AutoGeneratedFile.tar.gz
Binary file not shown.
41 changes: 39 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,43 @@
# Changelog
All notable changes to this project will be documented in this file.

## [4.14]
### Added
- Finite element BDM2 and BDM2ortho in test, Bug in BDM2ortho corrected the 4 sept 2014 in version: v4.13-130-g1af52457
- Conversion of matrix or transpose of matrix in `int[int][int]` array to get the structure of sparse matrix.
see tutorial/sparse-matrix.edp example at end
```
matrix A = va(Ph,Vh);
int[int] a = A, at= A';
````
- a meshL finite function can be see as real function with 1, or 2 parameters
```
meshL ThL = segment(10); fespace VhL(ThL,P1); VhL u= x;
cout << u(0.5) << endl;
cout << u(0.5,0) << endl;
```
- Exemple to code convolution of 2 function with one with a small support
too be not to expanxive
see tutorial/Convolution-Sample.edp example
- Support for dense blocks in PETSc matrices
- GenEO for saddle-point examples with PCHPDDM in PETSc
- Distributed ParaView output on `meshS`
- Interface to `mmg2d` for two-dimensional `mesh`
- Support for Mmg parameters `localParameter`, `-nosizreq`, -hgradreq`

### Changed
- PETSc 3.20.2

### Deprecated
-

### Removed
-

### Fixed
- bug in P3pnc3d in vectorial case (thank to loic.balaziatchynillama@cea.fr )
- in segment(10,region=1,label=ll); region is now used..

## [4.13]

### Added
Expand Down Expand Up @@ -48,7 +85,7 @@ All notable changes to this project will be documented in this file.

- add New Finite element 2d on mesh : RT0dc (discontinios RT0 ) in plugin Element_Mixte
see example plugin/RT0dc.edp
and P1nc (Crouziex-Raviat) + bulle : name P1bnc in plugin Element_P1ncdc
and P1nc (Crouziex-Raviart) + bulle : name P1bnc in plugin Element_P1ncdc
and P1nc totaly discontinous + bulle ; name P1bdcnc in plugin Element_P1ncdc
see example plugin/example testp1dcnc.edp
for akram.beni-hamad@inria.fr
Expand Down Expand Up @@ -604,7 +641,7 @@ All notable changes to this project will be documented in this file.
### Changed
- The main distribution is now on Github

[Unreleased]: https://github.com/FreeFem/FreeFem-sources/compare/v4.12..develop
[4.14]: https://github.com/FreeFem/FreeFem-sources/compare/v4.13..v4.14
[4.13]: https://github.com/FreeFem/FreeFem-sources/compare/v4.12..v4.13
[4.12]: https://github.com/FreeFem/FreeFem-sources/compare/v4.11..v4.12
[4.11]: https://github.com/FreeFem/FreeFem-sources/compare/v4.10..v4.11
Expand Down
49 changes: 49 additions & 0 deletions bin/change-dylib-gfortran
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash
## change path gfortran lib in freefem install
## usage : change-dylibgfortran oldlibdir newlibdir libnam1 libnam2 list of dylyb file pathname to change ...
## F. hecht sep. 2023 on MoOS Ventura , Monterey
## remark the file $oldlibdir/$libnam1 , ... must exist ...
olddir=$1
shift
newdir=$1
shift
lib1=$1
shift
lib2=$1
shift
lib3=$1
shift
fi

if test -f "$olddir/$lib1" -a -f "$olddir/$lib2" -a -f "$olddir/$lib3" \
-a -f "$newdir/$lib1" -a -f "$newdir/$lib2" -a -f "$newdir/$lib3" ; then
for ff in $@; do
ch=0
for lib in $lib1 $lib2 $lib3; do
old=$olddir/$lib
new=$newdir/$lib
nnl=`otool -L $ff|grep $lib|awk '{print $1}'`
case $nnl in
/* ) old=$nnl
esac
# echo "old .. " $old $nnl
# otool -L $ff|awk "/$lib/ "'{print $1}'
nn=`otool -L $ff|grep $old|wc -l`
# echo "nn=" $nn $nnl $old
otool -L $ff| grep brew
if test $nn -ne 0 ; then
# echo ..change $old to $new in $ff
ch=1
echo change $old to $new1 in $ff
install_name_tool -change $old $new $ff
fi
done
if test $ch -eq 1 ; then
codesign --remove-signature $ff
codesign -s - $ff
fi
done
else
echo "$olddir/$lib1" "$olddir/$lib2" "$olddir/$lib3" do some not exist!
echo "$newdir/$lib1" "$newdir/$lib2" "$newdir/$lib3" do not exist!
fi
Loading

0 comments on commit 853ffcc

Please sign in to comment.