Update from OCC

This commit is contained in:
admin 2004-12-17 11:38:32 +00:00
parent b34b5e7038
commit a639367a17
4 changed files with 25 additions and 4 deletions

4
INSTALL Normal file
View File

@ -0,0 +1,4 @@
This is the version 2.1.0 of NETGENPLUGIN
Compatible with :
- KERNEL 2.1.0
- SMESH 2.1.0

View File

@ -9,7 +9,7 @@
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=. top_builddir=.
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/resources VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
@COMMENCE@ @COMMENCE@
@ -18,6 +18,8 @@ SUBDIRS = idl src
RESOURCES_FILES = NETGENPlugin.xml RESOURCES_FILES = NETGENPlugin.xml
BIN_SCRIPT = VERSION
# copy header files in common directory ------------ # copy header files in common directory ------------
ifeq ($(HAVE_SSTREAM),yes) ifeq ($(HAVE_SSTREAM),yes)
@ -45,6 +47,13 @@ include/salome/sstream: salome_adm/unix/sstream
-$(RM) $@ -$(RM) $@
$(LN_S) ../../$< $@ $(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 -------------------- # CLEAN --------------------
distclean: distclean-other distclean: distclean-other
@ -57,3 +66,4 @@ distclean-other:
@MODULE@ @MODULE@
install: install-bin

1
bin/VERSION Executable file
View File

@ -0,0 +1 @@
THIS IS SALOME - NETGENPLUGIN VERSION: 2.1.0

View File

@ -12,6 +12,7 @@ using namespace std;
#include "NETGENPlugin_NETGEN_3D.hxx" #include "NETGENPlugin_NETGEN_3D.hxx"
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_subMesh.hxx"
#include "SMDS_MeshElement.hxx" #include "SMDS_MeshElement.hxx"
#include "SMDS_MeshNode.hxx" #include "SMDS_MeshNode.hxx"
@ -99,8 +100,8 @@ bool NETGENPlugin_NETGEN_3D::CheckHypothesis
theHyp = (*itl); // use only the first hypothesis theHyp = (*itl); // use only the first hypothesis
string hypName = theHyp->GetName(); string hypName = theHyp->GetName();
int hypId = theHyp->GetID(); // int hypId = theHyp->GetID();
SCRUTE(hypName); // SCRUTE(hypName);
bool isOk = false; bool isOk = false;
@ -760,7 +761,12 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
Ng_Result status; 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); SCRUTE(status);