Changes in src/molecule_dynamics.cpp [a67d19:e138de]

File:

• src/molecule_dynamics.cpp (modified) (14 diffs)

src/molecule_dynamics.cpp

@@ -207 +207 @@
     doubles++;
   if (doubles >0)
-    DoLog(2) && (Log() << Verbose(2) << "Found " << doubles << " Doubles." << endl);
+    Log() << Verbose(2) << "Found " << doubles << " Doubles." << endl;
   Free(&DoubleList);
 //  Log() << Verbose(2) << zeile1.str() << endl << zeile2.str() << endl;
@@ -249 +249 @@
     Params.DoubleList[Params.DistanceList[Walker->nr]->begin()->second->nr]++;            // increase this target's source count (>1? not injective)
     Params.DistanceIterators[Walker->nr] = Params.DistanceList[Walker->nr]->begin();    // and remember which one we picked
-    DoLog(2) && (Log() << Verbose(2) << *Walker << " starts with distance " << Params.DistanceList[Walker->nr]->begin()->first << "." << endl);
+    Log() << Verbose(2) << *Walker << " starts with distance " << Params.DistanceList[Walker->nr]->begin()->first << "." << endl;
   }
 };
@@ -277 +277 @@
       Params.DistanceIterators[Walker->nr] = NewBase;
       OldPotential = Potential;
-      DoLog(3) && (Log() << Verbose(3) << "Found a new permutation, new potential is " << OldPotential << "." << endl);
+      Log() << Verbose(3) << "Found a new permutation, new potential is " << OldPotential << "." << endl;
     }
   }
@@ -306 +306 @@
   for (int i=mol->AtomCount; i--;) // now each single entry in the DoubleList should be <=1
     if (Params.DoubleList[i] > 1) {
-      DoeLog(0) && (eLog()<< Verbose(0) << "Failed to create an injective PermutationMap!" << endl);
-      performCriticalExit();
-    }
-  DoLog(1) && (Log() << Verbose(1) << "done." << endl);
+      eLog() << Verbose(0) << "Failed to create an injective PermutationMap!" << endl;
+      exit(1);
+    }
+  Log() << Verbose(1) << "done." << endl;
 };
 
@@ -358 +358 @@
   Params.PenaltyConstants[2] = 1e+7;    // just a huge penalty
   // generate the distance list
-  DoLog(1) && (Log() << Verbose(1) << "Allocating, initializting and filling the distance list ... " << endl);
+  Log() << Verbose(1) << "Allocating, initializting and filling the distance list ... " << endl;
   FillDistanceList(this, Params);
 
@@ -365 +365 @@
 
   // make the PermutationMap injective by checking whether we have a non-zero constants[2] term in it
-  DoLog(1) && (Log() << Verbose(1) << "Making the PermutationMap injective ... " << endl);
+  Log() << Verbose(1) << "Making the PermutationMap injective ... " << endl;
   MakeInjectivePermutation(this, Params);
   Free(&Params.DoubleList);
 
   // argument minimise the constrained potential in this injective PermutationMap
-  DoLog(1) && (Log() << Verbose(1) << "Argument minimising the PermutationMap." << endl);
+  Log() << Verbose(1) << "Argument minimising the PermutationMap, at current potential " << OldPotential << " ... " << endl;
   OldPotential = 1e+10;
   round = 0;
   do {
-    DoLog(2) && (Log() << Verbose(2) << "Starting round " << ++round << ", at current potential " << OldPotential << " ... " << endl);
+    Log() << Verbose(2) << "Starting round " << ++round << " ... " << endl;
     OlderPotential = OldPotential;
     do {
@@ -424 +424 @@
             } else {
               Params.DistanceIterators[Runner->nr] = Rider;  // if successful also move the pointer in the iterator list
-              DoLog(3) && (Log() << Verbose(3) << "Found a better permutation, new potential is " << Potential << " vs." << OldPotential << "." << endl);
+              Log() << Verbose(3) << "Found a better permutation, new potential is " << Potential << " vs." << OldPotential << "." << endl;
               OldPotential = Potential;
             }
             if (Potential > Params.PenaltyConstants[2]) {
-              DoeLog(1) && (eLog()<< Verbose(1) << "The two-step permutation procedure did not maintain injectivity!" << endl);
+              eLog() << Verbose(0) << "ERROR: The two-step permutation procedure did not maintain injectivity!" << endl;
               exit(255);
             }
             //Log() << Verbose(0) << endl;
           } else {
-            DoeLog(1) && (eLog()<< Verbose(1) << *Runner << " was not the owner of " << *Sprinter << "!" << endl);
+            eLog() << Verbose(0) << "ERROR: " << *Runner << " was not the owner of " << *Sprinter << "!" << endl;
             exit(255);
           }
@@ -443 +443 @@
     } while (Walker->next != end);
   } while ((OlderPotential - OldPotential) > 1e-3);
-  DoLog(1) && (Log() << Verbose(1) << "done." << endl);
+  Log() << Verbose(1) << "done." << endl;
 
 
@@ -466 +466 @@
 {
   /// evaluate forces (only the distance to target dependent part) with the final PermutationMap
-  DoLog(1) && (Log() << Verbose(1) << "Calculating forces and adding onto ForceMatrix ... " << endl);
+  Log() << Verbose(1) << "Calculating forces and adding onto ForceMatrix ... " << endl;
   ActOnAllAtoms( &atom::EvaluateConstrainedForce, startstep, endstep, PermutationMap, Force );
-  DoLog(1) && (Log() << Verbose(1) << "done." << endl);
+  Log() << Verbose(1) << "done." << endl;
 };
 
