Added regression test; ran pre-commit

Author: JanRotti

Common/src/CConfig.cpp

@@ -6691,7 +6691,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
         if ((Design_Variable[iDV] == NO_DEFORMATION) ||
             (Design_Variable[iDV] == FFD_SETTING) ||
             (Design_Variable[iDV] == SCALE) ) nParamDV = 0;
-        if ((Design_Variable[iDV] == ANGLE_OF_ATTACK) || 
+        if ((Design_Variable[iDV] == ANGLE_OF_ATTACK) ||
             (Design_Variable[iDV] == HICKS_HENNE_CAMBER)) nParamDV = 1;
         if ((Design_Variable[iDV] == FFD_CAMBER_2D) ||
             (Design_Variable[iDV] == FFD_THICKNESS_2D) ||

Common/src/grid_movement/CSurfaceMovement.cpp

@@ -640,15 +640,14 @@ vector<vector<su2double> > CSurfaceMovement::SetSurface_Deformation(CGeometry* g
           break;
       }
     }
-    
+
     /*--- HICKS_HENNE_CAMBER design variable ---*/
-  
+
     if (config->GetDesign_Variable(0) == HICKS_HENNE_CAMBER) {
       SetHicksHenneCamber(geometry, config);
     }
   }
 
-
   /*--- NACA_4Digits design variable ---*/
 
   else if (config->GetDesign_Variable(0) == NACA_4DIGITS) {
@@ -673,8 +672,6 @@ vector<vector<su2double> > CSurfaceMovement::SetSurface_Deformation(CGeometry* g
     if (rank == MASTER_NODE) cout << "No surface deformation (setting FFD)." << endl;
   }
 
-
-
   /*--- Scale, Translate, and Rotate will be done with rigid mesh transforms. ---*/
 
   else if ((config->GetDesign_Variable(0) == ROTATION) || (config->GetDesign_Variable(0) == TRANSLATION) ||
@@ -2770,8 +2767,6 @@ void CSurfaceMovement::SetHicksHenne(CGeometry* boundary, CConfig* config, unsig
     }
   }
 
-
-
 #ifdef HAVE_MPI
 
   int iProcessor, nProcessor = size;
@@ -3711,8 +3706,8 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
   unsigned long iVertex;
   unsigned short iMarker, nDV_Camber = 0;
   su2double VarCoord[3] = {0.0, 0.0, 0.0}, VarCoordTrans[3] = {0.0, 0.0, 0.0}, *CoordTrans, *NormalTrans, ek, fk,
-            Coord[3] = {0.0, 0.0, 0.0}, TPCoord[2] = {0.0, 0.0}, LPCoord[2] = {0.0, 0.0},
-            USTPCoord[2] = {0.0, 0.0}, LSTPCoord[2] = {0.0, 0.0}, Distance, Chord, AoA, ValCos, ValSin;
+            Coord[3] = {0.0, 0.0, 0.0}, TPCoord[2] = {0.0, 0.0}, LPCoord[2] = {0.0, 0.0}, USTPCoord[2] = {0.0, 0.0},
+            LSTPCoord[2] = {0.0, 0.0}, Distance, Chord, AoA, ValCos, ValSin;
   vector<su2double> positions, values, X_Coord_upper, Y_Coord_upper, X_Coord_lower, Y_Coord_lower;
 
   // --- Check if the type of design variables is only HICKS_HENNE_CAMBER ---// // TODO: Extend to CAMBER + THICKNESS
@@ -3728,16 +3723,15 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
   values.resize(nDV_Camber);
 
   /*--- Collect the values of the Hicks-Henne camber design variables ---*/
-  for (unsigned short iDV = 0, counter = 0; iDV < config->GetnDV(); iDV++){
+  for (unsigned short iDV = 0, counter = 0; iDV < config->GetnDV(); iDV++) {
     if (config->GetDesign_Variable(iDV) == HICKS_HENNE_CAMBER) {
-      positions[counter] = config->GetParamDV(iDV, 0); /*--- Position of the camber point as a fraction of the chord ---*/
+      positions[counter] =
+          config->GetParamDV(iDV, 0);             /*--- Position of the camber point as a fraction of the chord ---*/
       values[counter] = config->GetDV_Value(iDV); /*--- Value of the deformation ---*/
       counter++;
     }
   }
 
-  
-
   /*--- Compute the angle of attack, Leading-edge (LP) and Trailing-edge (TP) point.
         We do this for upper and lower surface separately to detect blunt trailing edges ---*/
 
@@ -3750,7 +3744,7 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
       USTPCoord[1] = CoordTrans[1];
       for (iVertex = 1; iVertex < boundary->nVertex[iMarker]; iVertex++) {
         CoordTrans = boundary->vertex[iMarker][iVertex]->GetCoord();
-        NormalTrans = boundary->vertex[iMarker][0]->GetNormal(); 
+        NormalTrans = boundary->vertex[iMarker][0]->GetNormal();
         if ((CoordTrans[0] > TPCoord[0]) && (abs(NormalTrans[1]) > abs(NormalTrans[0]))) {
           if (NormalTrans[1] >= 0.0) {
             USTPCoord[0] = CoordTrans[0];
@@ -3785,37 +3779,37 @@ void CSurfaceMovement::SetHicksHenneCamber(CGeometry* boundary, CConfig* config)
           LPCoord[1] = CoordTrans[1];
         }
       }
-    } 
+    }
   }
