Skip to content
Snippets Groups Projects
Commit 99aa5f83 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent faf5de7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 77 additions and 141 deletions
Common/GmshDefines.h
+ 7
− 0
View file @ 99aa5f83
...@@ -50,6 +50,13 @@ ...@@ -50,6 +50,13 @@
#define PYR2 14 #define PYR2 14
#define PNT 15 #define PNT 15
// Geometrical entities
#define ENT_NONE 0
#define ENT_POINT 1
#define ENT_LINE 2
#define ENT_SURFACE 3
#define ENT_VOLUME 4
#define CONV_VALUE 0.8 #define CONV_VALUE 0.8
#define VIS_GEOM (1<<0) #define VIS_GEOM (1<<0)
......
Geo/Geo.h
+ 2
− 6
View file @ 99aa5f83
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
#define NMAX_SPLINE 100 #define NMAX_SPLINE 100
#define ENT_NONE 0
#define ENT_POINT 1
#define ENT_LINE 2
#define ENT_SURFACE 3
#define ENT_VOLUME 4
#define MSH_TRSF_LINE 1 #define MSH_TRSF_LINE 1
#define MSH_TRSF_SURFACE 2 #define MSH_TRSF_SURFACE 2
#define MSH_TRSF_VOLUME 3 #define MSH_TRSF_VOLUME 3
...@@ -130,4 +124,6 @@ void extrude(List_T *list, char *fich, char *what, char *tx, char *ty, char *tz) ...@@ -130,4 +124,6 @@ void extrude(List_T *list, char *fich, char *what, char *tx, char *ty, char *tz)
void protude(List_T *list, char *fich, char *what, char *ax, char *ay, char *az, void protude(List_T *list, char *fich, char *what, char *ax, char *ay, char *az,
char *px, char *py, char *pz, char *angle); char *px, char *py, char *pz, char *angle);
void Print_Geo(char *c);
#endif #endif
Graphics/CreateFile.cpp
+ 2
− 2
View file @ 99aa5f83
// $Id: CreateFile.cpp,v 1.89 2006-08-07 21:04:05 geuzaine Exp $ // $Id: CreateFile.cpp,v 1.90 2006-08-07 22:02:29 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "OpenFile.h" #include "OpenFile.h"
#include "Context.h" #include "Context.h"
#include "Options.h" #include "Options.h"
#include "Mesh.h" #include "Geo.h"
#include "GModel.h" #include "GModel.h"
#include "gl2ps.h" #include "gl2ps.h"
......
Graphics/Draw.cpp
+ 4
− 9
View file @ 99aa5f83
// $Id: Draw.cpp,v 1.98 2006-08-04 14:28:02 geuzaine Exp $ // $Id: Draw.cpp,v 1.99 2006-08-07 22:02:29 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Geo.h" #include "GmshDefines.h"
#include "CAD.h" #include "CAD.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Context.h" #include "Context.h"
#include "Numeric.h" #include "Numeric.h"
#include "GModel.h" #include "GModel.h"
extern Mesh *THEM;
extern Context_T CTX; extern Context_T CTX;
extern GModel *GMODEL; extern GModel *GMODEL;
...@@ -37,11 +35,8 @@ extern GModel *GMODEL; ...@@ -37,11 +35,8 @@ extern GModel *GMODEL;
int NeedPolygonOffset() int NeedPolygonOffset()
{ {
if(THEM->status == 2 && // FIXME: this should be improved!
(CTX.mesh.surfaces_edges || CTX.geom.lines || CTX.geom.surfaces)) if(CTX.geom.lines || CTX.mesh.surfaces_edges || CTX.mesh.volumes_edges)
return 1;
if(THEM->status == 3 &&
(CTX.mesh.surfaces_edges || CTX.mesh.volumes_edges))
return 1; return 1;
for(int i = 0; i < List_Nbr(CTX.post.list); i++){ for(int i = 0; i < List_Nbr(CTX.post.list); i++){
Post_View *v = *(Post_View**)List_Pointer(CTX.post.list, i); Post_View *v = *(Post_View**)List_Pointer(CTX.post.list, i);
......
Graphics/Entity.cpp
+ 1
− 2
View file @ 99aa5f83
// $Id: Entity.cpp,v 1.65 2006-07-14 13:31:08 geuzaine Exp $ // $Id: Entity.cpp,v 1.66 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// //
// Please report all bugs and problems to <gmsh@geuz.org>. // Please report all bugs and problems to <gmsh@geuz.org>.
#include "Mesh.h"
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Numeric.h" #include "Numeric.h"
......
Graphics/Graph2D.cpp
+ 1
− 2
View file @ 99aa5f83
// $Id: Graph2D.cpp,v 1.56 2006-01-06 00:34:24 geuzaine Exp $ // $Id: Graph2D.cpp,v 1.57 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "GmshUI.h" #include "GmshUI.h"
#include "Context.h" #include "Context.h"
#include "Numeric.h" #include "Numeric.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Views.h" #include "Views.h"
#include "gl2ps.h" #include "gl2ps.h"
......
Graphics/Iso.cpp
+ 1
− 3
View file @ 99aa5f83
// $Id: Iso.cpp,v 1.36 2006-01-14 16:24:54 geuzaine Exp $ // $Id: Iso.cpp,v 1.37 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Geo.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Context.h" #include "Context.h"
#include "Views.h" #include "Views.h"
......
Graphics/Makefile
+ 40
− 84
View file @ 99aa5f83
# $Id: Makefile,v 1.88 2006-08-07 19:08:12 geuzaine Exp $ # $Id: Makefile,v 1.89 2006-08-07 22:02:30 geuzaine Exp $
# #
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
# #
...@@ -72,14 +72,14 @@ depend: ...@@ -72,14 +72,14 @@ depend:
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \ 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 \ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/Geo.h \ ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \ ../Common/GmshDefines.h ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \ ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
../Geo/ExtrudeParams.h Draw.h ../Common/Views.h ../Common/ColorTable.h \ ../Geo/ExtrudeParams.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \ ../Common/VertexArray.h ../Common/SmoothNormals.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
...@@ -129,57 +129,30 @@ Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \ ...@@ -129,57 +129,30 @@ Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.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 \ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \ ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \ ../Numeric/Numeric.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \ ../Common/VertexArray.h ../Common/SmoothNormals.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ ../Common/Context.h gl2ps.h
../Geo/ExtrudeParams.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
gl2ps.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
PostElement.o: PostElement.cpp ../Common/Gmsh.h ../Common/Message.h \ PostElement.o: PostElement.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \ ../Common/GmshUI.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \ ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.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 ../Common/GmshDefines.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
Iso.h ../Common/Context.h Iso.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \ Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/Geo.h \ ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h Draw.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h
../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
Entity.o: Entity.cpp ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h \ Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \ ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Common/Views.h \
../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../Common/GmshUI.h Draw.h ../Common/Views.h \
../Common/ColorTable.h ../Common/VertexArray.h \ ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \ ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
...@@ -195,14 +168,8 @@ ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Gmsh.h ../Common/Message.h \ ...@@ -195,14 +168,8 @@ ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Gmsh.h ../Common/Message.h \
Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \ Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Numeric/Numeric.h ../Mesh/Mesh.h ../Mesh/Vertex.h \ ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h ../Common/Views.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \ ../Common/ColorTable.h ../Common/VertexArray.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 ../Common/GmshDefines.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \ ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
gl2ps.h gl2ps.h
...@@ -210,14 +177,8 @@ Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \ ...@@ -210,14 +177,8 @@ Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
Graph2D.o: Graph2D.cpp ../Common/Gmsh.h ../Common/Message.h \ Graph2D.o: Graph2D.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Common/Context.h ../Numeric/Numeric.h \ ../Common/GmshUI.h ../Common/Context.h ../Numeric/Numeric.h Draw.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.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 ../Common/GmshDefines.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \ ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h gl2ps.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h gl2ps.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
...@@ -225,25 +186,20 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \ ...@@ -225,25 +186,20 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Parser/OpenFile.h ../Common/Context.h \ ../Common/GmshUI.h ../Parser/OpenFile.h ../Common/Context.h \
../Common/Options.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \ ../Common/Options.h ../Geo/Geo.h ../Geo/GModel.h ../Geo/GVertex.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.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 \
../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/MVertex.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/MVertex.h \
../Geo/MVertex.h ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/GEntity.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/GEdge.h \
../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/GFace.h \ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \ ../Numeric/Numeric.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/MElement.h ../Geo/SBoundingBox3d.h gl2ps.h gl2gif.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
PixelBuffer.h Draw.h ../Common/Views.h ../Common/ColorTable.h \ ../Geo/SBoundingBox3d.h gl2ps.h gl2gif.h PixelBuffer.h Draw.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \ ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
gl2jpeg.h gl2png.h gl2ppm.h gl2yuv.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h gl2jpeg.h gl2png.h \
gl2ppm.h gl2yuv.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
gl2ps.o: gl2ps.cpp gl2ps.h gl2ps.o: gl2ps.cpp gl2ps.h
# 1 "/Users/geuzaine/.gmsh/Graphics//" # 1 "/Users/geuzaine/.gmsh/Graphics//"
......
Graphics/Mesh.cpp
+ 3
− 3
View file @ 99aa5f83
// $Id: Mesh.cpp,v 1.155 2006-08-04 14:28:02 geuzaine Exp $ // $Id: Mesh.cpp,v 1.156 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -83,8 +83,8 @@ void Draw_Mesh() ...@@ -83,8 +83,8 @@ void Draw_Mesh()
/* /*
if(CTX.mesh.changed){ if(CTX.mesh.changed){
if(THEM->normals) delete THEM->normals; if(GMODEL->normals) delete GMODEL->normals;
THEM->normals = new smooth_normals(CTX.mesh.angle_smooth_normals); GMODEL->normals = new smooth_normals(CTX.mesh.angle_smooth_normals);
} }
*/ */
......
Graphics/Post.cpp
+ 1
− 3
View file @ 99aa5f83
// $Id: Post.cpp,v 1.106 2006-08-04 14:28:02 geuzaine Exp $ // $Id: Post.cpp,v 1.107 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Numeric.h" #include "Numeric.h"
#include "Geo.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Views.h" #include "Views.h"
#include "Context.h" #include "Context.h"
......
Graphics/PostElement.cpp
+ 13
− 24
View file @ 99aa5f83
// $Id: PostElement.cpp,v 1.74 2006-07-14 13:31:08 geuzaine Exp $ // $Id: PostElement.cpp,v 1.75 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -25,16 +25,10 @@ ...@@ -25,16 +25,10 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Geo.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Iso.h" #include "Iso.h"
#include "Context.h" #include "Context.h"
#include "Numeric.h" #include "Numeric.h"
#include <iostream>
#include <math.h>
using namespace std;
extern Context_T CTX; extern Context_T CTX;
...@@ -1270,22 +1264,18 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals, ...@@ -1270,22 +1264,18 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals,
case POST_PYRAMID: nbnod = 5; break; case POST_PYRAMID: nbnod = 5; break;
} }
/// By lack of any current better solution, tensors are displayed as
/// their Von Mises invariant (J2 invariant); this will simply call
/// the scalar function...
int ts = View->TimeStep; int ts = View->TimeStep;
if(View->TensorType == DRAW_POST_VONMISES){ if(View->TensorType == DRAW_POST_VONMISES){
View->TimeStep = 0;
View->TimeStep = 0;
double V_VonMises[8]; double V_VonMises[8];
for(int i = 0; i < nbnod; i++){ for(int i = 0; i < nbnod; i++)
V_VonMises[i] = ComputeVonMises(V + 9*(i + nbnod * ts)); V_VonMises[i] = ComputeVonMises(V + 9*(i + nbnod * ts));
} Draw_ScalarElement(type, View, preproNormals, ValMin, ValMax,
Draw_ScalarElement(type, View, preproNormals, ValMin, ValMax, iX, iY, iZ, V_VonMises); iX, iY, iZ, V_VonMises);
}
}
else if(View->TensorType == DRAW_POST_LMGC90 || else if(View->TensorType == DRAW_POST_LMGC90 ||
View->TensorType == DRAW_POST_LMGC90_TYPE || View->TensorType == DRAW_POST_LMGC90_TYPE ||
View->TensorType == DRAW_POST_LMGC90_COORD || View->TensorType == DRAW_POST_LMGC90_COORD ||
...@@ -1297,9 +1287,7 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals, ...@@ -1297,9 +1287,7 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals,
View->TensorType == DRAW_POST_LMGC90_DEPAV || View->TensorType == DRAW_POST_LMGC90_DEPAV ||
View->TensorType == DRAW_POST_LMGC90_DEPNORM){ View->TensorType == DRAW_POST_LMGC90_DEPNORM){
//cout << View->TensorType << endl; static double zmin[3], zmax[3];
static double zmin[3],zmax[3];
int it; int it;
double DEP[3]; // déplacement relatif cdf % a config de référence double DEP[3]; // déplacement relatif cdf % a config de référence
double CDG[3]; // coordonnées du centre de gravité au tps t0 double CDG[3]; // coordonnées du centre de gravité au tps t0
...@@ -1584,7 +1572,8 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals, ...@@ -1584,7 +1572,8 @@ void Draw_TensorElement(int type, Post_View * View, int preproNormals,
glCallList((* View->DisplayListsOfGrains )[(int)V[6]]); glCallList((* View->DisplayListsOfGrains )[(int)V[6]]);
glPopMatrix(); glPopMatrix();
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
} }
View->TimeStep = ts; View->TimeStep = ts;
} }
......
Graphics/Scale.cpp
+ 1
− 2
View file @ 99aa5f83
// $Id: Scale.cpp,v 1.62 2006-01-06 00:34:25 geuzaine Exp $ // $Id: Scale.cpp,v 1.63 2006-08-07 22:02:30 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "Numeric.h" #include "Numeric.h"
#include "Mesh.h"
#include "Draw.h" #include "Draw.h"
#include "Context.h" #include "Context.h"
#include "Views.h" #include "Views.h"
......
Mesh/Mesh.h
+ 1
− 1
View file @ 99aa5f83
...@@ -361,7 +361,7 @@ void mai3d(int Asked); ...@@ -361,7 +361,7 @@ void mai3d(int Asked);
void Init_Mesh0(); void Init_Mesh0();
void Init_Mesh(); void Init_Mesh();
void Print_Geo(char *c);
void GetStatistics(double s[50]); void GetStatistics(double s[50]);
void GetDefaultMeshFileName(int Type, char *name); void GetDefaultMeshFileName(int Type, char *name);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment