* Corrected error in OCC part of nglib header - header now has no external dependencies

This commit is contained in:
Philippose Rajan 2009-08-30 12:37:40 +00:00
parent 4fc9c40286
commit 3551550857
2 changed files with 661 additions and 589 deletions

View File

@ -1,5 +1,5 @@
/**************************************************************************/
/* File: nglib.cc */
/* File: nglib.cpp */
/* Author: Joachim Schoeberl */
/* Date: 7. May. 2000 */
/**************************************************************************/
@ -74,6 +74,9 @@ DLL_HEADER void Ng_Init ()
testout = new ofstream ("test.out");
}
// Clean-up functions before ending usage of nglib
DLL_HEADER void Ng_Exit ()
{
;
@ -81,6 +84,7 @@ DLL_HEADER void Ng_Exit ()
// Create a new netgen mesh object
DLL_HEADER Ng_Mesh * Ng_NewMesh ()
{
Mesh * mesh = new Mesh;
@ -88,19 +92,44 @@ DLL_HEADER Ng_Mesh * Ng_NewMesh ()
return (Ng_Mesh*)(void*)mesh;
}
// Delete an existing netgen mesh object
DLL_HEADER void Ng_DeleteMesh (Ng_Mesh * mesh)
{
delete (Mesh*)mesh;
}
// feeds points, surface elements and volume elements to the mesh
// Save a netgen mesh in the native VOL format
DLL_HEADER void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename)
{
((Mesh*)mesh)->Save(filename);
}
// Load a netgen native VOL mesh from a given file
DLL_HEADER Ng_Mesh * Ng_LoadMesh(const char* filename)
{
Mesh * mesh = new Mesh;
mesh->Load(filename);
return ( (Ng_Mesh*)mesh );
}
// Manually add a point to an existing mesh object
DLL_HEADER void Ng_AddPoint (Ng_Mesh * mesh, double * x)
{
Mesh * m = (Mesh*)mesh;
m->AddPoint (Point3d (x[0], x[1], x[2]));
}
// Manually add a surface element of a given type to an existing mesh object
DLL_HEADER void Ng_AddSurfaceElement (Ng_Mesh * mesh, Ng_Surface_Element_Type et,
int * pi)
{
@ -113,6 +142,9 @@ DLL_HEADER void Ng_AddSurfaceElement (Ng_Mesh * mesh, Ng_Surface_Element_Type et
m->AddSurfaceElement (el);
}
// Manually add a volume element of a given type to an existing mesh object
DLL_HEADER void Ng_AddVolumeElement (Ng_Mesh * mesh, Ng_Volume_Element_Type et,
int * pi)
{
@ -126,24 +158,33 @@ DLL_HEADER void Ng_AddVolumeElement (Ng_Mesh * mesh, Ng_Volume_Element_Type et,
m->AddVolumeElement (el);
}
// ask for number of points, surface and volume elements
// Obtain the number of points in the mesh
DLL_HEADER int Ng_GetNP (Ng_Mesh * mesh)
{
return ((Mesh*)mesh) -> GetNP();
}
// Obtain the number of surface elements in the mesh
DLL_HEADER int Ng_GetNSE (Ng_Mesh * mesh)
{
return ((Mesh*)mesh) -> GetNSE();
}
// Obtain the number of volume elements in the mesh
DLL_HEADER int Ng_GetNE (Ng_Mesh * mesh)
{
return ((Mesh*)mesh) -> GetNE();
}
// return point coordinates
// Return point coordinates of a given point index in the mesh
DLL_HEADER void Ng_GetPoint (Ng_Mesh * mesh, int num, double * x)
{
const Point3d & p = ((Mesh*)mesh)->Point(num);
@ -152,7 +193,9 @@ DLL_HEADER void Ng_GetPoint (Ng_Mesh * mesh, int num, double * x)
x[2] = p.Z();
}
// return surface and volume element in pi
// Return the surface element at a given index "pi"
DLL_HEADER Ng_Surface_Element_Type
Ng_GetSurfaceElement (Ng_Mesh * mesh, int num, int * pi)
{
@ -171,6 +214,9 @@ Ng_GetSurfaceElement (Ng_Mesh * mesh, int num, int * pi)
return et;
}
// Return the volume element at a given index "pi"
DLL_HEADER Ng_Volume_Element_Type
Ng_GetVolumeElement (Ng_Mesh * mesh, int num, int * pi)
{
@ -190,16 +236,25 @@ Ng_GetVolumeElement (Ng_Mesh * mesh, int num, int * pi)
return et;
}
// Set a global limit on the maximum mesh size allowed
DLL_HEADER void Ng_RestrictMeshSizeGlobal (Ng_Mesh * mesh, double h)
{
((Mesh*)mesh) -> SetGlobalH (h);
}
// Set a local limit on the maximum mesh size allowed around the given point
DLL_HEADER void Ng_RestrictMeshSizePoint (Ng_Mesh * mesh, double * p, double h)
{
((Mesh*)mesh) -> RestrictLocalH (Point3d (p[0], p[1], p[2]), h);
}
// Set a local limit on the maximum mesh size allowed within a given box region
DLL_HEADER void Ng_RestrictMeshSizeBox (Ng_Mesh * mesh, double * pmin, double * pmax, double h)
{
for (double x = pmin[0]; x < pmax[0]; x += h)
@ -209,7 +264,8 @@ DLL_HEADER void Ng_RestrictMeshSizeBox (Ng_Mesh * mesh, double * pmin, double *
}
// generates volume mesh from surface mesh
// Generates volume mesh from an existing surface mesh
DLL_HEADER Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp)
{
Mesh * m = (Mesh*)mesh;
@ -234,7 +290,7 @@ DLL_HEADER Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameter
// 2D Meshing Functions:
/* ------------------ 2D Meshing Functions ------------------------- */
@ -355,28 +411,9 @@ DLL_HEADER void Ng_HP_Refinement (Ng_Geometry_2D * geom,
Array<STLReadTriangle> readtrias; //only before initstlgeometry
Array<Point<3> > readedges; //only before init stlgeometry
DLL_HEADER void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename)
{
((Mesh*)mesh)->Save(filename);
}
DLL_HEADER Ng_Mesh * Ng_LoadMesh(const char* filename)
{
Mesh * mesh = new Mesh;
mesh->Load(filename);
return ( (Ng_Mesh*)mesh );
}
// loads geometry from STL file
DLL_HEADER Ng_STL_Geometry * Ng_STL_LoadGeometry (const char * filename, int binary)
{
@ -630,12 +667,14 @@ DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_BREP (const char * filename)
// Extract a
DLL_HEADER Ng_Result Ng_OCC_GetFMap(Ng_OCC_Geometry * geom,
TopTools_IndexedMapOfShape & FMap)
Ng_OCC_TopTools_IndexedMapOfShape * FMap)
{
OCCGeometry* occgeom = (OCCGeometry*)geom;
FMap = occgeom->fmap;
TopTools_IndexedMapOfShape *occfmap = (TopTools_IndexedMapOfShape *)FMap;
if(FMap.Extent())
occfmap->Assign(occgeom->fmap);
if(occfmap->Extent())
{
return NG_OK;
}
@ -657,14 +696,32 @@ DLL_HEADER Ng_Meshing_Parameters :: Ng_Meshing_Parameters()
{
maxh = 1000;
fineness = 0.5;
grading = 0.3;
secondorder = 0;
meshsize_filename = 0;
quad_dominated = 0;
optsteps_2d = 3;
optsteps_3d = 3;
}
DLL_HEADER void Ng_Meshing_Parameters :: Reset_Meshing_Parameters()
{
maxh = 1000;
fineness = 0.5;
grading = 0.3;
secondorder = 0;
meshsize_filename = 0;
quad_dominated = 0;
optsteps_2d = 3;
optsteps_3d = 3;
}
} // End of namespace nglib
// compatibility functions:
@ -704,7 +761,4 @@ void Render()
;
}
}
} // End of namespace netgen

