Support for Paraview/VTK XML (*.vtu) and Multiblock (*.vtm) visualization files

Common/include/config_structure.hpp

@@ -1118,6 +1118,7 @@ class CConfig {
   unsigned short pastix_verb_lvl;  /*!< \brief Verbosity level for PaStiX */
   unsigned short pastix_fill_lvl;  /*!< \brief Fill level for PaStiX ILU */
 
+  string caseName;                   /*!< \brief Name of the current case
 
   /*!
    * \brief Set the default values of config options not set in the config file using another config object.
@@ -9292,6 +9293,12 @@ class CConfig {
    * \return <TRUE> if option was set in the config file
    */
   bool OptionIsSet(string option);
+
+  /*!
+   * \brief Get the name of the current case
+   * \return the case name
+   */
+  string GetCaseName();
 };
 
 #include "config_structure.inl"

Common/include/config_structure.inl

@@ -2073,3 +2073,5 @@ inline unsigned short* CConfig::GetVolumeOutputFiles() {return VolumeOutputFiles
 inline unsigned short CConfig::GetnVolumeOutputFiles() {return nVolumeOutputFiles;}
 
 inline bool CConfig::OptionIsSet(string option){ return all_options.find(option) == all_options.end();}
+
+inline string CConfig::GetCaseName(){ return caseName;}

Common/include/option_structure.hpp

@@ -1491,7 +1491,10 @@ enum ENUM_OUTPUT {
   MESH      = 11,                /*!< \brief SU2 mesh format. */
   RESTART_BINARY = 12,           /*!< \brief SU2 binary restart format. */
   RESTART_ASCII = 13,            /*!< \brief SU2 ASCII restart format. */
-  CGNS = 14                      /*!< \brief CGNS format. */
+  CGNS = 14,                      /*!< \brief CGNS format. */
+  PARAVIEW_XML = 15,              /*!< \brief Paraview XML with binary data format */
+  SURFACE_PARAVIEW_XML = 16,       /*!< \brief Surface Paraview XML with binary data format */
+  PARAVIEW_MULTIBLOCK = 17        /*!< \brief Paraview XML Multiblock */
 };
 static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPUT>
 ("TECPLOT_ASCII", TECPLOT)
@@ -1501,9 +1504,12 @@ static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPU
 ("CSV", CSV)
 ("SURFACE_CSV", SURFACE_CSV)
 ("PARAVIEW_ASCII", PARAVIEW)
-("PARAVIEW", PARAVIEW_BINARY)
+("PARAVIEW_LEGACY", PARAVIEW_BINARY)
 ("SURFACE_PARAVIEW_ASCII", SURFACE_PARAVIEW)
-("SURFACE_PARAVIEW", SURFACE_PARAVIEW_BINARY)
+("SURFACE_PARAVIEW_LEGACY", SURFACE_PARAVIEW_BINARY)
+("PARAVIEW", PARAVIEW_XML)
+("SURFACE_PARAVIEW", SURFACE_PARAVIEW_XML)
+("PARAVIEW_MULTIBLOCK", PARAVIEW_MULTIBLOCK)
 ("RESTART_ASCII", RESTART_ASCII)
 ("RESTART", RESTART_BINARY)
 ("CGNS", CGNS);

Common/src/config_structure.cpp

@@ -55,6 +55,12 @@ vector<double> GEMM_Profile_MaxTime;      /*!< \brief Maximum time spent for thi
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software, bool verb_high) {
 
+  /*--- Set the case name to the base config file name without extension ---*/
+
+  caseName = string(case_filename);
+  unsigned short lastindex = caseName.find_last_of(".");
+  caseName = caseName.substr(0, lastindex);
+
   base_config = true;
 
   /*--- Store MPI rank and size ---*/ 
@@ -102,6 +108,8 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
 CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, bool verb_high) {
 
+  caseName = config->GetCaseName();
+
   unsigned short val_nDim;
 
   base_config = false;
@@ -157,6 +165,12 @@ CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], unsigned
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_software) {
 
+  /*--- Set the case name to the base config file name without extension ---*/
+
+  caseName = string(case_filename);
+  unsigned short lastindex = caseName.find_last_of(".");
+  caseName = caseName.substr(0, lastindex);
+
   base_config = true;
 
   nZone = 1;
@@ -203,6 +217,12 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
 
 CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
 
+  /*--- Set the case name to the base config file name without extension ---*/
+
+  caseName = string(case_filename);
+  unsigned short lastindex = caseName.find_last_of(".");
+  caseName = caseName.substr(0, lastindex);
+
   base_config = true;
 
   /*--- Store MPI rank and size ---*/ 
@@ -9464,7 +9484,28 @@ void CConfig::SetMultizone(CConfig *driver_config, CConfig **config_container){
       SU2_MPI::Error("Option MULTIZONE_MESH must be the same in all zones.", CURRENT_FUNCTION);
     }
   }
