[SCM] FreeFem++ packaging branch, master, updated. debian/3.11-1-12-g59c9362
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Tue Jan 18 22:44:11 UTC 2011
The following commit has been merged in the master branch:
commit a07ac71253f7621918e522d73ff905bc41031941
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Jan 18 01:31:50 2011 +0200
Fix alioth git repository addresses in debian/control
diff --git a/.directory b/.directory
deleted file mode 100644
index 4f6bd2a..0000000
--- a/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Dolphin]
-Timestamp=2011,1,7,10,12,44
-
-[Settings]
-ShowDotFiles=true
diff --git a/debian/control b/debian/control
index e7c350d..cbc2413 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,13 @@ Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gfortran, gawk,
libxpm-dev, openmpi-bin, libfftw3-dev, libblas-dev,
libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick,
libfltk1.1-dev, freeglut3-dev, texlive, texlive-extra-utils,
- texlive-latex-extra, libtool, libglut3-dev, texlive-font-utils,
+ texlive-latex-extra, libglut3-dev, texlive-font-utils,
libmumps-dev, libsuperlu3-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
libscotch-dev, ghostscript, libptscotch-dev
Standards-Version: 3.9.1
Homepage: http://www.freefem.org/ff++/
-Vcs-Git: git://git.debian.org/debian-science/packages/freefem++.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freefem++.git
+Vcs-Git: git://git.debian.org/debian-science/packages/freefempp.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freefempp.git
Package: freefem++
Architecture: any
diff --git a/download/tetgen/tetgen1.4.2.patch b/download/tetgen/tetgen1.4.2.patch
new file mode 100644
index 0000000..a2dcf15
--- /dev/null
+++ b/download/tetgen/tetgen1.4.2.patch
@@ -0,0 +1,41 @@
+diff -ur tetgen1.4.2/tetgen.cxx tetgen1.4.2-okk/tetgen.cxx
+--- tetgen1.4.2/tetgen.cxx 2007-04-16 16:45:11.000000000 +0200
++++ tetgen1.4.2-okk/tetgen.cxx 2009-05-25 10:37:19.000000000 +0200
+@@ -3506,7 +3506,7 @@
+ // //
+ ///////////////////////////////////////////////////////////////////////////////
+
+-void tetgenmesh::set_compfunc(char* str, int* itbytes, compfunc* pcomp)
++void tetgenmesh::set_compfunc(const char* str, int* itbytes, compfunc* pcomp)
+ {
+ // First figure out whether it is a pointer or not.
+ if (str[strlen(str) - 1] == '*') {
+@@ -25978,6 +25978,7 @@
+ }
+ delete [] oldtetlist;
+ delete [] newtetlist;
++ delete [] newpt; // Add by J. Morice for FreeFem++ (missing delete) Nov 2008
+ // Clear work lists.
+ newsegshlist->clear();
+ spinshlist->clear();
+diff -ur tetgen1.4.2/tetgen.h tetgen1.4.2-okk/tetgen.h
+--- tetgen1.4.2/tetgen.h 2007-04-16 16:45:13.000000000 +0200
++++ tetgen1.4.2-okk/tetgen.h 2009-05-25 10:37:41.000000000 +0200
+@@ -980,7 +980,7 @@
+
+ // The function used to determine the size of primitive data types and
+ // set the corresponding predefined linear order functions for them.
+- static void set_compfunc(char* str, int* itembytes, compfunc* pcomp);
++ static void set_compfunc(const char* str, int* itembytes, compfunc* pcomp);
+
+ ///////////////////////////////////////////////////////////////////////////////
+ // //
+@@ -1021,7 +1021,7 @@
+ list(int itbytes, compfunc pcomp, int mitems = 256, int exsize = 128) {
+ listinit(itbytes, pcomp, mitems, exsize);
+ }
+- list(char* str, int mitems = 256, int exsize = 128) {
++ list(const char* str, int mitems = 256, int exsize = 128) {
+ set_compfunc(str, &itembytes, &comp);
+ listinit(itembytes, comp, mitems, exsize);
+ }
diff --git a/examples++-load/WHERE_LIBRARY-download-new b/examples++-load/WHERE_LIBRARY-download-new
deleted file mode 100644
index e69de29..0000000
diff --git a/examples++-load/makeref.edp b/examples++-load/makeref.edp
new file mode 100644
index 0000000..a7fd99b
--- /dev/null
+++ b/examples++-load/makeref.edp
@@ -0,0 +1,200 @@
+// Regression tests
+// ----------------
+
+// $Id$
+
+// Regression tests
+// ----------------
+
+// The tests are checked against reference values by "make check" in
+// each examples subdirectory
+
+// "ref.edp" contains all reference values and may be rebuilt with
+// "make Ref"
+
+// $Id$
+
+// The values tested here may not have a physical or mathematical
+// meaning. Their main property is to gather numerical values from the
+// whole domain, to be checked for consistency with previous runs.
+
+NoUseOfWait=true;
+int verbosityy=verbosity;
+
+
+
+
+ofstream ref("ref.edp");
+
+
+
+
+
+// The values tested here may not have a physical or mathematical
+// meaning. Their main property is to gather numerical values from the
+// whole domain, to be checked for consistency with previous runs.
+cout << "--------- file : load.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "load.edp";
+ real TESTload=uh[].max;
+ ref<<"real REFload="<<TESTload<<";"<<endl;
+};
+
+cout << "--------- file : testFE.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE.edp";
+
+};
+
+cout << "--------- file : testFEMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFEMorley.edp";
+
+};
+
+cout << "--------- file : funcTemplate.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "funcTemplate.edp";
+
+};
+
+cout << "--------- file : LapDG3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LapDG3.edp";
+
+};
+
+cout << "--------- file : LapDG4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LapDG4.edp";
+
+};
+
+cout << "--------- file : LaplaceP3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LaplaceP3.edp";
+
+};
+
+cout << "--------- file : LaplaceP4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LaplaceP4.edp";
+
+};
+
+cout << "--------- file : bilapMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "bilapMorley.edp";
+
+};
+
+cout << "--------- file : plot-fb-P3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P3.edp";
+
+};
+
+cout << "--------- file : plot-fb-P3dc.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P3dc.edp";
+
+};
+
+cout << "--------- file : plot-fb-P4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P4.edp";
+
+};
+
+cout << "--------- file : plot-fb-P4dc.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P4dc.edp";
+
+};
+
+cout << "--------- file : splitmesh3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "splitmesh3.edp";
+
+};
+
+cout << "--------- file : splitmesh6.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "splitmesh6.edp";
+
+};
+
+cout << "--------- file : testFE-PkEdge.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE-PkEdge.edp";
+
+};
+
+cout << "--------- file : testFE.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE.edp";
+
+};
+
+cout << "--------- file : testFEMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFEMorley.edp";
+
+};
+
+
+
diff --git a/examples++-load/regtests.edp b/examples++-load/regtests.edp
new file mode 100644
index 0000000..b0095de
--- /dev/null
+++ b/examples++-load/regtests.edp
@@ -0,0 +1,203 @@
+// Regression tests
+// ----------------
+
+// $Id$
+
+// Regression tests
+// ----------------
+
+// The tests are checked against reference values by "make check" in
+// each examples subdirectory
+
+// "ref.edp" contains all reference values and may be rebuilt with
+// "make Ref"
+
+// $Id$
+
+// The values tested here may not have a physical or mathematical
+// meaning. Their main property is to gather numerical values from the
+// whole domain, to be checked for consistency with previous runs.
+
+NoUseOfWait=true;
+int verbosityy=verbosity;
+
+
+
+
+include "ref.edp";
+
+
+
+
+
+// The values tested here may not have a physical or mathematical
+// meaning. Their main property is to gather numerical values from the
+// whole domain, to be checked for consistency with previous runs.
+cout << "--------- file : load.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "load.edp";
+ real TESTload=uh[].max;
+ cout<<"load reference value = "<<REFload
+ <<" test value ="<<TESTload<<endl;
+ assert(TESTload<REFload*(1+0.0001));
+ assert(TESTload>REFload*(1-0.0001));
+};
+
+cout << "--------- file : testFE.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE.edp";
+
+};
+
+cout << "--------- file : testFEMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFEMorley.edp";
+
+};
+
+cout << "--------- file : funcTemplate.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "funcTemplate.edp";
+
+};
+
+cout << "--------- file : LapDG3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LapDG3.edp";
+
+};
+
+cout << "--------- file : LapDG4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LapDG4.edp";
+
+};
+
+cout << "--------- file : LaplaceP3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LaplaceP3.edp";
+
+};
+
+cout << "--------- file : LaplaceP4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "LaplaceP4.edp";
+
+};
+
+cout << "--------- file : bilapMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "bilapMorley.edp";
+
+};
+
+cout << "--------- file : plot-fb-P3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P3.edp";
+
+};
+
+cout << "--------- file : plot-fb-P3dc.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P3dc.edp";
+
+};
+
+cout << "--------- file : plot-fb-P4.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P4.edp";
+
+};
+
+cout << "--------- file : plot-fb-P4dc.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "plot-fb-P4dc.edp";
+
+};
+
+cout << "--------- file : splitmesh3.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "splitmesh3.edp";
+
+};
+
+cout << "--------- file : splitmesh6.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "splitmesh6.edp";
+
+};
+
+cout << "--------- file : testFE-PkEdge.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE-PkEdge.edp";
+
+};
+
+cout << "--------- file : testFE.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFE.edp";
+
+};
+
+cout << "--------- file : testFEMorley.edp -----------------" << endl;
+verbosity=verbosityy;
+{
+
+
+ include "testFEMorley.edp";
+
+};
+
+
+
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list