WIP Feature Hybrid Parallel and SIMD

Common/include/config_structure.inl

@@ -26,7 +26,6 @@
  */
 
 #pragma once
-#include "config_structure.hpp"
 
 inline su2double CConfig::GetHTP_Axis(unsigned short val_index) { return HTP_Axis[val_index]; }
 

Common/include/interpolation_structure.hpp

@@ -1,7 +1,7 @@
 /*!
  * \file interpolation_structure.hpp
- * \brief Headers of the main subroutines used by SU2_FSI.
- *        The subroutines and functions are in the <i>interpolation_structure.cpp</i> file.
+ * \brief Headers of classes used for multiphysics interpolation.
+ *        The implementation is in the <i>interpolation_structure.cpp</i> file.
  * \author H. Kline
  * \version 7.0.0 "Blackbird"
  *
@@ -244,7 +244,7 @@ class CIsoparametric : public CInterpolator {
    * \param[in] nDim - the dimension of the coordinates.
    * \param[in] iZone_1 - zone index of the element to use for interpolation (the DONOR zone)
    * \param[in] donor_elem - element index of the element to use for interpolation (or global index of a point in 2D)
-   * \param[in[ nDonorPoints - number of donor points in the element.
+   * \param[in] nDonorPoints - number of donor points in the element.
    * \param[in] xj - point projected onto the plane of the donor element.
    * \param[out] isoparams - isoparametric coefficients. Must be allocated to size nNodes ahead of time. (size> nDonors)
    *

Common/include/omp_structure.hpp

@@ -85,6 +85,7 @@ inline constexpr int omp_get_thread_num(void) {return 0;}
 
 #define SU2_OMP_MASTER SU2_OMP(master)
 #define SU2_OMP_BARRIER SU2_OMP(barrier)
+#define SU2_OMP_CRITICAL SU2_OMP(critical)
 
 #define SU2_OMP_PARALLEL SU2_OMP(parallel)
 #define SU2_OMP_PARALLEL_(ARGS) SU2_OMP(parallel ARGS)

Common/include/toolboxes/MMS/CIncTGVSolution.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
@@ -31,32 +31,32 @@
 
 #include <cmath>
 #include "CVerificationSolution.hpp"
-  
+
 /*!
  * \class CIncTGVSolution
  * \brief Class to define the required data for the incompressible Taylor Green Vortex.
  * \author T. Economon, E. van der Weide
  */
-class CIncTGVSolution: public CVerificationSolution {
-  
+class CIncTGVSolution final: public CVerificationSolution {
+
 protected:
-  
+
   /*--- TGV specific conditions. ---*/
-  
+
   su2double tgvLength;    /*!< \brief Taylor-Green length scale. */
   su2double tgvVelocity;  /*!< \brief Taylor-Green velocity. */
   su2double tgvDensity;   /*!< \brief Taylor-Green density. */
   su2double tgvViscosity; /*!< \brief Taylor-Green viscosity. */
-  
+
   su2double Temperature;  /*!< \brief Temperature, just to be safe. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CIncTGVSolution(void);
-  
+
   /*!
    * \overload
    * \param[in] val_nDim  - Number of dimensions of the problem.
@@ -68,12 +68,12 @@ class CIncTGVSolution: public CVerificationSolution {
                   unsigned short val_nvar,
                   unsigned short val_iMesh,
                   CConfig*       config);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CIncTGVSolution(void);
-  
+
   /*!
    * \brief Get the exact solution at the current position and time.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -82,8 +82,8 @@ class CIncTGVSolution: public CVerificationSolution {
    */
   void GetSolution(const su2double *val_coords,
                    const su2double val_t,
-                   su2double       *val_solution);
-  
+                   su2double       *val_solution) const override;
+
   /*!
    * \brief Get the boundary conditions state for an exact solution.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -92,5 +92,5 @@ class CIncTGVSolution: public CVerificationSolution {
    */
   void GetBCState(const su2double *val_coords,
                   const su2double val_t,
-                  su2double       *val_solution);
+                  su2double       *val_solution) const override;
 };

