Changeset 4142

Timestamp:

Aug 5, 2019 12:38:31 PM (5 years ago)

Author:

suehring

Message:

Consider spinup in number of output timesteps for averaged 2D output

File:

• palm/trunk/SOURCE/check_parameters.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Consider spinup in number of output timesteps for averaged 2D output (merge
+! from branch resler).
+! 
+! 4069 2019-07-01 14:05:51Z Giersch
 ! Masked output running index mid has been introduced as a local variable to 
 ! avoid runtime error (Loop variable has been modified) in time_integration
@@ -3365 +3369 @@
           ntdim_2d_yz(0) = ntdim_2d_yz(0) + 1
        ENDIF
-
-       ntdim_2d_xy(1) = do2d_xy_time_count(1) + CEILING(                       &
-                        ( end_time - MAX( skip_time_data_output_av,            &
-                                          simulated_time_at_begin )            &
-                        ) / dt_data_output_av )
-
-       ntdim_2d_xz(1) = do2d_xz_time_count(1) + CEILING(                       &
-                        ( end_time - MAX( skip_time_data_output_av,            &
-                                          simulated_time_at_begin )            &
-                                 ) / dt_data_output_av )
-
-       ntdim_2d_yz(1) = do2d_yz_time_count(1) + CEILING(                       &
-                        ( end_time - MAX( skip_time_data_output_av,            &
-                                          simulated_time_at_begin )            &
-                        ) / dt_data_output_av )
+!
+!--    Please note, for averaged 2D data skip_time_data_output_av is the relavant 
+!--    output control parameter. 
+       ntdim_2d_xy(1) = do2d_xy_time_count(1) + CEILING(                              &
+                     ( end_time - MAX( MERGE( skip_time_data_output_av,               &
+                                              skip_time_data_output_av + spinup_time, &
+                                              data_output_during_spinup ),            &
+                                       simulated_time_at_begin )                      &
+                     ) / dt_data_output_av )
+
+       ntdim_2d_xz(1) = do2d_xz_time_count(1) + CEILING(                              &
+                     ( end_time - MAX( MERGE( skip_time_data_output_av,               &
+                                              skip_time_data_output_av + spinup_time, &
+                                              data_output_during_spinup ),            &
+                                       simulated_time_at_begin )                      &
+                     ) / dt_data_output_av )
+
+       ntdim_2d_yz(1) = do2d_yz_time_count(1) + CEILING(                              &
+                     ( end_time - MAX( MERGE( skip_time_data_output_av,               &
+                                              skip_time_data_output_av + spinup_time, &
+                                              data_output_during_spinup ),            &
+                                       simulated_time_at_begin )                      &
+                     ) / dt_data_output_av )
 
     ENDIF