Changeset 2587 for branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/ran_num.F90

Timestamp:

2011-02-15T12:58:59+01:00 (13 years ago)

Author:

vidard

Message:

refer to ticket #798

File:

• branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/ran_num.F90 (modified) (5 diffs)

branches/TAM_V3_0/NEMOTAM/OPATAM_SRC/ran_num.F90

@@ -13 +13 @@
    USE dom_oce        ! Domain variables
    USE in_out_manager ! I/O stuff
+   USE mt19937ar, ONLY : &
+    & init_mtrand,       &
+    & mtrand_real1
 
    IMPLICIT NONE
@@ -118 +121 @@
        
    END FUNCTION gausva
-
-   FUNCTION psrandom( kdum ) 
-      !!----------------------------------------------------------------------
-      !!               ***  ROUTINE psrandom ***
-      !!          
-      !! ** Purpose : Pseudo-Random number generator.
-      !!
-      !! ** Method  : Returns a pseudo-random number from a uniform distribution
-      !!              between 0 and 1
-      !!              Call with kdum a negative integer to initialize.
-      !!              Thereafter, do not alter kdum between successive deviates 
-      !!              in sequence.
-      !!
-      !! ** Action  : 
-      !!
-      !! History :
-      !!        !  10-02  (F. Vigilant)  Original code 
-      !!----------------------------------------------------------------------
-      !! * Function return
-      REAL(wp) ::  &
-         & psrandom
-      !! * Arguments
-      INTEGER, INTENT(INOUT) :: &
-         & kdum          ! Seed
-      LOGICAL, SAVE :: &
-         & llinit = .FALSE.
-
-      ! Initialization
-      IF ( .NOT. llinit ) THEN
-         
-         CALL srand( kdum )
-         llinit     = .TRUE.
-         
-      ENDIF
-
-      CALL rand(psrandom) 
-
-   END FUNCTION psrandom
-   
 
    FUNCTION gaustb_2d( ki, kj, kseed, pamp, pmean  )
@@ -241 +205 @@
       IF ( niset(ki,kj) == 0 ) THEN
 
-         zv1   = 2.0_wp * psrandom_2d( ki, kj, kdum ) - 1.0_wp
-         zv2   = 2.0_wp * psrandom_2d( ki, kj, kdum ) - 1.0_wp
+         zv1   = 2.0_wp * psrandom( kdum(ki,kj) ) - 1.0_wp
+         zv2   = 2.0_wp * psrandom( kdum(ki,kj) ) - 1.0_wp
          zrsq  = zv1**2 + zv2**2
 
          DO WHILE ( ( zrsq >= 1.0_wp ) .OR. ( zrsq == 0.0_wp ) ) 
 
-            zv1   = 2.0_wp * psrandom_2d( ki, kj, kdum ) - 1.0_wp
-            zv2   = 2.0_wp * psrandom_2d( ki, kj, kdum ) - 1.0_wp
+            zv1   = 2.0_wp * psrandom( kdum(ki,kj) ) - 1.0_wp
+            zv2   = 2.0_wp * psrandom( kdum(ki,kj) ) - 1.0_wp
             zrsq  = zv1**2 + zv2**2
 
@@ -267 +231 @@
    END FUNCTION gausva_2d
 
-   FUNCTION psrandom_2d( ki, kj, kdum ) 
-      !!----------------------------------------------------------------------
-      !!               ***  ROUTINE psrandom_2d ***
-      !!          
-      !! ** Purpose : Random number generator.
+   FUNCTION psrandom( kdum )
+      !!----------------------------------------------------------------------
+      !!               ***  ROUTINE psrandom ***
+      !!          
+      !! ** Purpose : Pseudo-Random number generator.
       !!
       !! ** Method  : Returns a pseudo-random number from a uniform distribution
@@ -286 +250 @@
       !! * Function return
       REAL(wp) ::  &
-         & psrandom_2d
-      !! * Arguments
-      INTEGER, INTENT(IN) :: &
-         & ki, &         ! Indices in seed array
-         & kj
-      INTEGER, INTENT(INOUT), DIMENSION(jpi,jpj) :: &
+         & psrandom
+      !! * Arguments
+      INTEGER, INTENT(INOUT) :: &
          & kdum          ! Seed
       LOGICAL, SAVE :: &
          & llinit = .FALSE.
+      INTEGER :: &
+   & kdum1, &
+   & kdum2
 
       ! Initialization
       IF ( .NOT. llinit ) THEN
-         
-         CALL srand( kdum( ki,kj ) )
+    kdum2 = 596035
+    kdum1 = kdum + nproc * kdum2
+         CALL init_mtrand(kdum)
          llinit     = .TRUE.
-         
-      ENDIF
-
-      CALL rand(psrandom_2d)  
+      ENDIF
+
+      psrandom = mtrand_real1()
       
-   END FUNCTION psrandom_2d
+   END FUNCTION psrandom
+
 
 END MODULE ran_num