Changeset 3646 for palm/trunk/SOURCE/data_output_2d.f90

Timestamp:

Dec 28, 2018 5:58:49 PM (5 years ago)

Author:

kanani

Message:

Bugfix: replace simulated_time by time_since_reference_point where required

File:

• palm/trunk/SOURCE/data_output_2d.f90 (modified) (11 diffs)

palm/trunk/SOURCE/data_output_2d.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: use time_since_reference_point instead of simulated_time (relevant
+! when using wall/soil spinup)
+! 
+! 3637 2018-12-20 01:51:36Z knoop
 ! Implementation of the PALM module interface
 ! 
@@ -298 +302 @@
                ibc_uv_b, io_blocks, io_group, message_string,                  &
                ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz,                          &
-               psolver, section, simulated_time,                               &
+               psolver, section,                                               &
                time_since_reference_point
 
@@ -510 +514 @@
             ntdim_2d_xy(av) )  THEN
           WRITE ( message_string, * ) 'Output of xy cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', time_since_reference_point, 's because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0384', 0, 1, 0, 6, 0 )
@@ -519 +523 @@
             ntdim_2d_xz(av) )  THEN
           WRITE ( message_string, * ) 'Output of xz cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', time_since_reference_point, 's because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0385', 0, 1, 0, 6, 0 )
@@ -528 +532 @@
             ntdim_2d_yz(av) )  THEN
           WRITE ( message_string, * ) 'Output of yz cross-sections is not ',   &
-                          'given at t=', simulated_time, '&because the',       & 
+                          'given at t=', time_since_reference_point, 's because the',       & 
                           ' maximum number of output time levels is exceeded.'
           CALL message( 'data_output_2d', 'PA0386', 0, 1, 0, 6, 0 )
@@ -697 +701 @@
              CASE ( 'pc_xy', 'pc_xz', 'pc_yz' )  ! particle concentration
                 IF ( av == 0 )  THEN
-                   IF ( simulated_time >= particle_advection_start )  THEN
+                   IF ( time_since_reference_point >= particle_advection_start )  THEN
                       tend = prt_count
 !                      CALL exchange_horiz( tend, nbgp )
@@ -722 +726 @@
              CASE ( 'pr_xy', 'pr_xz', 'pr_yz' )  ! mean particle radius (effective radius)
                 IF ( av == 0 )  THEN
-                   IF ( simulated_time >= particle_advection_start )  THEN
+                   IF ( time_since_reference_point >= particle_advection_start )  THEN
                       DO  i = nxl, nxr
                          DO  j = nys, nyn
@@ -844 +848 @@
              CASE ( 'ql_vp_xy', 'ql_vp_xz', 'ql_vp_yz' )
                 IF ( av == 0 )  THEN
-                   IF ( simulated_time >= particle_advection_start )  THEN
+                   IF ( time_since_reference_point >= particle_advection_start )  THEN
                       DO  i = nxl, nxr
                          DO  j = nys, nyn
@@ -1422 +1426 @@
 !--                In case of parallel output, this is only done by PE0
 !--                to increase the performance.
-                   IF ( simulated_time /= do2d_xy_last_time(av) )  THEN
+                   IF ( time_since_reference_point /= do2d_xy_last_time(av) )  THEN
                       do2d_xy_time_count(av) = do2d_xy_time_count(av) + 1
-                      do2d_xy_last_time(av)  = simulated_time
+                      do2d_xy_last_time(av)  = time_since_reference_point
                       IF ( myid == 0 )  THEN
                          IF ( .NOT. data_output_2d_on_each_pe  &
@@ -1611 +1615 @@
 !--                In case of parallel output, this is only done by PE0
 !--                to increase the performance.
-                   IF ( simulated_time /= do2d_xz_last_time(av) )  THEN
+                   IF ( time_since_reference_point /= do2d_xz_last_time(av) )  THEN
                       do2d_xz_time_count(av) = do2d_xz_time_count(av) + 1
-                      do2d_xz_last_time(av)  = simulated_time
+                      do2d_xz_last_time(av)  = time_since_reference_point
                       IF ( myid == 0 )  THEN
                          IF ( .NOT. data_output_2d_on_each_pe  &
@@ -1829 +1833 @@
 !--                In case of parallel output, this is only done by PE0
 !--                to increase the performance.
-                   IF ( simulated_time /= do2d_yz_last_time(av) )  THEN
+                   IF ( time_since_reference_point /= do2d_yz_last_time(av) )  THEN
                       do2d_yz_time_count(av) = do2d_yz_time_count(av) + 1
-                      do2d_yz_last_time(av)  = simulated_time
+                      do2d_yz_last_time(av)  = time_since_reference_point
                       IF ( myid == 0 )  THEN
                          IF ( .NOT. data_output_2d_on_each_pe  &