Changeset caab20 for molecuilder/src

Timestamp:

Apr 26, 2010, 4:35:42 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

326a42d

Parents:

732da7 (diff), 8758eb (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 'FixWorld_differentdefaultcell_size' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/World.cpp

Conflict has been due to added cell_size initialization.

File:

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

molecuilder/src/World.cpp

@@ -20 +20 @@
 {
   cell_size = new double[6];
+  cell_size[0] = 20.;
+  cell_size[1] = 0.;
+  cell_size[2] = 20.;
+  cell_size[3] = 0.;
+  cell_size[4] = 0.;
+  cell_size[5] = 20.;
   DefaultName = new char[MAXSTRINGSIZE];
   strcpy(DefaultName, "none");