--- trunk/gadget/maininfo.cc	2016/05/25 16:36:33	19
+++ trunk/gadget/maininfo.cc	2017/04/07 09:20:55	20
@@ -20,6 +20,9 @@
     << " -n                           perform a network run (using paramin)\n"
     << " -v --version                 display version information and exit\n"
     << " -h --help                    display this help screen and exit\n"
+#ifdef _OPENMP
+    << " -parallel  <option>          run in parallel <option> == [spe, rep]. spe=speculative, rep=reproducible. Defaull spe\n"
+#endif
     << "\nOptions for specifying the input to Gadget models:\n"
     << " -i <filename>                read model parameters from <filename>\n"
     << " -opt <filename>              read optimising parameters from <filename>\n"
@@ -41,7 +44,11 @@
 }
 
 MainInfo::MainInfo()
-  : givenOptInfo(0), givenInitialParam(0), runoptimise(0),
+#ifdef _OPENMP
+  : givenOptInfo(0), givenInitialParam(0), runoptimise(0), runparallel(0),
+#else
+  : givenOptInfo(0), givenInitialParam(0), runoptimise(0), 
+#endif
     runstochastic(0), runnetwork(0), runprint(1), forceprint(0),
     printInitialInfo(0), printFinalInfo(0), printLogLevel(0), maxratio(0.95) {
 
@@ -146,12 +153,14 @@
 
     } else if (strcasecmp(aVector[k], "-co") == 0) {
       handle.logMessage(LOGFAIL, "The -co switch is no longer supported");
-
-    } else if (strcasecmp(aVector[k], "-printinitial") == 0) {
+#ifdef _OPENMP
+    } else if (strcasecmp(aVector[k], "-parallel") == 0) {
+      handle.logMessage(LOGINFO, "--------parallel option ", aVector[k]);
       if (k == aNumber - 1)
         this->showCorrectUsage(aVector[k]);
       k++;
-      this->setPrintInitialFile(aVector[k]);
+      this->setParallel(aVector[k]);
+#endif
 
     } else if (strcasecmp(aVector[k], "-printfinal") == 0) {
       if (k == aNumber - 1)
@@ -423,6 +432,12 @@
     } else if (strcasecmp(text, "-printfinal") == 0) {
       infile >> text >> ws;
       this->setPrintFinalFile(text);
+#ifdef _OPENMP
+    } else if (strcasecmp(text, "-parallel") == 0) {
+      infile >> text >> ws;
+handle.logMessage(LOGINFO, "--------parallel option 222 ", text);
+      this->setParallel(text);
+#endif
     } else if (strcasecmp(text, "-opt") == 0) {
       infile >> text >> ws;
       this->setOptInfoFile(text);
@@ -479,6 +494,22 @@
   strcpy(strPrintFinalFile, filename);
   printFinalInfo = 1;
 }
+#ifdef _OPENMP
+void MainInfo::setParallel(char* filename) {
+  if (!strcasecmp(filename,"spe")){
+       runparallel=1;
+handle.logMessage(LOGINFO, "--------parallel speculative ", filename);
+       return;
+  }
+  if (!strcasecmp(filename,"rep")){
+handle.logMessage(LOGINFO, "--------parallel reproducible ", filename);
+       runparallel=2;
+       return;
+  }
+  this->showCorrectUsage("opt");
+  
+}
+#endif
 
 void MainInfo::setMainGadgetFile(char* filename) {
   if (strMainGadgetFile != NULL) {