@@ -503 +503 @@
 
   // go through all steps and add the molecular configuration to the list and to the Trajectories of \a this molecule
-  DoLog(1) && (Log() << Verbose(1) << "Filling intermediate " << MaxSteps << " steps with MDSteps of " << MDSteps << "." << endl);
+  Log() << Verbose(1) << "Filling intermediate " << MaxSteps << " steps with MDSteps of " << MDSteps << "." << endl;
   for (int step = 0; step <= MaxSteps; step++) {
     mol = new molecule(elemente);
@@ -568 +568 @@
     // parse file into ForceMatrix
     if (!Force.ParseMatrix(file, 0,0,0)) {
-      DoeLog(0) && (eLog()<< Verbose(0) << "Could not parse Force Matrix file " << file << "." << endl);
-      performCriticalExit();
+      eLog() << Verbose(0) << "Could not parse Force Matrix file " << file << "." << endl;
       return false;
     }
     if (Force.RowCounter[0] != AtomCount) {
-      DoeLog(0) && (eLog()<< Verbose(0) << "Mismatch between number of atoms in file " << Force.RowCounter[0] << " and in molecule " << AtomCount << "." << endl);
-      performCriticalExit();
+      eLog() << Verbose(0) << "Mismatch between number of atoms in file " << Force.RowCounter[0] << " and in molecule " << AtomCount << "." << endl;
       return false;
     }
@@ -652 +650 @@
   switch(Thermostat) {
      case None:
-      DoLog(2) && (Log() << Verbose(2) <<  "Applying no thermostat..." << endl);
+      Log() << Verbose(2) <<  "Applying no thermostat..." << endl;
       break;
      case Woodcock:
       if ((configuration.ScaleTempStep > 0) && ((MDSteps-1) % configuration.ScaleTempStep == 0)) {
-        DoLog(2) && (Log() << Verbose(2) <<  "Applying Woodcock thermostat..." << endl);
+        Log() << Verbose(2) <<  "Applying Woodcock thermostat..." << endl;
         ActOnAllAtoms( &atom::Thermostat_Woodcock, sqrt(ScaleTempFactor), MDSteps, &ekin );
       }
       break;
      case Gaussian:
-      DoLog(2) && (Log() << Verbose(2) <<  "Applying Gaussian thermostat..." << endl);
+      Log() << Verbose(2) <<  "Applying Gaussian thermostat..." << endl;
       ActOnAllAtoms( &atom::Thermostat_Gaussian_init, MDSteps, &G, &E );
 
-      DoLog(1) && (Log() << Verbose(1) << "Gaussian Least Constraint constant is " << G/E << "." << endl);
+      Log() << Verbose(1) << "Gaussian Least Constraint constant is " << G/E << "." << endl;
       ActOnAllAtoms( &atom::Thermostat_Gaussian_least_constraint, MDSteps, G/E, &ekin, &configuration);
 
       break;
      case Langevin:
-      DoLog(2) && (Log() << Verbose(2) <<  "Applying Langevin thermostat..." << endl);
+      Log() << Verbose(2) <<  "Applying Langevin thermostat..." << endl;
       // init random number generator
       gsl_rng_env_setup();
@@ -679 +677 @@
 
      case Berendsen:
-      DoLog(2) && (Log() << Verbose(2) <<  "Applying Berendsen-VanGunsteren thermostat..." << endl);
+      Log() << Verbose(2) <<  "Applying Berendsen-VanGunsteren thermostat..." << endl;
       ActOnAllAtoms( &atom::Thermostat_Berendsen, MDSteps, ScaleTempFactor, &ekin, &configuration );
       break;
 
      case NoseHoover:
-      DoLog(2) && (Log() << Verbose(2) <<  "Applying Nose-Hoover thermostat..." << endl);
+      Log() << Verbose(2) <<  "Applying Nose-Hoover thermostat..." << endl;
       // dynamically evolve alpha (the additional degree of freedom)
       delta_alpha = 0.;
@@ -690 +688 @@
       delta_alpha = (delta_alpha - (3.*AtomCount+1.) * configuration.TargetTemp)/(configuration.HooverMass*Units2Electronmass);
       configuration.alpha += delta_alpha*configuration.Deltat;
-      DoLog(3) && (Log() << Verbose(3) << "alpha = " << delta_alpha << " * " << configuration.Deltat << " = " << configuration.alpha << "." << endl);
+      Log() << Verbose(3) << "alpha = " << delta_alpha << " * " << configuration.Deltat << " = " << configuration.alpha << "." << endl;
       // apply updated alpha as additional force
       ActOnAllAtoms( &atom::Thermostat_NoseHoover_scale, MDSteps, &ekin, &configuration );
       break;
   }
-  DoLog(1) && (Log() << Verbose(1) << "Kinetic energy is " << ekin << "." << endl);
-};
+  Log() << Verbose(1) << "Kinetic energy is " << ekin << "." << endl;
+};