Common/include/toolboxes/MMS/CInviscidVortexSolution.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
@@ -37,7 +37,7 @@
  * \brief Class to define the required data for the Inviscid Vortex.
  * \author E. van der Weide, T. Economon
  */
-class CInviscidVortexSolution: public CVerificationSolution {
+class CInviscidVortexSolution final: public CVerificationSolution {
 
 protected:
 
@@ -56,12 +56,12 @@ class CInviscidVortexSolution: public CVerificationSolution {
   su2double gamOvGm1;     /*!< \brief Gamma over Gamma minus 1 */
 
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CInviscidVortexSolution(void);
-  
+
   /*!
    * \overload
    * \param[in] val_nDim  - Number of dimensions of the problem.
@@ -73,7 +73,7 @@ class CInviscidVortexSolution: public CVerificationSolution {
                           unsigned short val_nvar,
                           unsigned short val_iMesh,
                           CConfig*       config);
-  
+
   /*!
    * \brief Destructor of the class.
    */
@@ -87,7 +87,7 @@ class CInviscidVortexSolution: public CVerificationSolution {
    */
   void GetSolution(const su2double *val_coords,
                    const su2double val_t,
-                   su2double       *val_solution);
+                   su2double       *val_solution) const override;
 
   /*!
    * \brief Get the boundary conditions state for an exact solution.
@@ -97,5 +97,5 @@ class CInviscidVortexSolution: public CVerificationSolution {
    */
   void GetBCState(const su2double *val_coords,
                   const su2double val_t,
-                  su2double       *val_solution);
+                  su2double       *val_solution) const override;
 };

Common/include/toolboxes/MMS/CMMSIncEulerSolution.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
@@ -38,32 +38,32 @@
  *        incompressible Euler equations.
  * \author T. Economon, E. van der Weide
  */
-class CMMSIncEulerSolution: public CVerificationSolution {
-  
+class CMMSIncEulerSolution final: public CVerificationSolution {
+
 protected:
-  
+
   /*--- Variables that define the solution and MMS source term. ---*/
   su2double Density;      /*!< \brief Density, must be constant. */
   su2double Temperature;  /*!< \brief Temperature, just to be safe. */
-  
+
   /*--- Constants, which describe this manufactured solution. This is a
    solution where the primitive variables vary as a combination
    of sine and cosine functions. The solution is from Salari K, and
    Knupp P, "Code verification by the method of manufactured solutions,"
    SAND 2000-1444, Sandia National Laboratories, Albuquerque, NM, 2000. ---*/
-  
+
   su2double P_0;      /*!< \brief Parameter for the pressure solution. */
   su2double u_0;      /*!< \brief Parameter for the x-velocity solution. */
   su2double v_0;      /*!< \brief Parameter for the y-velocity solution. */
   su2double epsilon;  /*!< \brief Parameter for the velocity solutions. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CMMSIncEulerSolution(void);
-  
+
   /*!
    * \overload
    * \param[in] val_nDim  - Number of dimensions of the problem.
@@ -75,12 +75,12 @@ class CMMSIncEulerSolution: public CVerificationSolution {
                        unsigned short val_nvar,
                        unsigned short val_iMesh,
                        CConfig*       config);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CMMSIncEulerSolution(void);
-  
+
   /*!
    * \brief Get the exact solution at the current position and time.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -89,8 +89,8 @@ class CMMSIncEulerSolution: public CVerificationSolution {
    */
   void GetSolution(const su2double *val_coords,
                    const su2double val_t,
-                   su2double       *val_solution);
-  
+                   su2double       *val_solution) const override;
+
   /*!
    * \brief Get the boundary conditions state for an exact solution.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -99,8 +99,8 @@ class CMMSIncEulerSolution: public CVerificationSolution {
    */
   void GetBCState(const su2double *val_coords,
                   const su2double val_t,
-                  su2double       *val_solution);
-  
+                  su2double       *val_solution) const override;
+
   /*!
    * \brief Get the source term for the manufactured solution (MMS).
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -109,11 +109,11 @@ class CMMSIncEulerSolution: public CVerificationSolution {
    */
   void GetMMSSourceTerm(const su2double *val_coords,
                         const su2double val_t,
-                        su2double       *val_source);
-  
+                        su2double       *val_source) const override;
+
   /*!
    * \brief Whether or not this verification solution is a manufactured solution.
    * \return  - True, because this is a manufactured solution.
    */
