-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013 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
#include <StdMeshers_QuadToTriaAdaptor.hxx>
#include <StdMeshers_ViscousLayers2D.hxx>
+#include <SALOMEDS_Tool.hxx>
+
#include <utilities.h>
#include <BRepBuilderAPI_Copy.hxx>
#include <Bnd_B3d.hxx>
#include <NCollection_Map.hxx>
#include <Standard_ErrorHandler.hxx>
+#include <Standard_ProgramError.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeInteger.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopoDS.hxx>
+#include <OSD_File.hxx>
+#include <OSD_Path.hxx>
// Netgen include files
#ifndef OCCGEOMETRY
#include <meshing.hpp>
//#include <ngexception.hpp>
namespace netgen {
+#ifdef NETGEN_V5
+ extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, MeshingParameters&, int, int);
+#else
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
+#endif
//extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);
extern MeshingParameters mparam;
extern volatile multithreadt multithread;
#include <vector>
#include <limits>
+#ifdef WIN32
+#include <process.h>
+#endif
using namespace nglib;
using namespace std;
#define nodeVec_ACCESS(index) ((SMDS_MeshNode*) nodeVec[index])
#endif
-#ifdef NETGEN_NEW
#define NGPOINT_COORDS(p) p(0),p(1),p(2)
-#else
-#define NGPOINT_COORDS(p) p.X(),p.Y(),p.Z()
-#endif
// dump elements added to ng mesh
//#define DUMP_SEGMENTS
_optimize(true),
_fineness(NETGENPlugin_Hypothesis::GetDefaultFineness()),
_isViscousLayers2D(false),
- _simpleHyp(NULL)
+ _ngMesh(NULL),
+ _occgeom(NULL),
+ _curShapeIndex(-1),
+ _progressTic(1),
+ _totalTime(1.0),
+ _simpleHyp(NULL),
+ _ptrToMe(NULL)
{
SetDefaultParameters();
ShapesWithLocalSize.Clear();
FaceId2LocalSize.clear();
}
+//================================================================================
+/*!
+ * Destuctor
+ */
+//================================================================================
+
+NETGENPlugin_Mesher::~NETGENPlugin_Mesher()
+{
+ if ( _ptrToMe )
+ *_ptrToMe = NULL;
+ _ptrToMe = 0;
+ _ngMesh = NULL;
+}
+
+//================================================================================
+/*!
+ * Set pointer to NETGENPlugin_Mesher* field of the holder, that will be
+ * nullified at destruction of this
+ */
+//================================================================================
+
+void NETGENPlugin_Mesher::SetSelfPointer( NETGENPlugin_Mesher ** ptr )
+{
+ if ( _ptrToMe )
+ *_ptrToMe = NULL;
+
+ _ptrToMe = ptr;
+
+ if ( _ptrToMe )
+ *_ptrToMe = this;
+}
+
//================================================================================
/*!
* \brief Initialize global NETGEN parameters with default values
// {
// BRepTools::Clean (shape);
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
-#endif
BRepMesh_IncrementalMesh e(shape, 0.01, true);
-
}
catch (Standard_Failure)
{
// get root submeshes
list< SMESH_subMesh* > rootSM;
- if ( SMESH_subMesh* sm = mesh.GetSubMeshContaining( shape )) {
- rootSM.push_back( sm );
+ const int shapeID = mesh.GetMeshDS()->ShapeToIndex( shape );
+ if ( shapeID > 0 ) { // SMESH_subMesh with ID 0 may exist, don't use it!
+ rootSM.push_back( mesh.GetSubMesh( shape ));
}
else {
for ( TopoDS_Iterator it( shape ); it.More(); it.Next() )
}
occgeo.facemeshstatus.SetSize (occgeo.fmap.Extent());
occgeo.facemeshstatus = 0;
-#ifdef NETGEN_NEW
occgeo.face_maxh_modified.SetSize(occgeo.fmap.Extent());
occgeo.face_maxh_modified = 0;
occgeo.face_maxh.SetSize(occgeo.fmap.Extent());
occgeo.face_maxh = netgen::mparam.maxh;
-#endif
}
//================================================================================
TopoDS_Shape solid = occgeom.somap( solidID1 );
TopAbs_Orientation faceOriInSolid = helper.GetSubShapeOri( solid, geomFace );
if ( faceOriInSolid >= 0 )
- reverse = SMESH_Algo::IsReversedSubMesh
- ( TopoDS::Face( geomFace.Oriented( faceOriInSolid )), helper.GetMeshDS() );
+ reverse =
+ helper.IsReversedSubMesh( TopoDS::Face( geomFace.Oriented( faceOriInSolid )));
}
// Add surface elements
#ifdef DUMP_TRIANGLES_SCRIPT
// create a python script making a mesh containing triangles added for internal vertices
ofstream py(DUMP_TRIANGLES_SCRIPT);
- py << "from smesh import * "<< endl
- << "m = Mesh(name='triangles')" << endl;
+ py << "import SMESH"<< endl
+ << "from salome.smesh import smeshBuilder"<<endl
+ << "smesh = smeshBuilder.New(salome.myStudy)"
+ << "m = smesh.Mesh(name='triangles')" << endl;
#endif
if ( nodeVec.size() < ngMesh.GetNP() )
nodeVec.resize( ngMesh.GetNP(), 0 );
int edgeID = 1, posID = -2;
bool isInternalWire = false;
double vertexNormPar = 0;
+ const int prevNbNGSeg = ngMesh.GetNSeg();
for ( int i = 0; i < nbSegments; ++i ) // loop on segments
{
// Add the first point of a segment
SMESH_TNodeXYZ np1( n ), np2( uvPtVec[ i+1 ].node );
// get an average size of adjacent segments to avoid sharp change of
// element size (regression on issue 0020452, note 0010898)
- int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments );
- int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments );
- double avgH = ( segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ]) / 3;
-
- RestrictLocalSize( ngMesh, 0.5*(np1+np2), avgH );
+ int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments );
+ int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments );
+ double sunH = segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ];
+ int nbSeg = ( int( segLen[ iPrev ] > sunH / 100.) +
+ int( segLen[ i ] > sunH / 100.) +
+ int( segLen[ iNext ] > sunH / 100.));
+ if ( nbSeg > 0 )
+ RestrictLocalSize( ngMesh, 0.5*(np1+np2), sunH / nbSeg );
}
-#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
}
}
+#ifdef DUMP_SEGMENTS
+ cout << "BEGIN WIRE " << iW << endl;
+ for ( int i = prevNbNGSeg+1; i <= ngMesh.GetNSeg(); ++i )
+ {
+ netgen::Segment& seg = ngMesh.LineSegment( i );
+ if ( i > 1 ) {
+ netgen::Segment& prevSeg = ngMesh.LineSegment( i-1 );
+ if ( seg[0] == prevSeg[1] && seg[1] == prevSeg[0] )
+ {
+ cout << "Segment: " << seg.edgenr << endl << "\tis REVRESE of the previous one" << endl;
+ continue;
+ }
+ }
+ 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;
+ }
+ cout << "--END WIRE " << iW << endl;
+#endif
+
} // loop on WIREs of a FACE
// add a segment instead of an internal vertex
{
const netgen::Segment& seg = ngMesh.LineSegment(i);
TopoDS_Edge aEdge;
-#ifdef NETGEN_NEW
int pinds[3] = { seg.pnums[0], seg.pnums[1], seg.pnums[2] };
-#else
- int pinds[3] = { seg.p1, seg.p2, seg.pmid };
-#endif
int nbp = 0;
double param2 = 0;
for (int j=0; j < 3; ++j)
str << ": " << ex.What();
return str;
}
+
+ const double edgeMeshingTime = 0.001;
+ const double faceMeshingTime = 0.019;
+ const double edgeFaceMeshingTime = edgeMeshingTime + faceMeshingTime;
+ const double faceOptimizTime = 0.06;
+ const double voluMeshingTime = 0.15;
+ const double volOptimizeTime = 0.77;
}
//=============================================================================
list< SMESH_subMesh* > meshedSM[3]; // for 0-2 dimensions
NETGENPlugin_Internals internals( *_mesh, _shape, _isVolume );
PrepareOCCgeometry( occgeo, _shape, *_mesh, meshedSM, &internals );
+ _occgeom = &occgeo;
+
+ _totalTime = edgeFaceMeshingTime;
+ if ( _optimize )
+ _totalTime += faceOptimizTime;
+ if ( _isVolume )
+ _totalTime += voluMeshingTime + ( _optimize ? volOptimizeTime : 0 );
+ double doneTime = 0;
+ _ticTime = -1;
+ _progressTic = 1;
+ _curShapeIndex = -1;
// -------------------------
// Generate the mesh
// -------------------------
- netgen::Mesh *ngMesh = NULL;
+ _ngMesh = NULL;
NETGENPlugin_ngMeshInfo initState; // it remembers size of ng mesh equal to size of Smesh
SMESH_Comment comment;
if ( _simpleHyp || ( mparams.minh == 0.0 && _fineness != NETGENPlugin_Hypothesis::UserDefined))
mparams.minh = GetDefaultMinSize( _shape, mparams.maxh );
-#ifdef NETGEN_NEW
// Local size on faces
occgeo.face_maxh = mparams.maxh;
-#endif
- // Let netgen create ngMesh and calculate element size on not meshed shapes
+ // Let netgen create _ngMesh and calculate element size on not meshed shapes
+#ifndef NETGEN_V5
char *optstr = 0;
+#endif
int startWith = netgen::MESHCONST_ANALYSE;
int endWith = netgen::MESHCONST_ANALYSE;
try
{
OCC_CATCH_SIGNALS;
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, mparams, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, startWith, endWith, optstr);
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
comment << text(err);
}
catch (Standard_Failure& ex)
comment << text(ex);
}
err = 0; //- MESHCONST_ANALYSE isn't so important step
- if ( !ngMesh )
+ if ( !_ngMesh )
return false;
- ngLib.setMesh(( Ng_Mesh*) ngMesh );
+ ngLib.setMesh(( Ng_Mesh*) _ngMesh );
- ngMesh->ClearFaceDescriptors(); // we make descriptors our-self
+ _ngMesh->ClearFaceDescriptors(); // we make descriptors our-self
if ( _simpleHyp )
{
const TopoDS_Edge& e = TopoDS::Edge( occgeo.emap(iE));
if ( nbSeg )
segSize = SMESH_Algo::EdgeLength( e ) / ( nbSeg - 0.4 );
- setLocalSize( e, segSize, *ngMesh );
+ setLocalSize( e, segSize, *_ngMesh );
}
}
else // if ( ! _simpleHyp )
double hi = (*it).second;
const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key);
const TopoDS_Edge& e = TopoDS::Edge(shape);
- setLocalSize( e, hi, *ngMesh );
+ setLocalSize( e, hi, *_ngMesh );
}
for(std::map<int,double>::const_iterator it=VertexId2LocalSize.begin(); it!=VertexId2LocalSize.end(); it++)
{
const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key);
const TopoDS_Vertex& v = TopoDS::Vertex(shape);
gp_Pnt p = BRep_Tool::Pnt(v);
- NETGENPlugin_Mesher::RestrictLocalSize( *ngMesh, p.XYZ(), hi );
+ NETGENPlugin_Mesher::RestrictLocalSize( *_ngMesh, p.XYZ(), hi );
}
for(map<int,double>::const_iterator it=FaceId2LocalSize.begin();
it!=FaceId2LocalSize.end(); it++)
int faceNgID = occgeo.fmap.FindIndex(shape);
occgeo.SetFaceMaxH(faceNgID, val);
for ( TopExp_Explorer edgeExp( shape, TopAbs_EDGE ); edgeExp.More(); edgeExp.Next() )
- setLocalSize( TopoDS::Edge( edgeExp.Current() ), val, *ngMesh );
+ setLocalSize( TopoDS::Edge( edgeExp.Current() ), val, *_ngMesh );
}
}
internals.getInternalEdges( intOccgeo.fmap, intOccgeo.emap, intOccgeo.vmap, meshedSM );
intOccgeo.boundingbox = occgeo.boundingbox;
intOccgeo.shape = occgeo.shape;
-#ifdef NETGEN_NEW
intOccgeo.face_maxh.SetSize(intOccgeo.fmap.Extent());
intOccgeo.face_maxh = netgen::mparam.maxh;
-#endif
netgen::Mesh *tmpNgMesh = NULL;
try
{
OCC_CATCH_SIGNALS;
// compute local H on internal shapes in the main mesh
- //OCCSetLocalMeshSize(intOccgeo, *ngMesh); it deletes ngMesh->localH
+ //OCCSetLocalMeshSize(intOccgeo, *_ngMesh); it deletes _ngMesh->localH
// let netgen create a temporary mesh
+#ifdef NETGEN_V5
+ netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, mparams, startWith, endWith);
+#else
netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
// copy LocalH from the main to temporary mesh
- initState.transferLocalH( ngMesh, tmpNgMesh );
+ initState.transferLocalH( _ngMesh, tmpNgMesh );
// compute mesh on internal edges
startWith = endWith = netgen::MESHCONST_MESHEDGES;
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, mparams, startWith, endWith);
+#else
err = netgen::OCCGenerateMesh(intOccgeo, tmpNgMesh, startWith, endWith, optstr);
+#endif
comment << text(err);
}
catch (Standard_Failure& ex)
nglib::Ng_DeleteMesh((nglib::Ng_Mesh*)tmpNgMesh);
}
- // Fill ngMesh with nodes and segments of computed submeshes
+ // Fill _ngMesh with nodes and segments of computed submeshes
if ( !err )
{
- err = ! ( FillNgMesh(occgeo, *ngMesh, nodeVec, meshedSM[ MeshDim_0D ]) &&
- FillNgMesh(occgeo, *ngMesh, nodeVec, meshedSM[ MeshDim_1D ]));
+ err = ! ( FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_0D ]) &&
+ FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_1D ]));
}
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
// Compute 1d mesh
if (!err)
try
{
OCC_CATCH_SIGNALS;
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, mparams, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, startWith, endWith, optstr);
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
comment << text(err);
}
catch (Standard_Failure& ex)
err = 1;
}
}
+ if ( _isVolume )
+ _ticTime = ( doneTime += edgeMeshingTime ) / _totalTime / _progressTic;
+
mparams.uselocalh = true; // restore as it is used at surface optimization
// ---------------------
}
else {
// length from edges
- if ( ngMesh->GetNSeg() ) {
+ if ( _ngMesh->GetNSeg() ) {
double edgeLength = 0;
TopTools_MapOfShape visitedEdges;
for ( TopExp_Explorer exp( _shape, TopAbs_EDGE ); exp.More(); exp.Next() )
edgeLength += SMESH_Algo::EdgeLength( TopoDS::Edge( exp.Current() ));
// we have to multiply length by 2 since for each TopoDS_Edge there
// are double set of NETGEN edges, in other words, we have to
- // divide ngMesh->GetNSeg() by 2.
- mparams.maxh = 2*edgeLength / ngMesh->GetNSeg();
+ // divide _ngMesh->GetNSeg() by 2.
+ mparams.maxh = 2*edgeLength / _ngMesh->GetNSeg();
}
else {
mparams.maxh = 1000;
}
mparams.quad = _simpleHyp->GetAllowQuadrangles();
mparams.maxh = min( mparams.maxh, occgeo.boundingbox.Diam()/2 );
- ngMesh->SetGlobalH (mparams.maxh);
+ _ngMesh->SetGlobalH (mparams.maxh);
netgen::Box<3> bb = occgeo.GetBoundingBox();
bb.Increase (bb.Diam()/20);
- ngMesh->SetLocalH (bb.PMin(), bb.PMax(), mparams.grading);
+ _ngMesh->SetLocalH (bb.PMin(), bb.PMax(), mparams.grading);
}
// Care of vertices internal in faces (issue 0020676)
{
// store computed segments in SMESH in order not to create SMESH
// edges for ng segments added by AddIntVerticesInFaces()
- FillSMesh( occgeo, *ngMesh, initState, *_mesh, nodeVec, comment );
+ FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment );
// add segments to faces with internal vertices
- AddIntVerticesInFaces( occgeo, *ngMesh, nodeVec, internals );
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
+ AddIntVerticesInFaces( occgeo, *_ngMesh, nodeVec, internals );
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
}
// Build viscous layers
if ( _isViscousLayers2D )
{
if ( !internals.hasInternalVertexInFace() ) {
- FillSMesh( occgeo, *ngMesh, initState, *_mesh, nodeVec, comment );
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
+ FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment );
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
}
SMESH_ProxyMesh::Ptr viscousMesh;
SMESH_MesherHelper helper( *_mesh );
if ( !viscousMesh )
return false;
// exclude from computation ng segments built on EDGEs of F
- for (int i = 1; i <= ngMesh->GetNSeg(); i++)
+ for (int i = 1; i <= _ngMesh->GetNSeg(); i++)
{
- netgen::Segment & seg = ngMesh->LineSegment(i);
+ netgen::Segment & seg = _ngMesh->LineSegment(i);
if (seg.si == faceID)
seg.si = 0;
}
- // add new segments to ngMesh instead of excluded ones
+ // add new segments to _ngMesh instead of excluded ones
helper.SetSubShape( F );
TSideVector wires =
StdMeshers_FaceSide::GetFaceWires( F, *_mesh, /*skipMediumNodes=*/true,
error, viscousMesh );
- error = AddSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec );
+ error = AddSegmentsToMesh( *_ngMesh, occgeo, wires, helper, nodeVec );
if ( !error ) error = SMESH_ComputeError::New();
}
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
}
// Let netgen compute 2D mesh
try
{
OCC_CATCH_SIGNALS;
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, mparams, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, startWith, endWith, optstr);
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
comment << text (err);
}
catch (Standard_Failure& ex)
//err = 1; -- try to make volumes anyway
}
}
+ if ( _isVolume )
+ {
+ doneTime += faceMeshingTime + ( _optimize ? faceOptimizTime : 0 );
+ _ticTime = doneTime / _totalTime / _progressTic;
+ }
// ---------------------
// generate volume mesh
// ---------------------
- // Fill ngMesh with nodes and faces of computed 2D submeshes
+ // Fill _ngMesh with nodes and faces of computed 2D submeshes
if ( !err && _isVolume && ( !meshedSM[ MeshDim_2D ].empty() || mparams.quad ))
{
// load SMESH with computed segments and faces
- FillSMesh( occgeo, *ngMesh, initState, *_mesh, nodeVec, comment );
+ FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment );
// compute pyramids on quadrangles
SMESH_ProxyMesh::Ptr proxyMesh;
quadFaceSM.push_back( _mesh->GetSubMesh( face.Current() ));
meshedSM[ MeshDim_2D ].remove( quadFaceSM.back() );
}
- FillNgMesh(occgeo, *ngMesh, nodeVec, quadFaceSM, proxyMesh);
+ FillNgMesh(occgeo, *_ngMesh, nodeVec, quadFaceSM, proxyMesh);
}
}
- // fill ngMesh with faces of sub-meshes
- err = ! ( FillNgMesh(occgeo, *ngMesh, nodeVec, meshedSM[ MeshDim_2D ]));
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
- //toPython( ngMesh, "/tmp/ngPython.py");
+ // fill _ngMesh with faces of sub-meshes
+ err = ! ( FillNgMesh(occgeo, *_ngMesh, nodeVec, meshedSM[ MeshDim_2D ]));
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
+ //toPython( _ngMesh, "/tmp/ngPython.py");
}
if (!err && _isVolume)
{
}
else {
// length from faces
- mparams.maxh = ngMesh->AverageH();
+ mparams.maxh = _ngMesh->AverageH();
}
- ngMesh->SetGlobalH (mparams.maxh);
+ _ngMesh->SetGlobalH (mparams.maxh);
mparams.grading = 0.4;
- ngMesh->CalcLocalH();
+#ifdef NETGEN_V5
+ _ngMesh->CalcLocalH(mparams.grading);
+#else
+ _ngMesh->CalcLocalH();
+#endif
}
// Care of vertices internal in solids and internal faces (issue 0020676)
if ( internals.hasInternalVertexInSolid() || internals.hasInternalFaces() )
{
// store computed faces in SMESH in order not to create SMESH
// faces for ng faces added here
- FillSMesh( occgeo, *ngMesh, initState, *_mesh, nodeVec, comment );
+ FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment );
// add ng faces to solids with internal vertices
- AddIntVerticesInSolids( occgeo, *ngMesh, nodeVec, internals );
+ AddIntVerticesInSolids( occgeo, *_ngMesh, nodeVec, internals );
// duplicate mesh faces on internal faces
- FixIntFaces( occgeo, *ngMesh, internals );
- initState = NETGENPlugin_ngMeshInfo(ngMesh);
+ FixIntFaces( occgeo, *_ngMesh, internals );
+ initState = NETGENPlugin_ngMeshInfo(_ngMesh);
}
// Let netgen compute 3D mesh
startWith = endWith = netgen::MESHCONST_MESHVOLUME;
try
{
OCC_CATCH_SIGNALS;
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, mparams, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, startWith, endWith, optstr);
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
if ( comment.empty() ) // do not overwrite a previos error
comment << text(err);
}
comment << text(exc);
err = 1;
}
+ _ticTime = ( doneTime += voluMeshingTime ) / _totalTime / _progressTic;
+
// Let netgen optimize 3D mesh
if ( !err && _optimize )
{
try
{
OCC_CATCH_SIGNALS;
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, mparams, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, _ngMesh, startWith, endWith, optstr);
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
+
if ( comment.empty() ) // do not overwrite a previos error
comment << text(err);
}
{
OCC_CATCH_SIGNALS;
netgen::OCCRefinementSurfaces ref (occgeo);
- ref.MakeSecondOrder (*ngMesh);
+ ref.MakeSecondOrder (*_ngMesh);
}
catch (Standard_Failure& ex)
{
}
}
}
- int nbNod = ngMesh->GetNP();
- int nbSeg = ngMesh->GetNSeg();
- int nbFac = ngMesh->GetNSE();
- int nbVol = ngMesh->GetNE();
+
+ _ticTime = 0.98 / _progressTic;
+
+ int nbNod = _ngMesh->GetNP();
+ int nbSeg = _ngMesh->GetNSeg();
+ int nbFac = _ngMesh->GetNSE();
+ int nbVol = _ngMesh->GetNE();
bool isOK = ( !err && (_isVolume ? (nbVol > 0) : (nbFac > 0)) );
MESSAGE((err ? "Mesh Generation failure" : "End of Mesh Generation") <<
// Feed back the SMESHDS with the generated Nodes and Elements
if ( true /*isOK*/ ) // get whatever built
- FillSMesh( occgeo, *ngMesh, initState, *_mesh, nodeVec, comment ); //!<
+ FillSMesh( occgeo, *_ngMesh, initState, *_mesh, nodeVec, comment ); //!<
SMESH_ComputeErrorPtr readErr = ReadErrors(nodeVec);
if ( readErr && !readErr->myBadElements.empty() )
err = 0; // no fatal errors, only warnings
}
+ ngLib._isComputeOk = !err;
+
return !err;
}
if ( _simpleHyp || ( mparams.minh == 0.0 && _fineness != NETGENPlugin_Hypothesis::UserDefined))
mparams.minh = GetDefaultMinSize( _shape, mparams.maxh );
- // let netgen create ngMesh and calculate element size on not meshed shapes
+ // let netgen create _ngMesh and calculate element size on not meshed shapes
NETGENPlugin_NetgenLibWrapper ngLib;
netgen::Mesh *ngMesh = NULL;
+#ifndef NETGEN_V5
char *optstr = 0;
+#endif
int startWith = netgen::MESHCONST_ANALYSE;
int endWith = netgen::MESHCONST_MESHEDGES;
+#ifdef NETGEN_V5
+ int err = netgen::OCCGenerateMesh(occgeo, ngMesh, mparams, startWith, endWith);
+#else
int err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#endif
+
if(netgen::multithread.terminate)
return false;
-#endif
+
ngLib.setMesh(( Ng_Mesh*) ngMesh );
if (err) {
if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( _shape ))
return true;
}
+double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder,
+ const int * algoProgressTic,
+ const double * algoProgress) const
+{
+ ((int&) _progressTic ) = *algoProgressTic + 1;
+
+ if ( !_occgeom ) return 0;
+
+ double progress = -1;
+ if ( !_isVolume )
+ {
+ if ( _ticTime < 0 && netgen::multithread.task[0] == 'O'/*Optimizing surface*/ )
+ {
+ ((double&) _ticTime ) = edgeFaceMeshingTime / _totalTime / _progressTic;
+ }
+ else if ( !_optimize /*&& _occgeom->fmap.Extent() > 1*/ )
+ {
+ int doneShapeIndex = -1;
+ while ( doneShapeIndex+1 < _occgeom->facemeshstatus.Size() &&
+ _occgeom->facemeshstatus[ doneShapeIndex+1 ])
+ doneShapeIndex++;
+ if ( doneShapeIndex+1 != _curShapeIndex )
+ {
+ ((int&) _curShapeIndex) = doneShapeIndex+1;
+ double doneShapeRate = _curShapeIndex / double( _occgeom->fmap.Extent() );
+ double doneTime = edgeMeshingTime + doneShapeRate * faceMeshingTime;
+ ((double&) _ticTime) = doneTime / _totalTime / _progressTic;
+ // cout << "shape " << _curShapeIndex << " _ticTime " << _ticTime
+ // << " " << doneTime / _totalTime / _progressTic << endl;
+ }
+ }
+ }
+ else if ( !_optimize && _occgeom->somap.Extent() > 1 )
+ {
+ int curShapeIndex = _curShapeIndex;
+ if ( _ngMesh->GetNE() > 0 )
+ {
+ netgen::Element el = (*_ngMesh)[netgen::ElementIndex( _ngMesh->GetNE()-1 )];
+ curShapeIndex = el.GetIndex();
+ }
+ if ( curShapeIndex != _curShapeIndex )
+ {
+ ((int&) _curShapeIndex) = curShapeIndex;
+ double doneShapeRate = _curShapeIndex / double( _occgeom->somap.Extent() );
+ double doneTime = edgeFaceMeshingTime + doneShapeRate * voluMeshingTime;
+ ((double&) _ticTime) = doneTime / _totalTime / _progressTic;
+ // cout << "shape " << _curShapeIndex << " _ticTime " << _ticTime
+ // << " " << doneTime / _totalTime / _progressTic << endl;
+ }
+ }
+ if ( _ticTime > 0 )
+ progress = Max( *algoProgressTic * _ticTime, *algoProgress );
+ if ( progress > 0 )
+ {
+ ((int&) *algoProgressTic )++;
+ ((double&) *algoProgress) = progress;
+ }
+ //cout << progress << " " << *algoProgressTic << " " << netgen::multithread.task << " "<< _ticTime << endl;
+
+ return Min( progress, 0.99 );
+}
+
//================================================================================
/*!
* \brief Remove "test.out" and "problemfaces" files in current directory
void NETGENPlugin_Mesher::RemoveTmpFiles()
{
- if ( SMESH_File("test.out").remove() && netgen::testout)
+ bool rm = SMESH_File("test.out").remove() ;
+#ifndef WIN32
+ if (rm && netgen::testout)
{
delete netgen::testout;
netgen::testout = 0;
}
+#endif
SMESH_File("problemfaces").remove();
SMESH_File("occmesh.rep").remove();
}
ofstream outfile(pyFile.c_str(), ios::out);
if ( !outfile ) return;
- outfile << "import smesh, SMESH" << endl
+ outfile << "import SMESH" << endl
+ << "from salome.smesh import smeshBuilder" << endl
+ << "smesh = smeshBuilder.New(salome.myStudy)" << endl
<< "mesh = smesh.Mesh()" << endl << endl;
using namespace netgen;
{
if ( !fromMesh->LocalHFunctionGenerated() ) return;
if ( !toMesh->LocalHFunctionGenerated() )
+#ifdef NETGEN_V5
+ toMesh->CalcLocalH(netgen::mparam.grading);
+#else
toMesh->CalcLocalH();
+#endif
const size_t size = sizeof( netgen::LocalH );
_copyOfLocalH = new char[ size ];
NETGENPlugin_NetgenLibWrapper::NETGENPlugin_NetgenLibWrapper()
{
Ng_Init();
+
+ // redirect all netgen output (mycout,myerr,cout) to _outputFileName
+ _isComputeOk = false;
+ _outputFileName = getOutputFileName();
+ netgen::mycout = new ofstream ( _outputFileName.c_str() );
+ netgen::myerr = netgen::mycout;
+ _coutBuffer = std::cout.rdbuf();
+#ifdef _DEBUG_
+ cout << "NOTE: netgen output is redirected to file " << _outputFileName << endl;
+#endif
+ std::cout.rdbuf( netgen::mycout->rdbuf() );
+
_ngMesh = Ng_NewMesh();
}
Ng_DeleteMesh( _ngMesh );
Ng_Exit();
NETGENPlugin_Mesher::RemoveTmpFiles();
+ std::cout.rdbuf( _coutBuffer );
+#ifdef _DEBUG_
+ if( _isComputeOk )
+#endif
+ removeOutputFile();
}
//================================================================================
Ng_DeleteMesh( _ngMesh );
_ngMesh = mesh;
}
+
+//================================================================================
+/*!
+ * \brief Return a unique file name
+ */
+//================================================================================
+
+std::string NETGENPlugin_NetgenLibWrapper::getOutputFileName()
+{
+ std::string aTmpDir = SALOMEDS_Tool::GetTmpDir();
+
+ TCollection_AsciiString aGenericName = (char*)aTmpDir.c_str();
+ aGenericName += "NETGEN_";
+#ifndef WIN32
+ aGenericName += getpid();
+#else
+ aGenericName += _getpid();
+#endif
+ aGenericName += "_";
+ aGenericName += Abs((Standard_Integer)(long) aGenericName.ToCString());
+ aGenericName += ".out";
+
+ return aGenericName.ToCString();
+}
+
+//================================================================================
+/*!
+ * \brief Remove file with netgen output
+ */
+//================================================================================
+
+void NETGENPlugin_NetgenLibWrapper::removeOutputFile()
+{
+ string tmpDir = SALOMEDS_Tool::GetDirFromPath( _outputFileName );
+ SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames;
+ aFiles->length(1);
+ std::string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out";
+ aFiles[0] = aFileName.c_str();
+ if ( netgen::mycout)
+ {
+ delete netgen::mycout;
+ netgen::mycout = 0;
+ netgen::myerr = 0;
+ }
+
+ SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
+#ifdef _DEBUG_
+ //cout << "NOTE: netgen output log was REMOVED " << _outputFileName << endl;
+#endif
+}
