cant have nice things

Author: pcarruscag

Common/include/option_structure.inl

@@ -1054,18 +1054,13 @@ public:
 template <class T>
 struct CStringValuesListHelper {
   static T resize(unsigned short) { return T(); }
-  static void clear(T&) {}
   static T& access(T& val, unsigned short) { return val; }
 };
 
 // Specialization for pointer types (multiple values per string).
 template <class T>
 struct CStringValuesListHelper<T*> {
   static T* resize(unsigned short n) { return new T[n]; }
-  static void clear(T*& ptr) {
-    delete[] ptr;
-    ptr = nullptr;
-  }
   static T& access(T* ptr, unsigned short i) { return ptr[i]; }
 };
 
@@ -1089,16 +1084,6 @@ public:
     name(name_), size(size_), strings(strings_), values(values_), num_vals(optional_num_vals) {
   }
 
-  ~COptionStringValuesList() override {
-    for (unsigned short i = 0; i < size; i++) {
-      CStringValuesListHelper<Type>::clear(values[i]);
-    }
-    delete[] values;
-    delete[] strings;
-    values = nullptr;
-    strings = nullptr;
-  };
-
   string SetValue(vector<string> option_value) override {
     COptionBase::SetValue(option_value);
     unsigned short option_size = option_value.size();

Common/src/CConfig.cpp

@@ -858,7 +858,7 @@ void CConfig::SetPointersNull(void) {
   Inlet_Ttotal    = nullptr;    Inlet_Ptotal      = nullptr;
   Inlet_FlowDir   = nullptr;    Inlet_Temperature = nullptr;    Inlet_Pressure = nullptr;
   Inlet_Velocity  = nullptr;    Inlet_MassFrac    = nullptr;
-  Outlet_Pressure = nullptr;
+  Outlet_Pressure = nullptr;    Inlet_SpeciesVal  = nullptr;
 
   /*--- Engine Boundary Condition settings ---*/
 
@@ -7930,6 +7930,13 @@ CConfig::~CConfig(void) {
      delete[] FlowLoad_Value;
      delete[] Roughness_Height;
      delete[] Wall_Emissivity;
+
+  if (Inlet_SpeciesVal != nullptr) {
+    for (auto i = 0u; i < nMarker_Inlet_Species; ++i)
+      delete[] Inlet_SpeciesVal[i];
+  }
+  delete[] Inlet_SpeciesVal;
+
   /*--- related to periodic boundary conditions ---*/
 
   for (iMarker = 0; iMarker < nMarker_PerBound; iMarker++) {
@@ -7986,6 +7993,7 @@ CConfig::~CConfig(void) {
              delete[] Marker_Internal;
                 delete[] Marker_HeatFlux;
           delete[] Marker_Emissivity;
+  delete[] Marker_Inlet_Species;
 
   delete [] Int_Coeffs;