Skip to content

Commit 07f5919

Browse files
sgarnotelsgarnotel
committed
replace some FreeFem++ by FreeFEM
1 parent 2caa6f6 commit 07f5919

21 files changed

+247
-267
lines changed

‎.gitignore

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
# ======================================================================
2-
# This file is part of Freefem++
3-
#
4-
# Freefem++ is free software; you can redistribute it and/or modify
5-
# it under the terms of the GNU Lesser General Public License as
6-
# published by the Free Software Foundation; either version 3 of
7-
# the License, or (at your option) any later version.
8-
#
9-
# Freefem++ is distributed in the hope that it will be useful,
10-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU Lesser General Public License for more details.
13-
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with Freefem++; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17-
# ======================================================================
18-
# headeralh conf default=0 freefem start=2008 upmc written
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
1917

2018
*#
2119
*ListOfUnAllocPtr.bin

‎3rdparty/arpack/ARmake.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ARPACK ARmake.inc modified for FreeFem++
1+
# ARPACK ARmake.inc modified for FreeFEM
22
# $Id$
33

44
###########################################################################

‎3rdparty/arpack/ARmake.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ARPACK ARmake.inc modified for FreeFem++
1+
# ARPACK ARmake.inc modified for FreeFEM
22
# $Id$
33

44
###########################################################################

‎3rdparty/arpack/Makefile.am

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# ======================================================================
2-
# Laboratoire Jacques-Louis Lions
3-
# Université Pierre et Marie Curie-Paris6, UMR 7598, Paris, F-75005 France
4-
# ======================================================================
5-
# This file is part of Freefem++
6-
#
7-
# Freefem++ is free software; you can redistribute it and/or modify
8-
# it under the terms of the GNU Lesser General Public License as
9-
# published by the Free Software Foundation; either version 2.1 of
10-
# the License, or (at your option) any later version.
11-
#
12-
# Freefem++ is distributed in the hope that it will be useful,
13-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU Lesser General Public License for more details.
16-
#
17-
# You should have received a copy of the GNU Lesser General Public
18-
# License along with Freefem++; if not, write to the Free Software
19-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
20-
# ======================================================================
21-
# headeralh default=0 freefem make multipleauthors start=04/06/04 upmc brief="Makefile for downloaded ARPACK"
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
17+
# SUMMARY : Makefile for downloaded ARPACK
18+
# LICENSE : LGPLv3
19+
# ORG : LJLL Universite Pierre et Marie Curie, Paris, FRANCE
20+
# AUTHORS : ...
21+
# E-MAIL : ...
2222

2323
all-local:$(DOWNLOAD_ARPACK)
2424
EXTRA_DIST=ARmake.m4 arpack-patch-lapack.tar.gz veclib_zdotc.f veclib_cdotc.f

‎3rdparty/blas/Makefile.am

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
# Downloading and compiling extra BLAS libraries
2-
# ======================================================================
3-
# Laboratoire Jacques-Louis Lions
4-
# Université Pierre et Marie Curie-Paris6, UMR 7598, Paris, F-75005 France
5-
# ======================================================================
6-
# This file is part of Freefem++
7-
#
8-
# Freefem++ is free software; you can redistribute it and/or modify
9-
# it under the terms of the GNU Lesser General Public License as
10-
# published by the Free Software Foundation; either version 2.1 of
11-
# the License, or (at your option) any later version.
12-
#
13-
# Freefem++ is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU Lesser General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU Lesser General Public
19-
# License along with Freefem++; if not, write to the Free Software
20-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21-
# ======================================================================
22-
# headeralh brief="Downloading and compiling extra BLAS libraries" default=0 freefem make multipleauthors start=04/06/04 upmc
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
17+
# SUMMARY : Downloading and compiling extra BLAS libraries
18+
# LICENSE : LGPLv3
19+
# ORG : LJLL Universite Pierre et Marie Curie, Paris, FRANCE
20+
# AUTHORS : ...
21+
# E-MAIL : ...
2322

