Merge pull request #1566 from su2code/fix_1564

Fix CGNS mesh reader for multizone problems (one CGNS mesh per zone)

Author: pcarruscag

Common/include/geometry/meshreader/CCGNSMeshReaderFVM.hpp

@@ -45,10 +45,9 @@ class CCGNSMeshReaderFVM: public CMeshReaderFVM {
 
 #ifdef HAVE_CGNS
   int cgnsFileID; /*!< \brief CGNS file identifier. */
-  int cgnsBase;   /*!< \brief CGNS database index. */
-  int cgnsZone;   /*!< \brief CGNS zone index. */
+  const int cgnsBase = 1; /*!< \brief CGNS database index (the CGNS reader currently assumes a single database). */
+  const int cgnsZone = 1; /*!< \brief CGNS zone index (and 1 zone in that database). */
 
-  int nZones;     /*!< \brief Total number of zones in the CGNS file. */
   int nSections;  /*!< \brief Total number of sections in the CGNS file. */
 
   vector<bool> isInterior;             /*!< \brief Vector of booleans to store whether each section in the CGNS file is an interior or boundary section. */

Common/src/geometry/meshreader/CCGNSMeshReaderFVM.cpp

@@ -35,12 +35,6 @@ CCGNSMeshReaderFVM::CCGNSMeshReaderFVM(CConfig        *val_config,
 : CMeshReaderFVM(val_config, val_iZone, val_nZone) {
 
 #ifdef HAVE_CGNS
-  /*--- We use val_iZone with +1 for the 1-based indexing in CGNS. ---*/
-  cgnsZone = val_iZone + 1;
-  nZones   = val_nZone;
-
-  /*--- The CGNS reader currently assumes a single database. ---*/
-  cgnsBase = 1;
   OpenCGNSFile(config->GetMesh_FileName());
 
   /*--- Read the basic information about the database and zone(s). ---*/