Changeset 2956 for palm/trunk

Timestamp:

Apr 10, 2018 11:01:03 AM (6 years ago)

Author:

Giersch

Message:

Bugfix of the allocation of spectrum_x and spectrum_y in case of restart runs, spectrum_x and spectrum_y are now treat as global restart data not local

Location:

palm/trunk/SOURCE

Files:

• read_restart_data_mod.f90 (modified) (5 diffs)
• spectra_mod.f90 (modified) (2 diffs)
• write_restart_data_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! spectrum_x and spectrum_y have been moved to global data
+! 
+! 2921 2018-03-22 15:05:23Z Giersch
 ! spinup_time, day_of_year_init and time_utc_init are also read now
 ! 
@@ -117 +120 @@
 
        USE spectra_mod,                                                        &
-           ONLY:  average_count_sp
+           ONLY:  average_count_sp, spectrum_x, spectrum_y
 
        USE statistics,                                                         &
@@ -569 +572 @@
              CASE ( 'simulated_time' )
                 READ ( 13 )  simulated_time
+             CASE ( 'spectrum_x' )
+                IF ( .NOT. ALLOCATED( spectrum_x ) )  THEN
+                   ALLOCATE( spectrum_x( 1:nx/2, 1:100, 1:10 ) )
+                ENDIF
+                READ ( 13 )  spectrum_x
+             CASE ( 'spectrum_y' )
+                IF ( .NOT. ALLOCATED( spectrum_y ) )  THEN
+                   ALLOCATE( spectrum_y( 1:ny/2, 1:100, 1:10 ) )
+                ENDIF
+                READ ( 13 )  spectrum_y
              CASE ( 'spinup_time' )
                 READ ( 13 )  spinup_time
@@ -1052 +1065 @@
         ONLY:  id_random_array, seq_random_array
 
-    USE spectra_mod,                                                           &
-        ONLY:  spectrum_x, spectrum_y
-
     USE surface_mod,                                                           &
         ONLY :  surface_rrd_local
@@ -1690 +1700 @@
                    shf_av(nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp)  =          &
                       tmp_2d(nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'spectrum_x' )
-                   IF ( k == 1 )  THEN
-                      IF ( nx_on_file /= nx )  THEN
-                         message_string = 'rrd_local: spectrum_x ' //          &
-                                     'on restart file ignored because' //      &
-                                     '&total numbers of grid points (nx) ' //  &
-                                     'do not match'
-                         CALL message( 'rrd_local', 'PA0293',                  &
-                                       0, 1, 0, 6, 0 )
-                         READ ( 13 )  rdummy
-                      ELSE
-                         READ ( 13 )  spectrum_x
-                      ENDIF
-                   ENDIF
-
-                CASE ( 'spectrum_y' )
-                   IF ( k == 1 )  THEN
-                      IF ( ny_on_file /= ny )  THEN
-                         message_string = 'rrd_local: spectrum_y ' //          &
-                                     'on restart file ignored because' //      &
-                                     '&total numbers of grid points (ny) '//   &
-                                     'do not match'
-                         CALL message( 'rrd_local', 'PA0294',                  &
-                                       0, 1, 0, 6, 0 )
-                         READ ( 13 )  rdummy
-                      ELSE
-                         READ ( 13 )  spectrum_y
-                      ENDIF
-                   ENDIF
                    
                 CASE ( 'ssws_av' )

palm/trunk/SOURCE/spectra_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! spectrum_x and spectrum_y will only be allocated if they are not allocated 
+! before (e.g. in case of restart runs) 
+! 
+! 2932 2018-03-26 09:39:22Z maronga
 ! renamed spectra_par to spectra_parameters
 ! 
@@ -291 +295 @@
 
        IF ( dt_dosp /= 9999999.9_wp )  THEN
-          ALLOCATE( spectrum_x( 1:nx/2, 1:100, 1:10 ),                         &
-                    spectrum_y( 1:ny/2, 1:100, 1:10 ) )
-          spectrum_x = 0.0_wp
-          spectrum_y = 0.0_wp
+
+          IF ( .NOT. ALLOCATED( spectrum_x ) )  THEN
+             ALLOCATE( spectrum_x( 1:nx/2, 1:100, 1:10 ) )
+             spectrum_x = 0.0_wp
+          ENDIF
+
+          IF ( .NOT. ALLOCATED( spectrum_y ) )  THEN
+             ALLOCATE( spectrum_y( 1:ny/2, 1:100, 1:10 ) )
+             spectrum_y = 0.0_wp
+          ENDIF
 
           ALLOCATE( var_d(nzb:nzt+1) )

palm/trunk/SOURCE/write_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! spectrum_x and spectrum_y have been moved to global data
+! 
+! 2921 2018-03-22 15:05:23Z Giersch
 ! spinup_time, day_of_year_init and time_utc_init are also written out now
 ! 
@@ -93 +96 @@
 
        USE indices,                                                            &
-           ONLY:  nz, nx, ny
+           ONLY:  nx, ny, nz
 
        USE microphysics_mod,                                                   &
@@ -116 +119 @@
 
        USE spectra_mod,                                                        &
-           ONLY:  average_count_sp
+           ONLY:  average_count_sp, spectrum_x, spectrum_y
 
        USE synthetic_turbulence_generator_mod,                                 &
@@ -640 +643 @@
        CALL wrd_write_string( 'simulated_time' ) 
        WRITE ( 14 )  simulated_time
+
+       IF ( ALLOCATED( spectrum_x ) )  THEN
+          CALL wrd_write_string( 'spectrum_x' ) 
+          WRITE ( 14 )  spectrum_x
+          CALL wrd_write_string( 'spectrum_y' ) 
+          WRITE ( 14 )  spectrum_y
+       ENDIF
 
        CALL wrd_write_string( 'spinup_time ' ) 
@@ -958 +968 @@
        USE random_generator_parallel,                                          &
            ONLY:  id_random_array, seq_random_array
-        
-       USE spectra_mod,                                                        &
-           ONLY:  spectrum_x, spectrum_y
 
        USE surface_mod,                                                        &
@@ -1220 +1227 @@
        ENDIF
 
-       IF ( ALLOCATED( spectrum_x ) )  THEN
-          CALL wrd_write_string( 'spectrum_x' ) 
-          WRITE ( 14 )  spectrum_x
-          CALL wrd_write_string( 'spectrum_y' ) 
-          WRITE ( 14 )  spectrum_y
-       ENDIF
-
        IF ( ALLOCATED( ts_av ) )  THEN
           CALL wrd_write_string( 'ts_av' )