ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0020483: EDF 1117 SMESH,VISU: Mesh with descending connectivity is badly read by SMESH and VISU

Browse Source
This commit is contained in:
jfa 2013-01-25 13:47:57 +00:00
parent 097db70a03
commit 2e3f1dc0ff
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
idl/SMESH_Mesh.idl
View File

@ -228,6 +228,7 @@ module SMESH
DRS_WARN_RENUMBER, // a MED file has overlapped ranges of element numbers,
// so the numbers from the file are ignored
DRS_WARN_SKIP_ELEM, // some elements were skipped due to incorrect file data
DRS_WARN_DESCENDING, // some elements were skipped due to descending connectivity
DRS_FAIL // general failure (exception etc.)
};

1
src/Driver/Driver_Mesh.h
View File

@ -54,6 +54,7 @@ class MESHDRIVER_EXPORT Driver_Mesh
DRS_WARN_RENUMBER, // a file has overlapped ranges of element numbers,
// so the numbers from the file are ignored
DRS_WARN_SKIP_ELEM, // some elements were skipped due to incorrect file data
DRS_WARN_DESCENDING, // some elements were skipped due to descending connectivity
DRS_FAIL // general failure (exception etc.)
};

24
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -71,6 +71,7 @@ DriverMED_R_SMESHDS_Mesh
::Perform()
{
Status aResult = DRS_FAIL;
bool isDescConn = false;
#ifndef _DEXCEPT_
try{
#endif
@ -173,15 +174,26 @@ DriverMED_R_SMESHDS_Mesh
}
}
// Are there any MED cells in descending connectivity
//---------------------------------------------------
if (!isDescConn) {
MED::TEntityInfo aEntityInfoDesc = aMed->GetEntityInfo(aMeshInfo, eDESC);
MED::TEntityInfo::iterator anEntityIterDesc = aEntityInfoDesc.begin();
for (; anEntityIterDesc != aEntityInfoDesc.end() && !isDescConn; anEntityIterDesc++) {
const EEntiteMaillage& anEntity = anEntityIterDesc->first;
if (anEntity != eNOEUD) isDescConn = true;
}
}
// Reading pre information about all MED cells
//--------------------------------------------
typedef MED::TVector<int> TNodeIds;
bool takeNumbers = true; // initially we trust the numbers from file
MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo);
MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo, eNOD);
MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin();
for(; anEntityIter != aEntityInfo.end(); anEntityIter++){
for (; anEntityIter != aEntityInfo.end(); anEntityIter++) {
const EEntiteMaillage& anEntity = anEntityIter->first;
if(anEntity == eNOEUD) continue;
if (anEntity == eNOEUD) continue;
// Reading MED cells to the corresponding SMDS structure
//------------------------------------------------------
const MED::TGeom2Size& aGeom2Size = anEntityIter->second;
@ -905,6 +917,12 @@ DriverMED_R_SMESHDS_Mesh
#endif
if (myMesh)
myMesh->compactMesh();
if (aResult == DRS_OK && isDescConn) {
INFOS("There are some elements in descending connectivity in med file. They were not read !!!");
aResult = DRS_WARN_DESCENDING;
}
if(MYDEBUG) MESSAGE("Perform - aResult status = "<<aResult);
return aResult;
}

4
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -1478,6 +1478,10 @@ so that the application may crash. Do you wish to continue visualization?</trans
</message>
<message>
<source>SMESH_DRS_4</source>
<translation type="unfinished">MED file contains some elements in descending connectivity. They were not read.</translation>
</message>
<message>
<source>SMESH_DRS_5</source>
<translation>The file is incorrect, some data is missed</translation>
</message>
<message>

4
src/SMESHGUI/SMESH_msg_fr.ts
View File

@ -1450,6 +1450,10 @@ ce qui peut faire planter l&apos;application. Voulez-vous continuer la visualisa
</message>
<message>
<source>SMESH_DRS_4</source>
<translation type="unfinished">MED file contains some elements in descending connectivity. They were not read.</translation>
</message>
<message>
<source>SMESH_DRS_5</source>
<translation>Le fichier n&apos;est pas correct, des données sont manquantes</translation>
</message>
<message>

2
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -320,6 +320,8 @@ static SMESH::DriverMED_ReadStatus ConvertDriverMEDReadStatus (int theStatus)
res = SMESH::DRS_WARN_RENUMBER; break;
case DriverMED_R_SMESHDS_Mesh::DRS_WARN_SKIP_ELEM:
res = SMESH::DRS_WARN_SKIP_ELEM; break;
case DriverMED_R_SMESHDS_Mesh::DRS_WARN_DESCENDING:
res = SMESH::DRS_WARN_DESCENDING; break;
case DriverMED_R_SMESHDS_Mesh::DRS_FAIL:
default:
res = SMESH::DRS_FAIL; break;