-
+
+  bool multiblockDriver = false;  
+  for (unsigned short iFiles = 0; iFiles < driver_config->GetnVolumeOutputFiles(); iFiles++){
+    if (driver_config->GetVolumeOutputFiles()[iFiles] == PARAVIEW_MULTIBLOCK){
+      multiblockDriver = true;
+    }
+  }
+
+  bool multiblockZone = false;
+  for (unsigned short iZone = 0; iZone < nZone; iZone++){
+    multiblockZone = false;
+    for (unsigned short iFiles = 0; iFiles < config_container[iZone]->GetnVolumeOutputFiles(); iFiles++){
+      if (config_container[iZone]->GetVolumeOutputFiles()[iFiles] == PARAVIEW_MULTIBLOCK){
+        multiblockZone = true;
+      }
+    }
+    if (multiblockZone != multiblockDriver){
+      SU2_MPI::Error("To enable PARAVIEW_MULTIBLOCK output, add it to OUTPUT_FILES option in main config and\n"
+                     "remove option from sub-config files.", CURRENT_FUNCTION);
+    }
+  }
+
   /*--- Set the Restart iter for time dependent problems ---*/
   if (driver_config->GetRestart()){
     Unst_RestartIter = driver_config->GetRestart_Iter();

SU2_CFD/include/output/filewriter/CCSVFileWriter.hpp

@@ -37,7 +37,7 @@ class CCSVFileWriter final: public CFileWriter{
    * \param[in] fields - A list of field names
    * \param[in] nDim - Physical dimension
    */
-  CCSVFileWriter(vector<string> fields, unsigned short nDim, string fileName, CParallelDataSorter* data_sorter);
+  CCSVFileWriter(string fileName, CParallelDataSorter* data_sorter);
 
   /*!
    * \brief Destructor

SU2_CFD/include/output/filewriter/CFEMDataSorter.hpp

@@ -37,9 +37,9 @@ class CFEMDataSorter final: public CParallelDataSorter{
    * \brief Constructor
    * \param[in] config - Pointer to the current config structure
    * \param[in] geometry - Pointer to the current geometry
-   * \param[in] nFields - Number of output fields
+   * \param[in] fieldNames - Vector containing the field names
    */
-  CFEMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
+  CFEMDataSorter(CConfig *config, CGeometry *geometry, vector<string> fieldNames);
 
   /*!
    * \brief Destructor

SU2_CFD/include/output/filewriter/CFVMDataSorter.hpp

@@ -42,9 +42,9 @@ class CFVMDataSorter final: public CParallelDataSorter{
    * \brief Constructor
    * \param[in] config - Pointer to the current config structure
    * \param[in] geometry - Pointer to the current geometry
-   * \param[in] nFields - Number of output fields
+   * \param[in] fieldNames - Vector containing the field names
    */
-  CFVMDataSorter(CConfig *config, CGeometry *geometry, unsigned short nFields);
+  CFVMDataSorter(CConfig *config, CGeometry *geometry, vector<string> fieldNames);
 
   /*!
    * \brief Destructor

SU2_CFD/include/output/filewriter/CFileWriter.hpp

@@ -42,16 +42,6 @@ using namespace std;
 class CFileWriter{
 protected:
 
-  /*!
-   * \brief Vector containing the field names
-   */
-  std::vector<std::string> fieldnames;
-
-  /*!
-   * \brief The physical dimension of the problem
-   */
-  unsigned short nDim;
-
   /*!
    * \brief The MPI rank
    */
@@ -88,21 +78,27 @@ class CFileWriter{
    * \brief Filename
    */
   string fileName;
-
+  
   /*!
    * \brief The parallel data sorter
    */
   CParallelDataSorter* dataSorter;
-
+  
 public:
   /*!
    * \brief Construct a file writer using field names, file extension and dimension.
-   * \param[in] fields - A list of field names
+   * \param[in] fileName - The name of the file
    * \param[in] file_ext - The file extension to be attached to the filename
-   * \param[in] nDim - Physical dimension
    */
-  CFileWriter(std::vector<std::string> fields, string fileName, CParallelDataSorter* dataSorter, string file_ext, unsigned short nDim);
-
+  CFileWriter(string fileName, CParallelDataSorter* dataSorter, string file_ext);
+
+  /*!
+   * \brief Construct a file writer using field names, file extension and dimension.
+   * \param[in] fileName - The name of the file
+   * \param[in] fileExt - The file extension to be attached to the filename
+   */
+  CFileWriter(string fileName, string fileExt);
+
   /*!
    * \brief Destructor
    */

SU2_CFD/include/output/filewriter/CParallelDataSorter.hpp

@@ -86,6 +86,10 @@ class CParallelDataSorter{
   unsigned long *idSend;               //!< Send buffer holding global indices that will be send to other processors
   int nSends,                          //!< Number of sends
   nRecvs;                              //!< Number of receives
+
+  vector<string> fieldNames;           //!< Vector with names of the output fields
+
+  unsigned short nDim;                 //!< Spatial dimension of the data
 
   /*!
    * \brief Prepare the send buffers by filling them with the global indices.
@@ -100,9 +104,9 @@ class CParallelDataSorter{
   /*!
    * \brief Constructor
    * \param[in] config - Pointer to the current config structure
-   * \param[in] nFields - Number of output fields
+   * \param[in] fieldNames - Vector containing the field names
    */
-  CParallelDataSorter(CConfig *config, unsigned short nFields);
+  CParallelDataSorter(CConfig *config, vector<string> fieldNames);
 
   /*!
    * \brief Destructor
@@ -121,6 +125,14 @@ class CParallelDataSorter{
    * \param[in] val_sort - boolean controlling whether the elements are sorted or simply loaded by their owning rank.
    */
   virtual void SortConnectivity(CConfig *config, CGeometry *geometry, bool val_sort = true){}
+
+  /*!
+   * \brief Sort the connectivities into data structures (only for surface data sorters).
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] markerList - A list of marker names that should be sorted.
+   */
+  virtual void SortConnectivity(CConfig *config, CGeometry *geometry, vector<string> markerList){}
 
   /*!
    * \brief Get the number of points the local rank owns.
@@ -232,4 +244,20 @@ class CParallelDataSorter{
   su2double GetUnsorted_Data(unsigned long iPoint, unsigned short iField){
     return connSend[Index[iPoint] + iField];
   }
+
+  /*!
+   * \brief Get the vector containing the names of the output fields
+   * \return Vector of strings containing the field names
+   */
+  vector<string> GetFieldNames(){
+    return fieldNames;
+  }
+
+  /*!
+   * \brief Get the spatial dimension
+   * \return The spatial dimension
+   */
+  unsigned short GetnDim(){
+    return nDim;
+  }
 };

SU2_CFD/include/output/filewriter/CParaviewBinaryFileWriter.hpp

@@ -45,8 +45,7 @@ class CParaviewBinaryFileWriter final: public CFileWriter{
    * \param[in] fileName - The name of the file
    * \param[in] data_sorter - The parallel sorted data to write
    */
-  CParaviewBinaryFileWriter(vector<string> fields, unsigned short nDim,
-                            string fileName, CParallelDataSorter* data_sorter);
+  CParaviewBinaryFileWriter(string fileName, CParallelDataSorter* data_sorter);
 
   /*!
    * \brief Destructor

SU2_CFD/include/output/filewriter/CParaviewFileWriter.hpp

@@ -44,8 +44,7 @@ class CParaviewFileWriter final: public CFileWriter{
    * \param[in] fileName - The name of the file
    * \param[in] data_sorter - The parallel sorted data to write
    */
-  CParaviewFileWriter(vector<string> fields, unsigned short nDim,
-                      string fileName, CParallelDataSorter* data_sorter);
+  CParaviewFileWriter(string fileName, CParallelDataSorter* data_sorter);
 
   /*!
    * \brief Destructor