fix build and clean a bunch of warnings

pcarruscag · pcarruscag · commit 8a49e8263461 · 2020-08-12T17:41:00.000+01:00
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp b/SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp
@@ -234,7 +234,7 @@ class CFVMFlowSolverBase : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] reconstruction - indicator that the gradient being computed is for upwind reconstruction.
    */
-  void SetPrimitive_Gradient_GG(CGeometry* geometry, const CConfig* config, bool reconstruction = false) final;
+  void SetPrimitive_Gradient_GG(CGeometry* geometry, const CConfig* config, bool reconstruction = false) override;
 
   /*!
    * \brief Compute the gradient of the primitive variables using a Least-Squares method,
@@ -243,7 +243,7 @@ class CFVMFlowSolverBase : public CSolver {
    * \param[in] config - Definition of the particular problem.
    * \param[in] reconstruction - indicator that the gradient being computed is for upwind reconstruction.
    */
-  void SetPrimitive_Gradient_LS(CGeometry* geometry, const CConfig* config, bool reconstruction = false) final;
+  void SetPrimitive_Gradient_LS(CGeometry* geometry, const CConfig* config, bool reconstruction = false) override;
 
   /*!
    * \brief Compute the limiter of the primitive variables.
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
diff --git a/SU2_CFD/include/solvers/CNEMOEulerSolver.hpp b/SU2_CFD/include/solvers/CNEMOEulerSolver.hpp
@@ -96,7 +96,7 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
                     CSolver **solver_container,
                     CConfig *config,
                     unsigned short iMesh,
-                    unsigned long Iteration);
+                    unsigned long Iteration) final;
 
   /*!
    * \brief Set the initial condition for the Euler Equations.
@@ -105,7 +105,7 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
    * \param[in] config - Definition of the particular problem.
    * \param[in] ExtIter - External iteration.
    */
-  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter);
+  void SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long ExtIter) final;
 
   /*!
    * \brief Load a solution from a restart file.
@@ -115,7 +115,7 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
    * \param[in] val_iter - Current external iteration number.
    * \param[in] val_update_geo - Flag for updating coords and grid velocity.
    */
-  void LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo);
+  void LoadRestart(CGeometry **geometry, CSolver ***solver, CConfig *config, int val_iter, bool val_update_geo) final;
 
   /*!
    * \brief Compute the spatial integration using a centered scheme.
@@ -125,49 +125,48 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
    * \param[in] config - Definition of the particular problem.
    * \param[in] iMesh - Index of the mesh in multigrid computations.
    */
-  void Centered_Residual(CGeometry *geometry, CSolver **solver_container, CNumerics *numerics,
-                         CConfig *config, unsigned short iMesh, unsigned short iRKStep);
+  void Centered_Residual(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics,
+                         CConfig *config, unsigned short iMesh, unsigned short iRKStep) final;
 
   /*!
-     * \brief Compute the spatial integration using a upwind scheme.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] solver_container - Container vector with all the solutions.
-     * \param[in] solver - Description of the numerical method.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] iMesh - Index of the mesh in multigrid computations.
-     */
-   void Upwind_Residual(CGeometry *geometry,
+   * \brief Compute the spatial integration using a upwind scheme.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] solver - Description of the numerical method.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iMesh - Index of the mesh in multigrid computations.
+   */
+  void Upwind_Residual(CGeometry *geometry,
                        CSolver **solver_container,
                        CNumerics **numerics_container,
                        CConfig *config,
                        unsigned short iMesh) final;
 
