Changeset 478683 for molecuilder/src/builder.cpp

Timestamp:

Jan 26, 2010, 12:52:31 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

8d0b25, d34341

Parents:

551a58

Message:

GetDistanceToSurface() separated, filling now with water instead of boron, DissectMoleculeIntoConnectedSubgraphs() now working on list of molecules instead of single one.

• MoleculeListClass::DissectMoleculeIntoConnectedSubgraphs() so far was working on a single molecule (given by parameter) instead of the list already contained in the list of its class.
• Tesselation::GetDistanceSquaredToSurface() is split up into function of same name, which calls finds the closest triangle and calls Tesselation::GetDistanceSquaredToTriangle() which contains the former code.
• PeriodicCorrelationToSurface() was adapted to the above split.
• in tesselation.cpp lots of list<> and set<>s were replaced by the already present and appropriate define's.

• small verbosity changes in: MatrixContainer::ParseMatrix(), TesselPoint::TesselPoint(), TesselPoint::~TesselPoint(), PointCloud::PointCloud(), PointCloud::~PointCloud(), Tesselation::GuessStartingTriangle(), BondGraph::LoadBondLengthTable() (status of parsing gives appropriate message).

Signed-off-by: Frederik Heber <heber@…>

File:

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

molecuilder/src/builder.cpp

@@ -1551 +1551 @@
      if (configuration.BG == NULL) {
        configuration.BG = new BondGraph(configuration.GetIsAngstroem());
-       if ((BondGraphFileName.empty()) && (configuration.BG->LoadBondLengthTable(BondGraphFileName))) {
+       if ((!BondGraphFileName.empty()) && (configuration.BG->LoadBondLengthTable(BondGraphFileName))) {
          Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
        } else {
@@ -1660 +1660 @@
               Log() << Verbose(1) << "Dissecting molecular system into a set of disconnected subgraphs ... " << endl;
               // @TODO rather do the dissection afterwards
-              molecules->DissectMoleculeIntoConnectedSubgraphs(mol,&configuration);
+              molecules->DissectMoleculeIntoConnectedSubgraphs(periode, &configuration);
               mol = NULL;
               if (molecules->ListOfMolecules.size() != 0) {
@@ -1708 +1708 @@
                 int ranges[NDIM] = {1,1,1};
                 CorrelationToSurfaceMap *surfacemap = PeriodicCorrelationToSurface( molecules, elemental, TesselStruct, LCList, ranges );
+                //OutputCorrelationToSurface(&output, surfacemap);
                 BinPairMap *binmap = BinData( surfacemap, 0.5, 0., 0. );
                 OutputCorrelation ( &binoutput, binmap );
@@ -1744 +1745 @@
                 Log() << Verbose(1) << "Filling Box with water molecules." << endl;
                 // construct water molecule
-                molecule *filler = new molecule(periode);;
+                molecule *filler = new molecule(periode);
                 molecule *Filling = NULL;
-//                atom *second = NULL, *third = NULL;
+                atom *second = NULL, *third = NULL;
+//                first = new atom();
+//                first->type = periode->FindElement(5);
+//                first->x.Zero();
+//                filler->AddAtom(first);
                 first = new atom();
-                first->type = periode->FindElement(5);
-                first->x.Zero();
+                first->type = periode->FindElement(1);
+                first->x.Init(0.441, -0.143, 0.);
                 filler->AddAtom(first);
-//                first = new atom();
-//                first->type = periode->FindElement(1);
-//                first->x.Init(0.441, -0.143, 0.);
-//                filler->AddAtom(first);
-//                second = new atom();
-//                second->type = periode->FindElement(1);
-//                second->x.Init(-0.464, 1.137, 0.0);
-//                filler->AddAtom(second);
-//                third = new atom();
-//                third->type = periode->FindElement(8);
-//                third->x.Init(-0.464, 0.177, 0.);
-//                filler->AddAtom(third);
-//                filler->AddBond(first, third, 1);
-//                filler->AddBond(second, third, 1);
+                second = new atom();
+                second->type = periode->FindElement(1);
+                second->x.Init(-0.464, 1.137, 0.0);
+                filler->AddAtom(second);
+                third = new atom();
+                third->type = periode->FindElement(8);
+                third->x.Init(-0.464, 0.177, 0.);
+                filler->AddAtom(third);
+                filler->AddBond(first, third, 1);
+                filler->AddBond(second, third, 1);
                 // call routine
                 double distance[NDIM];