From: Paul RASCLE <paul.rascle@edf.fr>
Date: Fri, 15 Sep 2017 09:15:53 +0000 (+0200)
Subject: Merge branch 'master' into pre/penta18
X-Git-Tag: V8_4_0a2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=30ce546b0c5099ad1112929e2db94810e683e54b;hp=-c

Merge branch 'master' into pre/penta18
---

30ce546b0c5099ad1112929e2db94810e683e54b
diff --combined src/DriverCGNS/DriverCGNS_Write.cxx
index 14f1c10e2,5f334797a..4d79e0f7c
--- a/src/DriverCGNS/DriverCGNS_Write.cxx
+++ b/src/DriverCGNS/DriverCGNS_Write.cxx
@@@ -130,11 -130,6 +130,11 @@@ namespac
          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;
@@@ -628,7 -623,7 +628,7 @@@ Driver_Mesh::Status DriverCGNS_Write::P
        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);