diff --git a/Makefile b/Makefile index 8fa95a6e02508b2823a6f76543b6390fc01fd607..fc1e920c92ce7054c1783b43e1a9b2fe2e36fe6c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.129 2001-08-14 12:53:17 geuzaine Exp $ +# $Id: Makefile,v 1.130 2001-08-14 16:10:47 geuzaine Exp $ GMSH_RELEASE = 1.23 MAKE = make @@ -267,19 +267,10 @@ compile_linux_gcc-2.95: "GL_INCLUDE=-I/usr/X11R6/include" \ "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \ ); done - rm -f Mesh/3D_Extrude.o - @for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \ - "CC=$(HOME)/gcc-2.95.3/bin/g++" \ - "C_FLAGS=-O0" \ - "OS_FLAGS=-D_LITTLE_ENDIAN" \ - "VERSION_FLAGS=-D_FLTK" \ - "GL_INCLUDE=-I/usr/X11R6/include" \ - "GUI_INCLUDE=-I$(HOME)/SOURCES/fltk" \ - ); done link_linux_gcc-2.95: $(HOME)/gcc-2.95.3/bin/g++ -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) $(OPENGL_LIB) \ -L$(HOME)/SOURCES/fltk/lib $(FLTK_LIB) -L/usr/X11R6/lib $(X11_LIB) -lm -ldl -linux_gcc-2.95: tag compile_linux_gcc-2.95 link_linux-2.95 strip_bin +linux_gcc-2.95: tag compile_linux_gcc-2.95 link_linux_gcc-2.95 strip_bin rpm: src mv $(GMSH_SRCRPM).tar.gz /usr/src/redhat/SOURCES rpm -bb utils/gmsh_fltk.spec diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp index 2d737d5a52542f8c8a70bd08ce5bf5f801097638..65aad8bbdfd2c99aec14157b133cadceaba3003d 100644 --- a/Mesh/3D_Extrude.cpp +++ b/Mesh/3D_Extrude.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Extrude.cpp,v 1.31 2001-08-14 15:39:56 geuzaine Exp $ +// $Id: 3D_Extrude.cpp,v 1.32 2001-08-14 16:10:47 geuzaine Exp $ #include "Gmsh.h" #include "Numeric.h" @@ -695,6 +695,8 @@ int Extrude_Mesh (Volume * v){ if (!v->Extrude || !v->Extrude->mesh.ExtrudeMesh) return false; + InitExtrude (); + Msg(STATUS3, "Meshing Volume %d", v->Num); ep = v->Extrude; @@ -714,19 +716,10 @@ int Extrude_Mesh (Volume * v){ List_Delete (list); } - /* Hey, qu'est-ce que ca fout encore la, ca ? - list = Tree2List (s->Vertices); - for (i = 0; i < List_Nbr (list); i++){ - List_Read (list, i, &v1); - Extrude_Vertex (&v1, NULL); - } - List_Delete (list); - */ - Extrude_Surface1 (s); if(!ep->mesh.Recombine){ - j = TEST_IS_ALL_OK; + j = 0; do{ TEST_IS_ALL_OK = 0; Extrude_Surface2 (s); diff --git a/Mesh/3D_Extrude_Old.cpp b/Mesh/3D_Extrude_Old.cpp index 2d22ec0ee5160c980eeb5919c8e7ac452b85085c..4776d710614bdbb5b59728077f5a7a519ceaa9c6 100644 --- a/Mesh/3D_Extrude_Old.cpp +++ b/Mesh/3D_Extrude_Old.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Extrude_Old.cpp,v 1.12 2001-08-11 23:28:32 geuzaine Exp $ +// $Id: 3D_Extrude_Old.cpp,v 1.13 2001-08-14 16:10:47 geuzaine Exp $ // This is the old extrusion mesh generator -> only available through // the command line option -extrude (w/o -recombine). This mesh @@ -567,7 +567,7 @@ void Extrude_Mesh_Old(Mesh *M){ Tree_Action(M->Surfaces, Extrude_Surface1); if(!CTX.mesh.oldxtrude_recombine){ - j = TEST_IS_ALL_OK; + j = 0; do{ TEST_IS_ALL_OK=0; Tree_Action ( M->Surfaces , Extrude_Surface2 );