Merge branch 'master' into pre/penta18

diff --combined src/DriverCGNS/DriverCGNS_Write.cxx
index 14f1c10e23640f9de2540597636600d5667afa1d,5f334797a5ea74103dde5bc4cba76c32e50fe5ae..4d79e0f7cca78c3a0b275f5c1ce2735b09e3eb5a
--- 1/src/DriverCGNS/DriverCGNS_Write.cxx
--- 2/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);