-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : NETGENPlugin_NETGEN_2D_ONLY.cxx
// Author : Edward AGAPOV (OCC)
// Project : SALOME
#include <list>
#include <vector>
+#include <limits>
/*
Netgen include files
//#include <meshtype.hpp>
namespace netgen {
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
- /*extern*/ MeshingParameters mparam;
+ extern MeshingParameters mparam;
}
using namespace std;
using namespace netgen;
using namespace nglib;
+//#define DUMP_SEGMENTS
+
//=============================================================================
/*!
*
return false;
}
- if ( _hypMaxElementArea || _hypLengthFromEdges )
+ if ( _hypMaxElementArea || _hypLengthFromEdges || _hypQuadranglePreference)
aStatus = HYP_OK;
return aStatus == HYP_OK;
// Check wires and count nodes
// ----------------------------
int nbNodes = 0;
+ double totalLength = 0;
for ( int iW = 0; iW < wires.size(); ++iW )
{
StdMeshers_FaceSidePtr wire = wires[ iW ];
(new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH,
SMESH_Comment("Unexpected nb of points on wire ") << iW
<< ": " << uvPtVec.size()<<" != "<<wire->NbPoints()));
- nbNodes += wire->NbSegments();
+ nbNodes += wire->NbPoints();
+ totalLength += wire->Length();
}
nodeVec.reserve( nbNodes );
// bb.Increase (bb.Diam()/10);
// ngMesh.SetLocalH (bb.PMin(), bb.PMax(), 0.5); // set grading
+ // map for nodes on vertices since they can be shared between wires
+ // ( issue 0020676, face_int_box.brep)
+ map<const SMDS_MeshNode*, int > node2ngID;
+
const int faceID = 1, solidID = 0;
- ngMesh.AddFaceDescriptor (FaceDescriptor(faceID, solidID, solidID, 0));
+ if ( ngMesh.GetNFD() < 1 )
+ ngMesh.AddFaceDescriptor (FaceDescriptor(faceID, solidID, solidID, 0));
for ( int iW = 0; iW < wires.size(); ++iW )
{
StdMeshers_FaceSidePtr wire = wires[ iW ];
const vector<UVPtStruct>& uvPtVec = wire->GetUVPtStruct();
+ const int nbSegments = wire->NbPoints() - 1;
- bool reverse = // 20526: [CEA] Disk meshing fails
- ( wire->NbEdges() == 1 &&
- geom.emap(geom.emap.FindIndex(wire->Edge(0))).Orientation() == TopAbs_REVERSED );
-
- int firstPointID = ngMesh.GetNP() + 1;
int edgeID = 1, posID = -2;
- for ( int i = 0; i < wire->NbSegments(); ++i ) // loop on segments
+ bool isInternalWire = false;
+ for ( int i = 0; i < nbSegments; ++i ) // loop on segments
{
// Add the first point of a segment
const SMDS_MeshNode * n = uvPtVec[ i ].node;
const int posShapeID = n->GetPosition()->GetShapeId();
+ bool onVertex = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
// skip nodes on degenerated edges
if ( helper.IsDegenShape( posShapeID ) &&
helper.IsDegenShape( uvPtVec[ i+1 ].node->GetPosition()->GetShapeId() ))
continue;
- nodeVec.push_back( n );
-
- MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) );
- ngMesh.AddPoint ( mp, 1, EDGEPOINT );
+ int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1;
+ if ( onVertex )
+ ngID1 = node2ngID.insert( make_pair( n, ngID1 )).first->second;
+ if ( ngID1 > ngMesh.GetNP() )
+ {
+ MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) );
+ ngMesh.AddPoint ( mp, 1, EDGEPOINT );
+ nodeVec.push_back( n );
+ }
+ else
+ {
+ ngID2 = ngMesh.GetNP() + 1;
+ if ( i > 0 ) // prev segment belongs to same wire
+ {
+ Segment& prevSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
+ prevSeg[1] = ngID1;
+ }
+ }
// Add the segment
Segment seg;
- seg.p1 = ngMesh.GetNP(); // ng node id
- seg.p2 = seg.p1 + 1; // ng node id
+ seg[0] = ngID1; // ng node id
+ seg[1] = ngID2; // ng node id
+
seg.edgenr = ngMesh.GetNSeg() + 1;// segment id
seg.si = faceID; // = geom.fmap.FindIndex (face);
seg.epgeominfo[ iEnd ].v = pnt.v;
// find out edge id and node parameter on edge
- bool onVertex = ( pnt.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
+ onVertex = ( pnt.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
if ( onVertex || posShapeID != posID )
{
// get edge id
const TopoDS_Edge& edge = wire->Edge( wire->EdgeIndex( normParam ));
edgeID = geom.emap.FindIndex( edge );
posID = posShapeID;
+ isInternalWire = ( edge.Orientation() == TopAbs_INTERNAL );
if ( onVertex ) // param on curve is different on each of two edges
seg.epgeominfo[ iEnd ].dist = helper.GetNodeU( edge, pnt.node );
}
seg.epgeominfo[ iEnd ].edgenr = edgeID; // = geom.emap.FindIndex(edge);
}
- // 20526: [CEA] Disk meshing fails
- if (reverse)
- {
- swap (seg.p1, seg.p2);
- swap (seg.epgeominfo[0].dist, seg.epgeominfo[1].dist);
- swap (seg.epgeominfo[0].u, seg.epgeominfo[1].u);
- swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v);
- }
ngMesh.AddSegment (seg);
-// cout << "Segment: " << seg.edgenr << endl
-// << "\tp1: " << seg.p1 << endl
-// << "\tp2: " << seg.p2 << endl
-// << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl
-// << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl
-// << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl
-// << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl
-// << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl
-// << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl;
+#ifdef DUMP_SEGMENTS
+ cout << "Segment: " << seg.edgenr << endl
+ << "\tp1: " << seg[0] << endl
+ << "\tp2: " << seg[1] << endl
+ << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl
+ << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl
+ << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl
+ << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl
+ << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl
+ << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl;
+#endif
+ if ( isInternalWire )
+ {
+ swap (seg[0], seg[1]);
+ swap( seg.epgeominfo[0], seg.epgeominfo[1] );
+ seg.edgenr = ngMesh.GetNSeg() + 1; // segment id
+ ngMesh.AddSegment (seg);
+#ifdef DUMP_SEGMENTS
+ cout << "Segment: " << seg.edgenr << endl << "\tis REVRESE of the previous one" << endl;
+#endif
+ }
+ } // loop on segments on a wire
+
+ // close chain of segments
+ if ( nbSegments > 0 )
+ {
+ Segment& lastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() - int( isInternalWire));
+ const SMDS_MeshNode * lastNode = uvPtVec.back().node;
+ lastSeg[1] = node2ngID.insert( make_pair( lastNode, lastSeg[1] )).first->second;
+ if ( lastSeg[1] > ngMesh.GetNP() )
+ {
+ MeshPoint mp( Point<3> (lastNode->X(), lastNode->Y(), lastNode->Z()) );
+ ngMesh.AddPoint ( mp, 1, EDGEPOINT );
+ nodeVec.push_back( lastNode );
+ }
+ if ( isInternalWire )
+ {
+ Segment& realLastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
+ realLastSeg[0] = lastSeg[1];
+ }
}
- Segment& seg = ngMesh.LineSegment( ngMesh.GetNSeg() );
- seg.p2 = firstPointID;
- }
- ngMesh.CalcSurfacesOfNode();
+ } // loop on wires of a face
+
+ // add a segment instead of internal vertex
+ NETGENPlugin_Internals intShapes( *helper.GetMesh(), helper.GetSubShape(), /*is3D=*/false );
+ NETGENPlugin_Mesher::addIntVerticesInFaces( geom, ngMesh, nodeVec, intShapes );
+
+ ngMesh.CalcSurfacesOfNode();
return TError();
}
// Make input netgen mesh
// -------------------------
- Ng_Init();
- netgen::Mesh * ngMesh = new netgen::Mesh ();
+ NETGENPlugin_NetgenLibWrapper ngLib;
+ netgen::Mesh * ngMesh = (netgen::Mesh*) ngLib._ngMesh;
netgen::OCCGeometry occgeo;
NETGENPlugin_Mesher::PrepareOCCgeometry( occgeo, F, aMesh );
vector< const SMDS_MeshNode* > nodeVec;
problem = AddSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec );
- if ( problem && !problem->IsOK() ) {
- delete ngMesh; Ng_Exit();
+ if ( problem && !problem->IsOK() )
return error( problem );
- }
// --------------------
// compute edge length
for ( int i = nbInputNodes + 1; i <= nbNodes; ++i )
{
const MeshPoint& ngPoint = ngMesh->Point(i);
+#ifdef NETGEN_NEW
+ SMDS_MeshNode * node = meshDS->AddNode(ngPoint(0), ngPoint(1), ngPoint(2));
+#else
SMDS_MeshNode * node = meshDS->AddNode(ngPoint.X(), ngPoint.Y(), ngPoint.Z());
+#endif
nodeVec[ i-1 ] = node;
}
face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]);
}
- Ng_DeleteMesh((nglib::Ng_Mesh*)ngMesh);
- Ng_Exit();
-
- NETGENPlugin_Mesher::RemoveTmpFiles();
-
return !err;
}
double maxArea = _hypMaxElementArea->GetMaxArea();
ELen = sqrt(2. * maxArea/sqrt(3.0));
}
- if ( ELen < Precision::Confusion() ) {
- SMESH_subMesh *sm = aMesh.GetSubMesh(F);
- if ( sm ) {
- SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
- smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,"Submesh can not be evaluated.\nToo small element length",this));
- }
- return false;
- }
-
GProp_GProps G;
BRepGProp::SurfaceProperties(F,G);
double anArea = G.Mass();
- int nbFaces = 0;
- if ( ELen > Precision::Confusion() )
- nbFaces = (int) ( anArea / ( ELen*ELen*sqrt(3.) / 4 ) );
+
+ const int hugeNb = numeric_limits<int>::max()/10;
+ if ( anArea / hugeNb > ELen*ELen )
+ {
+ SMESH_subMesh *sm = aMesh.GetSubMesh(F);
+ SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
+ smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,"Submesh can not be evaluated.\nToo small element length",this));
+ return false;
+ }
+ int nbFaces = (int) ( anArea / ( ELen*ELen*sqrt(3.) / 4 ) );
int nbNodes = (int) ( ( nbFaces*3 - (nb1d-1)*2 ) / 6 + 1 );
std::vector<int> aVec(SMDSEntity_Last);
for(int i=SMDSEntity_Node; i<SMDSEntity_Last; i++) aVec[i]=0;
