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

Timestamp:

Jun 6, 2019 12:16:46 PM (6 years ago)

Author:

schwenkel

Message:

Modularization of all lagrangian particle model code components

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -544 +544 @@
                do_sum, dt_3d, dt_averaging_input, dt_averaging_input_pr, dt_coupling,              &
                dt_data_output_av, dt_disturb, dt_do2d_xy, dt_do2d_xz, dt_do2d_yz, dt_do3d,         &
-               dt_domask,dt_dopts, dt_dopr, dt_dopr_listing, dt_dots, dt_dvrp, dt_run_control,     &
+               dt_domask,dt_dopts, dt_dopr, dt_dopr_listing, dt_dots, dt_run_control,              &
                end_time, first_call_lpm, first_call_mas, galilei_transformation, humidity,         &
                indoor_model, intermediate_timestep_count, intermediate_timestep_count_max,         &
@@ -557 +557 @@
                time_do2d_xz, time_do2d_yz, time_do3d, time_domask, time_dopr, time_dopr_av,        &
                time_dopr_listing, time_dopts, time_dosp, time_dosp_av, time_dots, time_do_av,      &
-               time_do_sla, time_disturb, time_dvrp, time_run_control, time_since_reference_point, &
+               time_do_sla, time_disturb, time_run_control, time_since_reference_point,            &
                turbulent_inflow, turbulent_outflow, urban_surface,                                 &
                use_initial_profile_as_reference, use_single_reference_value, u_gtrans, v_gtrans,   &
@@ -591 +591 @@
         ONLY:  lsm_boundary_condition, lsm_energy_balance, lsm_soil_model, skip_time_do_lsm
 
-    USE lpm_mod,                                                                                   &
-        ONLY:  lpm
+    USE lagrangian_particle_model_mod,                                                             &
+        ONLY:  lpm_data_output_ptseries
 
     USE lsf_nudging_mod,                                                                           &
@@ -846 +846 @@
        ENDIF
     ENDIF
-
-#if defined( __dvrp_graphics )
-!
-!-- Time measurement with dvrp software  
-    CALL DVRP_LOG_EVENT( 2, current_timestep_number )
-#endif
 
     CALL location_message( 'atmosphere (and/or ocean) time-stepping', 'start' )
@@ -1003 +997 @@
                .AND.  intermediate_timestep_count == 1 )                                           &
           THEN
-             CALL lpm
+             CALL module_interface_actions( 'after_prognostic_equations' )
              first_call_lpm = .FALSE.
           ENDIF
@@ -1541 +1535 @@
           ENDIF
        ENDDO
-       time_dvrp          = time_dvrp        + dt_3d
        IF ( time_since_reference_point >= skip_time_dosp )  THEN
           time_dosp       = time_dosp        + dt_3d
@@ -1838 +1831 @@
                ( time_since_reference_point >= particle_advection_start  .AND.                     &
                  first_call_lpm ) )  THEN
-             CALL data_output_ptseries
+             CALL lpm_data_output_ptseries
              time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
           ENDIF
        ENDIF
-
-!
-!--    Output of dvrp-graphics (isosurface, particles, slicer)
-#if defined( __dvrp_graphics )
-       CALL DVRP_LOG_EVENT( -2, current_timestep_number-1 )
-#endif
-       IF ( time_dvrp >= dt_dvrp )  THEN
-          CALL data_output_dvrp
-          time_dvrp = MOD( time_dvrp, MAX( dt_dvrp, dt_3d ) )
-       ENDIF
-#if defined( __dvrp_graphics )
-       CALL DVRP_LOG_EVENT( 2, current_timestep_number )
-#endif
 
 !
@@ -1934 +1914 @@
     IF ( myid == 0 )  CALL finish_progress_bar
 
-#if defined( __dvrp_graphics )
-    CALL DVRP_LOG_EVENT( -2, current_timestep_number )
-#endif
-
     CALL location_message( 'atmosphere (and/or ocean) time-stepping', 'finished' )