-  
+
   AoA = atan((LPCoord[1] - TPCoord[1]) / (TPCoord[0] - LPCoord[0])) * 180 / PI_NUMBER;
-  
-  /*--- Apply deformation based on the camberline Hicks-Henne deformation and the existing airfoil thickness distribution ---*/
+
+  /*--- Apply deformation based on the camberline Hicks-Henne deformation and the existing airfoil thickness
+   * distribution ---*/
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     for (iVertex = 0; iVertex < boundary->nVertex[iMarker]; iVertex++) {
       if (config->GetMarker_All_DV(iMarker) == YES) {
         CoordTrans = boundary->vertex[iMarker][iVertex]->GetCoord();
         NormalTrans = boundary->vertex[iMarker][iVertex]->GetNormal();
-        
+
         ValCos = cos(AoA * PI_NUMBER / 180.0);
-        ValSin = sin(AoA * PI_NUMBER / 180.0); 
+        ValSin = sin(AoA * PI_NUMBER / 180.0);
 
         /*--- Transform the coordinates ---*/
         Coord[0] = (CoordTrans[0] - LPCoord[0]) * ValCos - (CoordTrans[1] - LPCoord[1]) * ValSin;
         Coord[0] = max(0.0, Coord[0]);  // Coord x should be always positive
         Coord[1] = (CoordTrans[1] - LPCoord[1]) * ValCos + (CoordTrans[0] - LPCoord[0]) * ValSin;
 
         /*--- Special case: surface point is part of trailing edge ---*/
-        if (Coord[0] > 0.99) { 
+        if (Coord[0] > 0.99) {
           continue;
-        } 
+        }
 
         /*--- Compute the Hicks-Henne bumps ---*/
         fk = 0.0;
         for (unsigned short iDV = 0; iDV < nDV_Camber; iDV++) {
           ek = log10(0.5) / log10(positions[iDV]);
-          if (Coord[0] > 10 * EPS)
-            fk += pow(sin(PI_NUMBER * pow(Coord[0], ek)), 3) * values[iDV];
+          if (Coord[0] > 10 * EPS) fk += pow(sin(PI_NUMBER * pow(Coord[0], ek)), 3) * values[iDV];
         }
         VarCoord[1] = fk;
       }

TestCases/deformation/naca0012/def_NACA0012_camber.cfg

@@ -0,0 +1,134 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: Transonic inviscid flow around a NACA0012 airfoil          %
+% Author: Thomas D. Economon                                                   %
+% Institution: Stanford University                                             %
+% Date: 2014.06.11                                                             %
+% File Version 8.2.0 "Harrier"                                                 %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
+%
+SOLVER= EULER
+MATH_PROBLEM= DIRECT
+RESTART_SOL= NO
+
+% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
+%
+MACH_NUMBER= 0.8
+AOA= 1.25
+FREESTREAM_PRESSURE= 101325.0
+FREESTREAM_TEMPERATURE= 273.15
+
+% -------------- COMPRESSIBLE AND INCOMPRESSIBLE FLUID CONSTANTS --------------%
+%
+GAMMA_VALUE= 1.4
+GAS_CONSTANT= 287.87
+
+% ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
+%
+REF_ORIGIN_MOMENT_X = 0.25
+REF_ORIGIN_MOMENT_Y = 0.00
+REF_ORIGIN_MOMENT_Z = 0.00
+REF_LENGTH= 1.0
+REF_AREA= 1.0
+REF_DIMENSIONALIZATION= DIMENSIONAL
+
+% ----------------------- BOUNDARY CONDITION DEFINITION -----------------------%
+%
+MARKER_EULER= ( airfoil )
+MARKER_FAR= ( farfield )
+
+% ------------------------ SURFACES IDENTIFICATION ----------------------------%
+%
+MARKER_PLOTTING = ( airfoil )
+MARKER_MONITORING = ( airfoil )
+MARKER_DESIGNING = ( airfoil )
+
+% ------------- COMMON PARAMETERS TO DEFINE THE NUMERICAL METHOD --------------%
+%
+NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
+OBJECTIVE_FUNCTION= DRAG
+CFL_NUMBER= 4.0
+ITER= 250
+
+% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
+%
+LINEAR_SOLVER= FGMRES
+LINEAR_SOLVER_PREC= LU_SGS
+LINEAR_SOLVER_ERROR= 1E-6
+LINEAR_SOLVER_ITER= 5
+
+% -------------------------- MULTIGRID PARAMETERS -----------------------------%
+%
+MGLEVEL= 3
+MGCYCLE= W_CYCLE
+MG_PRE_SMOOTH= ( 1, 2, 3, 3 )
+MG_POST_SMOOTH= ( 0, 0, 0, 0 )
+MG_CORRECTION_SMOOTH= ( 0, 0, 0, 0 )
+MG_DAMP_RESTRICTION= 1.0
+MG_DAMP_PROLONGATION= 1.0
+
+% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
+%
+CONV_NUM_METHOD_FLOW= JST
+JST_SENSOR_COEFF= ( 0.5, 0.02 )
+TIME_DISCRE_FLOW= EULER_IMPLICIT
+
+% ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------%
+%
+CONV_NUM_METHOD_ADJFLOW= JST
+ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 )
+CFL_REDUCTION_ADJFLOW= 0.5
+TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
+
+% ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
+%
+DV_KIND= HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER, HICKS_HENNE_CAMBER
+DV_MARKER= ( airfoil )
+DV_PARAM= ( 0.06666666666666667 ); ( 0.13333333333333333 ); ( 0.2 ); ( 0.26666666666666666 ); ( 0.3333333333333333 ); ( 0.4 ); ( 0.4666666666666667 ); ( 0.5333333333333333 ); ( 0.6 ); ( 0.6666666666666666 ); ( 0.7333333333333333 ); ( 0.8 ); ( 0.8666666666666667 ); ( 0.9333333333333333 )
+DV_VALUE= 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.005
+
+% ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
+%
+DEFORM_LINEAR_SOLVER= FGMRES
+DEFORM_LINEAR_SOLVER_PREC= LU_SGS
+DEFORM_LINEAR_SOLVER_ITER= 1000
+DEFORM_NONLINEAR_ITER= 1
+DEFORM_CONSOLE_OUTPUT= YES
+DEFORM_LINEAR_SOLVER_ERROR= 1E-14
+DEFORM_COEFF = 1E6
+DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
+
+% --------------------------- CONVERGENCE PARAMETERS --------------------------%
+%
+CONV_RESIDUAL_MINVAL= -8
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-6
+
+% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
+%
+MESH_FILENAME= mesh_NACA0012_inv.su2
+MESH_FORMAT= SU2
+MESH_OUT_FILENAME= mesh_out.su2
+SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_ADJ_FILENAME= solution_adj.dat
+TABULAR_FORMAT= CSV
+CONV_FILENAME= history
+RESTART_FILENAME= restart_flow.dat
+RESTART_ADJ_FILENAME= restart_adj.dat
+VOLUME_FILENAME= flow
+VOLUME_ADJ_FILENAME= adjoint
+GRAD_OBJFUNC_FILENAME= of_grad.dat
+SURFACE_FILENAME= surface_flow
+SURFACE_ADJ_FILENAME= surface_adjoint
+OUTPUT_WRT_FREQ= 250
+
+% --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
+%
+OPT_OBJECTIVE= DRAG * 0.001
+OPT_CONSTRAINT= ( LIFT > 0.328188 ) * 0.001; ( MOMENT_Z > 0.034068 ) * 0.001; ( AIRFOIL_THICKNESS > 0.11 ) * 0.001
+DEFINITION_DV= ( 37, 1.0 | airfoil | 0.06666666666666667 ); ( 37, 1.0 | airfoil | 0.13333333333333333 ); ( 37, 1.0 | airfoil | 0.2 ); ( 37, 1.0 | airfoil | 0.26666666666666666 ); ( 37, 1.0 | airfoil | 0.3333333333333333 ); ( 37, 1.0 | airfoil | 0.4 ); ( 37, 1.0 | airfoil | 0.4666666666666667 ); ( 37, 1.0 | airfoil | 0.5333333333333333 ); ( 37, 1.0 | airfoil | 0.6 ); ( 37, 1.0 | airfoil | 0.6666666666666666 ); ( 37, 1.0 | airfoil | 0.7333333333333333 ); ( 37, 1.0 | airfoil | 0.8 ); ( 37, 1.0 | airfoil | 0.8666666666666667 ); ( 37, 1.0 | airfoil | 0.9333333333333333 )

