Changeset c5f836

Timestamp:

Nov 23, 2009, 7:09:42 PM (15 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:

6a7f78c, 85bc8e

Parents:

e359a8

Message:

bugfix to errorLogger and some error verbosity changes.

• BUGFIX: errorLogger::operator << would first give the message, then the prefix and most of them to cout instead of cerr
• GetCenterofCircumcircle() did break if sum of angles was > 180 which is unnecessary.
• config::Load() - bond length table loading is now an error

Location:

src

Files:

• config.cpp (modified) (1 diff)
• errorlogger.cpp (modified) (2 diffs)
• tesselationhelpers.cpp (modified) (1 diff)

src/config.cpp

@@ -1060 +1060 @@
     Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
   } else {
-    Log() << Verbose(0) << "Bond length table loading failed." << endl;
+    eLog() << Verbose(1) << "Bond length table loading failed." << endl;
   }
 

src/errorlogger.cpp

@@ -82 +82 @@
   l.nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cout << "CRITICAL: ";
+        cerr << "CRITICAL: ";
         break;
       case 1:
-        cout << "ERROR: ";
+        cerr << "ERROR: ";
         break;
       case 2:
-        cout << "WARNING: ";
+        cerr << "WARNING: ";
         break;
       default:
         break;
     }
+    v.print(cerr);
     return cerr;
   } else
@@ -105 +105 @@
   l->nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cout << "CRITICAL: ";
+        cerr << "CRITICAL: ";
         break;
       case 1:
-        cout << "ERROR: ";
+        cerr << "ERROR: ";
         break;
       case 2:
-        cout << "WARNING: ";
+        cerr << "WARNING: ";
         break;
       default:
         break;
     }
+    v.print(cerr);
     return cerr;
   } else

src/tesselationhelpers.cpp

@@ -188 +188 @@
   //Log() << Verbose(3) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
   if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON) {
-    eLog() << Verbose(0) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
-    performCriticalExit();
+    eLog() << Verbose(1) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
   }