*** empty log message ***

Common/Makefile

-# $Id: Makefile,v 1.90 2006-07-10 08:08:59 remacle Exp $
+# $Id: Makefile,v 1.91 2006-07-10 12:16:34 remacle Exp $
 #
 # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 #
@@ -64,7 +64,6 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
-# 1 "/Users/geuzaine/.gmsh/Common//"
 Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Context.h \
@@ -75,51 +74,247 @@ Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
   ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Views.h ColorTable.h \
-  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h Trackball.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  VertexArray.h SmoothNormals.h GmshMatrix.h /sw/include/gsl/gsl_linalg.h \
+  /sw/include/gsl/gsl_mode.h /sw/include/gsl/gsl_permutation.h \
+  /sw/include/gsl/gsl_types.h /sw/include/gsl/gsl_errno.h \
+  /sw/include/gsl/gsl_check_range.h /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h AdaptiveViews.h Trackball.h
 AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
-  GmshMatrix.h ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h OS.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  GmshMatrix.h /sw/include/gsl/gsl_linalg.h /sw/include/gsl/gsl_mode.h \
+  /sw/include/gsl/gsl_permutation.h /sw/include/gsl/gsl_types.h \
+  /sw/include/gsl/gsl_errno.h /sw/include/gsl/gsl_check_range.h \
+  /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h ../Plugin/Plugin.h ../Common/Options.h \
+  ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h OS.h
 Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h ../DataStr/List.h \
   ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
   ../DataStr/Tree.h ../Numeric/Numeric.h Views.h ColorTable.h \
-  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h Context.h \
-  Options.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  VertexArray.h SmoothNormals.h GmshMatrix.h /sw/include/gsl/gsl_linalg.h \
+  /sw/include/gsl/gsl_mode.h /sw/include/gsl/gsl_permutation.h \
+  /sw/include/gsl/gsl_types.h /sw/include/gsl/gsl_errno.h \
+  /sw/include/gsl/gsl_check_range.h /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h AdaptiveViews.h Context.h Options.h \
+  ../contrib/MathEval/matheval.h
 ViewsIO.o: ViewsIO.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Views.h \
-  ColorTable.h VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h \
-  Context.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  ColorTable.h VertexArray.h SmoothNormals.h GmshMatrix.h \
+  /sw/include/gsl/gsl_linalg.h /sw/include/gsl/gsl_mode.h \
+  /sw/include/gsl/gsl_permutation.h /sw/include/gsl/gsl_types.h \
+  /sw/include/gsl/gsl_errno.h /sw/include/gsl/gsl_check_range.h \
+  /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h AdaptiveViews.h Context.h
 Octree.o: Octree.cpp Octree.h OctreeInternals.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 OctreeInternals.o: OctreeInternals.cpp Message.h OctreeInternals.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 OctreePost.o: OctreePost.cpp Octree.h OctreeInternals.h OctreePost.h \
   ../DataStr/List.h Views.h ColorTable.h VertexArray.h SmoothNormals.h \
-  ../Numeric/Numeric.h GmshMatrix.h AdaptiveViews.h Message.h \
-  ShapeFunctions.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  ../Numeric/Numeric.h GmshMatrix.h /sw/include/gsl/gsl_linalg.h \
+  /sw/include/gsl/gsl_mode.h /sw/include/gsl/gsl_permutation.h \
+  /sw/include/gsl/gsl_types.h /sw/include/gsl/gsl_errno.h \
+  /sw/include/gsl/gsl_check_range.h /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h AdaptiveViews.h Message.h ShapeFunctions.h
 Options.o: Options.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Gmsh.h Message.h \
-  ../DataStr/Malloc.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h GmshUI.h \
-  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
-  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
-  ../Mesh/Matrix.h ../Graphics/Draw.h Context.h Options.h \
-  ../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
-  ../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Fltk/Popup_Button.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  /sw/include/gsl/gsl_linalg.h /sw/include/gsl/gsl_mode.h \
+  /sw/include/gsl/gsl_permutation.h /sw/include/gsl/gsl_types.h \
+  /sw/include/gsl/gsl_errno.h /sw/include/gsl/gsl_check_range.h \
+  /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h ../Common/AdaptiveViews.h \
+  ../Common/GmshMatrix.h Gmsh.h Message.h ../DataStr/Malloc.h \
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Graphics/Draw.h \
+  Context.h Options.h ../Fltk/Solvers.h ../Fltk/GUI.h \
+  ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
+  ../Fltk/Popup_Button.h
 CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h GmshUI.h GmshVersion.h \