- 
-
   /*!
-     * \brief Source term integration.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] solver_container - Container vector with all the solutions.
-     * \param[in] numerics - Description of the numerical method.
+   * \brief Source term integration.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] numerics - Description of the numerical method.
    * \param[in] second_numerics - Description of the second numerical method.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] iMesh - Index of the mesh in multigrid computations.
-     */
-   void Source_Residual(CGeometry *geometry,
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iMesh - Index of the mesh in multigrid computations.
+   */
+  void Source_Residual(CGeometry *geometry,
                        CSolver **solver_container,
                        CNumerics **numerics_container,
                        CConfig *config,
                        unsigned short iMesh) final;
 
   /*!
-     * \brief Compute the velocity^2, SoundSpeed, Pressure, Enthalpy, Viscosity.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] solver_container - Container vector with all the solutions.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] iRKStep - Current step of the Runge-Kutta iteration.
+   * \brief Compute the velocity^2, SoundSpeed, Pressure, Enthalpy, Viscosity.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iRKStep - Current step of the Runge-Kutta iteration.
    * \param[in] RunTime_EqSystem - System of equations which is going to be solved.
-     */
-  void Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iMesh, unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output);
+   */
+  void Preprocessing(CGeometry *geometry, CSolver **solver_container, CConfig *config, unsigned short iMesh,
+                     unsigned short iRKStep, unsigned short RunTime_EqSystem, bool Output) override;
 
   /*!
    * \brief Computes primitive variables.
@@ -194,25 +193,14 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
   void SetNondimensionalization(CConfig *config, unsigned short iMesh) final;
 
   /*!
-     * \brief Impose via the residual the Euler wall boundary condition.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] solver_container - Container vector with all the solutions.
-     * \param[in] numerics - Description of the numerical method.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] val_marker - Surface marker where the boundary condition is applied.
-     */
-  //void BC_Euler_Wall(CGeometry *geometry, CSolver **solver_container, CNumerics *conv_numerics,
-  //                   CNumerics *visc_numerics, CConfig *config, unsigned short val_marker) final;
-
-  /*!
-     * \brief Impose the far-field boundary condition using characteristics.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] solver_container - Container vector with all the solutions.
-     * \param[in] conv_numerics - Description of the numerical method for convective terms.
+   * \brief Impose the far-field boundary condition using characteristics.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] solver_container - Container vector with all the solutions.
+   * \param[in] conv_numerics - Description of the numerical method for convective terms.
    * \param[in] visc_numerics - Description of the numerical method for viscous terms.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] val_marker - Surface marker where the boundary condition is applied.
-     */
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Surface marker where the boundary condition is applied.
+   */
   void BC_Far_Field(CGeometry *geometry, CSolver **solver_container, CNumerics *conv_numerics,
                     CNumerics *visc_numerics, CConfig *config, unsigned short val_marker) override;
 
@@ -314,30 +302,12 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
   void SetResidual_DualTime(CGeometry *geometry, CSolver **solver_container, CConfig *config,
                             unsigned short iRKStep, unsigned short iMesh, unsigned short RunTime_EqSystem) override;
 
-  /*!
-     * \brief Load a direct flow solution for use with the adjoint solver.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] config - Definition of the particular problem.
-     * \param[in] val_iZone - Current zone in the mesh.
-     */
-  void GetRestart(CGeometry *geometry, CConfig *config, unsigned short val_iZone);
-
-  /*!
-     * \brief Load the output data container with the variables to be written to the volume solution file.
-   * \param[in] config - Definition of the particular problem.
-     * \param[in] geometry - Geometrical definition of the problem.
-     * \param[in] data_container - Container holding the output variable data.
-   * \param[in] nOutput_Vars - Number of output variables being stored.
-     */
-  void SetVolume_Output(CConfig *config, CGeometry *geometry, su2double **data_container, unsigned short nOutput_Vars);
-
   /*!
    * \brief Compute a pressure sensor switch.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] solver_container - Container vector with all the solutions.
    * \param[in] config - Definition of the particular problem.
-    */
-
+   */
   inline void SetCentered_Dissipation_Sensor(CGeometry *geometry, CConfig *config) { }
 
    /*!
@@ -353,4 +323,4 @@ class CNEMOEulerSolver : public CFVMFlowSolverBase<CNEMOEulerVariable, COMPRESSI
    */
   void PrintVerificationError(const CConfig* config) const final { }
 
-};
+};
diff --git a/SU2_CFD/include/solvers/CNEMONSSolver.hpp b/SU2_CFD/include/solvers/CNEMONSSolver.hpp
@@ -40,7 +40,7 @@
  * \author S. R. Copeland, F. Palacios, W. Maier.
  * \version 6.1
  */
