Skip to content

Commit e1da5b0

Browse files
author
Francisco Palacios
committed
Merge branch 'develop'
2 parents a97d332 + 8c778d1 commit e1da5b0

File tree

193 files changed

+1439
-1269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+1439
-1269
lines changed

‎Common/doc/docmain.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \author F. Palacios
55
* \version 3.2.9 "eagle"
66
*
7-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
7+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
88
* Dr. Thomas D. Economon ([email protected]).
99
*
1010
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

‎Common/include/config_structure.hpp‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* \author F. Palacios, T. Economon, B. Tracey
66
* \version 3.2.9 "eagle"
77
*
8-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
8+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
99
* Dr. Thomas D. Economon ([email protected]).
1010
*
1111
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
@@ -238,6 +238,7 @@ class CConfig {
238238
double *ActDisk_PressJump;
239239
double *ActDisk_TempJump;
240240
double *ActDisk_Omega;
241+
unsigned short *ActDisk_Distribution;
241242
double **Periodic_RotCenter; /*!< \brief Rotational center for each periodic boundary. */
242243
double **Periodic_RotAngles; /*!< \brief Rotation angles for each periodic boundary. */
243244
double **Periodic_Translation; /*!< \brief Translation vector for each periodic boundary. */
@@ -421,6 +422,7 @@ class CConfig {
421422
bool Fixed_CL_Mode; /*!< \brief Activate fixed CL mode (external flow only). */
422423
double Target_CL; /*!< \brief Specify a target CL instead of AoA (external flow only). */
423424
double Damp_Fixed_CL; /*!< \brief Damping coefficient for fixed CL mode (external flow only). */
425+
unsigned long Iter_Fixed_CL; /*!< \brief Iterations to re-evaluate the angle of attack (external flow only). */
424426
bool Update_AoA; /*!< \brief Boolean flag for whether to update the AoA for fixed lift mode on a given iteration. */
425427
double ChargeCoeff; /*!< \brief Charge coefficient (just for poisson problems). */
426428
double *U_FreeStreamND; /*!< \brief Reference variables at the infinity, free stream values. */
@@ -926,12 +928,13 @@ class CConfig {
926928
}
927929

928930
void addActuatorDiskOption(const string & name, unsigned short & nMarker_ActDisk_Inlet, unsigned short & nMarker_ActDisk_Outlet,
929-
string* & Marker_ActDisk_Inlet, string* & Marker_ActDisk_Outlet,
930-
double** & ActDisk_Origin, double* & ActDisk_RootRadius, double* & ActDisk_TipRadius,
931-
double* & ActDisk_PressJump, double* & ActDisk_TempJump, double* & ActDisk_Omega) {
931+
string* & Marker_ActDisk_Inlet, string* & Marker_ActDisk_Outlet,
932+
double** & ActDisk_Origin, double* & ActDisk_RootRadius, double* & ActDisk_TipRadius,
933+
double* & ActDisk_PressJump, double* & ActDisk_TempJump, double* & ActDisk_Omega,
934+
unsigned short* & ActDisk_Distribution) {
932935
assert(option_map.find(name) == option_map.end());
933936
all_options.insert(pair<string, bool>(name, true));
934-
COptionBase* val = new COptionActuatorDisk(name, nMarker_ActDisk_Inlet, nMarker_ActDisk_Outlet, Marker_ActDisk_Inlet, Marker_ActDisk_Outlet, ActDisk_Origin, ActDisk_RootRadius, ActDisk_TipRadius, ActDisk_PressJump, ActDisk_TempJump, ActDisk_Omega);
937+
COptionBase* val = new COptionActuatorDisk(name, nMarker_ActDisk_Inlet, nMarker_ActDisk_Outlet, Marker_ActDisk_Inlet, Marker_ActDisk_Outlet, ActDisk_Origin, ActDisk_RootRadius, ActDisk_TipRadius, ActDisk_PressJump, ActDisk_TempJump, ActDisk_Omega, ActDisk_Distribution);
935938
option_map.insert(pair<string, COptionBase *>(name, val));
936939
}
937940

@@ -4557,7 +4560,12 @@ class CConfig {
45574560
* \brief Get the rev / min of the actuator disk.
45584561
*/
45594562
double GetActDisk_Omega(string val_marker);
4560-
4563+
4564+
/*!
4565+
* \brief Get the rev / min of the actuator disk.
4566+
*/
4567+
unsigned short GetActDisk_Distribution(string val_marker);
4568+
45614569
/*!
45624570
* \brief Get Actuator Disk Outlet for boundary <i>val_marker</i> (actuator disk inlet).
45634571
* \return Actuator Disk Outlet from the config information for the marker <i>val_marker</i>.
@@ -5155,7 +5163,13 @@ class CConfig {
51555163
* \return Damping coefficient for fixed CL mode.
51565164
*/
51575165
double GetDamp_Fixed_CL(void);
5158-
5166+
5167+
/*!
5168+
* \brief Get the value of iterations to re-evaluate the angle of attack.
5169+
* \return Number of iterations.
5170+
*/
5171+
unsigned long GetIter_Fixed_CL(void);
5172+
51595173
/*!
51605174
* \brief Set the value of the boolean for updating AoA in fixed lift mode.
51615175
* \param[in] val_update - the bool for whether to update the AoA.

‎Common/include/config_structure.inl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \author F. Palacios, T. Economon
55
* \version 3.2.9 "eagle"
66
*
7-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
7+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
88
* Dr. Thomas D. Economon ([email protected]).
99
*
1010
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
@@ -1157,6 +1157,8 @@ inline double CConfig::GetTarget_CL(void) {return Target_CL; }
11571157

11581158
inline double CConfig::GetDamp_Fixed_CL(void) {return Damp_Fixed_CL; }
11591159

1160+
inline unsigned long CConfig::GetIter_Fixed_CL(void) {return Iter_Fixed_CL; }
1161+
11601162
inline bool CConfig::GetUpdate_AoA(void) { return Update_AoA; }
11611163

11621164
inline void CConfig::SetUpdate_AoA(bool val_update) { Update_AoA = val_update; }

‎Common/include/dual_grid_structure.hpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* \author F. Palacios
66
* \version 3.2.9 "eagle"
77
*
8-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
8+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
99
* Dr. Thomas D. Economon ([email protected]).
1010
*
1111
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
@@ -1020,12 +1020,6 @@ class CVertex : public CDualGrid {
10201020
* \return Value of the rotation that must be applied to the solution of the vertex
10211021
*/
10221022
short GetRotation_Type(void);
1023-
1024-
/*!
1025-
* \brief Set the periodic point of a vertex.
1026-
* \param[in] val_periodicpoint - Value of periodic point of the vertex.
1027-
*/
1028-
void SetDonorPoint(long val_periodicpoint);
10291023

10301024
/*!
10311025
* \overload

‎Common/include/dual_grid_structure.inl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \author F. Palacios
55
* \version 3.2.9 "eagle"
66
*
7-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
7+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
88
* Dr. Thomas D. Economon ([email protected]).
99
*
1010
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
@@ -308,8 +308,6 @@ inline void CVertex::SetRotation_Type(short val_rotation_type) { Rotation_Type =
308308

309309
inline short CVertex::GetRotation_Type(void) { return Rotation_Type; }
310310

311-
inline void CVertex::SetDonorPoint(long val_periodicpoint) { PeriodicPoint[0] = val_periodicpoint; }
312-
313311
inline void CVertex::SetDonorPoint(long val_periodicpoint, long val_processor) {
314312
PeriodicPoint[0] = val_periodicpoint;
315313
PeriodicPoint[1] = val_processor;

‎Common/include/geometry_structure.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* \author F. Palacios
66
* \version 3.2.9 "eagle"
77
*
8-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
8+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
99
* Dr. Thomas D. Economon ([email protected]).
1010
*
1111
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

‎Common/include/geometry_structure.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \author F. Palacios
55
* \version 3.2.9 "eagle"
66
*
7-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
7+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
88
* Dr. Thomas D. Economon ([email protected]).
99
*
1010
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

‎Common/include/grid_adaptation_structure.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* \author F. Palacios
88
* \version 3.2.9 "eagle"
99
*
10-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
10+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
1111
* Dr. Thomas D. Economon ([email protected]).
1212
*
1313
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

‎Common/include/grid_adaptation_structure.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \author F. Palacios
55
* \version 3.2.9 "eagle"
66
*
7-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
7+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
88
* Dr. Thomas D. Economon ([email protected]).
99
*
1010
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

‎Common/include/grid_movement_structure.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* \author F. Palacios, T. Economon, S. Padron
88
* \version 3.2.9 "eagle"
99
*
10-
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
10+
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
1111
* Dr. Thomas D. Economon ([email protected]).
1212
*
1313
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.

0 commit comments

Comments
 (0)