fix the cylindrical FFD to work with the FFD containment check

Author: pcarruscag

TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg

@@ -9,9 +9,43 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+% -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
+%
+FFD_TOLERANCE= 1E-10
+FFD_ITERATIONS= 1000
+% The definition of the box is in cartesian coordinates, the first face
+% (first 4 points) is extruded along the x axis to connect it with the
+% second face. The x-y plane marks theta = 0 and x-z marks theta = pi/2.
+% Angles above pi/2 (negative y coord) are subtracted 2*pi which allows
+% creating a ~360 degree box as shown here.
+FFD_DEFINITION= (CYLINDER_BOX,\
+  0.6, -0.1, 1.5,\
+  0.6, -0.1, 0.5,\
+  0.6, 0.1, 0.5,\
+  0.6, 0.1, 1.5,\
+ -0.6, -0.1, 1.5,\
+ -0.6, -0.1, 0.5,\
+ -0.6, 0.1, 0.5,\
+ -0.6, 0.1, 1.5)
+% Abovew We start by changing Z, which changes the radius and thus the cylindrical
+% "i" is the radius, then we change Y, which changes the angle and thus "j" is for
+% theta. Finally we change X and thus "k" is for the axial coordinate.
+FFD_DEGREE= (1, 9, 4)
+FFD_CONTINUITY= 1ST_DERIVATIVE
+FFD_COORD_SYSTEM= CYLINDRICAL
+% This is the origin of axis, the direction is always x.
+FFD_AXIS= (0.0, 0.0, 0.0)
+
+% ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
+%
+DV_KIND= FFD_CONTROL_POINT
+DV_MARKER= ( CYLINDER )
+DV_PARAM= ( CYLINDER_BOX, 0, 3, 2, 1.0, 0.0, 0.0 )
+DV_VALUE= 1.0
+
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
-SOLVER= EULER 
+SOLVER= EULER
 MATH_PROBLEM= DIRECT
 RESTART_SOL= NO
 SYSTEM_MEASUREMENTS= US
@@ -22,7 +56,7 @@ MACH_NUMBER= 0.8
 AOA= 0.0
 SIDESLIP_ANGLE= 0.0
 FREESTREAM_TEMPERATURE= 518.67
-FREESTREAM_PRESSURE= 2116.216 
+FREESTREAM_PRESSURE= 2116.216
 
 % ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
 %
@@ -46,7 +80,7 @@ MARKER_DESIGNING = ( CYLINDER )
 
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
-NUM_METHOD_GRAD= GREEN_GAUSS 
+NUM_METHOD_GRAD= GREEN_GAUSS
 CFL_NUMBER= 1.0
 CFL_ADAPT= NO
 CFL_ADAPT_PARAM= ( 1.0, 1.0, 1.0, 10.0 )
@@ -72,13 +106,6 @@ MUSCL_FLOW= YES
 SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
 TIME_DISCRE_FLOW= EULER_IMPLICIT
 
-% ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
-%
-DV_KIND= FFD_CONTROL_POINT 
-DV_MARKER= ( CYLINDER )
-DV_PARAM= ( CYLINDER_BOX, 0, 3, 2, 1.0, 0.0, 0.0 )
-DV_VALUE= 1.0 
-
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
 DEFORM_LINEAR_SOLVER= FGMRES
@@ -88,16 +115,6 @@ DEFORM_CONSOLE_OUTPUT= YES
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 
-% -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
-%
-FFD_TOLERANCE= 1E-10
-FFD_ITERATIONS= 1000
-FFD_DEFINITION= (CYLINDER_BOX, -0.6, -0.1, 1.5, -0.6, -0.1, 0.5, -0.6, 0.1, 0.5, -0.6, 0.1, 1.5, 0.6, -0.1, 1.5, 0.6, -0.1, 0.5, 0.6, 0.1, 0.5, 0.6, 0.1, 1.5)
-FFD_DEGREE= (1, 9, 4)
-FFD_CONTINUITY= 1ST_DERIVATIVE
-FFD_COORD_SYSTEM= CYLINDRICAL
-FFD_AXIS= (0.0, 0.0, 0.0)
-
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
 ITER= 5