Changeset b75386 for src/LinkedCell

Timestamp:

Jan 4, 2012, 2:28:41 PM (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:

c9cafa

Parents:

57a770

git-author:

Frederik Heber <heber@…> (01/03/12 16:22:59)

git-committer:

Frederik Heber <heber@…> (01/04/12 14:28:41)

Message:

Verbosity fixes to LinkedCell_Model and _View.

Location:

src/LinkedCell

Files:

• LinkedCell_Model.cpp (modified) (2 diffs)
• LinkedCell_View.cpp (modified) (4 diffs)

src/LinkedCell/LinkedCell_Model.cpp

@@ -150 +150 @@
   ASSERT(getSize(0)*getSize(1)*getSize(2) < MAX_LINKEDCELLNODES,
       "LinkedCell_Model::AllocateCells() - Number linked of linked cell nodes exceeded hard-coded limit, use greater edge length!");
+  LOG(1, "INFO: Allocating array ("
+      << getSize(0) << ","
+      << getSize(1) << ","
+      << getSize(2) << ") for a new LinkedCell_Model.");
 
   // allocate LinkedCell instances
@@ -221 +225 @@
   RealSpaceMatrix output = Minv * neighborhood;
 
-  std::cout << Minv << " * " << neighborhood << " = " << output << std::endl;
+  //std::cout << Minv << " * " << neighborhood << " = " << output << std::endl;
 
   Dimensions = output.invert();
   Partition = Minv*Dimensions; //
 
-  std::cout << "Dimensions are then " << Dimensions << std::endl;
-  std::cout << "Partition matrix is then " << Partition << std::endl;
+  //std::cout << "Dimensions are then " << Dimensions << std::endl;
+  //std::cout << "Partition matrix is then " << Partition << std::endl;
 }
 

src/LinkedCell/LinkedCell_View.cpp

@@ -53 +53 @@
   ASSERT( inserter.second,
       "LinkedCell_View::LinkedCell_View() - we "+toString(this)+" are already present in RAIIMap.");
-  LOG(1, "INFO: Placing instance "+toString(this)+" into RAIIMap.");
+  LOG(3, "INFO: Placing instance "+toString(this)+" into RAIIMap.");
 }
 
@@ -71 +71 @@
     ASSERT( inserter.second,
         "LinkedCell_View::LinkedCell_View(&view) - we "+toString(this)+" are already present in RAIIMap.");
-    LOG(1, "INFO: Placing instance "+toString(this)+" copied from "+toString(&_view)+" into RAIIMap.");
+    LOG(3, "INFO: Placing instance "+toString(this)+" copied from "+toString(&_view)+" into RAIIMap.");
   }
 }
@@ -87 +87 @@
   if (iter != RAIIMap.end()) {
     RAIIMap.erase(iter);
-    LOG(1, "INFO: Removing instance "+toString(this)+" from RAIIMap.");
+    LOG(3, "INFO: Removing instance "+toString(this)+" from RAIIMap.");
   } else {
     ELOG(1, "Failed to remove instance "+toString(this)+" from RAIIMap.");
@@ -121 +121 @@
           LCmodel->applyBoundaryConditions(absolute_n);
         const LinkedCell &List = LCmodel->getCell(absolute_n);
-        LOG(1, "Current cell is " << neighbors.first << " plus " << n << ", yielding " << absolute_n << ".");
+        LOG(3, "INFO: Current cell is " << neighbors.first << " plus " << n << ", yielding " << absolute_n << ".");
         for (LinkedCell::const_iterator Runner = List.begin(); Runner != List.end(); Runner++)
           TesselList.push_back(*Runner);