From 3f259e9ac7b80757175e8d33f3415c7bd0d219ca Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Thu, 26 Jul 2001 18:48:00 +0000
Subject: [PATCH] *** empty log message ***

---
 Adapt/Makefile             |  16 +--
 Common/DefaultOptions.h    |   4 +-
 Common/Makefile            |  30 +-----
 Common/Options.cpp         |  18 +++-
 Common/Options.h           |   1 +
 Common/Views.cpp           |   3 +-
 Common/Views.h             |   6 +-
 DataStr/Makefile           |   7 +-
 Fltk/Callbacks.cpp         |  10 +-
 Fltk/GUI.cpp               |  19 +++-
 Fltk/Makefile              |  68 +------------
 Geo/Makefile               |  51 +---------
 Graphics/Makefile          |  96 +----------------
 Graphics/Post.cpp          |  22 +++-
 Graphics/PostSimplex.cpp   |  85 ++++++++++++----
 Makefile                   |   4 +-
 Mesh/3D_Extrude.cpp        |  20 +++-
 Mesh/Makefile              | 204 +------------------------------------
 Mesh/Simplex.cpp           |   4 +-
 Motif/Makefile             | 116 +--------------------
 Parser/FunctionManager.cpp |   4 +-
 Parser/Gmsh.tab.cpp        |   2 +-
 Parser/Gmsh.yy.cpp         |   4 +-
 Parser/Makefile            |  26 +----
 Plugin/Makefile            |  14 +--
 Plugin/PluginManager.h     |   5 +-
 jpeg/Makefile              |  42 +-------
 27 files changed, 183 insertions(+), 698 deletions(-)

diff --git a/Adapt/Makefile b/Adapt/Makefile
index 809a64b577..0699d84b99 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.15 2001-04-23 10:38:06 geuzaine Exp $
+# $Id: Makefile,v 1.16 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libAdapt.a"
 #
@@ -58,17 +58,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Adapt.o: Adapt.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Adapt.h nrutil.h \
- ../Common/Const.h
-mnbrak.o: mnbrak.cpp nrutil.h ../Common/Const.h
-brent.o: brent.cpp nrutil.h ../Common/Const.h
-nrutil.o: nrutil.cpp
-dsvdcmp.o: dsvdcmp.cpp nrutil.h ../Common/Const.h
-newt.o: newt.cpp nrutil.h ../Common/Const.h
-fmin.o: fmin.cpp nrutil.h ../Common/Const.h
-fdjac.o: fdjac.cpp nrutil.h ../Common/Const.h
-lnsrch.o: lnsrch.cpp nrutil.h ../Common/Const.h
-lubksb.o: lubksb.cpp
-ludcmp.o: ludcmp.cpp nrutil.h ../Common/Const.h
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index badcf9756a..185f59d528 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -447,6 +447,8 @@ StringXNumber ViewOptions_Number[] = {
     "Is the view visible?" },
   { F|O, "IntervalsType" , opt_view_intervals_type , DRAW_POST_ISO ,
     "Type of interval display (1=iso, 2=discrete, 3=continuous, 4=numeric)" },
