Merge pull request #2212 from su2code/fix_addresssanitizer_findings

Fix bugs detected by the address sanitizer

Author: jblueh

Common/include/CConfig.hpp

@@ -183,8 +183,10 @@ class CConfig {
   nMarker_NearFieldBound,         /*!< \brief Number of near field boundary markers. */
   nMarker_ActDiskInlet,           /*!< \brief Number of actuator disk inlet markers. */
   nMarker_ActDiskOutlet,          /*!< \brief Number of actuator disk outlet markers. */
-  nMarker_ActDiskBemInlet,        /*!< \brief Number of actuator disk BEM inlet markers. */
-  nMarker_ActDiskBemOutlet,       /*!< \brief Number of actuator disk BEM outlet markers. */
+  nMarker_ActDiskBemInlet_CG,     /*!< \brief Number of actuator disk BEM inlet markers passed to MARKER_ACTDISK_BEM_CG. */
+  nMarker_ActDiskBemOutlet_CG,    /*!< \brief Number of actuator disk BEM outlet markers passed to MARKER_ACTDISK_BEM_CG. */
+  nMarker_ActDiskBemInlet_Axis,   /*!< \brief Number of actuator disk BEM inlet markers passed to MARKER_ACTDISK_BEM_AXIS. */
+  nMarker_ActDiskBemOutlet_Axis,  /*!< \brief Number of actuator disk BEM outlet markers passed to MARKER_ACTDISK_BEM_AXIS. */
   nMarker_Deform_Mesh_Sym_Plane,  /*!< \brief Number of markers with symmetric deformation */
   nMarker_Deform_Mesh,            /*!< \brief Number of deformable markers at the boundary. */
   nMarker_Fluid_Load,             /*!< \brief Number of markers in which the flow load is computed/employed. */
@@ -241,8 +243,10 @@ class CConfig {
   *Marker_CHTInterface,           /*!< \brief Conjugate heat transfer interface markers. */
   *Marker_ActDiskInlet,           /*!< \brief Actuator disk inlet markers. */
   *Marker_ActDiskOutlet,          /*!< \brief Actuator disk outlet markers. */
-  *Marker_ActDiskBemInlet,        /*!< \brief Actuator disk BEM inlet markers. */
-  *Marker_ActDiskBemOutlet,       /*!< \brief Actuator disk BEM outlet markers. */
+  *Marker_ActDiskBemInlet_CG,     /*!< \brief Actuator disk BEM inlet markers passed to MARKER_ACTDISK_BEM_CG. */
+  *Marker_ActDiskBemOutlet_CG,    /*!< \brief Actuator disk BEM outlet markers passed to MARKER_ACTDISK_BEM_CG. */
+  *Marker_ActDiskBemInlet_Axis,   /*!< \brief Actuator disk BEM inlet markers passed to MARKER_ACTDISK_BEM_AXIS. */
+  *Marker_ActDiskBemOutlet_Axis,  /*!< \brief Actuator disk BEM outlet markers passed to MARKER_ACTDISK_BEM_AXIS. */
   *Marker_Inlet,                  /*!< \brief Inlet flow markers. */
   *Marker_Inlet_Species,          /*!< \brief Inlet species markers. */
   *Marker_Inlet_Turb,             /*!< \brief Inlet turbulent markers. */

Common/include/geometry/meshreader/CBoxMeshReaderFVM.hpp

@@ -76,5 +76,5 @@ class CBoxMeshReaderFVM : public CMeshReaderFVM {
   /*!
    * \brief Destructor of the CBoxMeshReaderFVM class.
    */
-  ~CBoxMeshReaderFVM(void);
+  ~CBoxMeshReaderFVM(void) override;
 };

Common/include/geometry/meshreader/CCGNSMeshReaderFVM.hpp

@@ -148,5 +148,5 @@ class CCGNSMeshReaderFVM : public CMeshReaderFVM {
   /*!
    * \brief Destructor of the CCGNSMeshReaderFVM class.
    */
-  ~CCGNSMeshReaderFVM(void);
+  ~CCGNSMeshReaderFVM(void) override;
 };

Common/include/geometry/meshreader/CMeshReaderFVM.hpp

@@ -76,6 +76,8 @@ class CMeshReaderFVM {
    */
   CMeshReaderFVM(const CConfig* val_config, unsigned short val_iZone, unsigned short val_nZone);
 
+  virtual ~CMeshReaderFVM() = default;
+
   /*!
    * \brief Get the physical dimension of the problem (2 or 3).
    * \returns Physical dimension of the problem.

Common/include/option_structure.inl

@@ -1696,7 +1696,22 @@ class COptionActDisk : public COptionBase {
     this->name = name;
   }
 
-  ~COptionActDisk() override{};
+  ~COptionActDisk() override {
+    for (int i = 0; i < this->inlet_size; i++) {
+      if (this->press_jump) delete[] this->press_jump[i];
+      if (this->temp_jump) delete[] this->temp_jump[i];
+      if (this->omega) delete[] this->omega[i];
+    }
+    delete[] press_jump;
+    delete[] temp_jump;
+    delete[] omega;
+
+    delete[] marker_inlet;
+    delete[] marker_outlet;
+
+    SetDefault();
+  }
+
   string SetValue(const vector<string>& option_value) override {
     COptionBase::SetValue(option_value);
     const int mod_num = 8;

Common/src/CConfig.cpp

@@ -1535,12 +1535,12 @@ void CConfig::SetConfig_Options() {
 
   /*!\brief MARKER_ACTDISK_BEM_CG\n DESCRIPTION: Actuator disk CG for blade element momentum (BEM) method. \ingroup Config*/
   addActDiskBemOption("MARKER_ACTDISK_BEM_CG",
-                      nMarker_ActDiskBemInlet, nMarker_ActDiskBemOutlet,  Marker_ActDiskBemInlet, Marker_ActDiskBemOutlet,
+                      nMarker_ActDiskBemInlet_CG, nMarker_ActDiskBemOutlet_CG,  Marker_ActDiskBemInlet_CG, Marker_ActDiskBemOutlet_CG,
                       ActDiskBem_CG[0], ActDiskBem_CG[1], ActDiskBem_CG[2]);
 
   /*!\brief MARKER_ACTDISK_BEM_AXIS\n DESCRIPTION: Actuator disk axis for blade element momentum (BEM) method. \ingroup Config*/
   addActDiskBemOption("MARKER_ACTDISK_BEM_AXIS",
-                      nMarker_ActDiskBemInlet, nMarker_ActDiskBemOutlet,  Marker_ActDiskBemInlet, Marker_ActDiskBemOutlet,
+                      nMarker_ActDiskBemInlet_Axis, nMarker_ActDiskBemOutlet_Axis,  Marker_ActDiskBemInlet_Axis, Marker_ActDiskBemOutlet_Axis,
                       ActDiskBem_Axis[0], ActDiskBem_Axis[1], ActDiskBem_Axis[2]);
 
   /*!\brief ACTDISK_FILENAME \n DESCRIPTION: Input file for a specified actuator disk (w/ extension) \n DEFAULT: actdiskinput.dat \ingroup Config*/
@@ -3589,6 +3589,28 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
       || (Kind_ActDisk == POWER))
     ActDisk_Jump = RATIO;
 
+  if(Marker_ActDiskBemInlet_CG && Marker_ActDiskBemInlet_Axis){
+    if(nMarker_ActDiskBemInlet_CG != nMarker_ActDiskBemInlet_Axis){
+      SU2_MPI::Error("Marker lists supplied to MARKER_ACTDISK_BEM_CG and MARKER_ACTDISK_BEM_AXIS must be identical.", CURRENT_FUNCTION);
+    }
+    for(iMarker=0; iMarker<nMarker_ActDiskBemInlet_CG; iMarker++){
+      if(Marker_ActDiskBemInlet_CG[iMarker]!=Marker_ActDiskBemInlet_Axis[iMarker]){
+          SU2_MPI::Error("Marker lists supplied to MARKER_ACTDISK_BEM_CG and MARKER_ACTDISK_BEM_AXIS must be identical.", CURRENT_FUNCTION);
+      }
+    }
+  }
+
+  if(Marker_ActDiskBemOutlet_CG && Marker_ActDiskBemOutlet_Axis){
+    if(nMarker_ActDiskBemOutlet_CG != nMarker_ActDiskBemOutlet_Axis){
+      SU2_MPI::Error("Marker lists supplied to MARKER_ACTDISK_BEM_CG and MARKER_ACTDISK_BEM_AXIS must be identical.", CURRENT_FUNCTION);
+    }
+    for(iMarker=0; iMarker<nMarker_ActDiskBemOutlet_CG; iMarker++){
+      if(Marker_ActDiskBemOutlet_CG[iMarker]!=Marker_ActDiskBemOutlet_Axis[iMarker]){
+          SU2_MPI::Error("Marker lists supplied to MARKER_ACTDISK_BEM_CG and MARKER_ACTDISK_BEM_AXIS must be identical.", CURRENT_FUNCTION);
+      }
+    }
+  }
+
   /*--- Error-catching and automatic array adjustments for objective, marker, and weights arrays --- */
 
   /*--- If Kind_Obj has not been specified, these arrays need to take a default --*/
@@ -5559,7 +5581,7 @@ void CConfig::SetMarkers(SU2_COMPONENT val_software) {
   nMarker_Custom + nMarker_Damper + nMarker_Fluid_Load +
   nMarker_Clamped + nMarker_Load_Dir + nMarker_Disp_Dir +
   nMarker_ActDiskInlet + nMarker_ActDiskOutlet +
-  nMarker_ActDiskBemInlet + nMarker_ActDiskBemOutlet +
+  nMarker_ActDiskBemInlet_CG + nMarker_ActDiskBemOutlet_CG +
   nMarker_ZoneInterface;
 
   /*--- Add the possible send/receive domains ---*/
@@ -8693,17 +8715,17 @@ su2double CConfig::GetActDisk_Omega(const string& val_marker, unsigned short val
 
 su2double CConfig::GetActDiskBem_CG(unsigned short iDim, string val_marker, unsigned short val_value) const {
   unsigned short iMarker_ActDisk;
-  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskBemInlet; iMarker_ActDisk++)
-    if ((Marker_ActDiskBemInlet[iMarker_ActDisk] == val_marker) ||
-        (Marker_ActDiskBemOutlet[iMarker_ActDisk] == val_marker)) break;
+  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskBemInlet_CG; iMarker_ActDisk++)
+    if ((Marker_ActDiskBemInlet_CG[iMarker_ActDisk] == val_marker) ||
+        (Marker_ActDiskBemOutlet_CG[iMarker_ActDisk] == val_marker)) break;
   return ActDiskBem_CG[iDim][iMarker_ActDisk][val_value];
 }
 
 su2double CConfig::GetActDiskBem_Axis(unsigned short iDim, string val_marker, unsigned short val_value) const {
   unsigned short iMarker_ActDisk;
-  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskBemInlet; iMarker_ActDisk++)
-    if ((Marker_ActDiskBemInlet[iMarker_ActDisk] == val_marker) ||
-        (Marker_ActDiskBemOutlet[iMarker_ActDisk] == val_marker)) break;
+  for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskBemInlet_Axis; iMarker_ActDisk++)
+    if ((Marker_ActDiskBemInlet_Axis[iMarker_ActDisk] == val_marker) ||
+        (Marker_ActDiskBemOutlet_Axis[iMarker_ActDisk] == val_marker)) break;
   return ActDiskBem_Axis[iDim][iMarker_ActDisk][val_value];
 }
 