@@ -130,16 +325,47 @@ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
   ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Views.h ColorTable.h \
-  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h \
-  ../Parser/OpenFile.h ../Parser/Parser.h OS.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
+  VertexArray.h SmoothNormals.h GmshMatrix.h /sw/include/gsl/gsl_linalg.h \
+  /sw/include/gsl/gsl_mode.h /sw/include/gsl/gsl_permutation.h \
+  /sw/include/gsl/gsl_types.h /sw/include/gsl/gsl_errno.h \
+  /sw/include/gsl/gsl_check_range.h /sw/include/gsl/gsl_vector.h \
+  /sw/include/gsl/gsl_vector_complex_long_double.h \
+  /sw/include/gsl/gsl_complex.h /sw/include/gsl/gsl_vector_long_double.h \
+  /sw/include/gsl/gsl_block_long_double.h \
+  /sw/include/gsl/gsl_vector_complex.h \
+  /sw/include/gsl/gsl_block_complex_long_double.h \
+  /sw/include/gsl/gsl_vector_complex_double.h \
+  /sw/include/gsl/gsl_vector_double.h /sw/include/gsl/gsl_block_double.h \
+  /sw/include/gsl/gsl_block_complex_double.h \
+  /sw/include/gsl/gsl_vector_complex_float.h \
+  /sw/include/gsl/gsl_vector_float.h /sw/include/gsl/gsl_block_float.h \
+  /sw/include/gsl/gsl_block_complex_float.h \
+  /sw/include/gsl/gsl_vector_ulong.h /sw/include/gsl/gsl_block_ulong.h \
+  /sw/include/gsl/gsl_vector_long.h /sw/include/gsl/gsl_block_long.h \
+  /sw/include/gsl/gsl_vector_uint.h /sw/include/gsl/gsl_block_uint.h \
+  /sw/include/gsl/gsl_vector_int.h /sw/include/gsl/gsl_block_int.h \
+  /sw/include/gsl/gsl_vector_ushort.h /sw/include/gsl/gsl_block_ushort.h \
+  /sw/include/gsl/gsl_vector_short.h /sw/include/gsl/gsl_block_short.h \
+  /sw/include/gsl/gsl_vector_uchar.h /sw/include/gsl/gsl_block_uchar.h \
+  /sw/include/gsl/gsl_vector_char.h /sw/include/gsl/gsl_block_char.h \
+  /sw/include/gsl/gsl_matrix.h \
+  /sw/include/gsl/gsl_matrix_complex_long_double.h \
+  /sw/include/gsl/gsl_matrix_complex_double.h \
+  /sw/include/gsl/gsl_matrix_complex_float.h \
+  /sw/include/gsl/gsl_matrix_long_double.h \
+  /sw/include/gsl/gsl_matrix_double.h /sw/include/gsl/gsl_matrix_float.h \
+  /sw/include/gsl/gsl_matrix_ulong.h /sw/include/gsl/gsl_matrix_long.h \
+  /sw/include/gsl/gsl_matrix_uint.h /sw/include/gsl/gsl_matrix_int.h \
+  /sw/include/gsl/gsl_matrix_ushort.h /sw/include/gsl/gsl_matrix_short.h \
+  /sw/include/gsl/gsl_matrix_uchar.h /sw/include/gsl/gsl_matrix_char.h \
+  /sw/include/gsl/gsl_blas.h /sw/include/gsl/gsl_blas_types.h \
+  /sw/include/gsl/gsl_cblas.h AdaptiveViews.h ../Parser/OpenFile.h \
+  ../Parser/Parser.h OS.h
 OS.o: OS.cpp Message.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h ColorTable.h Context.h \
   ../Numeric/Numeric.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 Visibility.o: Visibility.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h ../Geo/Geo.h ../Geo/CAD.h \
@@ -150,19 +376,15 @@ Visibility.o: Visibility.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
   ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
   ../Geo/ExtrudeParams.h ../Parser/Parser.h Visibility.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 Trackball.o: Trackball.cpp Trackball.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 VertexArray.o: VertexArray.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h VertexArray.h Context.h \
   ../Numeric/Numeric.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 SmoothNormals.o: SmoothNormals.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h \
   SmoothNormals.h
