Skip to content

Commit d0a77f2

Browse files
EvertBunschotenEvertBunschoten
authored
Merge branch 'develop' into feature_new_flamelet
2 parents 212ffdc + 20cc4ce commit d0a77f2

12 files changed

Lines changed: 16 additions & 62 deletions

File tree

‎Common/include/grid_movement/CSurfaceMovement.hpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,17 +336,6 @@ class CSurfaceMovement : public CGridMovement {
336336
bool SetFFDCamber_2D(CGeometry* geometry, CConfig* config, CFreeFormDefBox* FFDBox, CFreeFormDefBox** ResetFFDBox,
337337
unsigned short iDV, bool ResetDef) const;
338338

339-
/*!
340-
* \brief Set a camber deformation of the Free From box using the control point position.
341-
* \param[in] geometry - Geometrical definition of the problem.
342-
* \param[in] config - Definition of the particular problem.
343-
* \param[in] FFDBox - Array with all the free forms FFDBoxes of the computation.
344-
* \param[in] iDV - Index of the design variable.
345-
* \param[in] ResetDef - Reset the deformation before starting a new one.
346-
*/
347-
bool SetFFDTwist_2D(CGeometry* geometry, CConfig* config, CFreeFormDefBox* FFDBox, CFreeFormDefBox** ResetFFDBox,
348-
unsigned short iDV, bool ResetDef);
349-
350339
/*!
351340
* \brief Set a thickness deformation of the Free From box using the control point position.
352341
* \param[in] geometry - Geometrical definition of the problem.

‎Common/include/option_structure.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2136,7 +2136,6 @@ enum ENUM_PARAM {
21362136
FFD_CONTROL_POINT_2D = 19, /*!< \brief Free form deformation for 2D design (change a control point). */
21372137
FFD_CAMBER_2D = 20, /*!< \brief Free form deformation for 3D design (camber change). */
21382138
FFD_THICKNESS_2D = 21, /*!< \brief Free form deformation for 3D design (thickness change). */
2139-
FFD_TWIST_2D = 22, /*!< \brief Free form deformation for 3D design (camber change). */
21402139
FFD_CONTROL_SURFACE = 23, /*!< \brief Free form deformation for 3D design (control surface). */
21412140
FFD_ANGLE_OF_ATTACK = 24, /*!< \brief Angle of attack for FFD problem. */
21422141
HICKS_HENNE = 30, /*!< \brief Hicks-Henne bump function for airfoil deformation. */
@@ -2159,7 +2158,6 @@ enum ENUM_PARAM {
21592158
static const MapType<std::string, ENUM_PARAM> Param_Map = {
21602159
MakePair("FFD_SETTING", FFD_SETTING)
21612160
MakePair("FFD_CONTROL_POINT_2D", FFD_CONTROL_POINT_2D)
2162-
MakePair("FFD_TWIST_2D", FFD_TWIST_2D)
21632161
MakePair("FFD_ANGLE_OF_ATTACK", FFD_ANGLE_OF_ATTACK)
21642162
MakePair("FFD_CAMBER_2D", FFD_CAMBER_2D)
21652163
MakePair("FFD_THICKNESS_2D", FFD_THICKNESS_2D)

‎Common/include/option_structure.inl‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,6 @@ class COptionDVParam : public COptionBase {
567567
case FFD_THICKNESS_2D:
568568
nParamDV[iDV] = 2;
569569
break;
570-
case FFD_TWIST_2D:
571-
nParamDV[iDV] = 3;
572-
break;
573570
case HICKS_HENNE:
574571
nParamDV[iDV] = 2;
575572
break;
@@ -676,11 +673,11 @@ class COptionDVParam : public COptionBase {
676673
((this->design_variable[iDV] == NO_DEFORMATION) || (this->design_variable[iDV] == FFD_SETTING) ||
677674
(this->design_variable[iDV] == FFD_ANGLE_OF_ATTACK) ||
678675
(this->design_variable[iDV] == FFD_CONTROL_POINT_2D) || (this->design_variable[iDV] == FFD_CAMBER_2D) ||
679-
(this->design_variable[iDV] == FFD_TWIST_2D) || (this->design_variable[iDV] == FFD_THICKNESS_2D) ||
680-
(this->design_variable[iDV] == FFD_CONTROL_POINT) || (this->design_variable[iDV] == FFD_NACELLE) ||
681-
(this->design_variable[iDV] == FFD_GULL) || (this->design_variable[iDV] == FFD_TWIST) ||
682-
(this->design_variable[iDV] == FFD_ROTATION) || (this->design_variable[iDV] == FFD_CONTROL_SURFACE) ||
683-
(this->design_variable[iDV] == FFD_CAMBER) || (this->design_variable[iDV] == FFD_THICKNESS))) {
676+
(this->design_variable[iDV] == FFD_THICKNESS_2D) || (this->design_variable[iDV] == FFD_CONTROL_POINT) ||
677+
(this->design_variable[iDV] == FFD_NACELLE) || (this->design_variable[iDV] == FFD_GULL) ||
678+
(this->design_variable[iDV] == FFD_TWIST) || (this->design_variable[iDV] == FFD_ROTATION) ||
679+
(this->design_variable[iDV] == FFD_CONTROL_SURFACE) || (this->design_variable[iDV] == FFD_CAMBER) ||
680+
(this->design_variable[iDV] == FFD_THICKNESS))) {
684681
ss >> this->FFDTag[iDV];
685682
this->paramDV[iDV][iParamDV] = 0;
686683
} else

‎Common/src/CConfig.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,7 +2305,6 @@ void CConfig::SetConfig_Options() {
23052305
- SPHERICAL ( ControlPoint_Index, Theta_Disp, R_Disp )
23062306
- FFD_CONTROL_POINT ( FFDBox ID, i_Ind, j_Ind, k_Ind, x_Disp, y_Disp, z_Disp )
23072307
- FFD_TWIST ( FFDBox ID, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
2308-
- FFD_TWIST_2D ( FFDBox ID, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
23092308
- FFD_ROTATION ( FFDBox ID, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
23102309
- FFD_CONTROL_SURFACE ( FFDBox ID, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
23112310
- FFD_CAMBER ( FFDBox ID, i_Ind, j_Ind )
@@ -6441,7 +6440,6 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
64416440
case FFD_CONTROL_POINT_2D: cout << "FFD 2D (control point) <-> "; break;
64426441
case FFD_CAMBER_2D: cout << "FFD 2D (camber) <-> "; break;
64436442
case FFD_THICKNESS_2D: cout << "FFD 2D (thickness) <-> "; break;
6444-
case FFD_TWIST_2D: cout << "FFD 2D (twist) <-> "; break;
64456443
case HICKS_HENNE: cout << "Hicks Henne <-> " ; break;
64466444
case SURFACE_BUMP: cout << "Surface bump <-> " ; break;
64476445
case ANGLE_OF_ATTACK: cout << "Angle of attack <-> " ; break;
@@ -6491,7 +6489,6 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
64916489
(Design_Variable[iDV] == CST) ||
64926490
(Design_Variable[iDV] == SURFACE_BUMP) ||
64936491
(Design_Variable[iDV] == FFD_CAMBER) ||
6494-
(Design_Variable[iDV] == FFD_TWIST_2D) ||
64956492
(Design_Variable[iDV] == FFD_THICKNESS) ) nParamDV = 3;
64966493
if (Design_Variable[iDV] == FFD_CONTROL_POINT_2D) nParamDV = 5;
64976494
if (Design_Variable[iDV] == ROTATION) nParamDV = 6;
@@ -6511,7 +6508,6 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
65116508
(Design_Variable[iDV] == FFD_CONTROL_POINT_2D) ||
65126509
(Design_Variable[iDV] == FFD_CAMBER_2D) ||
65136510
(Design_Variable[iDV] == FFD_THICKNESS_2D) ||
6514-
(Design_Variable[iDV] == FFD_TWIST_2D) ||
65156511
(Design_Variable[iDV] == FFD_CONTROL_POINT) ||
65166512
(Design_Variable[iDV] == FFD_NACELLE) ||
65176513
(Design_Variable[iDV] == FFD_GULL) ||

‎Common/src/grid_movement/CSurfaceMovement.cpp‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,11 @@ vector<vector<su2double> > CSurfaceMovement::SetSurface_Deformation(CGeometry* g
160160
/*--- Free Form deformation based ---*/
161161

162162
if ((config->GetDesign_Variable(0) == FFD_CONTROL_POINT_2D) || (config->GetDesign_Variable(0) == FFD_CAMBER_2D) ||
163-
(config->GetDesign_Variable(0) == FFD_THICKNESS_2D) || (config->GetDesign_Variable(0) == FFD_TWIST_2D) ||
164-
(config->GetDesign_Variable(0) == FFD_CONTROL_POINT) || (config->GetDesign_Variable(0) == FFD_NACELLE) ||
165-
(config->GetDesign_Variable(0) == FFD_GULL) || (config->GetDesign_Variable(0) == FFD_TWIST) ||
166-
(config->GetDesign_Variable(0) == FFD_ROTATION) || (config->GetDesign_Variable(0) == FFD_CONTROL_SURFACE) ||
167-
(config->GetDesign_Variable(0) == FFD_CAMBER) || (config->GetDesign_Variable(0) == FFD_THICKNESS) ||
168-
(config->GetDesign_Variable(0) == FFD_ANGLE_OF_ATTACK)) {
163+
(config->GetDesign_Variable(0) == FFD_THICKNESS_2D) || (config->GetDesign_Variable(0) == FFD_CONTROL_POINT) ||
164+
(config->GetDesign_Variable(0) == FFD_NACELLE) || (config->GetDesign_Variable(0) == FFD_GULL) ||
165+
(config->GetDesign_Variable(0) == FFD_TWIST) || (config->GetDesign_Variable(0) == FFD_ROTATION) ||
166+
(config->GetDesign_Variable(0) == FFD_CONTROL_SURFACE) || (config->GetDesign_Variable(0) == FFD_CAMBER) ||
167+
(config->GetDesign_Variable(0) == FFD_THICKNESS) || (config->GetDesign_Variable(0) == FFD_ANGLE_OF_ATTACK)) {
169168
/*--- Definition of the FFD deformation class ---*/
170169

171170
FFDBox = new CFreeFormDefBox*[MAX_NUMBER_FFD];
@@ -1558,9 +1557,6 @@ void CSurfaceMovement::ApplyDesignVariables(CGeometry* geometry, CConfig* config
15581557
case FFD_THICKNESS_2D:
15591558
SetFFDThickness_2D(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, false);
15601559
break;
1561-
case FFD_TWIST_2D:
1562-
SetFFDTwist_2D(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, false);
1563-
break;
15641560
case FFD_CONTROL_POINT:
15651561
SetFFDCPChange(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, false);
15661562
break;
@@ -2247,11 +2243,6 @@ bool CSurfaceMovement::SetFFDThickness_2D(CGeometry* geometry, CConfig* config,
22472243
return true;
22482244
}
22492245

2250-
bool CSurfaceMovement::SetFFDTwist_2D(CGeometry* geometry, CConfig* config, CFreeFormDefBox* FFDBox,
2251-
CFreeFormDefBox** ResetFFDBox, unsigned short iDV, bool ResetDef) {
2252-
return true;
2253-
}
2254-
22552246
bool CSurfaceMovement::SetFFDCamber(CGeometry* geometry, CConfig* config, CFreeFormDefBox* FFDBox,
22562247
CFreeFormDefBox** ResetFFDBox, unsigned short iDV, bool ResetDef) const {
22572248
su2double Ampl, movement[3] = {0.0, 0.0, 0.0};

‎QuickStart/inv_NACA0012.cfg‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT
172172
% Kind of deformation (NO_DEFORMATION, TRANSLATION, ROTATION, SCALE,
173173
% FFD_SETTING, FFD_NACELLE
174174
% FFD_CONTROL_POINT, FFD_CAMBER, FFD_THICKNESS, FFD_TWIST
175-
% FFD_CONTROL_POINT_2D, FFD_CAMBER_2D, FFD_THICKNESS_2D, FFD_TWIST_2D,
175+
% FFD_CONTROL_POINT_2D, FFD_CAMBER_2D, FFD_THICKNESS_2D,
176176
% HICKS_HENNE, SURFACE_BUMP)
177177
DV_KIND= HICKS_HENNE
178178
%
@@ -196,7 +196,6 @@ DV_MARKER= ( airfoil )
196196
% - FFD_CONTROL_POINT_2D ( FFD_BoxTag, i_Ind, j_Ind, x_Disp, y_Disp )
197197
% - FFD_CAMBER_2D ( FFD_BoxTag, i_Ind )
198198
% - FFD_THICKNESS_2D ( FFD_BoxTag, i_Ind )
199-
% - FFD_TWIST_2D ( FFD_BoxTag, x_Orig, y_Orig )
200199
% - HICKS_HENNE ( Lower Surface (0)/Upper Surface (1)/Only one Surface (2), x_Loc )
201200
% - SURFACE_BUMP ( x_Start, x_End, x_Loc )
202201
DV_PARAM= ( 1, 0.5 )

‎SU2_DEF/src/drivers/CDiscAdjDeformationDriver.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,10 @@ void CDiscAdjDeformationDriver::SetProjection_FD(CGeometry* geometry, CConfig* c
426426

427427
if ((config->GetDesign_Variable(iDV) == FFD_CONTROL_POINT_2D) ||
428428
(config->GetDesign_Variable(iDV) == FFD_CAMBER_2D) || (config->GetDesign_Variable(iDV) == FFD_THICKNESS_2D) ||
429-
(config->GetDesign_Variable(iDV) == FFD_TWIST_2D) || (config->GetDesign_Variable(iDV) == FFD_CONTROL_POINT) ||
430-
(config->GetDesign_Variable(iDV) == FFD_NACELLE) || (config->GetDesign_Variable(iDV) == FFD_GULL) ||
431-
(config->GetDesign_Variable(iDV) == FFD_TWIST) || (config->GetDesign_Variable(iDV) == FFD_ROTATION) ||
432-
(config->GetDesign_Variable(iDV) == FFD_CAMBER) || (config->GetDesign_Variable(iDV) == FFD_THICKNESS) ||
429+
(config->GetDesign_Variable(iDV) == FFD_CONTROL_POINT) || (config->GetDesign_Variable(iDV) == FFD_NACELLE) ||
430+
(config->GetDesign_Variable(iDV) == FFD_GULL) || (config->GetDesign_Variable(iDV) == FFD_TWIST) ||
431+
(config->GetDesign_Variable(iDV) == FFD_ROTATION) || (config->GetDesign_Variable(iDV) == FFD_CAMBER) ||
432+
(config->GetDesign_Variable(iDV) == FFD_THICKNESS) ||
433433
(config->GetDesign_Variable(iDV) == FFD_ANGLE_OF_ATTACK)) {
434434
/*--- Read the FFD information in the first iteration. ---*/
435435

@@ -482,9 +482,6 @@ void CDiscAdjDeformationDriver::SetProjection_FD(CGeometry* geometry, CConfig* c
482482
Local_MoveSurface =
483483
surface_movement->SetFFDThickness_2D(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, true);
484484
break;
485-
case FFD_TWIST_2D:
486-
Local_MoveSurface = surface_movement->SetFFDTwist_2D(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, true);
487-
break;
488485
case FFD_CONTROL_POINT:
489486
Local_MoveSurface = surface_movement->SetFFDCPChange(geometry, config, FFDBox[iFFDBox], FFDBox, iDV, true);
490487
break;

‎SU2_GEO/src/SU2_GEO.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,6 @@ int main(int argc, char* argv[]) {
745745
if ((config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_CONTROL_POINT_2D) ||
746746
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_CAMBER_2D) ||
747747
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_THICKNESS_2D) ||
748-
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_TWIST_2D) ||
749748
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_CONTROL_POINT) ||
750749
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_NACELLE) ||
751750
(config_container[ZONE_0]->GetDesign_Variable(iDV) == FFD_GULL) ||
@@ -824,10 +823,6 @@ int main(int argc, char* argv[]) {
824823
Local_MoveSurface = surface_movement->SetFFDThickness_2D(
825824
geometry_container[ZONE_0], config_container[ZONE_0], FFDBox[iFFDBox], FFDBox, iDV, true);
826825
break;
827-
case FFD_TWIST_2D:
828-
Local_MoveSurface = surface_movement->SetFFDTwist_2D(geometry_container[ZONE_0], config_container[ZONE_0],
829-
FFDBox[iFFDBox], FFDBox, iDV, true);
830-
break;
831826
case FFD_CONTROL_POINT:
832827
Local_MoveSurface = surface_movement->SetFFDCPChange(geometry_container[ZONE_0], config_container[ZONE_0],
833828
FFDBox[iFFDBox], FFDBox, iDV, true);

‎SU2_PY/SU2/io/config.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ def read_config(filename):
413413
"FFD_CONTROL_POINT",
414414
"FFD_NACELLE",
415415
"FFD_GULL",
416-
"FFD_TWIST_2D",
417416
"FFD_TWIST",
418417
"FFD_ROTATION",
419418
"FFD_CAMBER",
@@ -546,7 +545,6 @@ def read_config(filename):
546545
"FFD_NACELLE",
547546
"FFD_GULL",
548547
"FFD_TWIST",
549-
"FFD_TWIST_2D",
550548
"FFD_TWIST_ANGLE",
551549
"FFD_ROTATION",
552550
"FFD_CAMBER",
@@ -1117,7 +1115,6 @@ def write_config(filename, param_dict):
11171115
"FFD_GULL",
11181116
"FFD_TWIST_ANGLE",
11191117
"FFD_TWIST",
1120-
"FFD_TWIST_2D",
11211118
"FFD_ROTATION",
11221119
"FFD_CAMBER",
11231120
"FFD_THICKNESS",

‎SU2_PY/SU2/io/config_options.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class DEFINITION_DV(ordered_bunch):
7272
-FFD_CONTROL_POINT_2D ( 19, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
7373
-FFD_CAMBER_2D ( 20, Scale | Mark. List | FFD_BoxTag, i_Ind )
7474
-FFD_THICKNESS_2D ( 21, Scale | Mark. List | FFD_BoxTag, i_Ind )
75-
-FFD_TWIST_2D ( 22, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig )
7675
-HICKS_HENNE ( 30, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
7776
-ANGLE_OF_ATTACK ( 101, Scale | Mark. List | 1.0 )
7877
@@ -128,7 +127,6 @@ class DV_KIND(ordered_bunch):
128127
-FFD_CONTROL_POINT_2D ( 19, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
129128
-FFD_CAMBER_2D ( 20, Scale | Mark. List | FFD_BoxTag, i_Ind )
130129
-FFD_THICKNESS_2D ( 21, Scale | Mark. List | FFD_BoxTag, i_Ind )
131-
-FFD_TWIST_2D ( 22, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig )
132130
-HICKS_HENNE ( 30, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
133131
-ANGLE_OF_ATTACK ( 101, Scale | Mark. List | 1.0 )
134132

0 commit comments

Comments
 (0)