-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 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
#define OCCGEOMETRY
#endif
#include <occgeom.hpp>
+#include <ngexception.hpp>
namespace nglib {
#include <nglib.h>
}
#else
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
#endif
+
+ NETGENPLUGIN_DLL_HEADER
extern MeshingParameters mparam;
+
+ NETGENPLUGIN_DLL_HEADER
extern volatile multithreadt multithread;
}
using namespace nglib;
*/
//=============================================================================
-NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, int studyId,
- SMESH_Gen* gen)
- : SMESH_3D_Algo(hypId, studyId, gen)
+NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen)
+ : SMESH_3D_Algo(hypId, gen)
{
- MESSAGE("NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D");
_name = "NETGEN_3D";
_shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type
_compatibleHypothesis.push_back("MaxElementVolume");
NETGENPlugin_NETGEN_3D::~NETGENPlugin_NETGEN_3D()
{
- MESSAGE("NETGENPlugin_NETGEN_3D::~NETGENPlugin_NETGEN_3D");
}
//=============================================================================
const TopoDS_Shape& aShape,
Hypothesis_Status& aStatus)
{
- MESSAGE("NETGENPlugin_NETGEN_3D::CheckHypothesis");
-
_hypMaxElementVolume = NULL;
_hypParameters = NULL;
_viscousLayersHyp = NULL;
const SMESHDS_SubMesh * aSubMeshDSFace = proxyMesh->GetSubMesh( aShapeFace );
if ( !aSubMeshDSFace ) continue;
+
SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements();
+ if ( _quadraticMesh &&
+ dynamic_cast< const SMESH_ProxyMesh::SubMesh*>( aSubMeshDSFace ))
+ {
+ // add medium nodes of proxy triangles to helper (#16843)
+ while ( iteratorElem->more() )
+ helper.AddTLinks( static_cast< const SMDS_MeshFace* >( iteratorElem->next() ));
+
+ iteratorElem = aSubMeshDSFace->GetElements();
+ }
while ( iteratorElem->more() ) // loop on elements on a geom face
{
// check mesh face
return ( ngLib._isComputeOk = compute( aMesh, helper, nodeVec, Netgen_mesh));
}
-namespace
-{
- void limitVolumeSize( netgen::Mesh* ngMesh,
- double maxh )
- {
- // get average h of faces
- double faceh = 0;
- int nbh = 0;
- for (int i = 1; i <= ngMesh->GetNSE(); i++)
- {
- const netgen::Element2d& face = ngMesh->SurfaceElement(i);
- for (int j=1; j <= face.GetNP(); ++j)
- {
- const netgen::PointIndex & i1 = face.PNumMod(j);
- const netgen::PointIndex & i2 = face.PNumMod(j+1);
- if ( i1 < i2 )
- {
- const netgen::Point3d & p1 = ngMesh->Point( i1 );
- const netgen::Point3d & p2 = ngMesh->Point( i2 );
- faceh += netgen::Dist2( p1, p2 );
- nbh++;
- }
- }
- }
- faceh = Sqrt( faceh / nbh );
-
- double compareh;
- if ( faceh < 0.5 * maxh ) compareh = -1;
- else if ( faceh > 1.5 * maxh ) compareh = 1;
- else compareh = 0;
- // cerr << "faceh " << faceh << endl;
- // cerr << "init maxh " << maxh << endl;
- // cerr << "compareh " << compareh << endl;
-
- if ( compareh > 0 )
- maxh *= 1.2;
- else
- maxh *= 0.8;
- // cerr << "maxh " << maxh << endl;
-
- // get bnd box
- netgen::Point3d pmin, pmax;
- ngMesh->GetBox( pmin, pmax, 0 );
- const double dx = pmax.X() - pmin.X();
- const double dy = pmax.Y() - pmin.Y();
- const double dz = pmax.Z() - pmin.Z();
-
- if ( ! & ngMesh->LocalHFunction() )
- ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 );
-
- // adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8
- const int nbX = Max( 2, int( dx / maxh * 2 ));
- const int nbY = Max( 2, int( dy / maxh * 2 ));
- const int nbZ = Max( 2, int( dz / maxh * 2 ));
-
- netgen::Point3d p;
- for ( int i = 0; i <= nbX; ++i )
- {
- p.X() = pmin.X() + i * dx / nbX;
- for ( int j = 0; j <= nbY; ++j )
- {
- p.Y() = pmin.Y() + j * dy / nbY;
- for ( int k = 0; k <= nbZ; ++k )
- {
- p.Z() = pmin.Z() + k * dz / nbZ;
- ngMesh->RestrictLocalH( p, maxh );
- }
- }
- }
- }
-}
+// namespace
+// {
+// void limitVolumeSize( netgen::Mesh* ngMesh,
+// double maxh )
+// {
+// // get average h of faces
+// double faceh = 0;
+// int nbh = 0;
+// for (int i = 1; i <= ngMesh->GetNSE(); i++)
+// {
+// const netgen::Element2d& face = ngMesh->SurfaceElement(i);
+// for (int j=1; j <= face.GetNP(); ++j)
+// {
+// const netgen::PointIndex & i1 = face.PNumMod(j);
+// const netgen::PointIndex & i2 = face.PNumMod(j+1);
+// if ( i1 < i2 )
+// {
+// const netgen::Point3d & p1 = ngMesh->Point( i1 );
+// const netgen::Point3d & p2 = ngMesh->Point( i2 );
+// faceh += netgen::Dist2( p1, p2 );
+// nbh++;
+// }
+// }
+// }
+// faceh = Sqrt( faceh / nbh );
+
+// double compareh;
+// if ( faceh < 0.5 * maxh ) compareh = -1;
+// else if ( faceh > 1.5 * maxh ) compareh = 1;
+// else compareh = 0;
+// // cerr << "faceh " << faceh << endl;
+// // cerr << "init maxh " << maxh << endl;
+// // cerr << "compareh " << compareh << endl;
+
+// if ( compareh > 0 )
+// maxh *= 1.2;
+// else
+// maxh *= 0.8;
+// // cerr << "maxh " << maxh << endl;
+
+// // get bnd box
+// netgen::Point3d pmin, pmax;
+// ngMesh->GetBox( pmin, pmax, 0 );
+// const double dx = pmax.X() - pmin.X();
+// const double dy = pmax.Y() - pmin.Y();
+// const double dz = pmax.Z() - pmin.Z();
+
+// if ( ! & ngMesh->LocalHFunction() )
+// ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 );
+
+// // adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8
+// const int nbX = Max( 2, int( dx / maxh * 2 ));
+// const int nbY = Max( 2, int( dy / maxh * 2 ));
+// const int nbZ = Max( 2, int( dz / maxh * 2 ));
+
+// netgen::Point3d p;
+// for ( int i = 0; i <= nbX; ++i )
+// {
+// p.X() = pmin.X() + i * dx / nbX;
+// for ( int j = 0; j <= nbY; ++j )
+// {
+// p.Y() = pmin.Y() + j * dy / nbY;
+// for ( int k = 0; k <= nbZ; ++k )
+// {
+// p.Z() = pmin.Z() + k * dz / nbZ;
+// ngMesh->RestrictLocalH( p, maxh );
+// }
+// }
+// }
+// }
+// }
//================================================================================
/*!
NETGENPlugin_Mesher aMesher( &aMesh, helper.GetSubShape(), /*isVolume=*/true );
netgen::OCCGeometry occgeo;
-
+
if ( _hypParameters )
{
aMesher.SetParameters( _hypParameters );
+
+ if ( !_hypParameters->GetLocalSizesAndEntries().empty() ||
+ !_hypParameters->GetMeshSizeFile().empty() )
+ {
+ if ( ! &ngMesh->LocalHFunction() )
+ {
+ netgen::Point3d pmin, pmax;
+ ngMesh->GetBox( pmin, pmax, 0 );
+ ngMesh->SetLocalH( pmin, pmax, _hypParameters->GetGrowthRate() );
+ }
+ aMesher.SetLocalSize( occgeo, *ngMesh );
+
+ try {
+ ngMesh->LoadLocalMeshSize( netgen::mparam.meshsizefilename );
+ } catch (netgen::NgException & ex) {
+ return error( COMPERR_BAD_PARMETERS, ex.What() );
+ }
+ }
if ( !_hypParameters->GetOptimize() )
endWith = netgen::MESHCONST_MESHVOLUME;
}
str << ": " << ex.GetMessageString();
error(str);
}
- catch (netgen::NgException exc)
+ catch (netgen::NgException& exc)
{
SMESH_Comment str("NgException");
if ( strlen( netgen::multithread.task ) > 0 )
int Netgen_NbOfNodesNew = Ng_GetNP(Netgen_mesh);
int Netgen_NbOfTetra = Ng_GetNE(Netgen_mesh);
- MESSAGE("End of Volume Mesh Generation. err=" << err <<
- ", nb new nodes: " << Netgen_NbOfNodesNew - Netgen_NbOfNodes <<
- ", nb tetra: " << Netgen_NbOfTetra);
-
// -------------------------------------------------------------------
// Feed back the SMESHDS with the generated Nodes and Volume Elements
// -------------------------------------------------------------------
if ( err )
{
SMESH_ComputeErrorPtr ce = NETGENPlugin_Mesher::ReadErrors(nodeVec);
- if ( ce && !ce->myBadElements.empty() )
+ if ( ce && ce->HasBadElems() )
error( ce );
}
StdMeshers_QuadToTriaAdaptor* Adaptor = new StdMeshers_QuadToTriaAdaptor;
Adaptor->Compute(aMesh);
proxyMesh.reset( Adaptor );
+
+ if ( aHelper->IsQuadraticMesh() )
+ {
+ SMDS_ElemIteratorPtr fIt = proxyMesh->GetFaces();
+ while( fIt->more())
+ aHelper->AddTLinks( static_cast< const SMDS_MeshFace* >( fIt->next() ));
+ }
}
// maps nodes to ng ID
