More PRNG rationalization

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6274 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

CMakeLists.txt

@@ -416,6 +416,7 @@ set_source_files_properties (${ka9q_CSRCS} PROPERTIES COMPILE_FLAGS -Wno-sign-co
 set (wsjt_CSRCS
   ${ka9q_CSRCS}
   lib/ftrsd/ftrsd2.c
+  lib/sgran.c
   lib/gran.c
   lib/igray.c
   lib/init_random_seed.c

lib/JTMSKsim.f90

@@ -41,6 +41,9 @@ program JTMSKsim
   phi0=0.
   sig=10.0**(0.05*snrdb)
 
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
+
 ! Generate the Tx waveform
   cb11=0.
   do j=1,234

lib/chkfft.f90

@@ -42,6 +42,8 @@ program chkfft
   call getarg(5,arg)
   read(arg,*) npatience
 
+  call sgran()
+
   if(list) write(*,1000) infile,nr,nw,ncomplex,npatience
 1000 format(/'infile: ',a12,'   nr:',i2,'   nw',i2,'   nc:',i2,'   np:',i2/)
   if(.not.list) write(*,1002) nfft,nr,nw,ncomplex,npatience

lib/genmet.f90

@@ -33,6 +33,8 @@ program genmet
   hist=0
   nerr=0
 
+  call sgran()
+
   do iter=1,iters
      do i=0,ntones-1
         r(i)=0.

lib/init_random_seed.h

@@ -2,7 +2,7 @@
 #define INIT_RANDOM_SEED_H__
 
 #ifdef __cplusplus
-exten "C" {
+extern "C" {
 #endif
 
   /*

lib/jt4sim.f90

@@ -45,7 +45,8 @@ program jt4sim
   freq=f0                            !Silence compiler warning
   dphi=0.0                           !Silence compiler warning
 
-  call init_random_seed()
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
 
   h=default_header(12000,npts)  
 

lib/jt65sim.f90

@@ -35,7 +35,8 @@ program jt65sim
      go to 999
   endif
 
-  call init_random_seed(1)
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
 
   csubmode='A'
   call getarg(1,csubmode)

lib/jt9sim.f90

@@ -67,6 +67,9 @@ program jt9sim
 !  if(minutes.eq.30) f0=1025.
 
 
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
+
   h=default_header(12000,npts)  
   k=0                                !Silence compiler warning
 

lib/noisegen.f90

@@ -2,6 +2,9 @@ subroutine noisegen(d4,nmax)
 
   real*4 d4(4,nmax)
 
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
+
   do i=1,nmax
      d4(1,i)=gran()
      d4(2,i)=gran()

lib/sgran.c

@@ -1,8 +1,7 @@
 #include "init_random_seed.h"
 
-/* seed rand */
-float sgran_()
+/* Fortran wrapper to seed the C library rand */
+void sgran_(void)
 {
   init_random_seed();
-  return(0);
 }

lib/t1.f90

@@ -23,7 +23,9 @@ program t1
   call getarg(3,arg)
   read(arg,*) iters
 
-  call init_random_seed()
+  call init_random_seed(1)      ! seed Fortran RANDOM_NUMBER generator
+  call sgran()                  ! see C rand generator (used in gran)
+
   call random_number(r)
   itone=0
   where(r.gt.0.5) itone=1

lib/timefft.f90

@@ -19,6 +19,8 @@ program timefft
   lthreading=maxthreads.ge.1
   maxthreads=max(1,maxthreads)
 
+  call sgran()                  ! see C rand generator (used in gran)
+
 ! Allocate data arrays
   pa=fftwf_alloc_complex(int(nfft,C_SIZE_T))
   call c_f_pointer(pa,a,[nfft])

main.cpp

@@ -28,6 +28,7 @@
 #include "SettingsGroup.hpp"
 #include "TraceFile.hpp"
 #include "mainwindow.h"
+#include "lib/init_random_seed.h"
 
 namespace
 {
@@ -44,6 +45,8 @@ namespace
 
 int main(int argc, char *argv[])
 {
+  init_random_seed ();
+
   register_types ();            // make the Qt magic happen
 
   // Multiple instances:
@@ -56,7 +59,7 @@ int main(int argc, char *argv[])
                                    // consistent format, do this after
                                    // instantiating QApplication so
                                    // that GUI has correct l18n
-	      
+
       // Override programs executable basename as application name.
       a.setApplicationName ("WSJT-X");
       a.setApplicationVersion (version ());