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

Fix on Bug SMESH5864

Browse Source 
- Med file writer does not respect MED specifications for elements (Ecole_Ete_a4)
This commit is contained in:
smh 2004-05-18 04:58:22 +00:00
parent 2b81b5b1d8
commit f096a91538
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -257,16 +257,23 @@ DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
aNbNodes = 8; aNbNodes = 8;
break; break;
} }
// if(anIsElemNum)
// cout<<aCellInfo->GetElemNum(iElem)<<": ";
// else
// cout<<iElem<<": ";
vector<med_int> aNodeIds(aNbNodes); vector<med_int> aNodeIds(aNbNodes);
if(anIsNodeNum) {
for(int i = 0; i < aNbNodes; i++){
aNodeIds.at(i) = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1);
}
}else{
for(int i = 0; i < aNbNodes; i++){ for(int i = 0; i < aNbNodes; i++){
aNodeIds.at(i) = aCellInfo->GetConn(iElem,i); aNodeIds.at(i) = aCellInfo->GetConn(iElem,i);
//cout<<aNodeIds.at(i)<<", ";
} }
//cout<<endl; }
//if(anIsElemNum)
// cout<<aCellInfo->GetElemNum(iElem)<<": ";
//else
// cout<<iElem<<": ";
//for(int i = 0; i < aNbNodes; i++){
// cout<<aNodeIds.at(i)<<", ";
//}
bool isRenum = false; bool isRenum = false;
SMDS_MeshElement* anElement = NULL; SMDS_MeshElement* anElement = NULL;

39
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -208,6 +208,9 @@ void DriverMED_W_SMESHDS_Mesh::Add()
// Storing SMDS nodes to the MED file for the MED mesh // Storing SMDS nodes to the MED file for the MED mesh
//---------------------------------------------------- //----------------------------------------------------
typedef map<med_int,med_int> TNodeIdMap;
TNodeIdMap aNodeIdMap;
med_int aNbElems = myMesh->NbNodes(); med_int aNbElems = myMesh->NbNodes();
MED::TIntVector anElemNums(aNbElems); MED::TIntVector anElemNums(aNbElems);
MED::TIntVector aFamilyNums(aNbElems); MED::TIntVector aFamilyNums(aNbElems);
@ -218,7 +221,9 @@ void DriverMED_W_SMESHDS_Mesh::Add()
aCoordinates[iCoord] = aNode->X(); aCoordinates[iCoord] = aNode->X();
aCoordinates[iCoord+1] = aNode->Y(); aCoordinates[iCoord+1] = aNode->Y();
aCoordinates[iCoord+2] = aNode->Z(); aCoordinates[iCoord+2] = aNode->Z();
anElemNums[iNode] = aNode->GetID(); TNodeIdMap::key_type aNodeId = aNode->GetID();
anElemNums[iNode] = aNodeId;
aNodeIdMap[aNodeId] = iNode+1;
//cout<<aNode->GetID()<<": "<<aNode->X()<<", "<<aNode->Y()<<", "<<aNode->Z()<<endl; //cout<<aNode->GetID()<<": "<<aNode->X()<<", "<<aNode->Y()<<", "<<aNode->Z()<<endl;
if (anElemFamMap.find(aNode) != anElemFamMap.end()) if (anElemFamMap.find(aNode) != anElemFamMap.end())
@ -264,13 +269,9 @@ void DriverMED_W_SMESHDS_Mesh::Add()
SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIterator(); SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIterator();
for(med_int iNode = 0; iNode < aNbConnectivity && aNodesIter->more(); iNode++){ for(med_int iNode = 0; iNode < aNbConnectivity && aNodesIter->more(); iNode++){
const SMDS_MeshElement* aNode = aNodesIter->next(); const SMDS_MeshElement* aNode = aNodesIter->next();
aConnectivity[iConn+iNode] = aNode->GetID(); aConnectivity[iConn+iNode] = aNodeIdMap[aNode->GetID()];
} }
anElemNums[iElem] = anElem->GetID(); anElemNums[iElem] = anElem->GetID();
//cout<<anElem->GetID()<<": ";
//for(med_int iNode = 0; iNode < aNbNodes; iNode++)
// cout<<(*aConnectivity)[iConn+iNode]<<", ";
//cout<<endl;
if (anElemFamMap.find(anElem) != anElemFamMap.end()) if (anElemFamMap.find(anElem) != anElemFamMap.end())
aFamilyNums[iElem] = anElemFamMap[anElem]; aFamilyNums[iElem] = anElemFamMap[anElem];
@ -341,19 +342,15 @@ void DriverMED_W_SMESHDS_Mesh::Add()
// There is some differnce between SMDS and MED in cells mapping // There is some differnce between SMDS and MED in cells mapping
switch(aNbNodes){ switch(aNbNodes){
case 4: case 4:
(*aConnectivity)[aSize+0] = aVector[0]; (*aConnectivity)[aSize+0] = aNodeIdMap[aVector[0]];
(*aConnectivity)[aSize+1] = aVector[1]; (*aConnectivity)[aSize+1] = aNodeIdMap[aVector[1]];
(*aConnectivity)[aSize+2] = aVector[3]; (*aConnectivity)[aSize+2] = aNodeIdMap[aVector[3]];
(*aConnectivity)[aSize+3] = aVector[2]; (*aConnectivity)[aSize+3] = aNodeIdMap[aVector[2]];
default: default:
for(med_int iNode = 0; iNode < aNbNodes; iNode++) for(med_int iNode = 0; iNode < aNbNodes; iNode++)
(*aConnectivity)[aSize+iNode] = aVector[iNode]; (*aConnectivity)[aSize+iNode] = aNodeIdMap[aVector[iNode]];
} }
anElemNums->push_back(anElem->GetID()); anElemNums->push_back(anElem->GetID());
//cout<<anElem->GetID()<<": ";
//for(med_int iNode = 0; iNode < aNbNodes; iNode++)
// cout<<(*aConnectivity)[aSize+iNode]<<", ";
//cout<<endl;
if (anElemFamMap.find(anElem) != anElemFamMap.end()) if (anElemFamMap.find(anElem) != anElemFamMap.end())
aFamilyNums->push_back(anElemFamMap[anElem]); aFamilyNums->push_back(anElemFamMap[anElem]);
@ -464,14 +461,14 @@ void DriverMED_W_SMESHDS_Mesh::Add()
// There is some difference between SMDS and MED in cells mapping // There is some difference between SMDS and MED in cells mapping
switch(aNbNodes){ switch(aNbNodes){
case 5: case 5:
(*aConnectivity)[aSize+0] = aVector[0]; (*aConnectivity)[aSize+0] = aNodeIdMap[aVector[0]];
(*aConnectivity)[aSize+1] = aVector[3]; (*aConnectivity)[aSize+1] = aNodeIdMap[aVector[3]];
(*aConnectivity)[aSize+2] = aVector[2]; (*aConnectivity)[aSize+2] = aNodeIdMap[aVector[2]];
(*aConnectivity)[aSize+3] = aVector[1]; (*aConnectivity)[aSize+3] = aNodeIdMap[aVector[1]];
(*aConnectivity)[aSize+4] = aVector[4]; (*aConnectivity)[aSize+4] = aNodeIdMap[aVector[4]];
default: default:
for(med_int iNode = 0; iNode < aNbNodes; iNode++) for(med_int iNode = 0; iNode < aNbNodes; iNode++)
(*aConnectivity)[aSize+iNode] = aVector[iNode]; (*aConnectivity)[aSize+iNode] = aNodeIdMap[aVector[iNode]];
} }
anElemNums->push_back(anElem->GetID()); anElemNums->push_back(anElem->GetID());