2423
DIRPKG=../pkg
2524
BLAS_TGZ=$(DIRPKG)/blas-3.7.1.tgz

‎3rdparty/common.mak

+21-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
# Common make rules for all downloaded packages (request from FH)
2-
# ======================================================================
3-
# Written by Antoine Le Hyaric
4-
# http://www.ljll.math.upmc.fr/lehyaric
5-
# Laboratoire Jacques-Louis Lions
6-
# Université Pierre et Marie Curie-Paris6, UMR 7598, Paris, F-75005 France
7-
# ======================================================================
8-
# This file is part of Freefem++
9-
#
10-
# Freefem++ is free software; you can redistribute it and/or modify
11-
# it under the terms of the GNU Lesser General Public License as
12-
# published by the Free Software Foundation; either version 2.1 of
13-
# the License, or (at your option) any later version.
14-
#
15-
# Freefem++ is distributed in the hope that it will be useful,
16-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
17-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-
# GNU Lesser General Public License for more details.
19-
#
20-
# You should have received a copy of the GNU Lesser General Public
21-
# License along with Freefem++; if not, write to the Free Software
22-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
23-
# ======================================================================
24-
# headeralh brief="Common make rules for all downloaded packages (request from FH)" default=0 freefem make start=06/11/2013 upmc written
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
17+
# SUMMARY : Common make rules for all downloaded packages (request from FH)
18+
# LICENSE : LGPLv3
19+
# ORG : LJLL Universite Pierre et Marie Curie, Paris, FRANCE
20+
# AUTHORS : ...
21+
# E-MAIL : ...
2522

2623
# Common goals for all packages:
2724
# download compile install reinstall clean veryclean

‎3rdparty/dissection/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Dissection is a C++ implementation of parallel sparse direct solver on shared
22
memory architecture with a kernel detection algorithm for singular matrices.
33

4-
The source is available under GPL v3 from the FreeFem++ repository,
5-
< http://www.freefem.org/ff++/ff++/download/dissection/ >
4+
The source is available under GPL v3 from the FreeFEM repository,
5+
< http://www3.freefem.org/ff++/ff++/download/dissection/ >
66

77
The copyright holders of Dissection give you permission to combine Dissection
88
program with free software programs or libraries that are released under the

