Merge remote-tracking branch 'upstream/develop' into hybrid_parallel_bcs

pcarruscag · pcarruscag · commit d5f033a729ef · 2020-05-27T16:50:22.000+01:00
diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
@@ -44,7 +44,6 @@
 #include <assert.h>
 
 #include "./option_structure.hpp"
-#include "./datatype_structure.hpp"
 
 #ifdef HAVE_CGNS
 #include "cgnslib.h"
diff --git a/Common/include/basic_types/ad_structure.hpp b/Common/include/basic_types/ad_structure.hpp
diff --git a/Common/include/basic_types/datatype_structure.hpp b/Common/include/basic_types/datatype_structure.hpp
diff --git a/Common/include/blas_structure.hpp b/Common/include/blas_structure.hpp
@@ -8,7 +8,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-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "datatype_structure.hpp"
 #include "CConfig.hpp"
 
 /* LIBXSMM include files, if supported. */
@@ -39,7 +38,7 @@
 
 /*!
  * \class CBlasStructure
- * \brief Class, which serves as an interface to the BLAS functionalities needed. 
+ * \brief Class, which serves as an interface to the BLAS functionalities needed.
  * \author: E. van der Weide
  * \version 7.0.4 "Blackbird"
  */
diff --git a/Common/include/fem/geometry_structure_fem_part.hpp b/Common/include/fem/geometry_structure_fem_part.hpp
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include "../datatype_structure.hpp"
+#include "../basic_types/datatype_structure.hpp"
 
 #include <vector>
 #include <algorithm>
diff --git a/Common/include/interface_interpolation/CInterpolator.hpp b/Common/include/interface_interpolation/CInterpolator.hpp
@@ -26,7 +26,7 @@
  */
 #pragma once
 
-#include "../../include/datatype_structure.hpp"
+#include "../../include/basic_types/datatype_structure.hpp"
 #include "../../include/toolboxes/C2DContainer.hpp"
 #include <vector>
 
diff --git a/Common/include/mpi_structure.hpp b/Common/include/mpi_structure.hpp
@@ -33,7 +33,7 @@
 #include <map>
 #endif
 
-#include "./datatype_structure.hpp"
+#include "basic_types/datatype_structure.hpp"
 #include <stdlib.h>
 #ifndef _MSC_VER
 #include <unistd.h>
diff --git a/Common/include/toolboxes/C1DInterpolation.hpp b/Common/include/toolboxes/C1DInterpolation.hpp
@@ -31,7 +31,6 @@
 #include <cmath>
 #include <vector>
 #include<fstream>
-#include "../datatype_structure.hpp"
 #include "../option_structure.hpp"
 
 using namespace std;
diff --git a/Common/include/toolboxes/C2DContainer.hpp b/Common/include/toolboxes/C2DContainer.hpp
@@ -28,7 +28,7 @@
 #pragma once
 
 #include "allocation_toolbox.hpp"
-#include "../datatype_structure.hpp"
+#include "../basic_types/datatype_structure.hpp"
 
 #include <utility>
 #include <type_traits>
diff --git a/Common/include/toolboxes/printing_toolbox.hpp b/Common/include/toolboxes/printing_toolbox.hpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <cmath>
 #include <algorithm>
