Changeset 8d9d38 for molecuilder/src/builder.cpp

Timestamp:

Feb 25, 2010, 4:43:02 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

3db67e

Parents:

2e6496

Message:

Made the world solely responsible for creating and erasing molecules.

File:

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

molecuilder/src/builder.cpp

@@ -1432 +1432 @@
      }
      if (mol == NULL) {
-       mol = new molecule(periode);
+       mol = World::get()->createMolecule();
        mol->ActiveFlag = true;
        if (ConfigFileName != NULL)
@@ -1634 +1634 @@
                 Log() << Verbose(1) << "Filling Box with water molecules." << endl;
                 // construct water molecule
-                molecule *filler = new molecule(periode);
+                molecule *filler = World::get()->createMolecule();
                 molecule *Filling = NULL;
                 atom *second = NULL, *third = NULL;
@@ -1664 +1664 @@
                   molecules->insert(Filling);
                 }
-                delete(filler);
+                World::get()->destroyMolecule(filler);
                 argptr+=6;
               }
@@ -2203 +2203 @@
     if(World::get()->numMolecules() == 0){
         mol = World::get()->createMolecule();
+        World::get()->getMolecules()->insert(mol);
+        cout << "Molecule created" << endl;
         if(mol->cell_size[0] == 0.){
             Log() << Verbose(0) << "enter lower tridiagonal form of basis matrix" << endl << endl;