Merge branch 'develop' into adaptive_edge_color_group_size

Author: jblueh

Common/include/CConfig.hpp

@@ -214,8 +214,6 @@ class CConfig {
   nMarker_Damper,                 /*!< \brief Number of damper surface markers. */
   nMarker_Load_Dir,               /*!< \brief Number of load surface markers defined by magnitude and direction. */
   nMarker_Disp_Dir,               /*!< \brief Number of load surface markers defined by magnitude and direction. */
-  nMarker_Load_Sine,              /*!< \brief Number of load surface markers defined by magnitude and direction. */
-  nMarker_FlowLoad,               /*!< \brief Number of load surface markers. */
   nMarker_Internal,               /*!< \brief Number of internal flow markers. */
   nMarker_All,                    /*!< \brief Total number of markers using the grid information. */
   nMarker_Max,                    /*!< \brief Max number of number of markers using the grid information. */
@@ -269,7 +267,6 @@ class CConfig {
   *Marker_Load_Dir,               /*!< \brief Load markers defined in cartesian coordinates. */
   *Marker_Disp_Dir,               /*!< \brief Load markers defined in cartesian coordinates. */
   *Marker_Load_Sine,              /*!< \brief Sine-wave loaded markers defined in cartesian coordinates. */
-  *Marker_FlowLoad,               /*!< \brief Flow Load markers. */
   *Marker_Internal,               /*!< \brief Internal flow markers. */
   *Marker_All_TagBound;           /*!< \brief Global index for markers using grid information. */
 
@@ -328,10 +325,6 @@ class CConfig {
   su2double *Disp_Dir_Multiplier;            /*!< \brief Specified multiplier for load boundaries defined in cartesian coordinates. */
   su2double **Load_Dir;                      /*!< \brief Specified flow direction vector (unit vector) for inlet boundaries. */
   su2double **Disp_Dir;                      /*!< \brief Specified structural displacement direction (unit vector). */
-  su2double *Load_Sine_Amplitude;            /*!< \brief Specified amplitude for a sine-wave load. */
-  su2double *Load_Sine_Frequency;            /*!< \brief Specified multiplier for load boundaries defined in cartesian coordinates. */
-  su2double **Load_Sine_Dir;                 /*!< \brief Specified flow direction vector (unit vector) for inlet boundaries. */
-  su2double *FlowLoad_Value;                 /*!< \brief Specified force for flow load boundaries. */
   su2double *ActDiskInlet_MassFlow;          /*!< \brief Specified inlet mass flow for actuator disk. */
   su2double *ActDiskInlet_Temperature;       /*!< \brief Specified inlet temperature for actuator disk. */
   su2double *ActDiskInlet_TotalTemperature;  /*!< \brief Specified inlet total temperature for actuator disk. */
@@ -518,8 +511,6 @@ class CConfig {
   Kind_Deform_Linear_Solver_Prec,        /*!< \brief Preconditioner of the linear solver. */
   Kind_Linear_Solver,                    /*!< \brief Numerical solver for the implicit scheme. */
   Kind_Linear_Solver_Prec,               /*!< \brief Preconditioner of the linear solver. */
-  Kind_AdjTurb_Linear_Solver,            /*!< \brief Numerical solver for the turbulent adjoint implicit scheme. */
-  Kind_AdjTurb_Linear_Prec,              /*!< \brief Preconditioner of the turbulent adjoint linear solver. */
   Kind_DiscAdj_Linear_Solver,            /*!< \brief Linear solver for the discrete adjoint system. */
   Kind_DiscAdj_Linear_Prec,              /*!< \brief Preconditioner of the discrete adjoint linear solver. */
   Kind_TimeNumScheme,           /*!< \brief Global explicit or implicit time integration. */
@@ -632,9 +623,7 @@ class CConfig {
   su2double Roe_Kappa;                  /*!< \brief Relaxation of the Roe scheme. */
   su2double Relaxation_Factor_Adjoint;  /*!< \brief Relaxation coefficient for variable updates of adjoint solvers. */
   su2double Relaxation_Factor_CHT;      /*!< \brief Relaxation coefficient for the update of conjugate heat variables. */
-  su2double AdjTurb_Linear_Error;       /*!< \brief Min error of the turbulent adjoint linear solver for the implicit formulation. */
   su2double EntropyFix_Coeff;           /*!< \brief Entropy fix coefficient. */
-  unsigned short AdjTurb_Linear_Iter;   /*!< \brief Min error of the turbulent adjoint linear solver for the implicit formulation. */
   unsigned short nLocationStations,     /*!< \brief Number of section cuts to make when outputting mesh and cp . */
   nWingStations;                        /*!< \brief Number of section cuts to make when calculating internal volume. */
   su2double Kappa_1st_AdjFlow,  /*!< \brief Lax 1st order dissipation coefficient for adjoint flow equations (coarse multigrid levels). */
@@ -678,7 +667,6 @@ class CConfig {
   su2double Total_CM;         /*!< \brief Specify a Total CM instead of AoA (external flow only). */
   su2double Total_CD;         /*!< \brief Specify a target CD instead of AoA (external flow only). */
   su2double dCL_dAlpha;       /*!< \brief value of dCl/dAlpha. */
-  su2double dCM_diH;          /*!< \brief value of dCM/dHi. */
   unsigned long Iter_Fixed_CM;          /*!< \brief Iterations to re-evaluate the angle of attack (external flow only). */
   unsigned long Iter_Fixed_NetThrust;   /*!< \brief Iterations to re-evaluate the angle of attack (external flow only). */
   unsigned long Iter_dCL_dAlpha;        /*!< \brief Number of iterations to evaluate dCL_dAlpha. */
@@ -940,8 +928,6 @@ class CConfig {
   bool RampAndRelease;            /*!< \brief option for ramp load and release */
   bool Sine_Load;                 /*!< \brief option for sine load */
   su2double Thermal_Diffusivity;  /*!< \brief Thermal diffusivity used in the heat solver. */
-  su2double Cyclic_Pitch,         /*!< \brief Cyclic pitch for rotorcraft simulations. */
-  Collective_Pitch;               /*!< \brief Collective pitch for rotorcraft simulations. */
   su2double Mach_Motion;          /*!< \brief Mach number based on mesh velocity and freestream quantities. */
 
   su2double Motion_Origin[3] = {0.0}, /*!< \brief Mesh motion origin. */
@@ -1123,7 +1109,6 @@ class CConfig {
   distortion[2],         /*!< \brief SU2_GEO section locations array for the COption class. */
   ea_lim[3],             /*!< \brief equivalent area limit array for the COption class. */
   grid_fix[6],           /*!< \brief fixed grid (non-deforming region) array for the COption class. */
-  htp_axis[2],           /*!< \brief HTP axis for the COption class. */
   ffd_axis[3],           /*!< \brief FFD axis for the COption class. */
   inc_crit[3],           /*!< \brief incremental criteria array for the COption class. */
   extrarelfac[2],        /*!< \brief extra relaxation factor for Giles BC in the COption class. */
@@ -4296,18 +4281,6 @@ class CConfig {
    */
   su2double GetSemiSpan(void) const { return SemiSpan; }
 
-  /*!
-   * \brief Get the kind of solver for the implicit solver.
-   * \return Numerical solver for implicit formulation (solving the linear system).
-   */
-  unsigned short GetKind_AdjTurb_Linear_Solver(void) const { return Kind_AdjTurb_Linear_Solver; }
-
-  /*!
-   * \brief Get the kind of preconditioner for the implicit solver.
-   * \return Numerical preconditioner for implicit formulation (solving the linear system).
-   */
-  unsigned short GetKind_AdjTurb_Linear_Prec(void) const { return Kind_AdjTurb_Linear_Prec; }
-
   /*!
    * \brief Get the kind of solver for the implicit solver.
    * \return Numerical solver for implicit formulation (solving the linear system).
@@ -4326,30 +4299,12 @@ class CConfig {
    */
   unsigned short GetKind_Deform_Linear_Solver_Prec(void) const { return Kind_Deform_Linear_Solver_Prec; }
 
-  /*!
-   * \brief Set the kind of preconditioner for the implicit solver.
-   * \return Numerical preconditioner for implicit formulation (solving the linear system).
-   */
-  void SetKind_AdjTurb_Linear_Prec(unsigned short val_kind_prec) { Kind_AdjTurb_Linear_Prec = val_kind_prec; }
-
-  /*!
-   * \brief Get min error of the linear solver for the implicit formulation.
-   * \return Min error of the linear solver for the implicit formulation.
-   */
-  su2double GetAdjTurb_Linear_Error(void) const { return AdjTurb_Linear_Error; }
-
   /*!
    * \brief Get the entropy fix.
    * \return Vaule of the entropy fix.
    */
   su2double GetEntropyFix_Coeff(void) const { return EntropyFix_Coeff; }
 
-  /*!
-   * \brief Get max number of iterations of the linear solver for the implicit formulation.
-   * \return Max number of iterations of the linear solver for the implicit formulation.
-   */
-  unsigned short GetAdjTurb_Linear_Iter(void) const { return AdjTurb_Linear_Iter; }
-
   /*!
    * \brief Get CFL reduction factor for adjoint turbulence model.
    * \return CFL reduction factor.
@@ -6504,8 +6459,8 @@ class CConfig {
   su2double GetWeightCd(void) const { return WeightCd; }
 
   /*!
-   * \brief Value of the weight of the CD, CL, CM optimization.
-   * \return Value of the weight of the CD, CL, CM optimization.
+   * \brief Value of the damping factor for the Thrust BC (actuator disk).
+   * \return Value of the damping factor.
    */
   void SetdNetThrust_dBCThrust(su2double val_dnetthrust_dbcthrust);
 
@@ -6569,12 +6524,6 @@ class CConfig {
    */
   void SetdCL_dAlpha(su2double val_dcl_dalpha) { dCL_dAlpha = val_dcl_dalpha; }
 
-  /*!
-   * \brief Value of the weight of the CD, CL, CM optimization.
-   * \return Value of the weight of the CD, CL, CM optimization.
-   */
-  void SetdCM_diH(su2double val_dcm_dhi) { dCM_diH = val_dcm_dhi; }
-
   /*!
    * \brief Value of the weight of the CD, CL, CM optimization.
    * \return Value of the weight of the CD, CL, CM optimization.
@@ -8363,46 +8312,6 @@ class CConfig {
    */
   const su2double* GetDisp_Dir(const string& val_index) const;
 
-  /*!
-   * \brief Get the amplitude of the sine-wave at a load boundary defined in cartesian coordinates.
-   * \param[in] val_index - Index corresponding to the load boundary.
-   * \return The load value.
-   */
-  su2double GetLoad_Sine_Amplitude(const string& val_index) const;
-
-  /*!
-   * \brief Get the frequency of the sine-wave at a load boundary in cartesian coordinates.
-   * \param[in] val_index - Index corresponding to the load boundary.
-   * \return The load frequency.
-   */
-  su2double GetLoad_Sine_Frequency(const string& val_index) const;
-
-  /*!
-   * \brief Get the force direction at a sine-wave loaded boundary in cartesian coordinates.
-   * \param[in] val_index - Index corresponding to the load boundary.
-   * \return The load direction.
-   */
-  const su2double* GetLoad_Sine_Dir(const string& val_index) const;
-
-  /*!
-   * \brief Get the force value at an load boundary.
-   * \param[in] val_index - Index corresponding to the load boundary.
-   * \return The load value.
-   */
-  su2double GetFlowLoad_Value(const string& val_index) const;
-
-  /*!
-   * \brief Cyclic pitch amplitude for rotor blades.
-   * \return The specified cyclic pitch amplitude.
-   */
-  su2double GetCyclic_Pitch(void) const { return Cyclic_Pitch; }
-
-  /*!
-   * \brief Collective pitch setting for rotor blades.
-   * \return The specified collective pitch setting.
-   */
-  su2double GetCollective_Pitch(void) const { return Collective_Pitch; }
-
   /*!
    * \brief Get name of the arbitrary mesh motion input file.
    * \return File name of the arbitrary mesh motion input file.
@@ -8705,21 +8614,15 @@ class CConfig {
    */
   unsigned long GetIter_dCL_dAlpha(void) const { return Iter_dCL_dAlpha; }
 
-  /*!
-   * \brief Get the value of the damping coefficient for fixed CL mode.
-   * \return Damping coefficient for fixed CL mode.
-   */
-  su2double GetdCM_diH(void) const { return dCM_diH; }
-
   /*!
    * \brief Get the value of iterations to re-evaluate the angle of attack.
    * \return Number of iterations.
    */
   unsigned long GetIter_Fixed_NetThrust(void) const { return Iter_Fixed_NetThrust; }
 
   /*!
-   * \brief Get the value of the damping coefficient for fixed CL mode.
-   * \return Damping coefficient for fixed CL mode.
+   * \brief Get the value of NetThrust_dBCThrust.
+   * \return Value NetThrust_dBCThrust.
    */
   su2double GetdNetThrust_dBCThrust(void) const { return dNetThrust_dBCThrust; }
 

Common/include/grid_movement/CSurfaceMovement.hpp

@@ -156,13 +156,6 @@ class CSurfaceMovement : public CGridMovement {
   void SetBoundary_Flutter3D(CGeometry* geometry, CConfig* config, CFreeFormDefBox** FFDBox, unsigned long iter,
                              unsigned short iZone);
 
-  /*!
-   * \brief Set the collective pitch for a blade surface movement.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetCollective_Pitch(CGeometry* geometry, CConfig* config);
-
   /*!
    * \brief Set any surface deformationsbased on an input file.
    * \param[in] geometry - Geometrical definition of the problem.

Common/include/option_structure.inl

@@ -654,7 +654,7 @@ class COptionDVParam : public COptionBase {
         default: {
           string newstring;
           newstring.append(this->name);
-          newstring.append(": undefined design variable type found in configuration file.");
+          newstring.append(": undefined design variable type found in configuration file. ");
           return newstring;
         }
       }