Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V8_5_asterstudy'
[modules/smesh.git]
/
src
/
DriverCGNS
/
DriverCGNS_Write.cxx
diff --git
a/src/DriverCGNS/DriverCGNS_Write.cxx
b/src/DriverCGNS/DriverCGNS_Write.cxx
index 06abf1dad98d7bf046d68c803753993d564ad7c5..25dab65b638b33fd8f35903656d0bcc613279e57 100644
(file)
--- a/
src/DriverCGNS/DriverCGNS_Write.cxx
+++ b/
src/DriverCGNS/DriverCGNS_Write.cxx
@@
-130,6
+130,11
@@
namespace
interlaces[SMDSEntity_Quad_Penta] = ids;
cgTypes [SMDSEntity_Quad_Penta] = CGNS_ENUMV( PENTA_15 );
}
interlaces[SMDSEntity_Quad_Penta] = ids;
cgTypes [SMDSEntity_Quad_Penta] = CGNS_ENUMV( PENTA_15 );
}
+ {
+ static int ids[] = { 0,2,1,3,5,4,8,7,6,9,11,10,14,13,12,15,16,17 }; // TODO: check CGNS ORDER
+ interlaces[SMDSEntity_BiQuad_Penta] = ids;
+ cgTypes [SMDSEntity_BiQuad_Penta] = CGNS_ENUMV( PENTA_18 );
+ }
{
static int ids[] = { 0,3,2,1,4,7,6,5 };
interlaces[SMDSEntity_Hexa] = ids;
{
static int ids[] = { 0,3,2,1,4,7,6,5 };
interlaces[SMDSEntity_Hexa] = ids;
@@
-296,26
+301,26
@@
Driver_Mesh::Status DriverCGNS_Write::Perform()
vector< double > coords( myMesh->NbNodes() );
int iC;
// X
vector< double > coords( myMesh->NbNodes() );
int iC;
// X
- SMDS_NodeIteratorPtr nIt = myMesh->nodesIterator(
/*idInceasingOrder=*/true
);
+ SMDS_NodeIteratorPtr nIt = myMesh->nodesIterator();
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->X();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateX", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// Y
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->X();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateX", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// Y
- nIt = myMesh->nodesIterator(
/*idInceasingOrder=*/true
);
+ nIt = myMesh->nodesIterator();
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->Y();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateY", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// Z
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->Y();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateY", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// Z
- nIt = myMesh->nodesIterator(
/*idInceasingOrder=*/true
);
+ nIt = myMesh->nodesIterator();
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->Z();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateZ", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// store CGNS ids of nodes
for ( int i = 0; nIt->more(); ++i ) coords[i] = nIt->next()->Z();
if ( cg_coord_write( _fn, iBase, iZone, CGNS_ENUMV(RealDouble),
"CoordinateZ", &coords[0], &iC) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */true );
// store CGNS ids of nodes
- nIt = myMesh->nodesIterator(
/*idInceasingOrder=*/true
);
+ nIt = myMesh->nodesIterator();
for ( int i = 0; nIt->more(); ++i )
{
const SMDS_MeshElement* n = nIt->next();
for ( int i = 0; nIt->more(); ++i )
{
const SMDS_MeshElement* n = nIt->next();
@@
-562,7
+567,11
@@
Driver_Mesh::Status DriverCGNS_Write::Perform()
switch ( meshDim ) {
case 3:
switch ( group->GetType() ) {
switch ( meshDim ) {
case 3:
switch ( group->GetType() ) {
+#if CGNS_VERSION > 3130
case SMDSAbs_Volume: location = CGNS_ENUMV( CellCenter ); break;
case SMDSAbs_Volume: location = CGNS_ENUMV( CellCenter ); break;
+#else
+ case SMDSAbs_Volume: location = CGNS_ENUMV( FaceCenter ); break;
+#endif
case SMDSAbs_Face: location = CGNS_ENUMV( FaceCenter ); break;
case SMDSAbs_Edge: location = CGNS_ENUMV( EdgeCenter ); break;
default:;
case SMDSAbs_Face: location = CGNS_ENUMV( FaceCenter ); break;
case SMDSAbs_Edge: location = CGNS_ENUMV( EdgeCenter ); break;
default:;
@@
-570,13
+579,21
@@
Driver_Mesh::Status DriverCGNS_Write::Perform()
break;
case 2:
switch ( group->GetType() ) {
break;
case 2:
switch ( group->GetType() ) {
+#if CGNS_VERSION > 3130
case SMDSAbs_Face: location = CGNS_ENUMV( CellCenter ); break;
case SMDSAbs_Face: location = CGNS_ENUMV( CellCenter ); break;
+#else
+ case SMDSAbs_Face: location = CGNS_ENUMV( FaceCenter ); break;
+#endif
case SMDSAbs_Edge: location = CGNS_ENUMV( EdgeCenter ); break;
default:;
}
break;
case 1:
case SMDSAbs_Edge: location = CGNS_ENUMV( EdgeCenter ); break;
default:;
}
break;
case 1:
+#if CGNS_VERSION > 3130
location = CGNS_ENUMV( CellCenter ); break;
location = CGNS_ENUMV( CellCenter ); break;
+#else
+ location = CGNS_ENUMV( EdgeCenter ); break;
+#endif
break;
}
}
break;
}
}
@@
-611,7
+628,7
@@
Driver_Mesh::Status DriverCGNS_Write::Perform()
return addMessage( cg_get_error(), /*fatal = */true);
// write BC location
return addMessage( cg_get_error(), /*fatal = */true);
// write BC location
- if ( location != CGNS_ENUMV( Vertex ))
+ if ( location != CGNS_ENUMV( Vertex )
|| meshDim == 1
)
{
if ( cg_boco_gridlocation_write( _fn, iBase, iZone, iBC, location) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */false);
{
if ( cg_boco_gridlocation_write( _fn, iBase, iZone, iBC, location) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */false);