-class CNEMONSSolver : public CNEMOEulerSolver {
+class CNEMONSSolver final : public CNEMOEulerSolver {
 private:
 
   su2double Prandtl_Lam,   /*!< \brief Laminar Prandtl number. */
@@ -76,8 +76,8 @@ class CNEMONSSolver : public CNEMOEulerSolver {
    * \param[in] reconstruction - indicator that the gradient being computed is for upwind reconstruction.
    */
   void SetPrimitive_Gradient_GG(CGeometry *geometry,
-                                CConfig *config,
-                                bool reconstruction = false);
+                                const CConfig *config,
+                                bool reconstruction = false) override;
 
   /*!
    * \brief Compute the gradient of the primitive variables using a Least-Squares method,
@@ -87,8 +87,8 @@ class CNEMONSSolver : public CNEMOEulerSolver {
    * \param[in] reconstruction - indicator that the gradient being computed is for upwind reconstruction.
    */
   void SetPrimitive_Gradient_LS(CGeometry *geometry,
-                                CConfig *config,
-                                bool reconstruction = false);
+                                const CConfig *config,
+                                bool reconstruction = false) override;
 
   /*!
    * \brief Impose a constant heat-flux condition at the wall.
@@ -100,7 +100,7 @@ class CNEMONSSolver : public CNEMOEulerSolver {
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_HeatFlux_Wall(CGeometry *geometry, CSolver **solver_container, CNumerics *conv_numerics,
-                        CNumerics *visc_numerics, CConfig *config, unsigned short val_marker);
+                        CNumerics *visc_numerics, CConfig *config, unsigned short val_marker) override;
 
   /*!
    * \brief Impose a constant heat-flux condition at the wall.
@@ -142,7 +142,7 @@ class CNEMONSSolver : public CNEMOEulerSolver {
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
   void BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_container, CNumerics *conv_numerics,
-                          CNumerics *visc_numerics, CConfig *config, unsigned short val_marker);
+                          CNumerics *visc_numerics, CConfig *config, unsigned short val_marker) override;
 
   /*!
    * \brief Impose the Navier-Stokes boundary condition (strong).
@@ -185,7 +185,7 @@ class CNEMONSSolver : public CNEMOEulerSolver {
                                CNumerics *conv_numerics,
                                CNumerics *visc_numerics,
                                CConfig *config,
-                               unsigned short val_marker);
+                               unsigned short val_marker) override;
 
   /*!
    * \brief Compute the viscous residuals.
@@ -197,6 +197,6 @@ class CNEMONSSolver : public CNEMOEulerSolver {
    * \param[in] iRKStep - Current step of the Runge-Kutta iteration.
    */
   void Viscous_Residual(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics_container,
-                        CConfig *config, unsigned short iMesh, unsigned short iRKStep);
+                        CConfig *config, unsigned short iMesh, unsigned short iRKStep) override;
 
