Changeset d473c3

Timestamp:

Sep 6, 2008, 3:08:32 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

b21e1f

Parents:

f9cd68

Message:

BUGFIX: config::SaveMPQC() used molecule::DetermineCenter() which relies on the created bond structure, causing segfault.

When storing a newly created configuration file, the bond structure needs not be present yet. Hence, we created the function molecule:DetermineCenterOfAll(), similar to molecule::DetermineCenterOfGravity() just without scaling by masses. This new function is now used instead.

Location:

molecuilder/src

Files:

• config.cpp (modified) (3 diffs)
• molecules.cpp (modified) (1 diff)
• molecules.hpp (modified) (1 diff)

molecuilder/src/config.cpp

@@ -1072 +1072 @@
 bool config::SaveMPQC(ofstream *output, molecule *mol) const
 {
-  int ElementNo;
+  int ElementNo = 0;
   int AtomNo;
   atom *Walker = NULL;
-  element *runner;
-  Vector center;
+  element *runner = mol->elemente->start;
+  Vector *center = NULL;
 
   *output << "% Created by MoleCuilder" << endl;
@@ -1086 +1086 @@
   *output << "\t\t\tunit = " << (IsAngstroem ? "angstrom" : "bohr" ) << endl;
   *output << "\t\t\t{ atoms geometry } = {" << endl;
-  mol->DetermineCenter(center);
+  center = mol->DetermineCenterOfAll(output);
   // output of atoms
-  ElementNo = 0;
-  runner = mol->elemente->start;
   while (runner->next != mol->elemente->end) { // go through every element
     runner = runner->next;
@@ -1100 +1098 @@
         if (Walker->type == runner) { // if this atom fits to element
           AtomNo++;
-          *output << "\t\t\t\t" << Walker->type->symbol << " [ " << Walker->x.x[0]-center.x[0] << "\t" << Walker->x.x[1]-center.x[1] << "\t" << Walker->x.x[2]-center.x[2] << " ]" << endl;
+          *output << "\t\t\t\t" << Walker->type->symbol << " [ " << Walker->x.x[0]-center->x[0] << "\t" << Walker->x.x[1]-center->x[1] << "\t" << Walker->x.x[2]-center->x[2] << " ]" << endl;
         }
       }
     }
   }
+  delete(center);
   *output << "\t\t\t}" << endl;
   *output << "\t\t)" << endl;

molecuilder/src/molecules.cpp

@@ -720 +720 @@
   }
 }; 
+
+/** Returns vector pointing to center of gravity.
+ * \param *out output stream for debugging
+ * \return pointer to center of gravity vector
+ */
+Vector * molecule::DetermineCenterOfAll(ofstream *out)
+{
+  atom *ptr = start->next;  // start at first in list
+  Vector *a = new Vector();
+  Vector tmp;
+  double Num = 0;
+  
+  a->Zero();
+
+  if (ptr != end) {   //list not empty?
+    while (ptr->next != end) {  // continue with second if present
+      ptr = ptr->next;
+      Num += 1.;
+      tmp.CopyVector(&ptr->x);
+      a->AddVector(&tmp);       
+    }
+    a->Scale(-1./Num); // divide through total mass (and sign for direction)
+  }
+  //cout << Verbose(1) << "Resulting center of gravity: ";
+  //a->Output(out);
+  //cout << endl;
+  return a;
+};
 
 /** Returns vector pointing to center of gravity.

molecuilder/src/molecules.hpp

@@ -253 +253 @@
   void DetermineCenter(Vector &center);
   Vector * DetermineCenterOfGravity(ofstream *out);
+  Vector * DetermineCenterOfAll(ofstream *out);
   void SetBoxDimension(Vector *dim);
   double * ReturnFullMatrixforSymmetric(double *cell_size);