Changeset f23303 for src/Parser

Timestamp:

Dec 28, 2011, 3:24:58 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:

89a31d

Parents:

908dc7

git-author:

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

git-committer:

Frederik Heber <heber@…> (12/28/11 15:24:58)

Message:

Small fixes to FormatParser< tremolo >::parseKnownTypes() to give more specific error messages.

• also placed info about cleared usedFields in LOG() call.

File:

• src/Parser/TremoloParser.cpp (modified) (6 diffs)

src/Parser/TremoloParser.cpp

@@ -100 +100 @@
 FormatParser< tremolo >::~FormatParser() 
 {
-  std::cerr << "Clearing usedFields." << std::endl;
+  LOG(1, "INFO: Clearing usedFields.");
   usedFields.clear();
   additionalAtomData.clear();
@@ -118 +118 @@
   // reset atomIdMap, for we now get new serials
   atomIdMap.clear();
-        std::cerr << "Clearing usedFields." << std::endl;
+  LOG(1, "INFO: Clearing usedFields.");
   usedFields.clear();
 
@@ -349 +349 @@
 
   lineStream << line.substr(offset);
-        std::cerr << "Clearing usedFields in parseAtomDataKeysLine." << std::endl;
+  LOG(1, "INFO: Clearing usedFields in parseAtomDataKeysLine.");
   usedFields.clear();
   while (lineStream.good()) {
@@ -651 +651 @@
           ++tok_iter) {
         if ((*tok_iter).find("particle_type") != string::npos) {
-          LOG(3, "INFO: found line '" << line << "' containing keyword 'particle_type'.");
+          LOG(3, "INFO: found token '" << *tok_iter << "' containing keyword 'particle_type'.");
           tokenizer token((*tok_iter), equalitysep);
           ASSERT(token.begin() != token.end(),
@@ -660 +660 @@
         }
         if ((*tok_iter).find("element_name") != string::npos) {
-          LOG(3, "INFO: found line '" << line << "' containing keyword 'element_name'.");
+          LOG(3, "INFO: found token '" << *tok_iter << "' containing keyword 'element_name'.");
           tokenizer token((*tok_iter), equalitysep);
           ASSERT(token.begin() != token.end(),
@@ -677 +677 @@
         }
       } else {
-        ELOG(1, "INFO: Desired element " << element_type << " is not known." );
+        ELOG(3, "Line does not contain both 'particle_type' and 'element_name' as keys." );
       }
     }