[mareframe] Diff of /trunk/gadget/maininfo.cc

Diff of /trunk/gadget/maininfo.cc

-revision 19, Wed May 25 16:36:33 2016 UTC
+revision 20, Fri Apr  7 09:20:55 2017 UTC
 Line 20
      << " -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"
-Line 41
+Line 44
  }
  MainInfo::MainInfo()
+ #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) {
-Line 146
+Line 153
      } else if (strcasecmp(aVector[k], "-co") == 0) {
        handle.logMessage(LOGFAIL, "The -co switch is no longer supported");
+ #ifdef _OPENMP
-     } else if (strcasecmp(aVector[k], "-printinitial") == 0) {
+     } 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)
-Line 423
+Line 432
      } 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);
-Line 479
+Line 494
    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) {

 Legend:



Removed from v.19
 


changed lines


 
Added in v.20
 Legend:



Removed from v.19
 


changed lines


 
Added in v.20
-Removed from v.19
+Added in v.20

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0