TestCases/parallel_regression.py

@@ -1715,6 +1715,19 @@ def main():
     pass_list.append(naca0012_def.run_def())
     test_list.append(naca0012_def)
 
+    # Inviscid NACA0012 based on Camberline deformation (triangles)
+    naca0012_def_file_camber            = TestCase('naca0012_def_camber')
+    naca0012_def_file_camber.cfg_dir   = "deformation/naca0012"
+    naca0012_def_file_camber.cfg_file  = "def_NACA0012_camber.cfg"
+    naca0012_def_file_camber.test_iter = 10
+    naca0012_def_file_camber.test_vals = [0.008548]
+    naca0012_def_file_camber.command   = TestCase.Command("mpirun -n 2", "SU2_DEF")
+    naca0012_def_file_camber.timeout   = 1600
+    naca0012_def_file_camber.tol       = 1e-8
+
+    pass_list.append(naca0012_def_file_camber.run_def())
+    test_list.append(naca0012_def_file_camber)
+    
     # Inviscid NACA0012 based on SURFACE_FILE input (surface_bump.dat)
     naca0012_def_file            = TestCase('naca0012_def_file')
     naca0012_def_file.cfg_dir   = "deformation/naca0012"

TestCases/serial_regression.py

@@ -1256,6 +1256,19 @@ 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')
     naca0012_def_file.cfg_dir   = "deformation/naca0012"