Merge branch 'develop' into feature_OptimalPropeller

Author: EttoreSaetta

SU2_CFD/include/output/filewriter/CSU2FileWriter.hpp

@@ -44,11 +44,6 @@ class CSU2FileWriter final: public CFileWriter{
    */
   CSU2FileWriter(string valFileName, CParallelDataSorter* valDataSorter);
 
-  /*!
-   * \brief Destructor
-   */
-  ~CSU2FileWriter() override;
-
   /*!
    * \brief Write sorted data to file in SU2 ASCII file format
    */

SU2_CFD/include/output/filewriter/CSU2MeshFileWriter.hpp

@@ -50,11 +50,6 @@ class CSU2MeshFileWriter final: public CFileWriter{
   CSU2MeshFileWriter(string valFileName, CParallelDataSorter* valDataSorter,
                      unsigned short valiZone, unsigned short valnZone);
 
-  /*!
-   * \brief Destructor
-   */
-  ~CSU2MeshFileWriter() override;
-
   /*!
    * \brief Write sorted data to file in SU2 mesh file format
    * \param[in] - The name of the file

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -1963,15 +1963,15 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
   unsigned long iVertex, iPoint, iPointNormal;
   unsigned short iMarker, iMarker_Monitoring, iDim, jDim;
-  unsigned short T_INDEX, TVE_INDEX, VEL_INDEX;
+  unsigned short T_INDEX = 0, TVE_INDEX = 0, VEL_INDEX = 0;
   su2double Viscosity = 0.0, div_vel, WallDist[3] = {0.0}, Area, WallShearStress, TauNormal, RefTemp, RefVel2 = 0.0,
             RefDensity = 0.0, GradTemperature, Density = 0.0, WallDistMod, FrictionVel, Mach2Vel, Mach_Motion,
             UnitNormal[3] = {0.0}, TauElem[3] = {0.0}, TauTangent[3] = {0.0}, Tau[3][3] = {{0.0}}, Cp,
-            thermal_conductivity, thermal_conductivity_tr, thermal_conductivity_ve,
+            thermal_conductivity, thermal_conductivity_tr, thermal_conductivity_ve = 0.0,
             MaxNorm = 8.0, Grad_Vel[3][3] = {{0.0}}, Grad_Temp[3] = {0.0}, AxiFactor,
             delta[3][3] = {{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
   const su2double *Coord = nullptr, *Coord_Normal = nullptr, *Normal = nullptr;
-  su2double **Grad_PrimVar, dTn, dTven;
+  su2double **Grad_PrimVar = nullptr, dTn, dTven;
 
   string Marker_Tag, Monitoring_Tag;
 

SU2_CFD/include/solvers/CNEMOEulerSolver.hpp

@@ -43,8 +43,8 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
 
   unsigned short
   nSpecies;                              /*!< \brief Number of species in the gas mixture. */
-                  
-  su2double                  
+
+  su2double
   Energy_ve_Inf,                         /*!< \brief Vib.-el. free stream energy. */
   Temperature_ve_Inf;                    /*!< \brief Vib.-el. free stream temperature. */
   const su2double *MassFrac_Inf;        /*!< \brief Free stream species mass fraction. */
@@ -83,7 +83,7 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
      * \param[in] config - Definition of the particular problem.
      */
   void SetMax_Eigenvalue(CGeometry *geometry, CConfig *config);
-  
+
    /*!
   * \brief Compute the time step for solving the Euler equations.
   * \param[in] geometry - Geometrical definition of the problem.
@@ -176,7 +176,7 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
    * \return - The number of non-physical points.
    */
   unsigned long SetPrimitive_Variables(CSolver **solver_container,
-                                       bool Output); 
+                                       bool Output);
 
   /*!
      * \brief Compute the preconditioner for convergence acceleration by Roe-Turkel method.

SU2_CFD/include/variables/CVariable.hpp

@@ -36,10 +36,10 @@
 #include <cstdlib>
 
 #include "../../../Common/include/CConfig.hpp"
-#include "../fluid/CFluidModel.hpp"
-#include "../fluid/CNEMOGas.hpp"
 #include "../../../Common/include/toolboxes/C2DContainer.hpp"
 
+class CFluidModel;
+class CNEMOGas;
 
 using namespace std;
 

SU2_CFD/src/output/filewriter/CSU2FileWriter.cpp

@@ -32,79 +32,51 @@ const string CSU2FileWriter::fileExt = ".csv";
 CSU2FileWriter::CSU2FileWriter(string valFileName, CParallelDataSorter *valDataSorter) :
   CFileWriter(std::move(valFileName), valDataSorter, fileExt){}
 
-
-CSU2FileWriter::~CSU2FileWriter(){
-
-}
-
 void CSU2FileWriter::Write_Data(){
 
-  /*--- Local variables ---*/
-
-  unsigned short iVar;
-  unsigned long iPoint;
-
   ofstream restart_file;
-
-  int iProcessor;
   const vector<string> fieldNames = dataSorter->GetFieldNames();
 
   /*--- Set a timer for the file writing. ---*/
 
   startTime = SU2_MPI::Wtime();
 
-  /*--- Only the master node writes the header. ---*/
+  /*--- Only the FIRST node writes the header (it does not matter if that is the master). ---*/
 
-  if (rank == MASTER_NODE) {
-    restart_file.open(fileName.c_str(), ios::out);
-    restart_file.precision(15);
+  if (rank == 0) {
+    restart_file.open(fileName);
     restart_file << "\"PointID\"";
-    for (iVar = 0; iVar < fieldNames.size()-1; iVar++)
-      restart_file << ",\"" << fieldNames[iVar] << "\"";
-    restart_file << ",\"" << fieldNames[fieldNames.size()-1] << "\"" << endl;
+    for (auto& field : fieldNames) restart_file << ",\"" << field << "\"";
+    restart_file << "\n";
     restart_file.close();
   }
 
-#ifdef HAVE_MPI
-  SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
-
-  /*--- All processors open the file. ---*/
+  /*--- Serialize the writes to the restart file. ---*/
 
-  restart_file.open(fileName.c_str(), ios::out | ios::app);
-  restart_file.precision(15);
-
-  /*--- Write the restart file in parallel, processor by processor. ---*/
-
-  unsigned long myPoint = 0, Global_Index;
-  for (iProcessor = 0; iProcessor < size; iProcessor++) {
+  for (int iProcessor = 0; iProcessor < size; iProcessor++) {
     if (rank == iProcessor) {
-      for (iPoint = 0; iPoint < dataSorter->GetnPoints(); iPoint++) {
+      restart_file.open(fileName, ios::app);
+      restart_file.precision(15);
 
-        /*--- Global Index of the current point. (note outer loop over procs) ---*/
+      for (auto iPoint = 0ul; iPoint < dataSorter->GetnPoints(); iPoint++) {
 
-        Global_Index = dataSorter->GetGlobalIndex(iPoint);
+        /*--- Write global index of the current point. ---*/
 
-        /*--- Write global index. (note outer loop over procs) ---*/
+        restart_file << dataSorter->GetGlobalIndex(iPoint);
 
-        restart_file << Global_Index << ", ";
-        myPoint++;
+        /*--- Loop over the variables and write the values to file. ---*/
 
-        /*--- Loop over the variables and write the values to file ---*/
-
-        for (iVar = 0; iVar < fieldNames.size()-1; iVar++) {
-          restart_file << scientific << dataSorter->GetData(iVar, iPoint) << ", ";
-        }
-        restart_file << scientific << dataSorter->GetData(fieldNames.size()-1, iPoint) << "\n";
+        for (size_t iVar = 0; iVar < fieldNames.size(); iVar++)
+          restart_file << ", " << scientific << dataSorter->GetData(iVar, iPoint);
+        restart_file << "\n";
       }
 
+      restart_file.close();
     }
-    /*--- Flush the file and wait for all processors to arrive. ---*/
-    restart_file.flush();
-#ifdef HAVE_MPI
-    SU2_MPI::Barrier(MPI_COMM_WORLD);
-#endif
 
+    /*--- Wait for iProcessor to finish and close the file. ---*/
+
+    SU2_MPI::Barrier(MPI_COMM_WORLD);
   }
 
   /*--- Compute and store the write time. ---*/
@@ -120,8 +92,4 @@ void CSU2FileWriter::Write_Data(){
   /*--- Compute and store the bandwidth ---*/
 
   bandwidth = fileSize/(1.0e6)/usedTime;
-
-  /*--- All processors close the file. ---*/
-
-  restart_file.close();
 }