Merge branch 'develop' into feature_aero_thermo_elasticity

Author: pcarruscag

.gitignore

@@ -86,3 +86,5 @@ Mercurial
 
 # Ignore build folder
 ./build/
+build/
+ninja

Common/include/CConfig.hpp

@@ -31,7 +31,6 @@
 #include <cmath>
 #include <cstdlib>
 
-
 /*!
  * \class CSysVector
  * \brief Class for holding and manipulating vectors needed by linear solvers

Common/include/linear_algebra/CSysVector.hpp

@@ -95,6 +95,8 @@ const unsigned int INST_0 = 0;  /*!< \brief Definition of the first instance per
 
 const su2double STANDARD_GRAVITY = 9.80665;           /*!< \brief Acceleration due to gravity at surface of earth. */
 const su2double UNIVERSAL_GAS_CONSTANT = 8.3144598;   /*!< \brief Universal gas constant in J/(mol*K) */
+const su2double BOLTZMANN_CONSTANT = 1.3806503E-23; /*! \brief Boltzmann's constant [J K^-1] */
+const su2double AVOGAD_CONSTANT = 6.0221415E26; /*!< \brief Avogardro's constant, number of particles in one kmole. */
 
 const su2double EPS = 1.0E-16;        /*!< \brief Error scale. */
 const su2double TURB_EPS = 1.0E-16;   /*!< \brief Turbulent Error scale. */
