fix lgtm warnings

pcarruscag · pcarruscag · commit c3831fa8dc23 · 2021-04-19T17:34:50.000+01:00
diff --git a/Common/include/toolboxes/C1DInterpolation.hpp b/Common/include/toolboxes/C1DInterpolation.hpp
@@ -38,8 +38,6 @@ using namespace std;
 class C1DInterpolation{
 protected:
   bool Point_Match = false; /*!< \brief to make sure all points from the inlet data match the vertex coordinates */
-  vector<su2double> X;      /*!< \brief x for inlet data */
-  vector<su2double> Data;   /*!< \brief f(x) for inlet data */
 
 public:
   /*!
@@ -52,7 +50,7 @@ class C1DInterpolation{
    * \param[in] X - the x values.
    * \param[in] Data - the f(x) values.
    */
-  virtual void SetSpline(const vector<su2double> &X, const vector<su2double> &Data){}
+  virtual void SetSpline(const vector<su2double> &X, const vector<su2double> &Data) = 0;
 
   /*!
    * \brief virtual method for evaluating the value of the respective Spline.
@@ -80,7 +78,7 @@ class CAkimaInterpolation final: public C1DInterpolation{
    * \param[in] Data - the f(x) values.
    */
   CAkimaInterpolation(vector<su2double> &X, vector<su2double> &Data){
-      SetSpline(X,Data);
+    SetSpline(X,Data);
   }
 
   /*!
@@ -110,7 +108,7 @@ class CLinearInterpolation final: public C1DInterpolation{
    * \param[in] Data - the f(x) values.
    */
   CLinearInterpolation(vector<su2double> &X, vector<su2double> &Data){
-      SetSpline(X,Data);
+    SetSpline(X,Data);
   }
 
   /*!
diff --git a/SU2_CFD/src/solvers/CSolver.cpp b/SU2_CFD/src/solvers/CSolver.cpp
@@ -3379,7 +3379,7 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
       vector<su2double> InletRadii = profileReader.GetColumnForProfile(jMarker, radius_index);
       vector<su2double> Interpolation_Column (nRows);
 
-      bool Interpolate = false;
+      bool Interpolate = true;
 
       switch(config->GetKindInletInterpolationFunction()){
 
@@ -3388,21 +3388,19 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
           break;
 
         case (AKIMA_1D):
-          for (unsigned short iCol=0; iCol < nColumns; iCol++){
+          for (auto iCol=0ul; iCol < nColumns; iCol++){
             Interpolation_Column = profileReader.GetColumnForProfile(jMarker, iCol);
             interpolator[iCol] = new CAkimaInterpolation(InletRadii,Interpolation_Column);
-            interpolation_function = "AKIMA";
-            Interpolate = true;
           }
+          interpolation_function = "AKIMA";
           break;
 
         case (LINEAR_1D):
-          for (unsigned short iCol=0; iCol < nColumns; iCol++){
+          for (auto iCol=0ul; iCol < nColumns; iCol++){
             Interpolation_Column = profileReader.GetColumnForProfile(jMarker, iCol);
             interpolator[iCol] = new CLinearInterpolation(InletRadii,Interpolation_Column);
-            interpolation_function = "LINEAR";
-            Interpolate = true;
           }
+          interpolation_function = "LINEAR";
           break;
 
         default:
@@ -3496,7 +3494,7 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
           const su2double Theta = atan2(Coord[1],Coord[0]);
 
           /* --- Evaluating and saving the final spline data ---*/
-          for (unsigned short iVar=0; iVar < nColumns; iVar++){
+          for (auto iVar=0ul; iVar < nColumns; iVar++){
 
             /*---Evaluate spline will get the respective value of the Data set (column) specified
             for that interpolator[iVar], cycling through all columns to get all the
