Merge branch 'master' into gni/evolution

[modules/smesh.git] / src / DriverCGNS / DriverCGNS_Read.cxx

diff --git a/src/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx
index 3db2ad821fe4cd0e69bad99d1c848d57abed8bfb..dc6192470071bfe2b4b6dbfc6199128c47fe2fa6 100644 (file)
--- a/src/DriverCGNS/DriverCGNS_Read.cxx
+++ b/src/DriverCGNS/DriverCGNS_Read.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -22,7 +22,7 @@
 // File      : DriverCGNS_Read.cxx
 // Created   : Thu Jun 30 10:33:31 2011
 // Author    : Edward AGAPOV (eap)
-#define _DEBUG_
+//#define _DEBUG_
 #include <utilities.h>
 
 #include "DriverCGNS_Read.hxx"
@@ -134,12 +134,12 @@ namespace
       ids[2] = ids[0] + _sizeX + 1;
       ids[3] = ids[0] + ( k==_sizeZ ? _sizeX : 1);
     }
-    void IEdgeNodes( int i, int j, int k, cgsize_t* ids ) const // edge perpendiculaire to X (2D)
+    void IEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const // edge perpendiculaire to X (2D)
     {
       ids[0] = NodeID( i, j, 0 );
       ids[1] = ids[0] + _sizeX;
     }
-    void JEdgeNodes( int i, int j, int k, cgsize_t* ids ) const
+    void JEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const
     {
       ids[0] = NodeID( i, j, 0 );
       ids[1] = ids[0] + 1;
@@ -165,9 +165,9 @@ namespace
     int _beg[3], _end[3], _cur[3], _dir[3], _dim;
     bool _more;
   public:
-    TPointRangeIterator( const cgsize_t* range, int dim ):_dim(dim)
+    TPointRangeIterator( const cgsize_t* range, int dim ):
+      _beg{0,0,0}, _end{0,0,0}, _cur{0,0,0}, _dir{0,0,0}, _dim(dim), _more(false)
     {
-      _more = false;
       for ( int i = 0; i < dim; ++i )
       {
         _beg[i] = range[i];
@@ -178,8 +178,6 @@ namespace
         if ( _end[i] - _beg[i] )
           _more = true;
       }
-//       for ( int i = dim; i < 3; ++i )
-//         _cur[i] = _beg[i] = _end[i] = _dir[i] = 0;
     }
     bool More() const
     {
@@ -1073,14 +1071,14 @@ Driver_Mesh::Status DriverCGNS_Read::Perform()
               PGetNodesFun getNodesFun = 0;
               if ( elemType == SMDSAbs_Face  && meshDim == 3 )
                 switch ( axis ) {
-                case 0: getNodesFun = & TZoneData::IFaceNodes;
-                case 1: getNodesFun = & TZoneData::JFaceNodes;
-                case 2: getNodesFun = & TZoneData::KFaceNodes;
+                case 0: getNodesFun = & TZoneData::IFaceNodes; break;
+                case 1: getNodesFun = & TZoneData::JFaceNodes; break;
+                case 2: getNodesFun = & TZoneData::KFaceNodes; break;
                 }
               else if ( elemType == SMDSAbs_Edge && meshDim == 2 )
                 switch ( axis ) {
-                case 0: getNodesFun = & TZoneData::IEdgeNodes;
-                case 1: getNodesFun = & TZoneData::JEdgeNodes;
+                case 0: getNodesFun = & TZoneData::IEdgeNodes; break;
+                case 1: getNodesFun = & TZoneData::JEdgeNodes; break;
                 }
               if ( !getNodesFun )
               {
@@ -1103,14 +1101,14 @@ Driver_Mesh::Status DriverCGNS_Read::Perform()
               PGetNodesFun getNodesFun = 0;
               if ( elemType == SMDSAbs_Face )
                 switch ( axis ) {
-                case 0: getNodesFun = & TZoneData::IFaceNodes;
-                case 1: getNodesFun = & TZoneData::JFaceNodes;
-                case 2: getNodesFun = & TZoneData::KFaceNodes;
+                case 0: getNodesFun = & TZoneData::IFaceNodes; break;
+                case 1: getNodesFun = & TZoneData::JFaceNodes; break;
+                case 2: getNodesFun = & TZoneData::KFaceNodes; break;
                 }
               else if ( elemType == SMDSAbs_Edge && meshDim == 2 )
                 switch ( axis ) {
-                case 0: getNodesFun = & TZoneData::IEdgeNodes;
-                case 1: getNodesFun = & TZoneData::JEdgeNodes;
+                case 0: getNodesFun = & TZoneData::IEdgeNodes; break;
+                case 1: getNodesFun = & TZoneData::JEdgeNodes; break;
                 }
               if ( !getNodesFun )
               {
@@ -1129,9 +1127,9 @@ Driver_Mesh::Status DriverCGNS_Read::Perform()
 
             PAddElemFun addElemFun = 0;
             switch ( meshDim ) {
-            case 1: addElemFun = & add_BAR_2;
-            case 2: addElemFun = & add_QUAD_4;
-            case 3: addElemFun = & add_HEXA_8;
+            case 1: addElemFun = & add_BAR_2;  break;
+            case 2: addElemFun = & add_QUAD_4; break;
+            case 3: addElemFun = & add_HEXA_8; break;
             }
             int elemID = meshInfo.NbElements();
             const SMDS_MeshElement* elem = 0;