@@ -196,7 +198,9 @@ enum ENUM_MAIN_SOLVER {
   FEM_NAVIER_STOKES = 27,           /*!< \brief Definition of the finite element Navier-Stokes' solver. */
   FEM_RANS = 28,                    /*!< \brief Definition of the finite element Reynolds-averaged Navier-Stokes' (RANS) solver. */
   FEM_LES = 29,                     /*!< \brief Definition of the finite element Large Eddy Simulation Navier-Stokes' (LES) solver. */
-  MULTIPHYSICS = 30
+  MULTIPHYSICS = 30,
+  NEMO_EULER = 41,                  /*!< \brief Definition of the NEMO Euler solver. */
+  NEMO_NAVIER_STOKES = 42          /*!< \brief Definition of the NEMO NS solver. */
 };
 static const MapType<string, ENUM_MAIN_SOLVER> Solver_Map = {
   MakePair("NONE", NO_SOLVER)
@@ -210,6 +214,8 @@ static const MapType<string, ENUM_MAIN_SOLVER> Solver_Map = {
   MakePair("FEM_NAVIER_STOKES", FEM_NAVIER_STOKES)
   MakePair("FEM_RANS", FEM_RANS)
   MakePair("FEM_LES", FEM_LES)
+  MakePair("NEMO_EULER",NEMO_EULER)
+  MakePair("NEMO_NAVIER_STOKES",NEMO_NAVIER_STOKES)
   MakePair("ADJ_EULER", ADJ_EULER)
   MakePair("ADJ_NAVIER_STOKES", ADJ_NAVIER_STOKES)
   MakePair("ADJ_RANS", ADJ_RANS )
@@ -535,7 +541,9 @@ enum ENUM_FLUIDMODEL {
   PR_GAS = 3,             /*!< \brief Perfect Real gas model. */
   CONSTANT_DENSITY = 4,   /*!< \brief Constant density gas model. */
   INC_IDEAL_GAS = 5,      /*!< \brief Incompressible ideal gas model. */
-  INC_IDEAL_GAS_POLY = 6  /*!< \brief Inc. ideal gas, polynomial gas model. */
+  INC_IDEAL_GAS_POLY = 6,  /*!< \brief Inc. ideal gas, polynomial gas model. */
+  MUTATIONPP = 7,         /*!< \brief Mutation++ gas model for nonequilibrium flow. */
+  USER_DEFINED_NONEQ = 8        /*!< \brief User defined gas model for nonequilibrium flow. */
 };
 static const MapType<string, ENUM_FLUIDMODEL> FluidModel_Map = {
   MakePair("STANDARD_AIR", STANDARD_AIR)
@@ -545,6 +553,46 @@ static const MapType<string, ENUM_FLUIDMODEL> FluidModel_Map = {
   MakePair("CONSTANT_DENSITY", CONSTANT_DENSITY)
   MakePair("INC_IDEAL_GAS", INC_IDEAL_GAS)
   MakePair("INC_IDEAL_GAS_POLY", INC_IDEAL_GAS_POLY)
+  MakePair("MUTATIONPP", MUTATIONPP)
+  MakePair("USER_DEFINED_NONEQ", USER_DEFINED_NONEQ)
+};
+
+/*!
+ * \brief types of gas models
+ */
+enum ENUM_GASMODEL {
+   NO_MODEL   = 0,
+   ARGON      = 1,
+   AIR7       = 2,
+   AIR21      = 3,
+   O2         = 4,
+   N2         = 5,
+   AIR5       = 6,
+   ARGON_SID  = 7,
+   ONESPECIES = 8
+};
+static const MapType<string, ENUM_GASMODEL> GasModel_Map = {
+MakePair("NONE", NO_MODEL)
+MakePair("ARGON", ARGON)
+MakePair("AIR-7", AIR7)
+MakePair("AIR-21", AIR21)
+MakePair("O2", O2)
+MakePair("N2", N2)
+MakePair("AIR-5", AIR5)
+MakePair("ARGON-SID",ARGON_SID)
+MakePair("ONESPECIES", ONESPECIES)
+};
+
+/*!
+ * \brief types of coefficient transport model
+ */
+enum ENUM_TRANSCOEFFMODEL {
+  WILKE      = 0,
+  GUPTAYOS   = 1
+};
+static const MapType<string, ENUM_TRANSCOEFFMODEL> TransCoeffModel_Map = {
+MakePair("WILKE", WILKE)
+MakePair("GUPTA-YOS", GUPTAYOS)
 };
 
 /*!
@@ -738,7 +786,8 @@ enum ENUM_UPWIND {
   FDS = 14,                   /*!< \brief Flux difference splitting upwind method (incompressible flows). */
   LAX_FRIEDRICH = 15,         /*!< \brief Lax-Friedrich numerical method. */
   AUSMPLUSUP = 16,            /*!< \brief AUSM+ -up numerical method (All Speed) */
-  AUSMPLUSUP2 = 17            /*!< \brief AUSM+ -up2 numerical method (All Speed) */
+  AUSMPLUSUP2 = 17,            /*!< \brief AUSM+ -up2 numerical method (All Speed) */
+  AUSMPWPLUS = 18            /*!< \brief AUSMplus numerical method. (MAYBE for TNE2 ONLY)*/
 };
 static const MapType<string, ENUM_UPWIND> Upwind_Map = {
   MakePair("NONE", NO_UPWIND)
@@ -747,6 +796,7 @@ static const MapType<string, ENUM_UPWIND> Upwind_Map = {
   MakePair("AUSM", AUSM)
   MakePair("AUSMPLUSUP", AUSMPLUSUP)
   MakePair("AUSMPLUSUP2", AUSMPLUSUP2)
+  MakePair("AUSMPWPLUS", AUSMPWPLUS)
   MakePair("SLAU", SLAU)
   MakePair("HLLC", HLLC)
   MakePair("SW", SW)
@@ -1096,6 +1146,7 @@ enum BC_TYPE {
   DISP_DIR_BOUNDARY = 40,     /*!< \brief Boundary displacement definition. */
   DAMPER_BOUNDARY = 41,       /*!< \brief Damper. */
   CHT_WALL_INTERFACE = 50,    /*!< \brief Domain interface definition. */
+  SMOLUCHOWSKI_MAXWELL = 55,  /*!< \brief Smoluchoski/Maxwell wall boundary condition. */
   SEND_RECEIVE = 99,          /*!< \brief Boundary send-receive definition. */
 };
 
@@ -2127,7 +2178,8 @@ enum MPI_QUANTITIES {
   SOLUTION_FEA_OLD     = 26,  /*!< \brief FEA solution old communication. */
   MESH_DISPLACEMENTS   = 27,  /*!< \brief Mesh displacements at the interface. */
   SOLUTION_TIME_N      = 28,  /*!< \brief Solution at time n. */
-  SOLUTION_TIME_N1     = 29   /*!< \brief Solution at time n-1. */
+  SOLUTION_TIME_N1     = 29,   /*!< \brief Solution at time n-1. */
+  PRIMITIVE            = 30   /*!< \brief Primitive solution communication. */
 };
 
 /*!

Common/include/option_structure.hpp

@@ -595,3 +595,36 @@ struct C3DDummyMiddleView
     return data(i,k);
   }
 };
+
+/*!
+ * \class C3DContainerDecorator
+ * \brief Decorate a vector type (Storage) with 3 dimensions. *
+ */
+template<class Storage>
+struct C3DContainerDecorator {
+  using Scalar = typename Storage::Scalar;
+  using Index = typename Storage::Index;
+
+  Storage storage;
+  Index M, N;
+
+  C3DContainerDecorator() = default;
+
+  C3DContainerDecorator(Index length, Index rows, Index cols, Scalar value = 0) {
+    resize(length, rows, cols, value);
+  }
+
+  void resize(Index length, Index rows, Index cols, Scalar value = 0) {
+    M = rows;
+    N = cols;
+    storage.resize(length*rows*cols) = value;
+  }
+
+  Scalar& operator() (Index i, Index j, Index k) { return storage(i*M*N + j*N + k); }
+  const Scalar& operator() (Index i, Index j, Index k) const { return storage(i*M*N + j*N + k); }
+};
+
+/* Define an alias for a 3D int matrix, we use su2vector to store the integers contiguously
+ * and the container decorator to create the access semantics we want. */
+using C3DIntMatrix = C3DContainerDecorator<su2vector<int> >;
+using C3DDoubleMatrix = C3DContainerDecorator<su2vector<double> >;