Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Francisco Palacios committed Mar 20, 2015
2 parents a97d332 + 8c778d1 commit e1da5b0
Show file tree
Hide file tree
Showing 193 changed files with 1,439 additions and 1,269 deletions.
2 changes: 1 addition & 1 deletion Common/doc/docmain.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
28 changes: 21 additions & 7 deletions Common/include/config_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios, T. Economon, B. Tracey
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down Expand Up @@ -238,6 +238,7 @@ class CConfig {
double *ActDisk_PressJump;
double *ActDisk_TempJump;
double *ActDisk_Omega;
unsigned short *ActDisk_Distribution;
double **Periodic_RotCenter; /*!< \brief Rotational center for each periodic boundary. */
double **Periodic_RotAngles; /*!< \brief Rotation angles for each periodic boundary. */
double **Periodic_Translation; /*!< \brief Translation vector for each periodic boundary. */
Expand Down Expand Up @@ -421,6 +422,7 @@ class CConfig {
bool Fixed_CL_Mode; /*!< \brief Activate fixed CL mode (external flow only). */
double Target_CL; /*!< \brief Specify a target CL instead of AoA (external flow only). */
double Damp_Fixed_CL; /*!< \brief Damping coefficient for fixed CL mode (external flow only). */
unsigned long Iter_Fixed_CL; /*!< \brief Iterations to re-evaluate the angle of attack (external flow only). */
bool Update_AoA; /*!< \brief Boolean flag for whether to update the AoA for fixed lift mode on a given iteration. */
double ChargeCoeff; /*!< \brief Charge coefficient (just for poisson problems). */
double *U_FreeStreamND; /*!< \brief Reference variables at the infinity, free stream values. */
Expand Down Expand Up @@ -926,12 +928,13 @@ class CConfig {
}

void addActuatorDiskOption(const string & name, unsigned short & nMarker_ActDisk_Inlet, unsigned short & nMarker_ActDisk_Outlet,
string* & Marker_ActDisk_Inlet, string* & Marker_ActDisk_Outlet,
double** & ActDisk_Origin, double* & ActDisk_RootRadius, double* & ActDisk_TipRadius,
double* & ActDisk_PressJump, double* & ActDisk_TempJump, double* & ActDisk_Omega) {
string* & Marker_ActDisk_Inlet, string* & Marker_ActDisk_Outlet,
double** & ActDisk_Origin, double* & ActDisk_RootRadius, double* & ActDisk_TipRadius,
double* & ActDisk_PressJump, double* & ActDisk_TempJump, double* & ActDisk_Omega,
unsigned short* & ActDisk_Distribution) {
assert(option_map.find(name) == option_map.end());
all_options.insert(pair<string, bool>(name, true));
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);
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);
option_map.insert(pair<string, COptionBase *>(name, val));
}

