Changeset d13e27 for src/units/particle/interface_particles.cpp

Timestamp:

Mar 29, 2013, 5:03:13 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

f57182

Parents:

5ba22b

Message:

vmg: Work on output verbosity.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@2845 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/units/particle/interface_particles.cpp (modified) (8 diffs)

src/units/particle/interface_particles.cpp

@@ -86 +86 @@
   std::list<Particle::Particle>::iterator iter;
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
   vmg_float particle_charges = 0.0;
   for (iter=particles.begin(); iter!=particles.end(); ++iter)
     particle_charges += iter->Charge();
   particle_charges = MG::GetComm()->GlobalSumRoot(particle_charges);
-  comm.PrintStringOnce("Particle list charge sum: %e", particle_charges);
-  comm.PrintString("Local number of particles: %d", particles.size());
+  comm.PrintOnce(Debug, "Particle list charge sum: %e", particle_charges);
+  comm.Print(Debug, "Local number of particles: %d", particles.size());
 #endif
 
@@ -112 +112 @@
                                particle_grid.Local().Begin().Z() + k);
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
   Grid::iterator grid_iter;
   vmg_float charge_sum = 0.0;
@@ -118 +118 @@
     charge_sum += grid.GetVal(*grid_iter);
   charge_sum = MG::GetComm()->GlobalSum(charge_sum);
-  comm.PrintStringOnce("Grid charge sum: %e", charge_sum);
+  comm.PrintOnce(Debug, "Grid charge sum: %e", charge_sum);
 #endif
 }
@@ -126 +126 @@
   Index i;
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
   vmg_float e = 0.0;
   vmg_float e_long = 0.0;
@@ -185 +185 @@
           (*p1)->Pot() -= (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
           e_long += 0.5 * (*p1)->Charge() * ip.EvaluatePotentialLR(**p1);
           e_self += 0.5 * (*p1)->Charge() * (*p1)->Charge() * spl.GetAntiDerivativeAtZero();
@@ -206 +206 @@
                       (*p1)->Field() += (*p2)->Charge() * dir * spl.EvaluateField(length);
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
                       e_short_peak += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length;
                       e_short_spline += 0.5 * (*p1)->Charge() * (*p2)->Charge() / length * spl.EvaluatePotential(length);
@@ -229 +229 @@
   comm.CommParticlesBack(particles);
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
   vmg_float* q = factory.GetObjectStorageArray<vmg_float>("PARTICLE_CHARGE_ARRAY");
   const vmg_int& num_particles_local = factory.GetObjectStorageVal<vmg_int>("PARTICLE_NUM_LOCAL");
@@ -245 +245 @@
   e = comm.GlobalSumRoot(e);
 
-  comm.PrintStringOnce("E_long:         %e", e_long);
-  comm.PrintStringOnce("E_short_peak:   %e", e_short_peak);
-  comm.PrintStringOnce("E_short_spline: %e", e_short_spline);
-  comm.PrintStringOnce("E_self:         %e", e_self);
-  comm.PrintStringOnce("E_total:        %e", e);
-  comm.PrintStringOnce("E_total*:       %e", e_long + e_short_peak + e_short_spline - e_self);
-
-#endif /* DEBUG_OUTPUT */
-
+  comm.PrintOnce(Debug, "E_long:         %e", e_long);
+  comm.PrintOnce(Debug, "E_short_peak:   %e", e_short_peak);
+  comm.PrintOnce(Debug, "E_short_spline: %e", e_short_spline);
+  comm.PrintOnce(Debug, "E_self:         %e", e_self);
+  comm.PrintOnce(Debug, "E_total:        %e", e);
+  comm.PrintOnce(Debug, "E_total*:       %e", e_long + e_short_peak + e_short_spline - e_self);
+#endif
 }