From 80aadc784e3f79b69c7aa6fa277a54c91f2556ca Mon Sep 17 00:00:00 200…

…1 From: Tom Haber <tomh@lab.exascience.com> Date: Tue, 4 Dec 2012 14:27:49 +0100 Subject: [PATCH] particle positions split (double -> int+float)
ExaScience · Sep 7, 2016 · b2e3df3 · b2e3df3
1 parent 09d5754
commit b2e3df3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/include/shark/part.hpp b/include/shark/part.hpp
@@ -9,14 +9,19 @@
 #include "vec.hpp"
 
 namespace shark {
-	
+
 	namespace ndim {
 
-		template<int ndim, typename T>
+		struct part_position {
+			int pos;
+			float off;
+		};
+
+		template<int ndim>
 		struct part {
-			vec<ndim,T> x;
-			vec<ndim,T> v;
-			T w;
+			vec<ndim,part_position> x;
+			vec<ndim,double> v;
+			double w;
 		};
 
 	}

diff --git a/include/shark/types.hpp b/include/shark/types.hpp
@@ -15,7 +15,7 @@ namespace shark {
 		typedef shark::ndim::coords_range<1> coords_range;
 		typedef shark::ndim::Domain<1> Domain;
 		typedef shark::ndim::vec<1,double> vecD;
-		typedef shark::ndim::part<1,double> partD;
+		typedef shark::ndim::part<1> partD;
 		typedef shark::ndim::GlobalArray<1,int> GlobalArrayI;
 		typedef shark::ndim::GlobalArray<1,long> GlobalArrayL;
 		typedef shark::ndim::GlobalArray<1,float> GlobalArrayF;
@@ -49,7 +49,7 @@ namespace shark {
 		typedef shark::ndim::coords_range<2> coords_range;
 		typedef shark::ndim::Domain<2> Domain;
 		typedef shark::ndim::vec<2,double> vecD;
-		typedef shark::ndim::part<2,double> partD;
+		typedef shark::ndim::part<2> partD;
 		typedef shark::ndim::GlobalArray<2,int> GlobalArrayI;
 		typedef shark::ndim::GlobalArray<2,long> GlobalArrayL;
 		typedef shark::ndim::GlobalArray<2,float> GlobalArrayF;
@@ -83,7 +83,7 @@ namespace shark {
 		typedef shark::ndim::coords_range<3> coords_range;
 		typedef shark::ndim::Domain<3> Domain;
 		typedef shark::ndim::vec<3,double> vecD;
-		typedef shark::ndim::part<3,double> partD;
+		typedef shark::ndim::part<3> partD;
 		typedef shark::ndim::GlobalArray<3,int> GlobalArrayI;
 		typedef shark::ndim::GlobalArray<3,long> GlobalArrayL;
 		typedef shark::ndim::GlobalArray<3,float> GlobalArrayF;

diff --git a/inst_dimtype.tmpl b/inst_dimtype.tmpl
@@ -20,7 +20,7 @@
 
 #ifndef SYMB_ARITH
 
-#define SYMBD(d) SYMBDT(d,shark::ndim::part<d COMMA double>)
+#define SYMBD(d) SYMBDT(d,shark::ndim::part<d>)
 #include "inst_dim"
 #undef SYMBD
 

diff --git a/src/comm_impl.cpp b/src/comm_impl.cpp
@@ -11,6 +11,7 @@ using namespace shark::ndim;
 
 #if defined(SHARK_MPI_COMM)
 
+template<> const MPI_Datatype mpi_type<char>::t = MPI_CHAR;
 template<> const MPI_Datatype mpi_type<int>::t = MPI_INT;
 template<> const MPI_Datatype mpi_type<long>::t = MPI_LONG;
 template<> const MPI_Datatype mpi_type<float>::t = MPI_FLOAT;
@@ -23,7 +24,7 @@ template<> const MPI_Datatype mpi_type<std::complex<long double>>::t = MPI_C_LON
 template<int ndim> const MPI_Datatype mpi_type<coords_range<ndim>>::t = mpi_type<coord>::t;
 
 template<int ndim,typename T> const MPI_Datatype mpi_type<vec<ndim,T>>::t = mpi_type<T>::t;
-template<int ndim,typename T> const MPI_Datatype mpi_type<part<ndim,T>>::t = mpi_type<T>::t;
+template<int ndim> const MPI_Datatype mpi_type<part<ndim>>::t = mpi_type<char>::t;
 
 template<typename T> const MPI_Datatype mpi_type<valarray<T>>::t = mpi_type<T>::t;
 

diff --git a/src/comm_impl.hpp b/src/comm_impl.hpp
@@ -107,15 +107,15 @@ namespace shark {
 	/*
 	 * mpi_type for part
 	 */
-	template<int ndim,typename T>
-	struct mpi_type<shark::ndim::part<ndim,T>> {
+	template<int ndim>
+	struct mpi_type<shark::ndim::part<ndim>> {
 		static const MPI_Datatype t;
 		INLINE static int count();
 	};
 
-	template<int ndim,typename T>
-	inline int mpi_type<shark::ndim::part<ndim,T>>::count() {
-		return ndim*2 + 1;
+	template<int ndim>
+	inline int mpi_type<shark::ndim::part<ndim>>::count() {
+		return sizeof(shark::ndim::part<ndim>);
 	}
 
 	/*

diff --git a/src/comm_other_inst b/src/comm_other_inst
@@ -4,10 +4,7 @@
 
 #if defined(SHARK_MPI_COMM)
 
-#define SYMBD(d) SYMBT(shark::ndim::part<d COMMA float>)
-#include "inst_dim"
-#undef SYMBD
-#define SYMBD(d) SYMBT(shark::ndim::part<d COMMA double>)
+#define SYMBD(d) SYMBT(shark::ndim::part<d>)
 #include "inst_dim"
 #undef SYMBD
 #define SYMBD(d) SYMBT(shark::ndim::coords_range<d>)
@@ -17,10 +14,7 @@
 
 #elif defined(SHARK_NO_COMM)
 
-#define SYMBD(d) SYMBT(shark::ndim::part<d COMMA float>)
-#include "inst_dim"
-#undef SYMBD
-#define SYMBD(d) SYMBT(shark::ndim::part<d COMMA double>)
+#define SYMBD(d) SYMBT(shark::ndim::part<d>)
 #include "inst_dim"
 #undef SYMBD
 #define SYMBD(d) SYMBT(shark::ndim::coords_range<d>)