[freefempp] 02/05: Merge tag 'upstream/3.31-2'
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Mon Jul 21 17:59:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit a058ef98268807be010fc7ed616ea1cfd50302e0
Merge: a56793d ea45398
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Jul 21 14:13:56 2014 +0300
Merge tag 'upstream/3.31-2'
Upstream version 3.31-2
Conflicts:
configure
download/arpack/Makefile
examples++-3d/Makefile.in
examples++-3d/all.edp
examples++-eigen/._BeamEigenValue.edp
examples++-eigen/._free-cyl-axi.edp
examples++-eigen/Makefile.in
examples++-load/._bfstream.cpp
examples++-load/._lapack.cpp
examples++-load/Makefile.in
examples++/Makefile.in
src/Graphics/._ffglut.cpp
src/fflib/strversionnumber.cpp
BUGS | 14 +-
DOC/freefem++doc.pdf | Bin 9534128 -> 9573635 bytes
HISTORY | 28446 ++++++++++---------
INNOVATION | 91 +-
configure | 19434 +++++++++++++
configure.ac | 4 +-
download/arpack/Makefile | 631 +-
download/arpack/Makefile.am | 7 +
download/arpack/{Makefile => Makefile.orig} | 11 +
download/getall | 103 +-
.../._MeshSurface.idp | Bin
examples++-3d/Makefile.am | 2 +-
examples++-3d/Makefile.in | 1175 +
examples++-3d/MeshSurface.idp | 33 +-
examples++-3d/all.edp | 112 +-
examples++-3d/{all.edp => all.edp.orig} | 8 +
examples++-3d/fallingspheres.edp | 2 +-
examples++-3d/intlevelset3d.edp | 88 +
examples++-3d/tetgencube.edp | 2 +-
.../._BeamEigenValue.edp | Bin
.../._BeamEigenValue.edp.orig | Bin
.../._free-cyl-axi.edp | Bin
.../._free-cyl-axi.edp.orig | Bin
examples++-eigen/BeamEigenValue.edp | 2 +-
examples++-eigen/LapEigenValueFunc.edp | 70 +
examples++-eigen/Makefile.am | 5 +-
examples++-eigen/Makefile.in | 995 +
examples++-eigen/free-cyl-axi.edp | 89 +
examples++-load/._bfstream.cpp | Bin 0 -> 171 bytes
examples++-load/._bfstream.cpp.orig | Bin 0 -> 171 bytes
.../._bilapP3-hct-like.edp | Bin
examples++-load/._lapack.cpp | Bin 0 -> 171 bytes
examples++-load/._lapack.cpp.orig | Bin 0 -> 171 bytes
examples++-load/._msh3.hpp | Bin 0 -> 171 bytes
examples++-load/BEC.cpp | 34 +
examples++-load/IpOptMinSurf.edp | 2 +-
examples++-load/Makefile.am | 7 +-
examples++-load/Makefile.in | 1763 ++
examples++-load/PARDISO.cpp | 6 +-
examples++-load/bfstream.cpp | 85 +
examples++-load/bfstream.edp | 24 +
examples++-load/bilapMorley.edp | 7 +
examples++-load/bilapP3-hct-like.edp | 44 +
examples++-load/checkglumeshcube.edp | 6 +-
examples++-load/ff-Ipopt.cpp | 2542 +-
examples++-load/gsl.edp | 3 +-
examples++-load/msh3.cpp | 485 +-
examples++-load/msh3.hpp | 4 +-
examples++-load/tetgencube.edp | 9 +-
.../._DDM-NSUzawaCahouetChabart.edp | Bin
.../._DDM-Schwarz-macro.idp | Bin
examples++-mpi/._hips_FreeFem.cpp | Bin 0 -> 171 bytes
examples++-mpi/DDM-NSUzawaCahouetChabart.edp | 120 +
examples++-mpi/DDM-Schwarz-macro.idp | 12 +-
examples++-mpi/hips_FreeFem.cpp | 20 +-
examples++-tutorial/algo.edp | 59 +-
examples++-tutorial/intlevelset.edp | 17 +-
examples++-tutorial/readmesh.edp | 4 +-
.../._intlevelset.edp => examples++/._NSP1P2.edp | Bin
examples++/Makefile.am | 4 +-
examples++/Makefile.in | 1070 +
src/Eigen/eigenvalue.cpp | 284 +-
src/Graphics/._ffglut.cpp | Bin 0 -> 167 bytes
src/Graphics/._ffglut.cpp.orig | Bin 0 -> 167 bytes
src/Graphics/._getprog-unix.hpp | Bin 0 -> 171 bytes
src/Graphics/ffglut.cpp | 3 +-
src/Graphics/getprog-unix.hpp | 25 +-
src/bamglib/Mesh2.cpp | 16 +-
src/femlib/._CGNL.hpp | Bin 0 -> 171 bytes
src/femlib/._R1.hpp | Bin 0 -> 171 bytes
src/femlib/._R2.hpp | Bin 0 -> 171 bytes
src/femlib/._R3.hpp | Bin 0 -> 171 bytes
src/femlib/._gmres.hpp | Bin 0 -> 171 bytes
src/femlib/BamgFreeFem.cpp | 2 +-
src/femlib/CGNL.hpp | 7 +-
src/femlib/CheckPtr.cpp | 3 +-
src/femlib/MatriceCreuse.hpp | 42 +-
src/femlib/MatriceCreuse_tpl.hpp | 31 +-
src/femlib/QuadratureFormular.hpp | 48 +-
src/femlib/R1.hpp | 8 +-
src/femlib/R2.hpp | 7 +-
src/femlib/R3.hpp | 6 +
src/femlib/gmres.hpp | 17 +-
src/fflib/._lgsolver.hpp | Bin 0 -> 171 bytes
src/fflib/AFunction.cpp | 15 +-
src/fflib/AFunction.hpp | 30 +-
src/fflib/Operator.hpp | 7 +-
src/fflib/P1IsoValue.cpp | 230 +-
src/fflib/P1IsoValue.hpp | 3 +
src/fflib/glumesh2D.cpp | 2 +-
src/fflib/lgfem.cpp | 200 +-
src/fflib/lgmesh.cpp | 2 +-
src/fflib/lgsolver.hpp | 2 +-
src/fflib/problem.cpp | 485 +-
src/fflib/strversionnumber.cpp | 4 +-
src/lglib/lg.tab.cpp | 397 +-
src/lglib/lg.tab.hpp | 2 +-
src/lglib/lg.ypp | 3 +-
src/medit/._keyboard.c | Bin 0 -> 171 bytes
src/medit/._mouse.c | Bin 0 -> 171 bytes
src/medit/._sproto.h | Bin 0 -> 171 bytes
src/medit/keyboard.c | 9 +-
src/medit/mouse.c | 10 +-
src/medit/sproto.h | 1 +
104 files changed, 44199 insertions(+), 15353 deletions(-)
diff --cc download/arpack/Makefile.orig
index 83d98c6,44a38a5..d119821
--- a/download/arpack/Makefile.orig
+++ b/download/arpack/Makefile.orig
@@@ -648,7 -620,8 +648,12 @@@ reinstall::instal
compilepkg::$(ARPACKLIB)
$(ARPACKLIB): ARPACK/fait
++<<<<<<< HEAD:download/arpack/Makefile
+ if [ -n '' ] ; then \
++=======
+ case '$(BLASLIBS)' in *vecLib*|*Accelerate*) $(F77) -c $(FFLAGS) veclib_zdotc.f -o ARPACK/SRC/veclib_zdotc.o ;; esac;
+ if [ -n '@FF_LAPACKdir@' ] ; then \
++>>>>>>> upstream/3.31-2:download/arpack/Makefile.in
$(F77) -c `echo $(FFLAGS)\ |sed -e s/-O.\*\ // ` ARPACK/LAPACK/dlamch.f -o ARPACK/LAPACK/dlamch.o; \
fi; \
cd ARPACK && make lib
diff --cc examples++-3d/all.edp.orig
index 2ecb21c,0000000..b1d9115
mode 100644,000000..100644
--- a/examples++-3d/all.edp.orig
+++ b/examples++-3d/all.edp.orig
@@@ -1,137 -1,0 +1,145 @@@
+NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();
+ cout << "--------- file : 3d-Leman.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "3d-Leman.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : ArrayFE-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "ArrayFE-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "beam-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "cone.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "convect-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "cube-period.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "cylinder-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "cylinder.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "EqPoisson.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "fallingspheres.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : first.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "first.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Lac.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Laplace3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Laplace-Adapt-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Laplace-Adapt-aniso-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "LaplaceRT-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "meditddm.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "NSI3d-carac.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "NSI3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "p.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "periodic-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Period-Poisson-cube-ballon.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++<<<<<<< HEAD
+ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
++=======
++ cout << "--------- file : intlevelset3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "intlevelset3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
++>>>>>>> upstream/3.31-2
+verbosity=verbosityy;searchMethod=0;
+{ include "Poisson3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Poisson-cube-ballon.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Poisson.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "pyramide.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : refinesphere.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "refinesphere.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : schwarz-nm-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "schwarz-nm-3d.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : sphere2.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "sphere2.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : sphere6.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "sphere6.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Stokes.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "tetgencube.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : tetgenholeregion.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "tetgenholeregion.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "TruncLac.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
diff --cc examples++-eigen/._BeamEigenValue.edp.orig
index f7a8f68,f7a8f68..f7a8f68
Binary files differ
diff --cc examples++-eigen/._free-cyl-axi.edp.orig
index f7a8f68,f7a8f68..f7a8f68
Binary files differ
diff --cc examples++-load/._bfstream.cpp.orig
index 0000000,14f037e..14f037e
mode 000000,100644..100644
Binary files differ
diff --cc examples++-load/._lapack.cpp.orig
index 0000000,14f037e..14f037e
mode 000000,100644..100644
Binary files differ
diff --cc src/Graphics/._ffglut.cpp.orig
index 0000000,63e1130..63e1130
mode 000000,100644..100644
Binary files differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list