Addressed feedback from PR #2538

Author: JanRotti

Common/src/grid_movement/CSurfaceMovement.cpp

@@ -26,7 +26,6 @@
  */
 
 #include "../../include/grid_movement/CSurfaceMovement.hpp"
-#include <iostream>
 #include "../../include/toolboxes/C1DInterpolation.hpp"
 #include "../../include/toolboxes/geometry_toolbox.hpp"
 
@@ -3713,8 +3712,7 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
   // --- Check if the type of design variables is only HICKS_HENNE_CAMBER ---// // TODO: Extend to CAMBER + THICKNESS
   for (unsigned short iDV = 0; iDV < config->GetnDV(); iDV++)
     if (config->GetDesign_Variable(iDV) != HICKS_HENNE_CAMBER) {
-      cout << "'HicksHenneCamber' can not be combined with other design variables.";
-      cin.get();
+      SU2_MPI::Error("'HicksHenneCamber' can not be combined with other design variables.", CURRENT_FUNCTION);
     } else {
       nDV_Camber++;
     }
@@ -3759,7 +3757,7 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
   }
 
   /*--- Correct the TP coordinates if the trailing edge is blunt ---*/
-  if ((USTPCoord[0] != LSTPCoord[0]) || (USTPCoord[1] != LSTPCoord[1])) {
+  if ((fabs(USTPCoord[0] - LSTPCoord[0]) > EPS) || (fabs(USTPCoord[1] - LSTPCoord[1]) > EPS)) {
     TPCoord[0] = (USTPCoord[0] + LSTPCoord[0]) / 2.0;
     TPCoord[1] = (USTPCoord[1] + LSTPCoord[1]) / 2.0;
   } else {
@@ -3772,7 +3770,7 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
     if (config->GetMarker_All_DV(iMarker) == YES) {
       for (iVertex = 0; iVertex < boundary->nVertex[iMarker]; iVertex++) {
         CoordTrans = boundary->vertex[iMarker][iVertex]->GetCoord();
-        Distance = sqrt(pow(CoordTrans[0] - TPCoord[0], 2.0) + pow(CoordTrans[1] - TPCoord[1], 2.0));
+        Distance = GeometryToolbox::Distance(2, CoordTrans, TPCoord);
         if (Chord < Distance) {
           Chord = Distance;
           LPCoord[0] = CoordTrans[0];

TestCases/serial_regression.py

@@ -1255,19 +1255,6 @@ def main():
 
     pass_list.append(naca0012_def.run_def(args.tsan, args.asan))
     test_list.append(naca0012_def)
-
-    # Inviscid NACA0012 based on Camberline deformation (triangles)
-    naca0012_def_camber            = TestCase('naca0012_def_camber')
-    naca0012_def_camber.cfg_dir   = "deformation/naca0012"
-    naca0012_def_camber.cfg_file  = "def_NACA0012_camber.cfg"
-    naca0012_def_camber.test_iter = 10
-    naca0012_def_camber.test_vals = [0.0201692]
-    naca0012_def_camber.command   = TestCase.Command(exec = "SU2_DEF")
-    naca0012_def_camber.timeout   = 1600
-    naca0012_def_camber.tol       = 1e-06
-
-    pass_list.append(naca0012_def_camber.run_def(args.tsan, args.asan))
-    test_list.append(naca0012_def_camber)
 
     # Inviscid NACA0012 based on SURFACE_FILE input (surface_bump.dat)
     naca0012_def_file            = TestCase('naca0012_def_file')