Changeset 717e0c for src/boundary.cpp


Ignore:
Timestamp:
Nov 23, 2009, 6:22:33 PM (16 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, Candidate_v1.7.0, 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:
e359a8
Parents:
f1ef60a
Message:

Verbosity corrected for ERROR and WARNING

  • present ERROR and WARNING prefixes removed and placed by eLog() and respective Verbosity().
  • -v... is scanned for number of 'v's and verbosity is set accordingly
  • standard verbosity is now 0.

Signed-off-by: Frederik Heber <heber@…>

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/boundary.cpp

    rf1ef60a r717e0c  
    176176        angle = 0.; // otherwise it's a vector in Axis Direction and unimportant for boundary issues
    177177
    178       //Log() << Verbose(0) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
     178      //Log() << Verbose(2) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
    179179      if (ProjectedVector.ScalarProduct(&AngleReferenceNormalVector) > 0) {
    180180        angle = 2. * M_PI - angle;
    … …  
    214214    //      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
    215215    //        if (runner != BoundaryPoints[axis].begin())
    216     //          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
     216    //          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
    217217    //        else
    218     //          Log() << Verbose(0) << i << ": " << *runner->second.second;
     218    //          Log() << Verbose(2) << i << ": " << *runner->second.second;
    219219    //        i++;
    220220    //      }
    221     //      Log() << Verbose(0) << endl;
     221    //      Log() << Verbose(2) << endl;
    222222    //    }
    223223    // 3c. throw out points whose distance is less than the mean of left and right neighbours
    … …  
    249249          SideA.SubtractVector(MolCenter);
    250250          SideA.ProjectOntoPlane(&AxisVector);
    251           //          Log() << Verbose(0) << "SideA: ";
    252           //          SideA.Output(out);
    253           //          Log() << Verbose(0) << endl;
     251          //          Log() << Verbose(0) << "SideA: " << SideA << endl;
    254252
    255253          SideB.CopyVector(&right->second.second->x);
    256254          SideB.SubtractVector(MolCenter);
    257255          SideB.ProjectOntoPlane(&AxisVector);
    258           //          Log() << Verbose(0) << "SideB: ";
    259           //          SideB.Output(out);
    260           //          Log() << Verbose(0) << endl;
     256          //          Log() << Verbose(0) << "SideB: " << SideB << endl;
    261257
    262258          SideC.CopyVector(&left->second.second->x);
    263259          SideC.SubtractVector(&right->second.second->x);
    264260          SideC.ProjectOntoPlane(&AxisVector);
    265           //          Log() << Verbose(0) << "SideC: ";
    266           //          SideC.Output(out);
    267           //          Log() << Verbose(0) << endl;
     261          //          Log() << Verbose(0) << "SideC: " << SideC << endl;
    268262
    269263          SideH.CopyVector(&runner->second.second->x);
    270264          SideH.SubtractVector(MolCenter);
    271265          SideH.ProjectOntoPlane(&AxisVector);
    272           //          Log() << Verbose(0) << "SideH: ";
    273           //          SideH.Output(out);
    274           //          Log() << Verbose(0) << endl;
     266          //          Log() << Verbose(0) << "SideH: " << SideH << endl;
    275267
    276268          // calculate each length
    … …  
    335327      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
    336328        if (runner != BoundaryPoints[axis].begin())
    337           Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
     329          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
    338330        else
    339           Log() << Verbose(0) << i << ": " << *runner->second.second;
     331          Log() << Verbose(2) << i << ": " << *runner->second.second;
    340332        i++;
    341333      }
    342       Log() << Verbose(0) << endl;
     334      Log() << Verbose(2) << endl;
    343335    }
    344336
    … …  
    347339    for (Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++)
    348340        if (!TesselStruct->AddBoundaryPoint(runner->second.second, 0))
    349           Log() << Verbose(3) << "WARNING: Point " << *(runner->second.second) << " is already present!" << endl;
     341          eLog() << Verbose(2) << "Point " << *(runner->second.second) << " is already present!" << endl;
    350342
    351343  Log() << Verbose(2) << "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary." << endl;
    … …  
    355347  //  Log() << Verbose(1) << "Listing PointsOnBoundary:";
    356348  //  for(PointMap::iterator runner = PointsOnBoundary.begin(); runner != PointsOnBoundary.end(); runner++) {
    357   //    Log() << Verbose(0) << " " << *runner->second;
     349  //    Log() << Verbose(1) << " " << *runner->second;
    358350  //  }
    359   //  Log() << Verbose(0) << endl;
     351  //  Log() << Verbose(1) << endl;
    360352
    361353  // 3a. guess starting triangle
    … …  
    406398        // flip the line
    407399        if (TesselStruct->PickFarthestofTwoBaselines(line) == 0.)
    408           Log() << Verbose(1) << "ERROR: Correction of concave baselines failed!" << endl;
     400          eLog() << Verbose(1) << "Correction of concave baselines failed!" << endl;
    409401        else {
    410402          TesselStruct->FlipBaseline(line);
    … …  
    462454
    463455  if ((TesselStruct == NULL) || (TesselStruct->PointsOnBoundary.empty())) {
    464     Log() << Verbose(2) << "ERROR: TesselStruct is empty." << endl;
     456    eLog() << Verbose(1) << "TesselStruct is empty." << endl;
    465457    return false;
    466458  }
    … …  
    470462    Log() << Verbose(2) << "Remaining points are: ";
    471463    for (PointMap::iterator PointSprinter = TesselStruct->PointsOnBoundary.begin(); PointSprinter != TesselStruct->PointsOnBoundary.end(); PointSprinter++)
    472       Log() << Verbose(0) << *(PointSprinter->second) << "\t";
    473     Log() << Verbose(0) << endl;
     464      Log() << Verbose(2) << *(PointSprinter->second) << "\t";
     465    Log() << Verbose(2) << endl;
    474466
    475467    PointRunner = TesselStruct->PointsOnBoundary.begin();
    … …  
    528520  // check whether there is something to work on
    529521  if (TesselStruct == NULL) {
    530     Log() << Verbose(1) << "ERROR: TesselStruct is empty!" << endl;
     522    eLog() << Verbose(1) << "TesselStruct is empty!" << endl;
    531523    return volume;
    532524  }
    … …  
    756748  Log() << Verbose(1) << "Minimum volume of the convex envelope contained in a rectangular box is " << minimumvolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl;
    757749  if (minimumvolume > cellvolume) {
    758     eLog() << Verbose(0) << "ERROR: the containing box already has a greater volume than the envisaged cell volume!" << endl;
     750    eLog() << Verbose(1) << "the containing box already has a greater volume than the envisaged cell volume!" << endl;
    759751    Log() << Verbose(0) << "Setting Box dimensions to minimum possible, the greatest diameters." << endl;
    760752    for (int i = 0; i < NDIM; i++)
    … …  
    849841  for(int i=0;i<NDIM;i++) {
    850842    N[i] = (int) ceil(1./FillerDistance.x[i]);
    851     Log() << Verbose(0) << N[i];
     843    Log() << Verbose(1) << N[i];
    852844    if (i != NDIM-1)
    853       Log() << Verbose(0)<< ", ";
     845      Log() << Verbose(1)<< ", ";
    854846    else
    855       Log() << Verbose(0) << "." << endl;
     847      Log() << Verbose(1) << "." << endl;
    856848  }
    857849
    … …  
    870862          // get linked cell list
    871863          if (TesselStruct[i] == NULL) {
    872             Log() << Verbose(1) << "ERROR: TesselStruct of " << (*ListRunner) << " is NULL. Didn't we pre-create it?" << endl;
     864            eLog() << Verbose(1) << "TesselStruct of " << (*ListRunner) << " is NULL. Didn't we pre-create it?" << endl;
    873865            FillIt = false;
    874866          } else {
    … …  
    10151007      //Log() << Verbose(1) << "Line " << *baseline->second << " has " << baseline->second->triangles.size() << " triangles adjacent" << endl;
    10161008      if (baseline->second->triangles.size() != 2)
    1017         eLog() << Verbose(1) << "TESSELATION FINISHED WITH INVALID TRIANGLE COUNT!" << endl;
     1009        eLog() << Verbose(0) << "TESSELATION FINISHED WITH INVALID TRIANGLE COUNT!" << endl;
    10181010    }
    10191011
Note: See TracChangeset for help on using the changeset viewer.