remove a few HAVE_MPI's, address more than a few compiler warnings

Author: pcarruscag

Common/src/grid_movement/CVolumetricMovement.cpp

@@ -353,7 +353,7 @@ void CVolumetricMovement::ComputenNonconvexElements(CGeometry *geometry, bool Sc
         nNonconvexElements++;
       }
     }
-  } else {
+  } else if (false) {
 
     /*--- 3D elements ---*/
     unsigned short iNode, iFace, nFaceNodes;
@@ -371,6 +371,8 @@ void CVolumetricMovement::ComputenNonconvexElements(CGeometry *geometry, bool Sc
 
           face_point_i = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, iNode));
 
+          /// TODO: Faces may have up to 4 nodes, not all posibilities are covered
+
           if (iNode == 0) {
             face_point_j = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, nFaceNodes-1));
             face_point_k = geometry->elem[iElem]->GetNode(geometry->elem[iElem]->GetFaces(iFace, iNode+1));
@@ -391,6 +393,9 @@ void CVolumetricMovement::ComputenNonconvexElements(CGeometry *geometry, bool Sc
           /*--- Calculate cross product of edge vectors and its length---*/
           su2double crossProduct[3];
           GeometryToolbox::CrossProduct(edgeVector_i, edgeVector_j, crossProduct);
+
+          /// TODO: This logic is incorrect, the norm will never be less than 0
+
           crossProductLength = GeometryToolbox::Norm(nDim, crossProduct);
 
           /*--- Check if length is minimum or maximum ---*/

SU2_CFD/include/numerics/NEMO/NEMO_diffusion.hpp

@@ -38,8 +38,8 @@
  */
 class CAvgGrad_NEMO : public CNEMONumerics {
 private:
-  unsigned short iDim, iVar;    /*!< \brief Iterators in dimension an variable. */
-  su2double *Mean_PrimVar,          /*!< \brief Mean primitive variables. */
+  unsigned short iVar;        /*!< \brief Iterators in dimension an variable. */
+  su2double *Mean_PrimVar,    /*!< \brief Mean primitive variables. */
   *Mean_U,
   **Mean_GU,
   *Mean_dTdU,
@@ -54,9 +54,8 @@ class CAvgGrad_NEMO : public CNEMONumerics {
   Mean_Eddy_Viscosity,          /*!< \brief Mean value of the eddy viscosity. */
   Mean_Thermal_Conductivity,    /*!< \brief Mean value of the thermal conductivity. */
   Mean_Thermal_Conductivity_ve, /*!< \brief Mean value of the vib-el. thermal conductivity. */
-  *ProjFlux,                    /*!< \brief Projection of the viscous fluxes. */
   dist_ij;                      /*!< \brief Length of the edge and face. */
- 
+
 public:
 
   /*!
@@ -109,13 +108,11 @@ class CAvgGradCorrected_NEMO : public CNEMONumerics {
   Mean_Eddy_Viscosity,          /*!< \brief Mean value of the eddy viscosity. */
   Mean_Thermal_Conductivity,    /*!< \brief Mean value of the thermal conductivity. */
   Mean_Thermal_Conductivity_ve, /*!< \brief Mean value of the vib-el. thermal conductivity. */
-  
-  *ProjFlux,                    /*!< \brief Projection of the viscous fluxes. */
   dist_ij;                      /*!< \brief Length of the edge and face. */
   bool implicit;                /*!< \brief Implicit calculus. */
 
   su2double* Flux = nullptr;    /*!< \brief The flux / residual across the edge. */
-  
+
 public:
 
   /*!
@@ -142,5 +139,5 @@ class CAvgGradCorrected_NEMO : public CNEMONumerics {
    * \param[in] config - Definition of the particular problem.
    */
   ResidualType<> ComputeResidual(const CConfig* config) final;
-  
+
 };

SU2_CFD/include/solvers/CDiscAdjFEASolver.hpp

@@ -48,7 +48,6 @@ class CDiscAdjFEASolver final : public CSolver {
   su2double *Solution_Vel = nullptr,    /*!< \brief Velocity componenent of the solution. */
   *Solution_Accel = nullptr;            /*!< \brief Acceleration componenent of the solution. */
 
-  su2double ObjFunc_Value = 0.0;        /*!< \brief Value of the objective function. */
   su2double *normalLoads = nullptr;     /*!< \brief Values of the normal loads for each marker iMarker_nL. */
 
   unsigned short nMPROP = 0;            /*!< \brief Number of material properties */

SU2_CFD/include/solvers/CDiscAdjMeshSolver.hpp

@@ -39,7 +39,6 @@
  */
 class CDiscAdjMeshSolver final : public CSolver {
 private:
-  unsigned short KindDirect_Solver = 0;
   CSolver *direct_solver = nullptr;
 
   CDiscAdjMeshBoundVariable* nodes = nullptr;   /*!< \brief Variables of the discrete adjoint mesh solver. */

SU2_CFD/include/solvers/CDiscAdjSolver.hpp

@@ -49,7 +49,6 @@ class CDiscAdjSolver final : public CSolver {
   su2double Total_Sens_BPress;   /*!< \brief Total sensitivity to outlet pressure. */
   su2double Total_Sens_Density;  /*!< \brief Total sensitivity to initial density (incompressible). */
   su2double Total_Sens_ModVel;   /*!< \brief Total sensitivity to inlet velocity (incompressible). */
-  su2double ObjFunc_Value;       /*!< \brief Value of the objective function. */
   su2double Mach, Alpha, Beta, Pressure, Temperature, BPressure, ModVel;
   su2double TemperatureRad, Total_Sens_Temp_Rad;
 

SU2_CFD/include/variables/CNEMOEulerVariable.hpp

@@ -45,23 +45,23 @@ class CNEMOEulerVariable : public CVariable {
 
   bool ionization;          /*!< \brief Presence of charged species in gas mixture. */
   bool monoatomic = false;  /*!< \brief Presence of single species gas. */
-  
+
   VectorType Velocity2;     /*!< \brief Square of the velocity vector. */
   MatrixType Precond_Beta;  /*!< \brief Low Mach number preconditioner value, Beta. */
 
   CVectorOfMatrix& Gradient_Reconstruction;  /*!< \brief Reference to the gradient of the conservative variables for MUSCL reconstruction for the convective term */
   CVectorOfMatrix  Gradient_Aux;             /*!< \brief Auxiliary structure to store a second gradient for reconstruction, if required. */
-  
+
   /*--- Primitive variable definition ---*/
   MatrixType Primitive;                /*!< \brief Primitive variables (rhos_s, T, Tve, ...) in compressible flows. */
   MatrixType Primitive_Aux;            /*!< \brief Primitive auxiliary variables (Y_s, T, Tve, ...) in compressible flows. */
   CVectorOfMatrix Gradient_Primitive;  /*!< \brief Gradient of the primitive variables (rhos_s, T, Tve, ...). */
   MatrixType Limiter_Primitive;        /*!< \brief Limiter of the primitive variables  (rhos_s, T, Tve, ...). */
-  
+
   /*--- Secondary variable definition ---*/
   MatrixType Secondary;                /*!< \brief Primitive variables (T, vx, vy, vz, P, rho, h, c) in compressible flows. */
   CVectorOfMatrix Gradient_Secondary;  /*!< \brief Gradient of the primitive variables (T, vx, vy, vz, P, rho). */
-  
+
   /*--- New solution container for Classical RK4 ---*/
   MatrixType Solution_New;  /*!< \brief New solution container for Classical RK4. */
 
@@ -72,11 +72,11 @@ class CNEMOEulerVariable : public CVariable {
   MatrixType eves;   /*!< \brief energy of vib-el mode w.r.t. species. */
   MatrixType Cvves;  /*!< \brief Specific heat of vib-el mode w.r.t. species. */
   VectorType Gamma;  /*!< \brief Ratio of specific heats. */
-  
+
   CNEMOGas *fluidmodel;
 
   /*!< \brief Index definition for NEMO pritimive variables. */
-  unsigned long RHOS_INDEX, T_INDEX, TVE_INDEX, VEL_INDEX, P_INDEX, 
+  unsigned long RHOS_INDEX, T_INDEX, TVE_INDEX, VEL_INDEX, P_INDEX,
   RHO_INDEX, H_INDEX, A_INDEX, RHOCVTR_INDEX, RHOCVVE_INDEX,
   LAM_VISC_INDEX, EDDY_VISC_INDEX, nSpecies;
 
@@ -513,7 +513,7 @@ class CNEMOEulerVariable : public CVariable {
    * \param[in] val_Species - Index of species s.
    * \return Value of the mass fraction of species s.
    */
-  inline su2double GetMassFraction(unsigned long iPoint, unsigned short val_Species) const {
+  inline su2double GetMassFraction(unsigned long iPoint, unsigned long val_Species) const override {
     return Primitive(iPoint,RHOS_INDEX+val_Species) / Primitive(iPoint,RHO_INDEX);
   }
 
@@ -575,5 +575,5 @@ class CNEMOEulerVariable : public CVariable {
    * \brief Retrieves the value of the RhoCvve in the primitive variable vector.
    */
   inline unsigned short GetRhoCvveIndex(void) { return RHOCVVE_INDEX; }
-  
+
 };

SU2_CFD/src/SU2_CFD.cpp

@@ -60,7 +60,6 @@ int main(int argc, char *argv[]) {
 
   /*--- MPI initialization, and buffer setting ---*/
 
-#ifdef HAVE_MPI
 #ifdef HAVE_OMP
   int required = use_thread_mult? MPI_THREAD_MULTIPLE : MPI_THREAD_FUNNELED;
   int provided;
@@ -69,9 +68,6 @@ int main(int argc, char *argv[]) {
   SU2_MPI::Init(&argc, &argv);
 #endif
   SU2_Comm MPICommunicator(MPI_COMM_WORLD);
-#else
-  SU2_Comm MPICommunicator(0);
-#endif
 
   /*--- Uncomment the following line if runtime NaN catching is desired. ---*/
   // feenableexcept(FE_INVALID | FE_OVERFLOW);

SU2_CFD/src/solvers/CNEMOEulerSolver.cpp

@@ -219,22 +219,22 @@ CNEMOEulerSolver::CNEMOEulerSolver(CGeometry *geometry, CConfig *config,
   counter_local = 0;
 
   for (iPoint = 0; iPoint < nPoint; iPoint++) {
-  
+
     nonPhys = nodes->SetPrimVar(iPoint, FluidModel);
-  
+
     /*--- Set mixture state ---*/
-    FluidModel->SetTDStatePTTv(Pressure_Inf, MassFrac_Inf, Temperature_Inf, Temperature_ve_Inf);  
+    FluidModel->SetTDStatePTTv(Pressure_Inf, MassFrac_Inf, Temperature_Inf, Temperature_ve_Inf);
 
     /*--- Compute other freestream quantities ---*/
     Density_Inf    = FluidModel->GetDensity();
     Soundspeed_Inf = FluidModel->GetSoundSpeed();
-  
+
     sqvel = 0.0;
     for (iDim = 0; iDim < nDim; iDim++){
       sqvel += Mvec_Inf[iDim]*Soundspeed_Inf * Mvec_Inf[iDim]*Soundspeed_Inf;
     }
     const auto& Energies_Inf = FluidModel->ComputeMixtureEnergies();
-  
+
     /*--- Initialize Solution & Solution_Old vectors ---*/
     for (iSpecies = 0; iSpecies < nSpecies; iSpecies++) {
       Solution[iSpecies]      = Density_Inf*MassFrac_Inf[iSpecies];
@@ -246,9 +246,9 @@ CNEMOEulerSolver::CNEMOEulerSolver(CGeometry *geometry, CConfig *config,
     Solution[nSpecies+nDim+1]   = Density_Inf*Energies_Inf[1];
     nodes->SetSolution(iPoint,Solution);
     nodes->SetSolution_Old(iPoint,Solution);
-  
+
     if(nonPhys)
-      counter_local++;  
+      counter_local++;
   }
 
   /*--- Warning message about non-physical points ---*/
@@ -614,6 +614,7 @@ void CNEMOEulerSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_contai
   SU2_OMP_MASTER
   if (config->GetComm_Level() == COMM_FULL) {
     su2double rbuf_time;
+    SU2_MPI::Allreduce(&Min_Delta_Time, &rbuf_time, 1, MPI_DOUBLE, MPI_MIN, MPI_COMM_WORLD);
     Min_Delta_Time = rbuf_time;
 
     SU2_MPI::Allreduce(&Max_Delta_Time, &rbuf_time, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
@@ -1501,7 +1502,7 @@ void CNEMOEulerSolver::SetNondimensionalization(CConfig *config, unsigned short
    #else
      SU2_MPI::Error(string("Either 1) Mutation++ has not been configured/compiled (add '-Denable-mpp=true' to your meson string) or 2) CODI must be deactivated since it is not compatible with Mutation++."),
      CURRENT_FUNCTION);
-   #endif    
+   #endif
    break;
   case SU2_NONEQ:
    FluidModel = new CSU2TCLib(config, nDim, viscous);

SU2_DEF/src/SU2_DEF.cpp

@@ -39,17 +39,13 @@ int main(int argc, char *argv[]) {
 
   /*--- MPI initialization ---*/
 
-#ifdef HAVE_MPI
 #ifdef HAVE_OMP
   int provided;
   SU2_MPI::Init_thread(&argc, &argv, MPI_THREAD_FUNNELED, &provided);
 #else
   SU2_MPI::Init(&argc, &argv);
 #endif
   SU2_MPI::Comm MPICommunicator(MPI_COMM_WORLD);
-#else
-  SU2_Comm MPICommunicator(0);
-#endif
 
   rank = SU2_MPI::GetRank();
   size = SU2_MPI::GetSize();
@@ -502,10 +498,7 @@ int main(int argc, char *argv[]) {
     cout << endl << "------------------------- Exit Success (SU2_DEF) ------------------------" << endl << endl;
 
   /*--- Finalize MPI parallelization ---*/
-
-#ifdef HAVE_MPI
   SU2_MPI::Finalize();
-#endif
 
   return EXIT_SUCCESS;
 

SU2_DOT/src/SU2_DOT.cpp

@@ -38,17 +38,13 @@ int main(int argc, char *argv[]) {
 
   /*--- MPI initialization, and buffer setting ---*/
 
-#ifdef HAVE_MPI
 #ifdef HAVE_OMP
   int provided;
   SU2_MPI::Init_thread(&argc, &argv, MPI_THREAD_FUNNELED, &provided);
 #else
   SU2_MPI::Init(&argc, &argv);
 #endif
   SU2_MPI::Comm MPICommunicator(MPI_COMM_WORLD);
-#else
-  SU2_Comm MPICommunicator(0);
-#endif
 
   const int rank = SU2_MPI::GetRank();
   const int size = SU2_MPI::GetSize();
@@ -407,10 +403,7 @@ int main(int argc, char *argv[]) {
     cout << "\n------------------------- Exit Success (SU2_DOT) ------------------------\n" << endl;
 
   /*--- Finalize MPI parallelization ---*/
-
-#ifdef HAVE_MPI
   SU2_MPI::Finalize();
-#endif
 
   return EXIT_SUCCESS;
 
@@ -777,11 +770,8 @@ void SetProjection_AD(CGeometry *geometry, CConfig *config, CSurfaceMovement *su
     for (iDV_Value = 0; iDV_Value < nDV_Value; iDV_Value++){
       DV_Value = config->GetDV_Value(iDV, iDV_Value);
       my_Gradient = SU2_TYPE::GetDerivative(DV_Value);
-#ifdef HAVE_MPI
-    SU2_MPI::Allreduce(&my_Gradient, &localGradient, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-#else
-      localGradient = my_Gradient;
-#endif
+      SU2_MPI::Allreduce(&my_Gradient, &localGradient, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+
       /*--- Angle of Attack design variable (this is different,
        the value comes form the input file) ---*/