diff --git a/Mesh/Makefile b/Mesh/Makefile index 63b9a83b9ef9838d0fb0b454b4066a8ad478174b..305dcac1d6ba6c73a0140a223c091bf912d80826 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.82 2005-04-15 14:32:40 remacle Exp $ +# $Id: Makefile,v 1.83 2005-04-15 14:33:50 remacle Exp $ # # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle # @@ -83,7 +83,7 @@ ${LIB}: ${OBJ} ${RANLIB} ${LIB} .cpp.o: - ${CXX} ${CFLAGS} -c -pg $< + ${CXX} ${CFLAGS} -c $< # Don't optimize 3D_Mesh: it sometimes mysteriously crashes on Linux 3D_Mesh.o: diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h index 7676ba9d4bef62138e7f5945e03a8f56f8a2b1ab..751a3ec88dfcca5172e902b13eefb8911ba077e3 100644 --- a/Mesh/Mesh.h +++ b/Mesh/Mesh.h @@ -489,6 +489,7 @@ void ActionLiss(void *data, void *dummy); void ActionLissSurf(void *data, void *dummy); int Recombine(Tree_T *TreeAllVert, Tree_T *TreeAllSimp, Tree_T *TreeAllQuad, double a); +int Recombine_All(Mesh *M); void ApplyLcFactor(Mesh *M); void ExportLcField(Mesh *M, char *filename, int volume=1, int surface=1); diff --git a/Mesh/Vertex.cpp b/Mesh/Vertex.cpp index e844395a093d942f283298d06dd64ba20868ae0d..20f76b2f577ff31f903aa2e61740f9dae48ecfcb 100644 --- a/Mesh/Vertex.cpp +++ b/Mesh/Vertex.cpp @@ -1,4 +1,4 @@ -// $Id: Vertex.cpp,v 1.26 2005-01-01 19:35:31 geuzaine Exp $ +// $Id: Vertex.cpp,v 1.27 2005-04-15 14:32:40 remacle Exp $ // // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle // @@ -159,7 +159,7 @@ int comparePosition(const void *a, const void *b) int i, j; Vertex **q, **w; // TOLERANCE ! WARNING WARNING - double eps = 1.e-10 * CTX.lc; + double eps = 1.e-6 * CTX.lc; q = (Vertex **) a; w = (Vertex **) b;