-# 1 "/Users/geuzaine/.gmsh/Common//"
 License.o: License.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
   ../DataStr/List.h ../DataStr/Tree.h

DataStr/Makefile

-# $Id: Makefile,v 1.30 2006-01-28 18:44:19 geuzaine Exp $
+# $Id: Makefile,v 1.31 2006-07-10 12:16:34 remacle Exp $
 #
 # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 #
@@ -55,15 +55,9 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 List.o: List.cpp Malloc.h List.h ../Common/Message.h SafeIO.h
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 SafeIO.o: SafeIO.cpp SafeIO.h ../Common/Message.h
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 avl.o: avl.cpp avl.h Malloc.h
-# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Tools.o: Tools.cpp Tools.h List.h Tree.h avl.h

Geo/GEdge.cpp

@@ -8,3 +8,20 @@ void GEdge::delFace ( GFace *e )
 { 
   l_faces.erase(std::find(l_faces.begin(),l_faces.end(),e));  
 }
+
+GEdge::GEdge(GModel *model, 
+      int tag, 
+      GVertex *_v0, 
+      GVertex *_v1)
+  : GEntity (model,tag),v0(_v0),v1(_v1) 
+{
+  v0->addEdge (this);
+  v1->addEdge (this);
+}
+
+GEdge::~GEdge() 
+{
+  v0->delEdge (this);
+  v1->delEdge (this);
+}
+

Geo/GEdge.h

@@ -14,29 +14,14 @@ public:
   GEdge(GModel *model, 
 	int tag, 
 	GVertex *_v0, 
-	GVertex *_v1)
-    : GEntity (model,tag),v0(_v0),v1(_v1) 
-    {
-      v0->addEdge (this);
-      v1->addEdge (this);
-    }
-  virtual ~GEdge() 
-    {
-      v0->delEdge (this);
-      v1->delEdge (this);
-    }
+	GVertex *_v1);
+  virtual ~GEdge() ;
 
   virtual int dim() const {return 1;}
 
   virtual bool periodic(int dim=0) const = 0;
   virtual bool continuous(int dim=0) const = 0;
 
-  virtual int inClosure(GEntity *ent) const; // if ent is in closure of this edge
-
-  // Geometric ops
-  /** Get parameter on edge for given point. */
-  virtual double param(const GPoint &pt);
-
   /** Get the parameter location for a point in space on the edge. */
   virtual double parFromPoint(const SPoint3 &) const = 0;
 
@@ -44,7 +29,7 @@ public:
   virtual GPoint point(double p) const = 0;  
 
   /** Get the closest point on the edge to the given point. */
-  virtual GPoint closestPoint(const SPoint3 & queryPoint);
+  virtual GPoint closestPoint(const SPoint3 & queryPoint) =0;
 
   /** True if the edge contains the given parameter. */
   virtual int containsParam(double pt) const = 0;
@@ -52,9 +37,6 @@ public:
   /** Get first derivative of edge at the given parameter. */
   virtual SVector3 firstDer(double par) const = 0;
 
-  /** Get nth derivative at the given paramater. */
-  virtual void nthDerivative(double param, int n, double *array) const=0;
-
   /** reparmaterize the point onto the given face. */
   virtual SPoint2 reparamOnFace(GFace *face, double epar,int dir) const = 0;			  
 

Geo/GEdgeLoop.h

+#ifndef _EDGE_LOOP_H_
+#define _EDGE_LOOP_H_
+#include <list>
+
+class GEdgeLoop
+{
+  std::list<GEdge*> loop;
+  std::list<int>    dirs;
+public :
+  GEdgeLoop (const std::list<GEdge*> & l,   const std::list<int> & d)
+    : loop (l) , dirs (d)
+  {
+  }
+};
+#endif

Geo/GEntity.h

@@ -3,6 +3,7 @@
 
 #include "Range.h"
 #include "SPoint3.h"
+#include "SBoundingBox3d.h"
 #include <list>
 
 class GModel;
@@ -37,7 +38,7 @@ public:
     };
 
   GEntity(GModel *m, int t) : _model(m),_tag(t){}
-  virtual ~GEntity();
+    virtual ~GEntity() {};
 
   /** Return a renderable representation of the entity.*/
   //  virtual MeshRep * getGeometry() ;