View File

@ -2,7 +2,7 @@
#define NGLIB
/**************************************************************************/
/* File: nglib.hh */
/* File: nglib.h */
/* Author: Joachim Schoeberl */
/* Date: 7. May. 2000 */
/**************************************************************************/
@ -60,6 +60,7 @@ typedef void * Ng_STL_Geometry;
#ifdef OCCGEOMETRY
/// Data type for NETGEN OpenCascade geometry
typedef void * Ng_OCC_Geometry;
typedef void * Ng_OCC_TopTools_IndexedMapOfShape;
#endif
@ -93,9 +94,13 @@ class Ng_Meshing_Parameters
public:
double maxh; //!< Maximum global mesh size limit
double fineness; //!< Mesh density: 0...1 (0 => coarse; 1 => fine)
double grading; //!< Mesh grading: 0...1 (0 => uniform mesh; 1 => aggressive local grading)
int secondorder; //!< Generate second-order surface and volume elements
char * meshsize_filename; //!< Optional external mesh size file
int quad_dominated; //!< Creates a Quad-dominated mesh
int optsteps_3d; //!< Number of optimize steps to use for 3-D mesh optimization
int optsteps_2d; //!< Number of optimize steps to use for 2-D mesh optimization
/*!
Default constructor for the Mesh Parameters class
@ -104,11 +109,24 @@ public:
class with the following default values
- #maxh: 1000.0
- #fineness: 0.5
- #grading: 0.3
- #secondorder: 0.0
- #meshsize_filename: 0
- #meshsize_filename: null
- #quad_dominated: 0
- #optsteps_2d: 3
- #optsteps_3d: 3
*/
DLL_HEADER Ng_Meshing_Parameters();
/*!
Reset the meshing parameters to their defaults
This member function resets all the meshing parameters
of the object to the default values
*/
DLL_HEADER void Reset_Parameters();
};
@ -571,7 +589,7 @@ DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_BREP (const char * filename);
// Get the face map of an already loaded OCC geometry
DLL_HEADER Ng_Result Ng_OCC_GetFMap(Ng_OCC_Geometry * geom,
TopTools_IndexedMapOfShape & FMap);
Ng_OCC_TopTools_IndexedMapOfShape * FMap);
#endif