Changeset 5a4cbc

Timestamp:

Mar 30, 2012, 9:18:25 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:

345eda

Parents:

a88452

git-author:

Frederik Heber <heber@…> (03/01/12 16:40:31)

git-committer:

Frederik Heber <heber@…> (03/30/12 09:18:25)

Message:

VERBOSITY: Increased verbosity threshold of some outputs connected to FillRegularGridAction.

Location:

src

Files:

• Actions/FillAction/FillRegularGridAction.cpp (modified) (3 diffs)
• Filling/Filler.cpp (modified) (2 diffs)
• Filling/Predicates/IsVoidNode_FillPredicate.cpp (modified) (2 diffs)
• IdPool_impl.hpp (modified) (1 diff)
• Tesselation/boundary.cpp (modified) (1 diff)

src/Actions/FillAction/FillRegularGridAction.cpp

@@ -59 +59 @@
   // get selected atoms and find containing sphere
   World::AtomComposite atoms = World::getInstance().getSelectedAtoms();
+  if (atoms.size() == 0) {
+    ELOG(2, "No atoms selected, aborting,");
+    return Action::failure;
+  }
+
   Vector center;
   double radius = 0.;
@@ -90 +95 @@
   radius += 1e+6*std::numeric_limits<double>::epsilon();
   radius = std::max(params.mindistance, radius);
-  LOG(1, "INFO: The " << atoms.size() << " are contained in a sphere at "
+  LOG(2, "INFO: The " << atoms.size() << " are contained in a sphere at "
       << center << " with radius " << radius << ".");
   Shape *s = new Shape(Sphere(zeroVec, radius));
-  LOG(1, "INFO: Created sphere at " << s->getCenter() << " and radius " << s->getRadius() << ".");
+  LOG(2, "INFO: Created sphere at " << s->getCenter() << " and radius " << s->getRadius() << ".");
 
   // create set of atomic ids
@@ -100 +105 @@
       boost::bind(&atom::getId, _1) );
   Cluster::atomIdSet atomset(atomIds.begin(), atomIds.end());
-  LOG(1, "INFO: Created atomset of size " << atomset.size() << ".");
+  LOG(2, "INFO: Created atomset of size " << atomset.size() << ".");
 
   // create cluster
   ClusterInterface::Cluster_impl cluster(new Cluster(atomset, *s));
-  LOG(1, "INFO: Created cluster of size " << atomset.size() << ".");
+  LOG(2, "INFO: Created cluster of size " << atomset.size() << ".");
 
   // create predicate, mesh, and filler

src/Filling/Filler.cpp

@@ -75 +75 @@
   std::stringstream output;
   std::for_each( nodes.begin(), nodes.end(), output << boost::lambda::_1 << " ");
-  LOG(1, "INFO: Listing nodes to check: " << output.str());
+  LOG(3, "DEBUG: Listing nodes to check: " << output.str());
   if (nodes.size() == 0) {
     ASSERT(false,
@@ -89 +89 @@
 
   if (FillNodes.size() == 0) {
-    LOG(1, "INFO: For none of the nodes did the predicate return true.");
+    ELOG(2, "For none of the nodes did the predicate return true.");
     return;
+  } else {
+    LOG(1, "INFO: " << FillNodes.size() << " out of " << nodes.size() << " returned true from predicate.");
   }
 

src/Filling/Predicates/IsVoidNode_FillPredicate.cpp

@@ -46 +46 @@
 bool IsVoidNode(const LinkedCell::LinkedCell_View &LC, const Shape &shape, const Node &n)
 {
-  LOG(1, "INFO: Node is " << n << ".");
-  LOG(1, "INFO: Original shape is at " << shape.getCenter() << " with radius of "
+  LOG(3, "DEBUG: Node is " << n << ".");
+  LOG(3, "DEBUG: Original shape is at " << shape.getCenter() << " with radius of "
       << shape.getRadius() << ".");
   const Shape shapeAtn = translate(shape, n);
-  LOG(1, "INFO: Translated shape is at " << shapeAtn.getCenter() << ".");
+  LOG(3, "DEBUG: Translated shape is at " << shapeAtn.getCenter() << ".");
   LinkedCell::LinkedList neighborlist = LC.getAllNeighbors(
       shapeAtn.getRadius(), shapeAtn.getCenter());
-  LOG(1, "INFO: we have " << neighborlist.size() << " possible neighbors.");
+  LOG(3, "DEBUG: we have " << neighborlist.size() << " possible neighbors.");
   LinkedCell::LinkedList::const_iterator neighboriter =
       std::find_if(neighborlist.begin(), neighborlist.end(),
@@ -66 +66 @@
   const LinkedCell::LinkedCell_View LC = World::getInstance().getLinkedCell(_shape.getRadius());
   AnyFillPredicate::FillPredicator function = boost::bind(&IsVoidNode, LC, _shape, _1);
-  LOG(1, "INFO: Create IsVoidNode_FillPredicate from shape at "
+  LOG(2, "DEBUG: Create IsVoidNode_FillPredicate from shape at "
       << _shape.getCenter() << " and radius " << _shape.getRadius() << ".");
   FillPredicate::impl_ptr impl(new AnyFillPredicate(function));

src/IdPool_impl.hpp

@@ -96 +96 @@
     return;
   }
-  LOG(1, "STATUS: Defragmenting id pool.");
+  LOG(3, "DEBUG: Defragmenting id pool.");
   for(typename IdPool_t::iterator iter = pool.begin();iter!=pool.end();) {
     // see if this range is adjacent to the next one

src/Tesselation/boundary.cpp

@@ -1029 +1029 @@
   for (int i=0;i<NDIM;i++) {
     phi[i] = (random()/(rng_max-rng_min))*(2.*M_PI);
-    std::cout << "Random angle is " << phi[i] << std::endl;
+    LOG(4, "DEBUG: Random angle is " << phi[i] << ".");
   }