@@ -48,19 +49,19 @@ public:
   virtual int dim() const = 0;
 
   /** Returns true if ent is in the closure of this entity */
-  virtual int inClosure(GEntity *ent) const =0; 
+  virtual int inClosure(GEntity *ent) const {throw;} 
 
   /// Regions that bound this entity or that this entity bounds.
-  virtual std::list<GRegion*> regions() const;
+  virtual std::list<GRegion*> regions() const{throw;}
 
   /// Faces that bound this entity or that this entity bounds.
-  virtual std::list<GFace*> faces() const;
+  virtual std::list<GFace*> faces() const{throw;}
 
   /// Edges that bound this entity or that this entity bounds.
-  virtual std::list<GEdge*> edges() const;
+  virtual std::list<GEdge*> edges() const{throw;}
 
   /// Vertices that bound this entity.
-  virtual std::list<GVertex*> vertices() const;
+  virtual std::list<GVertex*> vertices() const{throw;}
 
   /// Underlying geometric representation of this entity.
   virtual GeomType geomType() const = 0;
@@ -74,17 +75,14 @@ public:
   /// True if there are parametric degeneracies in the "dim" direction.
   virtual bool degenerate(int dim) const {return false;}
 
-  /// Orientation of the parametric space w.r.t. the entity.
-  //  virtual int geomDirection() const;
-
   /// Parametric bounds of the entity in the "i" direction.
-  virtual Range<double> parBounds(int i) const;
+  virtual Range<double> parBounds(int i) const{throw;}
 
   /// Modeler tolerance for the entity.
-  virtual double tolerance() const;
+  virtual double tolerance() const {return 1.e-14;}
 
   /// True if the entity contains the given point to within tolerance.
-  virtual int containsPoint(const SPoint3 &pt) const;
+  virtual int containsPoint(const SPoint3 &pt) const{throw;}
 
   /// Get the native pointer of the particular representation
   virtual void * getNativePtr() const= 0;
@@ -93,6 +91,9 @@ public:
   GModel *model() const {return _model;}
   // The tag of the entity
   int tag () const {return _tag;}
+  // The bounding box
+  SBoundingBox3d bounds() const{throw;}
+
 
 };
 

Geo/GFace.h

@@ -4,7 +4,7 @@
 class GRegion;
 #include "GPoint.h"
 #include "GEntity.h"
-#include "GEdgeLoop.h"
+//#include "GEdgeLoop.h"
 #include "SPoint2.h"
 #include "SVector3.h"
 #include "Pair.h"
@@ -14,7 +14,7 @@ class GRegion;
 class GFace : public GEntity 
 {
 protected: 
-  std::list<GEdgeLoop *> l_edgeLoops;
+  //  std::list<GEdgeLoop *> l_edgeLoops;
   std::list<GEdge *>     l_edges;
   std::list<int>         l_dirs;
   GRegion *r1, *r2;
@@ -43,10 +43,10 @@ public:
   virtual int containsParam(const SPoint2 &pt) const = 0;
 
   /** Period of the face in the given direction. */
-  virtual double period(int dir) const;
+  virtual double period(int dir) const = 0;
 
   /** Return the point on the face closest to the given point. */
-  virtual GPoint closestPoint(const SPoint3 & queryPoint);
+  virtual GPoint closestPoint(const SPoint3 & queryPoint) = 0;
 
   /** Return the normal to the face at the given parameter location. */
   virtual SVector3 normal(const SPoint2 &param) const = 0;
@@ -54,13 +54,9 @@ public:
   /** Return the first derivate of the face at the parameter location. */
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const = 0;
   
-  /** Return the nth derivate of the face at the parametric location. */
-  virtual double * nthDerivative(const SPoint2 &param, int n, 
-				 double *array) const;
   /* true if the surface underlying the face is periodic and we
      need to worry about that. */
   virtual bool surfPeriodic(int dim) const = 0;
-  virtual int inClosure(GEntity *ent) const {throw;}
 protected:
   void buildEdgeLoops ();
 };

Geo/GModel.h

