Changeset d50264 for molecuilder/src/molecule_dynamics.cpp

Timestamp:

Feb 26, 2010, 2:01:57 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

db6b872

Parents:

f467c6 (diff), dc5413 (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 'StructureRefactoring' into MenuRefactoring

Conflicts:

molecuilder/src/UIElements/TextDialog.cpp

File:

• molecuilder/src/molecule_dynamics.cpp (modified) (4 diffs)

molecuilder/src/molecule_dynamics.cpp

@@ -6 +6 @@
  */
 
+#include "World.hpp"
 #include "atom.hpp"
 #include "config.hpp"
@@ -162 +163 @@
 double molecule::ConstrainedPotential(struct EvaluatePotential &Params)
 {
-  double tmp, result;
-
+  double tmp = 0.;
+  double result = 0.;
   // go through every atom
   atom *Runner = NULL;
@@ -485 +486 @@
   bool status = true;
   int MaxSteps = configuration.MaxOuterStep;
-  MoleculeListClass *MoleculePerStep = new MoleculeListClass();
+  MoleculeListClass *MoleculePerStep = new MoleculeListClass(World::get());
   // Get the Permutation Map by MinimiseConstrainedPotential
   atom **PermutationMap = NULL;
@@ -505 +506 @@
   Log() << Verbose(1) << "Filling intermediate " << MaxSteps << " steps with MDSteps of " << MDSteps << "." << endl;
   for (int step = 0; step <= MaxSteps; step++) {
-    mol = new molecule(elemente);
+    mol = World::get()->createMolecule();
     MoleculePerStep->insert(mol);
     Walker = start;