inlined all of multipole.cpp

Author: dmarce1

CMakeLists.txt

@@ -3,6 +3,5 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -march=native")
 
 add_executable( fmm_test
 	src/main.cpp
-	src/multipole.cpp
 )
 

src/multipole.cpp

@@ -51,4 +51,89 @@ class multipole: public std::array<real,MP> {
 	~multipole();
 };
 
+
+inline multipole::multipole() {
+}
+
+inline real multipole::operator ()() const {
+	return (*this)[0];
+}
+
+inline real& multipole::operator ()() {
+	return (*this)[0];
+}
+
+inline real multipole::operator ()(integer i, integer j) const {
+	return (*this)[1 + map2[i][j]];
+}
+
+inline real& multipole::operator ()(integer i, integer j) {
+	return (*this)[1 + map2[i][j]];
+}
+
+#ifdef CORRECTION_ON
+inline real multipole::operator ()(integer i, integer j, integer k) const {
+	return (*this)[7 + map3[i][j][k]];
+}
+
+inline real& multipole::operator ()(integer i, integer j, integer k) {
+	return (*this)[7 + map3[i][j][k]];
+}
+#endif
+
+inline multipole& multipole::operator =(const multipole& expansion) {
+	for (integer i = 0; i < MP; i++) {
+		(*this)[i] = expansion[i];
+	}
+	return *this;
+}
+
+inline multipole& multipole::operator =(real expansion) {
+	for (integer i = 0; i < MP; i++) {
+		(*this)[i] = expansion;
+	}
+	return *this;
+}
+
+inline multipole multipole::operator>>(const space_vector& dX) const {
+	multipole you = *this;
+	you >>= dX;
+	return you;
+}
+
+inline std::array<real, MP>& multipole::operator +=(const std::array<real, MP>& vec) {
+	for (integer i = 0; i < MP; i++) {
+		(*this)[i] += vec[i];
+	}
+	return *this;
+}
+
+inline multipole::~multipole() {
+}
+
+
+inline multipole& multipole::operator>>=(const space_vector& Y) {
+	multipole& me = *this;
+#ifdef CORRECTION_ON
+	for (integer p = 0; p < 3; p++) {
+		for (integer q = p; q < 3; q++) {
+			for (integer r = q; r < 3; r++) {
+				me(p, q, r) += me() * Y[p] * Y[q] * Y[r];
+				me(p, q, r) += Y[p] * me(r, q);
+				me(p, q, r) += Y[q] * me(p, r);
+				me(p, q, r) += Y[r] * me(q, p);
+			}
+		}
+	}
+#endif
+	for (integer p = 0; p < 3; p++) {
+		for (integer q = p; q < 3; q++) {
+			me(p, q) += me() * Y[p] * Y[q];
+		}
+	}
+	return me;
+}
+
+
+
 #endif /* multipole_H_ */