@@ -12,7 +12,7 @@
 class GModel  
 {
 public:
-  virtual ~GModel();
+  virtual ~GModel() {}
 
   typedef std::list<GRegion*>::iterator riter;
   typedef std::list<GFace*>::iterator   fiter;
@@ -20,7 +20,7 @@ public:
   typedef std::list<GVertex*>::iterator viter;
 
   /** Returns the geometric tolerance for the entire model. */
-  virtual double tolerance() const =0;
+  virtual double tolerance() const {return 1.e-14;}
 
   /** Get the number of regions in this model. */
   int numRegion() const;
@@ -28,12 +28,6 @@ public:
   int numEdge  () const;
   int numVertex() const;
 
-  /** Get the nth region in this model. */
-  //  GRegion * region(int n) const;
-  //  GFace   * face  (int n) const;
-  //  GEdge   * edge  (int n) const;
-  //  GVertex * vertex(int n) const;
-
   /** Get an iterator initialized to the first entity in this model. */
   riter firstRegion() {return regions.begin();}
   fiter firstFace() {return faces.begin();}
@@ -50,14 +44,6 @@ public:
   virtual GEdge   * edgeByTag  (int n) const;
   virtual GVertex * vertexByTag(int n) const;
 
-  //  virtual GRegion * regionByID(int n) const;
-  //  virtual GFace   * faceByID  (int n) const;
-  //  virtual GEdge   * edgeByID  (int n) const;
-  //  virtual GVertex * vertexByID(int n) const;
-
-  virtual void setGeomTolerance(double) {};
-  //  void setDisplayCoherence(int ); // default is coherent
-
   void add(GRegion *r){regions.push_back(r);}
   void add(GFace *f)  {faces.push_back(f);}
   void add(GEdge *e)  {edges.push_back(e);}
@@ -69,7 +55,8 @@ public:
   void remove(GVertex *v){vertices.erase(std::find(firstVertex(),lastVertex(),v));}
 
 protected:
-  GModel(const std::string &name);
+  std::string modelName;
+  GModel(const std::string &name):modelName(name){}
   std::list<GRegion*> regions;
   std::list<GFace*> faces;
   std::list<GEdge*> edges;

Geo/GRegion.h

@@ -12,7 +12,6 @@ public:
   GRegion(GModel *model, int tag) : GEntity (model,tag) {}
   virtual ~GRegion();
   virtual int dim() const {return 3;}
-  virtual int inClosure(GEntity *ent) const {throw;}  
   virtual GeomType geomType() const {return ThreeDimVolume;}
 };
 

Geo/GVertex.h

@@ -14,7 +14,6 @@ public:
   void addEdge ( GEdge *e );
   void delEdge ( GEdge *e );
   virtual int dim() const {return 0;}
-  virtual int inClosure(GEntity *ent) const {throw;}
   virtual GeomType geomType() const {return Point;}
 
 protected:

Geo/Makefile

-# $Id: Makefile,v 1.76 2006-07-10 08:09:00 remacle Exp $
+# $Id: Makefile,v 1.77 2006-07-10 12:16:34 remacle Exp $
 #
 # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 #
@@ -121,51 +121,68 @@ GeoUtils.o: GeoUtils.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
   ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
   ../Mesh/Matrix.h ExtrudeParams.h
-GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h GPoint.h
-GEdge.o: GEdge.cpp GEdge.h GEntity.h Range.h SPoint3.h GVertex.h GPoint.h \
-  SVector3.h SPoint2.h
-GFace.o: GFace.cpp GFace.h GPoint.h GEntity.h Range.h SPoint3.h SPoint2.h \
-  SVector3.h Pair.h GEdge.h GVertex.h
-GRegion.o: GRegion.cpp GRegion.h GEntity.h Range.h SPoint3.h GFace.h \
-  GPoint.h SPoint2.h SVector3.h Pair.h
+GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
+  SBoundingBox3d.h GPoint.h
+GEdge.o: GEdge.cpp GEdge.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
+  GVertex.h GPoint.h SVector3.h SPoint2.h
+GFace.o: GFace.cpp GFace.h GPoint.h GEntity.h Range.h SPoint3.h \
+  SBoundingBox3d.h GEdgeLoop.h SPoint2.h SVector3.h Pair.h GEdge.h \
+  GVertex.h
+GRegion.o: GRegion.cpp GRegion.h GEntity.h Range.h SPoint3.h \
+  SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h SPoint2.h SVector3.h \
+  Pair.h
 GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
