Changeset 3994 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

May 22, 2019 6:08:09 PM (3 years ago)

Author:

suehring

Message:

new module for diagnostic output quantities added + output of turbulence intensity

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (6 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! output of turbulence intensity added
+! 
+! 3988 2019-05-22 11:32:37Z kanani
 ! Implement steerable output interval for virtual measurements
 ! 
@@ -561 +564 @@
     USE date_and_time_mod,                                                                         &
         ONLY:  calc_date_and_time, hour_call_emis, hour_of_year
+
+    USE diagnostic_output_quantities_mod,                                                          &
+        ONLY:  diagnostic_output_quantities_calculate,                                             &
+               timestep_number_at_prev_calc
 
     USE flight_mod,                                                                                &
@@ -1655 +1662 @@
           time_do_sla = time_do_sla + dt_3d
           IF ( time_do_sla >= dt_averaging_input )  THEN
+             IF ( current_timestep_number > timestep_number_at_prev_calc )                         &
+                CALL diagnostic_output_quantities_calculate
+
              CALL sum_up_3d_data
              average_count_3d = average_count_3d + 1
@@ -1733 +1743 @@
 !--    2d-data output (cross-sections)
        IF ( time_do2d_xy >= dt_do2d_xy  .AND.  time_since_reference_point >= skip_time_do2d_xy )  THEN
+          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
+             CALL diagnostic_output_quantities_calculate
+
           CALL data_output_2d( 'xy', 0 )
           time_do2d_xy = MOD( time_do2d_xy, MAX( dt_do2d_xy, dt_3d ) )
        ENDIF
        IF ( time_do2d_xz >= dt_do2d_xz  .AND.  time_since_reference_point >= skip_time_do2d_xz )  THEN
+          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
+
+             CALL diagnostic_output_quantities_calculate
           CALL data_output_2d( 'xz', 0 )
           time_do2d_xz = MOD( time_do2d_xz, MAX( dt_do2d_xz, dt_3d ) )
        ENDIF
        IF ( time_do2d_yz >= dt_do2d_yz  .AND.  time_since_reference_point >= skip_time_do2d_yz )  THEN
+          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
+             CALL diagnostic_output_quantities_calculate
+
           CALL data_output_2d( 'yz', 0 )
           time_do2d_yz = MOD( time_do2d_yz, MAX( dt_do2d_yz, dt_3d ) )
@@ -1748 +1767 @@
 !--    3d-data output (volume data)
        IF ( time_do3d >= dt_do3d  .AND.  time_since_reference_point >= skip_time_do3d )  THEN
+          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
+             CALL diagnostic_output_quantities_calculate
+
           CALL data_output_3d( 0 )
           time_do3d = MOD( time_do3d, MAX( dt_do3d, dt_3d ) )
@@ -1757 +1779 @@
           IF ( time_domask(mid) >= dt_domask(mid)                                                  &
                .AND.  time_since_reference_point >= skip_time_domask(mid) )  THEN
+             IF ( current_timestep_number > timestep_number_at_prev_calc )                         &
+                CALL diagnostic_output_quantities_calculate
+
              CALL data_output_mask( 0 )
              time_domask(mid) = MOD( time_domask(mid), MAX( dt_domask(mid), dt_3d ) )