add CGNS import check and clean up code

Author: baldang

Common/src/CConfig.cpp

@@ -3237,6 +3237,16 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   }
 #endif
 
+  /*--- Check if SU2 was build with CGNS support, as that is required for CGNS output. ---*/
+#ifndef HAVE_CGNS
+  for (unsigned short iVolumeFile = 0; iVolumeFile < nVolumeOutputFiles; iVolumeFile++) {
+    if (VolumeOutputFiles[iVolumeFile] == CGNS ||
+        VolumeOutputFiles[iVolumeFile] == SURFACE_CGNS) {
+      SU2_MPI::Error(string("CGNS file requested in option OUTPUT_FILES but SU2 was built without CGNS support.\n"),CURRENT_FUNCTION);
+    }
+  }
+#endif
+
   /*--- STL_BINARY output not implelemted yet, but already a value in option_structure.hpp---*/
   for (unsigned short iVolumeFile = 0; iVolumeFile < nVolumeOutputFiles; iVolumeFile++) {
     if (VolumeOutputFiles[iVolumeFile] == STL_BINARY){

SU2_CFD/include/output/filewriter/CCGNSFileWriter.hpp

@@ -31,6 +31,9 @@
 #include "cgnslib.h"
 #endif
 
+/*--- Define data precision of output (float or double). ---*/
+typedef float dataPrecision;
+
 #include "CFileWriter.hpp"
 
 class CCGNSFileWriter final : public CFileWriter {
@@ -46,14 +49,20 @@ class CCGNSFileWriter final : public CFileWriter {
   int nZones;    /*!< \brief Total number of zones in the CGNS file. */
   int nSections; /*!< \brief Total number of sections in the CGNS file. */
 
-  unsigned short nDim; /*!< \brief Problem dimension. */
-  int nLocalPoints;    /*!< \brief Local number of points. */
-  int GlobalPoint;     /*!< \brief Total number of points. */
-  int GlobalElem;      /*!< \brief Total number of elements. */
+  unsigned short nDim;        /*!< \brief Problem dimension. */
+  unsigned long nLocalPoints; /*!< \brief Local number of points. */
+  cgsize_t GlobalPoint;       /*!< \brief Total number of points. */
+  cgsize_t GlobalElem;        /*!< \brief Total number of elements. */
+
+  vector<cgsize_t> sendBufferConnectivity; /*!< \brief Send buffer for connectivity data. */
+  vector<cgsize_t> recvBufferConnectivity; /*!< \brief Receive buffer for connectivity data. */
+  vector<dataPrecision> recvBufferField;   /*!< \brief Send buffer for field data. */
+  vector<dataPrecision> sendBufferField;   /*!< \brief Receive buffer for field data. */
 
   cgsize_t cumulative; /*!< \brief Cumulative number of elements written. */
-#endif
 
+  DataType_t dataType; /*!< \brief Datatype of fields can be RealSingle or RealDouble. */
+#endif
  public:
   /*!
    * \brief File extension
@@ -68,11 +77,6 @@ class CCGNSFileWriter final : public CFileWriter {
    */
   CCGNSFileWriter(string valFileName, CParallelDataSorter* valDataSorter, bool isSurf = false);
 
-  /*!
-   * \brief Destructor
-   */
-  ~CCGNSFileWriter() override;
-
   /*!
    * \brief Write sorted data to file in CGNS file format.
    */
@@ -81,14 +85,14 @@ class CCGNSFileWriter final : public CFileWriter {
   /*!
    * \brief Initialize CGNS mesh file.
    */
-  void initializeMeshFile();
+  void InitializeMeshFile();
 
   /*!
    * \brief Write i-th coordinate to file in CGNS file format.
-   * \param[in] CoordinateNumber - Coordinate number according to CGNS.
-   * \param[in] CoordinateName - Coordinate name according to CGNS.
+   * \param[in] iField - the output field ID.
+   * \param[in] FieldName - Field name in the CGNS.
    */
-  void WriteCoordinate(int CoordinateNumber, const string& CoordinateName);
+  void WriteField(int iField, const string& FieldName);
 
   /*!
    * \brief Write connectivity to file for GEO_TYPE in CGNS file format.
@@ -102,13 +106,6 @@ class CCGNSFileWriter final : public CFileWriter {
    */
   void InitializeFields();
 
-  /*!
-   * \brief Write i-th coordinate to file in CGNS file format.
-   * \param[in] iField - the output field ID.
-   * \param[in] FieldName - Field name in the CGNS.
-   */
-  void WriteField(int iField, const string& FieldName);
-
   /*!
    * \brief Call a generic CGNS function.
    * \param[in] ier - error value.