‎3rdparty/dissection/src/freefem++-interface/examples++-load/BDD.edp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func bool SubdomainsPartitionUnity(mesh & Th, int nnpart, real[int] & partdof,
1919
fespace Ph(Th,P0);
2020

2121
mesh Thi=Th;
22-
fespace Vhi(Thi,P1); // FreeFem++ trick, formal definition
22+
fespace Vhi(Thi,P1); // FreeFEM trick, formal definition
2323
Vhi[int] pun(nnpart); // local fem functions Vh sun=0, unssd=0;
2424
Vh sun = 0, unssd = 0;
2525
Ph part;

‎3rdparty/getall

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#!/usr/bin/perl
22

33
############################################################################
4-
# This file is part of FreeFem++. #
4+
# This file is part of FreeFEM. #
55
# #
6-
# FreeFem++ is free software: you can redistribute it and/or modify #
6+
# FreeFEM is free software: you can redistribute it and/or modify #
77
# it under the terms of the GNU Lesser General Public License as #
88
# published by the Free Software Foundation, either version 3 of #
99
# the License, or (at your option) any later version. #
1010
# #
11-
# FreeFem++ is distributed in the hope that it will be useful, #
11+
# FreeFEM is distributed in the hope that it will be useful, #
1212
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
1313
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
1414
# GNU Lesser General Public License for more details. #
1515
# #
1616
# You should have received a copy of the GNU Lesser General Public License #
17-
# along with FreeFem++. If not, see <http://www.gnu.org/licenses/>. #
17+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
1818
############################################################################
1919
# SUMMARY : Download third-party packages independently of FF configuration
2020
# LICENSE : LGPLv3
@@ -35,7 +35,7 @@ getopts('afho:',\%opts);
3535

3636
if($opts{h}){
3737
print <<EOF;
38-
getall [options]: Download third-party packages independently of the FreeFem++ configuration procedure
38+
getall [options]: Download third-party packages independently of the FreeFEM configuration procedure
3939
4040
Available options:
4141

‎3rdparty/umfpack/Makefile.am

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
# Downloading and compiling extra libraries for Umfpack
2-
# ======================================================================
3-
# Laboratoire Jacques-Louis Lions
4-
# Université Pierre et Marie Curie-Paris6, UMR 7598, Paris, F-75005 France
5-
# ======================================================================
6-
# This file is part of Freefem++
7-
#
8-
# Freefem++ is free software; you can redistribute it and/or modify
9-
# it under the terms of the GNU Lesser General Public License as
10-
# published by the Free Software Foundation; either version 2.1 of
11-
# the License, or (at your option) any later version.
12-
#
13-
# Freefem++ is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU Lesser General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU Lesser General Public
19-
# License along with Freefem++; if not, write to the Free Software
20-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21-
# ======================================================================
22-
# headeralh brief="Downloading and compiling extra libraries for Umfpack" default=0 freefem make multipleauthors start=04/06/04 upmc
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
17+
# SUMMARY : Downloading and compiling extra libraries for Umfpack
18+
# LICENSE : LGPLv3
19+
# ORG : LJLL Universite Pierre et Marie Curie, Paris, FRANCE
20+
# AUTHORS : ...
21+
# E-MAIL : ...
2322

2423
# see [[file:../../configure.ac::DOWNLOAD_UMFPACK]]
2524
all-local: $(DOWNLOAD_UMFPACK)

‎3rdparty/umfpack/Makefile.am-4.5.5

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
# Downloading and compiling extra libraries for Umfpack
2-
# ======================================================================
3-
# Laboratoire Jacques-Louis Lions
4-
# Université Pierre et Marie Curie-Paris6, UMR 7598, Paris, F-75005 France
5-
# ======================================================================
6-
# This file is part of Freefem++
7-
#
8-
# Freefem++ is free software; you can redistribute it and/or modify
9-
# it under the terms of the GNU Lesser General Public License as
10-
# published by the Free Software Foundation; either version 2.1 of
11-
# the License, or (at your option) any later version.
12-
#
13-
# Freefem++ is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU Lesser General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU Lesser General Public
19-
# License along with Freefem++; if not, write to the Free Software
20-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21-
# ======================================================================
22-
# headeralh brief="Downloading and compiling extra libraries for Umfpack" default=0 freefem make multipleauthors start=04/06/04 upmc
1+
############################################################################
2+
# This file is part of FreeFEM. #
3+
# #
4+
# FreeFEM is free software: you can redistribute it and/or modify #
5+
# it under the terms of the GNU Lesser General Public License as #
6+
# published by the Free Software Foundation, either version 3 of #
7+
# the License, or (at your option) any later version. #
8+
# #
9+
# FreeFEM is distributed in the hope that it will be useful, #
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
12+
# GNU Lesser General Public License for more details. #
13+
# #
14+
# You should have received a copy of the GNU Lesser General Public License #
15+
# along with FreeFEM. If not, see <http://www.gnu.org/licenses/>. #
16+
############################################################################
17+
# SUMMARY : Downloading and compiling extra libraries for Umfpack
18+
# LICENSE : LGPLv3
19+
# ORG : LJLL Universite Pierre et Marie Curie, Paris, FRANCE
20+
# AUTHORS : ...
21+
# E-MAIL : ...
2322

2423
# see [[file:../../configure.ac::DOWNLOAD_UMFPACK]]
2524
all-local: $(DOWNLOAD_UMFPACK)

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.0)
22

3-
project(FreeFem++ C CXX Fortran)
3+
project(FreeFEM C CXX Fortran)
44

55
set(FREEFEM_VERSION 4.0)
66

0 commit comments

Comments
 (0)