kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'refs/heads/jriegel/develop-fem'

Browse Source
This commit is contained in:
jriegel
2013-06-27 16:47:40 +02:00
parent 16c594d20d fa1aa95a93
commit 415262bc0d
90 changed files with 20127 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@@ -26,19 +26,34 @@ include_directories(
link_directories(${OCC_LIBRARY_DIR})
if(MSVC)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${NGLIB_LIBRARIES}
${NGLIB_DEBUG_LIBRARIES}
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
if(FREECAD_BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${NGLIB_LIBRARIES}
${NGLIB_DEBUG_LIBRARIES}
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
else(FREECAD_BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
endif(FREECAD_BUILD_FEM_NETGEN)
else(MSVC)
set(SMESH_LIBS
${OCC_LIBRARIES}
@@ -417,7 +432,8 @@ endif(MSVC)
#ENDIF(MINGW)
# Disable for all other compilers but MSVC
if (MSVC)
if (FREECAD_BUILD_FEM_NETGEN)
################
# NETGENPlugin #
################
@@ -442,7 +458,7 @@ else(MSVC)
set_target_properties(NETGENPlugin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin)
endif(MSVC)
endif (MSVC)
endif (FREECAD_BUILD_FEM_NETGEN)
#IF(WIN32)
# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ")

3
src/3rdParty/salomesmesh/inc/utilities.h vendored
View File

@@ -26,6 +26,9 @@
// Module : SALOME
// $Header: /home/server/cvs/KERNEL/KERNEL_SRC/src/SALOMELocalTrace/utilities.h,v 1.6.2.1 2007/01/22 13:51:27 prascle Exp $
// switch off massaging in release:
#define _NOMSG_
/* --- Definition macros file to print informations if _DEBUG_ or _DEBUG is defined --- */
#ifndef UTILITIES_H

4
src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp vendored
View File

@@ -50,7 +50,7 @@ using namespace std;
SMESH_Gen::SMESH_Gen()
{
MESSAGE("SMESH_Gen::SMESH_Gen");
//MESSAGE("SMESH_Gen::SMESH_Gen");
_localId = 0;
_hypId = 0;
_segmentation = 10;
@@ -64,7 +64,7 @@ SMESH_Gen::SMESH_Gen()
SMESH_Gen::~SMESH_Gen()
{
MESSAGE("SMESH_Gen::~SMESH_Gen");
//MESSAGE("SMESH_Gen::~SMESH_Gen");
}
//=============================================================================

4
src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp vendored
View File

@@ -86,7 +86,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
SMESHDS_Document* theDocument):
_groupId( 0 ), _nbSubShapes( 0 )
{
MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
//MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
_id = theLocalId;
_studyId = theStudyId;
_gen = theGen;
@@ -107,7 +107,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
SMESH_Mesh::~SMESH_Mesh()
{
INFOS("SMESH_Mesh::~SMESH_Mesh");
//INFOS("SMESH_Mesh::~SMESH_Mesh");
// issue 0020340: EDF 1022 SMESH : Crash with FindNodeClosestTo in a second new study
// Notify event listeners at least that something happens

2
src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp vendored
View File

@@ -107,7 +107,7 @@ SMESH_subMesh::SMESH_subMesh(int Id,
SMESH_subMesh::~SMESH_subMesh()
{
MESSAGE("SMESH_subMesh::~SMESH_subMesh");
//MESSAGE("SMESH_subMesh::~SMESH_subMesh");
// ****
DeleteOwnListeners();
}