Changeset 281324 for molecuilder/src

Timestamp:

Dec 16, 2009, 4:18:46 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

0310b8

Parents:

230b16 (diff), 16f34d (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 'FixTestSuite' into FixDegeneratedTesselation

Location:

molecuilder/src

Files:

• builder.cpp (modified) (1 diff)
• molecule_graph.cpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)

molecuilder/src/builder.cpp

@@ -2107 +2107 @@
                 if (volume != -1)
                   ExitFlag = 255;
-                  eLog() << Verbose(0) << "Not enough arguments given for suspension: -u <density>" << endl;
+                  eLog() << Verbose(0) << "Not enough or invalid arguments given for suspension: -u <density>" << endl;
                   performCriticalExit();
               } else {

molecuilder/src/molecule_graph.cpp

@@ -1117 +1117 @@
   bool status = true;
   if (ReferenceStack->IsEmpty()) {
-    eLog() << Verbose(0) << "ReferenceStack is empty!" << endl;
-    performCriticalExit();
+    Log() << Verbose(1) << "ReferenceStack is empty!" << endl;
     return false;
   }

molecuilder/src/moleculelist.cpp

@@ -402 +402 @@
   input.open(line.c_str());
   if (input == NULL) {
-    eLog() << Verbose(0) << endl << "Unable to open " << line << ", is the directory correct?" << endl;
-    performCriticalExit();
+    Log() << Verbose(1) << endl << "Unable to open " << line << ", is the directory correct?" << endl;
     return false;
   }