ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 02:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/V7_dev' into V8_0_0_BR

Browse Source
This commit is contained in:
vsr 2016-02-02 19:11:22 +03:00
commit f050ab3530
7 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -172,7 +172,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
//------------------------------------------------------
PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo);
if (!aNodeInfo) {
aResult = DRS_FAIL;
aResult = addMessage("No nodes", /*isFatal=*/true );
continue;
}
aMeshInfo->myDim=aMeshInfo->mySpaceDim;// ignore meshdim in MEDFile because it can be false
@ -365,9 +365,9 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
}
#ifndef _DEXCEPT_
} catch(const std::exception& exc) {
aResult = DRS_FAIL;
aResult = addMessage( exc.what(), /*isFatal=*/true );
} catch (...) {
aResult = DRS_FAIL;
aResult = addMessage( "Unknown exception", /*isFatal=*/true );
}
#endif
if ( !anElement ) {
@ -522,10 +522,10 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
#ifndef _DEXCEPT_
}catch(const std::exception& exc){
INFOS("Following exception was caught:\n\t"<<exc.what());
aResult = DRS_FAIL;
aResult = addMessage( exc.what(), /*isFatal=*/true );
}catch(...){
INFOS("Unknown exception was caught !!!");
aResult = DRS_FAIL;
aResult = addMessage( "Unknown exception", /*isFatal=*/true );
}
#endif
if(!anIsValidConnect)
@ -958,10 +958,10 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
#ifndef _DEXCEPT_
} catch(const std::exception& exc) {
INFOS("The following exception was caught:\n\t"<<exc.what());
aResult = DRS_FAIL;
aResult = addMessage( exc.what(), /*isFatal=*/true );
} catch(...) {
INFOS("Unknown exception was caught !!!");
aResult = DRS_FAIL;
aResult = addMessage( "Unknown exception", /*isFatal=*/true );
}
#endif
if (!anElement) {
@ -993,12 +993,12 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
catch(const std::exception& exc)
{
INFOS("The following exception was caught:\n\t"<<exc.what());
aResult = DRS_FAIL;
aResult = addMessage( exc.what(), /*isFatal=*/true );
}
catch(...)
{
INFOS("Unknown exception was caught !!!");
aResult = DRS_FAIL;
aResult = addMessage( "Unknown exception", /*isFatal=*/true );
}
#endif
if (myMesh)

8
src/MEDWrapper/Factory/MED_Factory.cxx
View File

@ -25,6 +25,7 @@
#include "MED_V2_2_Wrapper.hxx"
#include <stdio.h>
#include <errno.h>
#include <sstream>
#include <med.h>
@ -53,7 +54,7 @@ namespace MED
#ifndef WIN32
if (access(theFileName.c_str(),F_OK))
return aVersion;
if(theDoPreCheckInSeparateProcess){
if ( theDoPreCheckInSeparateProcess ) {
// First check, is it possible to deal with the file
std::ostringstream aStr;
// File name is in quotes for the case of space(s) inside it (PAL13009)
@ -64,8 +65,9 @@ namespace MED
std::string aCommand = aStr.str();
int aStatus = system(aCommand.c_str());
BEGMSG(MYDEBUG,"aCommand = '"<<aCommand<<"'; aStatus = "<<aStatus<<std::endl);
if(aStatus != 0)
BEGMSG( MYDEBUG,"aCommand = '" << aCommand << "'; aStatus = " << aStatus
<< "; errno = " << errno << " = " << strerror( errno ) << std::endl );
if ( aStatus != 0 && errno != EAGAIN && errno != ENOMEM ) // "Cannot allocate memory" is OK
return aVersion;
}
#endif

4
src/SMESH/SMESH_Mesh.cxx
View File

@ -536,6 +536,10 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName)
MESSAGE("MEDToMesh - _myMeshDS->NbFaces() = "<<_myMeshDS->NbFaces());
MESSAGE("MEDToMesh - _myMeshDS->NbVolumes() = "<<_myMeshDS->NbVolumes());
}
#ifdef _DEBUG_
SMESH_ComputeErrorPtr er = myReader.GetError();
if ( er && !er->IsOK() ) cout << er->myComment << endl;
#endif
// Reading groups (sub-meshes are out of scope of MED import functionality)
list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();

8
src/SMESH/SMESH_subMesh.cxx
View File

@ -438,7 +438,8 @@ const map < int, SMESH_subMesh * >& SMESH_subMesh::DependsOn()
}
break;
case TopAbs_COMPSOLID: insertDependence( _subShape, TopAbs_SOLID ); break;
case TopAbs_SOLID: insertDependence( _subShape, TopAbs_FACE ); break;
case TopAbs_SOLID: insertDependence( _subShape, TopAbs_FACE );
{ /*internal EDGE*/ insertDependence( _subShape, TopAbs_EDGE, TopAbs_WIRE ); break; }
case TopAbs_SHELL: insertDependence( _subShape, TopAbs_FACE ); break;
case TopAbs_FACE: insertDependence( _subShape, TopAbs_EDGE ); break;
case TopAbs_WIRE: insertDependence( _subShape, TopAbs_EDGE ); break;
@ -477,9 +478,10 @@ namespace
//=============================================================================
void SMESH_subMesh::insertDependence(const TopoDS_Shape aShape,
TopAbs_ShapeEnum aSubType)
TopAbs_ShapeEnum aSubType,
TopAbs_ShapeEnum avoidType)
{
TopExp_Explorer sub( aShape, aSubType );
TopExp_Explorer sub( aShape, aSubType, avoidType );
for ( ; sub.More(); sub.Next() )
{
SMESH_subMesh *aSubMesh = _father->GetSubMesh( sub.Current() );

4
src/SMESH/SMESH_subMesh.hxx
View File

@ -281,7 +281,9 @@ public:
protected:
// ==================================================================
void insertDependence(const TopoDS_Shape aShape, TopAbs_ShapeEnum aSubType );
void insertDependence(const TopoDS_Shape aShape,
TopAbs_ShapeEnum aSubType,
TopAbs_ShapeEnum avoidType=TopAbs_SHAPE);
void removeSubMeshElementsAndNodes();
void updateDependantsState(const compute_event theEvent);

4
src/SMESH_SWIG/smeshBuilder.py
View File

@ -1424,8 +1424,10 @@ class Mesh:
# Treat compute errors
computeErrors = self.smeshpyD.GetComputeErrors( self.mesh, geom )
shapeText = ""
for err in computeErrors:
shapeText = " on %s" % self.GetSubShapeName( err.subShapeID )
if self.mesh.HasShapeToMesh():
shapeText = " on %s" % self.GetSubShapeName( err.subShapeID )
errText = ""
stdErrors = ["OK", #COMPERR_OK
"Invalid input mesh", #COMPERR_BAD_INPUT_MESH

2
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
View File

@ -764,7 +764,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh,
else
{
for ( TopExp_Explorer exp(aShape,TopAbs_FACE); exp.More(); exp.Next() )
if (( aSubMeshDSFace = aProxyMesh->GetSubMesh( exp.Current() )))
if (( aSubMeshDSFace = meshDS->MeshElements( exp.Current() )))
itVec.push_back( aSubMeshDSFace->GetElements() );
}
typedef