-  GPoint.h GEdge.h SVector3.h SPoint2.h GFace.h Pair.h GRegion.h
-gmshModel.o: gmshModel.cpp gmshModel.h ../Mesh/Mesh.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
-  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
-  ../Mesh/Matrix.h Range.h Pair.h SPoint2.h SPoint3.h SVector3.h \
-  SBoundingBox3d.h gmshVertex.h GVertex.h GEntity.h GPoint.h gmshFace.h \
-  GFace.h gmshEdge.h GEdge.h gmshRegion.h GRegion.h GModel.h \
+  SBoundingBox3d.h GPoint.h GEdge.h SVector3.h SPoint2.h GFace.h \
+  GEdgeLoop.h Pair.h GRegion.h
+gmshModel.o: gmshModel.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
+  Range.h SPoint3.h SBoundingBox3d.h GPoint.h GEdge.h SVector3.h \
+  SPoint2.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Mesh/Mesh.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
   ../Parser/OpenFile.h ../DataStr/Tools.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../Common/Message.h
-gmshEdge.o: gmshEdge.cpp gmshModel.h ../Mesh/Mesh.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
-  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
-  ../Mesh/Matrix.h Range.h Pair.h SPoint2.h SPoint3.h SVector3.h \
-  SBoundingBox3d.h gmshVertex.h GVertex.h GEntity.h GPoint.h gmshFace.h \
-  GFace.h gmshEdge.h GEdge.h gmshRegion.h GRegion.h GModel.h \
-  ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
-  ExtrudeParams.h Geo.h
-gmshFace.o: gmshFace.cpp gmshModel.h ../Mesh/Mesh.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
-  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
-  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
-  ../Mesh/Matrix.h Range.h Pair.h SPoint2.h SPoint3.h SVector3.h \
-  SBoundingBox3d.h gmshVertex.h GVertex.h GEntity.h GPoint.h gmshFace.h \
-  GFace.h gmshEdge.h GEdge.h gmshRegion.h GRegion.h GModel.h \
+  ../DataStr/Tree.h ../Common/Message.h gmshVertex.h gmshFace.h \
+  gmshEdge.h gmshRegion.h
+gmshEdge.o: gmshEdge.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
+  SPoint3.h SBoundingBox3d.h GPoint.h GEdge.h SVector3.h SPoint2.h \
+  GFace.h GEdgeLoop.h Pair.h GRegion.h gmshEdge.h gmshVertex.h \
+  ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
   ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
   ExtrudeParams.h Geo.h
+gmshFace.o: gmshFace.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
+  SPoint3.h SBoundingBox3d.h GPoint.h GEdge.h SVector3.h SPoint2.h \
+  GFace.h GEdgeLoop.h Pair.h GRegion.h gmshEdge.h gmshVertex.h \
+  ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  gmshFace.h ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  CAD.h ExtrudeParams.h Geo.h
+gmshRegion.o: gmshRegion.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
+  Range.h SPoint3.h SBoundingBox3d.h GPoint.h GEdge.h SVector3.h \
+  SPoint2.h GFace.h GEdgeLoop.h Pair.h GRegion.h gmshEdge.h gmshVertex.h \
+  ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  gmshFace.h gmshRegion.h ../Mesh/Interpolation.h ../Mesh/Vertex.h \
+  ../Mesh/Mesh.h CAD.h ExtrudeParams.h Geo.h
 SVector3.o: SVector3.cpp SVector3.h SPoint3.h
 SBoundingBox3d.o: SBoundingBox3d.cpp SBoundingBox3d.h SPoint3.h
 ExtractContour.o: ExtractContour.cpp ../Common/Gmsh.h ../Common/Message.h \

Geo/gmshEdge.cpp

@@ -104,16 +104,6 @@ bool gmshEdge::periodic(int dim) const
   return false;
 }
 
-int gmshEdge::isSeam(GFace *face) const
-{
-  printf("gmshEdge::isSeam() is called.\n");
-  return 0;
-}
-
-double gmshEdge::period() const
-{
-  return 0;
-}
 
 GEntity::GeomType gmshEdge::geomType() const
 {
@@ -133,27 +123,6 @@ GEntity::GeomType gmshEdge::geomType() const
     }
 }
 
