Changeset 2636 for palm/trunk

Timestamp:

Nov 22, 2017 3:22:20 PM (6 years ago)

Author:

raasch

Message:

bugfix for reading required for parrallel random number generator

File:

• palm/trunk/SOURCE/read_3d_binary.f90 (modified) (3 diffs)

palm/trunk/SOURCE/read_3d_binary.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for reading required for parrallel random number generator
+! 
+! 2292 2017-06-20 09:51:42Z schwenkel
 ! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 
 ! includes two more prognostic equations for cloud drop concentration (nc)  
@@ -226 +229 @@
 
     REAL(wp), DIMENSION(:,:), ALLOCATABLE     ::  tmp_2d      !< temporary array for storing 2D data
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE     ::  tmp_2d_id_random    !< temporary array for storing random generator data
+    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE   ::  tmp_2d_seq_random   !< temporary array for storing random generator data
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE   ::  tmp_3d      !< temporary array for storing 3D data
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE   ::  tmp_3dwul   !<
@@ -695 +700 @@
                    IF ( k == 1 )  READ ( 13 )  random_iy
                    
-                CASE ( 'seq_random_array' )  ! still unresolved issue
-                   IF ( k == 1 )  READ ( 13 )  id_random_array
-                   IF ( k == 1 )  READ ( 13 )  seq_random_array
-
+                CASE ( 'seq_random_array' )
+                   ALLOCATE( tmp_2d_id_random(nys_on_file:nyn_on_file,         &
+                                              nxl_on_file:nxr_on_file) )
+                   ALLOCATE( tmp_2d_seq_random(5,nys_on_file:nyn_on_file,      &
+                                                 nxl_on_file:nxr_on_file) )
+                   IF ( .NOT. ALLOCATED( id_random_array ) )  THEN
+                      ALLOCATE( id_random_array(nys:nyn,nxl:nxr) )
+                   ENDIF
+                   IF ( .NOT. ALLOCATED( seq_random_array ) )  THEN
+                      ALLOCATE( seq_random_array(5,nys:nyn,nxl:nxr) )
+                   ENDIF
+                   IF ( k == 1 )  READ ( 13 )  tmp_2d_id_random
+                   IF ( k == 1 )  READ ( 13 )  tmp_2d_seq_random
+                   id_random_array(nysc:nync,nxlc:nxrc) =                      &
+                                          tmp_2d_id_random(nysf:nynf,nxlf:nxrf)
+                   seq_random_array(:,nysc:nync,nxlc:nxrc) =                   &
+                                       tmp_2d_seq_random(:,nysf:nynf,nxlf:nxrf)
+                   DEALLOCATE( tmp_2d_id_random, tmp_2d_seq_random )
                 CASE ( 'rho_ocean_av' )
                    IF ( .NOT. ALLOCATED( rho_ocean_av ) )  THEN