Expand Down Expand Up @@ -4557,7 +4560,12 @@ class CConfig {
* \brief Get the rev / min of the actuator disk.
*/
double GetActDisk_Omega(string val_marker);


/*!
* \brief Get the rev / min of the actuator disk.
*/
unsigned short GetActDisk_Distribution(string val_marker);

/*!
* \brief Get Actuator Disk Outlet for boundary <i>val_marker</i> (actuator disk inlet).
* \return Actuator Disk Outlet from the config information for the marker <i>val_marker</i>.
Expand Down Expand Up @@ -5155,7 +5163,13 @@ class CConfig {
* \return Damping coefficient for fixed CL mode.
*/
double GetDamp_Fixed_CL(void);


/*!
* \brief Get the value of iterations to re-evaluate the angle of attack.
* \return Number of iterations.
*/
unsigned long GetIter_Fixed_CL(void);

/*!
* \brief Set the value of the boolean for updating AoA in fixed lift mode.
* \param[in] val_update - the bool for whether to update the AoA.
Expand Down
4 changes: 3 additions & 1 deletion Common/include/config_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios, T. Economon
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down Expand Up @@ -1157,6 +1157,8 @@ inline double CConfig::GetTarget_CL(void) {return Target_CL; }

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

inline unsigned long CConfig::GetIter_Fixed_CL(void) {return Iter_Fixed_CL; }

inline bool CConfig::GetUpdate_AoA(void) { return Update_AoA; }

inline void CConfig::SetUpdate_AoA(bool val_update) { Update_AoA = val_update; }
Expand Down
8 changes: 1 addition & 7 deletions Common/include/dual_grid_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down Expand Up @@ -1020,12 +1020,6 @@ class CVertex : public CDualGrid {
* \return Value of the rotation that must be applied to the solution of the vertex
*/
short GetRotation_Type(void);

/*!
* \brief Set the periodic point of a vertex.
* \param[in] val_periodicpoint - Value of periodic point of the vertex.
*/
void SetDonorPoint(long val_periodicpoint);

/*!
* \overload
Expand Down
4 changes: 1 addition & 3 deletions Common/include/dual_grid_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down Expand Up @@ -308,8 +308,6 @@ inline void CVertex::SetRotation_Type(short val_rotation_type) { Rotation_Type =

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

inline void CVertex::SetDonorPoint(long val_periodicpoint) { PeriodicPoint[0] = val_periodicpoint; }

inline void CVertex::SetDonorPoint(long val_periodicpoint, long val_processor) {
PeriodicPoint[0] = val_periodicpoint;
PeriodicPoint[1] = val_processor;
Expand Down
2 changes: 1 addition & 1 deletion Common/include/geometry_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/geometry_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_adaptation_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_adaptation_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_movement_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* \author F. Palacios, T. Economon, S. Padron
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/grid_movement_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios, T. Economon, S. Padron
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/linear_solvers_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author J. Hicken, F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/linear_solvers_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author J. Hicken, F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/matrix_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios, A. Bueno
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/matrix_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios, A. Bueno
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
13 changes: 10 additions & 3 deletions Common/include/option_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* be declared and defined here; to keep all elements together, there
* is no corresponding .cpp file at this time.
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down Expand Up @@ -2622,15 +2622,16 @@ class COptionActuatorDisk : public COptionBase{
double * & press_jump;
double * & temp_jump;
double * & omega;
unsigned short * & distribution;

public:
COptionActuatorDisk(const string name, unsigned short & nMarker_ActDisk_Inlet, unsigned short & nMarker_ActDisk_Outlet, string * & Marker_ActDisk_Inlet, string * & Marker_ActDisk_Outlet, double ** & ActDisk_Origin, double * & ActDisk_RootRadius, double * & ActDisk_TipRadius, double * & ActDisk_PressJump, double * & ActDisk_TempJump, double * & ActDisk_Omega) : inlet_size(nMarker_ActDisk_Inlet), outlet_size(nMarker_ActDisk_Outlet), marker_inlet(Marker_ActDisk_Inlet), marker_outlet(Marker_ActDisk_Outlet), origin(ActDisk_Origin), root_radius(ActDisk_RootRadius), tip_radius(ActDisk_TipRadius), press_jump(ActDisk_PressJump), temp_jump(ActDisk_TempJump), omega(ActDisk_Omega) {
COptionActuatorDisk(const string name, unsigned short & nMarker_ActDisk_Inlet, unsigned short & nMarker_ActDisk_Outlet, string * & Marker_ActDisk_Inlet, string * & Marker_ActDisk_Outlet, double ** & ActDisk_Origin, double * & ActDisk_RootRadius, double * & ActDisk_TipRadius, double * & ActDisk_PressJump, double * & ActDisk_TempJump, double * & ActDisk_Omega, unsigned short * & ActDisk_Distribution) : inlet_size(nMarker_ActDisk_Inlet), outlet_size(nMarker_ActDisk_Outlet), marker_inlet(Marker_ActDisk_Inlet), marker_outlet(Marker_ActDisk_Outlet), origin(ActDisk_Origin), root_radius(ActDisk_RootRadius), tip_radius(ActDisk_TipRadius), press_jump(ActDisk_PressJump), temp_jump(ActDisk_TempJump), omega(ActDisk_Omega), distribution(ActDisk_Distribution) {
this->name = name;
}

~COptionActuatorDisk() {};
string SetValue(vector<string> option_value) {
const int mod_num = 10;
const int mod_num = 11;
unsigned long totalVals = option_value.size();
if ((totalVals == 1) && (option_value[0].compare("NONE") == 0)) {
this->SetDefault();
Expand All @@ -2655,6 +2656,7 @@ class COptionActuatorDisk : public COptionBase{
this->press_jump = new double[this->outlet_size];
this->temp_jump = new double[this->outlet_size];
this->omega = new double[this->inlet_size];
this->distribution = new unsigned short[this->inlet_size];

this->origin = new double*[this->inlet_size];
for (int i = 0; i < this->inlet_size; i++) {
Expand Down Expand Up @@ -2698,6 +2700,10 @@ class COptionActuatorDisk : public COptionBase{
if (!(ss_8th >> this->omega[i])) {
return badValue(option_value, tname, this->name);
}
istringstream ss_9th(option_value[mod_num*i + 10]);
if (!(ss_9th >> this->distribution[i])) {
return badValue(option_value, tname, this->name);
}
}
return "";
}
Expand All @@ -2712,6 +2718,7 @@ class COptionActuatorDisk : public COptionBase{
this->press_jump = NULL;
this->temp_jump = NULL;
this->omega = NULL;
this->distribution = NULL;
}
};

2 changes: 1 addition & 1 deletion Common/include/primal_grid_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/primal_grid_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/su2mpi.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author B. Tracey
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/vector_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* \author F. Palacios, J. Hicken
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/include/vector_structure.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* \author F. Palacios, J. Hicken
* \version 3.2.9 "eagle"
*
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
* Dr. Thomas D. Economon ([email protected]).
*
* SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/lib/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SU2 Makefile.am for common library
# SU2 v3.2.7 "eagle"
#
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
# Dr. Thomas D. Economon ([email protected]).
#
# SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
2 changes: 1 addition & 1 deletion Common/lib/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# SU2 Makefile.am for common library
# SU2 v3.2.7 "eagle"
#
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
# Dr. Thomas D. Economon ([email protected]).
#
# SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
Expand Down
Loading

0 comments on commit e1da5b0

Please sign in to comment.