disabled warnings for unknown command line options.

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 29f5fd3c9830d3cf56996b410528c72969ac9e57..9b0fff81d3988f515a229e60c98159b7dc9b8f48 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -4,6 +4,8 @@
 
 #include "latlib/progress.h"
 
+extern int opterr;
+
 o815::o815(int argc, char **argv, const string& _programid) {
   long timestamp;
 
@@ -33,14 +35,6 @@ o815::o815(int argc, char **argv, const string& _programid) {
     exit(0);
   }
 
-  if( comargs.showjobnum ) {
-    for( int i=1; i<=paraQ->getTotalJobs(); i++ ) {
-      if( paraQ->getTotalJobs()%i == 0 ) cout << paraQ->getTotalJobs()/i << "@" << i << " ";
-    }
-    cout << endl;
-    exit(0);
-  }
-
   if(rank==0) {
     timestamp = time(NULL);
     for(int idest=1; idest<numprocs; idest++)
@@ -53,6 +47,14 @@ o815::o815(int argc, char **argv, const string& _programid) {
 }
 
 void o815::mainLoop() {
+  if( comargs.showjobnum ) {
+    for( int i=1; i<=paraQ->getTotalJobs(); i++ ) {
+      if( paraQ->getTotalJobs()%i == 0 ) cout << paraQ->getTotalJobs()/i << "@" << i << " ";
+    }
+    cout << endl;
+    exit(0);
+  }
+
   *out->log << "OBS: Starting main loop." << endl;
 
   for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
@@ -66,7 +68,12 @@ void o815::mainLoop() {
     
     progress measProg(comargs.nmeas);
 
-    *out->log << "OBS: Starting measurements." << endl << flush;
+    *out->log << "OBS: Starting measurement of observables:";
+    for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
+      *out->log << " " << (*obsit)->obsid;
+    *out->log << endl << flush;
+
+    Sim->toEquilibrate = true;
 
     for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
       bool nextAlready = false;
@@ -93,6 +100,8 @@ void o815::mainLoop() {
 void o815::parseArgs(int argc, char **argv) {
   int opt = 0;
   
+  opterr = 0;
+
   while( (opt = getopt(argc, argv, "L:N:S:E:o:O:c:C:w:i:j:")) != -1 )
     switch(opt) {
     case 'L':