Changeset b2ae3b for src

Timestamp:

Jan 15, 2011, 3:32:15 PM (14 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:

e5bf2b

Parents:

dd88cb

git-author:

Frederik Heber <heber@…> (01/04/11 12:14:59)

git-committer:

Frederik Heber <heber@…> (01/15/11 15:32:15)

Message:

Removed smaller warning, mostly due to NDEBUG.

• ASSERTs are not compiled in with NDEBUG but some stuff is assigned before and then checked within the ASSERT. If NDEBUG, the compiler will issue a warning because of unused variable. These have been excluded by a #ifndef NDEBUG,#endif block.

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/OptionRegistry.cpp (modified) (1 diff)
• Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp (modified) (1 diff)
• periodentafel.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -63 +63 @@
       OptionRegistry::getInstance().registerInstance(optioniter->second);
     } else { // if present, ASSERT that types coincide
+#ifndef NDEBUG
       OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
+#endif
       ASSERT(PresentOption->getType() == optioniter->second->getType(),
           ("Action::Action() - option to add "+

src/Actions/OptionRegistry.cpp

@@ -88 +88 @@
         optioniter != (actioniter->second)->Traits.getEndIter();
         ++optioniter) {
+#ifndef NDEBUG
       std::string const &OptionName = optioniter->first;
       std::type_info const &typeDesired = *((actioniter->second)->Traits.getOption(OptionName).getType());
+      std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
+#endif
       ASSERT( isOptionPresentByName(OptionName),
-          "ConsistencyCheck() - option token not contained in OptionRegistry");
-      std::type_info const &typePresent = *(getOptionByName(OptionName)->getType());
+          "ConsistencyCheck() - option token "+OptionName+" not contained in OptionRegistry");
       ASSERT( typeDesired == typePresent,
-          "ConsistencyCheck() - Two options with same token do not have the same type!");
+          "ConsistencyCheck() - Two options -- "+toString(typeDesired.name())
+          +" and "+toString(typePresent.name())+" -- with same token do not have the same type!");
     }
   }

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp

@@ -61 +61 @@
 
 Action::state_ptr SelectionAllAtomsOfMoleculeAction::performRedo(Action::state_ptr _state){
-  SelectionAllAtomsOfMoleculeState *state = assert_cast<SelectionAllAtomsOfMoleculeState*>(_state.get());
+  //SelectionAllAtomsOfMoleculeState *state = assert_cast<SelectionAllAtomsOfMoleculeState*>(_state.get());
 
   World::getInstance().selectAllAtoms(AtomsByMoleculeSelection());

src/periodentafel.cpp

@@ -44 +44 @@
   {
     stringstream input(elementsDB,ios_base::in);
-    bool status = LoadElementsDatabase(input);
+#ifndef NDEBUG
+    bool status =
+#endif
+        LoadElementsDatabase(input);
     ASSERT(status,  "General element initialization failed");
   }
   {
     stringstream input(valenceDB,ios_base::in);
-    bool status = LoadValenceDatabase(&input);
+#ifndef NDEBUG
+    bool status =
+#endif
+        LoadValenceDatabase(&input);
     ASSERT(status, "Valence entry of element initialization failed");
   }
   {
     stringstream input(orbitalsDB,ios_base::in);
-    bool status = LoadOrbitalsDatabase(&input);
+#ifndef NDEBUG
+    bool status =
+#endif
+        LoadOrbitalsDatabase(&input);
     ASSERT(status, "Orbitals entry of element initialization failed");
   }
   {
     stringstream input(HbondangleDB,ios_base::in);
-    bool status = LoadHBondAngleDatabase(&input);
+#ifndef NDEBUG
+    bool status =
+#endif
+        LoadHBondAngleDatabase(&input);
     ASSERT(status, "HBond angle entry of element initialization failed");
   }
   {
     stringstream input(HbonddistanceDB,ios_base::in);
-    bool status = LoadHBondLengthsDatabase(&input);
+#ifndef NDEBUG
+    bool status =
+#endif
+        LoadHBondLengthsDatabase(&input);
     ASSERT(status, "HBond distance entry of element initialization failed");
   }