14 add compile time variable for the number of vertices stored

CMakeLists.txt

@@ -14,6 +14,14 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+# ==============================================
+# === Set Some default values for polyhedra ====
+# ==============================================
+# These values have to be set by exaNBody
+set(EXADEM_MAX_VERTICES "8" CACHE STRING "Maximum number of vertices per polyhedron")
+message(STATUS "Maximum number of vertices per polyhedron: ${EXADEM_MAX_VERTICES}, default is 8 vertices.")
+add_compile_options(-DEXADEM_MAX_VERTICES=${EXADEM_MAX_VERTICES})
+
 # ======================================
 # === exaNBody application framework ===
 # ======================================
@@ -87,12 +95,12 @@ endif()
 # =======================================
 exaNBodyStartApplication()
 
+
 # ==========================================
 # === build application plugins and libs ===
 # ==========================================
 add_subdirectory(src)
 
-
 # =============================
 # === check exaDEM examples ===
 # =============================

include/exanb/fields.h

@@ -32,7 +32,7 @@ XSTAMP_DECLARE_FIELD(::exanb::Vec3d    , vrot   	,"angular velocity"); //
 XSTAMP_DECLARE_FIELD(::exanb::Vec3d    , arot   	,"angular acceleration"); // 
 XSTAMP_DECLARE_FIELD(::exanb::Vec3d    , inertia   	,"inertia values (same value in the diagonal)");
 XSTAMP_DECLARE_FIELD(::exanb::Vec3d    , friction   	,"tmp field"); // 
-typedef ::onika::oarray_t<::exanb::Vec3d, 8> VerticesType;
+typedef ::onika::oarray_t<::exanb::Vec3d, EXADEM_MAX_VERTICES> VerticesType;
 XSTAMP_DECLARE_FIELD(VerticesType , vertices   	,"list to compute vertices"); // 
 
 

src/polyhedra/include/exaDEM/compute_vertices.hpp

@@ -8,7 +8,7 @@ namespace exaDEM
   struct PolyhedraComputeVerticesFunctor
   {
     shapes& shps;
-    ONIKA_HOST_DEVICE_FUNC inline void operator () (const uint8_t type, const double rx, const double ry, const double rz, const double h, const exanb::Quaternion& orient, ::onika::oarray_t<::exanb::Vec3d, 8>& vertices ) const
+    ONIKA_HOST_DEVICE_FUNC inline void operator () (const uint8_t type, const double rx, const double ry, const double rz, const double h, const exanb::Quaternion& orient, ::onika::oarray_t<::exanb::Vec3d, EXADEM_MAX_VERTICES>& vertices ) const
     {
 			// h will be used in a next development
 			const auto& shp = shps[type];

src/polyhedra/include/exaDEM/network.hpp

@@ -36,7 +36,7 @@ namespace exaDEM
 			double time;                                   ///< Incrementation time value
 
 
-			using signature = std::tuple<bool, double, exanb::Vec3d, exanb::Vec3d> (*)(const onika::oarray_t<exanb::Vec3d, 8>&, int, const exaDEM::shape*, const onika::oarray_t<exanb::Vec3d, 8>&, int, const exaDEM::shape*);
+			using signature = std::tuple<bool, double, exanb::Vec3d, exanb::Vec3d> (*)(const onika::oarray_t<exanb::Vec3d, EXADEM_MAX_VERTICES>&, int, const exaDEM::shape*, const onika::oarray_t<exanb::Vec3d, EXADEM_MAX_VERTICES>&, int, const exaDEM::shape*);
 
 			/**
 			 * @brief Array of function pointers for precomputed detection signatures.

src/polyhedra/include/exaDEM/shape/shape_detection.hpp

@@ -9,7 +9,7 @@
 namespace exaDEM
 {
 	using namespace exanb;
-	using VertexArray = ::onika::oarray_t<::exanb::Vec3d, 8>;
+	using VertexArray = ::onika::oarray_t<::exanb::Vec3d, EXADEM_MAX_VERTICES>;
 
 	/**
 	 * @brief Normalizes a 3D vector in-place.

src/polyhedra/include/exaDEM/shape/shape_detection_driver.hpp

@@ -11,7 +11,7 @@
 namespace exaDEM
 {
 	using namespace exanb;
-	using VertexArray = ::onika::oarray_t<::exanb::Vec3d, 8>;
+	using VertexArray = ::onika::oarray_t<::exanb::Vec3d, EXADEM_MAX_VERTICES>;
 
 	// -> First Filters
 	template<typename Driver>

src/polyhedra/include/exaDEM/shape/shape_reader.hpp

@@ -4,17 +4,6 @@
 
 namespace exaDEM
 {
-/*
-	bool adder(std::ifstream& stream, shape& item, std::string in)
-	{
-		switch (in)
-		{
-			case "name": 
-			default return false;
-		}
-	}
-*/
-
 	void add_shape_from_file_shp(shapes& sphs, const std::string file_name)
 	{
 		std::ifstream input( file_name.c_str() );
@@ -39,7 +28,6 @@ namespace exaDEM
 						input >> new_shape.m_name;
 					}
 
-
 					// === keys relative to the OBB
 					if(key == "obb.center")
 					{
@@ -88,6 +76,13 @@ namespace exaDEM
 					{
 						int nv = 0;
 						input >> nv;
+						if( nv >= EXADEM_MAX_VERTICES ) 
+						{
+							lout << "=== EXADEM ERROR ===
+							lout << "=== Please, increase the maximum number of vertices: cmake ${Path_To_ExaDEM} -DEXADEM_MAX_VERTICES=" << nv << std::endl;
+							lout << "=== ABORT ===     
+							std::abort();
+						}
 						assert( nv !=0 );
 						for(int i = 0; i < nv ; i++)
 						{

src/polyhedra/read_shape_file.cpp

@@ -40,7 +40,7 @@ namespace exaDEM
 		inline void execute () override final
 		{
 			auto& collection = *shapes_collection;
-			std::cout << "read file: " << *filename << std::endl;
+			lout << "Read file= " << *filename << std::endl;
 			exaDEM::add_shape_from_file_shp(collection, *filename);
 		};
 	};

src/polyhedra/update_grid_interaction.cpp

@@ -21,7 +21,7 @@
 namespace exaDEM
 {
   using namespace exanb;
-  using VertexArray = ::onika::oarray_t<::exanb::Vec3d, 8>;
+  using VertexArray = ::onika::oarray_t<::exanb::Vec3d, EXADEM_MAX_VERTICES>;
 
 
   template<typename GridT