revert some unneeded changes on netgen plugin

This commit is contained in:
wmayer 2016-10-11 19:00:49 +02:00
parent 9f7848aeac
commit 356723f121
4 changed files with 5 additions and 11 deletions

View File

@ -39,8 +39,6 @@
namespace nglib {
#include <nglib.h>
}
#include <meshing.hpp>
#include <occgeom.hpp>
#include <map>
#include <vector>
@ -56,10 +54,10 @@ class TopoDS_Shape;
class NETGENPlugin_Hypothesis;
class NETGENPlugin_SimpleHypothesis_2D;
class NETGENPlugin_Internals;
// namespace netgen {
// class OCCGeometry;
// class Mesh;
// }
namespace netgen {
class OCCGeometry;
class Mesh;
}
//=============================================================================
/*!
* \brief Struct storing nb of entities in netgen mesh

View File

@ -2460,8 +2460,6 @@ bool NETGENPlugin_Mesher::Compute()
// -------------------------
#if NETGEN_VERSION < 6
_ngMesh = NULL;
// #else
// _ngMesh = std::make_shared<netgen::Mesh>();
#endif
NETGENPlugin_ngMeshInfo initState; // it remembers size of ng mesh equal to size of Smesh
@ -2647,7 +2645,6 @@ bool NETGENPlugin_Mesher::Compute()
err = ( err || !comment.empty() );
#if NETGEN_VERSION > 5
// nglib::Ng_DeleteMesh((nglib::Ng_Mesh*)tmpNgMesh.get());
tmpNgMesh.reset();
#else
nglib::Ng_DeleteMesh((nglib::Ng_Mesh*)tmpNgMesh);

View File

@ -46,8 +46,6 @@ namespace nglib {
}
#include <meshing.hpp>
#include <iostream>
using namespace std;
//=============================================================================

View File

@ -235,6 +235,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
{
netgen::multithread.terminate = 0;
//netgen::multithread.task = "Surface meshing";
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
SMESH_MesherHelper helper(aMesh);
helper.SetElementsOnShape( true );