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

Timestamp:

Feb 6, 2019 1:10:18 PM (5 years ago)

Author:

kanani

Message:

Correct and clean-up cpu_logs, some overlapping counts (chemistry_model_mod, disturb_heatflux, large_scale_forcing_nudging_mod, ocean_mod, palm, prognostic_equations, synthetic_turbulence_generator_mod, time_integration, time_integration_spinup, turbulence_closure_mod)

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - removed wind_turbine cpu measurement, since same time is measured inside
+!   wtm_forces subroutine as special measures
+! - moved the numerous vnest cpulog to special measures
+! - extended radiation cpulog over entire radiation part,
+!   moved radiation_interactions cpulog to special measures
+! - moved some cpu_log calls to this routine for better overview
+! 
+! 3705 2019-01-29 19:56:39Z suehring
 ! Data output for virtual measurements added
 ! 
@@ -795 +803 @@
        IF ( vnested ) THEN
           IF ( .NOT. vnest_init  .AND.  simulated_time >= vnest_start_time )  THEN
-             CALL cpu_log( log_point(80), 'vnest_init', 'start' )
+             CALL cpu_log( log_point_s(22), 'vnest_init', 'start' )
              CALL vnest_init_fine
              vnest_init = .TRUE.
-             CALL cpu_log( log_point(80), 'vnest_init', 'stop' )
+             CALL cpu_log( log_point_s(22), 'vnest_init', 'stop' )
           ENDIF
        ENDIF
@@ -841 +849 @@
 !
 !--    Calculate forces by wind turbines
-       IF ( wind_turbine )  THEN
-
-          CALL cpu_log( log_point(55), 'wind_turbine', 'start' )
-
-          CALL wtm_forces
-
-          CALL cpu_log( log_point(55), 'wind_turbine', 'stop' )
-
-       ENDIF   
+       IF ( wind_turbine )  CALL wtm_forces  
        
 !
@@ -1049 +1049 @@
 !--       Vertical nesting: Interpolate fine grid data to the coarse grid
           IF ( vnest_init ) THEN
-             CALL cpu_log( log_point(81), 'vnest_anterpolate', 'start' )
+             CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'start' )
              CALL vnest_anterpolate
-             CALL cpu_log( log_point(81), 'vnest_anterpolate', 'stop' )
+             CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'stop' )
           ENDIF
 
@@ -1125 +1125 @@
 !
 !--       Impose a turbulent inflow using the recycling method
-          IF ( turbulent_inflow )  CALL  inflow_turbulence
+          IF ( turbulent_inflow )  CALL inflow_turbulence
 
 !
 !--       Set values at outflow boundary using the special outflow condition
-          IF ( turbulent_outflow )  CALL  outflow_turbulence
+          IF ( turbulent_outflow )  CALL outflow_turbulence
 
 !
@@ -1170 +1170 @@
 !--       only once per time step.
           IF ( use_syn_turb_gen  .AND.  time_stg_call >= dt_stg_call  .AND.    &
-             intermediate_timestep_count == intermediate_timestep_count_max )  THEN! &
+             intermediate_timestep_count == intermediate_timestep_count_max )  THEN
+             CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' )
              CALL stg_main
+             CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' )
           ENDIF
 !
@@ -1191 +1193 @@
                 IF ( coupling_mode == 'vnested_crse' )  CALL pres
 
-                CALL cpu_log( log_point(82), 'vnest_bc', 'start' )
+                CALL cpu_log( log_point_s(30), 'vnest_bc', 'start' )
                 CALL vnest_boundary_conds
-                CALL cpu_log( log_point(82), 'vnest_bc', 'stop' )
+                CALL cpu_log( log_point_s(30), 'vnest_bc', 'stop' )
  
                 IF ( coupling_mode == 'vnested_fine' )  CALL pres
 
 !--             Anterpolate TKE, satisfy Germano Identity
-                CALL cpu_log( log_point(83), 'vnest_anter_e', 'start' )
+                CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'start' )
                 CALL vnest_anterpolate_e
-                CALL cpu_log( log_point(83), 'vnest_anter_e', 'stop' )
+                CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'stop' )
 
              ELSE
@@ -1347 +1349 @@
                 CALL radiation_control
 
-                CALL cpu_log( log_point(50), 'radiation', 'stop' )
-
                 IF ( ( urban_surface  .OR.  land_surface )  .AND.               &
                      radiation_interactions )  THEN
-                   CALL cpu_log( log_point(75), 'radiation_interaction', 'start' )
+                   CALL cpu_log( log_point_s(75), 'radiation_interaction', 'start' )
                    CALL radiation_interaction
-                   CALL cpu_log( log_point(75), 'radiation_interaction', 'stop' )
+                   CALL cpu_log( log_point_s(75), 'radiation_interaction', 'stop' )
                 ENDIF
     
@@ -1359 +1359 @@
 !--             Return the current time to its original value
                 time_since_reference_point = time_since_reference_point_save
+
+                CALL cpu_log( log_point(50), 'radiation', 'stop' )
 
              ENDIF
@@ -1477 +1479 @@
           IF ( parametrize_inflow_turbulence )  THEN
              time_stg_adjust = time_stg_adjust + dt_3d
-             IF ( time_stg_adjust >= dt_stg_adjust )  CALL stg_adjust
+             IF ( time_stg_adjust >= dt_stg_adjust )  THEN
+                CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' )
+                CALL stg_adjust
+                CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' )
+             ENDIF
           ENDIF
           time_stg_call = time_stg_call + dt_3d
@@ -1745 +1751 @@
 
 !
-!--    If required, set the heat flux for the next time step at a random value
+!--    If required, set the heat flux for the next time step to a random value
        IF ( constant_heatflux  .AND.  random_heatflux )  THEN
-          IF ( surf_def_h(0)%ns >= 1 )  CALL disturb_heatflux( surf_def_h(0) )
-          IF ( surf_lsm_h%ns    >= 1 )  CALL disturb_heatflux( surf_lsm_h    )
-          IF ( surf_usm_h%ns    >= 1 )  CALL disturb_heatflux( surf_usm_h    )
+          IF ( surf_def_h(0)%ns >= 1 )  THEN
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' )
+             CALL disturb_heatflux( surf_def_h(0) )
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' )
+          ENDIF
+          IF ( surf_lsm_h%ns    >= 1 )  THEN
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' )
+             CALL disturb_heatflux( surf_lsm_h    )
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' )
+          ENDIF
+          IF ( surf_usm_h%ns    >= 1 )  THEN
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' )
+             CALL disturb_heatflux( surf_usm_h    )
+             CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' )
+          ENDIF
        ENDIF