Changeset 4d5553

Timestamp:

Mar 1, 2011, 10:16:38 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

e34254

Parents:

b23e26

git-author:

Frederik Heber <heber@…> (03/01/11 09:56:05)

git-committer:

Frederik Heber <heber@…> (03/01/11 10:16:38)

Message:

Changed verbosity for LoadMolecule().

File:

• src/config.cpp (modified) (8 diffs)

src/config.cpp

@@ -463 +463 @@
 
   if (mol == NULL) {
-    DoeLog(0) && (eLog()<< Verbose(0) << "Molecule is not allocated in LoadMolecule(), exit.");
+    ELOG(0, "Molecule is not allocated in LoadMolecule(), exit.");
     performCriticalExit();
   }
@@ -469 +469 @@
   ParseForParameter(verbose,FileBuffer,"MaxTypes", 0, 1, 1, int_type, &(MaxTypes), 1, critical);
   if (MaxTypes == 0) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "There are no atoms according to MaxTypes in this config file." << endl);
+    ELOG(1, "There are no atoms according to MaxTypes in this config file." << endl);
     //performCriticalExit();
   } else {
     // prescan number of ions per type
-    DoLog(0) && (Log() << Verbose(0) << "Prescanning ions per type: " << endl);
+    LOG(0, "STATUS: Prescanning ions per type: " << endl);
     int NoAtoms = 0;
     for (int i=0; i < MaxTypes; i++) {
@@ -488 +488 @@
     sprintf(name,"Ion_Type%i",MaxTypes);
     if (!ParseForParameter(verbose,FileBuffer, (const char*)name, 1, 1, 1, int_type, &value[0], 1, critical)) {
-      DoeLog(0) && (eLog()<< Verbose(0) << "There are no atoms in the config file!" << endl);
+      ELOG(0, "There are no atoms in the config file!" << endl);
       performCriticalExit();
       return;
@@ -496 +496 @@
     FileBuffer->MapIonTypesInBuffer(NoAtoms);
     for (int i=FileBuffer->CurrentLine; i<FileBuffer->NoLines;++i) {
-      DoLog(4) && (Log() << Verbose(4) << FileBuffer->buffer[ FileBuffer->LineMapping[i] ]);
+      LOG(4, FileBuffer->buffer[ FileBuffer->LineMapping[i] ]);
     }
 
@@ -517 +517 @@
         keyword_stream << "Ion_Type" << i+1 << "_" << j+1;
         const std::string keyword = keyword_stream.str();
-        DoLog(3) && (Log() << Verbose(3) << "INFO: Parsing for " << keyword << "." << std::endl);
+        LOG(3, "INFO: Parsing for " << keyword << "." << std::endl);
         while (true) {
           const std::string line(FileBuffer->buffer[ FileBuffer->LineMapping[FileBuffer->CurrentLine] ]);
@@ -526 +526 @@
             const std::string token = *tok_iter++;
             if (token == keyword) {
-              DoLog(3) && (Log() << Verbose(3) << "INFO: Found keyword " << keyword << " in line " << FileBuffer->CurrentLine << std::endl);
+              LOG(3, "INFO: Found keyword " << keyword << " in line " << FileBuffer->CurrentLine << std::endl);
               if (step == 0) {
                 neues = World::getInstance().createAtom();
                 AtomList[i][j] = neues;
-                DoLog(4) && (Log() << Verbose(4) << "Filling LinearList [ (FileBuffer->LineMapping[" << FileBuffer->CurrentLine << "]) = " << FileBuffer->LineMapping[FileBuffer->CurrentLine] << " with " << neues << endl);
+                LOG(4, "Filling LinearList [ (FileBuffer->LineMapping[" << FileBuffer->CurrentLine << "]) = " << FileBuffer->LineMapping[FileBuffer->CurrentLine] << " with " << neues << endl);
                 LinearList[ FileBuffer->LineMapping[FileBuffer->CurrentLine] ] = neues;
                 neues->setType(elementhash[i]); // find element type
@@ -540 +540 @@
               for (tokenizer::iterator tokiter = tokens.begin(); tokiter != tokens.end(); ++tokiter)
                 ++tokens_size;
-              DoLog(3) && (Log() << Verbose(3) << "INFO: Line contains " << tokens_size << " tokens." << std::endl);
+              LOG(3, "INFO: Line contains " << tokens_size << " tokens." << std::endl);
               // and parse
               tempVector.Zero();
               if (tokens_size >= 5) { // only AtomicPosition and FixedIon
-                DoLog(3) && (Log() << Verbose(3) << "INFO: Parsing AtomicPosition and FixedIon" << std::endl);
                 for (int i=0;i<NDIM;++i)
                   tempVector[i] = toDouble(*tok_iter++);
@@ -550 +549 @@
                 _fixedion = toInt(*tok_iter++);
                 neues->setFixedIon(_fixedion == 1);
+                LOG(3, "INFO: Parsing AtomicPosition " << tempVector << " and FixedIon " << _fixedion << "." << std::endl);
               }
               tempVector.Zero();
               if (tokens_size >= 8) { // AtomicVelocity
-                DoLog(3) && (Log() << Verbose(3) << "INFO: Parsing AtomicVelocity" << std::endl);
                 for (int i=0;i<NDIM;++i)
                   tempVector[i] = toDouble(*tok_iter++);
+                LOG(3, "INFO: Parsing AtomicVelocity " << tempVector << "." << std::endl);
               }
               neues->setAtomicVelocityAtStep(step, tempVector);
               tempVector.Zero();
               if (tokens_size >= 11) {  // AtomicForce
-                DoLog(3) && (Log() << Verbose(3) << "INFO: Parsing AtomicForce" << std::endl);
+                LOG(3, "INFO: Parsing AtomicForce" << std::endl);
                 for (int i=0;i<NDIM;++i)
                   tempVector[i] = toDouble(*tok_iter++);