New Nonlinear Iteration Controller for Improved Fluid Solver Robustness & Convergence

Common/include/config_structure.hpp

@@ -111,7 +111,7 @@ class CConfig {
   su2double FFD_Tol;  	/*!< \brief Tolerance in the point inversion problem. */
   su2double Opt_RelaxFactor;  	/*!< \brief Scale factor for the line search. */
   su2double Opt_LineSearch_Bound;  	/*!< \brief Bounds for the line search. */
-  su2double StartTime;
+  su2double StartTime;        /*!< \brief Start time for performance tracking of each phase of the code: preprocessing, compute, and output. */
   bool ContinuousAdjoint,			/*!< \brief Flag to know if the code is solving an adjoint problem. */
   Viscous,                /*!< \brief Flag to know if the code is solving a viscous problem. */
   EquivArea,				/*!< \brief Flag to know if the code is going to compute and plot the equivalent area. */
@@ -463,6 +463,7 @@ class CConfig {
   *Kind_SurfaceMovement,    /*!< \brief Kind of the static mesh movement. */
   nKind_SurfaceMovement,    /*!< \brief Kind of the dynamic mesh movement. */  
   Kind_Gradient_Method,		/*!< \brief Numerical method for computation of spatial gradients. */
+  Kind_Gradient_Method_Recon,    /*!< \brief Numerical method for computation of spatial gradients used for upwind reconstruction. */
   Kind_Deform_Linear_Solver, /*!< Numerical method to deform the grid */
   Kind_Deform_Linear_Solver_Prec,		/*!< \brief Preconditioner of the linear solver. */
   Kind_Linear_Solver,		/*!< \brief Numerical solver for the implicit scheme. */
@@ -518,6 +519,8 @@ class CConfig {
   Kind_Solver_Fluid_FSI,		/*!< \brief Kind of solver for the fluid in FSI applications. */
   Kind_Solver_Struc_FSI,		/*!< \brief Kind of solver for the structure in FSI applications. */
   Kind_BGS_RelaxMethod;				/*!< \brief Kind of relaxation method for Block Gauss Seidel method in FSI problems. */
+  bool ReconstructionGradientRequired; /*!< \brief Enable or disable a second gradient calculation for upwind reconstruction only. */
+  bool LeastSquaresRequired;  /*!< \brief Enable or disable memory allocation for least-squares gradient methods. */
   bool Energy_Equation;         /*!< \brief Solve the energy equation for incompressible flows. */
   bool MUSCL,		/*!< \brief MUSCL scheme .*/
   MUSCL_Flow,		/*!< \brief MUSCL scheme for the flow equations.*/
@@ -558,8 +561,6 @@ class CConfig {
   unsigned short Linear_Solver_ILU_n;		/*!< \brief ILU fill=in level. */
   su2double SemiSpan;		/*!< \brief Wing Semi span. */
   su2double Roe_Kappa;		/*!< \brief Relaxation of the Roe scheme. */
-  su2double Relaxation_Factor_Flow;		/*!< \brief Relaxation coefficient of the linear solver mean flow. */
-  su2double Relaxation_Factor_Turb;		/*!< \brief Relaxation coefficient of the linear solver turbulence. */
   su2double Relaxation_Factor_AdjFlow;		/*!< \brief Relaxation coefficient of the linear solver adjoint mean flow. */
   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. */
@@ -759,7 +760,6 @@ class CConfig {
   Wrt_Performance,            /*!< \brief Write the performance summary at the end of a calculation.  */
   Wrt_AD_Statistics,          /*!< \brief Write the tape statistics (discrete adjoint).  */
   Wrt_MeshQuality,            /*!< \brief Write the mesh quality statistics to the visualization files.  */
-  Wrt_InletFile,                   /*!< \brief Write a template inlet profile file */
   Wrt_Slice,                   /*!< \brief Write 1D slice of a 2D cartesian solution */
   Wrt_Projected_Sensitivity,   /*!< \brief Write projected sensitivities (dJ/dx) on surfaces to ASCII file. */
   Plot_Section_Forces;       /*!< \brief Write sectional forces for specified markers. */
@@ -1625,6 +1625,12 @@ class CConfig {
    */
   su2double GetCFL_AdaptParam(unsigned short val_index);
 
+  /*!
+   * \brief Get the values of the CFL adapation.
+   * \return Value of CFL adapation
+   */
+  inline void SetCFL_AdaptParam(unsigned short val_index, su2double val_cfl_param) { CFL_AdaptParam[val_index] = val_cfl_param; }
+
   /*!
    * \brief Get the values of the CFL adapation.
    * \return Value of CFL adapation
@@ -3259,18 +3265,6 @@ class CConfig {
    * \return <code>TRUE</code> means that the mesh quality metrics will be written to the visualization files.
    */
   bool GetWrt_MeshQuality(void);
-
-  /*!
-   * \brief Get information about writing a template inlet profile file.
-   * \return <code>TRUE</code> means that a template inlet profile file will be written.
-   */
-  bool GetWrt_InletFile(void);
-
-  /*!
-   * \brief Set information about writing a template inlet profile file.
-   * \param[in] val_wrt_inletfile - flag for whether to write a template inlet profile file.
-   */
-  void SetWrt_InletFile(bool val_wrt_inletfile);
 
   /*!
    * \brief Get information about writing a 1D slice of a 2D cartesian solution.
@@ -3991,11 +3985,29 @@ class CConfig {
   void SetKt_PolyCoeffND(su2double val_coeff, unsigned short val_index);
 
   /*!
-   * \brief Get the kind of method for computation of spatial gradients.
-   * \return Numerical method for computation of spatial gradients.
+   * \brief Get the kind of method for computation of spatial gradients used for viscous and source terms.
+   * \return Numerical method for computation of spatial gradients used for viscous and source terms.
    */
   unsigned short GetKind_Gradient_Method(void);
 
+  /*!
+   * \brief Get the kind of method for computation of spatial gradients used for upwind reconstruction.
+   * \return Numerical method for computation of spatial gradients used for upwind reconstruction.
+   */
+  unsigned short GetKind_Gradient_Method_Recon(void);
+
+  /*!
+   * \brief Get flag for whether a second gradient calculation is required for upwind reconstruction alone.
+   * \return <code>TRUE</code> means that a second gradient will be calculated for upwind reconstruction.
+   */
+  bool GetReconstructionGradientRequired(void);
+
+  /*!
+   * \brief Get flag for whether a least-squares gradient method is being applied.
+   * \return <code>TRUE</code> means that a least-squares gradient method is being applied.
+   */
+  bool GetLeastSquaresRequired(void);
+
   /*!
    * \brief Get the kind of solver for the implicit solver.
    * \return Numerical solver for implicit formulation (solving the linear system).
@@ -4069,23 +4081,11 @@ class CConfig {
    */
   su2double GetLinear_Solver_Smoother_Relaxation(void) const;
 
-  /*!
-   * \brief Get the relaxation coefficient of the linear solver for the implicit formulation.
-   * \return relaxation coefficient of the linear solver for the implicit formulation.
-   */
-  su2double GetRelaxation_Factor_Flow(void);
-
   /*!
    * \brief Get the relaxation coefficient of the linear solver for the implicit formulation.
    * \return relaxation coefficient of the linear solver for the implicit formulation.
    */
   su2double GetRelaxation_Factor_AdjFlow(void);
-
-  /*!
-   * \brief Get the relaxation coefficient of the linear solver for the implicit formulation.
-   * \return relaxation coefficient of the linear solver for the implicit formulation.
-   */
-  su2double GetRelaxation_Factor_Turb(void);
 
   /*!
    * \brief Get the relaxation coefficient of the CHT coupling.
@@ -9198,14 +9198,14 @@ class CConfig {
   unsigned short GetnConv_Field();  
 
   /*!
-   * \brief Set_StartTime
-   * \param starttime
+   * \brief Set the start time to track a phase of the code (preprocessing, compute, output).
+   * \param[in] Value of the start time to track a phase of the code.
    */
   void Set_StartTime(su2double starttime);
 
   /*!
-   * \brief Get_StartTime
-   * \return 
+   * \brief Get the start time to track a phase of the code (preprocessing, compute, output).
+   * \return Value of the start time to track a phase of the code.
    */
   su2double Get_StartTime();
 

Common/include/config_structure.inl

@@ -990,6 +990,12 @@ inline su2double CConfig::GetmaxTurkelBeta() { return  Max_Beta_RoeTurkel; }
 
 inline unsigned short CConfig::GetKind_Gradient_Method(void) { return Kind_Gradient_Method; }
 
+inline unsigned short CConfig::GetKind_Gradient_Method_Recon(void) { return Kind_Gradient_Method_Recon; }
+
+inline bool CConfig::GetReconstructionGradientRequired(void) { return ReconstructionGradientRequired; }
+
+inline bool CConfig::GetLeastSquaresRequired(void) { return LeastSquaresRequired; }
+
 inline unsigned short CConfig::GetKind_Linear_Solver(void) { return Kind_Linear_Solver; }
 
 inline unsigned short CConfig::GetKind_Deform_Linear_Solver(void) { return Kind_Deform_Linear_Solver; }
@@ -1014,12 +1020,8 @@ inline unsigned long CConfig::GetLinear_Solver_Restart_Frequency(void) { return
 
 inline su2double CConfig::GetLinear_Solver_Smoother_Relaxation(void) const { return Linear_Solver_Smoother_Relaxation; }
 
-inline su2double CConfig::GetRelaxation_Factor_Flow(void) { return Relaxation_Factor_Flow; }
-
 inline su2double CConfig::GetRelaxation_Factor_AdjFlow(void) { return Relaxation_Factor_AdjFlow; }
 
-inline su2double CConfig::GetRelaxation_Factor_Turb(void) { return Relaxation_Factor_Turb; }
-
 inline su2double CConfig::GetRelaxation_Factor_CHT(void) { return Relaxation_Factor_CHT; }
 
 inline su2double CConfig::GetRoe_Kappa(void) { return Roe_Kappa; }
@@ -1671,10 +1673,6 @@ inline bool CConfig::GetWrt_AD_Statistics(void) { return Wrt_AD_Statistics; }
 
 inline bool CConfig::GetWrt_MeshQuality(void) { return Wrt_MeshQuality; }
 
-inline bool CConfig::GetWrt_InletFile(void) { return Wrt_InletFile; }
-
-inline void CConfig::SetWrt_InletFile(bool val_wrt_inletfile) { Wrt_InletFile = val_wrt_inletfile; }
-
 inline bool CConfig::GetWrt_Slice(void) { return Wrt_Slice; }
 
 inline bool CConfig::GetWrt_Projected_Sensitivity(void) { return Wrt_Projected_Sensitivity; }

Common/include/interpolation_structure.hpp

@@ -76,15 +76,16 @@ class CInterpolator {
   *Buffer_Send_nVertex_Donor,/*!\brief Buffer to send number of vertices on the local processor*/
   *Buffer_Send_nFace_Donor,/*!\brief Buffer to send number of faces on the local processor*/
   *Buffer_Send_nFaceNodes_Donor,/*!\brief Buffer to send the number of nodes assocated with faces per processor*/
-  *Buffer_Receive_GlobalPoint, /*!\brief Buffer to receive global point indices*/
-  *Buffer_Send_GlobalPoint,/*!\brief Buffer to send global point indices*/
   *Buffer_Send_FaceIndex,/*!\brief Buffer to send indices pointing to the node indices that define the faces*/
   *Buffer_Receive_FaceIndex,/*!\brief Buffer to receive indices pointing to the node indices that define the faces*/
   *Buffer_Send_FaceNodes,/*!\brief Buffer to send indices pointing to the location of node information in other buffers, defining faces*/
   *Buffer_Receive_FaceNodes,/*!\brief Buffer to receive indices pointing to the location of node information in other buffers, defining faces*/
   *Buffer_Send_FaceProc,/*!\brief Buffer to send processor which stores the node indicated in Buffer_Receive_FaceNodes*/
   *Buffer_Receive_FaceProc;/*!\brief Buffer to receive processor which stores the node indicated in Buffer_Receive_FaceNodes*/
 
+  long   *Buffer_Send_GlobalPoint,/*!\brief Buffer to send global point indices*/
+  *Buffer_Receive_GlobalPoint; /*!\brief Buffer to receive global point indices*/
+
   su2double *Buffer_Send_Coord,/*!\brief Buffer to send coordinate values*/
   *Buffer_Send_Normal,/*!\brief Buffer to send normal vector values */
   *Buffer_Receive_Coord,/*!\brief Buffer to receive coordinate values*/

Common/include/option_structure.hpp

@@ -996,11 +996,15 @@ static const map<string, ENUM_SPACE_ITE_FEA> Space_Ite_Map_FEA = CCreateMap<stri
  * \brief types of schemes to compute the flow gradient
  */
 enum ENUM_FLOW_GRADIENT {
-  GREEN_GAUSS = 1,		/*!< \brief Gradients computation using Green Gauss theorem. */
-  WEIGHTED_LEAST_SQUARES = 2	/*!< \brief Gradients computation using Weighted Least Squares. */
+  NO_GRADIENT            = 0, /*!< \brief No gradient method. Only possible for reconstruction gradient, in which case, the option chosen for NUM_METHOD_GRAD is used. */
+  GREEN_GAUSS            = 1,	/*!< \brief Gradient computation using Green-Gauss theorem. */
+  LEAST_SQUARES          = 2, /*!< \brief Gradient computation using unweighted least squares. */
+  WEIGHTED_LEAST_SQUARES = 3	/*!< \brief Gradients computation using inverse-distance weighted least squares. */
 };
 static const map<string, ENUM_FLOW_GRADIENT> Gradient_Map = CCreateMap<string, ENUM_FLOW_GRADIENT>
+("NONE", NO_GRADIENT)
 ("GREEN_GAUSS", GREEN_GAUSS)
+("LEAST_SQUARES", LEAST_SQUARES)
 ("WEIGHTED_LEAST_SQUARES", WEIGHTED_LEAST_SQUARES);
 
 /*!

Common/include/toolboxes/C2DContainer.hpp

@@ -81,7 +81,7 @@ class AccessorImpl
   alignas(AlignSize) Scalar_t m_data[StaticRows*StaticCols];
 
   /*!
-   * Static size specializations use this do-nothing macro.
+   * Static size specializations use this do-nothing allocation macro.
    */
 #define DUMMY_ALLOCATOR \
   void m_allocate(size_t sz, Index_t rows, Index_t cols) noexcept {}
@@ -90,18 +90,27 @@ class AccessorImpl
    * runtime internal value that depend on the number of rows/columns.
    * What values need setting depends on the specialization as not all have
    * members for e.g. number of rows and cols (static size optimization).
+   * \note Aligned dynamic allocation is disabled for compilation on MAC.
    */
-#define REAL_ALLOCATOR(EXTRA)                                           \
+#ifndef __APPLE__
+#define REAL_ALLOCATOR(EXTRA)                                             \
   static_assert(AlignSize % alignof(Scalar_t)==0,                         \
-      "AlignSize is not a multiple of the type's alignment spec.");       \
+    "AlignSize is not a multiple of the type's alignment spec.");         \
                                                                           \
   void m_allocate(size_t sz, Index_t rows, Index_t cols) noexcept {       \
-      EXTRA;                                                              \
-      if(AlignSize==0)                                                    \
-          m_data = static_cast<Scalar_t*>(malloc(sz));                    \
-      else                                                                \
-          m_data = static_cast<Scalar_t*>(aligned_alloc(AlignSize,sz));   \
+    EXTRA;                                                                \
+    if(AlignSize==0)                                                      \
+      m_data = static_cast<Scalar_t*>(malloc(sz));                        \
+    else                                                                  \
+      m_data = static_cast<Scalar_t*>(aligned_alloc(AlignSize,sz));       \
   }
+#else
+#define REAL_ALLOCATOR(EXTRA)                                             \
+  void m_allocate(size_t sz, Index_t rows, Index_t cols) noexcept {       \
+    EXTRA;                                                                \
+    m_data = static_cast<Scalar_t*>(malloc(sz));                          \
+  }
+#endif
 
   DUMMY_ALLOCATOR