Changeset 9eb71b3 for src/Potentials/Specifics

Timestamp:

May 5, 2017, 2:08:59 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes

Children:

ac9dc8

Parents:

aa91de0

git-author:

Frederik Heber <frederik.heber@…> (05/05/17 12:22:20)

git-committer:

Frederik Heber <frederik.heber@…> (05/05/17 14:08:59)

Message:

Commented out MemDebug include and Memory::ignore.

• MemDebug clashes with various allocation operators that use a specific placement in memory. It is so far not possible to wrap new/delete fully. Hence, we stop this effort which so far has forced us to put ever more includes (with clashes) into MemDebug and thereby bloat compilation time.
• MemDebug does not add that much usefulness which is not also provided by valgrind.

Location:

src/Potentials/Specifics

Files:

• ConstantPotential.cpp (modified) (2 diffs)
• FourBodyPotential_Improper.cpp (modified) (2 diffs)
• FourBodyPotential_Torsion.cpp (modified) (2 diffs)
• ManyBodyPotential_Tersoff.cpp (modified) (2 diffs)
• PairPotential_Harmonic.cpp (modified) (2 diffs)
• PairPotential_LennardJones.cpp (modified) (2 diffs)
• PairPotential_Morse.cpp (modified) (2 diffs)
• PotentialTypes.cpp (modified) (1 diff)
• ThreeBodyPotential_Angle.cpp (modified) (2 diffs)

src/Potentials/Specifics/ConstantPotential.cpp

@@ -36 +36 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "ConstantPotential.hpp"
@@ -63 +63 @@
     ;
 const std::string ConstantPotential::potential_token("constant");
-Coordinator::ptr ConstantPotential::coordinator(Memory::ignore(new OneBody_Constant()));
+Coordinator::ptr ConstantPotential::coordinator( /* Memory::ignore( */ new OneBody_Constant() /*) */);
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/FourBodyPotential_Improper.cpp

@@ -33 +33 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "CodePatterns/Assert.hpp"
@@ -51 +51 @@
     ;
 const std::string FourBodyPotential_Improper::improper_token("improper");
-Coordinator::ptr FourBodyPotential_Improper::coordinator(Memory::ignore(new FourBody_ImproperAngle()));
+Coordinator::ptr FourBodyPotential_Improper::coordinator( /* Memory::ignore( */ new FourBody_ImproperAngle() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/FourBodyPotential_Torsion.cpp

@@ -35 +35 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "FourBodyPotential_Torsion.hpp"
@@ -64 +64 @@
     ;
 const std::string FourBodyPotential_Torsion::potential_token("torsion");
-Coordinator::ptr FourBodyPotential_Torsion::coordinator(Memory::ignore(new FourBody_TorsionAngle()));
+Coordinator::ptr FourBodyPotential_Torsion::coordinator( /* Memory::ignore( */ new FourBody_TorsionAngle() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/ManyBodyPotential_Tersoff.cpp

@@ -36 +36 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "ManyBodyPotential_Tersoff.hpp"
@@ -80 +80 @@
     ;
 const std::string ManyBodyPotential_Tersoff::potential_token("tersoff");
-Coordinator::ptr ManyBodyPotential_Tersoff::coordinator(Memory::ignore(new OneBody_Constant()));
+Coordinator::ptr ManyBodyPotential_Tersoff::coordinator( /* Memory::ignore( */ new OneBody_Constant() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/PairPotential_Harmonic.cpp

@@ -36 +36 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "PairPotential_Harmonic.hpp"
@@ -65 +65 @@
     ;
 const std::string PairPotential_Harmonic::potential_token("harmonic_bond");
-Coordinator::ptr PairPotential_Harmonic::coordinator(Memory::ignore(new TwoBody_Length()));
+Coordinator::ptr PairPotential_Harmonic::coordinator( /* Memory::ignore( */ new TwoBody_Length() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/PairPotential_LennardJones.cpp

@@ -35 +35 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "PairPotential_LennardJones.hpp"
@@ -65 +65 @@
     ;
 const std::string PairPotential_LennardJones::potential_token("lennardjones");
-Coordinator::ptr PairPotential_LennardJones::coordinator(Memory::ignore(new TwoBody_Length()));
+Coordinator::ptr PairPotential_LennardJones::coordinator( /* Memory::ignore( */ new TwoBody_Length() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/PairPotential_Morse.cpp

@@ -36 +36 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "PairPotential_Morse.hpp"
@@ -67 +67 @@
     ;
 const std::string PairPotential_Morse::potential_token("morse");
-Coordinator::ptr PairPotential_Morse::coordinator(Memory::ignore(new TwoBody_Length()));
+Coordinator::ptr PairPotential_Morse::coordinator( /* Memory::ignore( */ new TwoBody_Length() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)

src/Potentials/Specifics/PotentialTypes.cpp

@@ -34 +34 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp" 
+//#include "CodePatterns/MemDebug.hpp" 
   
 #include "PotentialTypes.hpp"

src/Potentials/Specifics/ThreeBodyPotential_Angle.cpp

@@ -36 +36 @@
 #endif
 
-#include "CodePatterns/MemDebug.hpp"
+//#include "CodePatterns/MemDebug.hpp"
 
 #include "ThreeBodyPotential_Angle.hpp"
@@ -65 +65 @@
     ;
 const std::string ThreeBodyPotential_Angle::potential_token("harmonic_angle");
-Coordinator::ptr ThreeBodyPotential_Angle::coordinator(Memory::ignore(new ThreeBody_Angle()));
+Coordinator::ptr ThreeBodyPotential_Angle::coordinator( /* Memory::ignore( */ new ThreeBody_Angle() /* ) */ );
 
 static BindingModel generateBindingModel(const EmpiricalPotential::ParticleTypes_t &_ParticleTypes)