Merge remote-tracking branch 'upstream/develop' into feature_Sobolev_smoothing_solver

Author: thomasdick

Common/src/CConfig.cpp

@@ -2835,7 +2835,7 @@ void CConfig::SetConfig_Options() {
   addUnsignedLongOption("OUTPUT_WRT_FREQ", VolumeWrtFreq, 250);
   /* DESCRIPTION: Volume solution files */
   addEnumListOption("OUTPUT_FILES", nVolumeOutputFiles, VolumeOutputFiles, Output_Map);
-  
+
   /* DESCRIPTION: Using Uncertainty Quantification with SST Turbulence Model */
   addBoolOption("USING_UQ", using_uq, false);
 
@@ -8159,7 +8159,7 @@ string CConfig::GetFilename(string filename, string ext, int timeIter) const {
   if (GetTime_Domain()){
     filename = GetUnsteady_FileName(filename, timeIter, ext);
   }
-  
+
   return filename;
 }
 

SU2_CFD/src/output/filewriter/CParallelFileWriter.cpp

@@ -200,8 +200,8 @@ bool CFileWriter::WriteMPIString(const string &str, unsigned short processor){
 
 bool CFileWriter::OpenMPIFile(string val_filename){
 
-/*--- We append the pre-defined suffix (extension) to the filename (prefix) ---*/
-val_filename.append(fileExt);
+  /*--- We append the pre-defined suffix (extension) to the filename (prefix) ---*/
+  val_filename.append(fileExt);
 
 #ifdef HAVE_MPI
   int ierr;

SU2_CFD/src/output/filewriter/CParaviewVTMFileWriter.cpp

@@ -92,13 +92,11 @@ void CParaviewVTMFileWriter::AddDataset(string foldername, string name, string f
   /*--- Construct the full file name incl. folder ---*/
   /*--- Note that the folder name is simply the filename ---*/
 
-  //string fullFilename = folderName + "/zone_" + to_string(iZone) + "/" + file;
   string fullFilename = foldername + "/zone_" + to_string(iZone) + "/" + file;
 
   /*--- Create an XML writer and dump data into file ---*/
 
   CParaviewXMLFileWriter XMLWriter(dataSorter);
-  cout << "writing to XML file "<<fullFilename << endl;
   XMLWriter.Write_Data(fullFilename);
 
   /*--- Add the dataset to the vtm file ---*/

config_template.cfg

@@ -1693,7 +1693,7 @@ TABULAR_FORMAT= CSV
 % Files to output
 % Possible formats : (TECPLOT_ASCII, TECPLOT, SURFACE_TECPLOT_ASCII,
 %  SURFACE_TECPLOT, CSV, SURFACE_CSV, PARAVIEW_ASCII, PARAVIEW_LEGACY, SURFACE_PARAVIEW_ASCII,
-%  SURFACE_PARAVIEW_LEGACY, PARAVIEW, SURFACE_PARAVIEW, RESTART_ASCII, RESTART, CGNS, SURFACE_CGNS, STL_ASCII, STL)
+%  SURFACE_PARAVIEW_LEGACY, PARAVIEW, SURFACE_PARAVIEW, RESTART_ASCII, RESTART, CGNS, SURFACE_CGNS, STL_ASCII, STL_BINARY)
 % default : (RESTART, PARAVIEW, SURFACE_PARAVIEW)
 OUTPUT_FILES= (RESTART, PARAVIEW, SURFACE_PARAVIEW)
 %