Changeset 075729 for molecuilder/src/Legacy/oldmenu.cpp

Timestamp:

Apr 27, 2010, 2:25:42 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

90c4460

Parents:

1561e2 (diff), 2bc713 (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 'Analysis_PairCorrelation' into StructureRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in

Conflicts have been many and too numerous to listen here, just the few general cases

• new molecule() replaced by World::getInstance().createMolecule()
• new atom() replaced by World::getInstance().createAtom() where appropriate.
• Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
• DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
• ...

Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.

This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.

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

File:

• molecuilder/src/Legacy/oldmenu.cpp (modified) (8 diffs)

molecuilder/src/Legacy/oldmenu.cpp

@@ -79 +79 @@
         Log() << Verbose(0) << "Enter absolute coordinates." << endl;
         first = World::getInstance().createAtom();
-        first->x.AskPosition(mol->cell_size, false);
+        first->x.AskPosition(World::getInstance().getDomain(), false);
         first->type = periode->AskElement();  // give type
         mol->AddAtom(first);  // add to molecule
@@ -90 +90 @@
           if (!valid) eLog() << Verbose(2) << "Resulting position out of cell." << endl;
           Log() << Verbose(0) << "Enter reference coordinates." << endl;
-          x.AskPosition(mol->cell_size, true);
+          x.AskPosition(World::getInstance().getDomain(), true);
           Log() << Verbose(0) << "Enter relative coordinates." << endl;
-          first->x.AskPosition(mol->cell_size, false);
+          first->x.AskPosition(World::getInstance().getDomain(), false);
           first->x.AddVector((const Vector *)&x);
           Log() << Verbose(0) << "\n";
@@ -107 +107 @@
           second = mol->AskAtom("Enter atom number: ");
           Log() << Verbose(0) << "Enter relative coordinates." << endl;
-          first->x.AskPosition(mol->cell_size, false);
+          first->x.AskPosition(World::getInstance().getDomain(), false);
           for (int i=NDIM;i--;) {
             first->x.x[i] += second->x.x[i];
@@ -334 +334 @@
     case 'b': // normal vector of mirror plane
       Log() << Verbose(0) << "Enter normal vector of mirror plane." << endl;
-      n.AskPosition(mol->cell_size,0);
+      n.AskPosition(World::getInstance().getDomain(),0);
       n.Normalize();
       break;
@@ -401 +401 @@
     case 'b': // normal vector of mirror plane
       Log() << Verbose(0) << "Enter normal vector of mirror plane." << endl;
-      n.AskPosition(mol->cell_size,0);
+      n.AskPosition(World::getInstance().getDomain(),0);
       n.Normalize();
       break;
@@ -778 +778 @@
       x.Zero();
       y.Zero();
-      y.x[abs(axis)-1] = mol->cell_size[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] * abs(axis)/axis; // last term is for sign, first is for magnitude
+      y.x[abs(axis)-1] = World::getInstance().getDomain()[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] * abs(axis)/axis; // last term is for sign, first is for magnitude
       for (int i=1;i<faktor;i++) {  // then add this list with respective translation factor times
         x.AddVector(&y); // per factor one cell width further
@@ -801 +801 @@
         mol->Translate(&x);
       }
-      mol->cell_size[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] *= faktor;
+      World::getInstance().getDomain()[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] *= faktor;
     }
   }
@@ -894 +894 @@
         Log() << Verbose(0) << "Current molecule is: " << mol->IndexNr << "\t" << mol->name << endl;
         Log() << Verbose(0) << "Enter translation vector." << endl;
-        x.AskPosition(mol->cell_size,0);
+        x.AskPosition(World::getInstance().getDomain(),0);
         mol->Center.AddVector((const Vector *)&x);
      }