Changeset 44f53e for src/Fragmentation

Timestamp:

Feb 22, 2012, 11:28:28 AM (13 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:

8c6d18

Parents:

98c428

git-author:

Frederik Heber <heber@…> (01/05/12 16:37:05)

git-committer:

Frederik Heber <heber@…> (02/22/12 11:28:28)

Message:

Made various verbosities a lot less annoying.

• LinkedCell_Model does not notify about all updates on default.
• PdbParser notes currently parsed time step.
• WorldTime tells about new time step set.
• MatrixContainer gives its details at level 3 not 0 or 1.
• BondGraph does not tell about each look at its bond length table.
• getDipole() does not shout out each dipole vector.

File:

• src/Fragmentation/MatrixContainer.cpp (modified) (14 diffs)

src/Fragmentation/MatrixContainer.cpp

@@ -57 +57 @@
 {
   if (_container == NULL) {
-    LOG(0, "Initialising indices with trivial mapping.");
+    LOG(3, "INFO: Initialising indices with trivial mapping.");
     Indices.resize(MatrixCounter + 1);
     for(int i=MatrixCounter+1;i--;) {
@@ -78 +78 @@
       }
     }
-    LOG(0, "Initialising indices from other MatrixContainer: " << output.str());
+    LOG(3, "INFO: Initialising indices from other MatrixContainer: " << output.str());
   }
   return true;
@@ -118 +118 @@
   for(int k=skipcolumns;k--;)
     line >> Header[MatrixNr];
-  LOG(0, line.str());
+  LOG(3, "INFO: Header of Matrix " << MatrixNr << " :" << line.str());
 
   // scan header for number of columns
@@ -128 +128 @@
       ColumnCounter[MatrixNr]++;
   }
-  LOG(0, line.str());
-  LOG(1, "ColumnCounter[" << MatrixNr << "]: " << ColumnCounter[MatrixNr] << ".");
+  LOG(3, "INFO: "+line.str());
+  LOG(4, "INFO: ColumnCounter[" << MatrixNr << "]: " << ColumnCounter[MatrixNr] << ".");
   if (ColumnCounter[MatrixNr] == 0) {
     ELOG(0, "ColumnCounter[" << MatrixNr << "]: " << ColumnCounter[MatrixNr] << " from ostream.");
@@ -141 +141 @@
   while (!input.eof()) {
     input.getline(filename, 1023);
-    LOG(0, "Comparing: " << strncmp(filename,"MeanForce",9));
+    LOG(3, "INFO: Comparing: " << strncmp(filename,"MeanForce",9));
     RowCounter[MatrixNr]++; // then line was not last MeanForce
     if (strncmp(filename,"MeanForce", 9) == 0) {
@@ -147 +147 @@
     }
   }
-  LOG(1, "RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from input stream.");
+  LOG(4, "INFO: RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from input stream.");
   if (RowCounter[MatrixNr] == 0) {
-    ELOG(0, "RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from input stream.");
+    ELOG(0, "INFO: RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from input stream.");
     performCriticalExit();
   }
@@ -176 +176 @@
     input.getline(dummy, 1023);    // skip header
   line.str(dummy);
-  LOG(0, "Header: " << line.str());
+  LOG(3, "INFO: Header: " << line.str());
   for(int k=skipcolumns;k--;)  // skip columns in header too
     line >> filename;
@@ -191 +191 @@
       output << " " << std::setprecision(2) << Matrix[MatrixNr][j][k] << endl;
     }
-    LOG(1, output.str());
+    LOG(3, output.str());
   }
 
@@ -228 +228 @@
   input.open(file.str().c_str(), ios::in);
   if (input.bad()) {
-    LOG(0, endl << "MatrixContainer::ParseFragmentMatrix: Unable to open " << file.str() << ", is the directory correct?");
+    ELOG(1, "MatrixContainer::ParseFragmentMatrix: Unable to open " << file.str() << ", is the directory correct?");
     return false;
   }
@@ -237 +237 @@
   }
   input.close();
-  LOG(0, "Determined " << MatrixCounter << " fragments.");
-
-  LOG(0, "Parsing through each fragment and retrieving " << prefix << suffix << ".");
+  LOG(2, "INFO: Determined " << MatrixCounter << " fragments.");
+
+  LOG(1, "STATUS: Parsing through each fragment and retrieving " << prefix << suffix << ".");
   Header.clear();
   Matrix.clear();
@@ -254 +254 @@
     file << name << FRAGMENTPREFIX << FragmentNumber << prefix << suffix;
     std::ifstream input(file.str().c_str());
-    LOG(1, "INFO: Opening " << file.str() << " ... ");
+    LOG(2, "INFO: Opening " << file.str() << " ... ");
     if (!ParseMatrix(input, skiplines, skipcolumns, i)) {
       input.close();
@@ -430 +430 @@
   char *FragmentNumber = NULL;
 
-  LOG(0, "Writing fragment files.");
+  LOG(1, "STATUS: Writing fragment files.");
   for(int i=0;i<MatrixCounter;i++) {
     stringstream line;
@@ -464 +464 @@
   stringstream line;
 
-  LOG(0, "Writing matrix values of " << suffix << ".");
+  LOG(1, "STATUS: Writing matrix values of " << suffix << ".");
   line << name << prefix << suffix;
   output.open(line.str().c_str(), ios::out);
@@ -513 +513 @@
 {
   for (int i=0;i<=m.MatrixCounter;++i) {
-    ost << "Printing matrix " << i << ":" << std::endl;
+    ost << "Matrix " << i << " in MatrixContainer:" << std::endl;
     for (int j=0;j<=m.RowCounter[i];++j) {
       for (int k=0;k<m.ColumnCounter[i];++k) {