-#include "../datatype_structure.hpp"
+#include "../basic_types/datatype_structure.hpp"
 
 namespace PrintingToolbox {
 
diff --git a/Common/lib/Makefile.am b/Common/lib/Makefile.am
@@ -59,7 +59,7 @@ lib_sources = \
   ../src/grid_adaptation_structure.cpp \
   ../src/grid_movement_structure.cpp \
   ../src/mpi_structure.cpp \
-  ../src/ad_structure.cpp \
+  ../src/basic_types/ad_structure.cpp \
   ../src/fem/fem_gauss_jacobi_quadrature.cpp \
   ../src/geometry/CGeometry.cpp \
   ../src/geometry/CPhysicalGeometry.cpp \
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
@@ -32,7 +32,7 @@
 #include "../include/fem/fem_gauss_jacobi_quadrature.hpp"
 #include "../include/fem/fem_geometry_structure.hpp"
 
-#include "../include/ad_structure.hpp"
+#include "../include/basic_types/ad_structure.hpp"
 #include "../include/toolboxes/printing_toolbox.hpp"
 
 using namespace PrintingToolbox;
diff --git a/Common/src/basic_types/ad_structure.cpp b/Common/src/basic_types/ad_structure.cpp
@@ -25,7 +25,7 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/datatype_structure.hpp"
+#include "../../include/basic_types/datatype_structure.hpp"
 
 namespace AD {
 #ifdef CODI_REVERSE_TYPE
diff --git a/Common/src/fem/fem_cgns_elements.cpp b/Common/src/fem/fem_cgns_elements.cpp
@@ -29,7 +29,6 @@
 #include "../../include/fem/fem_cgns_elements.hpp"
 #include "../../include/fem/geometry_structure_fem_part.hpp"
 #include "../../include/mpi_structure.hpp"
-#include "../../include/datatype_structure.hpp"
 
 #include <cmath>
 #include <climits>
diff --git a/Common/src/meson.build b/Common/src/meson.build
@@ -2,7 +2,7 @@ common_include = include_directories('./')
 common_src =files(['graph_coloring_structure.cpp',
            'CConfig.cpp',
            'blas_structure.cpp',
-           'ad_structure.cpp',
+           'basic_types/ad_structure.cpp',
            'grid_movement_structure.cpp',
            'grid_adaptation_structure.cpp',
            'wall_model.cpp',
diff --git a/SU2_CFD/include/transport_model.hpp b/SU2_CFD/include/transport_model.hpp
@@ -6,7 +6,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-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -41,7 +41,7 @@
 #include "stdio.h"
 #include "math.h"
 
-#include "../../Common/include/datatype_structure.hpp"
+#include "../../Common/include/basic_types/datatype_structure.hpp"
 
 using namespace std;
 
@@ -105,24 +105,24 @@ class CViscosityModel {
  * \version 1.0
  */
 class CConstantViscosity : public CViscosityModel {
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CConstantViscosity(void);
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CConstantViscosity(su2double mu_const);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CConstantViscosity(void) override;
-   
+
 };
 
 /*!
@@ -137,34 +137,34 @@ class CSutherland : public CViscosityModel {
   su2double Mu_ref,  /*!< \brief Internal Energy. */
   T_ref,             /*!< \brief DpDd_e. */
   S;                 /*!< \brief DpDe_d. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CSutherland(void);
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CSutherland(su2double mu_ref, su2double t_ref, su2double s);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CSutherland(void) override;
-  
+
   /*!
    * \brief Set Viscosity.
    */
   void SetViscosity(su2double T, su2double rho) override;
-  
+
   /*!
    * \brief Set Viscosity Derivatives.
    */
   void SetDerViscosity(su2double T, su2double rho) override;
-  
+
 };
 
 /*!
@@ -178,27 +178,27 @@ class CPolynomialViscosity : public CViscosityModel {
   su2double *b;               /*!< \brief Polynomial coefficients for viscosity as a function of temperature. */
 
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialViscosity(void);
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialViscosity(unsigned short val_nCoeffs, const su2double* val_b);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CPolynomialViscosity(void) override;
-  
+
   /*!
    * \brief Set Viscosity.
    */
   void SetViscosity(su2double T, su2double rho) override;
-  
+
 };
 
 /*!
@@ -286,33 +286,33 @@ class CConstantConductivity : public CConductivityModel {
  * \version 1.0
  */
 class CConstantConductivityRANS : public CConductivityModel {
-  
+
 protected:
   su2double Kt_Lam;         /*!< \brief Constant laminar conductivity. */
   su2double Prandtl_Turb;   /*!< \brief Turbulent Prandtl number. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CConstantConductivityRANS(void);
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CConstantConductivityRANS(su2double kt_const, su2double pr_turb);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CConstantConductivityRANS(void) override;
-  
+
   /*!
    * \brief Set effective thermal conductivity.
    */
   void SetConductivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp) override;
-  
+
 };
 
 /*!
@@ -401,29 +401,29 @@ class CPolynomialConductivity : public CConductivityModel {
 protected:
   unsigned short nPolyCoeffs; /*!< \brief Number of coefficients in the temperature polynomial. */
   su2double *b;               /*!< \brief Polynomial coefficients for thermal conductivity as a function of temperature. */
-  
+
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialConductivity(void);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CPolynomialConductivity(void) override;
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialConductivity(unsigned short val_nCoeffs, const su2double* val_b);
-  
+
   /*!
    * \brief Set Thermal conductivity.
    */
   void SetConductivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp) override;
-  
+
 };
 
 /*!
@@ -438,27 +438,27 @@ class CPolynomialConductivityRANS : public CConductivityModel {
   su2double Prandtl_Turb;     /*!< \brief Turbulent Prandtl number. */
 
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialConductivityRANS(void);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   ~CPolynomialConductivityRANS(void) override;
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPolynomialConductivityRANS(unsigned short val_nCoeffs, const su2double* val_b, su2double pr_turb);
-  
+
   /*!
    * \brief Set Thermal conductivity.
    */
   void SetConductivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp) override;
-  
+
 };
 
 #include "transport_model.inl"
