ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-22 10:42:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

StructuredCGNS - Write FamilyName info to be able to get the original group name from the BC node

Browse Source
This commit is contained in:
Christophe Bourcier 2024-06-26 15:57:46 +02:00
parent 1396881275
commit cc09b83e05
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/DriverCGNS/DriverStructuredCGNS_Write.cxx
View File

@ -270,17 +270,34 @@ Driver_Mesh::Status DriverStructuredCGNS_Write::Perform()
if(pRange[4] < pRange[1]) {std::swap(pRange[1],pRange[4]);} if(pRange[4] < pRange[1]) {std::swap(pRange[1],pRange[4]);}
if(pRange[5] < pRange[2]) {std::swap(pRange[2],pRange[5]);} if(pRange[5] < pRange[2]) {std::swap(pRange[2],pRange[5]);}
int cgIndexBoco = 0; int cgIndexBoco = 0;
std::string boundaryName = boundaryNames[faceId].empty() ? zoneName + "_" + std::to_string(faceId) : boundaryNames[faceId]; std::string boundaryName = boundaryNames[faceId];
std::string boundaryNameOrig(boundaryName);
bool isInGroup = false;
if (boundaryName.empty())
boundaryName = zoneName + "_" + std::to_string(faceId);
else
isInGroup = true;
if ( bNames.count(boundaryName)!=0 ) if ( bNames.count(boundaryName)!=0 )
boundaryName = boundaryName + "_" + std::to_string(faceId); boundaryName = boundaryName + "_" + std::to_string(faceId);
bNames.insert( boundaryName ); bNames.insert( boundaryName );
if(cg_boco_write(_fn, iBase, iZone, boundaryName.c_str(), CGNS_ENUMV(BCTypeNull), if(cg_boco_write(_fn, iBase, iZone, boundaryName.c_str(), CGNS_ENUMV(BCTypeNull),
CGNS_ENUMV(PointRange), 2, &pRange[0], &cgIndexBoco) != CG_OK) return addMessage(cg_get_error(), /*fatal = */true); CGNS_ENUMV(PointRange), 2, &pRange[0], &cgIndexBoco) != CG_OK) return addMessage(cg_get_error(), /*fatal = */true);
// write also the group name as FamilyName in the same node
if (isInGroup)
{
// go to the BC node
if(cg_goto(_fn, iBase, "Zone_t", iZone, "ZoneBC_t", 1,
"BC_t", cgIndexBoco, "end") != CG_OK)
return addMessage(cg_get_error(), /*fatal = */true);
// write the family name
if(cg_famname_write(boundaryNameOrig.c_str()) != CG_OK)
return addMessage(cg_get_error(), /*fatal = */true);
}
faceId++; faceId++;
} }
// End write boundary // End write boundary
// Writte Interfaces // Write Interfaces
for ( TopExp_Explorer fEx( shape, TopAbs_SOLID ); fEx.More(); fEx.Next() ) for ( TopExp_Explorer fEx( shape, TopAbs_SOLID ); fEx.More(); fEx.Next() )
{ {
TopoDS_Solid neighbourSolid = TopoDS::Solid(fEx.Current()); TopoDS_Solid neighbourSolid = TopoDS::Solid(fEx.Current());
@ -382,17 +399,34 @@ Driver_Mesh::Status DriverStructuredCGNS_Write::Perform()
if(pRange[2] < pRange[0]) {std::swap(pRange[0],pRange[2]);} if(pRange[2] < pRange[0]) {std::swap(pRange[0],pRange[2]);}
if(pRange[1] < pRange[3]) {std::swap(pRange[1],pRange[3]);} if(pRange[1] < pRange[3]) {std::swap(pRange[1],pRange[3]);}
int cgIndexBoco = 0; int cgIndexBoco = 0;
std::string boundaryName = boundaryNames[edgeId].empty() ? zoneName + "_" + std::to_string(edgeId) : boundaryNames[edgeId]; std::string boundaryName = boundaryNames[edgeId];
std::string boundaryNameOrig(boundaryName);
bool isInGroup = false;
if (boundaryName.empty())
boundaryName = zoneName + "_" + std::to_string(edgeId);
else
isInGroup = true;
if ( bNames.count(boundaryName)!=0) if ( bNames.count(boundaryName)!=0)
boundaryName = boundaryName + "_" + std::to_string(edgeId); boundaryName = boundaryName + "_" + std::to_string(edgeId);
bNames.insert( boundaryName ); bNames.insert( boundaryName );
if(cg_boco_write(_fn, iBase, iZone, boundaryName.c_str(), CGNS_ENUMV(BCTypeNull), if(cg_boco_write(_fn, iBase, iZone, boundaryName.c_str(), CGNS_ENUMV(BCTypeNull),
CGNS_ENUMV(PointRange), 2, &pRange[0], &cgIndexBoco) != CG_OK) return addMessage(cg_get_error(), /*fatal = */true); CGNS_ENUMV(PointRange), 2, &pRange[0], &cgIndexBoco) != CG_OK) return addMessage(cg_get_error(), /*fatal = */true);
// write also the group name as FamilyName in the same node
if (isInGroup)
{
// go to the BC node
if(cg_goto(_fn, iBase, "Zone_t", iZone, "ZoneBC_t", 1,
"BC_t", cgIndexBoco, "end") != CG_OK)
return addMessage(cg_get_error(), /*fatal = */true);
// write the family name
if(cg_famname_write(boundaryNameOrig.c_str()) != CG_OK)
return addMessage(cg_get_error(), /*fatal = */true);
}
edgeId++; edgeId++;
} }
// End write Boundary // End write Boundary
// Writte Interfaces // Write Interfaces
for ( TopExp_Explorer fEx( shape, TopAbs_FACE ); fEx.More(); fEx.Next() ) for ( TopExp_Explorer fEx( shape, TopAbs_FACE ); fEx.More(); fEx.Next() )
{ {
TopoDS_Face neighbourFace = TopoDS::Face(fEx.Current()); TopoDS_Face neighbourFace = TopoDS::Face(fEx.Current());