diff --git a/Adapt/Makefile b/Adapt/Makefile
index 4cc763a74d0830a18a54da6a93291bb089fc7a1c..a2b4d0a667236ac971371017fa1c8f5cd3e24312 100644
--- a/Adapt/Makefile
+++ b/Adapt/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000-11-25 15:26:10 geuzaine Exp $
+# $Id: Makefile,v 1.5 2000-11-27 17:13:35 geuzaine Exp $
#
# Makefile for "libAdapt.a"
#
@@ -57,13 +57,13 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
-brent.o: brent.cpp nrutil.h ../Common/Const.h
-mnbrak.o: mnbrak.cpp nrutil.h ../Common/Const.h
-nrutil.o: nrutil.cpp
-optimesh.o: optimesh.cpp ../Common/Gmsh.h ../Common/Message.h \
+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
diff --git a/Geo/Makefile b/Geo/Makefile
index 875e8be3c6abb5275461197735bbf8a55bba0657..11aff7d57b710bf99c897aa9f2c5fb9680fe5cec 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000-11-25 15:26:10 geuzaine Exp $
+# $Id: Makefile,v 1.5 2000-11-27 17:13:45 geuzaine Exp $
#
# Makefile for "libGeo.a"
#
@@ -60,7 +60,7 @@ CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.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
+ ../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 \
@@ -83,8 +83,9 @@ Geo.o: Geo.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h ../Parser/Parser.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 Geo.h \
- StepGeomDatabase.h DataBase.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 \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index d3ecbcff909870d35099f4b57aaab0acf8f216ac..8a046f90a9bc3309494da5227b4ec7a79536b914 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2000-11-25 15:26:10 geuzaine Exp $
+# $Id: Makefile,v 1.4 2000-11-27 17:13:48 geuzaine Exp $
#
# Makefile for "libGraphics.a"
#
@@ -98,24 +98,6 @@ PostSimplex.o: PostSimplex.cpp ../Common/Gmsh.h ../Common/Message.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 ../Graphics/ColorTable.h Iso.h ../Common/Context.h
-PostTriangle.o: PostTriangle.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 ../Graphics/ColorTable.h Iso.h ../Common/Context.h
-PostLine.o: PostLine.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 ../Graphics/ColorTable.h Iso.h ../Common/Context.h
-PostPoint.o: PostPoint.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 ../Graphics/ColorTable.h Iso.h ../Common/Context.h
Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp
index e52d942bd756ef51dfb213a2328dcfe516dd6eab..e524d0966f097e0178a4deb36cb0b3a489604282 100644
--- a/Mesh/3D_Mesh.cpp
+++ b/Mesh/3D_Mesh.cpp
@@ -1,4 +1,4 @@
-/* $Id: 3D_Mesh.cpp,v 1.7 2000-11-26 15:43:46 geuzaine Exp $ */
+/* $Id: 3D_Mesh.cpp,v 1.8 2000-11-27 17:13:49 geuzaine Exp $ */
/*
J-F Remacle 1995
@@ -605,18 +605,18 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
if (!THES){
Msg(WARNING, "Vertex (%g,%g,%g) in no Simplex",
THEV->Pos.X,THEV->Pos.Y,THEV->Pos.Z);
- THEV->Pos.X += CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
- THEV->Pos.Y += CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
- THEV->Pos.Z += CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ THEV->Pos.X += 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ THEV->Pos.Y += 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ THEV->Pos.Z += 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
Tree_Action (m->Simplexes, Action_First_Simplexes);
}
bool ca_marche = Bowyer_Watson (m, THEV, THES, 1);
int count = 0;
while(!ca_marche){
count ++;
- double dx = rand_sign() * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
- double dy = rand_sign() * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
- double dz = rand_sign() * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ double dx = rand_sign() * 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ double dy = rand_sign() * 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
+ double dz = rand_sign() * 10 * CTX.mesh.rand_factor * LC3D * rand()/RAND_MAX;
THEV->Pos.X += dx;
THEV->Pos.Y += dy;
THEV->Pos.Z += dz;
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 1b603343ff700f120fc932d41912f0a0dc19a4c8..5303e816bf59c49b4eb9be137f6976893f148387 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000-11-25 15:26:11 geuzaine Exp $
+# $Id: Makefile,v 1.5 2000-11-27 17:13:49 geuzaine Exp $
#
# Makefile for "libMesh.a"
#
@@ -219,7 +219,7 @@ Print_Mesh.o: Print_Mesh.cpp ../Common/Gmsh.h ../Common/Message.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
+ 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 \
@@ -269,7 +269,9 @@ 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 Vertex.h ../DataStr/List.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
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 \
diff --git a/Unix/Makefile b/Unix/Makefile
index cf620387b4d7fc39046d5d0c86d5639ed3311b03..0b7ccaa2b6244bad59b6565b41b95ac8dfe16ec6 100644
--- a/Unix/Makefile
+++ b/Unix/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2000-11-25 15:26:12 geuzaine Exp $
+# $Id: Makefile,v 1.4 2000-11-27 17:13:50 geuzaine Exp $
#
# Makefile for "libUnix.a"
#
@@ -80,7 +80,7 @@ Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \
../Graphics/ColorTable.h ../Common/Context.h ../Parser/Parser.h \
../Geo/MinMax.h Widgets.h Pixmaps.h XColors.h XContext.h \
XRessources.h CbContext.h CbGeom.h Register.h Geometry.h \
- ../Common/Static.h ../Common/Version.h XStatic.h
+ ../Common/Static.h XStatic.h ../Common/Version.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 \