Merge pull request #2227 from mccode-dev/defer-srandom-until-init

Author: willend

common/lib/share/mccode_main.c

@@ -34,7 +34,9 @@ int mccode_main(int argc, char *argv[])
   // init global _particle.randstate for random number use
   // during init(), finally() and display(). NOTE: during trace, a local
   // "_particle" variable is present and thus used instead.
-  srandom(_hash(mcseed-1));
+  //
+  // PW: srandom deferred until init() since we did not read seed input from commandline
+  //srandom(_hash(mcseed-1));
 
 #ifdef USE_MPI
   /* *** print number of nodes *********************************************** */

mccode/src/cogen.c.in

@@ -1484,6 +1484,8 @@ int cogen_section(struct instr_def *instr, char *section, char *section_lower,
   if (!strcmp(section, "INITIALISE"))
   {
     cout("  DEBUG_INSTR();");
+    cout("  // Initialise rng");
+    cout("  srandom(_hash(mcseed-1));");
     cout("");
     /* default values for instrument parameters are set in mcreadparams */
     cout("  /* code_main/parseoptions/readparams "