Changes in src/atom_trajectoryparticle.cpp [d74077:952f38]

File:

• src/atom_trajectoryparticle.cpp (modified) (13 diffs)

src/atom_trajectoryparticle.cpp

@@ -12 +12 @@
 #include "config.hpp"
 #include "element.hpp"
-#include "info.hpp"
-#include "log.hpp"
+#include "Helpers/Info.hpp"
+#include "Helpers/Log.hpp"
 #include "parser.hpp"
 #include "ThermoStatContainer.hpp"
-#include "verbose.hpp"
+#include "Helpers/Verbose.hpp"
 
 /** Constructor of class TrajectoryParticle.
@@ -38 +38 @@
 {
   for (int i=NDIM;i--;)
-    *temperature += getType()->mass * Trajectory.U.at(step)[i]* Trajectory.U.at(step)[i];
+    *temperature += type->mass * Trajectory.U.at(step)[i]* Trajectory.U.at(step)[i];
 };
 
@@ -65 +65 @@
   for(int d=0;d<NDIM;d++) {
     Trajectory.U.at(Step)[d] -= CoGVelocity->at(d);
-    *ActualTemp += 0.5 * getType()->mass * Trajectory.U.at(Step)[d] * Trajectory.U.at(Step)[d];
+    *ActualTemp += 0.5 * type->mass * Trajectory.U.at(Step)[d] * Trajectory.U.at(Step)[d];
   }
 };
@@ -113 +113 @@
     Trajectory.R.at(NextStep)[d] = Trajectory.R.at(NextStep-1)[d];
     Trajectory.R.at(NextStep)[d] += configuration->Deltat*(Trajectory.U.at(NextStep-1)[d]);     // s(t) = s(0) + v * deltat + 1/2 a * deltat^2
-    Trajectory.R.at(NextStep)[d] += 0.5*configuration->Deltat*configuration->Deltat*(Trajectory.F.at(NextStep)[d]/getType()->mass);     // F = m * a and s =
+    Trajectory.R.at(NextStep)[d] += 0.5*configuration->Deltat*configuration->Deltat*(Trajectory.F.at(NextStep)[d]/type->mass);     // F = m * a and s =
   }
   // Update U
   for (int d=0; d<NDIM; d++) {
     Trajectory.U.at(NextStep)[d] = Trajectory.U.at(NextStep-1)[d];
-    Trajectory.U.at(NextStep)[d] += configuration->Deltat * (Trajectory.F.at(NextStep)[d]+Trajectory.F.at(NextStep-1)[d]/getType()->mass); // v = F/m * t
+    Trajectory.U.at(NextStep)[d] += configuration->Deltat * (Trajectory.F.at(NextStep)[d]+Trajectory.F.at(NextStep-1)[d]/type->mass); // v = F/m * t
   }
   // Update R (and F)
@@ -137 +137 @@
 void TrajectoryParticle::SumUpKineticEnergy( int Step, double *TotalMass, Vector *TotalVelocity ) const
 {
-  *TotalMass += getType()->mass;  // sum up total mass
+  *TotalMass += type->mass;  // sum up total mass
   for(int d=0;d<NDIM;d++) {
-    TotalVelocity->at(d) += Trajectory.U.at(Step)[d]*getType()->mass;
+    TotalVelocity->at(d) += Trajectory.U.at(Step)[d]*type->mass;
   }
 };
@@ -154 +154 @@
     for (int d=0; d<NDIM; d++) {
       U[d] *= ScaleTempFactor;
-      *ekin += 0.5*getType()->mass * U[d]*U[d];
+      *ekin += 0.5*type->mass * U[d]*U[d];
     }
 };
@@ -170 +170 @@
     for (int d=0; d<NDIM; d++) {
       *G += U[d] * F[d];
-      *E += U[d]*U[d]*getType()->mass;
+      *E += U[d]*U[d]*type->mass;
     }
 };
@@ -185 +185 @@
   if (FixedIon == 0) // even FixedIon moves, only not by other's forces
     for (int d=0; d<NDIM; d++) {
-      U[d] += configuration->Deltat/getType()->mass * ( (G_over_E) * (U[d]*getType()->mass) );
-      *ekin += getType()->mass * U[d]*U[d];
+      U[d] += configuration->Deltat/type->mass * ( (G_over_E) * (U[d]*type->mass) );
+      *ekin += type->mass * U[d]*U[d];
     }
 };
@@ -198 +198 @@
 void TrajectoryParticle::Thermostat_Langevin(int Step, gsl_rng * r, double *ekin, config *configuration)
 {
-  double sigma  = sqrt(configuration->Thermostats->TargetTemp/getType()->mass); // sigma = (k_b T)/m (Hartree/atomicmass = atomiclength/atomictime)
+  double sigma  = sqrt(configuration->Thermostats->TargetTemp/type->mass); // sigma = (k_b T)/m (Hartree/atomicmass = atomiclength/atomictime)
   Vector &U = Trajectory.U.at(Step);
   if (FixedIon == 0) { // even FixedIon moves, only not by other's forces
@@ -211 +211 @@
     }
     for (int d=0; d<NDIM; d++)
-      *ekin += 0.5*getType()->mass * U[d]*U[d];
+      *ekin += 0.5*type->mass * U[d]*U[d];
   }
 };
@@ -227 +227 @@
     for (int d=0; d<NDIM; d++) {
       U[d] *= sqrt(1+(configuration->Deltat/configuration->Thermostats->TempFrequency)*(ScaleTempFactor-1));
-      *ekin += 0.5*getType()->mass * U[d]*U[d];
+      *ekin += 0.5*type->mass * U[d]*U[d];
     }
   }
@@ -241 +241 @@
   if (FixedIon == 0) { // even FixedIon moves, only not by other's forces
     for (int d=0; d<NDIM; d++) {
-      *delta_alpha += U[d]*U[d]*getType()->mass;
+      *delta_alpha += U[d]*U[d]*type->mass;
     }
   }
@@ -256 +256 @@
   if (FixedIon == 0) { // even FixedIon moves, only not by other's forces
     for (int d=0; d<NDIM; d++) {
-        U[d] += configuration->Deltat/getType()->mass * (configuration->Thermostats->alpha * (U[d] * getType()->mass));
-        *ekin += (0.5*getType()->mass) * U[d]*U[d];
+        U[d] += configuration->Deltat/type->mass * (configuration->Thermostats->alpha * (U[d] * type->mass));
+        *ekin += (0.5*type->mass) * U[d]*U[d];
       }
   }
 };
-
-
-std::ostream & TrajectoryParticle::operator << (std::ostream &ost) const
-{
-  ParticleInfo::operator<<(ost);
-  ost << "," << getPosition();
-  return ost;
-}
-
-std::ostream & operator << (std::ostream &ost, const TrajectoryParticle &a)
-{
-  a.ParticleInfo::operator<<(ost);
-  ost << "," << a.getPosition();
-  return ost;
-}
-