ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-20 23:17:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency of SMDS on CASCADE

Browse Source
This commit is contained in:
vsr 2011-06-17 10:44:02 +00:00
parent 9e5c18b4c8
commit 646a140e47
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SMDS/Makefile.am
View File

@ -122,21 +122,16 @@ dist_libSMDS_la_SOURCES = \
# additionnal information to compil and link file # additionnal information to compil and link file
libSMDS_la_CPPFLAGS = \ libSMDS_la_CPPFLAGS = \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(BOOST_CPPFLAGS) $(BOOST_CPPFLAGS)
libSMDS_la_LDFLAGS = \ libSMDS_la_LDFLAGS = \
$(VTK_LIBS) \ $(VTK_LIBS) \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace
$(CAS_KERNEL)
# Executables targets # Executables targets
bin_PROGRAMS = SMDS_MemoryLimit bin_PROGRAMS = SMDS_MemoryLimit
dist_SMDS_MemoryLimit_SOURCES = \ dist_SMDS_MemoryLimit_SOURCES = \
SMDS_MemoryLimit.cxx SMDS_MemoryLimit.cxx
SMDS_MemoryLimit_LDADD = \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace
#libSMDS_la_LDFLAGS += -L/data/eap/S5_MV/INSTALL/SMESH/lib/salome -lPerfmeter #libSMDS_la_LDFLAGS += -L/data/eap/S5_MV/INSTALL/SMESH/lib/salome -lPerfmeter

6
src/SMDS/SMDS_MeshElementIDFactory.cxx
View File

@ -38,6 +38,8 @@
#include "SMDS_UnstructuredGrid.hxx" #include "SMDS_UnstructuredGrid.hxx"
#include <vtkCellType.h> #include <vtkCellType.h>
#include <climits>
using namespace std; using namespace std;
//======================================================================= //=======================================================================
@ -173,7 +175,7 @@ void SMDS_MeshElementIDFactory::ReleaseID(int ID, int vtkId)
void SMDS_MeshElementIDFactory::updateMinMax() const void SMDS_MeshElementIDFactory::updateMinMax() const
{ {
myMin = IntegerLast(); myMin = INT_MAX;
myMax = 0; myMax = 0;
for (int i = 0; i < myMesh->myCells.size(); i++) for (int i = 0; i < myMesh->myCells.size(); i++)
{ {
@ -186,7 +188,7 @@ void SMDS_MeshElementIDFactory::updateMinMax() const
myMin = id; myMin = id;
} }
} }
if (myMin == IntegerLast()) if (myMin == INT_MAX)
myMin = 0; myMin = 0;
} }

1
src/SMDS/SMDS_MeshNode.hxx
View File

@ -32,7 +32,6 @@
#include "SMDS_MeshElement.hxx" #include "SMDS_MeshElement.hxx"
#include "SMDS_Position.hxx" #include "SMDS_Position.hxx"
#include "ObjectPool.hxx" #include "ObjectPool.hxx"
#include <NCollection_List.hxx>
class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement class SMDS_EXPORT SMDS_MeshNode:public SMDS_MeshElement
{ {