Merge branch 'develop' into feature_invalidGridPrevention

Author: TobiKattmann

.gitignore

@@ -87,4 +87,6 @@ Mercurial
 # Ignore build folder
 ./build/
 build/
+
+# ninja binary (build system)
 ninja

Common/include/CConfig.hpp

@@ -32,7 +32,7 @@
 
 #include "../basic_types/datatype_structure.hpp"
 #include "./CADTNodeClass.hpp"
-#include "../omp_structure.hpp"
+#include "../parallelization/omp_structure.hpp"
 
 using namespace std;
 

Common/include/adt/CADTBaseClass.hpp

@@ -29,7 +29,7 @@
 
 #include "./CADTBaseClass.hpp"
 #include "./CBBoxTargetClass.hpp"
-#include "../omp_structure.hpp"
+#include "../parallelization/omp_structure.hpp"
 
 /*!
  * \class CADTElemClass

Common/include/adt/CADTElemClass.hpp

@@ -613,7 +613,8 @@ class C2DContainer :
  * \brief Useful typedefs with default template parameters
  */
 template<class T> using su2vector = C2DContainer<unsigned long, T, StorageType::ColumnMajor, 64, DynamicSize, 1>;
-template<class T> using su2matrix = C2DContainer<unsigned long, T, StorageType::RowMajor, 64, DynamicSize, DynamicSize>;
+template<class T> using su2matrix = C2DContainer<unsigned long, T, StorageType::RowMajor,    64, DynamicSize, DynamicSize>;
+template<class T> using ColMajorMatrix = C2DContainer<unsigned long, T, StorageType::ColumnMajor, 64, DynamicSize, DynamicSize>;
 
 using su2activevector = su2vector<su2double>;
 using su2activematrix = su2matrix<su2double>;

Common/include/containers/C2DContainer.hpp

@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include "../mpi_structure.hpp"
+#include "../parallelization/mpi_structure.hpp"
 
 #ifdef HAVE_CGNS
   #include "cgnslib.h"

Common/include/fem/fem_cgns_elements.hpp

@@ -34,7 +34,7 @@
 #include "fem_cgns_elements.hpp"
 #endif
 #include "../wall_model.hpp"
-#include "../blas_structure.hpp"
+#include "../linear_algebra/blas_structure.hpp"
 
 using namespace std;
 

Common/include/fem/fem_geometry_structure.hpp

@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "../mpi_structure.hpp"
+#include "../parallelization/mpi_structure.hpp"
 
 #ifdef HAVE_METIS
 #include "metis.h"
@@ -84,7 +84,7 @@ class CGeometry {
   nPointGhost{0},                 /*!< \brief Number of ghost points of the mesh. */
   nPointNode{0},                  /*!< \brief Size of the node array allocated to hold CPoint objects. */
   Global_nPoint{0},               /*!< \brief Total number of nodes in a simulation across all processors (including halos). */
-  Global_nPointDomain{0},	        /*!< \brief Total number of nodes in a simulation across all processors (excluding halos). */
+  Global_nPointDomain{0},         /*!< \brief Total number of nodes in a simulation across all processors (excluding halos). */
   nElem{0},                       /*!< \brief Number of elements of the mesh. */
   Global_nElem{0},                /*!< \brief Total number of elements in a simulation across all processors (all types). */
   Global_nElemDomain{0},          /*!< \brief Total number of elements in a simulation across all processors (excluding halos). */
@@ -190,7 +190,7 @@ class CGeometry {
 
   CPrimalGrid** elem{nullptr};           /*!< \brief Element vector (primal grid information). */
   CPrimalGrid** face{nullptr};           /*!< \brief Face vector (primal grid information). */
-  CPrimalGrid*** bound{nullptr};	       /*!< \brief Boundary vector (primal grid information). */
+  CPrimalGrid*** bound{nullptr};         /*!< \brief Boundary vector (primal grid information). */
   CPoint* nodes{nullptr};                /*!< \brief Node vector (dual grid information). */
   CEdge* edges{nullptr};                 /*!< \brief Edge vector (dual grid information). */
   CVertex*** vertex{nullptr};            /*!< \brief Boundary Vertex vector (dual grid information). */
@@ -857,20 +857,6 @@ class CGeometry {
    */
   inline virtual void SetBoundControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_mesh_out_filename - Name of the output file.
-   */
-  inline virtual void SetMeshFile(CConfig *config, string val_mesh_out_filename) {}
-
-  /*!
-   * \brief A virtual member.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_mesh_out_filename - Name of the output file.
-   */
-  inline virtual void SetMeshFile(CGeometry *geometry, CConfig *config, string val_mesh_out_filename) {}
-
   /*!
    * \brief A virtual member.
    * \param[in] config - Definition of the particular problem.

Common/include/geometry/CGeometry.hpp

@@ -40,7 +40,6 @@ class CMultiGridGeometry final : public CGeometry {
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
   using CGeometry::SetVertex;
-  using CGeometry::SetMeshFile;
   using CGeometry::SetControlVolume;
   using CGeometry::SetBoundControlVolume;
   using CGeometry::SetPoint_Connectivity;

Common/include/geometry/CMultiGridGeometry.hpp

@@ -29,8 +29,8 @@
 #pragma once
 
 #include <vector>
-#include "containers/CFastFindAndEraseQueue.hpp"
-#include "geometry/CGeometry.hpp"
+#include "../containers/CFastFindAndEraseQueue.hpp"
+#include "CGeometry.hpp"
 
 using namespace std;