From 4c6718ccd93cd83b0f4fe55148dbd40520bbbd00 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 23 Aug 2016 13:45:05 +0300 Subject: [PATCH] 23308: [EDF] Re-implement DISTENE meshing plugins to use libraries instead of executables --- CMakeLists.txt | 16 +- resources/HYBRIDPlugin.xml | 3 +- src/HYBRIDPlugin/CMakeLists.txt | 4 + src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx | 480 ++++---- src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx | 21 +- src/HYBRIDPlugin/MG_HYBRID_API.cxx | 1292 ++++++++++++++++++++++ src/HYBRIDPlugin/MG_HYBRID_API.hxx | 88 ++ 7 files changed, 1592 insertions(+), 312 deletions(-) create mode 100644 src/HYBRIDPlugin/MG_HYBRID_API.cxx create mode 100644 src/HYBRIDPlugin/MG_HYBRID_API.hxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e64af4..2c38431 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,8 @@ SET(BUILD_SHARED_LIBS TRUE) # ============ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME HYBRIDPLUGIN documentation" ON) +OPTION(SALOME_USE_MG_LIBS "Use MeshGems libraries" ON) +MARK_AS_ADVANCED(SALOME_USE_MG_LIBS) IF(SALOME_BUILD_TESTS) ENABLE_TESTING() @@ -79,7 +81,6 @@ ENDIF() # Advanced options: OPTION(SALOME_BUILD_GUI "Enable GUI" ON) - ## ## From KERNEL: ## @@ -166,9 +167,19 @@ IF(EXISTS ${SMESH_ROOT_DIR}) ELSE(EXISTS ${SMESH_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR") ENDIF(EXISTS ${SMESH_ROOT_DIR}) + # MEDFile FIND_PACKAGE(SalomeMEDFile REQUIRED) +# Find MESHGEMS +# ============= +IF(SALOME_USE_MG_LIBS) + FIND_PACKAGE(SalomeMESHGEMS) + SALOME_LOG_OPTIONAL_PACKAGE(MESHGEMS SALOME_USE_MG_LIBS) + ADD_DEFINITIONS(-DUSE_MG_LIBS) +ENDIF(SALOME_USE_MG_LIBS) + + # Detection summary: SALOME_PACKAGE_REPORT_AND_CHECK() @@ -258,6 +269,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} # Ensure the variables are always defined for the configure: SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}") +SET(MESHGEMS_ROOT_DIR "${MESHGEMS_ROOT_DIR}") SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") @@ -268,7 +280,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX - SMESH_ROOT_DIR) + SMESH_ROOT_DIR MESHGEMS_ROOT_DIR) WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} diff --git a/resources/HYBRIDPlugin.xml b/resources/HYBRIDPlugin.xml index 39e540a..7a642e9 100644 --- a/resources/HYBRIDPlugin.xml +++ b/resources/HYBRIDPlugin.xml @@ -59,12 +59,11 @@ icon-id="mesh_tree_hypo_hybrid.png" input="TRIA,QUAD" need-geom="false" - opt-hypos="HYBRID_Parameters, ViscousLayers" + opt-hypos="HYBRID_Parameters" dim="3"> HYBRID_3D=Tetrahedron(algo=smeshBuilder.HYBRID) HYBRID_Parameters=Parameters() - ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces()) diff --git a/src/HYBRIDPlugin/CMakeLists.txt b/src/HYBRIDPlugin/CMakeLists.txt index 2ac6d3f..caeb991 100644 --- a/src/HYBRIDPlugin/CMakeLists.txt +++ b/src/HYBRIDPlugin/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${GEOM_INCLUDE_DIRS} ${SMESH_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} + ${MESHGEMS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/idl @@ -46,6 +47,7 @@ SET(_link_LIBRARIES ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKCDF} + ${MESHGEMS_HYBRID_LIBRARY} ${SMESH_SMESHimpl} ${SMESH_SMESHEngine} ${SMESH_SMESHDS} @@ -69,6 +71,7 @@ SET(HYBRIDEngine_HEADERS HYBRIDPlugin_HYBRID_i.hxx HYBRIDPlugin_Hypothesis.hxx HYBRIDPlugin_Hypothesis_i.hxx + MG_HYBRID_API.hxx ) # --- sources --- @@ -80,6 +83,7 @@ SET(HYBRIDEngine_SOURCES HYBRIDPlugin_i.cxx HYBRIDPlugin_Hypothesis.cxx HYBRIDPlugin_Hypothesis_i.cxx + MG_HYBRID_API.cxx ) # --- scripts --- diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx index 4bd0a04..dfb1b40 100644 --- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx +++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx @@ -24,6 +24,7 @@ // #include "HYBRIDPlugin_HYBRID.hxx" #include "HYBRIDPlugin_Hypothesis.hxx" +#include "MG_HYBRID_API.hxx" #include #include @@ -31,16 +32,17 @@ #include #include #include +#include #include #include #include #include #include #include -#include +#include #include -#include -#include +// #include +// #include #include #include @@ -54,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -71,24 +72,14 @@ #include #include -#ifdef WIN32 -#include -#else -#include -#endif #include #define castToNode(n) static_cast( n ); -extern "C" -{ -#ifndef WIN32 -#include -#include +#ifndef GMFVERSION +#define GMFVERSION GmfDouble #endif -#include -#include -} +#define GMFDIMENSION 3 #define HOLE_ID -1 @@ -99,9 +90,9 @@ static const char theDomainGroupNamePrefix[] = "Domain_"; static void removeFile( const TCollection_AsciiString& fileName ) { try { - OSD_File( fileName ).Remove(); + SMESH_File( fileName.ToCString() ).remove(); } - catch ( Standard_ProgramError ) { + catch ( ... ) { MESSAGE("Can't remove file: " << fileName.ToCString() << " ; file does not exist or permission denied"); } } @@ -122,7 +113,7 @@ HYBRIDPlugin_HYBRID::HYBRIDPlugin_HYBRID(int hypId, int studyId, SMESH_Gen* gen) _iShape=0; _nbShape=0; _compatibleHypothesis.push_back( HYBRIDPlugin_Hypothesis::GetHypType()); - _compatibleHypothesis.push_back( StdMeshers_ViscousLayers::GetHypType() ); + //_compatibleHypothesis.push_back( StdMeshers_ViscousLayers::GetHypType() ); _requireShape = false; // can work without shape_studyId smeshGen_i = SMESH_Gen_i::GetSMESHGen(); @@ -133,10 +124,10 @@ HYBRIDPlugin_HYBRID::HYBRIDPlugin_HYBRID(int hypId, int studyId, SMESH_Gen* gen) myStudy = NULL; myStudy = aStudyMgr->GetStudyByID(_studyId); - if (myStudy) + if (!myStudy->_is_nil()) MESSAGE("myStudy->StudyId() = " << myStudy->StudyId()); - _compute_canceled = false; + _computeCanceled = false; } //============================================================================= @@ -163,7 +154,7 @@ bool HYBRIDPlugin_HYBRID::CheckHypothesis ( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; _hyp = 0; - _viscousLayersHyp = 0; + //_viscousLayersHyp = 0; _keepFiles = false; _removeLogOnSuccess = true; _logInStandardOutput = false; @@ -175,8 +166,8 @@ bool HYBRIDPlugin_HYBRID::CheckHypothesis ( SMESH_Mesh& aMesh, { if ( !_hyp ) _hyp = dynamic_cast< const HYBRIDPlugin_Hypothesis*> ( *h ); - if ( !_viscousLayersHyp ) - _viscousLayersHyp = dynamic_cast< const StdMeshers_ViscousLayers*> ( *h ); + // if ( !_viscousLayersHyp ) + // _viscousLayersHyp = dynamic_cast< const StdMeshers_ViscousLayers*> ( *h ); } if ( _hyp ) { @@ -197,6 +188,8 @@ bool HYBRIDPlugin_HYBRID::CheckHypothesis ( SMESH_Mesh& aMesh, TopoDS_Shape HYBRIDPlugin_HYBRID::entryToShape(std::string entry) { MESSAGE("HYBRIDPlugin_HYBRID::entryToShape "<_is_nil() ) + throw SALOME_Exception("MG-HYBRID plugin can't work w/o publishing in the study"); GEOM::GEOM_Object_var aGeomObj; TopoDS_Shape S = TopoDS_Shape(); SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() ); @@ -615,8 +608,9 @@ static void makeDomainGroups( std::vector< std::vector< const SMDS_MeshElement* //purpose : read GMF file w/o geometry associated to mesh //======================================================================= -static bool readGMFFile(const char* theFile, - HYBRIDPlugin_HYBRID* theAlgo, +static bool readGMFFile(MG_HYBRID_API* MGOutput, + const char* theFile, + HYBRIDPlugin_HYBRID* theAlgo, SMESH_MesherHelper* theHelper, std::vector & theNodeByHybridId, std::vector & theFaceByHybridId, @@ -652,7 +646,7 @@ static bool readGMFFile(const char* theFile, int nbElem = 0, nbRef = 0; int aGMFNodeID = 0; - const SMDS_MeshNode** GMFNode; + std::vector< const SMDS_MeshNode* > GMFNode; #ifdef _DEBUG_ std::map > subdomainId2tetraId; #endif @@ -672,7 +666,7 @@ static bool readGMFFile(const char* theFile, int ver, dim; MESSAGE("Read " << theFile << " file"); - int InpMsh = GmfOpenMesh(theFile, GmfRead, &ver, &dim); + int InpMsh = MGOutput->GmfOpenMesh(theFile, GmfRead, &ver, &dim); if (!InpMsh) return false; MESSAGE("Done "); @@ -700,24 +694,25 @@ static bool readGMFFile(const char* theFile, // IMP 0022172: [CEA 790] create the groups corresponding to domains std::vector< std::vector< const SMDS_MeshElement* > > elemsOfDomain; - int nbVertices = GmfStatKwd(InpMsh, GmfVertices) - nbInitialNodes; - GMFNode = new const SMDS_MeshNode*[ nbVertices + 1 ]; + int nbVertices = MGOutput->GmfStatKwd(InpMsh, GmfVertices) - nbInitialNodes; + if ( nbVertices < 0 ) + return false; + GMFNode.resize( nbVertices + 1 ); std::map ::const_iterator it = tabRef.begin(); for ( ; it != tabRef.end() ; ++it) { if(theAlgo->computeCanceled()) { - GmfCloseMesh(InpMsh); - delete [] GMFNode; + MGOutput->GmfCloseMesh(InpMsh); return false; } int dummy; GmfKwdCod token = it->first; nbRef = it->second; - nbElem = GmfStatKwd(InpMsh, token); + nbElem = MGOutput->GmfStatKwd(InpMsh, token); if (nbElem > 0) { - GmfGotoKwd(InpMsh, token); + MGOutput->GmfGotoKwd(InpMsh, token); std::cout << "Read " << nbElem; } else @@ -728,41 +723,25 @@ static bool readGMFFile(const char* theFile, if (token == GmfVertices) { (nbElem <= 1) ? tmpStr = " vertex" : tmpStr = " vertices"; -// std::cout << nbInitialNodes << " from input mesh " << std::endl; - - // Remove orphan nodes from previous enforced mesh which was cleared -// if ( nbElem < nbMeshNodes ) { -// const SMDS_MeshNode* node; -// SMDS_NodeIteratorPtr nodeIt = theMeshDS->nodesIterator(); -// while ( nodeIt->more() ) -// { -// node = nodeIt->next(); -// if (theNodeToHybridIdMap.find(node) != theNodeToHybridIdMap.end()) -// theMeshDS->RemoveNode(node); -// } -// } - int aGMFID; - float VerTab_f[3]; double x, y, z; const SMDS_MeshNode * aGMFNode; for ( int iElem = 0; iElem < nbElem; iElem++ ) { if(theAlgo->computeCanceled()) { - GmfCloseMesh(InpMsh); - delete [] GMFNode; + MGOutput->GmfCloseMesh(InpMsh); return false; } if (ver == GmfFloat) { - GmfGetLin(InpMsh, token, &VerTab_f[0], &VerTab_f[1], &VerTab_f[2], &dummy); + MGOutput->GmfGetLin(InpMsh, token, &VerTab_f[0], &VerTab_f[1], &VerTab_f[2], &dummy); x = VerTab_f[0]; y = VerTab_f[1]; z = VerTab_f[2]; } else { - GmfGetLin(InpMsh, token, &x, &y, &z, &dummy); + MGOutput->GmfGetLin(InpMsh, token, &x, &y, &z, &dummy); } if (iElem >= nbInitialNodes) { if ( elemSearcher && @@ -781,32 +760,32 @@ static bool readGMFFile(const char* theFile, else if (token == GmfCorners && nbElem > 0) { (nbElem <= 1) ? tmpStr = " corner" : tmpStr = " corners"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]]); } else if (token == GmfRidges && nbElem > 0) { (nbElem <= 1) ? tmpStr = " ridge" : tmpStr = " ridges"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]]); } else if (token == GmfEdges && nbElem > 0) { (nbElem <= 1) ? tmpStr = " edge" : tmpStr = " edges"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &domainID[iElem]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &domainID[iElem]); } else if (token == GmfTriangles && nbElem > 0) { (nbElem <= 1) ? tmpStr = " triangle" : tmpStr = " triangles"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &domainID[iElem]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &domainID[iElem]); } else if (token == GmfQuadrilaterals && nbElem > 0) { (nbElem <= 1) ? tmpStr = " Quadrilateral" : tmpStr = " Quadrilaterals"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &domainID[iElem]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &domainID[iElem]); } else if (token == GmfTetrahedra && nbElem > 0) { (nbElem <= 1) ? tmpStr = " Tetrahedron" : tmpStr = " Tetrahedra"; for ( int iElem = 0; iElem < nbElem; iElem++ ) { - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &domainID[iElem]); + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &domainID[iElem]); #ifdef _DEBUG_ subdomainId2tetraId[dummy].insert(iElem+1); // MESSAGE("subdomainId2tetraId["< 0) { (nbElem <= 1) ? tmpStr = " Prism" : tmpStr = " Prisms"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &id[iElem*tabRef[token]+4], &id[iElem*tabRef[token]+5], &domainID[iElem]); } else if (token == GmfHexahedra && nbElem > 0) { (nbElem <= 1) ? tmpStr = " Hexahedron" : tmpStr = " Hexahedra"; for ( int iElem = 0; iElem < nbElem; iElem++ ) - GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], + MGOutput->GmfGetLin(InpMsh, token, &id[iElem*tabRef[token]], &id[iElem*tabRef[token]+1], &id[iElem*tabRef[token]+2], &id[iElem*tabRef[token]+3], &id[iElem*tabRef[token]+4], &id[iElem*tabRef[token]+5], &id[iElem*tabRef[token]+6], &id[iElem*tabRef[token]+7], &domainID[iElem]); } std::cout << tmpStr << std::endl; @@ -846,8 +825,7 @@ static bool readGMFFile(const char* theFile, for ( int iElem = 0; iElem < nbElem; iElem++ ) { if(theAlgo->computeCanceled()) { - GmfCloseMesh(InpMsh); - delete [] GMFNode; + MGOutput->GmfCloseMesh(InpMsh); return false; } // Check if elem is already in input mesh. If yes => skip @@ -1018,8 +996,7 @@ static bool readGMFFile(const char* theFile, theMeshDS->RemoveFreeNode( GMFNode[i], /*sm=*/0, /*fromGroups=*/false ); } - GmfCloseMesh(InpMsh); - delete [] GMFNode; + MGOutput->GmfCloseMesh(InpMsh); // 0022172: [CEA 790] create the groups corresponding to domains if ( toMakeGroupsOfDomains ) @@ -1051,7 +1028,8 @@ static bool readGMFFile(const char* theFile, } -static bool writeGMFFile(const char* theMeshFileName, +static bool writeGMFFile(MG_HYBRID_API* MGInput, + const char* theMeshFileName, const char* theRequiredFileName, const char* theSolFileName, const SMESH_ProxyMesh& theProxyMesh, @@ -1112,7 +1090,7 @@ static bool writeGMFFile(const char* theMesh if ( nbFaces == 0 ) return false; - idx = GmfOpenMesh(theMeshFileName, GmfWrite, GMFVERSION, GMFDIMENSION); + idx = MGInput->GmfOpenMesh(theMeshFileName, GmfWrite, GMFVERSION, GMFDIMENSION); if (!idx) return false; @@ -1454,9 +1432,9 @@ static bool writeGMFFile(const char* theMesh // GmfVertices std::cout << "Begin writing required nodes in GmfVertices" << std::endl; std::cout << "Nb vertices: " << theOrderedNodes.size() << std::endl; - GmfSetKwd(idx, GmfVertices, theOrderedNodes.size()); //theOrderedNodes.size()+solSize) + MGInput->GmfSetKwd(idx, GmfVertices, theOrderedNodes.size()); //theOrderedNodes.size()+solSize) for (hybridNodeIt = theOrderedNodes.begin();hybridNodeIt != theOrderedNodes.end();++hybridNodeIt) { - GmfSetLin(idx, GmfVertices, (*hybridNodeIt)->X(), (*hybridNodeIt)->Y(), (*hybridNodeIt)->Z(), dummyint1); + MGInput->GmfSetLin(idx, GmfVertices, (*hybridNodeIt)->X(), (*hybridNodeIt)->Y(), (*hybridNodeIt)->Z(), dummyint1); } std::cout << "End writing required nodes in GmfVertices" << std::endl; @@ -1464,27 +1442,27 @@ static bool writeGMFFile(const char* theMesh if (requiredNodes + solSize) { std::cout << "Begin writing in req and sol file" << std::endl; aNodeGroupByHybridId.resize( requiredNodes + solSize ); - idxRequired = GmfOpenMesh(theRequiredFileName, GmfWrite, GMFVERSION, GMFDIMENSION); + idxRequired = MGInput->GmfOpenMesh(theRequiredFileName, GmfWrite, GMFVERSION, GMFDIMENSION); if (!idxRequired) { - GmfCloseMesh(idx); + MGInput->GmfCloseMesh(idx); return false; } - idxSol = GmfOpenMesh(theSolFileName, GmfWrite, GMFVERSION, GMFDIMENSION); + idxSol = MGInput->GmfOpenMesh(theSolFileName, GmfWrite, GMFVERSION, GMFDIMENSION); if (!idxSol) { - GmfCloseMesh(idx); + MGInput->GmfCloseMesh(idx); if (idxRequired) - GmfCloseMesh(idxRequired); + MGInput->GmfCloseMesh(idxRequired); return false; } int TypTab[] = {GmfSca}; double ValTab[] = {0.0}; - GmfSetKwd(idxRequired, GmfVertices, requiredNodes + solSize); - GmfSetKwd(idxSol, GmfSolAtVertices, requiredNodes + solSize, 1, TypTab); + MGInput->GmfSetKwd(idxRequired, GmfVertices, requiredNodes + solSize); + MGInput->GmfSetKwd(idxSol, GmfSolAtVertices, requiredNodes + solSize, 1, TypTab); // int usedEnforcedNodes = 0; // std::string gn = ""; for (hybridNodeIt = theRequiredNodes.begin();hybridNodeIt != theRequiredNodes.end();++hybridNodeIt) { - GmfSetLin(idxRequired, GmfVertices, (*hybridNodeIt)->X(), (*hybridNodeIt)->Y(), (*hybridNodeIt)->Z(), dummyint2); - GmfSetLin(idxSol, GmfSolAtVertices, ValTab); + MGInput->GmfSetLin(idxRequired, GmfVertices, (*hybridNodeIt)->X(), (*hybridNodeIt)->Y(), (*hybridNodeIt)->Z(), dummyint2); + MGInput->GmfSetLin(idxSol, GmfSolAtVertices, ValTab); if (theEnforcedNodes.find((*hybridNodeIt)) != theEnforcedNodes.end()) gn = theEnforcedNodes.find((*hybridNodeIt))->second; aNodeGroupByHybridId[usedEnforcedNodes] = gn; @@ -1497,8 +1475,8 @@ static bool writeGMFFile(const char* theMesh std::cout << "enfVertexSizes.at("<GmfSetLin(idxRequired, GmfVertices, ReqVerTab[i][0], ReqVerTab[i][1], ReqVerTab[i][2], dummyint3); + MGInput->GmfSetLin(idxSol, GmfSolAtVertices, solTab); aNodeGroupByHybridId[usedEnforcedNodes] = enfVerticesWithGroup.find(ReqVerTab[i])->second; #ifdef _DEBUG_ std::cout << "aNodeGroupByHybridId["<GmfOpenMesh(theRequiredFileName, GmfWrite, GMFVERSION, GMFDIMENSION); // if (!idxRequired) // return false; - GmfSetKwd(idx, GmfEdges, theKeptEnforcedEdges.size()); -// GmfSetKwd(idxRequired, GmfEdges, theKeptEnforcedEdges.size()); + MGInput->GmfSetKwd(idx, GmfEdges, theKeptEnforcedEdges.size()); +// MGInput->GmfSetKwd(idxRequired, GmfEdges, theKeptEnforcedEdges.size()); for(elemSetIt = theKeptEnforcedEdges.begin() ; elemSetIt != theKeptEnforcedEdges.end() ; ++elemSetIt) { elem = (*elemSetIt); nodeIt = elem->nodesIterator(); @@ -1535,19 +1513,19 @@ static bool writeGMFFile(const char* theMesh nedge[index] = it->second; index++; } - GmfSetLin(idx, GmfEdges, nedge[0], nedge[1], dummyint4); + MGInput->GmfSetLin(idx, GmfEdges, nedge[0], nedge[1], dummyint4); anEdgeGroupByHybridId[usedEnforcedEdges] = theEnforcedEdges.find(elem)->second; -// GmfSetLin(idxRequired, GmfEdges, nedge[0], nedge[1], dummyint); +// MGInput->GmfSetLin(idxRequired, GmfEdges, nedge[0], nedge[1], dummyint); usedEnforcedEdges++; } -// GmfCloseMesh(idxRequired); +// MGInput->GmfCloseMesh(idxRequired); } if (usedEnforcedEdges) { - GmfSetKwd(idx, GmfRequiredEdges, usedEnforcedEdges); + MGInput->GmfSetKwd(idx, GmfRequiredEdges, usedEnforcedEdges); for (int enfID=1;enfID<=usedEnforcedEdges;enfID++) { - GmfSetLin(idx, GmfRequiredEdges, enfID); + MGInput->GmfSetLin(idx, GmfRequiredEdges, enfID); } } @@ -1555,7 +1533,7 @@ static bool writeGMFFile(const char* theMesh int usedEnforcedTriangles = 0; if (anElemSet.size()+theKeptEnforcedTriangles.size()) { aFaceGroupByHybridId.resize( anElemSet.size()+theKeptEnforcedTriangles.size() ); - GmfSetKwd(idx, GmfTriangles, anElemSet.size()+theKeptEnforcedTriangles.size()); + MGInput->GmfSetKwd(idx, GmfTriangles, anElemSet.size()+theKeptEnforcedTriangles.size()); int k=0; for(elemSetIt = anElemSet.begin() ; elemSetIt != anElemSet.end() ; ++elemSetIt,++k) { elem = (*elemSetIt); @@ -1571,7 +1549,7 @@ static bool writeGMFFile(const char* theMesh ntri[index] = it->second; index++; } - GmfSetLin(idx, GmfTriangles, ntri[0], ntri[1], ntri[2], dummyint5); + MGInput->GmfSetLin(idx, GmfTriangles, ntri[0], ntri[1], ntri[2], dummyint5); aFaceGroupByHybridId[k] = ""; } @@ -1594,7 +1572,7 @@ static bool writeGMFFile(const char* theMesh ntri[index] = it->second; index++; } - GmfSetLin(idx, GmfTriangles, ntri[0], ntri[1], ntri[2], dummyint6); + MGInput->GmfSetLin(idx, GmfTriangles, ntri[0], ntri[1], ntri[2], dummyint6); aFaceGroupByHybridId[k] = theEnforcedTriangles.find(elem)->second; usedEnforcedTriangles++; } @@ -1603,16 +1581,16 @@ static bool writeGMFFile(const char* theMesh if (usedEnforcedTriangles) { - GmfSetKwd(idx, GmfRequiredTriangles, usedEnforcedTriangles); + MGInput->GmfSetKwd(idx, GmfRequiredTriangles, usedEnforcedTriangles); for (int enfID=1;enfID<=usedEnforcedTriangles;enfID++) - GmfSetLin(idx, GmfRequiredTriangles, anElemSet.size()+enfID); + MGInput->GmfSetLin(idx, GmfRequiredTriangles, anElemSet.size()+enfID); } - GmfCloseMesh(idx); + MGInput->GmfCloseMesh(idx); if (idxRequired) - GmfCloseMesh(idxRequired); + MGInput->GmfCloseMesh(idxRequired); if (idxSol) - GmfCloseMesh(idxSol); + MGInput->GmfCloseMesh(idxSol); return true; @@ -2838,37 +2816,7 @@ static bool writeGMFFile(const char* theMesh bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape) { - bool Ok(false); - //SMESHDS_Mesh* meshDS = theMesh.GetMeshDS(); - - // we count the number of shapes - // _nbShape = countShape( meshDS, TopAbs_SOLID ); -- 0020330: Pb with hybrid as a submesh - // _nbShape = 0; - TopExp_Explorer expBox ( theShape, TopAbs_SOLID ); - // for ( ; expBox.More(); expBox.Next() ) - // _nbShape++; - - // create bounding box for every shape inside the compound - - // int iShape = 0; - // TopoDS_Shape* tabShape; - // double** tabBox; - // tabShape = new TopoDS_Shape[_nbShape]; - // tabBox = new double*[_nbShape]; - // for (int i=0; i<_nbShape; i++) - // tabBox[i] = new double[6]; - // Standard_Real Xmin, Ymin, Zmin, Xmax, Ymax, Zmax; - - // for (expBox.ReInit(); expBox.More(); expBox.Next()) { - // tabShape[iShape] = expBox.Current(); - // Bnd_Box BoundingBox; - // BRepBndLib::Add(expBox.Current(), BoundingBox); - // BoundingBox.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); - // tabBox[iShape][0] = Xmin; tabBox[iShape][1] = Xmax; - // tabBox[iShape][2] = Ymin; tabBox[iShape][3] = Ymax; - // tabBox[iShape][4] = Zmin; tabBox[iShape][5] = Zmax; - // iShape++; - // } + bool Ok = false; // a unique working file name // to avoid access to the same files by eg different users @@ -2963,7 +2911,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, std::cout << nbEnforcedNodes << " enforced " << tmpStr << " from hypo" << std::endl; (nbEnforcedVertices <= 1) ? tmpStr = "vertex" : "vertices"; std::cout << nbEnforcedVertices << " enforced " << tmpStr << " from hypo" << std::endl; - + SMESH_MesherHelper helper( theMesh ); helper.SetSubShape( theShape ); @@ -2971,50 +2919,20 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, std::vector aFaceByHybridId; std::map aNodeToHybridIdMap; std::vector aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId; - { - SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); - // make prisms on quadrangles - if ( theMesh.NbQuadrangles() > 0 ) - { - std::vector components; - for (expBox.ReInit(); expBox.More(); expBox.Next()) - { - if ( _viscousLayersHyp ) - { - proxyMesh = _viscousLayersHyp->Compute( theMesh, expBox.Current() ); - if ( !proxyMesh ) - return false; - } - StdMeshers_QuadToTriaAdaptor* q2t = new StdMeshers_QuadToTriaAdaptor; - q2t->Compute( theMesh, expBox.Current(), proxyMesh.get() ); - components.push_back( SMESH_ProxyMesh::Ptr( q2t )); - } - proxyMesh.reset( new SMESH_ProxyMesh( components )); - } - // build viscous layers - else if ( _viscousLayersHyp ) - { - proxyMesh = _viscousLayersHyp->Compute( theMesh, theShape ); - if ( !proxyMesh ) - return false; - } + SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); - // Ok = (writePoints( aPointsFile, helper, - // aSmdsToHybridIdMap, anEnforcedNodeIdToHybridIdMap, aHybridIdToNodeMap, - // nodeIDToSizeMap, - // coordsSizeMap, enforcedNodes, enforcedEdges, enforcedTriangles) - // && - // writeFaces ( aFacesFile, *proxyMesh, theShape, - // aSmdsToHybridIdMap, anEnforcedNodeIdToHybridIdMap, - // enforcedEdges, enforcedTriangles )); - Ok = writeGMFFile(aGMFFileName.ToCString(), aRequiredVerticesFileName.ToCString(), aSolFileName.ToCString(), - *proxyMesh, helper, - aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, - aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, - enforcedNodes, enforcedEdges, enforcedTriangles, /*enforcedQuadrangles,*/ - enfVerticesWithGroup, coordsSizeMap); - } + MG_HYBRID_API mgHybrid( _computeCanceled, _progress ); + + Ok = writeGMFFile(&mgHybrid, + aGMFFileName.ToCString(), + aRequiredVerticesFileName.ToCString(), + aSolFileName.ToCString(), + *proxyMesh, helper, + aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, + aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, + enforcedNodes, enforcedEdges, enforcedTriangles, /*enforcedQuadrangles,*/ + enfVerticesWithGroup, coordsSizeMap); // Write aSmdsToHybridIdMap to temp file TCollection_AsciiString aSmdsToHybridIdMapFileName; @@ -3033,7 +2951,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, } aIdsFile.close(); - + if ( ! Ok ) { if ( !_keepFiles ) { removeFile( aGMFFileName ); @@ -3050,24 +2968,35 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, // ----------------- TCollection_AsciiString cmd( (char*)HYBRIDPlugin_Hypothesis::CommandToRun( _hyp ).c_str() ); - - cmd += TCollection_AsciiString(" --in ") + aGMFFileName; - //if ( nbEnforcedVertices + nbEnforcedNodes) - // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; - cmd += TCollection_AsciiString(" --out ") + aResultFileName; - if ( !_logInStandardOutput ) - cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file + if ( mgHybrid.IsExecutable() ) + { + cmd += TCollection_AsciiString(" --in ") + aGMFFileName; + //if ( nbEnforcedVertices + nbEnforcedNodes) + // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; + cmd += TCollection_AsciiString(" --out ") + aResultFileName; + } std::cout << std::endl; std::cout << "Hybrid execution with geometry..." << std::endl; - std::cout << cmd << std::endl; + std::cout << cmd; + if ( !_logInStandardOutput ) + { + mgHybrid.SetLogFile( aLogFileName.ToCString() ); + if ( mgHybrid.IsExecutable() ) + cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file + std::cout << " 1> " << aLogFileName; + } + std::cout << std::endl; - _compute_canceled = false; + _computeCanceled = false; - system( cmd.ToCString() ); // run + std::string errStr; + Ok = mgHybrid.Compute( cmd.ToCString(), errStr ); // run - std::cout << std::endl; - std::cout << "End of Hybrid execution !" << std::endl; + if ( _logInStandardOutput && mgHybrid.IsLibrary() ) + std::cout << std::endl << mgHybrid.GetLog() << std::endl; + if ( Ok ) + std::cout << "End of Hybrid execution !" << std::endl; // -------------- // read a result @@ -3075,15 +3004,6 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, // Mapping the result file - // int fileOpen; - // fileOpen = open( aResultFileName.ToCString(), O_RDONLY); - // if ( fileOpen < 0 ) { - // std::cout << std::endl; - // std::cout << "Can't open the " << aResultFileName.ToCString() << " HYBRID output file" << std::endl; - // std::cout << "Log: " << aLogFileName << std::endl; - // Ok = false; - // } - // else { HYBRIDPlugin_Hypothesis::TSetStrings groupsToRemove = HYBRIDPlugin_Hypothesis::GetGroupsToRemove(_hyp); bool toMeshHoles = _hyp ? _hyp->GetToMeshHoles(true) : HYBRIDPlugin_Hypothesis::DefaultMeshHoles(); @@ -3091,28 +3011,14 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, helper.IsQuadraticSubMesh( theShape ); helper.SetElementsOnShape( false ); - -// Ok = readResultFile( fileOpen, -// #ifdef WIN32 -// aResultFileName.ToCString(), -// #endif -// this, //theMesh, -// helper, tabShape, tabBox, _nbShape, -// aHybridIdToNodeMap, aNodeId2NodeIndexMap, -// toMeshHoles, -// nbEnforcedVertices, nbEnforcedNodes, -// enforcedEdges, enforcedTriangles, -// toMakeGroupsOfDomains ); - - Ok = readGMFFile(aResultFileName.ToCString(), + + Ok = readGMFFile(&mgHybrid, aResultFileName.ToCString(), this, &helper, aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, groupsToRemove, toMakeGroupsOfDomains, toMeshHoles); - //removeEmptyGroupsOfDomains( helper.GetMesh(), notEmptyAsWell ); removeEmptyGroupsOfDomains( helper.GetMesh(), !toMakeGroupsOfDomains ); - //} @@ -3129,22 +3035,23 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, // if ( _hyp && _hyp->GetToMakeGroupsOfDomains() ) // error( COMPERR_WARNING, "'toMakeGroupsOfDomains' is ignored since the mesh is on shape" ); } - else if ( OSD_File( aLogFileName ).Size() > 0 ) + else if ( mgHybrid.HasLog() ) { // get problem description from the log file _Ghs2smdsConvertor conv( aNodeByHybridId ); - storeErrorDescription( aLogFileName, conv ); + storeErrorDescription( _logInStandardOutput ? 0 : aLogFileName.ToCString(), + mgHybrid.GetLog(), conv ); } - else + else if ( !errStr.empty() ) { // the log file is empty removeFile( aLogFileName ); - INFOS( "HYBRID Error, command '" << cmd.ToCString() << "' failed" ); - error(COMPERR_ALGO_FAILED, "hybrid: command not found" ); + INFOS( "HYBRID Error, " << errStr ); + error(COMPERR_ALGO_FAILED, errStr ); } if ( !_keepFiles ) { - if (! Ok && _compute_canceled) + if (! Ok && _computeCanceled) removeFile( aLogFileName ); removeFile( aGMFFileName ); removeFile( aRequiredVerticesFileName ); @@ -3153,15 +3060,18 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, removeFile( aResultFileName ); removeFile( aSmdsToHybridIdMapFileName ); } - std::cout << "<" << aResultFileName.ToCString() << "> HYBRID output file "; - if ( !Ok ) - std::cout << "not "; - std::cout << "treated !" << std::endl; - std::cout << std::endl; - - // _nbShape = 0; // re-initializing _nbShape for the next Compute() method call - // delete [] tabShape; - // delete [] tabBox; + if ( mgHybrid.IsExecutable() ) + { + std::cout << "<" << aResultFileName.ToCString() << "> HYBRID output file "; + if ( !Ok ) + std::cout << "not "; + std::cout << "treated !" << std::endl; + std::cout << std::endl; + } + else + { + std::cout << "MG-HYBRID " << ( Ok ? "succeeded" : "failed") << std::endl; + } return Ok; } @@ -3295,46 +3205,51 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, std::vector aFaceByHybridId; std::map aNodeToHybridIdMap; std::vector aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId; - { - SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); - if ( theMesh.NbQuadrangles() > 0 ) - { - StdMeshers_QuadToTriaAdaptor* aQuad2Trias = new StdMeshers_QuadToTriaAdaptor; - aQuad2Trias->Compute( theMesh ); - proxyMesh.reset( aQuad2Trias ); - } - Ok = writeGMFFile(aGMFFileName.ToCString(), aRequiredVerticesFileName.ToCString(), aSolFileName.ToCString(), - *proxyMesh, *theHelper, - aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, - aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, - enforcedNodes, enforcedEdges, enforcedTriangles, - enfVerticesWithGroup, coordsSizeMap); - } + SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); + + MG_HYBRID_API mgHybrid( _computeCanceled, _progress ); + + Ok = writeGMFFile(&mgHybrid, + aGMFFileName.ToCString(), + aRequiredVerticesFileName.ToCString(), aSolFileName.ToCString(), + *proxyMesh, *theHelper, + aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, + aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, + enforcedNodes, enforcedEdges, enforcedTriangles, + enfVerticesWithGroup, coordsSizeMap); // ----------------- // run hybrid mesher // ----------------- - TCollection_AsciiString cmd = TCollection_AsciiString((char*)HYBRIDPlugin_Hypothesis::CommandToRun( _hyp, false ).c_str()); + TCollection_AsciiString cmd = HYBRIDPlugin_Hypothesis::CommandToRun( _hyp, false ).c_str(); - cmd += TCollection_AsciiString(" --in ") + aGMFFileName; - //if ( nbEnforcedVertices + nbEnforcedNodes) - // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; - cmd += TCollection_AsciiString(" --out ") + aResultFileName; + if ( mgHybrid.IsExecutable() ) + { + cmd += TCollection_AsciiString(" --in ") + aGMFFileName; + //if ( nbEnforcedVertices + nbEnforcedNodes) + // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; + cmd += TCollection_AsciiString(" --out ") + aResultFileName; + } if ( !_logInStandardOutput ) + { cmd += TCollection_AsciiString(" 1> " ) + aLogFileName; // dump into file - + mgHybrid.SetLogFile( aLogFileName.ToCString() ); + } std::cout << std::endl; std::cout << "Hybrid execution w/o geometry..." << std::endl; std::cout << cmd << std::endl; - _compute_canceled = false; + _computeCanceled = false; - system( cmd.ToCString() ); // run + std::string errStr; + Ok = mgHybrid.Compute( cmd.ToCString(), errStr ); // run - std::cout << std::endl; - std::cout << "End of Hybrid execution !" << std::endl; + if ( _logInStandardOutput && mgHybrid.IsLibrary() ) + std::cout << std::endl << mgHybrid.GetLog() << std::endl; + if ( Ok ) + std::cout << "End of Hybrid execution !" << std::endl; // -------------- // read a result @@ -3342,7 +3257,8 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, HYBRIDPlugin_Hypothesis::TSetStrings groupsToRemove = HYBRIDPlugin_Hypothesis::GetGroupsToRemove(_hyp); const bool toMakeGroupsOfDomains = HYBRIDPlugin_Hypothesis::GetToMakeGroupsOfDomains( _hyp ); - Ok = readGMFFile(aResultFileName.ToCString(), + Ok = readGMFFile(&mgHybrid, + aResultFileName.ToCString(), this, theHelper, aNodeByHybridId, aFaceByHybridId, aNodeToHybridIdMap, aNodeGroupByHybridId, anEdgeGroupByHybridId, aFaceGroupByHybridId, @@ -3369,11 +3285,12 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, //if ( !toMakeGroupsOfDomains && _hyp && _hyp->GetToMakeGroupsOfDomains() ) //error( COMPERR_WARNING, "'toMakeGroupsOfDomains' is ignored since 'toMeshHoles' is OFF." ); } - else if ( OSD_File( aLogFileName ).Size() > 0 ) + else if ( mgHybrid.HasLog() ) { // get problem description from the log file _Ghs2smdsConvertor conv( aNodeByHybridId ); - storeErrorDescription( aLogFileName, conv ); + storeErrorDescription( _logInStandardOutput ? 0 : aLogFileName.ToCString(), + mgHybrid.GetLog(), conv ); } else { // the log file is empty @@ -3384,7 +3301,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, if ( !_keepFiles ) { - if (! Ok && _compute_canceled) + if (! Ok && _computeCanceled) removeFile( aLogFileName ); removeFile( aGMFFileName ); removeFile( aResultFileName ); @@ -3397,7 +3314,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, void HYBRIDPlugin_HYBRID::CancelCompute() { - _compute_canceled = true; + _computeCanceled = true; #ifdef WIN32 #else std::string cmd = "ps xo pid,args | grep " + _genericName; @@ -3451,30 +3368,15 @@ static char* getIds( char* ptr, int nbIds, std::vector& ids ) */ //================================================================================ -bool HYBRIDPlugin_HYBRID::storeErrorDescription(const TCollection_AsciiString& logFile, - const _Ghs2smdsConvertor & toSmdsConvertor ) +bool HYBRIDPlugin_HYBRID::storeErrorDescription(const char* logFile, + const std::string& log, + const _Ghs2smdsConvertor & toSmdsConvertor ) { - if(_compute_canceled) + if(_computeCanceled) return error(SMESH_Comment("interruption initiated by user")); - // open file -#ifdef WIN32 - int file = ::_open (logFile.ToCString(), _O_RDONLY|_O_BINARY); -#else - int file = ::open (logFile.ToCString(), O_RDONLY); -#endif - if ( file < 0 ) - return error( SMESH_Comment("See ") << logFile << " for problem description"); - // get file size - off_t length = lseek( file, 0, SEEK_END); - lseek( file, 0, SEEK_SET); - - // read file - std::vector< char > buf( length ); - int nBytesRead = ::read (file, & buf[0], length); - ::close (file); - char* ptr = & buf[0]; - char* bufEnd = ptr + nBytesRead; + char* ptr = const_cast( log.c_str() ); + char* buf = ptr, * bufEnd = ptr + log.size(); SMESH_Comment errDescription; @@ -3713,11 +3615,13 @@ bool HYBRIDPlugin_HYBRID::storeErrorDescription(const TCollection_AsciiString& l } } - if ( errDescription.empty() ) - errDescription << "See " << logFile << " for problem description"; - else - errDescription << "\nSee " << logFile << " for more information"; - + if ( logFile && logFile[0] ) + { + if ( errDescription.empty() ) + errDescription << "See " << logFile << " for problem description"; + else + errDescription << "\nSee " << logFile << " for more information"; + } return error( errDescription ); } @@ -3871,19 +3775,11 @@ bool HYBRIDPlugin_HYBRID::Evaluate(SMESH_Mesh& aMesh, bool HYBRIDPlugin_HYBRID::importGMFMesh(const char* theGMFFileName, SMESH_Mesh& theMesh) { - SMESH_MesherHelper* helper = new SMESH_MesherHelper(theMesh ); - std::vector dummyNodeVector; - std::vector aFaceByHybridId; - std::map dummyNodeMap; - std::map, std::string> dummyEnfVertGroup; - std::vector dummyElemGroup; - std::set dummyGroupsToRemove; - - bool ok = readGMFFile(theGMFFileName, - this, - helper, dummyNodeVector, aFaceByHybridId, dummyNodeMap, dummyElemGroup, dummyElemGroup, dummyElemGroup, dummyGroupsToRemove); + SMESH_ComputeErrorPtr err = theMesh.GMFToMesh( theGMFFileName, /*makeRequiredGroups =*/ true ); + theMesh.GetMeshDS()->Modified(); - return ok; + + return ( !err || err->IsOK()); } namespace diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx index 8608757..face76b 100644 --- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx +++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx @@ -32,16 +32,6 @@ #include #include -extern "C" -{ - #include "libmesh5.h" -} - -#ifndef GMFVERSION -#define GMFVERSION GmfDouble -#endif -#define GMFDIMENSION 3 - class HYBRIDPlugin_Hypothesis; class SMDS_MeshNode; class SMESH_Mesh; @@ -64,7 +54,7 @@ public: const TopoDS_Shape& aShape); virtual void CancelCompute(); - bool computeCanceled() { return _compute_canceled;}; + bool computeCanceled() { return _computeCanceled; } virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, MapShapeNbElems& aResMap); @@ -82,13 +72,14 @@ public: protected: const HYBRIDPlugin_Hypothesis* _hyp; - const StdMeshers_ViscousLayers* _viscousLayersHyp; + //const StdMeshers_ViscousLayers* _viscousLayersHyp; std::string _genericName; private: - bool storeErrorDescription(const TCollection_AsciiString& logFile, - const _Ghs2smdsConvertor & toSmdsConvertor ); + bool storeErrorDescription(const char* logFile, + const std::string& log, + const _Ghs2smdsConvertor & toSmdsConvertor ); TopoDS_Shape entryToShape(std::string entry); int _iShape; @@ -98,8 +89,6 @@ private: bool _logInStandardOutput; SALOMEDS::Study_var myStudy; SMESH_Gen_i* smeshGen_i; - - volatile bool _compute_canceled; }; /*! diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx new file mode 100644 index 0000000..199a067 --- /dev/null +++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx @@ -0,0 +1,1292 @@ +// Copyright (C) 2004-2016 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#include "MG_HYBRID_API.hxx" + +#include +#include +#include + +#include +#include +#include + +#ifdef USE_MG_LIBS + +extern "C"{ +#include +#include +} + +struct MG_HYBRID_API::LibData +{ + // MG objects + context_t * _context; + hybrid_session_t *_session; + mesh_t * _surf_mesh; + sizemap_t * _sizemap; + mesh_t * _hybrid_mesh; + + // data to pass to MG + std::vector _xyz; + std::vector _nodeSize; // required nodes + std::vector _edgeNodesTags; + int _nbRequiredEdges; + std::vector _triaNodesTags; + int _nbRequiredTria; + std::vector _quadNodes; + std::vector _corners; + + int _count; + volatile bool& _cancelled_flag; + std::string _errorStr; + + double& _progress; + double _msgCost; + + LibData( volatile bool & cancelled_flag, double& progress ) + : _context(0), _session(0), _surf_mesh(0), _sizemap(0), _hybrid_mesh(0), + _nbRequiredEdges(0), _nbRequiredTria(0), + _cancelled_flag( cancelled_flag ), _progress( progress ), _msgCost( 0.00015 ) + { + } + // methods setting callbacks implemented after callback definitions + void Init(); + bool Compute(); + + ~LibData() + { + if ( _hybrid_mesh ) + hybrid_regain_mesh( _session, _hybrid_mesh ); + if ( _session ) + hybrid_session_delete( _session ); + if ( _surf_mesh ) + mesh_delete( _surf_mesh ); + if ( _sizemap ) + sizemap_delete( _sizemap ); + if ( _context ) + context_delete( _context ); + + _hybrid_mesh = 0; + _session = 0; + _surf_mesh = 0; + _sizemap = 0; + _context = 0; + } + + void AddError( const char *txt ) + { + if ( txt ) + { + _errorStr += txt; + } + } + + const std::string& GetErrors() + { + return _errorStr; + } + + void MG_Error(const char* txt="") + { + SMESH_Comment msg("\nMeshGems error. "); + msg << txt << "\n"; + AddError( msg.c_str() ); + } + + bool SetParam( const std::string& param, const std::string& value ) + { + status_t ret = hybrid_set_param( _session, param.c_str(), value.c_str() ); +#ifdef _DEBUG_ + //std::cout << param << " = " << value << std::endl; +#endif + return ( ret == STATUS_OK ); + } + + bool Cancelled() + { + return _cancelled_flag; + } + + int ReadNbSubDomains() + { + integer nb = 0; + status_t ret = mesh_get_subdomain_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_subdomain_count problem"); + return nb; + } + + int ReadNbNodes() + { + _corners.clear(); + + integer nb = 0; + status_t ret = mesh_get_vertex_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_vertex_count problem"); + return nb; + } + + int ReadNbEdges() + { + integer nb = 0; + status_t ret = mesh_get_edge_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_edge_count problem"); + return nb; + } + + int ReadNbTria() + { + integer nb = 0; + status_t ret = mesh_get_triangle_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_triangle_count problem"); + return nb; + } + + int ReadNbQuads() + { + integer nb = 0; + status_t ret = mesh_get_quadrangle_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_quadrangle_count problem"); + return nb; + } + + int ReadNbTetra() + { + integer nb = 0; + status_t ret = mesh_get_tetrahedron_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_tetrahedron_count problem"); + return nb; + } + + int ReadNbHexa() + { + integer nb = 0; + status_t ret = mesh_get_hexahedron_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_hexahedron_count problem"); + return nb; + } + + int ReadNbPrisms() + { + integer nb = 0; + status_t ret = mesh_get_prism_count( _hybrid_mesh, & nb ); + + if ( ret != STATUS_OK ) MG_Error("mesh_get_prism_count problem"); + return nb; + } + + int ReadNbCorners() + { + return _corners.size(); + } + + void ResetCounter() + { + _count = 1; + } + + void ReadSubDomain( int* nbNodes, int* faceInd, int* ori, int* domain ) + { + integer tag, seed_type, seed_idx, seed_orientation; + status_t ret = mesh_get_subdomain_description( _hybrid_mesh, _count, + &tag, &seed_type, &seed_idx, &seed_orientation); + + if ( ret != STATUS_OK ) MG_Error( "unable to get a sub-domain description"); + + *nbNodes = 3; + *faceInd = seed_idx; + *domain = tag; + *ori = seed_orientation; + + ++_count; + } + void ReadNodeXYZ( double* x, double* y, double *z, int* /*domain*/ ) + { + real coo[3]; + status_t ret = mesh_get_vertex_coordinates( _hybrid_mesh, _count, coo ); + if ( ret != STATUS_OK ) MG_Error( "unable to get resulting vertices" ); + + *x = coo[0]; + *y = coo[1]; + *z = coo[2]; + + integer isCorner = 0; + ret = mesh_get_vertex_corner_property( _hybrid_mesh, _count, &isCorner); + if (ret != STATUS_OK) MG_Error( "unable to get resulting vertex property" ); + if ( isCorner ) + _corners.push_back( _count ); + + ++_count; + } + + void ReadEdgeNodes( int* node1, int* node2, int* domain ) + { + integer vtx[2], tag; + status_t ret = mesh_get_edge_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting edge" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + + ret = mesh_get_edge_tag( _hybrid_mesh, _count, &tag ); + if (ret != STATUS_OK) MG_Error( "unable to get resulting edge tag" ); + + *domain = tag; + + ++_count; + } + + void ReadTriaNodes( int* node1, int* node2, int* node3, int* domain ) + { + integer vtx[3], tag; + status_t ret = mesh_get_triangle_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting triangle" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + *node3 = vtx[2]; + + ret = mesh_get_triangle_tag( _hybrid_mesh, _count, &tag ); + if (ret != STATUS_OK) MG_Error( "unable to get resulting triangle tag" ); + + *domain = tag; + + ++_count; + } + + void ReadQuadNodes( int* node1, int* node2, int* node3, int* node4, int* domain ) + { + integer vtx[4], tag; + status_t ret = mesh_get_quadrangle_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting quadrangle" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + *node3 = vtx[2]; + *node4 = vtx[3]; + + ret = mesh_get_quadrangle_tag( _hybrid_mesh, _count, &tag ); + if (ret != STATUS_OK) MG_Error( "unable to get resulting quadrangle tag" ); + + *domain = tag; + + ++_count; + } + + void ReadTetraNodes( int* node1, int* node2, int* node3, int* node4, int* domain ) + { + integer vtx[4], tag; + status_t ret = mesh_get_tetrahedron_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting tetrahedron" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + *node3 = vtx[2]; + *node4 = vtx[3]; + + ret = mesh_get_tetrahedron_tag( _hybrid_mesh, _count, &tag ); + if (ret != STATUS_OK) MG_Error( "unable to get resulting tetrahedron tag" ); + + *domain = tag; + + ++_count; + } + + void ReadHexaNodes( int* node1, int* node2, int* node3, int* node4, + int* node5, int* node6, int* node7, int* node8, int* domain ) + { + integer vtx[8], tag; + status_t ret = mesh_get_hexahedron_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting hexahedron" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + *node3 = vtx[2]; + *node4 = vtx[3]; + *node5 = vtx[4]; + *node6 = vtx[5]; + *node7 = vtx[6]; + *node8 = vtx[7]; + + ret = mesh_get_hexahedron_tag( _hybrid_mesh, _count, &tag ); + if (ret != STATUS_OK) MG_Error( "unable to get resulting hexahedron tag" ); + + *domain = tag; + + ++_count; + } + + void ReadPrismNodes( int* node1, int* node2, int* node3, int* node4, + int* node5, int* node6, int* domain ) + { + integer vtx[6]; + status_t ret = mesh_get_prism_vertices( _hybrid_mesh, _count, vtx); + if (ret != STATUS_OK) MG_Error( "unable to get resulting prism" ); + + *node1 = vtx[0]; + *node2 = vtx[1]; + *node3 = vtx[2]; + *node4 = vtx[3]; + *node5 = vtx[4]; + *node6 = vtx[5]; + + // integer tag; + // ret = mesh_get_hexahedron_tag( _hybrid_mesh, _count, &tag ); + // if (ret != STATUS_OK) MG_Error( "unable to get resulting hexahedron tag" ); + + // *domain = tag; + + ++_count; + } + + void ReadCorner( int* node ) + { + if ( _count <= ReadNbCorners() ) + *node = _corners[ _count - 1 ]; + else + *node = 0; + + ++_count; + } + + void SetNbVertices( int nb ) + { + _xyz.reserve( _xyz.capacity() + nb ); + } + + void SetNbEdges( int nb ) + { + _edgeNodesTags.reserve( nb * 3 ); + } + + void SetNbTria( int nb ) + { + _triaNodesTags.reserve( nb * 4 ); + } + + void SetNbQuads( int nb ) + { + _quadNodes.reserve( nb * 4 ); + } + + void SetNbReqVertices( int nb ) + { + _nodeSize.reserve( nb ); + } + + void SetNbReqEdges( int nb ) + { + _nbRequiredEdges = nb; + } + + void SetNbReqTria( int nb ) + { + _nbRequiredTria = nb; + } + + void AddNode( double x, double y, double z, int domain ) + { + _xyz.push_back( x ); + _xyz.push_back( y ); + _xyz.push_back( z ); + } + + void AddSizeAtNode( double size ) + { + _nodeSize.push_back( size ); + } + + void AddEdgeNodes( int node1, int node2, int domain ) + { + _edgeNodesTags.push_back( node1 ); + _edgeNodesTags.push_back( node2 ); + _edgeNodesTags.push_back( domain ); + } + + void AddTriaNodes( int node1, int node2, int node3, int domain ) + { + _triaNodesTags.push_back( node1 ); + _triaNodesTags.push_back( node2 ); + _triaNodesTags.push_back( node3 ); + _triaNodesTags.push_back( domain ); + } + + void AddQuadNodes( int node1, int node2, int node3, int node4 ) + { + _quadNodes.push_back( node1 ); + _quadNodes.push_back( node2 ); + _quadNodes.push_back( node3 ); + _quadNodes.push_back( node4 ); + } + + int NbNodes() + { + return _xyz.size() / 3; + } + + double* NodeCoord( int iNode ) + { + return & _xyz[ iNode * 3 ]; + } + + int NbEdges() + { + return _edgeNodesTags.size() / 3; + } + + int* GetEdgeNodes( int iEdge ) + { + return & _edgeNodesTags[ iEdge * 3 ]; + } + + int GetEdgeTag( int iEdge ) + { + return _edgeNodesTags[ iEdge * 3 + 2 ]; + } + + int NbTriangles() + { + return _triaNodesTags.size() / 4; + } + + int * GetTriaNodes( int iTria ) + { + return & _triaNodesTags[ iTria * 4 ]; + } + + int GetTriaTag( int iTria ) + { + return _triaNodesTags[ iTria * 4 + 3 ]; + } + + int NbQuads() + { + return _quadNodes.size() / 4; + } + + int * GetQuadNodes( int iQ ) + { + return & _quadNodes[ iQ * 4 ]; + } + + int IsVertexRequired( int iNode ) + { + return ! ( iNode < int( _xyz.size() - _nodeSize.size() )); + } + + double GetSizeAtVertex( int iNode ) + { + return IsVertexRequired( iNode ) ? _nodeSize[ iNode - _xyz.size() + _nodeSize.size() ] : 0.; + } +}; + +namespace // functions called by MG library to exchange with the application +{ + status_t get_vertex_count(integer * nbvtx, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *nbvtx = data->NbNodes(); + + return STATUS_OK; + } + + status_t get_vertex_coordinates(integer ivtx, real * xyz, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + double* coord = data->NodeCoord( ivtx-1 ); + for (int j = 0; j < 3; j++) + xyz[j] = coord[j]; + + return STATUS_OK; + } + status_t get_edge_count(integer * nbedge, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *nbedge = data->NbEdges(); + + return STATUS_OK; + } + + status_t get_edge_vertices(integer iedge, integer * vedge, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + int* nodes = data->GetEdgeNodes( iedge-1 ); + vedge[0] = nodes[0]; + vedge[1] = nodes[1]; + + return STATUS_OK; + } + + status_t get_edge_tag(integer iedge, integer * tag, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + * tag = data->GetEdgeTag( iedge-1 ); + + return STATUS_OK; + } + + status_t get_triangle_count(integer * nbtri, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *nbtri = data->NbTriangles(); + + return STATUS_OK; + } + + status_t get_triangle_vertices(integer itri, integer * vtri, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + int* nodes = data->GetTriaNodes( itri-1 ); + vtri[0] = nodes[0]; + vtri[1] = nodes[1]; + vtri[2] = nodes[2]; + + return STATUS_OK; + } + + status_t get_triangle_tag(integer itri, integer * tag, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + * tag = data->GetTriaTag( itri-1 ); + + return STATUS_OK; + } + + status_t get_quadrangle_count(integer * nbq, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *nbq = data->NbQuads(); + + return STATUS_OK; + } + + status_t get_quadrangle_vertices(integer iq, integer * vq, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + int* nodes = data->GetQuadNodes( iq-1 ); + vq[0] = nodes[0]; + vq[1] = nodes[1]; + vq[2] = nodes[2]; + vq[3] = nodes[3]; + + return STATUS_OK; + } + + status_t get_vertex_required_property(integer ivtx, integer * rvtx, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *rvtx = data->IsVertexRequired( ivtx - 1 ); + + return STATUS_OK; + } + + status_t get_vertex_weight(integer ivtx, real * wvtx, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *wvtx = data->GetSizeAtVertex( ivtx - 1 ); + + return STATUS_OK; + } + + status_t my_message_cb(message_t * msg, void *user_data) + { + char *desc; + message_get_description(msg, &desc); + + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + data->AddError( desc ); + + return STATUS_OK; + } + + status_t my_interrupt_callback(integer *interrupt_status, void *user_data) + { + MG_HYBRID_API::LibData* data = (MG_HYBRID_API::LibData *) user_data; + *interrupt_status = ( data->Cancelled() ? INTERRUPT_STOP : INTERRUPT_CONTINUE ); + + return STATUS_OK; + } + +} // end namespace + + +void MG_HYBRID_API::LibData::Init() +{ + status_t ret; + + // Create the meshgems working context + _context = context_new(); + if ( !_context ) MG_Error( "unable to create a new context" ); + + // Set the message callback for the _context. + ret = context_set_message_callback( _context, my_message_cb, this ); + if ( ret != STATUS_OK ) MG_Error("in context_set_message_callback"); + + // Create the structure holding the callbacks giving access to triangle mesh + _surf_mesh = mesh_new( _context ); + if ( !_surf_mesh ) MG_Error("unable to create a new mesh"); + + // Set callbacks to provide triangle mesh data + mesh_set_get_vertex_count( _surf_mesh, get_vertex_count, this ); + mesh_set_get_vertex_coordinates( _surf_mesh, get_vertex_coordinates, this ); + mesh_set_get_vertex_required_property( _surf_mesh, get_vertex_required_property, this ); + mesh_set_get_edge_count( _surf_mesh, get_edge_count, this); + mesh_set_get_edge_vertices( _surf_mesh, get_edge_vertices, this ); + mesh_set_get_edge_tag( _surf_mesh, get_edge_tag, this ); + mesh_set_get_triangle_count( _surf_mesh, get_triangle_count, this ); + mesh_set_get_triangle_vertices( _surf_mesh, get_triangle_vertices, this ); + mesh_set_get_triangle_tag( _surf_mesh, get_triangle_tag, this ); + mesh_set_get_quadrangle_count( _surf_mesh, get_quadrangle_count, this ); + mesh_set_get_quadrangle_vertices( _surf_mesh, get_quadrangle_vertices, this ); + + // Create a hybrid session + _session = hybrid_session_new( _context ); + if ( !_session ) MG_Error( "unable to create a new hybrid session"); + + ret = hybrid_set_interrupt_callback( _session, my_interrupt_callback, this ); + if ( ret != STATUS_OK ) MG_Error("in hybrid_set_interrupt_callback"); + +} + +bool MG_HYBRID_API::LibData::Compute() +{ + // Set surface mesh + status_t ret = hybrid_set_surface_mesh( _session, _surf_mesh ); + if ( ret != STATUS_OK ) MG_Error( "unable to set surface mesh"); + + // Set a sizemap + if ( !_nodeSize.empty() ) + { + _sizemap = meshgems_sizemap_new( _surf_mesh, meshgems_sizemap_type_iso_mesh_vertex, + (void*) &get_vertex_weight, this ); + if ( !_sizemap ) MG_Error("unable to create a new sizemap"); + + ret = hybrid_set_sizemap( _session, _sizemap ); + if ( ret != STATUS_OK ) MG_Error( "unable to set sizemap"); + } + + ////////////////////////////////////////////////////////////////////////////////////////// + // const char* file = "/tmp/ghs3d_IN.mesh"; + // mesh_write_mesh( _surf_mesh,file); + // std::cout << std::endl << std::endl << "Write " << file << std::endl << std::endl << std::endl; + + ret = hybrid_compute_mesh( _session ); + if ( ret != STATUS_OK ) return false; + + ret = hybrid_get_mesh( _session, &_hybrid_mesh); + if (ret != STATUS_OK) MG_Error( "unable to get resulting mesh"); + + ////////////////////////////////////////////////////////////////////////////////////////// + // file = "/tmp/ghs3d_OUT.mesh"; + // mesh_write_mesh( _hybrid_mesh,file); + // std::cout << std::endl << std::endl << "Write " << file << std::endl << std::endl << std::endl; + + return true; +} + + +#endif // ifdef USE_MG_LIBS + + +//================================================================================ +/*! + * \brief Constructor + */ +//================================================================================ + +MG_HYBRID_API::MG_HYBRID_API(volatile bool& cancelled_flag, double& progress) +{ +#ifdef USE_MG_LIBS + _useLib = true; + _libData = new LibData( cancelled_flag, progress ); + _libData->Init(); +#endif + if ( getenv("MG_HYBRID_USE_EXE")) + _useLib = false; +} + +//================================================================================ +/*! + * \brief Destructor + */ +//================================================================================ + +MG_HYBRID_API::~MG_HYBRID_API() +{ +#ifdef USE_MG_LIBS + delete _libData; + _libData = 0; +#endif + std::set::iterator id = _openFiles.begin(); + for ( ; id != _openFiles.end(); ++id ) + ::GmfCloseMesh( *id ); + _openFiles.clear(); +} + +//================================================================================ +/*! + * \brief Return the way of MG usage + */ +//================================================================================ + +bool MG_HYBRID_API::IsLibrary() +{ + return _useLib; +} + +//================================================================================ +/*! + * \brief Switch to usage of MG-HYBRID executable + */ +//================================================================================ + +void MG_HYBRID_API::SetUseExecutable() +{ + _useLib = false; +} + +//================================================================================ +/*! + * \brief Compute the hybrid mesh + * \param [in] cmdLine - a command to run mg_hybrid.exe + * \return bool - Ok or not + */ +//================================================================================ + +bool MG_HYBRID_API::Compute( const std::string& cmdLine, std::string& errStr ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + + // split cmdLine + std::istringstream strm( cmdLine ); + std::istream_iterator sIt( strm ), sEnd; + std::vector< std::string > args( sIt, sEnd ); + + // set parameters + std::string param, value; + for ( size_t i = 1; i < args.size(); ++i ) + { + // look for a param name; it starts from "-" + param = args[i]; + if ( param.size() < 2 || param[0] != '-') + continue; + while ( param[0] == '-') + param = param.substr( 1 ); + + value = ""; + while ( i+1 < args.size() && args[i+1][0] != '-' ) + { + if ( !value.empty() ) value += " "; + value += args[++i]; + } + if ( !_libData->SetParam( param, value )) + std::cout << "Warning: wrong param: '" << param <<"' = '" << value << "'" << std::endl; + } + + // compute + return _libData->Compute(); +#endif + } + + int err = system( cmdLine.c_str() ); // run + + if ( err ) + errStr = SMESH_Comment("system(mg-hybrid.exe ...) command failed with error: ") + << strerror( errno ); + + GetLog(); // write a log file + _logFile = ""; // not to write it again + + return !err; + +} + +//================================================================================ +/*! + * \brief Prepare for reading a mesh data + */ +//================================================================================ + +int MG_HYBRID_API::GmfOpenMesh(const char* theFile, int rdOrWr, int * ver, int * dim) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + return 1; +#endif + } + int id = ::GmfOpenMesh(theFile, rdOrWr, ver, dim ); + _openFiles.insert( id ); + return id; +} + +//================================================================================ +/*! + * \brief Return nb of entities + */ +//================================================================================ + +int MG_HYBRID_API::GmfStatKwd( int iMesh, GmfKwdCod what ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + switch ( what ) + { + case GmfSubDomainFromGeom: return _libData->ReadNbSubDomains(); + case GmfVertices: return _libData->ReadNbNodes(); + case GmfEdges: return _libData->ReadNbEdges(); + case GmfTriangles: return _libData->ReadNbTria(); + case GmfQuadrilaterals: return _libData->ReadNbQuads(); + case GmfTetrahedra: return _libData->ReadNbTetra(); + case GmfPrisms: return _libData->ReadNbPrisms(); + case GmfHexahedra: return _libData->ReadNbHexa(); + case GmfCorners: return _libData->ReadNbCorners(); + default: return 0; + } + return 0; +#endif + } + return ::GmfStatKwd( iMesh, what ); +} + +//================================================================================ +/*! + * \brief Prepare for reading some data + */ +//================================================================================ + +void MG_HYBRID_API::GmfGotoKwd( int iMesh, GmfKwdCod what ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ResetCounter(); + return; +#endif + } + ::GmfGotoKwd( iMesh, what ); +} + +//================================================================================ +/*! + * \brief Return index of a domain identified by a triangle normal + * \param [in] iMesh - mesh file index + * \param [in] what - must be GmfSubDomainFromGeom + * \param [out] nbNodes - nb nodes in a face + * \param [out] faceInd - face index + * \param [out] ori - face orientation + * \param [out] domain - domain index + * \param [in] dummy - an artificial param used to discriminate from GmfGetLin() reading + * a triangle + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin( int iMesh, GmfKwdCod what, int* nbNodes, int* faceInd, int* ori, int* domain, int dummy ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadSubDomain( nbNodes, faceInd, ori, domain ); + return; +#endif + } + ::GmfGetLin( iMesh, what, nbNodes, faceInd, ori, domain ); +} + +//================================================================================ +/*! + * \brief Return coordinates of a next node + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + double* x, double* y, double *z, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadNodeXYZ( x, y, z, domain ); + return; +#endif + } + ::GmfGetLin(iMesh, what, x, y, z, domain ); +} + +//================================================================================ +/*! + * \brief Return coordinates of a next node + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + float* x, float* y, float *z, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + double X,Y,Z; + _libData->ReadNodeXYZ( &X, &Y, &Z, domain ); + *x = X; + *y = Y; + *z = Z; + return; +#endif + } + ::GmfGetLin(iMesh, what, x, y, z, domain ); +} + +//================================================================================ +/*! + * \brief Return node index of a next corner + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, int* node ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadCorner( node ); + return; +#endif + } + ::GmfGetLin(iMesh, what, node ); +} + +//================================================================================ +/*! + * \brief Return node indices of a next edge + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadEdgeNodes( node1, node2, domain ); + return; +#endif + } + ::GmfGetLin( iMesh, what, node1, node2, domain ); +} + +//================================================================================ +/*! + * \brief Return node indices of a next triangle + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + int* node1, int* node2, int* node3, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadTriaNodes( node1, node2, node3, domain ); + return; +#endif + } + ::GmfGetLin(iMesh, what, node1, node2, node3, domain ); +} + +//================================================================================ +/*! + * \brief Return node indices of a next tetrahedron or quadrangle + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + int* node1, int* node2, int* node3, int* node4, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + if ( what == GmfQuadrilaterals ) + _libData->ReadQuadNodes( node1, node2, node3, node4, domain ); + else + _libData->ReadTetraNodes( node1, node2, node3, node4, domain ); + return; +#endif + } + ::GmfGetLin(iMesh, what, node1, node2, node3, node4, domain ); +} + +//================================================================================ +/*! + * \brief Return node indices of a next hexahedron + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + int* node1, int* node2, int* node3, int* node4, + int* node5, int* node6, int* node7, int* node8, + int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadHexaNodes( node1, node2, node3, node4, node5, node6, node7, node8, domain ); + return; +#endif + } + ::GmfGetLin(iMesh, what, node1, node2, node3, node4, node5, node6, node7, node8, domain ); +} + +//================================================================================ +/*! + * \brief Return node indices of a next prism + */ +//================================================================================ + +void MG_HYBRID_API::GmfGetLin(int iMesh, GmfKwdCod what, + int* node1, int* node2, int* node3, int* node4, + int* node5, int* node6, int* domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->ReadPrismNodes( node1, node2, node3, node4, node5, node6, domain ); + return; +#endif + } + ::GmfGetLin(iMesh, what, node1, node2, node3, node4, node5, node6, domain ); +} + +//================================================================================ +/*! + * \brief Prepare for passing data to MeshGems + */ +//================================================================================ + +int MG_HYBRID_API::GmfOpenMesh(const char* theFile, int rdOrWr, int ver, int dim) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + return 1; +#endif + } + int id = ::GmfOpenMesh(theFile, rdOrWr, ver, dim); + _openFiles.insert( id ); + return id; +} + +//================================================================================ +/*! + * \brief Set number of entities + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetKwd(int iMesh, GmfKwdCod what, int nb ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + switch ( what ) { + case GmfVertices: _libData->SetNbVertices( nb ); break; + case GmfEdges: _libData->SetNbEdges ( nb ); break; + case GmfRequiredEdges: _libData->SetNbReqEdges( nb ); break; + case GmfTriangles: _libData->SetNbTria ( nb ); break; + case GmfRequiredTriangles: _libData->SetNbReqTria ( nb ); break; + default:; + } + return; +#endif + } + ::GmfSetKwd(iMesh, what, nb ); +} + +//================================================================================ +/*! + * \brief Add coordinates of a node + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, double x, double y, double z, int domain) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->AddNode( x, y, z, domain ); + return; +#endif + } + ::GmfSetLin(iMesh, what, x, y, z, domain); +} + +//================================================================================ +/*! + * \brief Set number of field entities + * \param [in] iMesh - solution file index + * \param [in] what - solution type + * \param [in] nbNodes - nb of entities + * \param [in] nbTypes - nb of data entries in each entity + * \param [in] type - types of the data entries + * + * Used to prepare to storing size at nodes + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetKwd(int iMesh, GmfKwdCod what, int nbNodes, int dummy, int type[] ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + if ( what == GmfSolAtVertices ) _libData->SetNbReqVertices( nbNodes ); + return; +#endif + } + ::GmfSetKwd(iMesh, what, nbNodes, dummy, type ); +} + +//================================================================================ +/*! + * \brief Add solution data + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, double vals[]) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->AddSizeAtNode( vals[0] ); + return; +#endif + } + ::GmfSetLin(iMesh, what, vals); +} + +//================================================================================ +/*! + * \brief Add edge nodes + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->AddEdgeNodes( node1, node2, domain ); + return; +#endif + } + ::GmfSetLin(iMesh, what, node1, node2, domain ); +} + +//================================================================================ +/*! + * \brief Add a 'required' flag + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, int id ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + return; +#endif + } + ::GmfSetLin(iMesh, what, id ); +} + +//================================================================================ +/*! + * \brief Add triangle nodes + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int node3, int domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->AddTriaNodes( node1, node2, node3, domain ); + return; +#endif + } + ::GmfSetLin(iMesh, what, node1, node2, node3, domain ); +} + +//================================================================================ +/*! + * \brief Add quadrangle nodes + */ +//================================================================================ + +void MG_HYBRID_API::GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int node3, int node4, int domain ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + _libData->AddQuadNodes( node1, node2, node3, node4 ); + return; +#endif + } + ::GmfSetLin(iMesh, what, node1, node2, node3, domain ); +} + +//================================================================================ +/*! + * \brief Close a file + */ +//================================================================================ + +void MG_HYBRID_API::GmfCloseMesh( int iMesh ) +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + return; +#endif + } + ::GmfCloseMesh( iMesh ); + _openFiles.erase( iMesh ); +} + +//================================================================================ +/*! + * \brief Return true if the log is not empty + */ +//================================================================================ + +bool MG_HYBRID_API::HasLog() +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + return !_libData->GetErrors().empty(); +#endif + } + SMESH_File file( _logFile ); + return file.size() > 0; +} + +//================================================================================ +/*! + * \brief Return log contents + */ +//================================================================================ + +std::string MG_HYBRID_API::GetLog() +{ + if ( _useLib ) { +#ifdef USE_MG_LIBS + const std::string& err = _libData->GetErrors(); + if ( !_logFile.empty() && !err.empty() ) + { + SMESH_File file( _logFile, /*openForReading=*/false ); + file.openForWriting(); + file.write( err.c_str(), err.size() ); + } + return err; +#endif + } + SMESH_File file( _logFile ); + return file.getPos(); +} diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.hxx b/src/HYBRIDPlugin/MG_HYBRID_API.hxx new file mode 100644 index 0000000..461dfb5 --- /dev/null +++ b/src/HYBRIDPlugin/MG_HYBRID_API.hxx @@ -0,0 +1,88 @@ +// Copyright (C) 2004-2016 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef __MG_HYBRID_IO_HXX__ +#define __MG_HYBRID_IO_HXX__ + +extern "C" +{ +#include "libmesh5.h" +} +#include +#include + +/*! + * \brief Class providing a transparent switch between MG_HYBRID usage as + * a library and as an executable. API of libmesh5 inherited. + */ +class MG_HYBRID_API +{ +public: + + MG_HYBRID_API( volatile bool& cancelled_flag, double& progress ); + ~MG_HYBRID_API(); + + bool IsLibrary(); + bool IsExecutable() { return !IsLibrary(); } + void SetUseExecutable(); + + // IN to MESHGEMS + int GmfOpenMesh(const char* theFile, int rdOrWr, int ver, int dim); + void GmfSetKwd(int iMesh, GmfKwdCod what, int nb ); + void GmfSetLin(int iMesh, GmfKwdCod what, double x, double y, double z, int domain); + void GmfSetKwd(int iMesh, GmfKwdCod what, int nbNodes, int dummy, int type[] ); // sol type + void GmfSetLin(int iMesh, GmfKwdCod what, double vals[]); // sol + void GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int domain ); // edge + void GmfSetLin(int iMesh, GmfKwdCod what, int id ); // required + void GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int node3, int domain ); // tria + void GmfSetLin(int iMesh, GmfKwdCod what, int node1, int node2, int node3, int node4, int domain ); // quad + + bool Compute( const std::string& cmdLine, std::string& errStr ); + + // OUT from MESHGEMS + int GmfOpenMesh(const char* theFile, int rdOrWr, int * ver, int * dim); + int GmfStatKwd( int iMesh, GmfKwdCod what ); + void GmfGotoKwd( int iMesh, GmfKwdCod what ); + void GmfGetLin( int iMesh, GmfKwdCod what, int* nbNodes, int* faceInd, int* ori, int* domain, int dummy ); + void GmfGetLin(int iMesh, GmfKwdCod what, float* x, float* y, float *z, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, double* x, double* y, double *z, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* node3, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* node3, int* node4, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* node3, int* node4, int* node5, int* node6, int* domain ); + void GmfGetLin(int iMesh, GmfKwdCod what, int* node1, int* node2, int* node3, int* node4, int* node5, int* node6, int* node7, int* node8, int* domain ); + void GmfCloseMesh( int iMesh ); + + void SetLogFile( const std::string& logFileName ) { _logFile = logFileName; } + bool HasLog(); + std::string GetLog(); + + + struct LibData; + +private: + + bool _useLib; + LibData* _libData; + std::set _openFiles; + std::string _logFile; +}; + +#endif -- 2.39.2