-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
// 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
#include <nglib.h>
}
namespace netgen {
+#ifdef NETGEN_V5
+ extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, MeshingParameters&, int, int);
+#else
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
+#endif
extern MeshingParameters mparam;
extern volatile multithreadt multithread;
}
_viscousLayersHyp = NULL;
_maxElementVolume = DBL_MAX;
+ // for correct work of GetProgress():
+ netgen::multithread.percent = 0.;
+ netgen::multithread.task = "Volume meshing";
+ _progressByTic = -1.;
+
list<const SMESHDS_Hypothesis*>::const_iterator itl;
const SMESHDS_Hypothesis* theHyp;
bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape)
{
-#ifdef WITH_SMESH_CANCEL_COMPUTE
netgen::multithread.terminate = 0;
-#endif
- MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume);
-
+ _progressByTic = -1.;
+
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
SMESH_MesherHelper helper(aMesh);
bool _quadraticMesh = helper.IsQuadraticSubMesh(aShape);
helper.SetElementsOnShape( true );
- int Netgen_NbOfNodes = 0;
-
+ int Netgen_NbOfNodes = 0;
double Netgen_point[3];
int Netgen_triangle[3];
helper.NbAncestors(aShapeFace, aMesh, aShape.ShapeType()) > 1 )
// IsReversedSubMesh() can work wrong on strongly curved faces,
// so we use it as less as possible
- isRev = SMESH_Algo::IsReversedSubMesh( TopoDS::Face(aShapeFace), meshDS );
+ isRev = helper.IsReversedSubMesh( TopoDS::Face( aShapeFace ));
const SMESHDS_SubMesh * aSubMeshDSFace = proxyMesh->GetSubMesh( aShapeFace );
if ( !aSubMeshDSFace ) continue;
if ( internals.hasInternalVertexInSolid() )
{
netgen::OCCGeometry occgeo;
- NETGENPlugin_Mesher::addIntVerticesInSolids( occgeo,
+ NETGENPlugin_Mesher::AddIntVerticesInSolids( occgeo,
(netgen::Mesh&) *Netgen_mesh,
nodeVec,
internals);
// Generate the volume mesh
// -------------------------
- return compute( aMesh, helper, nodeVec, Netgen_mesh);
+ return ( ngLib._isComputeOk = compute( aMesh, helper, nodeVec, Netgen_mesh));
}
//================================================================================
vector< const SMDS_MeshNode* >& nodeVec,
Ng_Mesh * Netgen_mesh)
{
-#ifdef WITH_SMESH_CANCEL_COMPUTE
netgen::multithread.terminate = 0;
-#endif
+
netgen::Mesh* ngMesh = (netgen::Mesh*)Netgen_mesh;
int Netgen_NbOfNodes = Ng_GetNP(Netgen_mesh);
+#ifndef NETGEN_V5
char *optstr = 0;
+#endif
int startWith = netgen::MESHCONST_MESHVOLUME;
int endWith = netgen::MESHCONST_OPTVOLUME;
int err = 1;
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
#endif
+#ifdef NETGEN_V5
+ ngMesh->CalcLocalH(netgen::mparam.grading);
+ err = netgen::OCCGenerateMesh(occgeo, ngMesh, netgen::mparam, startWith, endWith);
+#else
ngMesh->CalcLocalH();
err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
+#endif
if(netgen::multithread.terminate)
return false;
-#endif
if ( err )
error(SMESH_Comment("Error in netgen::OCCGenerateMesh() at ") << netgen::multithread.task);
}
str << ": " << ex.GetMessageString();
error(str);
}
+ catch (netgen::NgException exc)
+ {
+ SMESH_Comment str("NgException");
+ if ( strlen( netgen::multithread.task ) > 0 )
+ str << " at " << netgen::multithread.task;
+ str << ": " << exc.What();
+ error(str);
+ }
catch (...)
{
SMESH_Comment str("Exception in netgen::OCCGenerateMesh()");
- str << " at " << netgen::multithread.task;
+ if ( strlen( netgen::multithread.task ) > 0 )
+ str << " at " << netgen::multithread.task;
error(str);
}
if ( err )
{
- SMESH_ComputeErrorPtr ce = NETGENPlugin_Mesher::readErrors(nodeVec);
+ SMESH_ComputeErrorPtr ce = NETGENPlugin_Mesher::ReadErrors(nodeVec);
if ( ce && !ce->myBadElements.empty() )
error( ce );
}
bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
SMESH_MesherHelper* aHelper)
{
- MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume);
const int invalid_ID = -1;
- bool _quadraticMesh = false;
- SMESH_MesherHelper::MType MeshType = aHelper->IsQuadraticMesh();
+ netgen::multithread.terminate = 0;
+ _progressByTic = -1.;
- if(MeshType == SMESH_MesherHelper::COMP)
+ SMESH_MesherHelper::MType MeshType = aHelper->IsQuadraticMesh();
+ if ( MeshType == SMESH_MesherHelper::COMP )
return error( COMPERR_BAD_INPUT_MESH,
- SMESH_Comment("Mesh with linear and quadratic elements given."));
- else if (MeshType == SMESH_MesherHelper::QUADRATIC)
- _quadraticMesh = true;
+ SMESH_Comment("Mesh with linear and quadratic elements given"));
+
+ aHelper->SetIsQuadratic( MeshType == SMESH_MesherHelper::QUADRATIC );
// ---------------------------------
// Feed the Netgen with surface mesh
int Netgen_param2ndOrder = 0;
double Netgen_paramFine = 1.;
double Netgen_paramSize = pow( 72, 1/6. ) * pow( _maxElementVolume, 1/3. );
-
+
double Netgen_point[3];
int Netgen_triangle[3];
int Netgen_tetrahedron[4];
// Generate the volume mesh
// -------------------------
- return compute( aMesh, *aHelper, nodeVec, Netgen_mesh);
+ return ( ngLib._isComputeOk = compute( aMesh, *aHelper, nodeVec, Netgen_mesh));
}
-#ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_3D::CancelCompute()
{
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1;
}
-#endif
+
+//================================================================================
+/*!
+ * \brief Return Compute progress
+ */
+//================================================================================
+
+double NETGENPlugin_NETGEN_3D::GetProgress() const
+{
+ double res;
+ const char* volMeshing = "Volume meshing";
+ const char* dlnMeshing = "Delaunay meshing";
+ const double meshingRatio = 0.15;
+ const_cast<NETGENPlugin_NETGEN_3D*>( this )->_progressTic++;
+
+ if ( _progressByTic < 0. &&
+ ( strncmp( netgen::multithread.task, dlnMeshing, 3 ) == 0 ||
+ strncmp( netgen::multithread.task, volMeshing, 3 ) == 0 ))
+ {
+ res = 0.001 + meshingRatio * netgen::multithread.percent / 100.;
+ //cout << netgen::multithread.task << " " <<_progressTic << "-" << netgen::multithread.percent << endl;
+ }
+ else // different otimizations
+ {
+ if ( _progressByTic < 0. )
+ ((NETGENPlugin_NETGEN_3D*)this)->_progressByTic = meshingRatio / _progressTic;
+ res = _progressByTic * _progressTic;
+ //cout << netgen::multithread.task << " " << _progressTic << " " << res << endl;
+ }
+ return Min ( res, 0.98 );
+}
//=============================================================================
/*!