+  { F|O, "SaturateValues" , opt_view_saturate_values , 0 ,
+    "Saturate the view values to custom min and max (1=true, 0=false)" },
   { F|O, "NbIso" , opt_view_nb_iso , 15. ,
     "Number of intervals" },
   { F|O, "Boundary" , opt_view_boundary , 0 ,
@@ -476,7 +478,7 @@ StringXNumber ViewOptions_Number[] = {
   { F|O, "TransparentScale" , opt_view_transparent_scale , 1. ,
     "Display a 'transparent' value scale?" },
   { F|O, "ScaleType" , opt_view_scale_type , DRAW_POST_LINEAR ,
-    "Value scale type (1=linear, 2=logarithmic)" },
+    "Value scale type (1=linear, 2=logarithmic, 3=double logarithmic)" },
   { F|O, "RangeType" , opt_view_range_type , DRAW_POST_DEFAULT ,
     "Value scale range type (1=default, 2=custom)" },
   { F|O, "ArrowType" , opt_view_arrow_type , DRAW_POST_ARROW ,
diff --git a/Common/Makefile b/Common/Makefile
index b929ed7150..7882f70470 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2001-05-11 09:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.21 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libCommon.a"
 #
@@ -62,31 +62,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Context.h \
- Options.h DefaultOptions.h trackball.c trackball.h
-Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h Views.h Const.h ColorTable.h Context.h Options.h
-Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Context.h \
- Const.h Options.h ../Fltk/Solvers.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h
-GetOptions.o: GetOptions.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h GmshUI.h GmshVersion.h Const.h Context.h Options.h \
- ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Views.h \
- ColorTable.h ../Parser/OpenFile.h ../Common/Const.h
-Timer.o: Timer.cpp
-ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h ColorTable.h Context.h Const.h
diff --git a/Common/Options.cpp b/Common/Options.cpp
index b00dfccdc0..2fa37877de 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.32 2001-07-17 07:00:37 geuzaine Exp $
+// $Id: Options.cpp,v 1.33 2001-07-26 18:47:59 remacle Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -1729,6 +1729,21 @@ double opt_view_intervals_type(OPT_ARGS_NUM){
 #endif
   return v->IntervalsType;
 }
+
+double opt_view_saturate_values(OPT_ARGS_NUM){
+  GET_VIEW(0.) ;
+  if(action & GMSH_SET){
+    v->SaturateValues = (int)val;
+    v->Changed = 1;
+  }
+#ifdef _FLTK
+  if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
+    WID->view_butt[25]->value(v->SaturateValues);
+  }
+#endif
+  return v->SaturateValues;
+}
+
 double opt_view_nb_iso(OPT_ARGS_NUM){
   GET_VIEW(0.) ;
   if(action & GMSH_SET){
@@ -1905,6 +1920,7 @@ double opt_view_scale_type(OPT_ARGS_NUM){
   if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
     WID->view_butt[1]->value(v->ScaleType==DRAW_POST_LINEAR);
     WID->view_butt[2]->value(v->ScaleType==DRAW_POST_LOGARITHMIC);
+    WID->view_butt[26]->value(v->ScaleType==DRAW_POST_DOUBLELOGARITHMIC);
   }
 #endif
   return v->ScaleType;
diff --git a/Common/Options.h b/Common/Options.h
index 975b5b6013..5ece8dc31c 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -205,6 +205,7 @@ double opt_view_raise2(OPT_ARGS_NUM);
 double opt_view_arrow_scale(OPT_ARGS_NUM);
 double opt_view_visible(OPT_ARGS_NUM);
 double opt_view_intervals_type(OPT_ARGS_NUM);
+double opt_view_saturate_values(OPT_ARGS_NUM);
 double opt_view_nb_iso(OPT_ARGS_NUM);
 double opt_view_boundary(OPT_ARGS_NUM);
 double opt_view_light(OPT_ARGS_NUM);
diff --git a/Common/Views.cpp b/Common/Views.cpp
index c147f69f9a..aeb78a7ae0 100644
--- a/Common/Views.cpp
+++ b/Common/Views.cpp
@@ -1,4 +1,4 @@
-// $Id: Views.cpp,v 1.40 2001-06-27 13:35:33 geuzaine Exp $
+// $Id: Views.cpp,v 1.41 2001-07-26 18:47:59 remacle Exp $
 
 #include <set>
 #include "Gmsh.h"
@@ -405,6 +405,7 @@ void CopyViewOptions(Post_View *src, Post_View *dest){
   dest->ArrowScale = src->ArrowScale;
   dest->Visible = src->Visible;
   dest->IntervalsType = src->IntervalsType;
+  dest->SaturateValues = src->SaturateValues;
   dest->Boundary = src->Boundary ;
   dest->NbIso = src->NbIso;
   dest->Light = src->Light ;
diff --git a/Common/Views.h b/Common/Views.h
index 290b4133fe..895113ae96 100644
--- a/Common/Views.h
+++ b/Common/Views.h
@@ -31,6 +31,7 @@ class Post_View{
   double CustomMin, CustomMax;
   double Offset[3], Raise[3], ArrowScale;
   int Visible, IntervalsType, NbIso, Light ;
+  int SaturateValues;
   int ShowElement, ShowTime, ShowScale;
   int TransparentScale, ScaleType, RangeType;
   int ArrowType, ArrowLocation;
@@ -88,8 +89,9 @@ extern int        Post_ViewForceNumber, Post_ViewComputeBBox;
 #define DRAW_POST_CUSTOM  2
 
 // ScaleType
-#define DRAW_POST_LINEAR       1
-#define DRAW_POST_LOGARITHMIC  2
+#define DRAW_POST_LINEAR             1
+#define DRAW_POST_LOGARITHMIC        2
+#define DRAW_POST_DOUBLELOGARITHMIC  3 // for vorticity e.g.
 
 // Public functions
 
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 0fbf31178e..ce8551ee7e 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2001-02-09 14:51:31 geuzaine Exp $
+# $Id: Makefile,v 1.6 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libDataStr.a"
 #
@@ -52,8 +52,3 @@ depend:
 
 
 # DO NOT DELETE THIS LINE
-List.o: List.cpp Malloc.h List.h ../Common/Message.h
-Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h
-Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h
-avl.o: avl.cpp avl.h Malloc.h
-Tools.o: Tools.cpp Tools.h List.h Tree.h avl.h
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 0e33f58956..7f4de020d2 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.64 2001-07-18 07:36:36 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.65 2001-07-26 18:47:59 remacle Exp $
 
 #include <sys/types.h>
 #include <signal.h>
@@ -21,6 +21,8 @@
 #include "Callbacks.h"
 #include "Plugin.h"
 
+using namespace std;
+
 #include <FL/fl_file_chooser.H>
 #include <errno.h>
 
@@ -1654,7 +1656,11 @@ void view_options_ok_cb(CALLBACK_ARGS){
 			  DRAW_POST_DEFAULT);
       opt_view_scale_type(i, GMSH_SET, 
 			  WID->view_butt[1]->value()?DRAW_POST_LINEAR:
-			  DRAW_POST_LOGARITHMIC);
+			  WID->view_butt[2]->value()?DRAW_POST_LOGARITHMIC:
+			  DRAW_POST_DOUBLELOGARITHMIC);
+      opt_view_saturate_values(i, GMSH_SET, 
+			       WID->view_butt[25]->value());
+      
       opt_view_intervals_type(i, GMSH_SET, 
 			      WID->view_butt[3]->value()?DRAW_POST_ISO:
 			      WID->view_butt[4]->value()?DRAW_POST_DISCRETE:
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 6a06e9015a..fd67037a9f 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.90 2001-07-26 10:01:31 geuzaine Exp $
+// $Id: GUI.cpp,v 1.91 2001-07-26 18:47:59 remacle Exp $
 
 // To make the interface as visually consistent as possible, please:
 // - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -541,6 +541,7 @@ void GUI::wait(){
 
 //********************************* Create the menu window *****************************
 
+
 void GUI::add_post_plugins ( Fl_Menu_Button *button , int iView)
 {
   char name[256],menuname[256];
@@ -1685,7 +1686,7 @@ void GUI::set_statistics(){
 /*
    A plugin has n options, we also show infos about
    the plugin on the top of the window
- */
+*/
 
 PluginDialogBox * GUI::create_plugin_window(GMSH_Plugin *p, int iView)
 {
@@ -1944,11 +1945,25 @@ void GUI::create_view_options_window(int num){
 	}
 	view_butt[1] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Linear");
 	view_butt[2] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Logarithmic");
+
 	for(i=1 ; i<3 ; i++){
 	  view_butt[i]->type(FL_RADIO_BUTTON);
 	  view_butt[i]->labelsize(CTX.fontsize);
 	  view_butt[i]->selection_color(FL_YELLOW);
 	}
+	/// ADD JF - DOUBLE LOG SCALE
+	/// ADD JF - POSSIBILITY OF SATURATING VALUES
+	view_butt[26] = new Fl_Check_Button(2*WB, 2*WB+6*BH, BW, BH, "Double Logarithmic");
+	view_butt[26]->type(FL_RADIO_BUTTON);
+	view_butt[26]->labelsize(CTX.fontsize);
+	view_butt[26]->selection_color(FL_YELLOW);
+
+        view_butt[25] = new Fl_Check_Button(2*WB, 2*WB+7*BH, BW, BH, "Saturate Values");
+	view_butt[25]->type(FL_TOGGLE_BUTTON);
+	view_butt[25]->down_box(FL_DOWN_BOX);
+	view_butt[25]->labelsize(CTX.fontsize);
+	view_butt[25]->selection_color(FL_YELLOW);
+
 	o->end();
       }
       // Intervals
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 3ef2cfbecc..ed51945d64 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2001-05-22 11:34:06 geuzaine Exp $
+# $Id: Makefile,v 1.20 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libFltk.a"
 #
@@ -63,69 +63,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h \
- ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Context.h ../Common/Options.h \
- ../Parser/Parser.h ../Common/Static.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Parser/OpenFile.h ../Common/GetOptions.h
-Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
- ../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Common/ColorTable.h
-GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Common/Gmsh.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
- ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h GUI.h \
- Opengl_Window.h Colorbar_Window.h Callbacks.h ../Common/Bitmaps.h \
- ../Common/Icon.h ../Common/GetOptions.h
-Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Timer.h ../Geo/Visibility.h \
- ../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/GetOptions.h \
- ../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
- Colorbar_Window.h Callbacks.h ../Plugin/Plugin.h Solvers.h
-Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Graphics/gl2ps.h
-Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/Context.h ../Common/Const.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h
-Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Common/ColorTable.h ../Common/Context.h ../Common/Const.h
-Socket.o: Socket.cpp ../Common/Message.h
-Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Socket.h ../Parser/OpenFile.h \
- ../Common/Const.h Solvers.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Common/ColorTable.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Context.h
diff --git a/Geo/Makefile b/Geo/Makefile
index 29bda212ed..b0d35f144c 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2001-04-23 10:38:11 geuzaine Exp $
+# $Id: Makefile,v 1.18 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libGeo.a"
 #
@@ -57,52 +57,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h \
- ../Mesh/Interpolation.h ../Mesh/Numeric.h ../Common/Const.h \
- ../Mesh/Create.h CAD.h ../Common/Context.h
-DataBase.o: DataBase.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h CAD.h ../Mesh/Create.h \
- Verif.h ../Common/Context.h
-MinMax.o: MinMax.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
- ../Mesh/Vertex.h ../Common/Context.h
-ExtrudeParams.o: ExtrudeParams.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ExtrudeParams.h
-Geo.o: Geo.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Geo.h CAD.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h ../Parser/Parser.h \
- ../Common/Context.h
-StepGeomDatabase.o: StepGeomDatabase.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h Geo.h StepGeomDatabase.h DataBase.h \
- ../Common/Context.h
-Verif.o: Verif.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h
-Visibility.o: Visibility.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h
-Print_Geo.o: Print_Geo.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h CAD.h ../Common/Context.h \
- ../Common/Const.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index ee089ef027..2c754d8022 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 2001-05-11 09:13:16 geuzaine Exp $
+# $Id: Makefile,v 1.24 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libGraphics.a"
 #
@@ -70,97 +70,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
- ../Geo/MinMax.h
-Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
- ../Geo/MinMax.h gl2ps.h ../Geo/Verif.h ../Mesh/Numeric.h \
- ../Geo/Visibility.h
-Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
- ../Geo/Verif.h ../Mesh/Interpolation.h ../Mesh/Numeric.h \
- ../Geo/Visibility.h ../Mesh/STL.h
-Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
-PostSimplex.o: PostSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h Iso.h IsoSimplex.h \
- ../Common/Context.h
-Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Mesh/Numeric.h
-IsoSimplex.o: IsoSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h Iso.h ../Common/Context.h \
- ../Mesh/Numeric.h
-Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
-Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
- ../Motif/XContext.h
-Axes.o: Axes.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h
-CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Parser/OpenFile.h \
- ../Common/Const.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/Context.h ../Motif/Widgets.h ../Motif/XContext.h XDump.h \
- gl2ps.h gl2gif.h gl2jpeg.h gl2ppm.h gl2yuv.h
-XDump.o: XDump.cpp
-gl2ps.o: gl2ps.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2ps.h
-gl2gif.o: gl2gif.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2gif.h
-gl2jpeg.o: gl2jpeg.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../jpeg/jpeglib.h ../jpeg/jconfig.h ../jpeg/jmorecfg.h \
- ../jpeg/jerror.h
-gl2ppm.o: gl2ppm.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
-gl2yuv.o: gl2yuv.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index f0b9d6e8cd..0c11832ab2 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.16 2001-06-28 17:42:08 geuzaine Exp $
+// $Id: Post.cpp,v 1.17 2001-07-26 18:47:59 remacle Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -29,6 +29,16 @@ double GiveValueFromIndex_Log(double ValMin, double ValMax, int NbIso, int Iso){
   return pow(10.,log10(ValMin)+Iso*(log10(ValMax)-log10(ValMin))/(NbIso-1.)) ;
 }
 
+double GiveValueFromIndex_DoubleLog(double ValMin, double ValMax, int NbIso, int Iso){
+  if(NbIso==1) return (ValMax+ValMin)/2.;
+  if(ValMin <= 0.) return 0. ;
+
+  double Iso2 = Iso/2;
+  double NbIso2 = NbIso/2;
+
+  return pow(10.,log10(ValMin)+Iso2*(log10(ValMax)-log10(ValMin))/(NbIso2-1.)) ;
+
+}
 
 /* ------------------------------------------------------------------------
     Give Index From Value
@@ -45,6 +55,12 @@ int GiveIndexFromValue_Log(double ValMin, double ValMax, int NbIso, double Val){
   return (int)((log10(Val)-log10(ValMin))*(NbIso-1)/(log10(ValMax)-log10(ValMin))) ;
 }
 
+int GiveIndexFromValue_DoubleLog(double ValMin, double ValMax, int NbIso, double Val){
+  if(ValMin==ValMax) return NbIso/2 ;  
+  if(ValMin <= 0.) return 0 ;
+  return (int)((log10(Val)-log10(ValMin))*(NbIso-1)/(log10(ValMax)-log10(ValMin))) ;
+}
+
 
 /* ------------------------------------------------------------------------
     Color Palette
@@ -179,6 +195,10 @@ void Draw_Post (void) {
         case DRAW_POST_LOGARITHMIC : 
           v->GIFV = GiveIndexFromValue_Log ;
           v->GVFI = GiveValueFromIndex_Log ;
+	  break;
+        case DRAW_POST_DOUBLELOGARITHMIC : 
+          v->GIFV = GiveIndexFromValue_DoubleLog ;
+          v->GVFI = GiveValueFromIndex_DoubleLog ;
           break;
         }
         
diff --git a/Graphics/PostSimplex.cpp b/Graphics/PostSimplex.cpp
index 7f4d514af5..c5b0863013 100644
--- a/Graphics/PostSimplex.cpp
+++ b/Graphics/PostSimplex.cpp
@@ -1,4 +1,4 @@
-// $Id: PostSimplex.cpp,v 1.17 2001-06-26 16:47:23 geuzaine Exp $
+// $Id: PostSimplex.cpp,v 1.18 2001-07-26 18:47:59 remacle Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -132,11 +132,36 @@ void Draw_ScalarTriangle(Post_View *View,
   int     i, k, nb=0;
   double  d;
   double  x1x0, y1y0, z1z0, x2x0, y2y0, z2z0, nn[3];
-  double  Xp[5],Yp[5],Zp[5],value[5],thev;
+  double  Xp[5],Yp[5],Zp[5],Val[3],value[5],thev;
   char    Num[100] ;
 
+  /** JF 
+     Saturation of values 
+  */
+  {
+    double *vv = &V[3*View->TimeStep];
+    if(View->SaturateValues)
+      {
+	for(i=0;i<3;i++)
+	  {
+	    
+	    if(vv[i] > ValMax) Val[i] = ValMax;
+	    else if(vv[i] < ValMin) Val[i] = ValMin;
+	    else Val[i] = vv[i];
+	  }
+      }
+    else
+      {
+	for(i=0;i<3;i++)
+	  {	      
+	    Val[i] = vv[i];
+	  }
+      }
+  }
+  /** - END JF - **/
+
   for(k=0 ; k<3 ; k++)
-    RaiseFill(k, V[3*View->TimeStep+k], ValMin, Raise);
+    RaiseFill(k, Val[k], ValMin, Raise);
 
   if(View->Light){
     x1x0 = (X[1]+Raise[0][1]) - (X[0]+Raise[0][0]); 
@@ -163,7 +188,7 @@ void Draw_ScalarTriangle(Post_View *View,
 
   if(View->IntervalsType == DRAW_POST_NUMERIC){
 
-    d = (V[3*View->TimeStep]+V[3*View->TimeStep+1]+V[3*View->TimeStep+2]) / 3.;
+    d = (Val[0]+Val[1]+Val[2]) / 3.;
     if(d >= ValMin && d <= ValMax){
       Palette2(View,ValMin,ValMax,d);
       sprintf(Num, View->Format, d);
@@ -180,26 +205,26 @@ void Draw_ScalarTriangle(Post_View *View,
   else{
     
     if(View->IntervalsType == DRAW_POST_CONTINUOUS){
-      if(V[3*View->TimeStep]  >=ValMin && V[3*View->TimeStep]  <=ValMax &&
-         V[3*View->TimeStep+1]>=ValMin && V[3*View->TimeStep+1]<=ValMax &&
-         V[3*View->TimeStep+2]>=ValMin && V[3*View->TimeStep+2]<=ValMax){
+      if(Val[0]  >=ValMin && Val[0]  <=ValMax &&
+         Val[1]>=ValMin && Val[1]<=ValMax &&
+         Val[2]>=ValMin && Val[2]<=ValMax){
         glBegin(GL_TRIANGLES);
-	Palette2(View,ValMin,ValMax,V[3*View->TimeStep]);
+	Palette2(View,ValMin,ValMax,Val[0]);
         glVertex3d(X[0]+View->Offset[0]+Raise[0][0],
                    Y[0]+View->Offset[1]+Raise[1][0],
                    Z[0]+View->Offset[2]+Raise[2][0]);
-	Palette2(View,ValMin,ValMax,V[3*View->TimeStep+1]);
+	Palette2(View,ValMin,ValMax,Val[1]);
         glVertex3d(X[1]+View->Offset[0]+Raise[0][1],
                    Y[1]+View->Offset[1]+Raise[1][1],
                    Z[1]+View->Offset[2]+Raise[2][1]);
-	Palette2(View,ValMin,ValMax,V[3*View->TimeStep+2]);
+	Palette2(View,ValMin,ValMax,Val[2]);
         glVertex3d(X[2]+View->Offset[0]+Raise[0][2],
                    Y[2]+View->Offset[1]+Raise[1][2],
                    Z[2]+View->Offset[2]+Raise[2][2]);
         glEnd();
       }
       else{
-        CutTriangle2D(X,Y,Z,&V[3*View->TimeStep],
+        CutTriangle2D(X,Y,Z,Val,
                       ValMin,ValMax,ValMin,ValMax,
                       Xp,Yp,Zp,&nb,value);
         if(nb >= 3){      
@@ -219,7 +244,7 @@ void Draw_ScalarTriangle(Post_View *View,
       for(k=0 ; k<View->NbIso ; k++){
         if(View->IntervalsType == DRAW_POST_DISCRETE){
           Palette(View,View->NbIso,k);
-          CutTriangle2D(X,Y,Z,&V[3*View->TimeStep],
+          CutTriangle2D(X,Y,Z,Val,
                         View->GVFI(ValMin,ValMax,View->NbIso+1,k),
                         View->GVFI(ValMin,ValMax,View->NbIso+1,k+1),
                         ValMin,ValMax,
@@ -232,7 +257,7 @@ void Draw_ScalarTriangle(Post_View *View,
         else{
           Palette(View,View->NbIso,k);
           thev = View->GVFI(ValMin,ValMax,View->NbIso,k);
-          CutTriangle1D(X,Y,Z,&V[3*View->TimeStep],
+          CutTriangle1D(X,Y,Z,Val,
                         thev, ValMin,ValMax,Xp,Yp,Zp,&nb);        
           if(nb == 2){
             for(i=0 ; i<2 ; i++) RaiseFill(i,thev,ValMin,Raise);
@@ -256,9 +281,10 @@ void Draw_ScalarTetrahedron(Post_View *View,
 			    double *Z, 
 			    double *V){
 
-  int     k;
+  int     k,i;
   double  d, xx[4], yy[4], zz[4], vv[4];
   char Num[100];
+  double Val[4];
 
   if(View->Boundary == 2){
     // boundary == 0 should draw the tet
@@ -279,6 +305,32 @@ void Draw_ScalarTetrahedron(Post_View *View,
     return;
   }
 
+  /** JF 
+     Saturation of values 
+  */
+  {
+    double *vv = &V[4*View->TimeStep];
+    if(View->SaturateValues)
+      {
+	for(i=0;i<4;i++)
+	  {
+	    
+	    if(vv[i] > ValMax) Val[i] = ValMax;
+	    else if(vv[i] < ValMin) Val[i] = ValMin;
+	    else Val[i] = vv[i];
+	  }
+      }
+    else
+      {
+	for(i=0;i<4;i++)
+	  {	      
+	    Val[i] = vv[i];
+	  }
+      }
+  }
+  /** - END JF - **/
+
+
   for(k=0 ; k<4 ; k++)
     RaiseFill(k, V[4*View->TimeStep+k], ValMin, Raise);
 
@@ -301,8 +353,7 @@ void Draw_ScalarTetrahedron(Post_View *View,
 
   if(View->IntervalsType == DRAW_POST_NUMERIC && !preproNormals){
 
-    d = 0.25 * (V[4*View->TimeStep]  +V[4*View->TimeStep+1]+
-		V[4*View->TimeStep+2]+V[4*View->TimeStep+3]);
+    d = 0.25 * (Val[0]  +Val[1]+Val[2] + Val[3]);
     if(d >= ValMin && d <= ValMax){
       Palette2(View,ValMin,ValMax,d);
       sprintf(Num, View->Format, d);
@@ -320,7 +371,7 @@ void Draw_ScalarTetrahedron(Post_View *View,
     for(k=0 ; k<View->NbIso ; k++){
       if(!preproNormals)Palette(View,View->NbIso,k);
       IsoSimplex(View,preproNormals,
-		 X, Y, Z, &V[4*View->TimeStep],
+		 X, Y, Z, Val,
 		 View->GVFI(ValMin,ValMax,View->NbIso,k), 
 		 ValMin, ValMax, View->Offset, Raise, View->Light);
     }
diff --git a/Makefile b/Makefile
index 272e057fed..77bb7d1cd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.105 2001-07-25 17:53:54 geuzaine Exp $
+# $Id: Makefile,v 1.106 2001-07-26 18:47:59 remacle Exp $
 # ----------------------------------------------------------------------
 #  Makefile for Gmsh  
 # ----------------------------------------------------------------------
@@ -431,7 +431,7 @@ fltk_compile_solaris_scorec :
 fltk_compile_linux_scorec :
 	@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
            "CC=$(CC)" \
-           "C_FLAGS=-O3" \
+           "C_FLAGS=-O2" \
            "VERSION_FLAGS=-D_FLTK" \
            "OS_FLAGS=-D_LITTLE_ENDIAN" \
            "GL_INCLUDE=$(OPENGL_INC)" \
diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp
index c4dc60197e..ae7ee55437 100644
--- a/Mesh/3D_Extrude.cpp
+++ b/Mesh/3D_Extrude.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Extrude.cpp,v 1.11 2001-06-25 18:34:59 remacle Exp $
+// $Id: 3D_Extrude.cpp,v 1.12 2001-07-26 18:47:59 remacle Exp $
 
 #include "Gmsh.h"
 #include "Const.h"
@@ -413,6 +413,8 @@ void Extrude_Seg (Vertex * V1, Vertex * V2){
           Tree_Add (THES->Simplexes, &s);
         }
         else{
+	  /// BUG FOUND FOR NON MATCHING SURFACES
+          are_cree (v1, v4, Tree_Ares);
           s = Create_Simplex (v3, v4, v1, NULL);
           s->iEnt = THES->Num;
           Tree_Add (THES->Simplexes, &s);
@@ -667,6 +669,7 @@ int Extrude_Mesh (Volume * v){
       do{
         TEST_IS_ALL_OK = 0;
         Extrude_Surface2 (s);
+	printf("swapping %d\n",TEST_IS_ALL_OK);
         if (TEST_IS_ALL_OK == j)
           break;
         j = TEST_IS_ALL_OK;
@@ -675,6 +678,21 @@ int Extrude_Mesh (Volume * v){
     }
 
     Extrude_Surface3 (s);
+
+    // Well well ... I think I fixed the bug in extrude meshes.
+    // Volume mesh cannot always comply with surface mesh, so I delete the
+    // surface mesh and create a new one. Edges were stored in Tree_Ares
+    // so that now, the surface mesh is ok (edge swapping is easy in 2d).
+    // cretainly not the most efficient way to do it but it seems to work
+    for (i = 0; i < List_Nbr (v->Surfaces); i++)
+      {
+	List_Read (v->Surfaces, i, &ss);
+	Tree_Action(ss->Simplexes, Free_Simplex);
+	Tree_Delete(ss->Simplexes);
+	ss->Simplexes = Tree_Create (sizeof (Simplex *), compareQuality);
+	Extrude_Mesh(ss);
+      }
+
     return true;
   }
   else{
diff --git a/Mesh/Makefile b/Mesh/Makefile
index efebe398bd..8126ab3b58 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2001-06-25 13:05:16 geuzaine Exp $
+# $Id: Makefile,v 1.23 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libMesh.a"
 #
@@ -90,205 +90,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-1D_Mesh.o: 1D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- ../Common/Context.h Interpolation.h Numeric.h
-2D_Mesh.o: 2D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Create.h 2D_Mesh.h Numeric.h ../Common/Context.h
-2D_SMesh.o: 2D_SMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h \
- Interpolation.h
-2D_Elliptic.o: 2D_Elliptic.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h
-2D_BGMesh.o: 2D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Recombine.o: 2D_Recombine.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Create.h \
- Numeric.h
-2D_InitMesh.o: 2D_InitMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Numeric.h
-2D_Bowyer.o: 2D_Bowyer.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Bricks.o: 2D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_DivAndConq.o: 2D_DivAndConq.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Util.o: 2D_Util.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h \
- ../Common/Context.h
-2D_Links.o: 2D_Links.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Tree.o: 2D_Tree.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Cylindrical.o: 2D_Cylindrical.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h ../Common/Context.h Numeric.h
-2D_Parametric.o: 2D_Parametric.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Interpolation.h Mesh.h \
- 2D_Mesh.h Create.h ../Common/Context.h Numeric.h
-2D_Mesh_Aniso.o: 2D_Mesh_Aniso.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Interpolation.h \
- Create.h ../Common/Context.h Numeric.h
-3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 3D_Mesh.h Create.h \
- Numeric.h ../Common/Context.h
-3D_SMesh.o: 3D_SMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h Interpolation.h Create.h
-3D_BGMesh.o: 3D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h 3D_Mesh.h ../Adapt/Adapt.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Numeric.h \
- ../Common/Context.h
-3D_Extrude.o: 3D_Extrude.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- ../Common/Context.h Create.h
-3D_Coherence.o: 3D_Coherence.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- 3D_Mesh.h Create.h Numeric.h
-3D_Divide.o: 3D_Divide.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
-3D_Bricks.o: 3D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
-MeshQuality.o: MeshQuality.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h
-Create.o: Create.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Numeric.h ../Common/Context.h
-Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
- ../Common/Context.h ../Parser/OpenFile.h
-Print_Mesh.o: Print_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Create.h ../Common/Context.h
-Read_Mesh.o: Read_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
- ../Geo/MinMax.h
-STL.o: STL.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h STL.h
-SMS.o: SMS.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
- ../Geo/MinMax.h ../Geo/CAD.h ../Mesh/Mesh.h ../Common/Context.h \
- ../Common/Const.h
-SwapEdge.o: SwapEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h SwapPatterns.h
-Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Numeric.h Interpolation.h ../Adapt/nrutil.h
-Metric.o: Metric.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Matrix.h Interpolation.h
-Nurbs.o: Nurbs.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h
-Interpolation.o: Interpolation.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.h \
- Interpolation.h
-SecondOrder.o: SecondOrder.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Interpolation.h \
- Numeric.h
-Smoothing.o: Smoothing.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
-CrossData.o: CrossData.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h
-Vertex.o: Vertex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Vertex.h ../Common/Context.h \
- ../Common/Const.h
-Edge.o: Edge.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h ../Common/Const.h
-Simplex.o: Simplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- Numeric.h ../Common/Context.h
diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp
index 7da6fd8849..22b397d4bf 100644
--- a/Mesh/Simplex.cpp
+++ b/Mesh/Simplex.cpp
@@ -1,4 +1,4 @@
-// $Id: Simplex.cpp,v 1.14 2001-06-06 15:30:18 remacle Exp $
+// $Id: Simplex.cpp,v 1.15 2001-07-26 18:47:59 remacle Exp $
 
 #include "Gmsh.h"
 #include "Const.h"
@@ -225,7 +225,7 @@ double Simplex::EtaShapeMeasure (){
       lij2 += DSQR (lij (i, j));
     }
   }
-  return 12. * pow (9. * DSQR (fabs (Volume_Simplexe ())), 1./3.) / (lij2);
+  return 12. * pow (9./10. * DSQR (fabs (Volume_Simplexe ())), 1./3.) / (lij2);
 }
 
 double Simplex::RhoShapeMeasure (){
diff --git a/Motif/Makefile b/Motif/Makefile
index 612e45c7b1..e8e2aff670 100644
--- a/Motif/Makefile
+++ b/Motif/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2001-04-23 10:38:15 geuzaine Exp $
+# $Id: Makefile,v 1.14 2001-07-26 18:47:59 remacle Exp $
 #
 # Makefile for "libMotif.a"
 #
@@ -71,117 +71,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Geo/Geo.h ../Geo/Verif.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h ../Common/Options.h ../Parser/Parser.h Widgets.h \
- Pixmaps.h XColors.h XContext.h XRessources.h CbContext.h CbGeom.h \
- Register.h Geometry.h ../Parser/OpenFile.h ../Common/GetOptions.h \
- ../Common/Static.h XStatic.h
-Widgets.o: Widgets.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Context.h \
- ../Common/Const.h XContext.h Info.h Widgets.h Help.h
-Geometry.o: Geometry.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h XContext.h Widgets.h
-Register.o: Register.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h XContext.h Widgets.h Register.h \
- CbOptions.h CbContext.h CbFile.h CbGeom.h CbMesh.h CbPost.h
-Pixmaps.o: Pixmaps.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h Widgets.h \
- ../Common/Context.h ../Common/Const.h Pixmaps.h ../Common/Bitmaps.h \
- XColors.h
-Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h \
- ../Graphics/gl2ps.h
-XColors.o: XColors.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h XContext.h
-Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
- Widgets.h
-CbContext.o: CbContext.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h XContext.h CbContext.h CbGeom.h CbMesh.h
-CbPost.o: CbPost.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h XContext.h ../Parser/OpenFile.h CbPost.h CbGeom.h \
- CbMesh.h CbColorbar.h
-CbColorbar.o: CbColorbar.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Const.h XColors.h Widgets.h Register.h ../Common/Context.h \
- XContext.h ../Common/ColorTable.h CbColorbar.h
-CbGeom.o: CbGeom.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h ../Geo/Verif.h ../Parser/OpenFile.h CbGeom.h
-CbMesh.o: CbMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h CbMesh.h \
- ../Common/Context.h Widgets.h
-CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
- ../Common/Options.h XContext.h Register.h ../Common/Timer.h \
- ../Geo/Visibility.h CbOptions.h CbGeom.h CbMesh.h CbPost.h
-CbFile.o: CbFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Parser/OpenFile.h ../Common/Const.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h ../Common/Options.h ../Graphics/CreateFile.h \
- CbFile.h CbColorbar.h
-CbInput.o: CbInput.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h ../Common/Options.h XContext.h Register.h \
- CbContext.h CbGeom.h CbPost.h CbMesh.h
-CbGeneral.o: CbGeneral.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h XContext.h Widgets.h
diff --git a/Parser/FunctionManager.cpp b/Parser/FunctionManager.cpp
index 7c93d043d4..681c4f961e 100644
--- a/Parser/FunctionManager.cpp
+++ b/Parser/FunctionManager.cpp
@@ -1,8 +1,8 @@
-// $Id: FunctionManager.cpp,v 1.10 2001-02-17 22:09:00 geuzaine Exp $
+// $Id: FunctionManager.cpp,v 1.11 2001-07-26 18:47:59 remacle Exp $
 
+#include <map>
 #include <stdio.h>
 #include <stack>
-#include <map>
 #include "FunctionManager.h"
 
 using namespace std;
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index cb30b48f5c..5708db1b36 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -171,7 +171,7 @@
 #line 1 "Gmsh.y"
  
 
-// $Id: Gmsh.tab.cpp,v 1.92 2001-07-25 13:11:07 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.93 2001-07-26 18:47:59 remacle Exp $
 
   //
   // Generaliser sprintf avec des chaines de caracteres
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index b3585e2b67..a3ad022f75 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.92 2001-07-25 13:11:08 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.93 2001-07-26 18:48:00 remacle Exp $
  */
 
 #define FLEX_SCANNER
@@ -986,7 +986,7 @@ char *yytext;
 #define INITIAL 0
 #line 2 "Gmsh.l"
 
-// $Id: Gmsh.yy.cpp,v 1.92 2001-07-25 13:11:08 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.93 2001-07-26 18:48:00 remacle Exp $
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Parser/Makefile b/Parser/Makefile
index 49c3d64b15..0211930320 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.21 2001-05-11 09:13:18 geuzaine Exp $
+# $Id: Makefile,v 1.22 2001-07-26 18:48:00 remacle Exp $
 #
 # Makefile for "libParser.a"
 #
@@ -63,27 +63,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Gmsh.tab.cpp.h
-Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
- ../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Mesh/Create.h ../Geo/StepGeomDatabase.h ../Common/Options.h \
- ../Common/Colors.h Parser.h OpenFile.h FunctionManager.h \
- ../Common/Timer.h ../Graphics/CreateFile.h ../Mesh/STL.h
-OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
- ../Common/Context.h Parser.h OpenFile.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Views.h \
- ../Common/ColorTable.h ../Geo/MinMax.h ../Geo/Visibility.h \
- ../Common/GmshUI.h ../Graphics/Draw.h ../Motif/Widgets.h
-FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 05c7f1e376..c1c5d424a7 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2001-04-23 10:38:17 geuzaine Exp $
+# $Id: Makefile,v 1.9 2001-07-26 18:48:00 remacle Exp $
 #
 # Makefile for "libAdapt.a"
 #
@@ -48,15 +48,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
- PluginManager.h CutPlane.h LevelsetPlugin.h CutSphere.h CutMap.h
-CutPlane.o: CutPlane.cpp CutPlane.h LevelsetPlugin.h Plugin.h \
- ../Common/Options.h ../Common/Message.h
-CutSphere.o: CutSphere.cpp CutSphere.h LevelsetPlugin.h Plugin.h \
- ../Common/Options.h ../Common/Message.h
-LevelsetPlugin.o: LevelsetPlugin.cpp LevelsetPlugin.h Plugin.h \
- ../Common/Options.h ../Common/Message.h ../DataStr/List.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Graphics/Iso.h
-CutMap.o: CutMap.cpp CutMap.h LevelsetPlugin.h Plugin.h \
- ../Common/Options.h ../Common/Message.h
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index 413d6f059f..103259de71 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -10,6 +10,7 @@
 */
 
 #include <map>
+#include <iosfwd>
 
 class GMSH_Plugin;
 struct ltstrpg
@@ -24,10 +25,10 @@ class GMSH_PluginManager
 {
   GMSH_PluginManager();
   static GMSH_PluginManager *instance;
-  std::map<char*,GMSH_Plugin*,ltstrpg> allPlugins;
+  std::map<const char*,GMSH_Plugin*,ltstrpg> allPlugins;
 public :
   virtual ~GMSH_PluginManager();
-  typedef std::map<char*,GMSH_Plugin*,ltstrpg>::iterator iter;
+  typedef std::map<const char*,GMSH_Plugin*,ltstrpg>::iterator iter;
 /**
   Registering all default plugins that are in $(GMSHPLUGINSHOME)
   In fact, we will load all .so files in dir $(GMSHPLUGINSHOME)
diff --git a/jpeg/Makefile b/jpeg/Makefile
index cfb2b4fbbe..9a1a7929f9 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2001-04-23 10:38:18 geuzaine Exp $
+# $Id: Makefile,v 1.14 2001-07-26 18:48:00 remacle Exp $
 #
 # Makefile for "libJpeg.a"
 #
@@ -51,43 +51,3 @@ depend:
 	$(RM) $(RMFLAGS) Makefile.new
 
 # DO NOT DELETE THIS LINE
-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jversion.h jerror.h
-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jmemsys.h
-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jmemsys.h
-jcapi.o: jcapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jerror.h
-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
-- 
GitLab