-};
+};
diff --git a/SU2_CFD/include/variables/CNEMOEulerVariable.hpp b/SU2_CFD/include/variables/CNEMOEulerVariable.hpp
@@ -259,7 +259,8 @@ class CNEMOEulerVariable : public CVariable {
    * \param[in] iDim   - Index of the dimension.
    * \param[in] value  - Value of the reconstruction gradient component.
    */
-  inline void SetGradient_Reconstruction(unsigned long iPoint, unsigned long iVar, unsigned long iDim, su2double value) { Gradient_Reconstruction(iPoint,iVar,iDim) = value;
+  inline void SetGradient_Reconstruction(unsigned long iPoint, unsigned long iVar, unsigned long iDim, su2double value) override {
+    Gradient_Reconstruction(iPoint,iVar,iDim) = value;
   }
 
   /*!
@@ -434,28 +435,28 @@ class CNEMOEulerVariable : public CVariable {
    * \brief A virtual member.
    * \return Value of the vibrational-electronic temperature.
    */
-  inline su2double GetTemperature_ve(unsigned long iPoint) const
+  inline su2double GetTemperature_ve(unsigned long iPoint) const override
                                     { return Primitive(iPoint,TVE_INDEX); }
 
   /*!
    * \brief Sets the vibrational electronic temperature of the flow.
    * \return Value of the temperature of the flow.
    */
-  inline bool SetTemperature_ve(unsigned long iPoint, su2double val_Tve)
+  inline bool SetTemperature_ve(unsigned long iPoint, su2double val_Tve) override
                                { Primitive(iPoint,TVE_INDEX) = val_Tve; return false; }
 
   /*!
    * \brief Get the mixture specific heat at constant volume (trans.-rot.).
    * \return \f$\rho C^{t-r}_{v} \f$
    */
-  inline su2double GetRhoCv_tr(unsigned long iPoint) const
+  inline su2double GetRhoCv_tr(unsigned long iPoint) const override
                               { return Primitive(iPoint,RHOCVTR_INDEX); }
 
   /*!
    * \brief Get the mixture specific heat at constant volume (vib.-el.).
    * \return \f$\rho C^{v-e}_{v} \f$
    */
-  inline su2double GetRhoCv_ve(unsigned long iPoint) const
+  inline su2double GetRhoCv_ve(unsigned long iPoint) const override
                               { return Primitive(iPoint,RHOCVVE_INDEX); }
 
   /*!
@@ -471,17 +472,17 @@ class CNEMOEulerVariable : public CVariable {
   /*!
    * \brief Set partial derivative of pressure w.r.t. density \f$\frac{\partial P}{\partial \rho_s}\f$
    */
-  inline su2double *GetdPdU(unsigned long iPoint) { return dPdU[iPoint]; }
+  inline su2double *GetdPdU(unsigned long iPoint) override { return dPdU[iPoint]; }
 
   /*!
    * \brief Set partial derivative of temperature w.r.t. density \f$\frac{\partial T}{\partial \rho_s}\f$
    */
-  inline su2double *GetdTdU(unsigned long iPoint) { return dTdU[iPoint]; }
+  inline su2double *GetdTdU(unsigned long iPoint) override { return dTdU[iPoint]; }
 
   /*!
    * \brief Set partial derivative of vib.-el. temperature w.r.t. density \f$\frac{\partial T^{V-E}}{\partial \rho_s}\f$
    */
-  inline su2double *GetdTvedU(unsigned long iPoint) { return dTvedU[iPoint]; }
+  inline su2double *GetdTvedU(unsigned long iPoint) override { return dTvedU[iPoint]; }
 
   /*!
    * \brief Get the mass fraction \f$\rho_s / \rho \f$ of species s.
diff --git a/SU2_CFD/src/solvers/CNEMOEulerSolver.cpp b/SU2_CFD/src/solvers/CNEMOEulerSolver.cpp
@@ -730,12 +730,14 @@ void CNEMOEulerSolver::SetMax_Eigenvalue(CGeometry *geometry, CConfig *config) {
 
 }
 
-void CNEMOEulerSolver::Centered_Residual(CGeometry *geometry, CSolver **solver_container, CNumerics *numerics,
+void CNEMOEulerSolver::Centered_Residual(CGeometry *geometry, CSolver **solver_container, CNumerics **numerics_container,
                                          CConfig *config, unsigned short iMesh, unsigned short iRKStep) {
   unsigned long iEdge, iPoint, jPoint;
   unsigned short iVar, jVar;
   bool err;
 
+  auto numerics = numerics_container[CONV_TERM];
+
   /*--- Set booleans based on config settings ---*/
   bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
 
@@ -3073,44 +3075,3 @@ void CNEMOEulerSolver::LoadRestart(CGeometry **geometry, CSolver ***solver, CCon
 
 }
 
-void CNEMOEulerSolver::SetVolume_Output(CConfig *config, CGeometry *geometry, su2double **data_container, unsigned short nOutput_Vars) {
-
-#ifdef DEBUG_TDE
-
-  unsigned short iVar;
-  unsigned long iPoint;
-
-  /*--- Add up total number of output variables to be written. ---*/
-  nOutput_Vars = nVar;
-
-  for (iVar = 0; iVar < config->GetnOutput_Vars_Vol(); iVar++ ) {
-
-    switch(config->GetOutput_Vars_Vol(iVar)) {
-    case PRESSURE:
-      nOutput_Vars++;
-      break;
-    case MACH:
-      nOutput_Vars++;
-      break;
-    }
-  }
-
-  // NEEDS TO BE MAX NUMBER OF POINTS ON ANY PARTITION ?
-  data_container = new su2double*[nOutput_Vars];
-  for (iVar = 0; iVar < nOutput_Vars; iVar++ ) {
-    data_container[iVar] = new su2double[nPointDomain];
-  }
-
-  for (iVar = 0; iVar < config->GetnOutput_Vars_Vol(); iVar++ ) {
-
-    switch(config->GetOutput_Vars_Vol(iVar)) {
-    case PRESSURE:
-      nOutput_Vars++;
-      break;
-    case MACH:
-      nOutput_Vars++;
-      break;
-    }
-  }
-#endif
-}
diff --git a/SU2_CFD/src/solvers/CNEMONSSolver.cpp b/SU2_CFD/src/solvers/CNEMONSSolver.cpp
