Merge pull request #145 from torbjoernk/feature/boris-logging-improve

Improving logging for Boris SDC

Author: memmett

examples/boris/bindings/simple_physics_solver.cpp

@@ -75,7 +75,8 @@ namespace simple_physics_solver
 //     cout << "SimplePhysicsSolver::evaluate_internal_e_field(t=" << t << ")" << endl;
     double r = double(0.0),
            r3 = double(0.0),
-           dist = double(0.0);
+           dist2 = double(0.0);
+    double* dist = new double[DIM];
 
     // computing forces on particle i
     for (size_t i = 0; i < num_particles; ++i) {
@@ -92,18 +93,19 @@ namespace simple_physics_solver
 //           cout << "      skipping" << endl;
           continue;
         }
-        dist = double(0.0);
+        dist2 = double(0.0);
         for (size_t d = 0; d < DIM; ++d) {
-          dist += (positions[i * DIM + d] - positions[j * DIM + d]) * (positions[i * DIM + d] - positions[j * DIM + d]);
+          dist[d] = positions[i * DIM + d] - positions[j * DIM + d];
+          dist2 += dist[d] * dist[d];
         }
 //         cout << "      dist = " << dist << endl;
-        r = sqrt(dist * dist + config->sigma2);
+        r = sqrt(dist2 + config->sigma2);
 //         cout << "      r = " << r << " (= sqrt(dist^2+" << config->sigma2 << ")" << endl;
-        phis[i] += charges[j] / r;
+//         phis[i] += charges[j] / r;
 
         r3 = r * r * r;
         for (size_t d = 0; d < DIM; ++d) {
-          exyz[i * DIM + d] += positions[j * DIM + d] / r3 * charges[j];
+          exyz[i * DIM + d] += dist[d] / r3 * charges[j];
 //           cout << "      exyz[" << i * DIM + d << "] += " << positions[j * DIM + d] << " / " << r3 << " * " << charges[j] << "(q) => " << exyz[i * DIM + d] << endl;
         }
       }
@@ -113,6 +115,7 @@ namespace simple_physics_solver
 //       cout << endl
 //            << "    phi_i = " << phis[i] << endl;
     }
+    delete[] dist;
 //     cout << "DONE SimplePhysicsSolver::evaluate_internal_e_field(t=" << t << ")" << endl;
   }
 

examples/boris/bindings/wrapper_simple_physics_solver_impl.hpp

@@ -115,12 +115,10 @@ namespace pfasst
         ParticleCloudComponent<scalar>
         WrapperSimplePhysicsSolver<scalar, time>::e_field_evaluate(const particle_cloud_type& particles, const time t)
         {
-          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << "time=" << t;
+          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << " time=" << t;
           size_t num_particles = particles->size();
           assert(DIM == particles->dim());
 
-//           VLOG(3) << LOG_INDENT << "positions:" << particles->positions();
-
           scalar* packed_positions = new scalar[num_particles * DIM];
           scalar* packed_masses = new scalar[num_particles];
           scalar* packed_charges = new scalar[num_particles];
@@ -145,7 +143,7 @@ namespace pfasst
         ParticleCloudComponent<scalar>
         WrapperSimplePhysicsSolver<scalar, time>::b_field_evaluate(const particle_cloud_type& particles, const time t)
         {
-          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << "time=" << t;
+          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << " time=" << t;
           size_t num_particles = particles->size();
           assert(DIM == particles->dim());
 
@@ -173,7 +171,7 @@ namespace pfasst
         ParticleCloudComponent<scalar>
         WrapperSimplePhysicsSolver<scalar, time>::b_field_vecs(const particle_cloud_type& particles, const time t)
         {
-          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << "time=" << t;
+          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << " time=" << t;
           auto b_vecs = cloud_component_factory<scalar>(particles->size(), particles->dim());
           for (size_t p = 0; p < particles->size(); ++p) {
             b_vecs[p] = this->get_b_field_vector() / particles->charges()[p] / particles->masses()[p];
@@ -186,7 +184,7 @@ namespace pfasst
         ParticleCloudComponent<scalar>
         WrapperSimplePhysicsSolver<scalar, time>::force_evaluate(const particle_cloud_type& particles, const time t)
         {
-          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << "time=" << t;
+          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << " time=" << t;
           auto e_force = this->e_field_evaluate(particles, t);
           auto b_force = this->b_field_evaluate(particles, t);
           VLOG_FUNC_END("WrapperSimplePhysicsSolver");
@@ -197,7 +195,7 @@ namespace pfasst
         scalar
         WrapperSimplePhysicsSolver<scalar, time>::energy(const particle_cloud_type& particles, const time t)
         {
-          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << "time=" << t;
+          VLOG_FUNC_START("WrapperSimplePhysicsSolver") << " time=" << t;
           size_t num_particles = particles->size();
           assert(DIM == particles->dim());
 
@@ -212,7 +210,6 @@ namespace pfasst
 
           auto energy = solver::compute_energy(packed_positions, packed_velocities, packed_charges, packed_masses,
                                                num_particles, t, this->config.get());
-          VLOG(2) << LOG_INDENT << "energy =" << energy;
           delete[] packed_velocities;
           delete[] packed_positions;
           delete[] packed_masses;