Porting to windows after merge with Salome 3.2.7
This commit is contained in:
parent
577a14ea2a
commit
94e5bd9233
@ -170,6 +170,9 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo,
|
|||||||
occgeo.shape = shape;
|
occgeo.shape = shape;
|
||||||
occgeo.changed = 1;
|
occgeo.changed = 1;
|
||||||
occgeo.BuildFMap();
|
occgeo.BuildFMap();
|
||||||
|
//amv for test
|
||||||
|
occgeo.amv_test();
|
||||||
|
|
||||||
BRepTools::Clean (shape);
|
BRepTools::Clean (shape);
|
||||||
BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, 0.01, true);
|
BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, 0.01, true);
|
||||||
Bnd_Box bb;
|
Bnd_Box bb;
|
||||||
@ -433,7 +436,7 @@ bool NETGENPlugin_Mesher::Compute()
|
|||||||
// create tetrahedra
|
// create tetrahedra
|
||||||
for (i = 1; i <= nbVol/* && isOK*/; ++i)
|
for (i = 1; i <= nbVol/* && isOK*/; ++i)
|
||||||
{
|
{
|
||||||
const netgen::Element& elem = ngMesh->VolumeElement(i);
|
const netgen::Element& elem = ngMesh->VolumeElement(i);
|
||||||
int aSolidInd = elem.GetIndex();
|
int aSolidInd = elem.GetIndex();
|
||||||
TopoDS_Solid aSolid;
|
TopoDS_Solid aSolid;
|
||||||
if (aSolidInd > 0 && aSolidInd <= occgeo.somap.Extent())
|
if (aSolidInd > 0 && aSolidInd <= occgeo.somap.Extent())
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#define _NETGENPlugin_Mesher_HXX_
|
#define _NETGENPlugin_Mesher_HXX_
|
||||||
|
|
||||||
#include "NETGENPlugin_Defs.hxx"
|
#include "NETGENPlugin_Defs.hxx"
|
||||||
|
#include "StdMeshers_FaceSide.hxx"
|
||||||
|
|
||||||
class SMESH_Mesh;
|
class SMESH_Mesh;
|
||||||
class SMESHDS_Mesh;
|
class SMESHDS_Mesh;
|
||||||
|
@ -55,9 +55,10 @@ namespace nglib {
|
|||||||
#define OCCGEOMETRY
|
#define OCCGEOMETRY
|
||||||
#include <occgeom.hpp>
|
#include <occgeom.hpp>
|
||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
|
//#include <meshtype.hpp>
|
||||||
namespace netgen {
|
namespace netgen {
|
||||||
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
|
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
|
||||||
extern MeshingParameters mparam;
|
/*extern*/ MeshingParameters mparam;
|
||||||
}
|
}
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@ -266,7 +267,7 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
|
|||||||
seg.p2 = firstPointID;
|
seg.p2 = firstPointID;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngMesh.CalcSurfacesOfNode();
|
ngMesh.CalcSurfacesOfNode();
|
||||||
|
|
||||||
return TError();
|
return TError();
|
||||||
}
|
}
|
||||||
|
@ -27,11 +27,26 @@
|
|||||||
#include "SMESH_2D_Algo.hxx"
|
#include "SMESH_2D_Algo.hxx"
|
||||||
#include "SMESH_Mesh.hxx"
|
#include "SMESH_Mesh.hxx"
|
||||||
|
|
||||||
|
/*#define OCCGEOMETRY
|
||||||
|
#include <occgeom.hpp>
|
||||||
|
#include <meshing.hpp>//amv*/
|
||||||
|
|
||||||
class StdMeshers_MaxElementArea;
|
class StdMeshers_MaxElementArea;
|
||||||
class StdMeshers_LengthFromEdges;
|
class StdMeshers_LengthFromEdges;
|
||||||
class StdMeshers_QuadranglePreference;
|
class StdMeshers_QuadranglePreference;
|
||||||
//class NETGENPlugin_Hypothesis;
|
//class NETGENPlugin_Hypothesis;
|
||||||
|
|
||||||
|
/*namespace netgen {
|
||||||
|
class OCCGeometry;
|
||||||
|
}*/
|
||||||
|
/*namespace netgen {
|
||||||
|
class OCCGeometry;
|
||||||
|
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
|
||||||
|
extern MeshingParameters mparam;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
//using namespace netgen;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Mesher generating 2D elements on a geometrical face taking
|
* \brief Mesher generating 2D elements on a geometrical face taking
|
||||||
* into account pre-existing nodes on face boundaries
|
* into account pre-existing nodes on face boundaries
|
||||||
@ -53,6 +68,12 @@ public:
|
|||||||
virtual bool Compute(SMESH_Mesh& aMesh,
|
virtual bool Compute(SMESH_Mesh& aMesh,
|
||||||
const TopoDS_Shape& aShape);
|
const TopoDS_Shape& aShape);
|
||||||
|
|
||||||
|
/*static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
|
||||||
|
OCCGeometry& geom,
|
||||||
|
const TSideVector& wires,
|
||||||
|
SMESH_MesherHelper& helper,
|
||||||
|
vector< const SMDS_MeshNode* > & nodeVec); //amv*/
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const StdMeshers_MaxElementArea* _hypMaxElementArea;
|
const StdMeshers_MaxElementArea* _hypMaxElementArea;
|
||||||
const StdMeshers_LengthFromEdges* _hypLengthFromEdges;
|
const StdMeshers_LengthFromEdges* _hypLengthFromEdges;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user