Random U and N where sharing the same state object. Make these states…

… unqiue and remove nested destructor call this states are in a global context.

src/korc_random.f90

@@ -11,7 +11,8 @@ MODULE korc_random
   IMPLICIT NONE
 
   TYPE(C_PTR), DIMENSION(:), ALLOCATABLE , PRIVATE :: states
-  TYPE(C_PTR),  PRIVATE :: state
+  TYPE(C_PTR),  PRIVATE :: state_u
+  TYPE(C_PTR),  PRIVATE :: state_n
   !    TYPE(VSL_STREAM_STATE), PRIVATE :: stream
 
   INTERFACE
@@ -130,40 +131,43 @@ SUBROUTINE finalize_random
     IMPLICIT NONE
 
     INTEGER             :: thread_num
-    !$OMP PARALLEL
+
+    !$OMP PARALLEL PRIVATE(thread_num)
     thread_num = get_thread_number()
     CALL random_destroy_U(states(thread_num))
     !$OMP END PARALLEL
+
+    DEALLOCATE (states)
   END SUBROUTINE
 
   SUBROUTINE initialize_random_U(seed)
     IMPLICIT NONE
 
     INTEGER, INTENT(IN) :: seed
 
-    state = random_construct_U(seed)
+    state_u = random_construct_U(seed)
 
   END SUBROUTINE initialize_random_U
 
   SUBROUTINE finalize_random_U
     IMPLICIT NONE
 
-    CALL random_destroy_U(state)
+    CALL random_destroy_U(state_u)
   END SUBROUTINE
 
   SUBROUTINE initialize_random_N(seed)
     IMPLICIT NONE
 
     INTEGER, INTENT(IN) :: seed
 
-    state = random_construct_N(seed)
+    state_n = random_construct_N(seed)
 
   END SUBROUTINE initialize_random_N
 
   SUBROUTINE finalize_random_N
     IMPLICIT NONE
 
-    CALL random_destroy_N(state)
+    CALL random_destroy_N(state_n)
   END SUBROUTINE
 
   FUNCTION get_random()
@@ -179,15 +183,15 @@ FUNCTION get_random_U()
 
     REAL(rp)            :: get_random_U
 
-    get_random_U = random_get_number_U(state)
+    get_random_U = random_get_number_U(state_u)
   END FUNCTION get_random_U
 
   FUNCTION get_random_N()
     IMPLICIT NONE
 
     REAL(rp)            :: get_random_N
 
-    get_random_N = random_get_number_N(state)
+    get_random_N = random_get_number_N(state_n)
   END FUNCTION get_random_N
 
   SUBROUTINE get_randoms(nums)

src/korc_velocity_distribution.f90

@@ -415,6 +415,7 @@ subroutine gyro_distribution(params,F,spp)
 
     call init_random_seed(params)
     call RANDOM_NUMBER(theta)
+    call finalize_random_seed
     theta = 2.0_rp*C_PI*theta
 
     if (spp%spatial_distribution.eq.'TRACER') theta=2.0*C_PI
@@ -476,8 +477,6 @@ subroutine gyro_distribution(params,F,spp)
     DEALLOCATE(b2)
     DEALLOCATE(b3)
     DEALLOCATE(hint)
-
-    call finalize_random_seed
   end subroutine gyro_distribution