diff --git a/Adapt/Makefile b/Adapt/Makefile
index 45152d7f70f3ed3c024e6b4d6ec3b6fbaf27c600..34931fe4f40048b066072d6c69a21e3736763866 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.19 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libAdapt.a"
#
@@ -58,3 +58,16 @@ 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/Box/Main.cpp b/Box/Main.cpp
index ab3858c8b2054dde431c502c9054c22fb7d9586e..d0b303f00291a8dd9cdeb3efcbc77f1218901319 100644
--- a/Box/Main.cpp
+++ b/Box/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.8 2001-08-08 18:03:15 remacle Exp $
+// $Id: Main.cpp,v 1.9 2001-08-09 18:28:23 remacle Exp $
#include <signal.h>
#include "ParUtil.h"
@@ -124,9 +124,11 @@ int main(int argc, char *argv[]){
Print_Histogram(THEM->Histogram[0]);
ParUtil::Instance()->Barrier(__LINE__,__FILE__);
ParUtil::Instance()->Exit();
+ return 1;
}
ParUtil::Instance()->Barrier(__LINE__,__FILE__);
ParUtil::Instance()->Exit();
+ return 1;
}
@@ -151,6 +153,7 @@ void Signal (int sig_num){
/* ------------------------------------------------------------------------ */
void Msg(int level, char *fmt, ...){
+
va_list args;
int abort=0;
int nb, nbvis;
@@ -160,13 +163,15 @@ void Msg(int level, char *fmt, ...){
switch(level){
case DIRECT :
- vfprintf(stdout, fmt, args); fprintf(stdout, "\n");
+ if(ParUtil::Instance()->master())
+ vfprintf(stdout, fmt, args); fprintf(stdout, "\n");
break;
case FATAL :
case FATAL1 :
case FATAL2 :
case FATAL3 :
+ fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
fprintf(stderr, FATAL_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
abort = 1 ;
@@ -176,6 +181,7 @@ void Msg(int level, char *fmt, ...){
case GERROR1 :
case GERROR2 :
case GERROR3 :
+ fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
fprintf(stderr, ERROR_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
abort = 1 ;
@@ -185,17 +191,21 @@ void Msg(int level, char *fmt, ...){
case WARNING1 :
case WARNING2 :
case WARNING3 :
+ fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
fprintf(stderr, WARNING_STR);
vfprintf(stderr, fmt,args); fprintf(stderr, "\n");
break;
case PARSER_ERROR :
- fprintf(stderr, PARSER_ERROR_STR);
- vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
+ if(ParUtil::Instance()->master())
+ {
+ fprintf(stderr, PARSER_ERROR_STR);
+ vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
+ }
break ;
case PARSER_INFO :
- if(CTX.verbosity == 5){
+ if(CTX.verbosity == 5 && ParUtil::Instance()->master()){
fprintf(stderr, PARSER_INFO_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
@@ -205,14 +215,14 @@ void Msg(int level, char *fmt, ...){
case DEBUG1 :
case DEBUG2 :
case DEBUG3 :
- if(CTX.verbosity > 2){
+ if(ParUtil::Instance()->master() && CTX.verbosity > 2){
fprintf(stderr, DEBUG_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
break;
default :
- if(CTX.verbosity > 0){
+ if(ParUtil::Instance()->master() && CTX.verbosity > 0){
fprintf(stderr, INFO_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
diff --git a/Common/Makefile b/Common/Makefile
index 32c98d33957962b6ddccbca0c208c0e6105c78f4..9d1b89e7e7f99b4cb297351206f3d8a1e409dfbb 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.24 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libCommon.a"
#
@@ -63,3 +63,36 @@ 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
+Iso.o: Iso.cpp Gmsh.h 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 ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
+ ../Mesh/Numeric.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 ../Parser/Parser.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/DataStr/Makefile b/DataStr/Makefile
index 20e789947a110d3bc8444a13082d9b962e9ee7b8..b9ce5c71e46472989333e94fb87e7e9629abad44 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.9 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libDataStr.a"
#
@@ -52,3 +52,8 @@ 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/Makefile b/Fltk/Makefile
index e1cbfdc81a598d077b8d21bcacd6511a7e95271a..b524e590ee8b5108785eff668f18e70fde5fca42 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.23 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libFltk.a"
#
@@ -63,3 +63,69 @@ 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 747a791d56b5c1ce1556f5b070ba1f0505d9448f..a66f8bf38a0bf0d3db4cdaf432def474631dad3b 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.21 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libGeo.a"
#
@@ -57,3 +57,49 @@ 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/IsoSimplex.cpp b/Graphics/IsoSimplex.cpp
index f13ea650dd93f1164384ba5ec885b167a13c5d78..d8261014e7ee5c5c567df18fb58c6e9fcd346cea 100644
--- a/Graphics/IsoSimplex.cpp
+++ b/Graphics/IsoSimplex.cpp
@@ -6,6 +6,7 @@
#include "Iso.h"
#include "Context.h"
#include "Views.h"
+#include "Numeric.h"
extern Context_T CTX;
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 2c37dbfff1fe6ce5ccb4a39554aa3f037e1798f8..8cbee6c5f343756ba72cb436a03138d790b8c76e 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.26 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.27 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libGraphics.a"
#
@@ -69,3 +69,88 @@ 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 gl2ps.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 gl2ps.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 ../Common/Iso.h IsoSimplex.h \
+ ../Common/Context.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 ../Common/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 gl2ps.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/PostSimplex.cpp b/Graphics/PostSimplex.cpp
index ba1c00bcfcc3441d0d9467a27e27a07ef0528de0..cd865d6ca724f20f8537d844be2efecc0aff2e5a 100644
--- a/Graphics/PostSimplex.cpp
+++ b/Graphics/PostSimplex.cpp
@@ -1,4 +1,4 @@
-// $Id: PostSimplex.cpp,v 1.27 2001-08-07 09:10:14 geuzaine Exp $
+// $Id: PostSimplex.cpp,v 1.28 2001-08-09 18:28:23 remacle Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -8,6 +8,7 @@
#include "Iso.h"
#include "IsoSimplex.h"
#include "Context.h"
+#include "Numeric.h"
extern Context_T CTX;
@@ -251,7 +252,7 @@ void Draw_ScalarTriangle(Post_View *View, int preproNormals,
for(i=0;i<3;i++){
if(!View->get_normal(X[i]+Raise[0][i],Y[i]+Raise[1][i],Z[i]+Raise[2][i],
norms[3*i],norms[3*i+1],norms[3*i+2])){
- //Msg(WARNING, "Oups, did not find smoothed normal");
+ Msg(WARNING, "Oups, did not find smoothed normal");
norms[3*i] = nn[0];
norms[3*i+1] = nn[1];
norms[3*i+2] = nn[2];
@@ -266,9 +267,15 @@ void Draw_ScalarTriangle(Post_View *View, int preproNormals,
norms[3*i+2] = nn[2];
}
}
- glNormal3dv(nn);
+
+ // hey geuz, t'avais mis glNormal3dv(nn);
+ glNormal3dv(norms);
}
+ norme(norms);
+ norme(&norms[3]);
+ norme(&norms[6]);
+
if(preproNormals) return;
if(View->ShowElement) Draw_Simplex(3,X,Y,Z,Raise);
diff --git a/Mesh/Makefile b/Mesh/Makefile
index fbdb92141ceb57bf27b04e228291f6dcac363f46..2993ffed0a690bb4bf3457522b969fbccc09b3d2 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.26 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libMesh.a"
#
@@ -90,3 +90,205 @@ 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 ../Common/Context.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_Extrude_Old.o: 3D_Extrude_Old.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 Create.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 3D_Mesh.h Create.h \
+ ../Geo/MinMax.h ../Common/Context.h ../Common/Const.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 ../Common/Context.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/Motif/Makefile b/Motif/Makefile
index ec51ab8babb0bd71785480740fc4c06f202e2aa6..9b98a8e5641457c49cfd9acf0685abd97c217901 100644
--- a/Motif/Makefile
+++ b/Motif/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.17 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libMotif.a"
#
@@ -71,3 +71,114 @@ 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/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 7af20935a0d0323bda9b7f6e482df37961d51de4..9337e04ffc23b57df93ce4b7d5b9e3c6da55478a 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -174,7 +174,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.103 2001-08-09 15:24:54 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.104 2001-08-09 18:28:23 remacle Exp $
//
// Generaliser sprintf avec des chaines de caracteres
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 9dcf6f9417de5b6569de04aabcc57cef8c7ef81d..a4f1b8d3478f429ef56b03046b4c16ce93c1444e 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.103 2001-08-09 15:24:55 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.104 2001-08-09 18:28:23 remacle Exp $
*/
#define FLEX_SCANNER
@@ -995,7 +995,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.103 2001-08-09 15:24:55 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.104 2001-08-09 18:28:23 remacle Exp $
#include <stdio.h>
#include <stdlib.h>
diff --git a/Parser/Makefile b/Parser/Makefile
index d9b84b205b406439dc3d50bde2c24e44cf9df6a8..3ef6f2242d776090dfdfe7dfe7ceb637cd80cb45 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.26 2001-08-08 14:05:27 remacle Exp $
+# $Id: Makefile,v 1.27 2001-08-09 18:28:23 remacle Exp $
#
# Makefile for "libParser.a"
#
@@ -63,3 +63,28 @@ 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 ../Plugin/PluginManager.h ../Parallel/ParUtil.h \
+ ../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 ../Common/GetOptions.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/CutMap.cpp b/Plugin/CutMap.cpp
index 91d25f06cb3167e3eee88de3c1820afa8b844f2c..62391784656a7abaaa74e3d75efa49aa3c3aeef4 100644
--- a/Plugin/CutMap.cpp
+++ b/Plugin/CutMap.cpp
@@ -1,11 +1,12 @@
-// $Id: CutMap.cpp,v 1.19 2001-08-06 11:13:25 geuzaine Exp $
+// $Id: CutMap.cpp,v 1.20 2001-08-09 18:28:23 remacle Exp $
#include "CutMap.h"
#include "List.h"
StringXNumber CutMapOptions_Number[] = {
{ GMSH_FULLRC, "A" , NULL , 1. },
- { GMSH_FULLRC, "iView" , NULL , -1. }
+ { GMSH_FULLRC, "iView" , NULL , -1. },
+ { GMSH_FULLRC, "iField" , NULL , 0. }
};
extern "C"
@@ -33,7 +34,8 @@ void GMSH_CutMapPlugin::getInfos(char *author, char *copyright, char *help_text)
strcpy(copyright, "DGR (www.multiphysics.com)");
strcpy(help_text,
"Extracts the isovalue surface of value A from a\n"
- "3D scalar map. Script name: Plugin(CutMap).");
+ "3D scalar map and draw ith component of the field on the iso.\n"
+ "Script name: Plugin(CutMap).");
}
int GMSH_CutMapPlugin::getNbOptions() const
@@ -65,8 +67,10 @@ Post_View *GMSH_CutMapPlugin::execute (Post_View *v)
{
Post_View *vv;
A = CutMapOptions_Number[0].def;
- int iView = (int)CutMapOptions_Number[1].def;
+ int iView = (int)CutMapOptions_Number[1].def;
+ _ith_field_to_draw_on_the_iso = (int)CutMapOptions_Number[2].def;
+
if(v && iView < 0)
vv = v;
else{
diff --git a/Plugin/CutMap.h b/Plugin/CutMap.h
index c44dccdb271519c5d037872bbbc0bec850d8633d..2a1ec869e9ba28f8666b92efe86726a7b341a8cd 100644
--- a/Plugin/CutMap.h
+++ b/Plugin/CutMap.h
@@ -21,4 +21,5 @@ public:
virtual StringXNumber* GetOption (int iopt);
virtual Post_View *execute (Post_View *);
};
+
#endif
diff --git a/Plugin/LevelsetPlugin.cpp b/Plugin/LevelsetPlugin.cpp
index 729f2505f7d9ff6040445e3fd07b2e62cd894aca..15b96e0ccbde2b63df213a5081fed2fd1d950e46 100644
--- a/Plugin/LevelsetPlugin.cpp
+++ b/Plugin/LevelsetPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id: LevelsetPlugin.cpp,v 1.12 2001-08-09 13:27:41 remacle Exp $
+// $Id: LevelsetPlugin.cpp,v 1.13 2001-08-09 18:28:24 remacle Exp $
#include "LevelsetPlugin.h"
#include "List.h"
@@ -14,6 +14,7 @@ int sys3x3 (double mat[3][3], double b[3], double res[3], double *det);
GMSH_LevelsetPlugin::GMSH_LevelsetPlugin()
{
processed = 0;
+ _ith_field_to_draw_on_the_iso = 0;
strcpy (OutputFileName,"levelset.pos");
}
@@ -60,23 +61,14 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
for(k=0;k<6;k++)
{
if(levels[edtet[k][0]] * levels[edtet[k][1]] <= 0.0)
- {
+ {
double coef = InterpolateIso(X,Y,Z,levels,0.0,
edtet[k][0],edtet[k][1],
&Xp[nx],&Yp[nx],&Zp[nx]);
- myVals[nx] = coef * (VAL[edtet[k][1]] - VAL[edtet[k][0]])
- + VAL[edtet[k][0]];
+ myVals[nx] = what_to_draw (Xp[nx],Yp[nx],Zp[nx],edtet[k][0],edtet[k][1],coef,VAL);
nx++;
}
}
- if(nx == 3 || nx == 4)
- {
- for(k=0;k<3;k++)List_Add(View->ST, &Xp[k]);
- for(k=0;k<3;k++)List_Add(View->ST, &Yp[k]);
- for(k=0;k<3;k++)List_Add(View->ST, &Zp[k]);
- for(k=0;k<3;k++)List_Add(View->ST, &myVals[k]);
- View->NbST++;
- }
if(nx == 4)
{
double xx = Xp[3];
@@ -91,11 +83,6 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
Yp[2] = yy;
Zp[2] = zz;
myVals[2] = vv;
- for(k=1;k<4;k++)List_Add(View->ST, &Xp[k %4]);
- for(k=1;k<4;k++)List_Add(View->ST, &Yp[k % 4]);
- for(k=1;k<4;k++)List_Add(View->ST, &Zp[k % 4]);
- for(k=1;k<4;k++)List_Add(View->ST, &myVals[k %4]);
- View->NbST++;
}
double v1[3] = {Xp[2]-Xp[0],Yp[2]-Yp[0],Zp[2]-Zp[0]};
@@ -108,17 +95,33 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
prosca(gr,n,&xx);
if(xx > 0){
- for(i=0;i<nb;i++){
- Xpi[i] = Xp[i];
- Ypi[i] = Yp[i];
- Zpi[i] = Zp[i];
+ for(k=0;k<nx;k++){
+ Xpi[k] = Xp[k];
+ Ypi[k] = Yp[k];
+ Zpi[k] = Zp[k];
}
- for(i=0;i<nb;i++){
- Xp[i] = Xpi[nb-i-1];
- Yp[i] = Ypi[nb-i-1];
- Zp[i] = Zpi[nb-i-1];
+ for(k=0;k<nx;k++){
+ Xp[k] = Xpi[nx-k-1];
+ Yp[k] = Ypi[nx-k-1];
+ Zp[k] = Zpi[nx-k-1];
+ }
+ }
+ if(nx == 3 || nx == 4)
+ {
+ for(k=0;k<3;k++)List_Add(View->ST, &Xp[k]);
+ for(k=0;k<3;k++)List_Add(View->ST, &Yp[k]);
+ for(k=0;k<3;k++)List_Add(View->ST, &Zp[k]);
+ for(k=0;k<3;k++)List_Add(View->ST, &myVals[k]);
+ View->NbST++;
+ }
+ if(nx == 4)
+ {
+ for(k=1;k<4;k++)List_Add(View->ST, &Xp[k %4]);
+ for(k=1;k<4;k++)List_Add(View->ST, &Yp[k % 4]);
+ for(k=1;k<4;k++)List_Add(View->ST, &Zp[k % 4]);
+ for(k=1;k<4;k++)List_Add(View->ST, &myVals[k %4]);
+ View->NbST++;
}
- }
}
char name[1024],filename[1024];
@@ -134,7 +137,21 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
return 0;
}
-
+double GMSH_LevelsetPlugin::what_to_draw (double x,
+ double y,
+ double z,
+ int p1,
+ int p2,
+ double coef,
+ double *VAL) const
+{
+ int offset = _ith_field_to_draw_on_the_iso * 4;
+ // TEST JF, this would draw y coord on the iso
+ // return y;
+ p2 += offset;
+ p1 += offset;
+ return coef * (VAL[p2] - VAL[p1]) + VAL[p1];
+}
diff --git a/Plugin/LevelsetPlugin.h b/Plugin/LevelsetPlugin.h
index e94f8528b4866bd73cb9fbe0fbea9f2c4a8a87f3..f25ec33104c1fd52415d713af806e54a67e6c8d0 100644
--- a/Plugin/LevelsetPlugin.h
+++ b/Plugin/LevelsetPlugin.h
@@ -4,7 +4,12 @@
class GMSH_LevelsetPlugin : public GMSH_Post_Plugin
{
- virtual double levelset (double x, double y, double z, double val) const = 0;
+protected:
+ int _ith_field_to_draw_on_the_iso;
+private:
+ virtual double levelset (double x, double y, double z, double val) const = 0;
+ virtual double what_to_draw (double x, double y, double z,
+ int p1, int p2, double coef, double *val) const;
public:
GMSH_LevelsetPlugin();
virtual Post_View *execute (Post_View *);
diff --git a/Plugin/Makefile b/Plugin/Makefile
index d96359f6226428f94f140dcd4ea390b3281dabf8..df34fa2c28c7afd563de2f1a49b38c3b4f887384 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2001-08-09 13:27:41 remacle Exp $
+# $Id: Makefile,v 1.14 2001-08-09 18:28:24 remacle Exp $
#
# Makefile for "libAdapt.a"
#
@@ -53,3 +53,25 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
+Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
+ PluginManager.h CutMap.h LevelsetPlugin.h CutPlane.h CutSphere.h Skin.h \
+ Smooth.h Transform.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 \
+ ../Common/Iso.h
+CutPlane.o: CutPlane.cpp CutPlane.h LevelsetPlugin.h Plugin.h \
+ ../Common/Options.h ../Common/Message.h ../DataStr/List.h
+CutSphere.o: CutSphere.cpp CutSphere.h LevelsetPlugin.h Plugin.h \
+ ../Common/Options.h ../Common/Message.h ../DataStr/List.h
+CutMap.o: CutMap.cpp CutMap.h LevelsetPlugin.h Plugin.h \
+ ../Common/Options.h ../Common/Message.h ../DataStr/List.h
+Smooth.o: Smooth.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
+ Smooth.h ../DataStr/List.h ../Common/Views.h ../Common/Const.h \
+ ../Common/ColorTable.h
+Transform.o: Transform.cpp Plugin.h ../Common/Options.h \
+ ../Common/Message.h Transform.h ../DataStr/List.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h
+Skin.o: Skin.cpp Plugin.h ../Common/Options.h ../Common/Message.h Skin.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
diff --git a/jpeg/Makefile b/jpeg/Makefile
index 1710b9ac0a9e9168308d19088d997ae7947ad995..4b2d0fc2978a4a7bbbf06d93212a84bfe7af0861 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2001-08-07 21:00:10 remacle Exp $
+# $Id: Makefile,v 1.17 2001-08-09 18:28:24 remacle Exp $
#
# Makefile for "libJpeg.a"
#
@@ -51,3 +51,42 @@ 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