-  bool IsManufacturedSolution(void);
+  bool IsManufacturedSolution(void) const override;
 };

Common/include/toolboxes/MMS/CMMSIncNSSolution.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2019, SU2 Contributors (cf. AUTHORS.md)
@@ -38,33 +38,33 @@
  *        laminar incompressible Navier-Stokes equations.
  * \author T. Economon, E. van der Weide
  */
-class CMMSIncNSSolution: public CVerificationSolution {
-  
+class CMMSIncNSSolution final: public CVerificationSolution {
+
 protected:
-  
+
   /*--- Variables that define the solution and MMS source term. ---*/
   su2double Viscosity;    /*!< \brief Viscosity, must be constant. */
   su2double Density;      /*!< \brief Density, must be constant. */
   su2double Temperature;  /*!< \brief Temperature, just to be safe. */
-  
+
   /*--- Constants, which describe this manufactured solution. This is a
    viscous solution where the primitive variables vary as a combination
    of sine and cosine functions. The solution is from Salari K, and
    Knupp P, "Code verification by the method of manufactured solutions,"
    SAND 2000-1444, Sandia National Laboratories, Albuquerque, NM, 2000. ---*/
-  
+
   su2double P_0;      /*!< \brief Parameter for the pressure solution. */
   su2double u_0;      /*!< \brief Parameter for the x-velocity solution. */
   su2double v_0;      /*!< \brief Parameter for the y-velocity solution. */
   su2double epsilon;  /*!< \brief Parameter for the velocity solutions. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CMMSIncNSSolution(void);
-  
+
   /*!
    * \overload
    * \param[in] val_nDim  - Number of dimensions of the problem.
@@ -76,12 +76,12 @@ class CMMSIncNSSolution: public CVerificationSolution {
                     unsigned short val_nvar,
                     unsigned short val_iMesh,
                     CConfig*       config);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CMMSIncNSSolution(void);
-  
+
   /*!
    * \brief Get the exact solution at the current position and time.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -90,8 +90,8 @@ class CMMSIncNSSolution: public CVerificationSolution {
    */
   void GetSolution(const su2double *val_coords,
                    const su2double val_t,
-                   su2double       *val_solution);
-  
+                   su2double       *val_solution) const override;
+
   /*!
    * \brief Get the boundary conditions state for an exact solution.
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -100,8 +100,8 @@ class CMMSIncNSSolution: public CVerificationSolution {
    */
   void GetBCState(const su2double *val_coords,
                   const su2double val_t,
-                  su2double       *val_solution);
-  
+                  su2double       *val_solution) const override;
+
   /*!
    * \brief Get the source term for the manufactured solution (MMS).
    * \param[in] val_coords   - Cartesian coordinates of the current position.
@@ -110,11 +110,11 @@ class CMMSIncNSSolution: public CVerificationSolution {
    */
   void GetMMSSourceTerm(const su2double *val_coords,
                         const su2double val_t,
-                        su2double       *val_source);
-  
+                        su2double       *val_source) const override;
+
   /*!
    * \brief Whether or not this verification solution is a manufactured solution.
    * \return  - True, because this is a manufactured solution.
    */
-  bool IsManufacturedSolution(void);
+  bool IsManufacturedSolution(void) const override;
 };