[SCM] FreeFem++ packaging branch, master, updated. debian/3.17-2-7-g6bc1554

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit 302ea31306d3ae1eb4287f0cad0b9a6ea3fb92fc
Merge: 30f6bd2ce29e84b3623e853bb92afb895279a805 9a955cfb2e1fcfd3894572c38fa0c5f4c0bab2ff
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Feb 4 23:07:33 2012 +0200

    Merge tag 'upstream/3.18'
    
    Upstream version 3.18

diff --combined examples++-load/all.edp
index 42fe198,0eb7813..d1fc57f
--- a/examples++-load/all.edp
+++ b/examples++-load/all.edp
@@@ -7,6 -7,18 +7,6 @@@ verbosity=verbosityy
  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 -35,17 +23,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 -55,18 +39,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 -79,10 +51,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 -103,54 +71,30 @@@ 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 -175,22 +119,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 -211,10 +143,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 -223,14 +151,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 -243,18 +163,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