Changeset 5eb05a

Timestamp:

May 26, 2008, 10:52:00 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

71dc4e

Parents:

ccd028

Message:

molecule::CreateAdjacencyList() now needs IsAngstroem as parameter

This is necessary, as the database values (covalent radii et al) are in Angstroem, hence don't match if we use Bohrradii as length unit instead. CreateAdjacencyList() converts units and now finds correct bond structure and fragments properly.

Location:

molecuilder/src

Files:

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

molecuilder/src/builder.cpp

@@ -931 +931 @@
                 cout << Verbose(0) << "Creating connection matrix..." << endl;
                 start = clock();
-                mol->CreateAdjacencyList((ofstream *)&cout, atof(argv[argptr++]));
+                mol->CreateAdjacencyList((ofstream *)&cout, atof(argv[argptr++]), configuration.GetIsAngstroem());
                 cout << Verbose(0) << "Fragmenting molecule with current connection matrix ..." << endl;
                 if (mol->first->next != mol->last) {
@@ -1116 +1116 @@
           }
           if (mol->first->next != mol->last) // if connect matrix is present already, redo it
-            mol->CreateAdjacencyList((ofstream *)&cout, mol->BondDistance);
+            mol->CreateAdjacencyList((ofstream *)&cout, mol->BondDistance, configuration.GetIsAngstroem());
           // free memory
           delete[](Elements);
@@ -1159 +1159 @@
         cin >> tmp1;
         start = clock();
-        mol->CreateAdjacencyList((ofstream *)&cout, tmp1);
+        mol->CreateAdjacencyList((ofstream *)&cout, tmp1, configuration.GetIsAngstroem());
         //mol->CreateListOfBondsPerAtom((ofstream *)&cout);
         Subgraphs = mol->DepthFirstSearchAnalysis((ofstream *)&cout, false, MinimumRingSize);

molecuilder/src/molecules.cpp

@@ -1318 +1318 @@
  * \param *out out stream for printing the matrix, NULL if no output
  * \param bonddistance length of linked cells (i.e. maximum minimal length checked)
- */
-void molecule::CreateAdjacencyList(ofstream *out, double bonddistance)
+ * \param IsAngstroem whether coordinate system is gauged to Angstroem or Bohr radii
+ */
+void molecule::CreateAdjacencyList(ofstream *out, double bonddistance, bool IsAngstroem)
 {
   atom *Walker = NULL, *OtherWalker = NULL;
@@ -1329 +1330 @@
   vector x;
  
-  BondDistance = bonddistance;
+  BondDistance = bonddistance; // * ((IsAngstroem) ? 1. : 1./AtomicLengthToAngstroem);
   *out << Verbose(0) << "Begin of CreateAdjacencyList." << endl;
   // remove every bond from the list
@@ -1407 +1408 @@
                         /// \todo periodic check is missing here!
                         //*out << Verbose(1) << "Checking distance " << OtherWalker->x.PeriodicDistance(&(Walker->x), cell_size) << " against typical bond length of " << bonddistance*bonddistance << "." << endl;
-                        MinDistance = OtherWalker->type->CovalentRadius + Walker->type->CovalentRadius;  
+                        MinDistance = OtherWalker->type->CovalentRadius + Walker->type->CovalentRadius;
+                        MinDistance *= (IsAngstroem) ? 1. : 1./AtomicLengthToAngstroem;
                         MaxDistance = MinDistance + BONDTHRESHOLD;
                         MinDistance -= BONDTHRESHOLD;
@@ -1414 +1416 @@
                           *out << Verbose(0) << "Adding Bond between " << *Walker << " and " << *OtherWalker << "." << endl;
                           AddBond(Walker->father, OtherWalker->father, 1);  // also increases molecule::BondCount
+                          BondCount++;
                         } else {
                           //*out << Verbose(1) << "Not Adding: Wrong label order or distance too great." << endl;
@@ -1428 +1431 @@
         delete(CellList[i]);
       }
-    Free((void **)&CellList, "molecule::CreateAdjacencyList - ** CellList"); 
-  
+    Free((void **)&CellList, "molecule::CreateAdjacencyList - ** CellList");
+    
     // create the adjacency list per atom
     CreateListOfBondsPerAtom(out);

molecuilder/src/molecules.hpp

@@ -279 +279 @@
 
   /// Initialising routines in fragmentation  
-  void CreateAdjacencyList(ofstream *out, double bonddistance);
+  void CreateAdjacencyList(ofstream *out, double bonddistance, bool IsAngstroem);
   void CreateListOfBondsPerAtom(ofstream *out);