-int gmshEdge::geomDirection() const
-{
-  return 1;
-}
-
-double gmshEdge::tolerance() const
-{ 
-  return 1.e-14; 
-}
-
-
-void gmshEdge::nthDerivative(double param, int n, double *array) const
-{
-  throw;
-}
-
-GVertex * gmshEdge::split(double)
-{
-  throw;
-  return 0;
-}
 
 void * gmshEdge::getNativePtr() const
 { 
@@ -165,9 +134,3 @@ int gmshEdge::containsPoint(const SPoint3 &pt) const
 { 
   throw;
 }
-
-// 200306 
-void gmshEdge::fixPeriodicPar(double &par)
-{
-  throw;
-}

Geo/gmshEdge.h

@@ -11,8 +11,7 @@ class gmshEdge : public GEdge{
 public:
   gmshEdge(GModel *model,Curve *edge,GVertex *v1,GVertex *v2);
   virtual ~gmshEdge();
-  int isSeam(GFace *face) const;
-  double period() const;
+  double period() const{throw ;}
   Range<double> parBounds(int i) const;
   virtual bool periodic(int dim=0) const;
   virtual GeomType geomType() const;
@@ -25,19 +24,13 @@ public:
   virtual int containsPoint(const SPoint3 &pt) const;  
   virtual int containsParam(double pt) const;
   virtual SVector3 firstDer(double par) const;
-  virtual void nthDerivative(double param, int n, double *array) const;
   virtual SPoint2 reparamOnFace(GFace * face, double epar, int dir) const{
     throw;
   }
-  int geomDirection() const;
-  void fixPeriodicPar(double &par);
-  virtual double tolerance() const;
   void * getNativePtr() const; 
-  virtual GVertex * split(double par);
-  Curve *c; 
-  //  virtual GeoRep * geometry() {return 0;}
   virtual double parFromPoint(const SPoint3 &pt) const;
 protected:
+  Curve *c; 
 };
 #endif
 

Geo/gmshFace.cpp

@@ -69,10 +69,6 @@ Pair<SVector3,SVector3> gmshFace::firstDer(const SPoint2 &param) const
 				  SVector3(vv.Pos.X,vv.Pos.Y,vv.Pos.Z));
 }
 
-double * gmshFace::nthDerivative(const SPoint2 &param, int n, double *array) const
-{
-  throw;
-}
 
 GPoint gmshFace::point(const SPoint2 &pt) const
 {   
@@ -176,7 +172,3 @@ int gmshFace::containsPoint(const SPoint3 &pt) const
 }
 
 // added 200306
-double gmshFace::period(int dir) const
-{
-  return 0.;
-}

Geo/gmshFace.h

@@ -18,7 +18,7 @@ public:
   virtual SBoundingBox3d bounds() const; 
   virtual GPoint point(double par1, double par2) const; 
   virtual GPoint point(const SPoint2 &pt) const; 
-  virtual GPoint closestPoint(const SPoint3 & queryPoint); 
+  virtual GPoint closestPoint(const SPoint3 & queryPoint) ; 
   
   virtual int containsPoint(const SPoint3 &pt) const;  
   virtual int containsParam(const SPoint2 &pt) const; 
@@ -26,7 +26,7 @@ public:
   virtual SVector3 normal(const SPoint2 &param) const; 
   virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const; 
   virtual double * nthDerivative(const SPoint2 &param, int n,  
- 				 double *array) const; 
+ 				 double *array) const {throw;}
   
   virtual GEntity::GeomType geomType() const; 
   virtual int geomDirection() const; 
@@ -34,7 +34,7 @@ public:
   virtual bool continuous(int dim) const; 
   virtual bool periodic(int dim) const; 
   virtual bool degenerate(int dim) const; 
-  virtual double period(int dir) const;	// 200306 
+  virtual double period(int dir) const {throw;}
   virtual double tolerance() const; 
   //  virtual GeoRep * geometry() {return 0;}
   void * getNativePtr() const; 

Geo/gmshModel.cpp

 #include "gmshModel.h"
+#include "Mesh.h"
+#include "GPoint.h"
+#include "SPoint2.h"
+#include "SPoint3.h"
+#include "SBoundingBox3d.h"
 #include "OpenFile.h"
 #include "Tools.h"
 #include "Message.h"
+#include "gmshVertex.h"
+#include "gmshFace.h"
+#include "gmshEdge.h"
+#include "gmshRegion.h"
 
 extern Mesh *THEM;
