Merge branch 'develop' into master

Author: economon

Common/include/config_structure.hpp

@@ -191,7 +191,6 @@ class CConfig {
   nMarker_FarField,				/*!< \brief Number of far-field markers. */
   nMarker_Custom,
   nMarker_SymWall,				/*!< \brief Number of symmetry wall markers. */
-  nMarker_Pressure,				/*!< \brief Number of pressure wall markers. */
   nMarker_PerBound,				/*!< \brief Number of periodic boundary markers. */
   nMarker_MixingPlaneInterface,				/*!< \brief Number of mixing plane interface boundary markers. */
   nMarker_Turbomachinery,				/*!< \brief Number turbomachinery markers. */
@@ -234,7 +233,6 @@ class CConfig {
   *Marker_FarField,				/*!< \brief Far field markers. */
   *Marker_Custom,
   *Marker_SymWall,				/*!< \brief Symmetry wall markers. */
-  *Marker_Pressure,				/*!< \brief Pressure boundary markers. */
   *Marker_PerBound,				/*!< \brief Periodic boundary markers. */
   *Marker_PerDonor,				/*!< \brief Rotationally periodic boundary donor markers. */
   *Marker_MixingPlaneInterface,				/*!< \brief MixingPlane interface boundary markers. */
@@ -808,6 +806,9 @@ class CConfig {
   su2double AitkenStatRelax;	/*!< \brief Aitken's relaxation factor (if set as static) */
   su2double AitkenDynMaxInit;	/*!< \brief Aitken's maximum dynamic relaxation factor for the first iteration */
   su2double AitkenDynMinInit;	/*!< \brief Aitken's minimum dynamic relaxation factor for the first iteration */
+  bool RampAndRelease;        /*!< \brief option for ramp load and release */
+  bool Sine_Load;             /*!< \brief option for sine load */
+  su2double *SineLoad_Coeff;  /*!< \brief Stores the load coefficient */
   su2double Wave_Speed;			  /*!< \brief Wave speed used in the wave solver. */
   su2double Thermal_Diffusivity;			/*!< \brief Thermal diffusivity used in the heat solver. */
   su2double Cyclic_Pitch,     /*!< \brief Cyclic pitch for rotorcraft simulations. */
@@ -892,8 +893,8 @@ class CConfig {
   bool PseudoStatic;    /*!< Application of dead loads to the FE analysis */
   bool MatchingMesh; 	        /*!< Matching mesh (while implementing interpolation procedures). */
   bool SteadyRestart; 	      /*!< Restart from a steady state for FSI problems. */
-  su2double Newmark_alpha,		/*!< \brief Parameter alpha for Newmark method. */
-  Newmark_delta;				      /*!< \brief Parameter delta for Newmark method. */
+  su2double Newmark_beta,		/*!< \brief Parameter alpha for Newmark method. */
+  Newmark_gamma;				      /*!< \brief Parameter delta for Newmark method. */
   unsigned short nIntCoeffs;	/*!< \brief Number of integration coeffs for structural calculations. */
   su2double *Int_Coeffs;		  /*!< \brief Time integration coefficients for structural method. */
   unsigned short nElasticityMod,  /*!< \brief Number of different values for the elasticity modulus. */
@@ -914,7 +915,6 @@ class CConfig {
   unsigned long IncLoad_Nincrements; /*!< \brief Number of increments. */
   su2double *IncLoad_Criteria;/*!< \brief Criteria for the application of incremental loading. */
   su2double Ramp_Time;			  /*!< \brief Time until the maximum load is applied. */
-  su2double Static_Time;			/*!< \brief Time while the structure is not loaded in FSI applications. */
   unsigned short Pred_Order;  /*!< \brief Order of the predictor for FSI applications. */
   unsigned short Kind_Interpolation; /*!\brief type of interpolation to use for FSI applications. */
   bool Prestretch;            /*!< Read a reference geometry for optimization purposes. */
@@ -953,7 +953,8 @@ class CConfig {
   *default_htp_axis,          /*!< \brief Default HTP axis for the COption class. */
   *default_ffd_axis,          /*!< \brief Default FFD axis for the COption class. */
   *default_inc_crit,          /*!< \brief Default incremental criteria array for the COption class. */
-  *default_extrarelfac;       /*!< \brief Default extra relaxation factor for Giles BC in the COption class. */
+  *default_extrarelfac,       /*!< \brief Default extra relaxation factor for Giles BC in the COption class. */
+  *default_sineload_coeff;    /*!< \brief Default values for a sine load. */
   unsigned short nSpanWiseSections; /*!< \brief number of span-wise sections */
   unsigned short nSpanMaxAllZones; /*!< \brief number of maximum span-wise sections for all zones */
   unsigned short *nSpan_iZones;  /*!< \brief number of span-wise sections for each zones */
@@ -974,6 +975,7 @@ class CConfig {
   bool Body_Force;            /*!< \brief Flag to know if a body force is included in the formulation. */
   su2double *Body_Force_Vector;  /*!< \brief Values of the prescribed body force vector. */
   su2double *FreeStreamTurboNormal; /*!< \brief Direction to initialize the flow in turbomachinery computation */
+  ofstream *ConvHistFile;       /*!< \brief Store the pointer to each history file */
 
   /*--- all_options is a map containing all of the options. This is used during config file parsing
    to track the options which have not been set (so the default values can be used). Without this map
@@ -7792,13 +7794,13 @@ class CConfig {
    * \brief Get Newmark alpha parameter.
    * \return Value of the Newmark alpha parameter.
    */
-  su2double GetNewmark_alpha(void);
+  su2double GetNewmark_beta(void);
 
   /*!
    * \brief Get Newmark delta parameter.
    * \return Value of the Newmark delta parameter.
    */
-  su2double GetNewmark_delta(void);
+  su2double GetNewmark_gamma(void);
 
   /*!
    * \brief Get the number of integration coefficients provided by the user.
@@ -7877,6 +7879,24 @@ class CConfig {
    */
   su2double GetRamp_Time(void);
 
+  /*!
+   * \brief Check if the user wants to apply the load as a ramp.
+   * \return  <code>TRUE</code> means that the load is to be applied as a ramp.
+   */
+  bool GetRampAndRelease_Load(void);
+
+  /*!
+   * \brief Check if the user wants to apply the load as a ramp.
+   * \return  <code>TRUE</code> means that the load is to be applied as a ramp.
+   */
+  bool GetSine_Load(void);
+
+  /*!
+   * \brief Get the sine load properties.
+   * \param[in] val_index - Index corresponding to the load boundary.
+   * \return The pointer to the sine load values.
+   */
+  su2double* GetLoad_Sine(void);
    /*!
     * \brief Get the kind of load transfer method we want to use for dynamic problems
     * \note This value is obtained from the config file, and it is constant
@@ -7897,12 +7917,6 @@ class CConfig {
     */
    su2double GetTotalDV_Penalty(void);
 
-  /*!
-   * \brief Get the maximum time of the ramp.
-   * \return 	Value of the max time while the load is linearly increased
-   */
-  su2double GetStatic_Time(void);
-  
   /*!
    * \brief Get the order of the predictor for FSI applications.
    * \return 	Order of predictor
@@ -8000,6 +8014,16 @@ class CConfig {
    * \return YES if the passed values is the integrated heat flux over the marker's surface.
    */
   bool GetIntegrated_HeatFlux(void);
+
+  /*!
+   * \brief Retrieve the ofstream of the history file for the current zone.
+   */
+  ofstream* GetHistFile(void);
+
+  /*!
+   * \brief Set the ofstream of the history file for the current zone.
+   */
+  void SetHistFile(ofstream *HistFile);
 };
 
 #include "config_structure.inl"

Common/include/config_structure.inl

@@ -1688,9 +1688,9 @@ inline su2double CConfig::GetCurrent_DynTime(void) { return Current_DynTime; }
 
 inline bool CConfig::GetWrt_Dynamic(void) { return Wrt_Dynamic; }
 
-inline su2double CConfig::GetNewmark_alpha(void) { return Newmark_alpha; }
+inline su2double CConfig::GetNewmark_beta(void) { return Newmark_beta; }
 
-inline su2double CConfig::GetNewmark_delta(void) { return Newmark_delta; }
+inline su2double CConfig::GetNewmark_gamma(void) { return Newmark_gamma; }
 
 inline unsigned short CConfig::GetnIntCoeffs(void) { return nIntCoeffs; }
 
@@ -1710,12 +1710,16 @@ inline bool CConfig::GetRamp_Load(void) { return Ramp_Load; }
 
 inline su2double CConfig::GetRamp_Time(void) { return Ramp_Time; }
 
+inline bool CConfig::GetRampAndRelease_Load(void) { return RampAndRelease; }
+
+inline bool CConfig::GetSine_Load(void) { return Sine_Load; }
+
+inline su2double* CConfig::GetLoad_Sine(void) { return SineLoad_Coeff; }
+
 inline su2double CConfig::GetRefGeom_Penalty(void) { return RefGeom_Penalty; }
 
 inline su2double CConfig::GetTotalDV_Penalty(void) { return DV_Penalty; }
 
-inline su2double CConfig::GetStatic_Time(void) { return Static_Time; }
-
 inline unsigned short CConfig::GetPredictorOrder(void) { return Pred_Order; }
 
 inline bool CConfig::GetIncrementalLoad(void) { return IncrementalLoad; }
@@ -1779,3 +1783,7 @@ inline unsigned short CConfig::GetKind_RoeLowDiss(void) {return Kind_RoeLowDiss;
 inline su2double CConfig::GetConst_DES(void) {return Const_DES; }
 
 inline bool CConfig::GetQCR(void) {return QCR;}
+
+inline ofstream* CConfig::GetHistFile(void) { return ConvHistFile; }
+
+inline void CConfig::SetHistFile(ofstream *HistFile) { ConvHistFile = HistFile; }

Common/include/option_structure.hpp

@@ -224,7 +224,7 @@ static const map<string, ENUM_SOLVER> Solver_Map = CCreateMap<string, ENUM_SOLVE
 ("WAVE_EQUATION", WAVE_EQUATION)
 ("HEAT_EQUATION_FVM", HEAT_EQUATION_FVM)
 ("HEAT_EQUATION", HEAT_EQUATION)
-("FEM_ELASTICITY", FEM_ELASTICITY)
+("ELASTICITY", FEM_ELASTICITY)
 ("DISC_ADJ_EULER", DISC_ADJ_EULER)
 ("DISC_ADJ_RANS", DISC_ADJ_RANS)
 ("DISC_ADJ_NAVIERSTOKES", DISC_ADJ_EULER)
@@ -254,11 +254,10 @@ static const map<string, ENUM_FSI_FLUID_PROBLEM> FSI_Fluid_Solver_Map = CCreateM
 enum ENUM_FSI_STRUC_PROBLEM {
   NO_SOLVER_SFSI = 0,				/*!< \brief Definition of no solver. */
   FEM_ELASTICITY_SFSI = 13,		/*!< \brief Nonlinear elasticity equations for the FSI problem */
-  ADJFEM_ELASTICITY_SFSI = 14,   /*!< \brief Nonlinear elasticity equations for the FSI problem */
 };
 static const map<string, ENUM_FSI_STRUC_PROBLEM> FSI_Struc_Solver_Map = CCreateMap<string, ENUM_FSI_STRUC_PROBLEM>
 ("NONE", NO_SOLVER_SFSI)
-("FEM_ELASTICITY", FEM_ELASTICITY_SFSI);
+("ELASTICITY", FEM_ELASTICITY_SFSI);
 
 /*!
  * \brief Material geometric conditions
@@ -842,13 +841,11 @@ enum ENUM_TRANSFER_METHOD {
   BROADCAST_DATA = 1,	/*!< \brief Gather data on one processor and broadcast it into all of them, relating to global nodes. */
   SCATTER_DATA = 2,   	/*!< \brief Gather data on one processor and scatter it into the one that needs it. */
   ALLGATHER_DATA = 3,   /*!< \brief All processors gather data (this will be useful for operations over a group of data - averaging) */
-  LEGACY_METHOD = 4		/*!< \brief Original transfer method, maintained to check . */
 };
 static const map<string, ENUM_TRANSFER_METHOD> Transfer_Method_Map = CCreateMap<string, ENUM_TRANSFER_METHOD>
 ("BROADCAST_DATA", BROADCAST_DATA)
 ("SCATTER_DATA", SCATTER_DATA)
-("ALLGATHER_DATA", ALLGATHER_DATA)
-("LEGACY_METHOD", LEGACY_METHOD);
+("ALLGATHER_DATA", ALLGATHER_DATA);
 
 /*!
  * \brief types of schemes to compute the flow gradient
@@ -907,7 +904,6 @@ enum BC_TYPE {
   RIEMANN_BOUNDARY= 24,   /*!< \brief Riemann Boundary definition. */
   ISOTHERMAL = 25,      /*!< \brief No slip isothermal wall boundary condition. */
   HEAT_FLUX  = 26,      /*!< \brief No slip constant heat flux wall boundary condition. */
-  PRESSURE_BOUNDARY = 27,   	/*!< \brief Pressure boundary condition. */
   ACTDISK_INLET = 32,	/*!< \brief Actuator disk inlet boundary definition. */
   ACTDISK_OUTLET = 33,	/*!< \brief Actuator disk outlet boundary definition. */
   CLAMPED_BOUNDARY = 34,		/*!< \brief Clamped Boundary definition. */