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

Diff of /trunk/gadget/maininfo.cc

-revision 10, Wed Jun 10 13:01:42 2015 UTC
+revision 11, Thu Jul 23 19:00:38 2015 UTC
 Line 41
  }
  MainInfo::MainInfo()
-   : givenOptInfo(0), givenInitialParam(0), runoptimise(0),
+   : givenOptInfo(0), givenInitialParam(0), runoptimise(0), runomp(0),
      runstochastic(0), runnetwork(0), runprint(1), forceprint(0),
      printInitialInfo(0), printFinalInfo(0), printLogLevel(0), maxratio(0.95) {
 Line 78
      delete[] strMainGadgetFile;
      strMainGadgetFile = NULL;
    }
+   if (seed != NULL) {
+           delete[] seed;
+           seed = NULL;
+   }
  }
  void MainInfo::read(int aNumber, char* const aVector[]) {
-Line 87
+Line 91
      return;
    }
+   seed = new unsigned[3];
+   seed[0] = 0;
+   seed[1] = 0;
+   seed[2] = 0;
    int k = 1;
    while (k < aNumber) {
      if (strcasecmp(aVector[k], "-l") == 0) {
-Line 101
+Line 109
      } else if (strcasecmp(aVector[k], "-s") == 0) {
        runstochastic = 1;
+ //FIXME
+     }else if (strcasecmp(aVector[k], "-omp") == 0) {
+       runomp = 1;
      } else if (strcasecmp(aVector[k], "-m") == 0) {
        ifstream infile;
-Line 220
+Line 231
        if (k == aNumber - 1)
          this->showCorrectUsage(aVector[k]);
        k++;
-       srand(atoi(aVector[k]));
+       seed[0] = atoi(aVector[k]);
+       srand(seed[0]);
+ //FIXME
+     } else if (strcasecmp(aVector[k], "-seedM") == 0) {
+         //JMB experimental setting of random number seed from the commandline
+         //if the "seed" is also specified in the optinfo file then that will override
+         //any seed that is specified on the commandline
+         if (k == aNumber - 1)
+           this->showCorrectUsage(aVector[k]);
+         k++;
+         seed[1] = atoi(aVector[k]);
+     } else if (strcasecmp(aVector[k], "-seedP") == 0) {
+         //JMB experimental setting of random number seed from the commandline
+         //if the "seed" is also specified in the optinfo file then that will override
+         //any seed that is specified on the commandline
+         if (k == aNumber - 1)
+           this->showCorrectUsage(aVector[k]);
+         k++;
+         seed[2] = atoi(aVector[k]);
      } else if (strcasecmp(aVector[k], "-maxratio") == 0) {
        //JMB experimental setting of maximum ratio of stock consumed in one timestep
-Line 234
+Line 264
      k++;
    }
+   if (seed[0] == 0) {
+           seed[0] = unsigned(time(NULL));
+           if (seed[1] == 0)
+                   seed[1] = unsigned(time(NULL));
+           if (seed[2] == 0)
+                   seed[2] = unsigned(time(NULL));
+   } else {
+           if (seed[1] == 0)
+                   seed[1] = seed[0];
+           if (seed[2] == 0)
+                   seed[2] = seed[0];
+   }
  }
  void MainInfo::checkUsage(const char* const inputdir, const char* const workingdir) {

 Legend:



Removed from v.10
 


changed lines


 
Added in v.11
 Legend:



Removed from v.10
 


changed lines


 
Added in v.11
-Removed from v.10
+Added in v.11

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