diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp index b2a1cb1852c71250be7a9940f001cc50099c3950..e29ccc51bb7e8145ca5954abd330cefeaecd5c45 100644 --- a/Geo/GModelIO_Mesh.cpp +++ b/Geo/GModelIO_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: GModelIO_Mesh.cpp,v 1.8 2007-02-27 17:15:46 remacle Exp $ +// $Id: GModelIO_Mesh.cpp,v 1.9 2007-02-27 22:09:44 geuzaine Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -706,12 +706,12 @@ int GModel::writeMSH(const std::string &name, double version, bool binary, for(viter it = firstVertex(); it != lastVertex(); ++it) writeElementsMSH(fp, (*it)->mesh_vertices, saveAll, version, binary, num, (*it)->tag(), (*it)->physicals); - writeElementHeaderMSH(binary, fp, elements, MSH_LIN_2, MSH_LIN_3,MSH_LIN_4,MSH_LIN_5); + writeElementHeaderMSH(binary, fp, elements, MSH_LIN_2, MSH_LIN_3, MSH_LIN_4, MSH_LIN_5); for(eiter it = firstEdge(); it != lastEdge(); ++it) writeElementsMSH(fp, (*it)->lines, saveAll, version, binary, num, (*it)->tag(), (*it)->physicals); writeElementHeaderMSH(binary, fp, elements, MSH_TRI_3, MSH_TRI_6, MSH_TRI_9, - MSH_TRI_10, MSH_TRI_12, MSH_TRI_15, MSH_TRI_15I,MSH_TRI_21); + MSH_TRI_10, MSH_TRI_12, MSH_TRI_15, MSH_TRI_15I, MSH_TRI_21); for(fiter it = firstFace(); it != lastFace(); ++it) writeElementsMSH(fp, (*it)->triangles, saveAll, version, binary, num, (*it)->tag(), (*it)->physicals); diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp index ac259f2b965e021d51f451a61f906e9d271fb4af..b60d0f57b02d3f17cb925f6c7603af0ddd40e3d0 100644 --- a/Geo/GModelIO_OCC.cpp +++ b/Geo/GModelIO_OCC.cpp @@ -1,4 +1,4 @@ -// $Id: GModelIO_OCC.cpp,v 1.18 2007-02-27 17:15:46 remacle Exp $ +// $Id: GModelIO_OCC.cpp,v 1.19 2007-02-27 22:09:44 geuzaine Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -392,11 +392,11 @@ void OCC_Internals::loadBREP(const char *fn) BRepTools::Read(shape, (char*)fn, aBuilder); BRepTools::Clean(shape); buildLists(); -// HealGeometry(CTX.geom.tolerance, -// CTX.geom.occ_fix_small_edges, -// CTX.geom.occ_fix_small_faces, -// CTX.geom.occ_sew_faces); -// BRepTools::Clean(shape); + HealGeometry(CTX.geom.tolerance, + CTX.geom.occ_fix_small_edges, + CTX.geom.occ_fix_small_faces, + CTX.geom.occ_sew_faces); + BRepTools::Clean(shape); } void OCC_Internals::loadSTEP(const char *fn) @@ -412,7 +412,6 @@ void OCC_Internals::loadSTEP(const char *fn) CTX.geom.occ_fix_small_edges, CTX.geom.occ_fix_small_faces, CTX.geom.occ_sew_faces); - buildLists(); BRepTools::Clean(shape); } diff --git a/Geo/MElement.h b/Geo/MElement.h index 16d838faa148d92fea0998c7301a93c84f0293ee..5545a6ca0fb7db587991ce1d1568d073e2a20e1c 100644 --- a/Geo/MElement.h +++ b/Geo/MElement.h @@ -385,8 +385,7 @@ class MTriangle6 : public MTriangle { getVertex(trifaces_tri2[num][1]), getVertex(trifaces_tri2[num][2])); } - virtual int getTypeForMSH(){ - return MSH_TRI_6; } + virtual int getTypeForMSH(){ return MSH_TRI_6; } virtual int getTypeForUNV(){ return 92; } // thin shell parabolic triangle virtual char *getStringForPOS(){ return "ST2"; } virtual char *getStringForBDF(){ return "CTRIA6"; }