Changeset dc5413 for molecuilder/src/molecule_dynamics.cpp

Timestamp:

Feb 26, 2010, 1:57:01 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

78b9d9, d50264

Parents:

e65cc0 (diff), 45cc89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FreddiesRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Patterns/Observer.cpp
molecuilder/src/World.cpp
molecuilder/src/boundary.cpp
molecuilder/src/molecule_dynamics.cpp
molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/AnalysisPairCorrelationUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/listofbondsunittest.cpp

File:

• molecuilder/src/molecule_dynamics.cpp (modified) (1 diff)

molecuilder/src/molecule_dynamics.cpp

@@ -163 +163 @@
 double molecule::ConstrainedPotential(struct EvaluatePotential &Params)
 {
-  double tmp, result=0;
-
+  double tmp = 0.;
+  double result = 0.;
   // go through every atom
   atom *Runner = NULL;