From a639367a1744e94ba38b2b87a94ba692b97e175b Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 17 Dec 2004 11:38:32 +0000 Subject: [PATCH] Update from OCC --- INSTALL | 4 ++++ Makefile.in | 12 +++++++++++- bin/VERSION | 1 + src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx | 12 +++++++++--- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 INSTALL create mode 100755 bin/VERSION diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..2e26afe --- /dev/null +++ b/INSTALL @@ -0,0 +1,4 @@ +This is the version 2.1.0 of NETGENPLUGIN +Compatible with : + - KERNEL 2.1.0 + - SMESH 2.1.0 diff --git a/Makefile.in b/Makefile.in index 4a77ac4..bc00cd6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/resources +VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ @@ -18,6 +18,8 @@ SUBDIRS = idl src RESOURCES_FILES = NETGENPlugin.xml +BIN_SCRIPT = VERSION + # copy header files in common directory ------------ ifeq ($(HAVE_SSTREAM),yes) @@ -45,6 +47,13 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +# install script in $(bindir) : +install-bin: $(BIN_SCRIPT) + $(INSTALL) -d $(bindir) + if test $(BIN_SCRIPT)X != X; then \ + $(INSTALL_PROGRAM) $^ $(bindir); \ + fi + # CLEAN -------------------- distclean: distclean-other @@ -57,3 +66,4 @@ distclean-other: @MODULE@ +install: install-bin diff --git a/bin/VERSION b/bin/VERSION new file mode 100755 index 0000000..05d399c --- /dev/null +++ b/bin/VERSION @@ -0,0 +1 @@ +THIS IS SALOME - NETGENPLUGIN VERSION: 2.1.0 diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx index 98b1e66..7f17292 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx @@ -12,6 +12,7 @@ using namespace std; #include "NETGENPlugin_NETGEN_3D.hxx" #include "SMESH_Gen.hxx" #include "SMESH_Mesh.hxx" +#include "SMESH_subMesh.hxx" #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" @@ -99,8 +100,8 @@ bool NETGENPlugin_NETGEN_3D::CheckHypothesis theHyp = (*itl); // use only the first hypothesis string hypName = theHyp->GetName(); - int hypId = theHyp->GetID(); - SCRUTE(hypName); +// int hypId = theHyp->GetID(); +// SCRUTE(hypName); bool isOk = false; @@ -760,7 +761,12 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh, Ng_Result status; - status = Ng_GenerateVolumeMesh(Netgen_mesh, &Netgen_param); + try { + status = Ng_GenerateVolumeMesh(Netgen_mesh, &Netgen_param); + } catch (...) { + MESSAGE("An exception has been caught during the Volume Mesh Generation ..."); + status = NG_VOLUME_FAILURE; + } SCRUTE(status); -- 2.39.2