Changes in src/parser.cpp [e359a8:e138de]

File:

• src/parser.cpp (modified) (12 diffs)

src/parser.cpp

@@ -159 +159 @@
   if (input == NULL) {
     eLog() << Verbose(0) << endl << "Unable to open " << name << ", is the directory correct?" << endl;
-    performCriticalExit();
     return false;
   }
@@ -180 +179 @@
   //Log() << Verbose(0) << line.str() << endl;
   //Log() << Verbose(0) << "ColumnCounter[" << MatrixNr << "]: " << ColumnCounter[MatrixNr] << "." << endl;
-  if (ColumnCounter[MatrixNr] == 0) {
+  if (ColumnCounter[MatrixNr] == 0)
     eLog() << Verbose(0) << "ColumnCounter[" << MatrixNr << "]: " << ColumnCounter[MatrixNr] << " from file " << name << ", this is probably an error!" << endl;
-    performCriticalExit();
-  }
   
   // scan rest for number of rows/lines
@@ -196 +193 @@
   }
   //Log() << Verbose(0) << "RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from file " << name << "." << endl;
-  if (RowCounter[MatrixNr] == 0) {
+  if (RowCounter[MatrixNr] == 0)
     eLog() << Verbose(0) << "RowCounter[" << MatrixNr << "]: " << RowCounter[MatrixNr] << " from file " << name << ", this is probably an error!" << endl;
-    performCriticalExit();
-  }
 
   // allocate matrix if it's not zero dimension in one direction
@@ -231 +226 @@
     }
   } else {
-    eLog() << Verbose(1) << "Matrix nr. " << MatrixNr << " has column and row count of (" << ColumnCounter[MatrixNr] << "," << RowCounter[MatrixNr] << "), could not allocate nor parse!" << endl; 
+    eLog() << Verbose(0) << "ERROR: Matrix nr. " << MatrixNr << " has column and row count of (" << ColumnCounter[MatrixNr] << "," << RowCounter[MatrixNr] << "), could not allocate nor parse!" << endl; 
   }
   input.close();
@@ -433 +428 @@
               if (m > RowCounter[ KeySets.OrderSet[Order][CurrentFragment] ]) {
                 eLog() << Verbose(0) << "In fragment No. " << KeySets.OrderSet[Order][CurrentFragment]   << " current force index " << m << " is greater than " << RowCounter[ KeySets.OrderSet[Order][CurrentFragment] ] << "!" << endl;
-                performCriticalExit();
                 return false;
               }
@@ -477 +471 @@
     if (output == NULL) {
       eLog() << Verbose(0) << "Unable to open output energy file " << line.str() << "!" << endl;
-      performCriticalExit();
       return false;
     }
@@ -507 +500 @@
   if (output == NULL) {
     eLog() << Verbose(0) << "Unable to open output matrix file " << line.str() << "!" << endl;
-    performCriticalExit();
     return false;
   }
@@ -664 +656 @@
       if (j > RowCounter[MatrixCounter]) {
         eLog() << Verbose(0) << "Current force index " << j << " is greater than " << RowCounter[MatrixCounter] << "!" << endl;
-        performCriticalExit();
         return false;
       }
@@ -802 +793 @@
       if (j > RowCounter[MatrixCounter]) {
         eLog() << Verbose(0) << "Current hessian index " << j << " is greater than " << RowCounter[MatrixCounter] << ", where i=" << i << ", Order=" << Order << ", l=" << l << " and FragmentNr=" << FragmentNr << "!" << endl;
-        performCriticalExit();
         return false;
       }
@@ -810 +800 @@
           if (k > ColumnCounter[MatrixCounter]) {
             eLog() << Verbose(0) << "Current hessian index " << k << " is greater than " << ColumnCounter[MatrixCounter] << ", where m=" << m << ", j=" << j << ", i=" << i << ", Order=" << Order << ", l=" << l << " and FragmentNr=" << FragmentNr << "!" << endl;
-            performCriticalExit();
             return false;
           }
@@ -863 +852 @@
               if (m > RowCounter[ KeySets.OrderSet[Order][CurrentFragment] ]) {
                 eLog() << Verbose(0) << "In fragment No. " << KeySets.OrderSet[Order][CurrentFragment]   << " current row index " << m << " is greater than " << RowCounter[ KeySets.OrderSet[Order][CurrentFragment] ] << "!" << endl;
-                performCriticalExit();
                 return false;
               }
@@ -881 +869 @@
                   if (n > ColumnCounter[ KeySets.OrderSet[Order][CurrentFragment] ]) {
                     eLog() << Verbose(0) << "In fragment No. " << KeySets.OrderSet[Order][CurrentFragment]   << " current column index " << n << " is greater than " << ColumnCounter[ KeySets.OrderSet[Order][CurrentFragment] ] << "!" << endl;
-                    performCriticalExit();
                     return false;
                   }