+gmshModel::gmshModel()
+  : GModel ( "noname" )
+{
+  convertFromUglyOldDataStructuresgmshModel();
+}
+
 gmshModel::gmshModel(char *geofile)
   : GModel ( geofile )
 {
-  if (geofile)
-    {
       OpenProblem ( geofile );
-    }
-  
+      convertFromUglyOldDataStructuresgmshModel();
+}
+
+void gmshModel::convertFromUglyOldDataStructuresgmshModel()
+{
   std::set<Vertex*> points;
 
   if(Tree_Nbr(THEM->Curves)) {
@@ -67,11 +83,11 @@ gmshModel::gmshModel(char *geofile)
     List_Delete(volumes);
   }
 
-  //Msg (INFO,"gmshModel Created\n");
-  //Msg (INFO,"%d Vertices\n",vertices.size());
-  //Msg (INFO,"%d Edges   \n",edges.size());
-  //Msg (INFO,"%d Faces\n",faces.size());
-  //Msg (INFO,"%d Regions\n" ,regions.size());
+  Msg (INFO,"gmshModel Created\n");
+  Msg (INFO,"%d Vertices\n",vertices.size());
+  Msg (INFO,"%d Edges   \n",edges.size());
+  Msg (INFO,"%d Faces\n",faces.size());
+  Msg (INFO,"%d Regions\n" ,regions.size());
 
 }
 

Geo/gmshModel.h

 #ifndef _H_GMSH_MODEL_
 #define _H_GMSH_MODEL_
 
-#include <list>
-#include "Mesh.h"
-#include "Range.h"
-#include "Pair.h"
-#include "SPoint2.h"
-#include "SPoint3.h"
-#include "SVector3.h"
-#include "SBoundingBox3d.h"
-#include "gmshVertex.h"
-#include "gmshFace.h"
-#include "gmshEdge.h"
-#include "gmshRegion.h"
 #include "GModel.h"
 
-
 class gmshModel : public GModel {
+  void convertFromUglyOldDataStructuresgmshModel(); 
 public:
-  gmshModel(char *geofile = 0); 
+  gmshModel(char *geofile); 
+  gmshModel(); 
   virtual ~gmshModel() {};
-  virtual void setGeomTolerance(double) {};
-  virtual double tolerance() const {return 1.e-14;}
-
-  //  virtual SBoundingBox3d bounds() const;
-  /** Find the region with the given tag. */
-  // virtual GRegion * regionByTag(int n) const;  
-  /** Find the face with the given tag. */
-  virtual GFace * faceByTag(int n) const;
-  /** Find the edge with the given tag. */
-  virtual GEdge * edgeByTag(int n) const;
-  /** Find the vertex with the given tag. */
-  virtual GVertex * vertexByTag(int n) const;
-  /** Same, but with ids */
-  //  virtual GRegion * regionByID(int n) const;
-  virtual GFace * faceByID(int n) const {return faceByTag(n);}
-  virtual GEdge * edgeByID(int n) const {return edgeByTag(n);}
-  virtual GVertex * vertexByID(int n) const {return vertexByTag(n);}
-  virtual GVertex *createVertex(std::istream &in){throw;}
-  virtual GEdge *createEdge(std::istream &in){throw;}
-  virtual GFace *createFace(std::istream &in){throw;}
-  virtual GRegion *createRegion(std::istream &in){throw;}
-#ifdef _HAVE_SGMODEL_
-  virtual SString modeler() const {throw;}
-  virtual SBoundingBox3d bounds() const {throw;}
-#endif
-protected: 
-private:
-  std::list<GFace*> faces;
-  std::list<GEdge*> edges;
-  std::list<GVertex*> vertices;
-  std::list<GRegion*> regions;
 };
 
 #endif

Makefile

-# $Id: Makefile,v 1.419 2006-03-12 16:24:08 geuzaine Exp $
+# $Id: Makefile,v 1.420 2006-07-10 12:16:34 remacle Exp $
 #
 # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 #
@@ -95,7 +95,7 @@ clean-most:
 
 depend: initialtag
 	for i in ${GMSH_DIRS};\
-        do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK"); done
+        do (cd $$i && ${MAKE} depend); done
 
 nodepend:
 	for i in ${GMSH_DIRS} ; do \