fewer bare pointers in flow solver base

Author: pcarruscag

SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp

@@ -137,28 +137,28 @@ class CFVMFlowSolverBase : public CSolver {
   su2double Total_Heat = 0.0;           /*!< \brief Total heat load for all the boundaries. */
   su2double Total_MaxHeat = 0.0;        /*!< \brief Maximum heat flux on all boundaries. */
   su2double AllBound_CNearFieldOF_Inv = 0.0; /*!< \brief Near-Field press coeff (inviscid) for all the boundaries. */
-  su2double* CNearFieldOF_Inv = nullptr;     /*!< \brief Near field pressure (inviscid) for each boundary. */
-  su2double* Surface_HF_Visc = nullptr;      /*!< \brief Total (integrated) heat flux for each monitored surface. */
-  su2double* Surface_MaxHF_Visc = nullptr;   /*!< \brief Maximum heat flux for each monitored surface. */
-  su2double* HF_Visc = nullptr;              /*!< \brief Heat load (viscous contribution) for each boundary. */
-  su2double* MaxHF_Visc = nullptr;           /*!< \brief Maximum heat flux (viscous contribution) for each boundary. */
-  su2double AllBound_HF_Visc = 0.0;          /*!< \brief Heat load (viscous contribution) for all the boundaries. */
-  su2double AllBound_MaxHF_Visc = 0.0;       /*!< \brief Maximum heat flux (viscous contribution) for all boundaries. */
-
-  su2double** Inlet_Ptotal = nullptr;      /*!< \brief Value of the Total P. */
-  su2double** Inlet_Ttotal = nullptr;      /*!< \brief Value of the Total T. */
-  su2double*** Inlet_FlowDir = nullptr;    /*!< \brief Value of the Flow Direction. */
-  su2double** HeatFlux = nullptr;          /*!< \brief Heat transfer coefficient for each boundary and vertex. */
-  su2double** HeatFluxTarget = nullptr;    /*!< \brief Heat transfer coefficient for each boundary and vertex. */
-  su2double*** CharacPrimVar = nullptr;    /*!< \brief Value of the characteristic variables at each boundary. */
-  su2double*** CSkinFriction = nullptr;    /*!< \brief Skin friction coefficient for each boundary and vertex. */
-  su2double** WallShearStress = nullptr;   /*!< \brief Wall Shear Stress for each boundary and vertex. */
-  su2double*** HeatConjugateVar = nullptr; /*!< \brief CHT variables for each boundary and vertex. */
-  su2double** CPressure = nullptr;         /*!< \brief Pressure coefficient for each boundary and vertex. */
-  su2double** CPressureTarget = nullptr;   /*!< \brief Target Pressure coefficient for each boundary and vertex. */
-  su2double** YPlus = nullptr;             /*!< \brief Yplus for each boundary and vertex. */
-
-  bool space_centered;       /*!< \brief True if space centered scheeme used. */
+  vector<su2double> CNearFieldOF_Inv;    /*!< \brief Near field pressure (inviscid) for each boundary. */
+  vector<su2double> Surface_HF_Visc;     /*!< \brief Total (integrated) heat flux for each monitored surface. */
+  vector<su2double> Surface_MaxHF_Visc;  /*!< \brief Maximum heat flux for each monitored surface. */
+  vector<su2double> HF_Visc;             /*!< \brief Heat load (viscous contribution) for each boundary. */
+  vector<su2double> MaxHF_Visc;          /*!< \brief Maximum heat flux (viscous contribution) for each boundary. */
+  su2double AllBound_HF_Visc = 0.0;      /*!< \brief Heat load (viscous contribution) for all the boundaries. */
+  su2double AllBound_MaxHF_Visc = 0.0;   /*!< \brief Maximum heat flux (viscous contribution) for all boundaries. */
+
+  vector<vector<su2double> > Inlet_Ptotal;      /*!< \brief Value of the Total P. */
+  vector<vector<su2double> > Inlet_Ttotal;      /*!< \brief Value of the Total T. */
+  vector<su2activematrix> Inlet_FlowDir;        /*!< \brief Value of the Flow Direction. */
+  vector<vector<su2double> > HeatFlux;          /*!< \brief Heat transfer coefficient for each boundary and vertex. */
+  vector<vector<su2double> > HeatFluxTarget;    /*!< \brief Heat transfer coefficient for each boundary and vertex. */
+  vector<su2activematrix> CharacPrimVar;        /*!< \brief Value of the characteristic variables at each boundary. */
+  vector<su2activematrix> CSkinFriction;        /*!< \brief Skin friction coefficient for each boundary and vertex. */
+  vector<vector<su2double> > WallShearStress;   /*!< \brief Wall Shear Stress for each boundary and vertex. */
+  vector<su2activematrix> HeatConjugateVar;     /*!< \brief CHT variables for each boundary and vertex. */
+  vector<vector<su2double> > CPressure;         /*!< \brief Pressure coefficient for each boundary and vertex. */
+  vector<vector<su2double> > CPressureTarget;   /*!< \brief Target Pressure coefficient for each boundary and vertex. */
+  vector<vector<su2double> > YPlus;             /*!< \brief Yplus for each boundary and vertex. */
+
+  bool space_centered;       /*!< \brief True if space centered scheme used. */
   bool euler_implicit;       /*!< \brief True if euler implicit scheme used. */
   bool least_squares;        /*!< \brief True if computing gradients by least squares. */
   su2double Gamma;           /*!< \brief Fluid's Gamma constant (ratio of specific heats). */
@@ -167,7 +167,7 @@ class CFVMFlowSolverBase : public CSolver {
   /*--- Sliding meshes variables ---*/
 
   su2double**** SlidingState = nullptr;
-  int** SlidingStateNodes = nullptr;
+  vector<vector<int> > SlidingStateNodes;
 
   /*--- Shallow copy of grid coloring for OpenMP parallelization. ---*/
 
@@ -2193,7 +2193,7 @@ class CFVMFlowSolverBase : public CSolver {
    * \param[in] val_vertex - Vertex of the marker <i>val_marker</i> where the coefficient is evaluated.
    * \return Value of the pressure coefficient.
    */
-  inline su2double* GetCharacPrimVar(unsigned short val_marker, unsigned long val_vertex) const final {
+  inline su2double* GetCharacPrimVar(unsigned short val_marker, unsigned long val_vertex) final {
     return CharacPrimVar[val_marker][val_vertex];
   }
 
@@ -2251,8 +2251,6 @@ class CFVMFlowSolverBase : public CSolver {
      * checking to prevent segmentation faults ---*/
     if (val_marker >= nMarker)
       SU2_MPI::Error("Out-of-bounds marker index used on inlet.", CURRENT_FUNCTION);
-    else if (Inlet_Ttotal == nullptr || Inlet_Ttotal[val_marker] == nullptr)
-      SU2_MPI::Error("Tried to set custom inlet BC on an invalid marker.", CURRENT_FUNCTION);
     else if (val_vertex >= nVertex[val_marker])
       SU2_MPI::Error("Out-of-bounds vertex index used on inlet.", CURRENT_FUNCTION);
     else
@@ -2270,8 +2268,6 @@ class CFVMFlowSolverBase : public CSolver {
      * checking to prevent segmentation faults ---*/
     if (val_marker >= nMarker)
       SU2_MPI::Error("Out-of-bounds marker index used on inlet.", CURRENT_FUNCTION);
-    else if (Inlet_Ptotal == nullptr || Inlet_Ptotal[val_marker] == nullptr)
-      SU2_MPI::Error("Tried to set custom inlet BC on an invalid marker.", CURRENT_FUNCTION);
     else if (val_vertex >= nVertex[val_marker])
       SU2_MPI::Error("Out-of-bounds vertex index used on inlet.", CURRENT_FUNCTION);
     else
@@ -2291,8 +2287,6 @@ class CFVMFlowSolverBase : public CSolver {
      * checking to prevent segmentation faults ---*/
     if (val_marker >= nMarker)
       SU2_MPI::Error("Out-of-bounds marker index used on inlet.", CURRENT_FUNCTION);
-    else if (Inlet_FlowDir == nullptr || Inlet_FlowDir[val_marker] == nullptr)
-      SU2_MPI::Error("Tried to set custom inlet BC on an invalid marker.", CURRENT_FUNCTION);
     else if (val_vertex >= nVertex[val_marker])
       SU2_MPI::Error("Out-of-bounds vertex index used on inlet.", CURRENT_FUNCTION);
     else

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -84,8 +84,8 @@ void CFVMFlowSolverBase<V, R>::AeroCoeffsArray::setZero(int i) {
 
 template <class V, ENUM_REGIME R>
 void CFVMFlowSolverBase<V, R>::Allocate(const CConfig& config) {
-  unsigned short iDim, iVar, iMarker;
-  unsigned long iPoint, iVertex;
+  unsigned short iVar;
+  unsigned long iPoint, iMarker;
 
   /*--- Define some auxiliar vector related with the residual ---*/
 
@@ -116,19 +116,16 @@ void CFVMFlowSolverBase<V, R>::Allocate(const CConfig& config) {
 
   /*--- Allocates a 2D array with variable "outer" sizes and init to 0. ---*/
 
-  auto Alloc2D = [](unsigned long M, const unsigned long* N, su2double**& X) {
-    X = new su2double*[M];
-    for (unsigned long i = 0; i < M; ++i) X[i] = new su2double[N[i]]();
+  auto Alloc2D = [](unsigned long M, const unsigned long* N, vector<vector<su2double> >& X) {
+    X.resize(M);
+    for (unsigned long i = 0; i < M; ++i) X[i].resize(N[i],0.0);
   };
 
   /*--- Allocates a 3D array with variable "middle" sizes and init to 0. ---*/
 
-  auto Alloc3D = [](unsigned long M, const unsigned long* N, unsigned long P, su2double***& X) {
-    X = new su2double**[M];
-    for (unsigned long i = 0; i < M; ++i) {
-      X[i] = new su2double*[N[i]];
-      for (unsigned long j = 0; j < N[i]; ++j) X[i][j] = new su2double[P]();
-    }
+  auto Alloc3D = [](unsigned long M, const unsigned long* N, unsigned long P, vector<su2activematrix>& X) {
+    X.resize(M);
+    for (unsigned long i = 0; i < M; ++i) X[i].resize(N[i],P) = su2double(0.0);
   };
 
   /*--- Store the value of the characteristic primitive variables at the boundaries ---*/
@@ -164,25 +161,25 @@ void CFVMFlowSolverBase<V, R>::Allocate(const CConfig& config) {
 
   /*--- Heat flux coefficients. ---*/
 
-  HF_Visc = new su2double[nMarker];
-  MaxHF_Visc = new su2double[nMarker];
+  HF_Visc.resize(nMarker,0.0);
+  MaxHF_Visc.resize(nMarker,0.0);
 
-  Surface_HF_Visc = new su2double[config.GetnMarker_Monitoring()];
-  Surface_MaxHF_Visc = new su2double[config.GetnMarker_Monitoring()];
+  Surface_HF_Visc.resize(config.GetnMarker_Monitoring());
+  Surface_MaxHF_Visc.resize(config.GetnMarker_Monitoring());
 
   /*--- Supersonic coefficients ---*/
 
-  CNearFieldOF_Inv = new su2double[nMarker];
+  CNearFieldOF_Inv.resize(nMarker,0.0);
 
   /*--- Initializate quantities for SlidingMesh Interface ---*/
 
   SlidingState = new su2double***[nMarker]();
-  SlidingStateNodes = new int*[nMarker]();
+  SlidingStateNodes.resize(nMarker);
 
   for (iMarker = 0; iMarker < nMarker; iMarker++) {
     if (config.GetMarker_All_KindBC(iMarker) == FLUID_INTERFACE) {
       SlidingState[iMarker] = new su2double**[nVertex[iMarker]]();
-      SlidingStateNodes[iMarker] = new int[nVertex[iMarker]]();
+      SlidingStateNodes[iMarker].resize(nVertex[iMarker],0);
 
       for (iPoint = 0; iPoint < nVertex[iMarker]; iPoint++)
         SlidingState[iMarker][iPoint] = new su2double*[nPrimVar + 1]();
@@ -200,13 +197,9 @@ void CFVMFlowSolverBase<V, R>::Allocate(const CConfig& config) {
 
   /*--- Skin friction in all the markers ---*/
 
-  CSkinFriction = new su2double**[nMarker];
-  for (iMarker = 0; iMarker < nMarker; iMarker++) {
-    CSkinFriction[iMarker] = new su2double*[nDim];
-    for (iDim = 0; iDim < nDim; iDim++) {
-      CSkinFriction[iMarker][iDim] = new su2double[nVertex[iMarker]]();
-    }
-  }
+  CSkinFriction.resize(nMarker);
+  for (iMarker = 0; iMarker < nMarker; iMarker++)
+    CSkinFriction[iMarker].resize(nDim, nVertex[iMarker]) = su2double(0.0);
 
   /*--- Wall Shear Stress in all the markers ---*/
 
@@ -216,14 +209,8 @@ void CFVMFlowSolverBase<V, R>::Allocate(const CConfig& config) {
    used for coupling with a solid donor cell ---*/
   constexpr auto nHeatConjugateVar = 4u;
 
-  HeatConjugateVar = new su2double**[nMarker];
-  for (iMarker = 0; iMarker < nMarker; iMarker++) {
-    HeatConjugateVar[iMarker] = new su2double*[nVertex[iMarker]];
-    for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
-      HeatConjugateVar[iMarker][iVertex] = new su2double[nHeatConjugateVar]();
-      HeatConjugateVar[iMarker][iVertex][0] = config.GetTemperature_FreeStreamND();
-    }
-  }
+  Alloc3D(nMarker, nVertex, nHeatConjugateVar, HeatConjugateVar);
+  for (auto& x : HeatConjugateVar) x = config.GetTemperature_FreeStreamND();
 
   if (MGLevel == MESH_0) {
     VertexTraction.resize(nMarker);
@@ -385,14 +372,8 @@ void CFVMFlowSolverBase<V, R>::HybridParallelInitialization(const CConfig& confi
 
 template <class V, ENUM_REGIME R>
 CFVMFlowSolverBase<V, R>::~CFVMFlowSolverBase() {
-  unsigned short iMarker, iVar, iDim;
-  unsigned long iVertex;
-
-  delete[] CNearFieldOF_Inv;
-  delete[] HF_Visc;
-  delete[] MaxHF_Visc;
-  delete[] Surface_HF_Visc;
-  delete[] Surface_MaxHF_Visc;
+  unsigned short iVar;
+  unsigned long iMarker, iVertex;
 
   if (SlidingState != nullptr) {
     for (iMarker = 0; iMarker < nMarker; iMarker++) {
@@ -408,101 +389,6 @@ CFVMFlowSolverBase<V, R>::~CFVMFlowSolverBase() {
     delete[] SlidingState;
   }
 
-  if (SlidingStateNodes != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      if (SlidingStateNodes[iMarker] != nullptr) delete[] SlidingStateNodes[iMarker];
-    }
-    delete[] SlidingStateNodes;
-  }
-
-  if (CPressure != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) delete[] CPressure[iMarker];
-    delete[] CPressure;
-  }
-
-  if (CPressureTarget != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) delete[] CPressureTarget[iMarker];
-    delete[] CPressureTarget;
-  }
-
-  if (CharacPrimVar != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) delete[] CharacPrimVar[iMarker][iVertex];
-      delete[] CharacPrimVar[iMarker];
-    }
-    delete[] CharacPrimVar;
-  }
-
-  if (Inlet_Ttotal != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++)
-      if (Inlet_Ttotal[iMarker] != nullptr) delete[] Inlet_Ttotal[iMarker];
-    delete[] Inlet_Ttotal;
-  }
-
-  if (Inlet_Ptotal != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++)
-      if (Inlet_Ptotal[iMarker] != nullptr) delete[] Inlet_Ptotal[iMarker];
-    delete[] Inlet_Ptotal;
-  }
-
-  if (Inlet_FlowDir != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      if (Inlet_FlowDir[iMarker] != nullptr) {
-        for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) delete[] Inlet_FlowDir[iMarker][iVertex];
-        delete[] Inlet_FlowDir[iMarker];
-      }
-    }
-    delete[] Inlet_FlowDir;
-  }
-
-  if (HeatFlux != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      delete[] HeatFlux[iMarker];
-    }
-    delete[] HeatFlux;
-  }
-
-  if (HeatFluxTarget != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      delete[] HeatFluxTarget[iMarker];
-    }
-    delete[] HeatFluxTarget;
-  }
-
-  if (YPlus != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      delete[] YPlus[iMarker];
-    }
-    delete[] YPlus;
-  }
-
-  if (CSkinFriction != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      for (iDim = 0; iDim < nDim; iDim++) {
-        delete[] CSkinFriction[iMarker][iDim];
-      }
-      delete[] CSkinFriction[iMarker];
-    }
-    delete[] CSkinFriction;
-  }
-
-  if (WallShearStress != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      delete[] WallShearStress[iMarker];
-    }
-    delete[] WallShearStress;
-  }
-
-  if (HeatConjugateVar != nullptr) {
-    for (iMarker = 0; iMarker < nMarker; iMarker++) {
-      for (iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
-        delete[] HeatConjugateVar[iMarker][iVertex];
-      }
-      delete[] HeatConjugateVar[iMarker];
-    }
-    delete[] HeatConjugateVar;
-  }
-
   delete nodes;
   delete edgeNumerics;
 }
@@ -2890,8 +2776,8 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
     Allreduce_inplace(nMarkerMon, SurfaceViscCoeff.CMy);
     Allreduce_inplace(nMarkerMon, SurfaceViscCoeff.CMz);
 
-    Allreduce_inplace(nMarkerMon, Surface_HF_Visc);
-    Allreduce_inplace(nMarkerMon, Surface_MaxHF_Visc);
+    Allreduce_inplace(nMarkerMon, Surface_HF_Visc.data());
+    Allreduce_inplace(nMarkerMon, Surface_MaxHF_Visc.data());
 
     delete[] buffer;
   }

SU2_CFD/include/solvers/CSolver.hpp

@@ -2976,7 +2976,7 @@ class CSolver {
    * \return Value of the pressure coefficient.
    */
   inline virtual su2double *GetCharacPrimVar(unsigned short val_marker,
-                                             unsigned long val_vertex) const { return nullptr; }
+                                             unsigned long val_vertex) { return nullptr; }
 
   /*!
    * \brief A virtual member