Use unique_ptr for gradient smoothing numerics in SU"_DOT.cpp.

Apply clang format.

Author: thomasdick

SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp

@@ -242,8 +242,10 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingSurface(CGeometry* geometry
   WriteSensitivity(geometry, config);
 }
 
-void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNumerics *numerics, CSurfaceMovement *surface_movement, CVolumetricMovement *grid_movement, CConfig *config, su2double** Gradient) {
-
+void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry* geometry, CNumerics* numerics,
+                                                        CSurfaceMovement* surface_movement,
+                                                        CVolumetricMovement* grid_movement, CConfig* config,
+                                                        su2double** Gradient) {
   unsigned nDVtotal=config->GetnDV_Total();
   unsigned column, row;
   unsigned long iPoint;
@@ -336,7 +338,9 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
   if (rank == MASTER_NODE) {
     /*--- For multizone append zone number to filename. ---*/
     string hess_filename = config->GetObjFunc_Hess_FileName();
-    if (config->GetMultizone_Problem()) hess_filename=config->GetMultizone_FileName(hess_filename, config->GetiZone(), ".dat");
+    if (config->GetMultizone_Problem()) {
+      hess_filename = config->GetMultizone_FileName(hess_filename, config->GetiZone(), ".dat");
+    }
     ofstream SysMatrix(hess_filename);
     SysMatrix.precision(config->GetOutput_Precision());
 
@@ -356,7 +360,6 @@ void CGradientSmoothingSolver::ApplyGradientSmoothingDV(CGeometry *geometry, CNu
   deltaP = x;
 
   OutputDVGradient(config);
-
 }
 
 void CGradientSmoothingSolver::Compute_StiffMatrix(CGeometry* geometry, CNumerics* numerics, const CConfig* config) {
@@ -734,7 +737,9 @@ void CGradientSmoothingSolver::OutputDVGradient(const CConfig* config, string ou
   unsigned iDV;
   if (rank == MASTER_NODE) {
     /*--- For multizone append zone number to filename. ---*/
-    if (config->GetMultizone_Problem()) out_file=config->GetMultizone_FileName(out_file, config->GetiZone(), ".dat");
+    if (config->GetMultizone_Problem()) {
+      out_file = config->GetMultizone_FileName(out_file, config->GetiZone(), ".dat");
+    }
     ofstream delta_p (out_file);
     delta_p.precision(config->GetOutput_Precision());
 

SU2_DOT/src/SU2_DOT.cpp

@@ -980,12 +980,8 @@ void DerivativeTreatment_MeshSensitivity(CGeometry *geometry, CConfig *config, C
 
   /*-- Construct the smoothing solver and numerics ---*/
   std::unique_ptr<CSolver> solver(new CGradientSmoothingSolver(geometry, config));
-  CNumerics* numerics;
-  if (config->GetSmoothOnSurface()) {
-    numerics = new CGradSmoothing(geometry->GetnDim()-1, config);
-  } else {
-    numerics = new CGradSmoothing(geometry->GetnDim(), config);
-  }
+  unsigned dim = (config->GetSmoothOnSurface() ? geometry->GetnDim() - 1 : geometry->GetnDim());
+  std::unique_ptr<CNumerics> numerics(new CGradSmoothing(dim, config));
 
   if (rank == MASTER_NODE)  cout << "Sobolev Smoothing of derivatives is active." << endl;
 
@@ -1003,7 +999,7 @@ void DerivativeTreatment_MeshSensitivity(CGeometry *geometry, CConfig *config, C
       solver->ReadSensFromGeometry(geometry);
 
       /*--- Perform the smoothing procedure on all boundaries marked as DV marker. ---*/
-      solver->ApplyGradientSmoothingSurface(geometry, numerics, config);
+      solver->ApplyGradientSmoothingSurface(geometry, numerics.get(), config);
 
       /*--- After appling the solver write the results back ---*/
       solver->WriteSensToGeometry(geometry);
@@ -1014,7 +1010,7 @@ void DerivativeTreatment_MeshSensitivity(CGeometry *geometry, CConfig *config, C
       /*--- Get the sensitivities from the geometry class to work with. ---*/
       solver->ReadSensFromGeometry(geometry);
 
-      solver->ApplyGradientSmoothingVolume(geometry, numerics, config);
+      solver->ApplyGradientSmoothingVolume(geometry, numerics.get(), config);
 
       /*--- After appling the solver write the results back ---*/
       solver->WriteSensToGeometry(geometry);
@@ -1025,8 +1021,6 @@ void DerivativeTreatment_MeshSensitivity(CGeometry *geometry, CConfig *config, C
 
   }
 
-  delete numerics;
-
 }
 
 void DerivativeTreatment_Gradient(CGeometry *geometry, CConfig *config, CVolumetricMovement* grid_movement, CSurfaceMovement *surface_movement, su2double** Gradient) {
@@ -1041,12 +1035,8 @@ void DerivativeTreatment_Gradient(CGeometry *geometry, CConfig *config, CVolumet
 
   /*-- Construct the smoothing solver and numerics ---*/
   std::unique_ptr<CSolver> solver(new CGradientSmoothingSolver(geometry, config));
-  CNumerics* numerics;
-  if (config->GetSmoothOnSurface()) {
-    numerics = new CGradSmoothing(geometry->GetnDim()-1, config);
-  } else {
-    numerics = new CGradSmoothing(geometry->GetnDim(), config);
-  }
+  unsigned dim = (config->GetSmoothOnSurface() ? geometry->GetnDim() - 1 : geometry->GetnDim());
+  std::unique_ptr<CNumerics> numerics(new CGradSmoothing(dim, config));
 
   if (rank == MASTER_NODE)  cout << "Sobolev Smoothing of derivatives is active." << endl;
 
@@ -1055,14 +1045,12 @@ void DerivativeTreatment_Gradient(CGeometry *geometry, CConfig *config, CVolumet
 
   /*--- Apply the smoothing procedure on the DV level. ---*/
   if (config->GetSobMode() == ENUM_SOBOLEV_MODUS::PARAM_LEVEL_COMPLETE) {
-    solver->ApplyGradientSmoothingDV(geometry, numerics, surface_movement, grid_movement, config, Gradient);
+    solver->ApplyGradientSmoothingDV(geometry, numerics.get(), surface_movement, grid_movement, config, Gradient);
 
     /*--- If smoothing already took place on the mesh level, or none is requested, just do standard projection. ---*/
   } else if (config->GetSobMode() == ENUM_SOBOLEV_MODUS::ONLY_GRAD ||
              config->GetSobMode() == ENUM_SOBOLEV_MODUS::MESH_LEVEL) {
     solver->RecordTapeAndCalculateOriginalGradient(geometry, surface_movement, grid_movement, config, Gradient);
   }
 
-  delete numerics;
-
 }