Common/src/basic_types/ad_structure.cpp

@@ -57,5 +57,6 @@ void Initialize() {
 #endif
 }
 
-void Finalize() {}
+void Finalize() { AD::Reset(); }
+
 }  // namespace AD

SU2_CFD/include/iteration/CDiscAdjFEAIteration.hpp

@@ -40,7 +40,6 @@ class CFEAIteration;
  */
 class CDiscAdjFEAIteration final : public CIteration {
  private:
-  CFEAIteration* fem_iteration;    /*!< \brief Pointer to the primal iteration class. */
   unsigned short CurrentRecording; /*!< \brief Stores the current status of the recording. */
 
   /*!

SU2_CFD/include/iteration/CIteration.hpp

@@ -61,7 +61,7 @@ class CIteration {
       StopTime{0.0}, UsedTime{0.0};
 
   std::shared_ptr<CTurboOutput> TurbomachineryPerformance;  /*!< \brief turbo performance calculator. */
-  CTurbomachineryStagePerformance* TurbomachineryStagePerformance;  /*!< \brief turbo stage performance calculator. */
+  std::shared_ptr<CTurbomachineryStagePerformance> TurbomachineryStagePerformance;  /*!< \brief turbo stage performance calculator. */
 
  public:
   /*!

SU2_CFD/include/output/CFlowCompOutput.hpp

@@ -109,15 +109,15 @@ class CFlowCompOutput final: public CFlowOutput {
    * \param[in] TurboPerf - Turboperformance class
    * \param[in] config - Definition of the particular problem
    */
-  void SetTurboMultiZonePerformance_Output(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
+  void SetTurboMultiZonePerformance_Output(std::shared_ptr<CTurbomachineryStagePerformance> TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
 
   /*!
    * \brief Loads the turboperformacne history data
    * \param[in] TurboStagePerf - Stage turboperformance class
    * \param[in] TurboPerf - Turboperformance class
    * \param[in] config - Definition of the particular problem
    */
-  void LoadTurboHistoryData(CTurbomachineryStagePerformance* TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
+  void LoadTurboHistoryData(std::shared_ptr<CTurbomachineryStagePerformance> TurboStagePerf, std::shared_ptr<CTurboOutput> TurboPerf, CConfig *config) override;
 
   /*!
    * \brief Write the kinematic and thermodynamic variables at each spanwise division