[SCM] FreeFem++ packaging branch, master, updated. debian/3.18-1-4-g5e32d81
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sat Feb 18 13:55:43 UTC 2012
The following commit has been merged in the master branch:
commit 040f8d7ef0f55ba61b85451b743df967cd8c51eb
Merge: 2e88dbbb9d1cb51a46808d1538b95f8a23c09872 fc21fc948833b7b3ed7f0d853b668512d986ae6e
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Fri Feb 17 23:25:27 2012 +0200
Merge tag 'upstream/3.18.1'
Upstream version 3.18.1
Conflicts:
DOC/freefem++doc.pdf
diff --combined examples++-load/all.edp
index 42fe198,ef0d9f8..21cdbd8
--- a/examples++-load/all.edp
+++ b/examples++-load/all.edp
@@@ -1,4 -1,20 +1,20 @@@
NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;
+ cout << "--------- file : APk-AdaptEpsDeltaPk.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "APk-AdaptEpsDeltaPk.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : APk-ExplicitPkTest.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "APk-ExplicitPkTest.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : APk-FreeFemQA.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "APk-FreeFemQA.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : APk-MetricPk.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "APk-MetricPk.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : LapDG3.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "LapDG3.edp";};
@@@ -7,6 -23,18 +23,6 @@@
verbosity=verbosityy;
{ include "LapDG4.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapLNewSolver.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapLNewSolver.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapNewSolver.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapNewSolver.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapUmfpack64.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapUmfpack64.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : LaplaceP3.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "LaplaceP3.edp";};
@@@ -23,13 -51,17 +39,13 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "Leman-mesh.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : MetricKuate.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "MetricKuate.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : NSP2BRP0.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "NSP2BRP0.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : SuperLU.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : SuperLu.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
-{ include "SuperLU.edp";};
+{ include "SuperLu.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : VarIneq2.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
@@@ -39,6 -71,18 +55,6 @@@
verbosity=verbosityy;
{ include "bilapMorley.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : bmo.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "bmo.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : buildlayermesh.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "buildlayermesh.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : checkglumeshcube.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "checkglumeshcube.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : cmaes-VarIneq.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "cmaes-VarIneq.edp";};
@@@ -51,6 -95,10 +67,6 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "convect_dervieux.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convectchacon-3d.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "convectchacon-3d.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : convectchacon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "convectchacon.edp";};
@@@ -71,26 -119,54 +87,26 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "funcTemplate.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : glumesh3D.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "glumesh3D.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : gsl.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "gsl.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : ilut.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "ilut.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : isoline.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "isoline.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : lame-TD-NSS.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "lame-TD-NSS.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : lap-solvers.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "lap-solvers.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : lapack.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "lapack.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : layer.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "layer.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : load.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "load.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "meditddm.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : metis.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "metis.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : mshmet.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "mshmet.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : myType.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "myType.edp";};
@@@ -115,10 -191,22 +131,10 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "plot-fb-P4dc.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : plotfb.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "plotfb.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : ppm2rnm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "ppm2rnm.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : provadxw.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "provadxw.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : refinesphere.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "refinesphere.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : schwarz-nm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "schwarz-nm.edp";};
@@@ -139,6 -227,10 +155,6 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "test-ElementMixte.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P13ddc.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P13ddc.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : testFE-P3.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "testFE-P3.edp";};
@@@ -147,6 -239,14 +163,6 @@@
verbosity=verbosityy;
{ include "testFE-P3dc.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P4.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P4.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P4dc.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P4dc.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : testFE-PkEdge.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "testFE-PkEdge.edp";};
@@@ -159,6 -259,18 +175,6 @@@ verbosity=verbosityy
verbosity=verbosityy;
{ include "testFEMorley.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgencube.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgenholeregion.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgenholeregion.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgenholeregion_rugby.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgenholeregion_rugby.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : thresholdings.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "thresholdings.edp";};
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list