Cleaning util.hpp and adding more spheres to MIC3D_SPHERES

include/util.hpp

@@ -19,16 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 #ifndef UTIL_HPP
 #define UTIL_HPP
 
-// Debug print macro.
-#ifdef NDEBUG
-#define dprintf(...)
-#else
-#define dprintf(...) fprintf(stderr, __VA_ARGS__)
-#endif
-
 
 #include <vector>
 #include <iostream>
@@ -66,29 +60,21 @@ constexpr int mypow(int v, int e)
 inline void print_vec(const double *vec, int n, const char file_name[])
 {
 	FILE *file = fopen(file_name, "w");
-	for (int i = 0; i < n; ++i)
+	for (int i = 0; i < n; ++i) {
 		fprintf(file, "[%lf]\n", vec[i]);
+	}
 	fclose(file);
 }
 
 
-inline void mvp(const double m[2][2], const double x[2], double *y)
+template<typename T, int n>
+inline void mvp(const T m[n][n], const T x[n], T *y)
 {
-	for (int i = 0; i < 2; ++i) {
-		double tmp = 0.0;
-		for (int j = 0; j < 2; ++j)
+	for (int i = 0; i < n; ++i) {
+		T tmp = 0.0;
+		for (int j = 0; j < n; ++j) {
 			tmp += m[i][j] * x[j];
-		y[i] = tmp;
 		}
-}
-
-
-inline void mvp(const double m[3][3], const double x[3], double *y)
-{
-	for (int i = 0; i < 3; ++i) {
-		double tmp = 0.0;
-		for (int j = 0; j < 3; ++j)
-			tmp += m[i][j] * x[j];
 		y[i] = tmp;
 	}
 }
@@ -135,7 +121,7 @@ inline bool point_inside_sphere(const double center[3], const double radius,
 	const double v[3] = {
 		point[0] - center[0],
 		point[1] - center[1],
-		point[2] - center[2]};
+		point[2] - center[2] };
 
 	return (norm<double, 3>(v) < radius) ? true : false;
 }

src/micro_common.cpp

@@ -136,7 +136,8 @@ micropp<tdim>::micropp(const micropp_params_t &params):
 
 #pragma omp parallel for schedule(dynamic,1)
 		for (int i = 0; i < num_of_A0s; ++i) {
-			ell_init(&A0[i], dim, dim, params.size, CG_ABS_TOL, CG_REL_TOL, CG_MAX_ITS);
+			ell_init(&A0[i], dim, dim, params.size, CG_ABS_TOL,
+				 CG_REL_TOL, CG_MAX_ITS);
 			double *u = (double *) calloc(nndim, sizeof(double));
 			assembly_mat(&A0[i], u, nullptr);
 			free(u);
@@ -165,7 +166,9 @@ micropp<tdim>::micropp(const micropp_params_t &params):
 		strcpy(filename, file_name_string.c_str());
 
 		ofstream_log.open(filename, ios::out);
-		ofstream_log << "#<gp_id>  <non-linear>  <cost>  <converged>" << endl;
+		ofstream_log
+			<< "#<gp_id>  <non-linear>  <cost>  <converged>"
+			<< endl;
 	}
 
 }
@@ -493,7 +496,7 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
 
 	       	/* Distribution of Several Spheres of diferent sizes */
 
-		const int num_spheres = 20;
+		const int num_spheres = 40;
 
 		const double centers[num_spheres][3] = {
 			{ .8663, .0689, .1568 },
@@ -515,7 +518,27 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
 			{ .7319, .7146, .8150 },
 			{ .8796, .2858, .6701 },
 			{ .1427, .9309, .9830 },
-			{ .1388, .3126, .8054 }
+			{ .1388, .3126, .8054 },
+			{ .0729, .4754, .4950 },
+			{ .5038, .7755, .7333 },
+			{ .0242, .2185, .9884 },
+			{ .5371, .5372, .8269 },
+			{ .4564, .0039, .1715 },
+			{ .7410, .0799, .8775 },
+			{ .2627, .9047, .5681 },
+			{ .7894, .1908, .2993 },
+			{ .1373, .5370, .9916 },
+			{ .0207, .8020, .9283 },
+			{ .6540, .2359, .0286 },
+			{ .7801, .3568, .5086 },
+			{ .7322, .5706, .1114 },
+			{ .5479, .1493, .1267 },
+			{ .6722, .1530, .1003 },
+			{ .7659, .3426, .9181 },
+			{ .4582, .4636, .6310 },
+			{ .1811, .9665, .4713 },
+			{ .0834, .6066, .6936 },
+			{ .4865, .7584, .3635 }
 		};
 
 		const double rads[num_spheres] = {
@@ -538,7 +561,27 @@ int micropp<tdim>::get_elem_type(int ex, int ey, int ez) const
 			0.1 * .8002,
 			0.1 * .8176,
 			0.1 * .9970,
-			0.1 * .4736
+			0.1 * .4736,
+			0.1 * .6351,
+			0.1 * .3140,
+			0.1 * .3440,
+			0.1 * .2444,
+			0.1 * .3894,
+			0.1 * .5234,
+			0.1 * .1658,
+			0.1 * .4020,
+			0.1 * .6813,
+			0.1 * .2060,
+			0.1 * .1427,
+			0.1 * .9332,
+			0.1 * .5406,
+			0.1 * .9765,
+			0.1 * .0956,
+			0.1 * .6432,
+			0.1 * .9998,
+			0.1 * .4166,
+			0.1 * .6907,
+			0.1 * .0404
 		};
 
 

test/benchmark-mic-1.cpp

@@ -89,6 +89,12 @@ int main(int argc, char **argv)
 	micropp<3> micro(mic_params);
 	//micro.print_info();
 
+	if (print) {
+		char filename[128];
+		snprintf(filename, 128, "micropp_%d", 0);
+		micro.output (0, filename);
+	}
+
 	ofstream file;
 	file.open("result.dat");