-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
// ---
// File : BLSURFPlugin_BLSURF.cxx
#include "BLSURFPlugin_Attractor.hxx"
extern "C"{
-#include <distene/api.h>
-#include <distene/blsurf.h>
-#include <distene/precad.h>
+#include <meshgems/meshgems.h>
+#include <meshgems/cadsurf.h>
+#include <meshgems/precad.h>
}
#include <structmember.h>
#include <Basics_Utils.hxx>
#include <Basics_OCCTVersion.hxx>
+#include <SMDS_EdgePosition.hxx>
#include <SMESHDS_Group.hxx>
#include <SMESH_Gen.hxx>
#include <SMESH_Group.hxx>
#include <SMESH_MeshEditor.hxx>
#include <SMESH_MesherHelper.hxx>
#include <StdMeshers_FaceSide.hxx>
+#include <StdMeshers_ViscousLayers2D.hxx>
+#include <SMESH_File.hxx>
#include <utilities.h>
#include <cstdlib>
// OPENCASCADE includes
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
+//#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepGProp.hxx>
+#include <BRepTools.hxx>
+#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
+#include <GProp_GProps.hxx>
+#include <Geom2d_Curve.hxx>
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+#include <NCollection_Map.hxx>
+#include <Standard_ErrorHandler.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
+#include <TopTools_DataMapOfShapeInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
-#include <NCollection_Map.hxx>
-
-#include <Geom_Surface.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Handle_Geom2d_Curve.hxx>
-#include <Geom_Curve.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_AIS_InteractiveObject.hxx>
-#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Compound.hxx>
#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
#include <TopoDS_Face.hxx>
-
-#include <gp_Pnt2d.hxx>
-#include <gp_Pnt.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
#include <TopoDS_Shape.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepTools.hxx>
-
-#include <TopTools_DataMapOfShapeInteger.hxx>
-#include <GProp_GProps.hxx>
-#include <BRepGProp.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
+#include <gp_XY.hxx>
+#include <gp_XYZ.hxx>
-#ifndef WNT
+#ifndef WIN32
#include <fenv.h>
#endif
-#include <Standard_ErrorHandler.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
-// #include <BRepClass_FaceClassifier.hxx>
-#include <TopTools_MapOfShape.hxx>
-
/* ==================================
* =========== PYTHON ==============
* ==================================*/
-typedef struct {
- PyObject_HEAD
- int softspace;
- std::string *out;
- } PyStdOut;
-
-static void
-PyStdOut_dealloc(PyStdOut *self)
+namespace
{
- PyObject_Del(self);
-}
+ typedef struct {
+ PyObject_HEAD
+ int softspace;
+ std::string *out;
+ } PyStdOut;
+
+ static void
+ PyStdOut_dealloc(PyStdOut *self)
+ {
+ PyObject_Del(self);
+ }
-static PyObject *
-PyStdOut_write(PyStdOut *self, PyObject *args)
-{
- char *c;
- int l;
- if (!PyArg_ParseTuple(args, "t#:write",&c, &l))
- return NULL;
+ static PyObject *
+ PyStdOut_write(PyStdOut *self, PyObject *args)
+ {
+ char *c;
+ int l;
+ if (!PyArg_ParseTuple(args, "t#:write",&c, &l))
+ return NULL;
- //std::cerr << c ;
- *(self->out)=*(self->out)+c;
+ *(self->out)=*(self->out)+c;
- Py_INCREF(Py_None);
- return Py_None;
-}
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
-static PyMethodDef PyStdOut_methods[] = {
- {"write", (PyCFunction)PyStdOut_write, METH_VARARGS,
- PyDoc_STR("write(string) -> None")},
- {NULL, NULL} /* sentinel */
-};
-
-static PyMemberDef PyStdOut_memberlist[] = {
- {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0,
- (char*)"flag indicating that a space needs to be printed; used by print"},
- {NULL} /* Sentinel */
-};
-
-static PyTypeObject PyStdOut_Type = {
- /* The ob_type field must be initialized in the module init function
- * to be portable to Windows without using C++. */
- PyObject_HEAD_INIT(NULL)
- 0, /*ob_size*/
- "PyOut", /*tp_name*/
- sizeof(PyStdOut), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- /* methods */
- (destructor)PyStdOut_dealloc, /*tp_dealloc*/
- 0, /*tp_print*/
- 0, /*tp_getattr*/
- 0, /*tp_setattr*/
- 0, /*tp_compare*/
- 0, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- 0, /*tp_hash*/
- 0, /*tp_call*/
- 0, /*tp_str*/
- PyObject_GenericGetAttr, /*tp_getattro*/
- /* softspace is writable: we must supply tp_setattro */
- PyObject_GenericSetAttr, /* tp_setattro */
- 0, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT, /*tp_flags*/
- 0, /*tp_doc*/
- 0, /*tp_traverse*/
- 0, /*tp_clear*/
- 0, /*tp_richcompare*/
- 0, /*tp_weaklistoffset*/
- 0, /*tp_iter*/
- 0, /*tp_iternext*/
- PyStdOut_methods, /*tp_methods*/
- PyStdOut_memberlist, /*tp_members*/
- 0, /*tp_getset*/
- 0, /*tp_base*/
- 0, /*tp_dict*/
- 0, /*tp_descr_get*/
- 0, /*tp_descr_set*/
- 0, /*tp_dictoffset*/
- 0, /*tp_init*/
- 0, /*tp_alloc*/
- 0, /*tp_new*/
- 0, /*tp_free*/
- 0, /*tp_is_gc*/
-};
-
-PyObject * newPyStdOut( std::string& out )
-{
- PyStdOut *self;
- self = PyObject_New(PyStdOut, &PyStdOut_Type);
- if (self == NULL)
- return NULL;
- self->softspace = 0;
- self->out=&out;
- return (PyObject*)self;
+ static PyMethodDef PyStdOut_methods[] = {
+ {"write", (PyCFunction)PyStdOut_write, METH_VARARGS,
+ PyDoc_STR("write(string) -> None")},
+ {NULL, NULL} /* sentinel */
+ };
+
+ static PyMemberDef PyStdOut_memberlist[] = {
+ {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0,
+ (char*)"flag indicating that a space needs to be printed; used by print"},
+ {NULL} /* Sentinel */
+ };
+
+ static PyTypeObject PyStdOut_Type = {
+ /* The ob_type field must be initialized in the module init function
+ * to be portable to Windows without using C++. */
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "PyOut", /*tp_name*/
+ sizeof(PyStdOut), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ /* methods */
+ (destructor)PyStdOut_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash*/
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ PyObject_GenericGetAttr, /*tp_getattro*/
+ /* softspace is writable: we must supply tp_setattro */
+ PyObject_GenericSetAttr, /* tp_setattro */
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT, /*tp_flags*/
+ 0, /*tp_doc*/
+ 0, /*tp_traverse*/
+ 0, /*tp_clear*/
+ 0, /*tp_richcompare*/
+ 0, /*tp_weaklistoffset*/
+ 0, /*tp_iter*/
+ 0, /*tp_iternext*/
+ PyStdOut_methods, /*tp_methods*/
+ PyStdOut_memberlist, /*tp_members*/
+ 0, /*tp_getset*/
+ 0, /*tp_base*/
+ 0, /*tp_dict*/
+ 0, /*tp_descr_get*/
+ 0, /*tp_descr_set*/
+ 0, /*tp_dictoffset*/
+ 0, /*tp_init*/
+ 0, /*tp_alloc*/
+ 0, /*tp_new*/
+ 0, /*tp_free*/
+ 0, /*tp_is_gc*/
+ };
+
+ PyObject * newPyStdOut( std::string& out )
+ {
+ PyStdOut* self = PyObject_New(PyStdOut, &PyStdOut_Type);
+ if (self) {
+ self->softspace = 0;
+ self->out=&out;
+ }
+ return (PyObject*)self;
+ }
}
////////////////////////END PYTHON///////////////////////////
//////////////////MY MAPS////////////////////////////////////////
+namespace {
TopTools_IndexedMapOfShape FacesWithSizeMap;
std::map<int,string> FaceId2SizeMap;
TopTools_IndexedMapOfShape EdgesWithSizeMap;
std::map<int,PyObject*> EdgeId2PythonSmp;
std::map<int,PyObject*> VertexId2PythonSmp;
+typedef std::map<int, std::vector< BLSURFPlugin_Attractor* > > TId2ClsAttractorVec;
+TId2ClsAttractorVec FaceId2ClassAttractor;
+TId2ClsAttractorVec FaceIndex2ClassAttractor;
std::map<int,std::vector<double> > FaceId2AttractorCoords;
-std::map<int,BLSURFPlugin_Attractor*> FaceId2ClassAttractor;
-std::map<int,BLSURFPlugin_Attractor*> FaceIndex2ClassAttractor;
+int theNbAttractors;
TopTools_IndexedMapOfShape FacesWithEnforcedVertices;
std::map< int, BLSURFPlugin_Hypothesis::TEnfVertexCoordsList > FaceId2EnforcedVertexCoords;
bool HasSizeMapOnEdge=false;
bool HasSizeMapOnVertex=false;
//bool HasAttractorOnFace=false;
-
+}
//=============================================================================
/*!
*
{
MESSAGE("BLSURFPlugin_BLSURF::BLSURFPlugin_BLSURF");
- _name = "BLSURF";
+ _name = "MG-CADSurf";//"BLSURF";
_shapeType = (1 << TopAbs_FACE); // 1 bit /shape type
_compatibleHypothesis.push_back(BLSURFPlugin_Hypothesis::GetHypType());
+ _compatibleHypothesis.push_back(StdMeshers_ViscousLayers2D::GetHypType());
_requireDiscreteBoundary = false;
_onlyUnaryInput = false;
_hypothesis = NULL;
myStudy = NULL;
myStudy = aStudyMgr->GetStudyByID(_studyId);
- if (myStudy)
+ if ( !myStudy->_is_nil() )
MESSAGE("myStudy->StudyId() = " << myStudy->StudyId());
/* Initialize the Python interpreter */
EnfVertexCoords2ProjVertex.clear();
EnfVertexCoords2EnfVertexList.clear();
-#ifdef WITH_SMESH_CANCEL_COMPUTE
_compute_canceled = false;
-#endif
}
//=============================================================================
const TopoDS_Shape& aShape,
SMESH_Hypothesis::Hypothesis_Status& aStatus)
{
- _hypothesis = NULL;
+ _hypothesis = NULL;
+ _haveViscousLayers = false;
list<const SMESHDS_Hypothesis*>::const_iterator itl;
const SMESHDS_Hypothesis* theHyp;
- const list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape);
- int nbHyp = hyps.size();
- if (!nbHyp)
+ const list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape,
+ /*ignoreAuxiliary=*/false);
+ aStatus = SMESH_Hypothesis::HYP_OK;
+ if ( hyps.empty() )
{
- aStatus = SMESH_Hypothesis::HYP_OK;
return true; // can work with no hypothesis
}
- itl = hyps.begin();
- theHyp = (*itl); // use only the first hypothesis
-
- string hypName = theHyp->GetName();
-
- if (hypName == "BLSURF_Parameters")
+ for ( itl = hyps.begin(); itl != hyps.end() && ( aStatus == HYP_OK ); ++itl )
{
- _hypothesis = static_cast<const BLSURFPlugin_Hypothesis*> (theHyp);
- ASSERT(_hypothesis);
- if ( _hypothesis->GetPhysicalMesh() == BLSURFPlugin_Hypothesis::DefaultSize &&
- _hypothesis->GetGeometricMesh() == BLSURFPlugin_Hypothesis::DefaultGeom )
- // hphy_flag = 0 and hgeo_flag = 0 is not allowed (spec)
- aStatus = SMESH_Hypothesis::HYP_BAD_PARAMETER;
+ theHyp = *itl;
+ string hypName = theHyp->GetName();
+ if ( hypName == BLSURFPlugin_Hypothesis::GetHypType() )
+ {
+ _hypothesis = static_cast<const BLSURFPlugin_Hypothesis*> (theHyp);
+ ASSERT(_hypothesis);
+ if ( _hypothesis->GetPhysicalMesh() == BLSURFPlugin_Hypothesis::DefaultSize &&
+ _hypothesis->GetGeometricMesh() == BLSURFPlugin_Hypothesis::DefaultGeom )
+ // hphy_flag = 0 and hgeo_flag = 0 is not allowed (spec)
+ aStatus = SMESH_Hypothesis::HYP_BAD_PARAMETER;
+ }
+ else if ( hypName == StdMeshers_ViscousLayers2D::GetHypType() )
+ {
+ if ( !_haveViscousLayers )
+ {
+ if ( error( StdMeshers_ViscousLayers2D::CheckHypothesis( aMesh, aShape, aStatus )))
+ _haveViscousLayers = true;
+ }
+ }
else
- aStatus = SMESH_Hypothesis::HYP_OK;
+ {
+ aStatus = SMESH_Hypothesis::HYP_INCOMPATIBLE;
+ }
}
- else
- aStatus = SMESH_Hypothesis::HYP_INCOMPATIBLE;
-
return aStatus == SMESH_Hypothesis::HYP_OK;
}
//=============================================================================
/*!
- * Pass parameters to BLSURF
+ * Pass parameters to MG-CADSurf
*/
//=============================================================================
-inline std::string to_string(double d)
+inline std::string val_to_string(double d)
+{
+ std::ostringstream o;
+ o << d;
+ return o.str();
+}
+
+inline std::string val_to_string_rel(double d)
{
std::ostringstream o;
o << d;
+ o << 'r';
+ return o.str();
+}
+
+inline std::string val_to_string(int i)
+{
+ std::ostringstream o;
+ o << i;
return o.str();
}
-inline std::string to_string(int i)
+inline std::string val_to_string_rel(int i)
{
std::ostringstream o;
o << i;
+ o << 'r';
return o.str();
}
double _smp_phy_size;
-// #if BLSURF_VERSION_LONG >= "3.1.1"
-// // sizemap_t *geo_sizemap_e, *geo_sizemap_f;
-// sizemap_t *iso_sizemap_p, *iso_sizemap_e, *iso_sizemap_f;
-// // sizemap_t *clean_geo_sizemap_e, *clean_geo_sizemap_f;
-// sizemap_t *clean_iso_sizemap_p, *clean_iso_sizemap_e, *clean_iso_sizemap_f;
-// #endif
status_t size_on_surface(integer face_id, real *uv, real *size, void *user_data);
status_t size_on_edge(integer edge_id, real t, real *size, void *user_data);
status_t size_on_vertex(integer vertex_id, real *size, void *user_data);
-double my_u_min=1e6,my_v_min=1e6,my_u_max=-1e6,my_v_max=-1e6;
-
typedef struct {
gp_XY uv;
gp_XYZ xyz;
GEOM::GEOM_Object_var aGeomObj;
TopoDS_Shape S = TopoDS_Shape();
SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
- SALOMEDS::GenericAttribute_var anAttr;
-
- if (!aSObj->_is_nil() && aSObj->FindAttribute(anAttr, "AttributeIOR")) {
- SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
- CORBA::String_var aVal = anIOR->Value();
- CORBA::Object_var obj = myStudy->ConvertIORToObject(aVal);
+ if (!aSObj->_is_nil()) {
+ CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
+ aSObj->UnRegister();
}
if ( !aGeomObj->_is_nil() )
S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
}
/////////////////////////////////////////////////////////
-void createAttractorOnFace(TopoDS_Shape GeomShape, std::string AttractorFunction)
+void createAttractorOnFace(TopoDS_Shape GeomShape, std::string AttractorFunction, double defaultSize)
{
MESSAGE("Attractor function: "<< AttractorFunction);
double xa, ya, za; // Coordinates of attractor point
// We construct the python function
ostringstream attractorFunctionStream;
attractorFunctionStream << "def f(u,v): return ";
- attractorFunctionStream << _smp_phy_size << "-(" << _smp_phy_size <<"-" << a << ")";
+ attractorFunctionStream << defaultSize << "-(" << defaultSize <<"-" << a << ")";
//attractorFunctionStream << "*exp(-((u-("<<u0<<"))*(u-("<<u0<<"))+(v-("<<v0<<"))*(v-("<<v0<<")))/(" << b << "*" << b <<"))";
// rnc: make possible to keep the size constant until
// a defined distance. Distance is expressed as the positiv part
// gp_Pnt myP(xyzPoint);
// TopoDS_Vertex myV = BRepBuilderAPI_MakeVertex(myP);
// BLSURFPlugin_Attractor myAttractor(TopoDS::Face(GeomShape),myV,200);
-// myAttractor.SetParameters(a, _smp_phy_size, b, d);
+// myAttractor.SetParameters(a, defaultSize, b, d);
// myAttractor.SetType(1);
// FaceId2ClassAttractor[key] = myAttractor;
// if(FaceId2ClassAttractor[key].GetFace().IsNull()){
// MESSAGE("point OK");
}
+// One sub-shape to get ids from
+BLSURFPlugin_BLSURF::TListOfIDs _getSubShapeIDsInMainShape(TopoDS_Shape theMainShape, TopoDS_Shape theSubShape,
+ TopAbs_ShapeEnum theShapeType)
+{
+ BLSURFPlugin_BLSURF::TListOfIDs face_ids;
+ TopTools_IndexedMapOfShape anIndices;
+ anIndices.Clear();
+ TopExp::MapShapes(theMainShape, theShapeType, anIndices);
+
+// Standard_Boolean result = BRepTools::Write(theMainShape,"main_shape.brep");
+
+ for (TopExp_Explorer face_iter(theSubShape,theShapeType);face_iter.More();face_iter.Next())
+ {
+ int face_id = anIndices.FindIndex(face_iter.Current());
+ if (face_id == 0)
+ throw SALOME_Exception ( SMESH_Comment("Sub_shape not found in main_shape"));
+ face_ids.push_back(face_id);
+// std::ostringstream o;
+// o << "face_" << face_id << ".brep";
+// std::string face_name = o.str();
+// const TopoDS_Face& face = TopoDS::Face(face_iter.Current());
+// Standard_Boolean result = BRepTools::Write(face,face_name.c_str());
+ }
+
+ return face_ids;
+}
+
+BLSURFPlugin_BLSURF::TListOfIDs _getSubShapeIDsInMainShape(SMESH_Mesh* theMesh,
+ TopoDS_Shape theSubShape,
+ TopAbs_ShapeEnum theShapeType)
+{
+ BLSURFPlugin_BLSURF::TListOfIDs face_ids;
+
+ for (TopExp_Explorer face_iter(theSubShape,theShapeType);face_iter.More();face_iter.Next())
+ {
+ int face_id = theMesh->GetMeshDS()->ShapeToIndex(face_iter.Current());
+ if (face_id == 0)
+ throw SALOME_Exception ( SMESH_Comment("Sub_shape not found in main_shape"));
+ face_ids.push_back(face_id);
+ }
+
+ return face_ids;
+}
+
+void BLSURFPlugin_BLSURF::addCoordsFromVertices(const std::vector<std::string> &theVerticesEntries, std::vector<double> &theVerticesCoords)
+{
+ for (std::vector<std::string>::const_iterator it = theVerticesEntries.begin(); it != theVerticesEntries.end(); it++)
+ {
+ BLSURFPlugin_Hypothesis::TEntry theVertexEntry = *it;
+ MESSAGE("Vertex entry " << theVertexEntry);
+ addCoordsFromVertex(theVertexEntry, theVerticesCoords);
+ }
+}
+
+
+void BLSURFPlugin_BLSURF::addCoordsFromVertex(BLSURFPlugin_Hypothesis::TEntry theVertexEntry, std::vector<double> &theVerticesCoords)
+{
+ if (theVertexEntry!="")
+ {
+ TopoDS_Shape aShape = entryToShape(theVertexEntry);
+
+ gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
+ double theX, theY, theZ;
+ theX = aPnt.X();
+ theY = aPnt.Y();
+ theZ = aPnt.Z();
+
+ theVerticesCoords.push_back(theX);
+ theVerticesCoords.push_back(theY);
+ theVerticesCoords.push_back(theZ);
+ }
+}
+
/////////////////////////////////////////////////////////
+void BLSURFPlugin_BLSURF::createPreCadFacesPeriodicity(TopoDS_Shape theGeomShape, const BLSURFPlugin_Hypothesis::TPreCadPeriodicity &preCadPeriodicity)
+{
+ MESSAGE("BLSURFPlugin_BLSURF::createFacesPeriodicity");
-void BLSURFPlugin_BLSURF::SetParameters(
-// #if BLSURF_VERSION_LONG >= "3.1.1"
-// cad_t * c,
-// #endif
- const BLSURFPlugin_Hypothesis* hyp,
- blsurf_session_t * bls,
+ TopoDS_Shape geomShape1 = entryToShape(preCadPeriodicity.shape1Entry);
+ TopoDS_Shape geomShape2 = entryToShape(preCadPeriodicity.shape2Entry);
+
+ TListOfIDs theFace1_ids = _getSubShapeIDsInMainShape(theGeomShape, geomShape1, TopAbs_FACE);
+ TListOfIDs theFace2_ids = _getSubShapeIDsInMainShape(theGeomShape, geomShape2, TopAbs_FACE);
+
+ TPreCadPeriodicityIDs preCadFacesPeriodicityIDs;
+ preCadFacesPeriodicityIDs.shape1IDs = theFace1_ids;
+ preCadFacesPeriodicityIDs.shape2IDs = theFace2_ids;
+
+ MESSAGE("preCadPeriodicity.theSourceVerticesEntries.size(): " << preCadPeriodicity.theSourceVerticesEntries.size());
+ MESSAGE("preCadPeriodicity.theTargetVerticesEntries.size(): " << preCadPeriodicity.theTargetVerticesEntries.size());
+
+ addCoordsFromVertices(preCadPeriodicity.theSourceVerticesEntries, preCadFacesPeriodicityIDs.theSourceVerticesCoords);
+ addCoordsFromVertices(preCadPeriodicity.theTargetVerticesEntries, preCadFacesPeriodicityIDs.theTargetVerticesCoords);
+
+ MESSAGE("preCadFacesPeriodicityIDs.theSourceVerticesCoords.size(): " << preCadFacesPeriodicityIDs.theSourceVerticesCoords.size());
+ MESSAGE("preCadFacesPeriodicityIDs.theTargetVerticesCoords.size(): " << preCadFacesPeriodicityIDs.theTargetVerticesCoords.size());
+
+ _preCadFacesIDsPeriodicityVector.push_back(preCadFacesPeriodicityIDs);
+ MESSAGE("_preCadFacesIDsPeriodicityVector.size() = " << _preCadFacesIDsPeriodicityVector.size());
+ MESSAGE("BLSURFPlugin_BLSURF::createFacesPeriodicity END");
+
+}
+
+/////////////////////////////////////////////////////////
+void BLSURFPlugin_BLSURF::createPreCadEdgesPeriodicity(TopoDS_Shape theGeomShape, const BLSURFPlugin_Hypothesis::TPreCadPeriodicity &preCadPeriodicity)
+{
+ MESSAGE("BLSURFPlugin_BLSURF::createEdgesPeriodicity");
+
+ TopoDS_Shape geomShape1 = entryToShape(preCadPeriodicity.shape1Entry);
+ TopoDS_Shape geomShape2 = entryToShape(preCadPeriodicity.shape2Entry);
+
+ TListOfIDs theEdge1_ids = _getSubShapeIDsInMainShape(theGeomShape, geomShape1, TopAbs_EDGE);
+ TListOfIDs theEdge2_ids = _getSubShapeIDsInMainShape(theGeomShape, geomShape2, TopAbs_EDGE);
+
+ TPreCadPeriodicityIDs preCadEdgesPeriodicityIDs;
+ preCadEdgesPeriodicityIDs.shape1IDs = theEdge1_ids;
+ preCadEdgesPeriodicityIDs.shape2IDs = theEdge2_ids;
+
+ addCoordsFromVertices(preCadPeriodicity.theSourceVerticesEntries, preCadEdgesPeriodicityIDs.theSourceVerticesCoords);
+ addCoordsFromVertices(preCadPeriodicity.theTargetVerticesEntries, preCadEdgesPeriodicityIDs.theTargetVerticesCoords);
+
+ _preCadEdgesIDsPeriodicityVector.push_back(preCadEdgesPeriodicityIDs);
+ MESSAGE("_preCadEdgesIDsPeriodicityVector.size() = " << _preCadEdgesIDsPeriodicityVector.size());
+ MESSAGE("BLSURFPlugin_BLSURF::createEdgesPeriodicity END");
+
+}
+
+/////////////////////////////////////////////////////////
+void BLSURFPlugin_BLSURF::createFacesPeriodicity(TopoDS_Shape theGeomShape, BLSURFPlugin_Hypothesis::TEntry theFace1, BLSURFPlugin_Hypothesis::TEntry theFace2)
+{
+ MESSAGE("BLSURFPlugin_BLSURF::createFacesPeriodicity");
+
+ TopoDS_Shape GeomShape1 = entryToShape(theFace1);
+ TopoDS_Shape GeomShape2 = entryToShape(theFace2);
+
+ TListOfIDs theFace1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomShape1, TopAbs_FACE);
+ TListOfIDs theFace2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomShape2, TopAbs_FACE);
+
+ // Only one face id, since only a face can be selected
+ int theFace1_id = theFace1_ids[0];
+ int theFace2_id = theFace2_ids[0];
+
+ std::pair<int, int> pairOfFacesID = std::make_pair(theFace1_id, theFace2_id);
+
+ _facesIDsPeriodicityVector.push_back(pairOfFacesID);
+ MESSAGE("_facesIDsPeriodicityVector.size() = " << _facesIDsPeriodicityVector.size());
+ MESSAGE("BLSURFPlugin_BLSURF::createFacesPeriodicity END");
+
+}
+
+
+/////////////////////////////////////////////////////////
+void BLSURFPlugin_BLSURF::createEdgesPeriodicity(TopoDS_Shape theGeomShape, BLSURFPlugin_Hypothesis::TEntry theFace1, BLSURFPlugin_Hypothesis::TEntry theEdge1,
+ BLSURFPlugin_Hypothesis::TEntry theFace2, BLSURFPlugin_Hypothesis::TEntry theEdge2, int edge_orientation)
+{
+ MESSAGE("BLSURFPlugin_BLSURF::createEdgesPeriodicity");
+
+ TEdgePeriodicityIDs edgePeriodicityIDs;
+
+ if (theFace1 != "")
+ {
+ TopoDS_Shape GeomFace1 = entryToShape(theFace1);
+ TListOfIDs theFace1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomFace1, TopAbs_FACE);
+ // Only one face id, since only a face can be selected
+ edgePeriodicityIDs.theFace1ID = theFace1_ids[0];
+ }
+ else
+ edgePeriodicityIDs.theFace1ID = 0;
+ if (theFace2 != "")
+ {
+ TopoDS_Shape GeomFace2 = entryToShape(theFace2);
+ TListOfIDs theFace2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomFace2, TopAbs_FACE);
+ edgePeriodicityIDs.theFace2ID = theFace2_ids[0];
+ }
+ else
+ edgePeriodicityIDs.theFace2ID = 0;
+
+ TopoDS_Shape GeomEdge1 = entryToShape(theEdge1);
+ TopoDS_Shape GeomEdge2 = entryToShape(theEdge2);
+
+ TListOfIDs theEdge1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge1, TopAbs_EDGE);
+ TListOfIDs theEdge2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge2, TopAbs_EDGE);
+
+ if (edge_orientation == 0 && GeomEdge1.Closed())
+ {
+ // if edge is closed, we have to set its orientation
+ MESSAGE("GeomEdge1.Orientation() = " << GeomEdge1.Orientation());
+ MESSAGE("GeomEdge2.Orientation() = " << GeomEdge2.Orientation());
+ if(GeomEdge1.Orientation() == TopAbs_FORWARD)
+ edge_orientation = CAD_ORIENTATION_REVERSED;
+ else
+ edge_orientation = CAD_ORIENTATION_FORWARD;
+ }
+
+ // Only one edge id, since only a edge can be selected
+ edgePeriodicityIDs.theEdge1ID = theEdge1_ids[0];
+ edgePeriodicityIDs.theEdge2ID = theEdge2_ids[0];
+ edgePeriodicityIDs.edge_orientation = edge_orientation;
+
+ _edgesIDsPeriodicityVector.push_back(edgePeriodicityIDs);
+ MESSAGE("_edgesIDsPeriodicityVector.size() = " << _edgesIDsPeriodicityVector.size());
+ MESSAGE("BLSURFPlugin_BLSURF::createEdgesPeriodicity END");
+
+}
+
+
+/////////////////////////////////////////////////////////
+void BLSURFPlugin_BLSURF::createVerticesPeriodicity(TopoDS_Shape theGeomShape, BLSURFPlugin_Hypothesis::TEntry theEdge1, BLSURFPlugin_Hypothesis::TEntry theVertex1,
+ BLSURFPlugin_Hypothesis::TEntry theEdge2, BLSURFPlugin_Hypothesis::TEntry theVertex2)
+{
+ MESSAGE("BLSURFPlugin_BLSURF::createVerticesPeriodicity");
+
+ TopoDS_Shape GeomEdge1 = entryToShape(theEdge1);
+ TopoDS_Shape GeomVertex1 = entryToShape(theVertex1);
+ TopoDS_Shape GeomEdge2 = entryToShape(theEdge2);
+ TopoDS_Shape GeomVertex2 = entryToShape(theVertex2);
+
+ TListOfIDs theEdge1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge1, TopAbs_EDGE);
+ TListOfIDs vertices1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomVertex1, TopAbs_VERTEX);
+ TListOfIDs theEdge2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge2, TopAbs_EDGE);
+ TListOfIDs vertices2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomVertex2, TopAbs_VERTEX);
+
+ // Only one vertex id, since only a vertex can be selected
+ TVertexPeriodicityIDs vertexPeriodicityIDs;
+ vertexPeriodicityIDs.theEdge1ID = theEdge1_ids[0];
+ vertexPeriodicityIDs.theVertex1ID = vertices1_ids[0];
+ vertexPeriodicityIDs.theEdge2ID = theEdge2_ids[0];
+ vertexPeriodicityIDs.theVertex2ID = vertices2_ids[0];
+
+ _verticesIDsPeriodicityVector.push_back(vertexPeriodicityIDs);
+ MESSAGE("_verticesIDsPeriodicityVector.size() = " << _verticesIDsPeriodicityVector.size());
+ MESSAGE("BLSURFPlugin_BLSURF::createVerticesPeriodicity END");
+
+}
+
+/////////////////////////////////////////////////////////
+
+void BLSURFPlugin_BLSURF::SetParameters(const BLSURFPlugin_Hypothesis* hyp,
+ cadsurf_session_t * css,
precad_session_t * pcs,
- SMESH_Mesh& mesh,
- bool * use_precad
- )
+ const TopoDS_Shape& theGeomShape,
+ bool * use_precad
+ )
{
- int _topology = BLSURFPlugin_Hypothesis::GetDefaultTopology();
- int _physicalMesh = BLSURFPlugin_Hypothesis::GetDefaultPhysicalMesh();
- double _phySize = BLSURFPlugin_Hypothesis::GetDefaultPhySize();
- int _geometricMesh = BLSURFPlugin_Hypothesis::GetDefaultGeometricMesh();
- double _angleMeshS = BLSURFPlugin_Hypothesis::GetDefaultAngleMeshS();
- double _angleMeshC = BLSURFPlugin_Hypothesis::GetDefaultAngleMeshC();
- double _gradation = BLSURFPlugin_Hypothesis::GetDefaultGradation();
- bool _quadAllowed = BLSURFPlugin_Hypothesis::GetDefaultQuadAllowed();
- bool _decimesh = BLSURFPlugin_Hypothesis::GetDefaultDecimesh();
- int _verb = BLSURFPlugin_Hypothesis::GetDefaultVerbosity();
+ // rnc : Bug 1457
+ // Clear map so that it is not stored in the algorithm with old enforced vertices in it
+ EnfVertexCoords2EnfVertexList.clear();
+
+ double diagonal = SMESH_Mesh::GetShapeDiagonalSize( theGeomShape );
+ double bbSegmentation = _gen->GetBoundaryBoxSegmentation();
+ int _physicalMesh = BLSURFPlugin_Hypothesis::GetDefaultPhysicalMesh();
+ int _geometricMesh = BLSURFPlugin_Hypothesis::GetDefaultGeometricMesh();
+ double _phySize = BLSURFPlugin_Hypothesis::GetDefaultPhySize(diagonal, bbSegmentation);
+ bool _phySizeRel = BLSURFPlugin_Hypothesis::GetDefaultPhySizeRel();
+ double _minSize = BLSURFPlugin_Hypothesis::GetDefaultMinSize(diagonal);
+ bool _minSizeRel = BLSURFPlugin_Hypothesis::GetDefaultMinSizeRel();
+ double _maxSize = BLSURFPlugin_Hypothesis::GetDefaultMaxSize(diagonal);
+ bool _maxSizeRel = BLSURFPlugin_Hypothesis::GetDefaultMaxSizeRel();
+ double _gradation = BLSURFPlugin_Hypothesis::GetDefaultGradation();
+ bool _quadAllowed = BLSURFPlugin_Hypothesis::GetDefaultQuadAllowed();
+ double _angleMesh = BLSURFPlugin_Hypothesis::GetDefaultAngleMesh();
+ double _chordalError = BLSURFPlugin_Hypothesis::GetDefaultChordalError(diagonal);
+ bool _anisotropic = BLSURFPlugin_Hypothesis::GetDefaultAnisotropic();
+ double _anisotropicRatio = BLSURFPlugin_Hypothesis::GetDefaultAnisotropicRatio();
+ bool _removeTinyEdges = BLSURFPlugin_Hypothesis::GetDefaultRemoveTinyEdges();
+ double _tinyEdgeLength = BLSURFPlugin_Hypothesis::GetDefaultTinyEdgeLength(diagonal);
+ bool _badElementRemoval = BLSURFPlugin_Hypothesis::GetDefaultBadElementRemoval();
+ double _badElementAspectRatio = BLSURFPlugin_Hypothesis::GetDefaultBadElementAspectRatio();
+ bool _optimizeMesh = BLSURFPlugin_Hypothesis::GetDefaultOptimizeMesh();
+ bool _quadraticMesh = BLSURFPlugin_Hypothesis::GetDefaultQuadraticMesh();
+ int _verb = BLSURFPlugin_Hypothesis::GetDefaultVerbosity();
+ int _topology = BLSURFPlugin_Hypothesis::GetDefaultTopology();
// PreCAD
- int _precadMergeEdges = BLSURFPlugin_Hypothesis::GetDefaultPreCADMergeEdges();
- int _precadRemoveNanoEdges = BLSURFPlugin_Hypothesis::GetDefaultPreCADRemoveNanoEdges();
- int _precadDiscardInput = BLSURFPlugin_Hypothesis::GetDefaultPreCADDiscardInput();
- double _precadEpsNano = BLSURFPlugin_Hypothesis::GetDefaultPreCADEpsNano();
+ int _precadMergeEdges = BLSURFPlugin_Hypothesis::GetDefaultPreCADMergeEdges();
+ int _precadProcess3DTopology = BLSURFPlugin_Hypothesis::GetDefaultPreCADProcess3DTopology();
+ int _precadDiscardInput = BLSURFPlugin_Hypothesis::GetDefaultPreCADDiscardInput();
if (hyp) {
MESSAGE("BLSURFPlugin_BLSURF::SetParameters");
- _topology = (int) hyp->GetTopology();
_physicalMesh = (int) hyp->GetPhysicalMesh();
- _phySize = hyp->GetPhySize();
_geometricMesh = (int) hyp->GetGeometricMesh();
- _angleMeshS = hyp->GetAngleMeshS();
- _angleMeshC = hyp->GetAngleMeshC();
- _gradation = hyp->GetGradation();
- _quadAllowed = hyp->GetQuadAllowed();
- _decimesh = hyp->GetDecimesh();
+ if (hyp->GetPhySize() > 0) {
+ _phySize = hyp->GetPhySize();
+ // if user size is not explicitly specified, "relative" flag is ignored
+ _phySizeRel = hyp->IsPhySizeRel();
+ }
+ if (hyp->GetMinSize() > 0) {
+ _minSize = hyp->GetMinSize();
+ // if min size is not explicitly specified, "relative" flag is ignored
+ _minSizeRel = hyp->IsMinSizeRel();
+ }
+ if (hyp->GetMaxSize() > 0) {
+ _maxSize = hyp->GetMaxSize();
+ // if max size is not explicitly specified, "relative" flag is ignored
+ _maxSizeRel = hyp->IsMaxSizeRel();
+ }
+ if (hyp->GetGradation() > 0)
+ _gradation = hyp->GetGradation();
+ _quadAllowed = hyp->GetQuadAllowed();
+ if (hyp->GetAngleMesh() > 0)
+ _angleMesh = hyp->GetAngleMesh();
+ if (hyp->GetChordalError() > 0)
+ _chordalError = hyp->GetChordalError();
+ _anisotropic = hyp->GetAnisotropic();
+ if (hyp->GetAnisotropicRatio() >= 0)
+ _anisotropicRatio = hyp->GetAnisotropicRatio();
+ _removeTinyEdges = hyp->GetRemoveTinyEdges();
+ if (hyp->GetTinyEdgeLength() > 0)
+ _tinyEdgeLength = hyp->GetTinyEdgeLength();
+ _badElementRemoval = hyp->GetBadElementRemoval();
+ if (hyp->GetBadElementAspectRatio() >= 0)
+ _badElementAspectRatio = hyp->GetBadElementAspectRatio();
+ _optimizeMesh = hyp->GetOptimizeMesh();
+ _quadraticMesh = hyp->GetQuadraticMesh();
_verb = hyp->GetVerbosity();
- if ( hyp->GetPhyMin() != ::BLSURFPlugin_Hypothesis::undefinedDouble() )
- blsurf_set_param(bls, "hphymin", to_string(hyp->GetPhyMin()).c_str());
- if ( hyp->GetPhyMax() != ::BLSURFPlugin_Hypothesis::undefinedDouble() )
- blsurf_set_param(bls, "hphymax", to_string(hyp->GetPhyMax()).c_str());
- if ( hyp->GetGeoMin() != ::BLSURFPlugin_Hypothesis::undefinedDouble() )
- blsurf_set_param(bls, "hgeomin", to_string(hyp->GetGeoMin()).c_str());
- if ( hyp->GetGeoMax() != ::BLSURFPlugin_Hypothesis::undefinedDouble() )
- blsurf_set_param(bls, "hgeomax", to_string(hyp->GetGeoMax()).c_str());
-
- const BLSURFPlugin_Hypothesis::TOptionValues & opts = hyp->GetOptionValues();
+ _topology = (int) hyp->GetTopology();
+ // PreCAD
+ _precadMergeEdges = hyp->GetPreCADMergeEdges();
+ _precadProcess3DTopology = hyp->GetPreCADProcess3DTopology();
+ _precadDiscardInput = hyp->GetPreCADDiscardInput();
+
+ const BLSURFPlugin_Hypothesis::TOptionValues& opts = hyp->GetOptionValues();
BLSURFPlugin_Hypothesis::TOptionValues::const_iterator opIt;
for ( opIt = opts.begin(); opIt != opts.end(); ++opIt )
if ( !opIt->second.empty() ) {
- MESSAGE("blsurf_set_param(): " << opIt->first << " = " << opIt->second);
- blsurf_set_param(bls, opIt->first.c_str(), opIt->second.c_str());
+ MESSAGE("cadsurf_set_param(): " << opIt->first << " = " << opIt->second);
+ set_param(css, opIt->first.c_str(), opIt->second.c_str());
}
-
- const BLSURFPlugin_Hypothesis::TOptionValues & preCADopts = hyp->GetPreCADOptionValues();
+
+ const BLSURFPlugin_Hypothesis::TOptionValues& custom_opts = hyp->GetCustomOptionValues();
+ for ( opIt = custom_opts.begin(); opIt != custom_opts.end(); ++opIt )
+ if ( !opIt->second.empty() ) {
+ MESSAGE("cadsurf_set_param(): " << opIt->first << " = " << opIt->second);
+ set_param(css, opIt->first.c_str(), opIt->second.c_str());
+ }
+
+ const BLSURFPlugin_Hypothesis::TOptionValues& preCADopts = hyp->GetPreCADOptionValues();
for ( opIt = preCADopts.begin(); opIt != preCADopts.end(); ++opIt )
if ( !opIt->second.empty() ) {
- if (_topology == BLSURFPlugin_Hypothesis::PreCAD) {
- MESSAGE("precad_set_param(): " << opIt->first << " = " << opIt->second);
- blsurf_set_param(bls, opIt->first.c_str(), opIt->second.c_str());
- }
+ *use_precad = true;
+ MESSAGE("precad_set_param(): " << opIt->first << " = " << opIt->second);
+ precad_set_param(pcs, opIt->first.c_str(), opIt->second.c_str());
}
- // PreCAD
- _precadMergeEdges = hyp->GetPreCADMergeEdges();
- _precadRemoveNanoEdges = hyp->GetPreCADRemoveNanoEdges();
- _precadDiscardInput = hyp->GetPreCADDiscardInput();
- _precadEpsNano = hyp->GetPreCADEpsNano();
-
- } else {
- //0020968: EDF1545 SMESH: Problem in the creation of a mesh group on geometry
- // GetDefaultPhySize() sometimes leads to computation failure
- _phySize = mesh.GetShapeDiagonalSize() / _gen->GetBoundaryBoxSegmentation();
- MESSAGE("BLSURFPlugin_BLSURF::SetParameters using defaults");
+ const BLSURFPlugin_Hypothesis::TOptionValues& custom_preCADopts = hyp->GetCustomPreCADOptionValues();
+ for ( opIt = custom_preCADopts.begin(); opIt != custom_preCADopts.end(); ++opIt )
+ if ( !opIt->second.empty() ) {
+ *use_precad = true;
+ MESSAGE("precad_set_param(): " << opIt->first << " = " << opIt->second);
+ precad_set_param(pcs, opIt->first.c_str(), opIt->second.c_str());
+ }
}
+// else {
+// //0020968: EDF1545 SMESH: Problem in the creation of a mesh group on geometry
+// // GetDefaultPhySize() sometimes leads to computation failure
+// // GDD 26/07/2012 From Distene documentation, global physical size default value = diag/100
+// _phySize = BLSURFPlugin_Hypothesis::GetDefaultPhySize(diagonal);
+// _minSize = BLSURFPlugin_Hypothesis::GetDefaultMinSize(diagonal);
+// _maxSize = BLSURFPlugin_Hypothesis::GetDefaultMaxSize(diagonal);
+// _chordalError = BLSURFPlugin_Hypothesis::GetDefaultChordalError(diagonal);
+// _tinyEdgeLength = BLSURFPlugin_Hypothesis::GetDefaultTinyEdgeLength(diagonal);
+// MESSAGE("BLSURFPlugin_BLSURF::SetParameters using defaults");
+// }
// PreCAD
if (_topology == BLSURFPlugin_Hypothesis::PreCAD) {
*use_precad = true;
- precad_set_param(pcs, "verbose", to_string(_verb).c_str());
+ precad_set_param(pcs, "verbose", val_to_string(_verb).c_str());
precad_set_param(pcs, "merge_edges", _precadMergeEdges ? "1" : "0");
- precad_set_param(pcs, "remove_nano_edges", _precadRemoveNanoEdges ? "1" : "0");
+ precad_set_param(pcs, "process_3d_topology", _precadProcess3DTopology ? "1" : "0");
precad_set_param(pcs, "discard_input_topology", _precadDiscardInput ? "1" : "0");
- if ( _precadEpsNano != ::BLSURFPlugin_Hypothesis::undefinedDouble() )
- precad_set_param(pcs, "eps_nano", to_string(_precadEpsNano).c_str());
- }
-
- _smp_phy_size = _phySize;
- blsurf_set_param(bls, "topo_points", _topology == BLSURFPlugin_Hypothesis::Process || _topology == BLSURFPlugin_Hypothesis::Process2 ? "1" : "0");
- blsurf_set_param(bls, "topo_curves", _topology == BLSURFPlugin_Hypothesis::Process || _topology == BLSURFPlugin_Hypothesis::Process2 ? "1" : "0");
- blsurf_set_param(bls, "topo_project", _topology == BLSURFPlugin_Hypothesis::Process || _topology == BLSURFPlugin_Hypothesis::Process2 ? "1" : "0");
- blsurf_set_param(bls, "clean_boundary", _topology == BLSURFPlugin_Hypothesis::Process2 ? "1" : "0");
- blsurf_set_param(bls, "close_boundary", _topology == BLSURFPlugin_Hypothesis::Process2 ? "1" : "0");
- blsurf_set_param(bls, "hphy_flag", to_string(_physicalMesh).c_str());
- blsurf_set_param(bls, "hphydef", to_string(_phySize).c_str());
- blsurf_set_param(bls, "hgeo_flag", to_string(_geometricMesh).c_str());
- blsurf_set_param(bls, "relax_size", _decimesh ? "0": to_string(_geometricMesh).c_str());
- blsurf_set_param(bls, "angle_meshs", to_string(_angleMeshS).c_str());
- blsurf_set_param(bls, "angle_meshc", to_string(_angleMeshC).c_str());
- blsurf_set_param(bls, "gradation", to_string(_gradation).c_str());
- blsurf_set_param(bls, "patch_independent", _decimesh ? "1" : "0");
- blsurf_set_param(bls, "element", _quadAllowed ? "q1.0" : "p1");
- blsurf_set_param(bls, "verb", to_string(_verb).c_str());
+ }
+ // unlimit mesh size (issue 0022266)
+ set_param(css, "max_number_of_points_per_patch", "1000000");
- if (_physicalMesh == BLSURFPlugin_Hypothesis::SizeMap){
+ bool useGradation = false;
+ switch (_physicalMesh)
+ {
+ case BLSURFPlugin_Hypothesis::PhysicalGlobalSize:
+ set_param(css, "physical_size_mode", "global");
+ set_param(css, "global_physical_size", _phySizeRel ? val_to_string_rel(_phySize).c_str() : val_to_string(_phySize).c_str());
+ break;
+ case BLSURFPlugin_Hypothesis::PhysicalLocalSize:
+ set_param(css, "physical_size_mode", "local");
+ set_param(css, "global_physical_size", _phySizeRel ? val_to_string_rel(_phySize).c_str() : val_to_string(_phySize).c_str());
+ useGradation = true;
+ break;
+ default:
+ set_param(css, "physical_size_mode", "none");
+ }
+
+ switch (_geometricMesh)
+ {
+ case BLSURFPlugin_Hypothesis::GeometricalGlobalSize:
+ set_param(css, "geometric_size_mode", "global");
+ set_param(css, "geometric_approximation", val_to_string(_angleMesh).c_str());
+ set_param(css, "chordal_error", val_to_string(_chordalError).c_str());
+ useGradation = true;
+ break;
+ case BLSURFPlugin_Hypothesis::GeometricalLocalSize:
+ set_param(css, "geometric_size_mode", "local");
+ set_param(css, "geometric_approximation", val_to_string(_angleMesh).c_str());
+ set_param(css, "chordal_error", val_to_string(_chordalError).c_str());
+ useGradation = true;
+ break;
+ default:
+ set_param(css, "geometric_size_mode", "none");
+ }
+
+ if ( hyp && hyp->GetPhySize() > 0 ) {
+ // user size is explicitly specified via hypothesis parameters
+ // min and max sizes should be compared with explicitly specified user size
+ // - compute absolute min size
+ double mins = _minSizeRel ? _minSize * diagonal : _minSize;
+ // - min size should not be greater than user size
+ if ( _phySize < mins )
+ set_param(css, "min_size", _phySizeRel ? val_to_string_rel(_phySize).c_str() : val_to_string(_phySize).c_str());
+ else
+ set_param(css, "min_size", _minSizeRel ? val_to_string_rel(_minSize).c_str() : val_to_string(_minSize).c_str());
+ // - compute absolute max size
+ double maxs = _maxSizeRel ? _maxSize * diagonal : _maxSize;
+ // - max size should not be less than user size
+ if ( _phySize > maxs )
+ set_param(css, "max_size", _phySizeRel ? val_to_string_rel(_phySize).c_str() : val_to_string(_phySize).c_str());
+ else
+ set_param(css, "max_size", _maxSizeRel ? val_to_string_rel(_maxSize).c_str() : val_to_string(_maxSize).c_str());
+ }
+ else {
+ // user size is not explicitly specified
+ // - if minsize is not explicitly specified, we pass default value computed automatically, in this case "relative" flag is ignored
+ set_param(css, "min_size", _minSizeRel ? val_to_string_rel(_minSize).c_str() : val_to_string(_minSize).c_str());
+ // - if maxsize is not explicitly specified, we pass default value computed automatically, in this case "relative" flag is ignored
+ set_param(css, "max_size", _maxSizeRel ? val_to_string_rel(_maxSize).c_str() : val_to_string(_maxSize).c_str());
+ }
+ // anisotropic and quadrangle mesh requires disabling gradation
+ if ( _anisotropic && _quadAllowed )
+ useGradation = false; // limitation of V1.3
+ if ( useGradation )
+ set_param(css, "gradation", val_to_string(_gradation).c_str());
+ set_param(css, "element_generation", _quadAllowed ? "quad_dominant" : "triangle");
+
+
+ set_param(css, "metric", _anisotropic ? "anisotropic" : "isotropic");
+ if ( _anisotropic )
+ set_param(css, "anisotropic_ratio", val_to_string(_anisotropicRatio).c_str());
+ set_param(css, "remove_tiny_edges", _removeTinyEdges ? "1" : "0");
+ if ( _removeTinyEdges )
+ set_param(css, "tiny_edge_length", val_to_string(_tinyEdgeLength).c_str());
+ set_param(css, "force_bad_surface_element_removal", _badElementRemoval ? "1" : "0");
+ if ( _badElementRemoval )
+ set_param(css, "bad_surface_element_aspect_ratio", val_to_string(_badElementAspectRatio).c_str());
+ set_param(css, "optimisation", _optimizeMesh ? "yes" : "no");
+ set_param(css, "element_order", _quadraticMesh ? "quadratic" : "linear");
+ set_param(css, "verbose", val_to_string(_verb).c_str());
+
+ _smp_phy_size = _phySizeRel ? _phySize*diagonal : _phySize;
+ if ( _verb > 0 )
+ std::cout << "_smp_phy_size = " << _smp_phy_size << std::endl;
+
+ if (_physicalMesh == BLSURFPlugin_Hypothesis::PhysicalLocalSize){
TopoDS_Shape GeomShape;
TopoDS_Shape AttShape;
TopAbs_ShapeEnum GeomType;
BLSURFPlugin_Hypothesis::TSizeMap::const_iterator smIt = sizeMaps.begin();
for ( ; smIt != sizeMaps.end(); ++smIt ) {
if ( !smIt->second.empty() ) {
- MESSAGE("blsurf_set_sizeMap(): " << smIt->first << " = " << smIt->second);
+ MESSAGE("cadsurf_set_sizeMap(): " << smIt->first << " = " << smIt->second);
GeomShape = entryToShape(smIt->first);
GeomType = GeomShape.ShapeType();
MESSAGE("Geomtype is " << GeomType);
//
// TODO appeler le constructeur des attracteurs directement ici
MESSAGE("Setting Attractors");
- const BLSURFPlugin_Hypothesis::TSizeMap attractors = BLSURFPlugin_Hypothesis::GetAttractorEntries(hyp);
- BLSURFPlugin_Hypothesis::TSizeMap::const_iterator atIt = attractors.begin();
- for ( ; atIt != attractors.end(); ++atIt ) {
- if ( !atIt->second.empty() ) {
- MESSAGE("blsurf_set_attractor(): " << atIt->first << " = " << atIt->second);
- GeomShape = entryToShape(atIt->first);
- GeomType = GeomShape.ShapeType();
- // Group Management
- if (GeomType == TopAbs_COMPOUND){
- for (TopoDS_Iterator it (GeomShape); it.More(); it.Next()){
- if (it.Value().ShapeType() == TopAbs_FACE){
- HasSizeMapOnFace = true;
- createAttractorOnFace(it.Value(), atIt->second);
+// if ( !_phySizeRel ) {
+ const BLSURFPlugin_Hypothesis::TSizeMap attractors = BLSURFPlugin_Hypothesis::GetAttractorEntries(hyp);
+ BLSURFPlugin_Hypothesis::TSizeMap::const_iterator atIt = attractors.begin();
+ for ( ; atIt != attractors.end(); ++atIt ) {
+ if ( !atIt->second.empty() ) {
+ MESSAGE("cadsurf_set_attractor(): " << atIt->first << " = " << atIt->second);
+ GeomShape = entryToShape(atIt->first);
+ GeomType = GeomShape.ShapeType();
+ // Group Management
+ if (GeomType == TopAbs_COMPOUND){
+ for (TopoDS_Iterator it (GeomShape); it.More(); it.Next()){
+ if (it.Value().ShapeType() == TopAbs_FACE){
+ HasSizeMapOnFace = true;
+ createAttractorOnFace(it.Value(), atIt->second, _phySizeRel ? _phySize*diagonal : _phySize);
+ }
}
}
- }
- if (GeomType == TopAbs_FACE){
- HasSizeMapOnFace = true;
- createAttractorOnFace(GeomShape, atIt->second);
- }
-/*
- if (GeomType == TopAbs_EDGE){
- HasSizeMapOnEdge = true;
- HasSizeMapOnFace = true;
- EdgeId2SizeMap[TopoDS::Edge(GeomShape).HashCode(IntegerLast())] = atIt->second;
- }
- if (GeomType == TopAbs_VERTEX){
- HasSizeMapOnVertex = true;
- HasSizeMapOnEdge = true;
- HasSizeMapOnFace = true;
- VertexId2SizeMap[TopoDS::Vertex(GeomShape).HashCode(IntegerLast())] = atIt->second;
+ if (GeomType == TopAbs_FACE){
+ HasSizeMapOnFace = true;
+ createAttractorOnFace(GeomShape, atIt->second, _phySizeRel ? _phySize*diagonal : _phySize);
+ }
+ /*
+ if (GeomType == TopAbs_EDGE){
+ HasSizeMapOnEdge = true;
+ HasSizeMapOnFace = true;
+ EdgeId2SizeMap[TopoDS::Edge(GeomShape).HashCode(IntegerLast())] = atIt->second;
+ }
+ if (GeomType == TopAbs_VERTEX){
+ HasSizeMapOnVertex = true;
+ HasSizeMapOnEdge = true;
+ HasSizeMapOnFace = true;
+ VertexId2SizeMap[TopoDS::Vertex(GeomShape).HashCode(IntegerLast())] = atIt->second;
+ }
+ */
}
-*/
}
- }
+// }
+// else
+// MESSAGE("Impossible to create the attractors when the physical size is relative");
// Class Attractors
// temporary commented out for testing
// - build the map here for each face with an attractor set and only if the attractor shape as changed since the last call to _buildmap()
// -> define a bool _mapbuilt in the class that is set to false by default and set to true when calling _buildmap() OK
+ theNbAttractors = 0;
const BLSURFPlugin_Hypothesis::TAttractorMap class_attractors = BLSURFPlugin_Hypothesis::GetClassAttractorEntries(hyp);
int key=-1;
BLSURFPlugin_Hypothesis::TAttractorMap::const_iterator AtIt = class_attractors.begin();
for ( ; AtIt != class_attractors.end(); ++AtIt ) {
if ( !AtIt->second->Empty() ) {
- // MESSAGE("blsurf_set_attractor(): " << AtIt->first << " = " << AtIt->second);
+ // MESSAGE("cadsurf_set_attractor(): " << AtIt->first << " = " << AtIt->second);
GeomShape = entryToShape(AtIt->first);
+ if ( !SMESH_MesherHelper::IsSubShape( GeomShape, theGeomShape ))
+ continue;
AttShape = AtIt->second->GetAttractorShape();
GeomType = GeomShape.ShapeType();
// Group Management
|| AttShape.ShapeType() == TopAbs_COMPOUND) ){
HasSizeMapOnFace = true;
- if (! FacesWithSizeMap.Contains(TopoDS::Face(GeomShape)) ) {
- key = FacesWithSizeMap.Add(TopoDS::Face(GeomShape) );
- }
- else {
- key = FacesWithSizeMap.FindIndex(TopoDS::Face(GeomShape));
-// MESSAGE("Face with key " << key << " already in map");
- }
+ key = FacesWithSizeMap.Add(TopoDS::Face(GeomShape) );
- FaceId2ClassAttractor[key] = AtIt->second;
+ FaceId2ClassAttractor[key].push_back( AtIt->second );
+ ++theNbAttractors;
}
else{
MESSAGE("Wrong shape type !!")
if (useInternalVertexAllFaces) {
std::string grpName = BLSURFPlugin_Hypothesis::GetInternalEnforcedVertexAllFacesGroup(hyp);
MESSAGE("Setting Internal Enforced Vertices");
- GeomShape = mesh.GetShapeToMesh();
gp_Pnt aPnt;
- TopExp_Explorer exp (GeomShape, TopAbs_FACE);
+ TopExp_Explorer exp (theGeomShape, TopAbs_FACE);
for (; exp.More(); exp.Next()){
MESSAGE("Iterating shapes. Shape type is " << exp.Current().ShapeType());
- TopExp_Explorer exp_face (exp.Current(), TopAbs_VERTEX);
+ TopExp_Explorer exp_face (exp.Current(), TopAbs_VERTEX, TopAbs_EDGE);
for (; exp_face.More(); exp_face.Next())
{
// Get coords of vertex
enfVertex->faceEntries.clear();
enfVertex->geomEntry = "";
enfVertex->grpName = grpName;
+ enfVertex->vertex = TopoDS::Vertex( exp_face.Current() );
_createEnforcedVertexOnFace( TopoDS::Face(exp.Current()), aPnt, enfVertex);
HasSizeMapOnFace = true;
}
MESSAGE("Setting Size Map on FACES ");
// #if BLSURF_VERSION_LONG < "3.1.1"
- blsurf_data_set_sizemap_iso_cad_face(bls, size_on_surface, &_smp_phy_size);
+ cadsurf_data_set_sizemap_iso_cad_face(css, size_on_surface, &_smp_phy_size);
// #else
// if (*use_precad)
// iso_sizemap_f = sizemap_new(c, distene_sizemap_type_iso_cad_face, (void *)size_on_surface, NULL);
if (HasSizeMapOnEdge){
MESSAGE("Setting Size Map on EDGES ");
// #if BLSURF_VERSION_LONG < "3.1.1"
- blsurf_data_set_sizemap_iso_cad_edge(bls, size_on_edge, &_smp_phy_size);
+ cadsurf_data_set_sizemap_iso_cad_edge(css, size_on_edge, &_smp_phy_size);
// #else
// if (*use_precad)
// iso_sizemap_e = sizemap_new(c, distene_sizemap_type_iso_cad_edge, (void *)size_on_edge, NULL);
if (HasSizeMapOnVertex){
MESSAGE("Setting Size Map on VERTICES ");
// #if BLSURF_VERSION_LONG < "3.1.1"
- blsurf_data_set_sizemap_iso_cad_point(bls, size_on_vertex, &_smp_phy_size);
+ cadsurf_data_set_sizemap_iso_cad_point(css, size_on_vertex, &_smp_phy_size);
// #else
// if (*use_precad)
// iso_sizemap_p = sizemap_new(c, distene_sizemap_type_iso_cad_point, (void *)size_on_vertex, NULL);
// #endif
}
}
-}
-namespace
-{
- /*!
- * \brief Class correctly terminating usage of BLSURF library at destruction
- */
- class BLSURF_Cleaner
- {
- context_t * _ctx;
- blsurf_session_t* _bls;
+ // PERIODICITY
+
+ // reset vectors
+ _preCadFacesIDsPeriodicityVector.clear();
+ _preCadEdgesIDsPeriodicityVector.clear();
+ _facesIDsPeriodicityVector.clear();
+ _edgesIDsPeriodicityVector.clear();
+ _verticesIDsPeriodicityVector.clear();
+
+ MESSAGE("SetParameters preCadFacesPeriodicityVector");
+ const BLSURFPlugin_Hypothesis::TPreCadPeriodicityVector preCadFacesPeriodicityVector = BLSURFPlugin_Hypothesis::GetPreCadFacesPeriodicityVector(hyp);
+
+ for (std::size_t i = 0; i<preCadFacesPeriodicityVector.size(); i++){
+ MESSAGE("SetParameters preCadFacesPeriodicityVector[" << i << "]");
+ createPreCadFacesPeriodicity(theGeomShape, preCadFacesPeriodicityVector[i]);
+ }
+ MESSAGE("_preCadFacesIDsPeriodicityVector.size() = " << _preCadFacesIDsPeriodicityVector.size());
+
+ MESSAGE("SetParameters preCadEdgesPeriodicityVector");
+ const BLSURFPlugin_Hypothesis::TPreCadPeriodicityVector preCadEdgesPeriodicityVector = BLSURFPlugin_Hypothesis::GetPreCadEdgesPeriodicityVector(hyp);
+
+ for (std::size_t i = 0; i<preCadEdgesPeriodicityVector.size(); i++){
+ MESSAGE("SetParameters preCadEdgesPeriodicityVector[" << i << "]");
+ createPreCadEdgesPeriodicity(theGeomShape, preCadEdgesPeriodicityVector[i]);
+ }
+ MESSAGE("_preCadEdgesIDsPeriodicityVector.size() = " << _preCadEdgesIDsPeriodicityVector.size());
+
+ if ( _preCadFacesIDsPeriodicityVector.size() > 0 || _preCadEdgesIDsPeriodicityVector.size() > 0 )
+ {
+ MESSAGE("USING PRECAD FOR PERIODICITY")
+ *use_precad = true;
+ precad_set_param(pcs, "verbose", val_to_string(_verb).c_str());
+ }
+
+ MESSAGE("SetParameters facesPeriodicityVector");
+ const BLSURFPlugin_Hypothesis::TFacesPeriodicityVector facesPeriodicityVector = BLSURFPlugin_Hypothesis::GetFacesPeriodicityVector(hyp);
+
+ for (std::size_t i = 0; i<facesPeriodicityVector.size(); i++){
+ MESSAGE("SetParameters facesPeriodicityVector[" << i << "]");
+ createFacesPeriodicity(theGeomShape, facesPeriodicityVector[i].first, facesPeriodicityVector[i].second);
+ }
+ MESSAGE("_facesIDsPeriodicityVector.size() = " << _facesIDsPeriodicityVector.size());
+
+
+ MESSAGE("SetParameters edgesPeriodicityVector");
+ const BLSURFPlugin_Hypothesis::TEdgesPeriodicityVector edgesPeriodicityVector = BLSURFPlugin_Hypothesis::GetEdgesPeriodicityVector(hyp);
+
+ for (std::size_t i = 0; i<edgesPeriodicityVector.size(); i++){
+ MESSAGE("SetParameters edgesPeriodicityVector[" << i << "]");
+ // TODO: passer directement en paramètre edgesPeriodicityVector[i] plutôt que tous ces attributs
+ createEdgesPeriodicity(theGeomShape, edgesPeriodicityVector[i].theFace1Entry, edgesPeriodicityVector[i].theEdge1Entry,
+ edgesPeriodicityVector[i].theFace2Entry, edgesPeriodicityVector[i].theEdge2Entry, edgesPeriodicityVector[i].edge_orientation);
+ }
+ MESSAGE("_edgesIDsPeriodicityVector.size() = " << _edgesIDsPeriodicityVector.size());
+
+ MESSAGE("SetParameters verticesPeriodicityVector");
+ const BLSURFPlugin_Hypothesis::TVerticesPeriodicityVector verticesPeriodicityVector = BLSURFPlugin_Hypothesis::GetVerticesPeriodicityVector(hyp);
+
+ for (std::size_t i = 0; i<verticesPeriodicityVector.size(); i++){
+ MESSAGE("SetParameters verticesPeriodicityVector[" << i << "]");
+ // TODO: passer directement en paramètre verticesPeriodicityVector[i] plutôt que tous ces attributs
+ createVerticesPeriodicity(theGeomShape, verticesPeriodicityVector[i].theEdge1Entry, verticesPeriodicityVector[i].theVertex1Entry,
+ verticesPeriodicityVector[i].theEdge2Entry, verticesPeriodicityVector[i].theVertex2Entry);
+ }
+ MESSAGE("_verticesIDsPeriodicityVector.size() = " << _verticesIDsPeriodicityVector.size());
+}
+
+//================================================================================
+/*!
+ * \brief Throws an exception if a parameter name is wrong
+ */
+//================================================================================
+
+void BLSURFPlugin_BLSURF::set_param(cadsurf_session_t *css,
+ const char * option_name,
+ const char * option_value)
+{
+ status_t status = cadsurf_set_param(css, option_name, option_value );
+ if ( status != MESHGEMS_STATUS_OK )
+ {
+ if ( status == MESHGEMS_STATUS_UNKNOWN_PARAMETER ) {
+ throw SALOME_Exception
+ ( SMESH_Comment("Invalid name of CADSURF parameter: ") << option_name );
+ }
+ else if ( status == MESHGEMS_STATUS_NOLICENSE )
+ throw SALOME_Exception
+ ( "No valid license available" );
+ else
+ throw SALOME_Exception
+ ( SMESH_Comment("Unacceptable value of CADSURF parameter '")
+ << option_name << "': " << option_value);
+ }
+}
+
+namespace
+{
+ // --------------------------------------------------------------------------
+ /*!
+ * \brief Class correctly terminating usage of MG-CADSurf library at destruction
+ */
+ class BLSURF_Cleaner
+ {
+ context_t * _ctx;
+ cadsurf_session_t* _css;
cad_t * _cad;
dcad_t * _dcad;
+ cad_t * _cleanc;
+ dcad_t * _cleandc;
public:
BLSURF_Cleaner(context_t * ctx,
- blsurf_session_t* bls,
+ cadsurf_session_t* css,
cad_t * cad,
- dcad_t * dcad)
+ dcad_t * dcad,
+ cad_t * cleanc,
+ dcad_t * cleandc)
: _ctx ( ctx ),
- _bls ( bls ),
+ _css ( css ),
_cad ( cad ),
- _dcad( dcad )
+ _dcad( dcad ),
+ _cleanc( cleanc ),
+ _cleandc( cleandc )
{
}
~BLSURF_Cleaner()
{
- blsurf_session_delete(_bls);
+ Clean( /*exceptContext=*/false );
+ }
+ void Clean(const bool exceptContext)
+ {
+ if ( _css )
+ {
+ cadsurf_session_delete(_css); _css = 0;
+
+ // #if BLSURF_VERSION_LONG >= "3.1.1"
+ // // if(geo_sizemap_e)
+ // // distene_sizemap_delete(geo_sizemap_e);
+ // // if(geo_sizemap_f)
+ // // distene_sizemap_delete(geo_sizemap_f);
+ // if(iso_sizemap_p)
+ // distene_sizemap_delete(iso_sizemap_p);
+ // if(iso_sizemap_e)
+ // distene_sizemap_delete(iso_sizemap_e);
+ // if(iso_sizemap_f)
+ // distene_sizemap_delete(iso_sizemap_f);
+ //
+ // // if(clean_geo_sizemap_e)
+ // // distene_sizemap_delete(clean_geo_sizemap_e);
+ // // if(clean_geo_sizemap_f)
+ // // distene_sizemap_delete(clean_geo_sizemap_f);
+ // if(clean_iso_sizemap_p)
+ // distene_sizemap_delete(clean_iso_sizemap_p);
+ // if(clean_iso_sizemap_e)
+ // distene_sizemap_delete(clean_iso_sizemap_e);
+ // if(clean_iso_sizemap_f)
+ // distene_sizemap_delete(clean_iso_sizemap_f);
+ // #endif
+
+ cad_delete(_cad); _cad = 0;
+ dcad_delete(_dcad); _dcad = 0;
+ cad_delete(_cleanc); _cleanc = 0;
+ dcad_delete(_cleandc); _cleandc = 0;
+ if ( !exceptContext )
+ {
+ context_delete(_ctx); _ctx = 0;
+ }
+ }
+ }
+ };
- // #if BLSURF_VERSION_LONG >= "3.1.1"
- // // if(geo_sizemap_e)
- // // distene_sizemap_delete(geo_sizemap_e);
- // // if(geo_sizemap_f)
- // // distene_sizemap_delete(geo_sizemap_f);
- // if(iso_sizemap_p)
- // distene_sizemap_delete(iso_sizemap_p);
- // if(iso_sizemap_e)
- // distene_sizemap_delete(iso_sizemap_e);
- // if(iso_sizemap_f)
- // distene_sizemap_delete(iso_sizemap_f);
- //
- // // if(clean_geo_sizemap_e)
- // // distene_sizemap_delete(clean_geo_sizemap_e);
- // // if(clean_geo_sizemap_f)
- // // distene_sizemap_delete(clean_geo_sizemap_f);
- // if(clean_iso_sizemap_p)
- // distene_sizemap_delete(clean_iso_sizemap_p);
- // if(clean_iso_sizemap_e)
- // distene_sizemap_delete(clean_iso_sizemap_e);
- // if(clean_iso_sizemap_f)
- // distene_sizemap_delete(clean_iso_sizemap_f);
- // #endif
-
- cad_delete(_cad);
- dcad_delete(_dcad);
- context_delete(_ctx);
+ // --------------------------------------------------------------------------
+ // comparator to sort nodes and sub-meshes
+ struct ShapeTypeCompare
+ {
+ // sort nodes by position in the following order:
+ // SMDS_TOP_FACE=2, SMDS_TOP_EDGE=1, SMDS_TOP_VERTEX=0, SMDS_TOP_3DSPACE=3
+ bool operator()( const SMDS_MeshNode* n1, const SMDS_MeshNode* n2 ) const
+ {
+ // NEW ORDER: nodes earlier added to sub-mesh are considered "less"
+ return n1->getIdInShape() < n2->getIdInShape();
+ // SMDS_TypeOfPosition pos1 = n1->GetPosition()->GetTypeOfPosition();
+ // SMDS_TypeOfPosition pos2 = n2->GetPosition()->GetTypeOfPosition();
+ // if ( pos1 == pos2 ) return 0;
+ // if ( pos1 < pos2 || pos1 == SMDS_TOP_3DSPACE ) return 1;
+ // return -1;
+ }
+ // sort sub-meshes in order: EDGE, VERTEX
+ bool operator()( const SMESHDS_SubMesh* s1, const SMESHDS_SubMesh* s2 ) const
+ {
+ int isVertex1 = ( s1 && s1->NbElements() == 0 );
+ int isVertex2 = ( s2 && s2->NbElements() == 0 );
+ if ( isVertex1 == isVertex2 )
+ return s1 < s2;
+ return isVertex1 < isVertex2;
+ }
+ };
+
+ //================================================================================
+ /*!
+ * \brief Fills groups of nodes to be merged
+ */
+ //================================================================================
+
+ void getNodeGroupsToMerge( const SMESHDS_SubMesh* smDS,
+ const TopoDS_Shape& shape,
+ SMESH_MeshEditor::TListOfListOfNodes& nodeGroupsToMerge)
+ {
+ SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
+ switch ( shape.ShapeType() )
+ {
+ case TopAbs_VERTEX: {
+ std::list< const SMDS_MeshNode* > nodes;
+ while ( nIt->more() )
+ nodes.push_back( nIt->next() );
+ if ( nodes.size() > 1 )
+ nodeGroupsToMerge.push_back( nodes );
+ break;
+ }
+ case TopAbs_EDGE: {
+ std::multimap< double, const SMDS_MeshNode* > u2node;
+ const SMDS_EdgePosition* ePos;
+ while ( nIt->more() )
+ {
+ const SMDS_MeshNode* n = nIt->next();
+ if (( ePos = dynamic_cast< const SMDS_EdgePosition* >( n->GetPosition() )))
+ u2node.insert( make_pair( ePos->GetUParameter(), n ));
+ }
+ if ( u2node.size() < 2 ) return;
+
+ //double tol = (( u2node.rbegin()->first - u2node.begin()->first ) / 20.) / u2node.size();
+ Standard_Real f,l;
+ BRep_Tool::Range( TopoDS::Edge( shape ), f,l );
+ double tol = (( l - f ) / 20.) / u2node.size();
+
+ std::multimap< double, const SMDS_MeshNode* >::iterator un2, un1;
+ for ( un2 = u2node.begin(), un1 = un2++; un2 != u2node.end(); un1 = un2++ )
+ {
+ if (( un2->first - un1->first ) <= tol )
+ {
+ std::list< const SMDS_MeshNode* > nodes;
+ nodes.push_back( un1->second );
+ while (( un2->first - un1->first ) <= tol )
+ {
+ nodes.push_back( un2->second );
+ if ( ++un2 == u2node.end()) {
+ --un2;
+ break;
+ }
+ }
+ // make nodes created on the boundary of viscous layer replace nodes created
+ // by MG-CADSurf as their SMDS_Position is more correct
+ nodes.sort( ShapeTypeCompare() );
+ nodeGroupsToMerge.push_back( nodes );
+ }
+ }
+ break;
+ }
+ default: ;
+ }
+ // SMESH_MeshEditor::TListOfListOfNodes::const_iterator nll = nodeGroupsToMerge.begin();
+ // for ( ; nll != nodeGroupsToMerge.end(); ++nll )
+ // {
+ // cout << "Merge ";
+ // const std::list< const SMDS_MeshNode* >& nl = *nll;
+ // std::list< const SMDS_MeshNode* >::const_iterator nIt = nl.begin();
+ // for ( ; nIt != nl.end(); ++nIt )
+ // cout << (*nIt) << " ";
+ // cout << endl;
+ // }
+ // cout << endl;
+ }
+
+ //================================================================================
+ /*!
+ * \brief A temporary mesh used to compute mesh on a proxy FACE
+ */
+ //================================================================================
+
+ struct TmpMesh: public SMESH_Mesh
+ {
+ typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*, TIDCompare > TN2NMap;
+ TN2NMap _tmp2origNN;
+ TopoDS_Face _proxyFace;
+
+ TmpMesh()
+ {
+ _myMeshDS = new SMESHDS_Mesh( _id, true );
+ }
+ //--------------------------------------------------------------------------------
+ /*!
+ * \brief Creates a FACE bound by viscous layers and mesh each its EDGE with 1 segment
+ */
+ //--------------------------------------------------------------------------------
+
+ const TopoDS_Face& makeProxyFace( SMESH_ProxyMesh::Ptr& viscousMesh,
+ const TopoDS_Face& origFace)
+ {
+ // get data of nodes on inner boundary of viscous layers
+ SMESH_Mesh* origMesh = viscousMesh->GetMesh();
+ TError err;
+ TSideVector wireVec = StdMeshers_FaceSide::GetFaceWires(origFace, *origMesh,
+ /*skipMediumNodes = */true,
+ err, viscousMesh );
+ if ( err && err->IsKO() )
+ throw *err.get(); // it should be caught at SMESH_subMesh
+
+ // proxy nodes and corresponding tmp VERTEXes
+ std::vector<const SMDS_MeshNode*> origNodes;
+ std::vector<TopoDS_Vertex> tmpVertex;
+
+ // create a proxy FACE
+ TopoDS_Shape origFaceCopy = origFace.EmptyCopied();
+ BRepBuilderAPI_MakeFace newFace( TopoDS::Face( origFaceCopy ));
+ for ( size_t iW = 0; iW != wireVec.size(); ++iW )
+ {
+ StdMeshers_FaceSidePtr& wireData = wireVec[iW];
+ const UVPtStructVec& wirePoints = wireData->GetUVPtStruct();
+ if ( wirePoints.size() < 3 )
+ continue;
+
+ BRepBuilderAPI_MakePolygon wire;
+ const size_t i0 = tmpVertex.size();
+ for ( size_t iN = 1; iN < wirePoints.size(); ++iN )
+ {
+ wire.Add( SMESH_TNodeXYZ( wirePoints[ iN ].node ));
+ origNodes.push_back( wirePoints[ iN ].node );
+ tmpVertex.push_back( wire.LastVertex() );
+ }
+ tmpVertex[ i0 ] = wire.FirstVertex(); // wire.LastVertex()==NULL for 1 vertex in wire
+ wire.Close();
+ if ( !wire.IsDone() )
+ throw SALOME_Exception("BLSURFPlugin_BLSURF: BRepBuilderAPI_MakePolygon failed");
+ newFace.Add( wire );
+ }
+ _proxyFace = newFace;
+
+ // set a new shape to mesh
+ TopoDS_Compound auxCompoundToMesh;
+ BRep_Builder shapeBuilder;
+ shapeBuilder.MakeCompound( auxCompoundToMesh );
+ shapeBuilder.Add( auxCompoundToMesh, _proxyFace );
+ shapeBuilder.Add( auxCompoundToMesh, origMesh->GetShapeToMesh() );
+
+ ShapeToMesh( auxCompoundToMesh );
+
+ //TopExp_Explorer fExp( auxCompoundToMesh, TopAbs_FACE );
+ //_proxyFace = TopoDS::Face( fExp.Current() );
+
+
+ // Make input mesh for MG-CADSurf: segments on EDGE's of newFace
+
+ // make nodes and fill in _tmp2origNN
+ //
+ SMESHDS_Mesh* tmpMeshDS = GetMeshDS();
+ for ( size_t i = 0; i < origNodes.size(); ++i )
+ {
+ GetSubMesh( tmpVertex[i] )->ComputeStateEngine( SMESH_subMesh::COMPUTE );
+ if ( const SMDS_MeshNode* tmpN = SMESH_Algo::VertexNode( tmpVertex[i], tmpMeshDS ))
+ _tmp2origNN.insert( _tmp2origNN.end(), make_pair( tmpN, origNodes[i] ));
+ else
+ throw SALOME_Exception("BLSURFPlugin_BLSURF: a proxy vertex not meshed");
+ }
+
+ // make segments
+ TopoDS_Vertex v1, v2;
+ for ( TopExp_Explorer edge( _proxyFace, TopAbs_EDGE ); edge.More(); edge.Next() )
+ {
+ const TopoDS_Edge& E = TopoDS::Edge( edge.Current() );
+ TopExp::Vertices( E, v1, v2 );
+ const SMDS_MeshNode* n1 = SMESH_Algo::VertexNode( v1, tmpMeshDS );
+ const SMDS_MeshNode* n2 = SMESH_Algo::VertexNode( v2, tmpMeshDS );
+
+ if ( SMDS_MeshElement* seg = tmpMeshDS->AddEdge( n1, n2 ))
+ tmpMeshDS->SetMeshElementOnShape( seg, E );
+ }
+
+ return _proxyFace;
+ }
+
+ //--------------------------------------------------------------------------------
+ /*!
+ * \brief Fill in the origMesh with faces computed by MG-CADSurf in this tmp mesh
+ */
+ //--------------------------------------------------------------------------------
+
+ void FillInOrigMesh( SMESH_Mesh& origMesh,
+ const TopoDS_Face& origFace )
+ {
+ SMESH_MesherHelper helper( origMesh );
+ helper.SetSubShape( origFace );
+ helper.SetElementsOnShape( true );
+
+ SMESH_MesherHelper tmpHelper( *this );
+ tmpHelper.SetSubShape( _proxyFace );
+
+ // iterate over tmp faces and copy them in origMesh
+ const SMDS_MeshNode* nodes[27];
+ const SMDS_MeshNode* nullNode = 0;
+ double xyz[3];
+ SMDS_FaceIteratorPtr fIt = GetMeshDS()->facesIterator(/*idInceasingOrder=*/true);
+ while ( fIt->more() )
+ {
+ const SMDS_MeshElement* f = fIt->next();
+ SMDS_ElemIteratorPtr nIt = f->nodesIterator();
+ int nbN = 0;
+ for ( ; nIt->more(); ++nbN )
+ {
+ const SMDS_MeshNode* n = static_cast<const SMDS_MeshNode*>( nIt->next() );
+ TN2NMap::iterator n2nIt =
+ _tmp2origNN.insert( _tmp2origNN.end(), make_pair( n, nullNode ));
+ if ( !n2nIt->second ) {
+ n->GetXYZ( xyz );
+ gp_XY uv = tmpHelper.GetNodeUV( _proxyFace, n );
+ n2nIt->second = helper.AddNode( xyz[0], xyz[1], xyz[2], uv.X(), uv.Y() );
+ }
+ nodes[ nbN ] = n2nIt->second;
+ }
+ switch( nbN ) {
+ case 3: helper.AddFace( nodes[0], nodes[1], nodes[2] ); break;
+ // case 6: helper.AddFace( nodes[0], nodes[1], nodes[2],
+ // nodes[3], nodes[4], nodes[5]); break;
+ case 4: helper.AddFace( nodes[0], nodes[1], nodes[2], nodes[3] ); break;
+ // case 9: helper.AddFace( nodes[0], nodes[1], nodes[2], nodes[3],
+ // nodes[4], nodes[5], nodes[6], nodes[7], nodes[8]); break;
+ // case 8: helper.AddFace( nodes[0], nodes[1], nodes[2], nodes[3],
+ // nodes[4], nodes[5], nodes[6], nodes[7]); break;
+ }
+ }
}
};
+
+ /*!
+ * \brief A structure holding an error description and a verbisity level
+ */
+ struct message_cb_user_data
+ {
+ std::string * _error;
+ int _verbosity;
+ double * _progress;
+ };
+
+
} // namespace
status_t curv_fun(real t, real *uv, real *dt, real *dtt, void *user_data);
// Fix problem with locales
Kernel_Utils::Localizer aLocalizer;
+ this->SMESH_Algo::_progress = 1e-3; // prevent progress advancment while computing attractors
+
+ if ( !compute( aMesh, aShape, /*allowSubMeshClearing=*/true ))
+ return false;
+
+ if ( _haveViscousLayers )
+ {
+ // Compute viscous layers
+
+ TopTools_MapOfShape map;
+ for (TopExp_Explorer face_iter(aShape,TopAbs_FACE);face_iter.More();face_iter.Next())
+ {
+ const TopoDS_Face& F = TopoDS::Face(face_iter.Current());
+ if ( !map.Add( F )) continue;
+ SMESH_ProxyMesh::Ptr viscousMesh = StdMeshers_ViscousLayers2D::Compute( aMesh, F );
+ if ( !viscousMesh )
+ return false; // error in StdMeshers_ViscousLayers2D::Compute()
+
+ // Compute MG-CADSurf mesh on viscous layers
+
+ if ( viscousMesh->NbProxySubMeshes() > 0 )
+ {
+ TmpMesh tmpMesh;
+ const TopoDS_Face& proxyFace = tmpMesh.makeProxyFace( viscousMesh, F );
+ if ( !compute( tmpMesh, proxyFace, /*allowSubMeshClearing=*/false ))
+ return false;
+ tmpMesh.FillInOrigMesh( aMesh, F );
+ }
+ }
+
+ // Re-compute MG-CADSurf mesh on the rest faces if the mesh was cleared
+
+ for (TopExp_Explorer face_iter(aShape,TopAbs_FACE);face_iter.More();face_iter.Next())
+ {
+ const TopoDS_Face& F = TopoDS::Face(face_iter.Current());
+ SMESH_subMesh* fSM = aMesh.GetSubMesh( F );
+ if ( fSM->IsMeshComputed() ) continue;
+
+ if ( !compute( aMesh, aShape, /*allowSubMeshClearing=*/true ))
+ return false;
+ break;
+ }
+ }
+ return true;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+
+bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh& aMesh,
+ const TopoDS_Shape& aShape,
+ bool allowSubMeshClearing)
+{
/* create a distene context (generic object) */
status_t status = STATUS_ERROR;
+ myMesh = &aMesh;
+ SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
+ SMESH_MesherHelper helper( aMesh );
+ // do not call helper.IsQuadraticSubMesh() because sub-meshes
+ // may be cleaned and helper.myTLinkNodeMap gets invalid in such a case
+ bool haveQuadraticSubMesh = SMESH_MesherHelper( aMesh ).IsQuadraticSubMesh( aShape );
+ bool quadraticSubMeshAndViscousLayer = false;
+ bool needMerge = false;
+ typedef set< SMESHDS_SubMesh*, ShapeTypeCompare > TSubMeshSet;
+ TSubMeshSet edgeSubmeshes;
+ TSubMeshSet& mergeSubmeshes = edgeSubmeshes;
+
+ TopTools_IndexedMapOfShape pmap, emap, fmap;
+
+ // Issue 0019864. On DebianSarge, FE signals do not obey to OSD::SetSignal(false)
+#ifndef WIN32
+ feclearexcept( FE_ALL_EXCEPT );
+ int oldFEFlags = fedisableexcept( FE_ALL_EXCEPT );
+#endif
+
context_t *ctx = context_new();
/* Set the message callback in the working context */
- context_set_message_callback(ctx, message_cb, &_comment);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+ message_cb_user_data mcud;
+ mcud._error = & this->SMESH_Algo::_comment;
+ mcud._progress = & this->SMESH_Algo::_progress;
+ mcud._verbosity =
+ _hypothesis ? _hypothesis->GetVerbosity() : BLSURFPlugin_Hypothesis::GetDefaultVerbosity();
+ context_set_message_callback(ctx, message_cb, &mcud);
+
+ /* set the interruption callback */
_compute_canceled = false;
context_set_interrupt_callback(ctx, interrupt_cb, this);
-#else
- context_set_interrupt_callback(ctx, interrupt_cb, NULL);
-#endif
/* create the CAD object we will work on. It is associated to the context ctx. */
- cad_t *c = cad_new(ctx);
+ cad_t *c = cad_new(ctx);
dcad_t *dcad = dcad_new(c);
FacesWithSizeMap.Clear();
VerticesWithSizeMap.Clear();
VertexId2SizeMap.clear();
- SMESH_MesherHelper helper( aMesh );
- // do not call helper.IsQuadraticSubMesh() because submeshes
- // may be cleaned and helper.myTLinkNodeMap gets invalid in such a case
- const bool haveQudraticSubMesh = SMESH_MesherHelper( aMesh ).IsQuadraticSubMesh( aShape );
- helper.SetIsQuadratic( haveQudraticSubMesh );
- bool needMerge = false;
- set< SMESH_subMesh* > edgeSubmeshes;
-
/* Now fill the CAD object with data from your CAD
* environement. This is the most complex part of a successfull
* integration.
// PreCAD
// If user requests it, send the CAD through Distene preprocessor : PreCAD
- cad_t *cleanc = NULL;
+ cad_t *cleanc = NULL; // preprocessed cad
+ dcad_t *cleandc = NULL; // preprocessed dcad
precad_session_t *pcs = precad_session_new(ctx);
+ // Give both dcad and cad to precad
+ precad_data_set_dcad(pcs, dcad);
precad_data_set_cad(pcs, c);
- blsurf_session_t *bls = blsurf_session_new(ctx);
+ cadsurf_session_t *css = cadsurf_session_new(ctx);
- // an object that correctly deletes all blsurf objects at destruction
- BLSURF_Cleaner cleaner( ctx,bls,c,dcad );
+ // an object that correctly deletes all cadsurf objects at destruction
+ BLSURF_Cleaner cleaner( ctx,css,c,dcad,cleanc,cleandc );
MESSAGE("BEGIN SetParameters");
bool use_precad = false;
- SetParameters(
-// #if BLSURF_VERSION_LONG >= "3.1.1"
-// c,
-// #endif
- _hypothesis, bls, pcs, aMesh, &use_precad);
+ SetParameters(_hypothesis, css, pcs, aShape, &use_precad);
MESSAGE("END SetParameters");
+ MESSAGE("_preCadFacesIDsPeriodicityVector.size() = " << _preCadFacesIDsPeriodicityVector.size());
+
+ haveQuadraticSubMesh = haveQuadraticSubMesh || (_hypothesis != NULL && _hypothesis->GetQuadraticMesh());
+ helper.SetIsQuadratic( haveQuadraticSubMesh );
+
+ // To remove as soon as quadratic mesh is allowed - BEGIN
+ // GDD: Viscous layer is not allowed with quadratic mesh
+ if (_haveViscousLayers && haveQuadraticSubMesh ) {
+ quadraticSubMeshAndViscousLayer = true;
+ _haveViscousLayers = !haveQuadraticSubMesh;
+ _comment += "Warning: Viscous layer is not possible with a quadratic mesh, it is ignored.";
+ error(COMPERR_WARNING, _comment);
+ }
+ // To remove as soon as quadratic mesh is allowed - END
+
// needed to prevent the opencascade memory managmement from freeing things
vector<Handle(Geom2d_Curve)> curves;
vector<Handle(Geom_Surface)> surfaces;
- surfaces.resize(0);
- curves.resize(0);
-
- TopTools_IndexedMapOfShape fmap;
- TopTools_IndexedMapOfShape emap;
- TopTools_IndexedMapOfShape pmap;
-
- fmap.Clear();
- FaceId2PythonSmp.clear();
emap.Clear();
- EdgeId2PythonSmp.clear();
pmap.Clear();
+ FaceId2PythonSmp.clear();
+ EdgeId2PythonSmp.clear();
VertexId2PythonSmp.clear();
- assert(Py_IsInitialized());
- PyGILState_STATE gstate;
- gstate = PyGILState_Ensure();
-
- string theSizeMapStr;
-
/****************************************************************************************
- FACES
+ FACES
*****************************************************************************************/
int iface = 0;
string bad_end = "return";
TopExp::MapShapes(aShape,TopAbs_VERTEX,_map);
int ienf = _map.Extent();
- for (TopExp_Explorer face_iter(aShape,TopAbs_FACE);face_iter.More();face_iter.Next()) {
- TopoDS_Face f=TopoDS::Face(face_iter.Current());
+ assert(Py_IsInitialized());
+ PyGILState_STATE gstate;
+
+ string theSizeMapStr;
+
+ for (TopExp_Explorer face_iter(aShape,TopAbs_FACE);face_iter.More();face_iter.Next())
+ {
+ TopoDS_Face f = TopoDS::Face(face_iter.Current());
+
+ SMESH_subMesh* fSM = aMesh.GetSubMesh( f );
+ if ( !fSM->IsEmpty() ) continue; // skip already meshed FACE with viscous layers
// make INTERNAL face oriented FORWARD (issue 0020993)
if (f.Orientation() != TopAbs_FORWARD && f.Orientation() != TopAbs_REVERSED )
f.Orientation(TopAbs_FORWARD);
- if (fmap.FindIndex(f) > 0)
- continue;
+ iface = fmap.Add(f);
+// std::string aFileName = "fmap_face_";
+// aFileName.append(val_to_string(iface));
+// aFileName.append(".brep");
+// BRepTools::Write(f,aFileName.c_str());
- fmap.Add(f);
- iface++;
surfaces.push_back(BRep_Tool::Surface(f));
- /* create an object representing the face for blsurf */
+ /* create an object representing the face for cadsurf */
/* where face_id is an integer identifying the face.
* surf_function is the function that defines the surface
- * (For this face, it will be called by blsurf with your_face_object_ptr
+ * (For this face, it will be called by cadsurf with your_face_object_ptr
* as last parameter.
*/
cad_face_t *fce = cad_face_new(c, iface, surf_fun, surfaces.back());
- /* by default a face has no tag (color). The following call sets it to the same value as the face_id : */
- cad_face_set_tag(fce, iface);
+ /* by default a face has no tag (color).
+ The following call sets it to the same value as the Geom module ID : */
+ const int faceTag = meshDS->ShapeToIndex(f);
+ cad_face_set_tag(fce, faceTag);
/* Set face orientation (optional if you want a well oriented output mesh)*/
- if(f.Orientation() != TopAbs_FORWARD){
+ if(f.Orientation() != TopAbs_FORWARD)
cad_face_set_orientation(fce, CAD_ORIENTATION_REVERSED);
- } else {
+ else
cad_face_set_orientation(fce, CAD_ORIENTATION_FORWARD);
- }
- if (HasSizeMapOnFace && !use_precad){
-// MESSAGE("A size map is defined on a face")
-// std::cout << "A size map is defined on a face" << std::endl;
+ if (HasSizeMapOnFace /*&& !use_precad*/) //22903: use_precad seems not to interfere
+ {
+ // -----------------
// Classic size map
+ // -----------------
faceKey = FacesWithSizeMap.FindIndex(f);
- if (FaceId2SizeMap.find(faceKey)!=FaceId2SizeMap.end()){
- MESSAGE("A size map is defined on face :"<<faceKey)
+ if (FaceId2SizeMap.find(faceKey)!=FaceId2SizeMap.end()) {
+ MESSAGE("A size map is defined on face :"<<faceKey);
theSizeMapStr = FaceId2SizeMap[faceKey];
// check if function ends with "return"
if (theSizeMapStr.find(bad_end) == (theSizeMapStr.size()-bad_end.size()-1))
continue;
// Expr To Python function, verification is performed at validation in GUI
+ gstate = PyGILState_Ensure();
PyObject * obj = NULL;
obj= PyRun_String(theSizeMapStr.c_str(), Py_file_input, main_dict, NULL);
Py_DECREF(obj);
func = PyObject_GetAttrString(main_mod, "f");
FaceId2PythonSmp[iface]=func;
FaceId2SizeMap.erase(faceKey);
+ PyGILState_Release(gstate);
}
// Specific size map = Attractor
MESSAGE("Check position of vertex =(" << xyzCoords[0] << "," << xyzCoords[1] << "," << xyzCoords[2] << ")");
gp_Pnt P(xyzCoords[0],xyzCoords[1],xyzCoords[2]);
BRepClass_FaceClassifier scl(f,P,1e-7);
- // scl.Perform() is bugged. The function was rewritten
-// scl.Perform();
- BRepClass_FaceClassifierPerform(&scl,f,P,1e-7);
+ // OCC 6.3sp6 : scl.Perform() is bugged. The function was rewritten
+ // BRepClass_FaceClassifierPerform(&scl,f,P,1e-7);
+ // OCC 6.5.2: scl.Perform() is not bugged anymore
+ scl.Perform(f, P, 1e-7);
TopAbs_State result = scl.State();
MESSAGE("Position of point on face: "<<result);
if ( result == TopAbs_OUT )
- MESSAGE("Point is out of face: node is not created");
+ MESSAGE("Point is out of face: node is not created");
if ( result == TopAbs_UNKNOWN )
- MESSAGE("Point position on face is unknown: node is not created");
+ MESSAGE("Point position on face is unknown: node is not created");
if ( result == TopAbs_ON )
- MESSAGE("Point is on border of face: node is not created");
+ MESSAGE("Point is on border of face: node is not created");
if ( result == TopAbs_IN )
{
// Point is inside face and not on border
MESSAGE("Point is in face: node is created");
- double uvCoords[2] = {attractor_iter->second[0],attractor_iter->second[1]};
+ double uvCoords[2] = {attractor_iter->second[0],attractor_iter->second[1]};
ienf++;
MESSAGE("Add cad point on (u,v)=(" << uvCoords[0] << "," << uvCoords[1] << ") with id = " << ienf);
cad_point_t* point_p = cad_point_new(fce, ienf, uvCoords);
}
}
+ // -----------------
// Class Attractors
- std::map<int,BLSURFPlugin_Attractor* >::iterator clAttractor_iter = FaceId2ClassAttractor.find(faceKey);
+ // -----------------
+ TId2ClsAttractorVec::iterator clAttractor_iter = FaceId2ClassAttractor.find(faceKey);
if (clAttractor_iter != FaceId2ClassAttractor.end()){
- MESSAGE("Face indice: " << iface);
- MESSAGE("Adding attractor");
- FaceIndex2ClassAttractor[iface]=clAttractor_iter->second;
- FaceId2ClassAttractor.erase(clAttractor_iter);
- }
+ MESSAGE("Face indice: " << iface);
+ MESSAGE("Adding attractor");
+ std::vector< BLSURFPlugin_Attractor* > & attVec = clAttractor_iter->second;
+ for ( size_t i = 0; i < attVec.size(); ++i )
+ if ( !attVec[i]->IsMapBuilt() ) {
+ std::cout<<"Compute " << theNbAttractors-- << "-th attractor" <<std::endl;
+ attVec[i]->BuildMap();
+ }
+ FaceIndex2ClassAttractor[iface].swap( attVec );
+ FaceId2ClassAttractor.erase(clAttractor_iter);
}
+ } // if (HasSizeMapOnFace && !use_precad)
+ // ------------------
// Enforced Vertices
- faceKey = FacesWithEnforcedVertices.FindIndex(f);
- std::map<int,BLSURFPlugin_Hypothesis::TEnfVertexCoordsList >::const_iterator evmIt = FaceId2EnforcedVertexCoords.find(faceKey);
- if (evmIt != FaceId2EnforcedVertexCoords.end()) {
- MESSAGE("Some enforced vertices are defined");
- BLSURFPlugin_Hypothesis::TEnfVertexCoordsList evl;
- MESSAGE("Face indice: " << iface);
- MESSAGE("Adding enforced vertices");
- evl = evmIt->second;
- MESSAGE("Number of vertices to add: "<< evl.size());
- BLSURFPlugin_Hypothesis::TEnfVertexCoordsList::const_iterator evlIt = evl.begin();
- for (; evlIt != evl.end(); ++evlIt) {
- BLSURFPlugin_Hypothesis::TEnfVertexCoords xyzCoords;
- xyzCoords.push_back(evlIt->at(2));
- xyzCoords.push_back(evlIt->at(3));
- xyzCoords.push_back(evlIt->at(4));
- MESSAGE("Check position of vertex =(" << xyzCoords[0] << "," << xyzCoords[1] << "," << xyzCoords[2] << ")");
- gp_Pnt P(xyzCoords[0],xyzCoords[1],xyzCoords[2]);
- BRepClass_FaceClassifier scl(f,P,1e-7);
- // OCC 6.3sp6 : scl.Perform() is bugged. The function was rewritten
-// BRepClass_FaceClassifierPerform(&scl,f,P,1e-7);
- // OCC 6.5.2: scl.Perform() is not bugged anymore
- scl.Perform(f, P, 1e-7);
- TopAbs_State result = scl.State();
- MESSAGE("Position of point on face: "<<result);
- if ( result == TopAbs_OUT ) {
- MESSAGE("Point is out of face: node is not created");
- if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
- EnfVertexCoords2ProjVertex.erase(xyzCoords);
- EnfVertexCoords2EnfVertexList.erase(xyzCoords);
- }
+ // ------------------
+ faceKey = FacesWithEnforcedVertices.FindIndex(f);
+ std::map<int,BLSURFPlugin_Hypothesis::TEnfVertexCoordsList >::const_iterator evmIt = FaceId2EnforcedVertexCoords.find(faceKey);
+ if (evmIt != FaceId2EnforcedVertexCoords.end()) {
+ MESSAGE("Some enforced vertices are defined");
+ BLSURFPlugin_Hypothesis::TEnfVertexCoordsList evl;
+ MESSAGE("Face indice: " << iface);
+ MESSAGE("Adding enforced vertices");
+ evl = evmIt->second;
+ MESSAGE("Number of vertices to add: "<< evl.size());
+ BLSURFPlugin_Hypothesis::TEnfVertexCoordsList::const_iterator evlIt = evl.begin();
+ for (; evlIt != evl.end(); ++evlIt) {
+ BLSURFPlugin_Hypothesis::TEnfVertexCoords xyzCoords;
+ xyzCoords.push_back(evlIt->at(2));
+ xyzCoords.push_back(evlIt->at(3));
+ xyzCoords.push_back(evlIt->at(4));
+ MESSAGE("Check position of vertex =(" << xyzCoords[0] << "," << xyzCoords[1] << "," << xyzCoords[2] << ")");
+ gp_Pnt P(xyzCoords[0],xyzCoords[1],xyzCoords[2]);
+ BRepClass_FaceClassifier scl(f,P,1e-7);
+ // OCC 6.3sp6 : scl.Perform() is bugged. The function was rewritten
+ // BRepClass_FaceClassifierPerform(&scl,f,P,1e-7);
+ // OCC 6.5.2: scl.Perform() is not bugged anymore
+ scl.Perform(f, P, 1e-7);
+ TopAbs_State result = scl.State();
+ MESSAGE("Position of point on face: "<<result);
+ if ( result == TopAbs_OUT ) {
+ MESSAGE("Point is out of face: node is not created");
+ if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
+ EnfVertexCoords2ProjVertex.erase(xyzCoords);
+ // isssue 22783. Do not erase as this point can be IN other face of a group
+ //EnfVertexCoords2EnfVertexList.erase(xyzCoords);
}
- if ( result == TopAbs_UNKNOWN ) {
- MESSAGE("Point position on face is unknown: node is not created");
- if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
- EnfVertexCoords2ProjVertex.erase(xyzCoords);
- EnfVertexCoords2EnfVertexList.erase(xyzCoords);
- }
+ }
+ if ( result == TopAbs_UNKNOWN ) {
+ MESSAGE("Point position on face is unknown: node is not created");
+ if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
+ EnfVertexCoords2ProjVertex.erase(xyzCoords);
+ //EnfVertexCoords2EnfVertexList.erase(xyzCoords);
}
- if ( result == TopAbs_ON ) {
- MESSAGE("Point is on border of face: node is not created");
- if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
- EnfVertexCoords2ProjVertex.erase(xyzCoords);
- EnfVertexCoords2EnfVertexList.erase(xyzCoords);
- }
+ }
+ if ( result == TopAbs_ON ) {
+ MESSAGE("Point is on border of face: node is not created");
+ if (EnfVertexCoords2ProjVertex.find(xyzCoords) != EnfVertexCoords2ProjVertex.end()) {
+ EnfVertexCoords2ProjVertex.erase(xyzCoords);
+ //EnfVertexCoords2EnfVertexList.erase(xyzCoords);
}
- if ( result == TopAbs_IN )
+ }
+ if ( result == TopAbs_IN )
+ {
+ // Point is inside face and not on border
+ MESSAGE("Point is in face: node is created");
+ double uvCoords[2] = {evlIt->at(0),evlIt->at(1)};
+ ienf++;
+ MESSAGE("Add cad point on (u,v)=(" << uvCoords[0] << "," << uvCoords[1] << ") with id = " << ienf);
+ cad_point_t* point_p = cad_point_new(fce, ienf, uvCoords);
+ int tag = 0;
+ std::map< BLSURFPlugin_Hypothesis::TEnfVertexCoords, BLSURFPlugin_Hypothesis::TEnfVertexList >::const_iterator enfCoordsIt = EnfVertexCoords2EnfVertexList.find(xyzCoords);
+ if (enfCoordsIt != EnfVertexCoords2EnfVertexList.end() &&
+ !enfCoordsIt->second.empty() )
{
- // Point is inside face and not on border
- MESSAGE("Point is in face: node is created");
- double uvCoords[2] = {evlIt->at(0),evlIt->at(1)};
- ienf++;
- MESSAGE("Add cad point on (u,v)=(" << uvCoords[0] << "," << uvCoords[1] << ") with id = " << ienf);
- cad_point_t* point_p = cad_point_new(fce, ienf, uvCoords);
- cad_point_set_tag(point_p, ienf);
+ // to merge nodes of an INTERNAL vertex belonging to several faces
+ TopoDS_Vertex v = (*enfCoordsIt->second.begin())->vertex;
+ if ( v.IsNull() ) v = (*enfCoordsIt->second.rbegin())->vertex;
+ if ( !v.IsNull() ) {
+ tag = pmap.Add( v );
+ SMESH_subMesh* vSM = aMesh.GetSubMesh( v );
+ vSM->ComputeStateEngine( SMESH_subMesh::COMPUTE );
+ mergeSubmeshes.insert( vSM->GetSubMeshDS() );
+ // //if ( tag != pmap.Extent() )
+ // needMerge = true;
+ }
}
+ if ( tag == 0 ) tag = ienf;
+ cad_point_set_tag(point_p, tag);
}
- FaceId2EnforcedVertexCoords.erase(faceKey);
}
-// else
-// std::cout << "No enforced vertex defined" << std::endl;
-// }
+ FaceId2EnforcedVertexCoords.erase(faceKey);
+ }
/****************************************************************************************
- EDGES
- now create the edges associated to this face
+ EDGES
+ now create the edges associated to this face
*****************************************************************************************/
int edgeKey = -1;
- for (TopExp_Explorer edge_iter(f,TopAbs_EDGE);edge_iter.More();edge_iter.Next()) {
+ for (TopExp_Explorer edge_iter(f,TopAbs_EDGE);edge_iter.More();edge_iter.Next())
+ {
TopoDS_Edge e = TopoDS::Edge(edge_iter.Current());
int ic = emap.FindIndex(e);
if (ic <= 0)
ic = emap.Add(e);
+// std::string aFileName = "fmap_edge_";
+// aFileName.append(val_to_string(ic));
+// aFileName.append(".brep");
+// BRepTools::Write(e,aFileName.c_str());
+
double tmin,tmax;
curves.push_back(BRep_Tool::CurveOnSurface(e, f, tmin, tmax));
if (theSizeMapStr.find(bad_end) == (theSizeMapStr.size()-bad_end.size()-1))
continue;
// Expr To Python function, verification is performed at validation in GUI
+ gstate = PyGILState_Ensure();
PyObject * obj = NULL;
obj= PyRun_String(theSizeMapStr.c_str(), Py_file_input, main_dict, NULL);
Py_DECREF(obj);
func = PyObject_GetAttrString(main_mod, "f");
EdgeId2PythonSmp[ic]=func;
EdgeId2SizeMap.erase(edgeKey);
+ PyGILState_Release(gstate);
}
}
+ /* data of nodes existing on the edge */
+ StdMeshers_FaceSidePtr nodeData;
+ SMESH_subMesh* sm = aMesh.GetSubMesh( e );
+ if ( !sm->IsEmpty() )
+ {
+ // SMESH_subMeshIteratorPtr subsmIt = sm->getDependsOnIterator( /*includeSelf=*/true,
+ // /*complexFirst=*/false);
+ // while ( subsmIt->more() )
+ // edgeSubmeshes.insert( subsmIt->next()->GetSubMeshDS() );
+ edgeSubmeshes.insert( sm->GetSubMeshDS() );
+
+ nodeData.reset( new StdMeshers_FaceSide( f, e, &aMesh, /*isForwrd = */true,
+ /*ignoreMedium=*/haveQuadraticSubMesh));
+ if ( nodeData->MissVertexNode() )
+ return error(COMPERR_BAD_INPUT_MESH,"No node on vertex");
- /* attach the edge to the current blsurf face */
+ const std::vector<UVPtStruct>& nodeDataVec = nodeData->GetUVPtStruct();
+ if ( !nodeDataVec.empty() )
+ {
+ if ( Abs( nodeDataVec[0].param - tmin ) > Abs( nodeDataVec.back().param - tmin ))
+ {
+ nodeData->Reverse();
+ nodeData->GetUVPtStruct(); // nodeData recomputes nodeDataVec
+ }
+ // tmin and tmax can change in case of viscous layer on an adjacent edge
+ tmin = nodeDataVec.front().param;
+ tmax = nodeDataVec.back().param;
+ }
+ else
+ {
+ cout << "---------------- Invalid nodeData" << endl;
+ nodeData.reset();
+ }
+ }
+
+ /* attach the edge to the current cadsurf face */
cad_edge_t *edg = cad_edge_new(fce, ic, tmin, tmax, curv_fun, curves.back());
- /* by default an edge has no tag (color). The following call sets it to the same value as the edge_id : */
+ /* by default an edge has no tag (color).
+ The following call sets it to the same value as the edge_id : */
cad_edge_set_tag(edg, ic);
/* by default, an edge does not necessalry appear in the resulting mesh,
- unless the following property is set :
+ unless the following property is set :
*/
cad_edge_set_property(edg, EDGE_PROPERTY_SOFT_REQUIRED);
if (e.Orientation() == TopAbs_INTERNAL)
cad_edge_set_property(edg, EDGE_PROPERTY_INTERNAL);
- // pass existing nodes of sub-meshes to BLSURF
- SMESH_subMesh* sm = aMesh.GetSubMesh( e );
- if ( !sm->IsEmpty() )
+ // pass existing nodes of sub-meshes to MG-CADSurf
+ if ( nodeData )
{
- edgeSubmeshes.insert( sm );
-
- StdMeshers_FaceSide edgeOfFace( f, e, &aMesh, e.Orientation() == TopAbs_FORWARD,
- /*ignoreMedium=*/haveQudraticSubMesh);
- if ( edgeOfFace.MissVertexNode() )
- return error(COMPERR_BAD_INPUT_MESH,"No node on vertex");
-
- const int nbNodes = edgeOfFace.NbPoints();
+ const std::vector<UVPtStruct>& nodeDataVec = nodeData->GetUVPtStruct();
+ const int nbNodes = nodeDataVec.size();
dcad_edge_discretization_t *dedge;
dcad_get_edge_discretization(dcad, edg, &dedge);
dcad_edge_discretization_set_vertex_count( dedge, nbNodes );
- const std::vector<UVPtStruct>& nodeData = edgeOfFace.GetUVPtStruct();
+ // cout << endl << " EDGE " << ic << endl;
+ // cout << "tmin = "<<tmin << ", tmax = "<< tmax << endl;
for ( int iN = 0; iN < nbNodes; ++iN )
{
- const UVPtStruct& nData = nodeData[ iN ];
+ const UVPtStruct& nData = nodeDataVec[ iN ];
double t = nData.param;
real uv[2] = { nData.u, nData.v };
SMESH_TNodeXYZ nXYZ( nData.node );
+ // cout << "\tt = " << t
+ // << "\t uv = ( " << uv[0] << ","<< uv[1] << " ) "
+ // << "\t u = " << nData.param
+ // << "\t ID = " << nData.node->GetID() << endl;
dcad_edge_discretization_set_vertex_coordinates( dedge, iN+1, t, uv, nXYZ._xyz );
}
dcad_edge_discretization_set_property(dedge, DISTENE_DCAD_PROPERTY_REQUIRED);
d2 = ee0.SquareDistance(BRep_Tool::Pnt(v));
}
*ip = pmap.FindIndex(v);
- if(*ip <= 0)
+ if(*ip <= 0) {
*ip = pmap.Add(v);
+ // SMESH_subMesh* sm = aMesh.GetSubMesh(v);
+ // if ( sm->IsMeshComputed() )
+ // edgeSubmeshes.insert( sm->GetSubMeshDS() );
+ }
+
+// std::string aFileName = "fmap_vertex_";
+// aFileName.append(val_to_string(*ip));
+// aFileName.append(".brep");
+// BRepTools::Write(v,aFileName.c_str());
if (HasSizeMapOnVertex){
vertexKey = VerticesWithSizeMap.FindIndex(v);
if (theSizeMapStr.find(bad_end) == (theSizeMapStr.size()-bad_end.size()-1))
continue;
// Expr To Python function, verification is performed at validation in GUI
+ gstate = PyGILState_Ensure();
PyObject * obj = NULL;
obj= PyRun_String(theSizeMapStr.c_str(), Py_file_input, main_dict, NULL);
Py_DECREF(obj);
func = PyObject_GetAttrString(main_mod, "f");
VertexId2PythonSmp[*ip]=func;
VertexId2SizeMap.erase(vertexKey); // do not erase if using a vector
+ PyGILState_Release(gstate);
}
}
}
// Clear mesh from already meshed edges if possible else
// remember that merge is needed
- set< SMESH_subMesh* >::iterator smIt = edgeSubmeshes.begin();
- for ( ; smIt != edgeSubmeshes.end(); ++smIt )
+ TSubMeshSet::iterator smIt = edgeSubmeshes.begin();
+ for ( ; smIt != edgeSubmeshes.end(); ++smIt ) // loop on already meshed EDGEs
{
- SMESH_subMesh* sm = *smIt;
- SMESH_subMeshIteratorPtr subsmIt = sm->getDependsOnIterator( /*includeSelf=*/true,
- /*complexFirst=*/false);
- while ( subsmIt->more() )
+ SMESHDS_SubMesh* smDS = *smIt;
+ if ( !smDS ) continue;
+ SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
+ if ( nIt->more() )
{
- sm = subsmIt->next();
- if ( SMESHDS_SubMesh* smDS = sm->GetSubMeshDS() )
+ const SMDS_MeshNode* n = nIt->next();
+ if ( n->NbInverseElements( SMDSAbs_Face ) > 0 )
{
- SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
- if ( nIt->more() )
+ needMerge = true; // to correctly sew with viscous mesh
+ // add existing medium nodes to helper
+ if ( aMesh.NbEdges( ORDER_QUADRATIC ) > 0 )
{
- const SMDS_MeshNode* n = nIt->next();
- if ( n->NbInverseElements( SMDSAbs_Face ) > 0 )
- {
- needMerge = true;
- // add existing medium nodes to helper
- if ( aMesh.NbEdges( ORDER_QUADRATIC ) > 0 )
- {
- SMDS_ElemIteratorPtr edgeIt = smDS->GetElements();
- while ( edgeIt->more() )
- helper.AddTLinks( static_cast<const SMDS_MeshEdge*>(edgeIt->next()));
- }
- }
+ SMDS_ElemIteratorPtr edgeIt = smDS->GetElements();
+ while ( edgeIt->more() )
+ helper.AddTLinks( static_cast<const SMDS_MeshEdge*>(edgeIt->next()));
+ }
+ continue;
+ }
+ }
+ if ( allowSubMeshClearing )
+ {
+ SMDS_ElemIteratorPtr eIt = smDS->GetElements();
+ while ( eIt->more() ) meshDS->RemoveFreeElement( eIt->next(), 0 );
+ SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
+ while ( nIt->more() ) meshDS->RemoveFreeNode( nIt->next(), 0 );
+ smDS->Clear();
+ }
+ else
+ {
+ needMerge = true;
+ }
+ }
+
+ ///////////////////////
+ // PERIODICITY //
+ ///////////////////////
+
+ MESSAGE("BEFORE PERIODICITY");
+ MESSAGE("_preCadFacesIDsPeriodicityVector.size() = " << _preCadFacesIDsPeriodicityVector.size());
+ if (! _preCadFacesIDsPeriodicityVector.empty()) {
+ MESSAGE("INTO PRECAD FACES PERIODICITY");
+ for (std::size_t i=0; i < _preCadFacesIDsPeriodicityVector.size(); i++){
+ std::vector<int> theFace1_ids = _preCadFacesIDsPeriodicityVector[i].shape1IDs;
+ std::vector<int> theFace2_ids = _preCadFacesIDsPeriodicityVector[i].shape2IDs;
+ int* theFace1_ids_c = &theFace1_ids[0];
+ int* theFace2_ids_c = &theFace2_ids[0];
+ std::ostringstream o;
+ o << "_preCadFacesIDsPeriodicityVector[" << i << "] = [";
+ for (std::size_t j=0; j < theFace1_ids.size(); j++)
+ o << theFace1_ids[j] << ", ";
+ o << "], [";
+ for (std::size_t j=0; j < theFace2_ids.size(); j++)
+ o << theFace2_ids[j] << ", ";
+ o << "]";
+ MESSAGE(o.str());
+ MESSAGE("theFace1_ids.size(): " << theFace1_ids.size());
+ MESSAGE("theFace2_ids.size(): " << theFace2_ids.size());
+ if (_preCadFacesIDsPeriodicityVector[i].theSourceVerticesCoords.empty())
+ {
+ // If no source points, call peridoicity without transformation function
+ MESSAGE("periodicity without transformation function");
+ meshgems_cad_periodicity_transformation_t periodicity_transformation = NULL;
+ status = cad_add_face_multiple_periodicity_with_transformation_function(c, theFace1_ids_c, theFace1_ids.size(),
+ theFace2_ids_c, theFace2_ids.size(), periodicity_transformation, NULL);
+ if(status != STATUS_OK)
+ cout << "cad_add_face_multiple_periodicity_with_transformation_function failed with error code " << status << "\n";
+ }
+ else
+ {
+ // get the transformation vertices
+ MESSAGE("periodicity with transformation vertices");
+ double* theSourceVerticesCoords_c = &_preCadFacesIDsPeriodicityVector[i].theSourceVerticesCoords[0];
+ double* theTargetVerticesCoords_c = &_preCadFacesIDsPeriodicityVector[i].theTargetVerticesCoords[0];
+ int nbSourceVertices = _preCadFacesIDsPeriodicityVector[i].theSourceVerticesCoords.size()/3;
+ int nbTargetVertices = _preCadFacesIDsPeriodicityVector[i].theTargetVerticesCoords.size()/3;
+
+ MESSAGE("nbSourceVertices: " << nbSourceVertices << ", nbTargetVertices: " << nbTargetVertices);
+
+ status = cad_add_face_multiple_periodicity_with_transformation_function_by_points(c, theFace1_ids_c, theFace1_ids.size(),
+ theFace2_ids_c, theFace2_ids.size(), theSourceVerticesCoords_c, nbSourceVertices, theTargetVerticesCoords_c, nbTargetVertices);
+ if(status != STATUS_OK)
+ cout << "cad_add_face_multiple_periodicity_with_transformation_function_by_points failed with error code " << status << "\n";
+ }
+ }
+
+ MESSAGE("END PRECAD FACES PERIODICITY");
+ }
+
+ MESSAGE("_preCadEdgesIDsPeriodicityVector.size() = " << _preCadEdgesIDsPeriodicityVector.size());
+ if (! _preCadEdgesIDsPeriodicityVector.empty()) {
+ MESSAGE("INTO PRECAD EDGES PERIODICITY");
+ for (std::size_t i=0; i < _preCadEdgesIDsPeriodicityVector.size(); i++){
+ std::vector<int> theEdge1_ids = _preCadEdgesIDsPeriodicityVector[i].shape1IDs;
+ std::vector<int> theEdge2_ids = _preCadEdgesIDsPeriodicityVector[i].shape2IDs;
+ // Use the address of the first element of the vector to initialise the array
+ int* theEdge1_ids_c = &theEdge1_ids[0];
+ int* theEdge2_ids_c = &theEdge2_ids[0];
+
+ std::ostringstream o;
+ o << "_preCadEdgesIDsPeriodicityVector[" << i << "] = [";
+ for (std::size_t j=0; j < theEdge1_ids.size(); j++)
+ o << theEdge1_ids[j] << ", ";
+ o << "], [";
+ for (std::size_t j=0; j < theEdge2_ids.size(); j++)
+ o << theEdge2_ids[j] << ", ";
+ o << "]";
+ MESSAGE(o.str());
+ MESSAGE("theEdge1_ids.size(): " << theEdge1_ids.size());
+ MESSAGE("theEdge2_ids.size(): " << theEdge2_ids.size());
+
+ if (_preCadEdgesIDsPeriodicityVector[i].theSourceVerticesCoords.empty())
+ {
+ // If no source points, call peridoicity without transformation function
+ MESSAGE("periodicity without transformation function");
+ meshgems_cad_periodicity_transformation_t periodicity_transformation = NULL;
+ status = cad_add_edge_multiple_periodicity_with_transformation_function(c, theEdge1_ids_c, theEdge1_ids.size(),
+ theEdge2_ids_c, theEdge2_ids.size(), periodicity_transformation, NULL);
+ if(status != STATUS_OK)
+ cout << "cad_add_edge_multiple_periodicity_with_transformation_function failed with error code " << status << "\n";
+ }
+ else
+ {
+ // get the transformation vertices
+ MESSAGE("periodicity with transformation vertices");
+ double* theSourceVerticesCoords_c = &_preCadEdgesIDsPeriodicityVector[i].theSourceVerticesCoords[0];
+ double* theTargetVerticesCoords_c = &_preCadEdgesIDsPeriodicityVector[i].theTargetVerticesCoords[0];
+ int nbSourceVertices = _preCadEdgesIDsPeriodicityVector[i].theSourceVerticesCoords.size()/3;
+ int nbTargetVertices = _preCadEdgesIDsPeriodicityVector[i].theTargetVerticesCoords.size()/3;
+
+ MESSAGE("nbSourceVertices: " << nbSourceVertices << ", nbTargetVertices: " << nbTargetVertices);
+
+ status = cad_add_edge_multiple_periodicity_with_transformation_function_by_points(c, theEdge1_ids_c, theEdge1_ids.size(),
+ theEdge2_ids_c, theEdge2_ids.size(), theSourceVerticesCoords_c, nbSourceVertices, theTargetVerticesCoords_c, nbTargetVertices);
+ if(status != STATUS_OK)
+ cout << "cad_add_edge_multiple_periodicity_with_transformation_function_by_points failed with error code " << status << "\n";
else
- {
- sm->ComputeStateEngine( SMESH_subMesh::CLEAN );
- }
+ MESSAGE("cad_add_edge_multiple_periodicity_with_transformation_function_by_points succeeded.\n");
}
+ }
+
+ MESSAGE("END PRECAD EDGES PERIODICITY");
+ }
+
+ if (! _facesIDsPeriodicityVector.empty()){
+ MESSAGE("INTO FACE PERIODICITY");
+ for (std::size_t i=0; i < _facesIDsPeriodicityVector.size(); i++){
+ int theFace1 = _facesIDsPeriodicityVector[i].first;
+ int theFace2 = _facesIDsPeriodicityVector[i].second;
+ MESSAGE("_facesIDsPeriodicityVector[" << i << "] = (" << theFace1 << ", " << theFace2 << ")");
+ status = cad_add_face_periodicity(c, theFace1, theFace2);
+ if(status != STATUS_OK){
+ cout << "cad_add_face_periodicity failed with error code " << status << "\n";
+ }
+ }
+ MESSAGE("END FACE PERIODICITY");
+ }
+
+
+ if (! _edgesIDsPeriodicityVector.empty()){
+ MESSAGE("INTO EDGE PERIODICITY");
+ for (std::size_t i=0; i < _edgesIDsPeriodicityVector.size(); i++){
+ int theFace1 = _edgesIDsPeriodicityVector[i].theFace1ID;
+ int theEdge1 = _edgesIDsPeriodicityVector[i].theEdge1ID;
+ int theFace2 = _edgesIDsPeriodicityVector[i].theFace2ID;
+ int theEdge2 = _edgesIDsPeriodicityVector[i].theEdge2ID;
+ int edge_orientation = _edgesIDsPeriodicityVector[i].edge_orientation;
+ MESSAGE("_edgesIDsPeriodicityVector[" << i << "] = (" << theFace1 << ", " << theEdge1 << ", " << theFace2 << ", " << theEdge2 << ", " << edge_orientation << ")");
+ status = cad_add_edge_periodicity(c, theFace1, theEdge1, theFace2, theEdge2, edge_orientation);
+ if(status != STATUS_OK){
+ cout << "cad_add_edge_periodicity failed with error code " << status << "\n";
}
}
+ MESSAGE("END EDGE PERIODICITY");
+ }
+
+ if (! _verticesIDsPeriodicityVector.empty()){
+ MESSAGE("INTO VERTEX PERIODICITY");
+ for (std::size_t i=0; i < _verticesIDsPeriodicityVector.size(); i++){
+ int theEdge1 = _verticesIDsPeriodicityVector[i].theEdge1ID;
+ int theVertex1 = _verticesIDsPeriodicityVector[i].theVertex1ID;
+ int theEdge2 = _verticesIDsPeriodicityVector[i].theEdge2ID;
+ int theVertex2 = _verticesIDsPeriodicityVector[i].theVertex2ID;
+ MESSAGE("_verticesIDsPeriodicityVector[" << i << "] = (" << theEdge1 << ", " << theVertex1 << ", " << theEdge2 << ", " << theVertex2 << ")");
+ status = cad_add_point_periodicity(c, theEdge1, theVertex1, theEdge2, theVertex2);
+ if(status != STATUS_OK){
+ cout << "cad_add_vertex_periodicity failed with error code " << status << "\n";
+ }
+ }
+ MESSAGE("END VERTEX PERIODICITY");
}
- PyGILState_Release(gstate);
+ ////
- if (use_precad){
+ if (use_precad) {
+ MESSAGE("use_precad");
/* Now launch the PreCAD process */
status = precad_process(pcs);
if(status != STATUS_OK){
- cout << "PreCAD processing failed with error code " << status << "\n";
- // Now we can delete the PreCAD session
- precad_session_delete(pcs);
+ // TODO: raise an error if status < 0.
+ cout << "================ WARNING =================== \n";
+ stringstream msg;
+ msg << "PreCAD processing failed with error code " << status << "\n";
+ msg << *mcud._error;
+ cout << msg.str();
+ cout << "============================================ \n";
+ // the text of _comment is set in message_cb by mcud->_error
+ // => No need to append msg to _comment
+ if (status > 0)
+ {
+ // TODO: fix the SIGSEGV of COMPERR_WARNING with 2 launches
+ error(COMPERR_WARNING, _comment);
+ }
+ if (status < 0)
+ {
+ error(_comment);
+ }
}
else {
// retrieve the pre-processed CAD object
+
+ // dcad
+ cleandc = precad_new_dcad(pcs);
+ if(!cleandc){
+ cout << "Unable to retrieve PreCAD result on dcad \n";
+ }
+ else
+ cout << "PreCAD processing successfull on dcad \n";
+
+ // cad
cleanc = precad_new_cad(pcs);
if(!cleanc){
- cout << "Unable to retrieve PreCAD result \n";
+ cout << "Unable to retrieve PreCAD result on cad \n";
}
- cout << "PreCAD processing successfull \n";
-
-// #if BLSURF_VERSION_LONG >= "3.1.1"
-// /* We can now get the updated sizemaps (if any) */
-// // if(geo_sizemap_e)
-// // clean_geo_sizemap_e = precad_new_sizemap(pcs, geo_sizemap_e);
-// //
-// // if(geo_sizemap_f)
-// // clean_geo_sizemap_f = precad_new_sizemap(pcs, geo_sizemap_f);
-//
-// if(iso_sizemap_p)
-// clean_iso_sizemap_p = precad_new_sizemap(pcs, iso_sizemap_p);
-//
-// if(iso_sizemap_e)
-// clean_iso_sizemap_e = precad_new_sizemap(pcs, iso_sizemap_e);
-//
-// if(iso_sizemap_f)
-// clean_iso_sizemap_f = precad_new_sizemap(pcs, iso_sizemap_f);
-// #endif
-
- // Now we can delete the PreCAD session
- precad_session_delete(pcs);
+ else
+ cout << "PreCAD processing successfull on cad \n";
+
+ // #if BLSURF_VERSION_LONG >= "3.1.1"
+ // /* We can now get the updated sizemaps (if any) */
+ // // if(geo_sizemap_e)
+ // // clean_geo_sizemap_e = precad_new_sizemap(pcs, geo_sizemap_e);
+ // //
+ // // if(geo_sizemap_f)
+ // // clean_geo_sizemap_f = precad_new_sizemap(pcs, geo_sizemap_f);
+ //
+ // if(iso_sizemap_p)
+ // clean_iso_sizemap_p = precad_new_sizemap(pcs, iso_sizemap_p);
+ //
+ // if(iso_sizemap_e)
+ // clean_iso_sizemap_e = precad_new_sizemap(pcs, iso_sizemap_e);
+ //
+ // if(iso_sizemap_f)
+ // clean_iso_sizemap_f = precad_new_sizemap(pcs, iso_sizemap_f);
+ // #endif
}
+ // Now we can delete the PreCAD session
+ precad_session_delete(pcs);
}
- blsurf_data_set_dcad(bls, dcad);
- if (cleanc) {
- // Give the pre-processed CAD object to the current BLSurf session
- blsurf_data_set_cad(bls, cleanc);
+ if (cleandc) {
+ cout << "Give the pre-processed dcad object to the current MG-CADSurf session \n";
+ cadsurf_data_set_dcad(css, cleandc);
}
else {
// Use the original one
- blsurf_data_set_cad(bls, c);
+ cadsurf_data_set_dcad(css, dcad);
}
-// #if BLSURF_VERSION_LONG >= "3.1.1"
-// blsurf_data_set_sizemap(bls, clean_iso_sizemap_p);
-// blsurf_data_set_sizemap(bls, clean_iso_sizemap_e);
-// blsurf_data_set_sizemap(bls, clean_iso_sizemap_f);
-// #endif
+ if (cleanc) {
+ // Give the pre-processed CAD object to the current MG-CADSurf session
+ cout << "Give the pre-processed CAD object to the current MG-CADSurf session \n";
+ cadsurf_data_set_cad(css, cleanc);
+ }
+ else {
+ // Use the original one
+ cadsurf_data_set_cad(css, c);
+ }
std::cout << std::endl;
std::cout << "Beginning of Surface Mesh generation" << std::endl;
std::cout << std::endl;
- // Issue 0019864. On DebianSarge, FE signals do not obey to OSD::SetSignal(false)
-#ifndef WNT
- feclearexcept( FE_ALL_EXCEPT );
- int oldFEFlags = fedisableexcept( FE_ALL_EXCEPT );
-#endif
-
try {
OCC_CATCH_SIGNALS;
- status = blsurf_compute_mesh(bls);
+ status = cadsurf_compute_mesh(css);
}
catch ( std::exception& exc ) {
}
catch (...) {
if ( _comment.empty() )
- _comment = "Exception in blsurf_compute_mesh()";
- }
- if ( status != STATUS_OK) {
- // There was an error while meshing
- //return error(_comment);
+ _comment = "Exception in cadsurf_compute_mesh()";
}
std::cout << std::endl;
std::cout << std::endl;
mesh_t *msh = NULL;
- blsurf_data_get_mesh(bls, &msh);
+ cadsurf_data_get_mesh(css, &msh);
if(!msh){
/* release the mesh object */
- blsurf_data_regain_mesh(bls, msh);
+ cadsurf_data_regain_mesh(css, msh);
return error(_comment);
}
if (_hypothesis)
GMFFileName = _hypothesis->GetGMFFile();
if (GMFFileName != "") {
-// bool GMFFileMode = _hypothesis->GetGMFFileMode();
- bool asciiFound = (GMFFileName.find(".mesh",GMFFileName.length()-5) != std::string::npos);
+ bool asciiFound = (GMFFileName.find(".mesh", GMFFileName.length()-5) != std::string::npos);
bool binaryFound = (GMFFileName.find(".meshb",GMFFileName.length()-6) != std::string::npos);
if (!asciiFound && !binaryFound)
GMFFileName.append(".mesh");
- /*
- if (GMFFileMode) {
- if (!binaryFound) {
- if (asciiFound)
- GMFFileName.append("b");
- else
- GMFFileName.append(".meshb");
- }
- }
- else {
- if (!asciiFound)
- GMFFileName.append(".mesh");
- }
- */
mesh_write_mesh(msh, GMFFileName.c_str());
}
- /* retrieve mesh data (see distene/mesh.h) */
- integer nv, ne, nt, nq, vtx[4], tag;
+ /* retrieve mesh data (see meshgems/mesh.h) */
+ integer nv, ne, nt, nq, vtx[4], tag, nb_tag;
+ integer *evedg, *evtri, *evquad, *tags_buff, type;
real xyz[3];
mesh_get_vertex_count(msh, &nv);
mesh_get_triangle_count(msh, &nt);
mesh_get_quadrangle_count(msh, &nq);
+ evedg = (integer *)mesh_calloc_generic_buffer(msh);
+ evtri = (integer *)mesh_calloc_generic_buffer(msh);
+ evquad = (integer *)mesh_calloc_generic_buffer(msh);
+ tags_buff = (integer*)mesh_calloc_generic_buffer(msh);
- SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
- SMDS_MeshNode** nodes = new SMDS_MeshNode*[nv+1];
- bool* tags = new bool[nv+1];
+ std::vector<const SMDS_MeshNode*> nodes(nv+1);
+ std::vector<bool> tags(nv+1);
/* enumerated vertices */
for(int iv=1;iv<=nv;iv++) {
mesh_get_vertex_coordinates(msh, iv, xyz);
mesh_get_vertex_tag(msh, iv, &tag);
// Issue 0020656. Use vertex coordinates
+ nodes[iv] = NULL;
if ( tag > 0 && tag <= pmap.Extent() ) {
TopoDS_Vertex v = TopoDS::Vertex(pmap(tag));
double tol = BRep_Tool::Tolerance( v );
xyz[0] = p.X(), xyz[1] = p.Y(), xyz[2] = p.Z();
else
tag = 0; // enforced or attracted vertex
+ nodes[iv] = SMESH_Algo::VertexNode( v, meshDS );
}
- nodes[iv] = meshDS->AddNode(xyz[0], xyz[1], xyz[2]);
+ if ( !nodes[iv] )
+ nodes[iv] = meshDS->AddNode(xyz[0], xyz[1], xyz[2]);
// Create group of enforced vertices if requested
BLSURFPlugin_Hypothesis::TEnfVertexCoords projVertex;
aGroupDS->SMDSGroup().Add(nodes[iv]);
MESSAGE("Node ID: " << nodes[iv]->GetID());
// How can I inform the hypothesis ?
-// _hypothesis->AddEnfVertexNodeID(currentEnfVertex->grpName,nodes[iv]->GetID());
+ // _hypothesis->AddEnfVertexNodeID(currentEnfVertex->grpName,nodes[iv]->GetID());
groupDone = true;
MESSAGE("Successfully added enforced vertex to existing group " << currentEnfVertex->grpName);
break;
}
}
-
- // internal point are tagged to zero
+ // internal points are tagged to zero
if(tag > 0 && tag <= pmap.Extent() ){
meshDS->SetNodeOnVertex(nodes[iv], TopoDS::Vertex(pmap(tag)));
tags[iv] = false;
/* enumerate edges */
for(int it=1;it<=ne;it++) {
-
+ SMDS_MeshEdge* edg;
mesh_get_edge_vertices(msh, it, vtx);
+ mesh_get_edge_extra_vertices(msh, it, &type, evedg);
mesh_get_edge_tag(msh, it, &tag);
+
+ // If PreCAD performed some cleaning operations (remove tiny edges,
+ // merge edges ...) an output tag can indeed represent several original tags.
+ // Get the initial tags corresponding to the output tag and redefine the tag as
+ // the last of the two initial tags (else the output tag is out of emap and hasn't any meaning)
+ mesh_get_composite_tag_definition(msh, tag, &nb_tag, tags_buff);
+ if(nb_tag > 1)
+ tag=tags_buff[nb_tag-1];
+ if ( tag > emap.Extent() )
+ {
+ std::cerr << "MG-CADSurf BUG:::: Edge tag " << tag
+ << " more than nb CAD egdes (" << emap.Extent() << ")" << std::endl;
+ continue;
+ }
if (tags[vtx[0]]) {
Set_NodeOnEdge(meshDS, nodes[vtx[0]], emap(tag));
tags[vtx[0]] = false;
Set_NodeOnEdge(meshDS, nodes[vtx[1]], emap(tag));
tags[vtx[1]] = false;
};
- SMDS_MeshEdge* edg = helper.AddEdge(nodes[vtx[0]], nodes[vtx[1]]);
+ if (type == MESHGEMS_MESH_ELEMENT_TYPE_EDGE3) {
+ // QUADRATIC EDGE
+ if (tags[evedg[0]]) {
+ Set_NodeOnEdge(meshDS, nodes[evedg[0]], emap(tag));
+ tags[evedg[0]] = false;
+ }
+ edg = meshDS->AddEdge(nodes[vtx[0]], nodes[vtx[1]], nodes[evedg[0]]);
+ }
+ else {
+ edg = helper.AddEdge(nodes[vtx[0]], nodes[vtx[1]]);
+ }
meshDS->SetMeshElementOnShape(edg, TopoDS::Edge(emap(tag)));
}
/* enumerate triangles */
for(int it=1;it<=nt;it++) {
+ SMDS_MeshFace* tri;
mesh_get_triangle_vertices(msh, it, vtx);
- SMDS_MeshFace* tri = helper.AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]]);
+ mesh_get_triangle_extra_vertices(msh, it, &type, evtri);
mesh_get_triangle_tag(msh, it, &tag);
- meshDS->SetMeshElementOnShape(tri, TopoDS::Face(fmap(tag)));
if (tags[vtx[0]]) {
- meshDS->SetNodeOnFace(nodes[vtx[0]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[0]], tag);
tags[vtx[0]] = false;
};
if (tags[vtx[1]]) {
- meshDS->SetNodeOnFace(nodes[vtx[1]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[1]], tag);
tags[vtx[1]] = false;
};
if (tags[vtx[2]]) {
- meshDS->SetNodeOnFace(nodes[vtx[2]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[2]], tag);
tags[vtx[2]] = false;
};
+ if (type == MESHGEMS_MESH_ELEMENT_TYPE_TRIA6) {
+ // QUADRATIC TRIANGLE
+ if (tags[evtri[0]]) {
+ meshDS->SetNodeOnFace(nodes[evtri[0]], tag);
+ tags[evtri[0]] = false;
+ }
+ if (tags[evtri[1]]) {
+ meshDS->SetNodeOnFace(nodes[evtri[1]], tag);
+ tags[evtri[1]] = false;
+ }
+ if (tags[evtri[2]]) {
+ meshDS->SetNodeOnFace(nodes[evtri[2]], tag);
+ tags[evtri[2]] = false;
+ }
+ tri = meshDS->AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]],
+ nodes[evtri[0]], nodes[evtri[1]], nodes[evtri[2]]);
+ }
+ else {
+ tri = helper.AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]]);
+ }
+ meshDS->SetMeshElementOnShape(tri, tag);
}
/* enumerate quadrangles */
for(int it=1;it<=nq;it++) {
+ SMDS_MeshFace* quad;
mesh_get_quadrangle_vertices(msh, it, vtx);
- SMDS_MeshFace* quad = helper.AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]], nodes[vtx[3]]);
+ mesh_get_quadrangle_extra_vertices(msh, it, &type, evquad);
mesh_get_quadrangle_tag(msh, it, &tag);
- meshDS->SetMeshElementOnShape(quad, TopoDS::Face(fmap(tag)));
if (tags[vtx[0]]) {
- meshDS->SetNodeOnFace(nodes[vtx[0]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[0]], tag);
tags[vtx[0]] = false;
};
if (tags[vtx[1]]) {
- meshDS->SetNodeOnFace(nodes[vtx[1]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[1]], tag);
tags[vtx[1]] = false;
};
if (tags[vtx[2]]) {
- meshDS->SetNodeOnFace(nodes[vtx[2]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[2]], tag);
tags[vtx[2]] = false;
};
if (tags[vtx[3]]) {
- meshDS->SetNodeOnFace(nodes[vtx[3]], TopoDS::Face(fmap(tag)));
+ meshDS->SetNodeOnFace(nodes[vtx[3]], tag);
tags[vtx[3]] = false;
};
+ if (type == MESHGEMS_MESH_ELEMENT_TYPE_QUAD9) {
+ // QUADRATIC QUADRANGLE
+ std::cout << "This is a quadratic quadrangle" << std::endl;
+ if (tags[evquad[0]]) {
+ meshDS->SetNodeOnFace(nodes[evquad[0]], tag);
+ tags[evquad[0]] = false;
+ }
+ if (tags[evquad[1]]) {
+ meshDS->SetNodeOnFace(nodes[evquad[1]], tag);
+ tags[evquad[1]] = false;
+ }
+ if (tags[evquad[2]]) {
+ meshDS->SetNodeOnFace(nodes[evquad[2]], tag);
+ tags[evquad[2]] = false;
+ }
+ if (tags[evquad[3]]) {
+ meshDS->SetNodeOnFace(nodes[evquad[3]], tag);
+ tags[evquad[3]] = false;
+ }
+ if (tags[evquad[4]]) {
+ meshDS->SetNodeOnFace(nodes[evquad[4]], tag);
+ tags[evquad[4]] = false;
+ }
+ quad = meshDS->AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]], nodes[vtx[3]],
+ nodes[evquad[0]], nodes[evquad[1]], nodes[evquad[2]], nodes[evquad[3]],
+ nodes[evquad[4]]);
+ }
+ else {
+ quad = helper.AddFace(nodes[vtx[0]], nodes[vtx[1]], nodes[vtx[2]], nodes[vtx[3]]);
+ }
+ meshDS->SetMeshElementOnShape(quad, tag);
}
- // SetIsAlwaysComputed( true ) to sub-meshes of degenerated EDGEs
- TopLoc_Location loc; double f,l;
- for (int i = 1; i <= emap.Extent(); i++)
- if ( BRep_Tool::Curve(TopoDS::Edge( emap( i )), loc, f,l).IsNull() )
- if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( emap( i )))
- sm->SetIsAlwaysComputed( true );
- for (int i = 1; i <= pmap.Extent(); i++)
- if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( pmap( i )))
- if ( !sm->IsMeshComputed() )
- sm->SetIsAlwaysComputed( true );
+ /* release the mesh object, the rest is released by cleaner */
+ cadsurf_data_regain_mesh(css, msh);
- if ( needMerge )
+ if ( needMerge ) // sew mesh computed by MG-CADSurf with pre-existing mesh
{
- set< SMESH_subMesh* >::iterator smIt = edgeSubmeshes.begin();
- for ( ; smIt != edgeSubmeshes.end(); ++smIt )
+ SMESH_MeshEditor editor( &aMesh );
+ SMESH_MeshEditor::TListOfListOfNodes nodeGroupsToMerge;
+ TIDSortedElemSet segementsOnEdge;
+ TSubMeshSet::iterator smIt;
+ SMESHDS_SubMesh* smDS;
+
+ // merge nodes on EDGE's with ones computed by MG-CADSurf
+ for ( smIt = mergeSubmeshes.begin(); smIt != mergeSubmeshes.end(); ++smIt )
{
- SMESH_subMesh* sm = *smIt;
- SMESH_subMeshIteratorPtr subsmIt = sm->getDependsOnIterator( /*includeSelf=*/true,
- /*complexFirst=*/false);
- TIDSortedNodeSet nodesOnEdge;
- double mergeTolerance = 1e-7, tol;
- while ( subsmIt->more() )
+ if (! (smDS = *smIt) ) continue;
+ getNodeGroupsToMerge( smDS, meshDS->IndexToShape((*smIt)->GetID()), nodeGroupsToMerge );
+
+ SMDS_ElemIteratorPtr segIt = smDS->GetElements();
+ while ( segIt->more() )
+ segementsOnEdge.insert( segIt->next() );
+ }
+ // merge nodes
+ editor.MergeNodes( nodeGroupsToMerge );
+
+ // merge segments
+ SMESH_MeshEditor::TListOfListOfElementsID equalSegments;
+ editor.FindEqualElements( segementsOnEdge, equalSegments );
+ editor.MergeElements( equalSegments );
+
+ // remove excess segments created on the boundary of viscous layers
+ const SMDS_TypeOfPosition onFace = SMDS_TOP_FACE;
+ for ( int i = 1; i <= emap.Extent(); ++i )
+ {
+ if ( SMESHDS_SubMesh* smDS = meshDS->MeshElements( emap( i )))
{
- // get nodes from an edge
- sm = subsmIt->next();
- if ( SMESHDS_SubMesh* smDS = sm->GetSubMeshDS() )
+ SMDS_ElemIteratorPtr segIt = smDS->GetElements();
+ while ( segIt->more() )
{
- SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
- while ( nIt->more() )
- nodesOnEdge.insert( nIt->next() );
+ const SMDS_MeshElement* seg = segIt->next();
+ if ( seg->GetNode(0)->GetPosition()->GetTypeOfPosition() == onFace ||
+ seg->GetNode(1)->GetPosition()->GetTypeOfPosition() == onFace )
+ meshDS->RemoveFreeElement( seg, smDS );
}
- // get max tolerance
- TopoDS_Shape subShape = sm->GetSubShape();
- if ( subShape.ShapeType() == TopAbs_EDGE )
- tol = BRep_Tool::Tolerance( TopoDS::Edge( subShape ));
- else
- tol = BRep_Tool::Tolerance( TopoDS::Vertex( subShape ));
- mergeTolerance = Max( tol, mergeTolerance );
}
- // find nodes to merge
- SMESH_MeshEditor::TListOfListOfNodes nodeGroupsToMerge;
- SMESH_MeshEditor editor( &aMesh );
- editor.FindCoincidentNodes( nodesOnEdge, mergeTolerance*2, nodeGroupsToMerge );
- // merge
- editor.MergeNodes( nodeGroupsToMerge );
}
}
- delete [] nodes;
+ // SetIsAlwaysComputed( true ) to sub-meshes of EDGEs w/o mesh
+ TopLoc_Location loc; double f,l;
+ for (int i = 1; i <= emap.Extent(); i++)
+ if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( emap( i )))
+ sm->SetIsAlwaysComputed( true );
+ for (int i = 1; i <= pmap.Extent(); i++)
+ if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( pmap( i )))
+ if ( !sm->IsMeshComputed() )
+ sm->SetIsAlwaysComputed( true );
- /* release the mesh object */
- blsurf_data_regain_mesh(bls, msh);
+ // Set error to FACE's w/o elements
+ SMESH_ComputeErrorName err = COMPERR_ALGO_FAILED;
+ if ( _comment.empty() && status == STATUS_OK )
+ {
+ err = COMPERR_WARNING;
+ _comment = "No mesh elements assigned to a face";
+ }
+ bool badFaceFound = false;
+ for (TopExp_Explorer face_iter(aShape,TopAbs_FACE);face_iter.More();face_iter.Next())
+ {
+ TopoDS_Face f = TopoDS::Face(face_iter.Current());
+ SMESH_subMesh* sm = aMesh.GetSubMesh( f );
+ if ( !sm->GetSubMeshDS() || sm->GetSubMeshDS()->NbElements() == 0 )
+ {
+ sm->GetComputeError().reset( new SMESH_ComputeError( err, _comment, this ));
+ badFaceFound = true;
+ }
+ }
+ if ( err == COMPERR_WARNING )
+ {
+ _comment.clear();
+ }
+ if ( status != STATUS_OK && !badFaceFound ) {
+ error(_comment);
+ }
// Issue 0019864. On DebianSarge, FE signals do not obey to OSD::SetSignal(false)
-#ifndef WNT
+#ifndef WIN32
if ( oldFEFlags > 0 )
feenableexcept( oldFEFlags );
feclearexcept( FE_ALL_EXCEPT );
#endif
/*
- std::cout << "FacesWithSizeMap" << std::endl;
- FacesWithSizeMap.Statistics(std::cout);
- std::cout << "EdgesWithSizeMap" << std::endl;
- EdgesWithSizeMap.Statistics(std::cout);
- std::cout << "VerticesWithSizeMap" << std::endl;
- VerticesWithSizeMap.Statistics(std::cout);
- std::cout << "FacesWithEnforcedVertices" << std::endl;
- FacesWithEnforcedVertices.Statistics(std::cout);
+ std::cout << "FacesWithSizeMap" << std::endl;
+ FacesWithSizeMap.Statistics(std::cout);
+ std::cout << "EdgesWithSizeMap" << std::endl;
+ EdgesWithSizeMap.Statistics(std::cout);
+ std::cout << "VerticesWithSizeMap" << std::endl;
+ VerticesWithSizeMap.Statistics(std::cout);
+ std::cout << "FacesWithEnforcedVertices" << std::endl;
+ FacesWithEnforcedVertices.Statistics(std::cout);
*/
MESSAGE("END OF BLSURFPlugin_BLSURF::Compute()");
- return true;
+ return ( status == STATUS_OK && !quadraticSubMeshAndViscousLayer );
}
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+//================================================================================
+/*!
+ * \brief Terminates computation
+ */
+//================================================================================
+
void BLSURFPlugin_BLSURF::CancelCompute()
{
_compute_canceled = true;
}
-#endif
//=============================================================================
/*!
*/
//=============================================================================
-void BLSURFPlugin_BLSURF::Set_NodeOnEdge(SMESHDS_Mesh* meshDS, SMDS_MeshNode* node, const TopoDS_Shape& ed) {
+void BLSURFPlugin_BLSURF::Set_NodeOnEdge(SMESHDS_Mesh* meshDS, const SMDS_MeshNode* node, const TopoDS_Shape& ed) {
const TopoDS_Edge edge = TopoDS::Edge(ed);
gp_Pnt pnt(node->X(), node->Y(), node->Z());
Standard_Real p1 = 1.0;
TopLoc_Location loc;
Handle(Geom_Curve) curve = BRep_Tool::Curve(edge, loc, p0, p1);
+ if ( curve.IsNull() )
+ {
+ // issue 22499. Node at a sphere apex
+ meshDS->SetNodeOnEdge(node, edge, p0);
+ return;
+ }
if ( !loc.IsIdentity() ) pnt.Transform( loc.Transformation().Inverted() );
GeomAPI_ProjectPointOnCurve proj(pnt, curve, p0, p1);
pa = (double)proj.LowerDistanceParameter();
// Issue 0020656. Move node if it is too far from edge
gp_Pnt curve_pnt = curve->Value( pa );
- double dist2 = pnt.SquareDistance( curve_pnt );
- double tol = BRep_Tool::Tolerance( edge );
+ double dist2 = pnt.SquareDistance( curve_pnt );
+ double tol = BRep_Tool::Tolerance( edge );
if ( 1e-14 < dist2 && dist2 <= 1000*tol ) // large enough and within tolerance
{
curve_pnt.Transform( loc );
meshDS->MoveNode( node, curve_pnt.X(), curve_pnt.Y(), curve_pnt.Z() );
}
}
-// GProp_GProps LProps;
-// BRepGProp::LinearProperties(ed, LProps);
-// double lg = (double)LProps.Mass();
meshDS->SetNodeOnEdge(node, edge, pa);
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-ostream & BLSURFPlugin_BLSURF::SaveTo(ostream & save)
-{
- return save;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-istream & BLSURFPlugin_BLSURF::LoadFrom(istream & load)
-{
- return load;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-ostream & operator << (ostream & save, BLSURFPlugin_BLSURF & hyp)
-{
- return hyp.SaveTo( save );
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-istream & operator >> (istream & load, BLSURFPlugin_BLSURF & hyp)
-{
- return hyp.LoadFrom( load );
-}
-
-/* Curve definition function See cad_curv_t in file distene/cad.h for
+/* Curve definition function See cad_curv_t in file meshgems/cad.h for
* more information.
* NOTE : if when your CAD systems evaluates second
* order derivatives it also computes first order derivatives and
status_t curv_fun(real t, real *uv, real *dt, real *dtt, void *user_data)
{
/* t is given. It contains the t (time) 1D parametric coordintaes
- of the point PreCAD/BLSurf is querying on the curve */
+ of the point PreCAD/MG-CADSurf is querying on the curve */
- /* user_data identifies the edge PreCAD/BLSurf is querying
+ /* user_data identifies the edge PreCAD/MG-CADSurf is querying
* (see cad_edge_new later in this example) */
const Geom2d_Curve*pargeo = (const Geom2d_Curve*) user_data;
if (uv){
- /* BLSurf is querying the function evaluation */
+ /* MG-CADSurf is querying the function evaluation */
gp_Pnt2d P;
P=pargeo->Value(t);
uv[0]=P.X(); uv[1]=P.Y();
}
/* Surface definition function.
- * See cad_surf_t in file distene/cad.h for more information.
+ * See cad_surf_t in file meshgems/cad.h for more information.
* NOTE : if when your CAD systems evaluates second order derivatives it also
* computes first order derivatives and function evaluation, you can optimize
* this example by making only one CAD call and filling the necessary xyz, du, dv, etc..
real *duu, real *duv, real *dvv, void *user_data)
{
/* uv[2] is given. It contains the u,v coordinates of the point
- * PreCAD/BLSurf is querying on the surface */
+ * PreCAD/MG-CADSurf is querying on the surface */
- /* user_data identifies the face PreCAD/BLSurf is querying (see
+ /* user_data identifies the face PreCAD/MG-CADSurf is querying (see
* cad_face_new later in this example)*/
const Geom_Surface* geometry = (const Geom_Surface*) user_data;
status_t size_on_surface(integer face_id, real *uv, real *size, void *user_data)
{
- if (face_id == 1) {
- if (my_u_min > uv[0]) {
- my_u_min = uv[0];
- }
- if (my_v_min > uv[1]) {
- my_v_min = uv[1];
- }
- if (my_u_max < uv[0]) {
- my_u_max = uv[0];
- }
- if (my_v_max < uv[1]) {
- my_v_max = uv[1];
- }
- }
- //MESSAGE("size_on_surface")
+ TId2ClsAttractorVec::iterator f2attVec;
if (FaceId2PythonSmp.count(face_id) != 0){
- //MESSAGE("A size map is used to calculate size on face : "<<face_id)
- PyObject * pyresult = NULL;
- PyObject* new_stderr = NULL;
assert(Py_IsInitialized());
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
- pyresult = PyObject_CallFunction(FaceId2PythonSmp[face_id],(char*)"(f,f)",uv[0],uv[1]);
- double result;
- if ( pyresult == NULL){
+ PyObject* pyresult = PyObject_CallFunction(FaceId2PythonSmp[face_id],(char*)"(f,f)",uv[0],uv[1]);
+ real result;
+ if ( pyresult != NULL) {
+ result = PyFloat_AsDouble(pyresult);
+ Py_DECREF(pyresult);
+// *size = result;
+ }
+ else{
fflush(stderr);
string err_description="";
- new_stderr = newPyStdOut(err_description);
+ PyObject* new_stderr = newPyStdOut(err_description);
+ PyObject* old_stderr = PySys_GetObject((char*)"stderr");
+ Py_INCREF(old_stderr);
PySys_SetObject((char*)"stderr", new_stderr);
PyErr_Print();
- PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__"));
+ PySys_SetObject((char*)"stderr", old_stderr);
Py_DECREF(new_stderr);
MESSAGE("Can't evaluate f(" << uv[0] << "," << uv[1] << ")" << " error is " << err_description);
- result = *((double*)user_data);
- }
- else {
- result = PyFloat_AsDouble(pyresult);
- Py_DECREF(pyresult);
+ result = *((real*)user_data);
}
- // MESSAGE("f(" << uv[0] << "," << uv[1] << ")" << " = " << result);
*size = result;
PyGILState_Release(gstate);
}
- else if (FaceIndex2ClassAttractor.count(face_id) !=0 && !FaceIndex2ClassAttractor[face_id]->Empty()){
+ else if (( f2attVec = FaceIndex2ClassAttractor.find(face_id)) != FaceIndex2ClassAttractor.end() && !f2attVec->second.empty()){
// MESSAGE("attractor used on face :"<<face_id)
// MESSAGE("List of attractor is not empty")
// MESSAGE("Attractor empty : "<< FaceIndex2ClassAttractor[face_id]->Empty())
- double result = FaceIndex2ClassAttractor[face_id]->GetSize(uv[0],uv[1]);
+ real result = 0;
+ result = 1e100;
+ std::vector< BLSURFPlugin_Attractor* > & attVec = f2attVec->second;
+ for ( size_t i = 0; i < attVec.size(); ++i )
+ {
+ //result += attVec[i]->GetSize(uv[0],uv[1]);
+ result = Min( result, attVec[i]->GetSize(uv[0],uv[1]));
+ }
+ //*size = result / attVec.size(); // mean of sizes defined by all attractors
*size = result;
- // MESSAGE("f(" << uv[0] << "," << uv[1] << ")" << " = " << result);
}
else {
// MESSAGE("List of attractor is empty !!!")
- *size = *((double*)user_data);
+ *size = *((real*)user_data);
}
+// std::cout << "Size_on_surface sur la face " << face_id << " donne une size de: " << *size << std::endl;
return STATUS_OK;
}
status_t size_on_edge(integer edge_id, real t, real *size, void *user_data)
{
if (EdgeId2PythonSmp.count(edge_id) != 0){
- PyObject * pyresult = NULL;
- PyObject* new_stderr = NULL;
assert(Py_IsInitialized());
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
- pyresult = PyObject_CallFunction(EdgeId2PythonSmp[edge_id],(char*)"(f)",t);
- double result;
- if ( pyresult == NULL){
+ PyObject* pyresult = PyObject_CallFunction(EdgeId2PythonSmp[edge_id],(char*)"(f)",t);
+ real result;
+ if ( pyresult != NULL) {
+ result = PyFloat_AsDouble(pyresult);
+ Py_DECREF(pyresult);
+// *size = result;
+ }
+ else{
fflush(stderr);
string err_description="";
- new_stderr = newPyStdOut(err_description);
+ PyObject* new_stderr = newPyStdOut(err_description);
+ PyObject* old_stderr = PySys_GetObject((char*)"stderr");
+ Py_INCREF(old_stderr);
PySys_SetObject((char*)"stderr", new_stderr);
PyErr_Print();
- PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__"));
+ PySys_SetObject((char*)"stderr", old_stderr);
Py_DECREF(new_stderr);
MESSAGE("Can't evaluate f(" << t << ")" << " error is " << err_description);
- result = *((double*)user_data);
- }
- else {
- result = PyFloat_AsDouble(pyresult);
- Py_DECREF(pyresult);
+ result = *((real*)user_data);
}
*size = result;
PyGILState_Release(gstate);
}
else {
- *size = *((double*)user_data);
+ *size = *((real*)user_data);
}
return STATUS_OK;
}
status_t size_on_vertex(integer point_id, real *size, void *user_data)
{
if (VertexId2PythonSmp.count(point_id) != 0){
- PyObject * pyresult = NULL;
- PyObject* new_stderr = NULL;
assert(Py_IsInitialized());
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
- pyresult = PyObject_CallFunction(VertexId2PythonSmp[point_id],(char*)"");
- double result;
- if ( pyresult == NULL){
+ PyObject* pyresult = PyObject_CallFunction(VertexId2PythonSmp[point_id],(char*)"");
+ real result;
+ if ( pyresult != NULL) {
+ result = PyFloat_AsDouble(pyresult);
+ Py_DECREF(pyresult);
+// *size = result;
+ }
+ else {
fflush(stderr);
string err_description="";
- new_stderr = newPyStdOut(err_description);
+ PyObject* new_stderr = newPyStdOut(err_description);
+ PyObject* old_stderr = PySys_GetObject((char*)"stderr");
+ Py_INCREF(old_stderr);
PySys_SetObject((char*)"stderr", new_stderr);
PyErr_Print();
- PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__"));
+ PySys_SetObject((char*)"stderr", old_stderr);
Py_DECREF(new_stderr);
MESSAGE("Can't evaluate f()" << " error is " << err_description);
- result = *((double*)user_data);
- }
- else {
- result = PyFloat_AsDouble(pyresult);
- Py_DECREF(pyresult);
+ result = *((real*)user_data);
}
*size = result;
PyGILState_Release(gstate);
}
else {
- *size = *((double*)user_data);
+ *size = *((real*)user_data);
}
return STATUS_OK;
}
/*
- * The following function will be called for PreCAD/BLSurf message
+ * The following function will be called for PreCAD/MG-CADSurf message
* printing. See context_set_message_callback (later in this
* template) for how to set user_data.
*/
message_get_number(msg, &errnumber);
message_get_description(msg, &desc);
string err( desc );
- if ( errnumber < 0 || err.find("license") != string::npos ) {
- string * error = (string*)user_data;
-// if ( !error->empty() )
-// *error += "\n";
+ message_cb_user_data * mcud = (message_cb_user_data*)user_data;
+ // Get all the error message and some warning messages related to license and periodicity
+ if ( errnumber < 0 ||
+ err.find("license" ) != string::npos ||
+ err.find("periodicity") != string::npos )
+ {
// remove ^A from the tail
int len = strlen( desc );
while (len > 0 && desc[len-1] != '\n')
len--;
- error->append( desc, len );
+ mcud->_error->append( desc, len );
}
else {
+ if ( errnumber == 3009001 )
+ * mcud->_progress = atof( desc + 11 ) / 100.;
+ if ( mcud->_verbosity > 0 )
std::cout << desc << std::endl;
}
return STATUS_OK;
}
-/* This is the interrupt callback. PreCAD/BLSurf will call this
- * function regularily. See the file distene/interrupt.h
+/* This is the interrupt callback. PreCAD/MG-CADSurf will call this
+ * function regularily. See the file meshgems/interrupt.h
*/
status_t interrupt_cb(integer *interrupt_status, void *user_data)
{
integer you_want_to_continue = 1;
-#ifdef WITH_SMESH_CANCEL_COMPUTE
BLSURFPlugin_BLSURF* tmp = (BLSURFPlugin_BLSURF*)user_data;
you_want_to_continue = !tmp->computeCanceled();
-#endif
if(you_want_to_continue)
{
*interrupt_status = INTERRUPT_CONTINUE;
return STATUS_OK;
}
- else /* you want to stop BLSurf */
+ else /* you want to stop MG-CADSurf */
{
*interrupt_status = INTERRUPT_STOP;
return STATUS_ERROR;
const TopoDS_Shape& aShape,
MapShapeNbElems& aResMap)
{
+ double diagonal = aMesh.GetShapeDiagonalSize();
+ double bbSegmentation = _gen->GetBoundaryBoxSegmentation();
int _physicalMesh = BLSURFPlugin_Hypothesis::GetDefaultPhysicalMesh();
- double _phySize = BLSURFPlugin_Hypothesis::GetDefaultPhySize();
+ double _phySize = BLSURFPlugin_Hypothesis::GetDefaultPhySize(diagonal, bbSegmentation);
+ bool _phySizeRel = BLSURFPlugin_Hypothesis::GetDefaultPhySizeRel();
//int _geometricMesh = BLSURFPlugin_Hypothesis::GetDefaultGeometricMesh();
- //double _angleMeshS = BLSURFPlugin_Hypothesis::GetDefaultAngleMeshS();
- double _angleMeshC = BLSURFPlugin_Hypothesis::GetDefaultAngleMeshC();
+ double _angleMesh = BLSURFPlugin_Hypothesis::GetDefaultAngleMesh();
bool _quadAllowed = BLSURFPlugin_Hypothesis::GetDefaultQuadAllowed();
if(_hypothesis) {
_physicalMesh = (int) _hypothesis->GetPhysicalMesh();
- _phySize = _hypothesis->GetPhySize();
+ _phySizeRel = _hypothesis->IsPhySizeRel();
+ if ( _hypothesis->GetPhySize() > 0)
+ _phySize = _phySizeRel ? diagonal*_hypothesis->GetPhySize() : _hypothesis->GetPhySize();
//_geometricMesh = (int) hyp->GetGeometricMesh();
- //_angleMeshS = hyp->GetAngleMeshS();
- _angleMeshC = _hypothesis->GetAngleMeshC();
- _quadAllowed = _hypothesis->GetQuadAllowed();
+ if (_hypothesis->GetAngleMesh() > 0)
+ _angleMesh = _hypothesis->GetAngleMesh();
+ _quadAllowed = _hypothesis->GetQuadAllowed();
+ } else {
+ //0020968: EDF1545 SMESH: Problem in the creation of a mesh group on geometry
+ // GetDefaultPhySize() sometimes leads to computation failure
+ _phySize = aMesh.GetShapeDiagonalSize() / _gen->GetBoundaryBoxSegmentation();
+ MESSAGE("BLSURFPlugin_BLSURF::SetParameters using defaults");
}
- bool IsQuadratic = false;
+ bool IsQuadratic = _quadraticMesh;
// ----------------
// evaluate 1D
V1 = V2;
P2 = P3;
}
- nb1d = (int)( fullAng/_angleMeshC + 1 );
+ nb1d = (int)( fullAng/_angleMesh + 1 );
}
fullNbSeg += nb1d;
std::vector<int> aVec(SMDSEntity_Last);
return true;
}
-
-//=============================================================================
-/*!
- * Rewritting of the BRepClass_FaceClassifier::Perform function which is bugged (CAS 6.3sp6)
- * Following line was added:
- * myExtrem.Perform(P);
- */
-//=============================================================================
-void BLSURFPlugin_BLSURF::BRepClass_FaceClassifierPerform(BRepClass_FaceClassifier* fc,
- const TopoDS_Face& face,
- const gp_Pnt& P,
- const Standard_Real Tol)
-{
- //-- Voir BRepExtrema_ExtPF.cxx
- BRepAdaptor_Surface Surf(face);
- Standard_Real U1, U2, V1, V2;
- BRepTools::UVBounds(face, U1, U2, V1, V2);
- Extrema_ExtPS myExtrem;
- myExtrem.Initialize(Surf, U1, U2, V1, V2, Tol, Tol);
- myExtrem.Perform(P);
- //----------------------------------------------------------
- //-- On cherche le point le plus proche , PUIS
- //-- On le classifie.
- Standard_Integer nbv = 0; // xpu
- Standard_Real MaxDist = RealLast();
- Standard_Integer indice = 0;
- if (myExtrem.IsDone()) {
- nbv = myExtrem.NbExt();
- for (Standard_Integer i = 1; i <= nbv; i++) {
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
- Standard_Real d = myExtrem.SquareDistance(i);
-#else
- Standard_Real d = myExtrem.Value(i);
- d = Abs(d);
-#endif
- if (d <= MaxDist) {
- MaxDist = d;
- indice = i;
- }
- }
- }
- if (indice) {
- gp_Pnt2d Puv;
- Standard_Real U1,U2;
- myExtrem.Point(indice).Parameter(U1, U2);
- Puv.SetCoord(U1, U2);
- fc->Perform(face, Puv, Tol);
- }
- else {
- fc->Perform(face, gp_Pnt2d(U1-1.0,V1 - 1.0), Tol); //-- NYI etc BUG PAS BEAU En attendant l acces a rejected
- //-- le resultat est TopAbs_OUT;
- }
-}