Ignore:
Timestamp:
Jun 6, 2019 12:16:46 PM (4 years ago)
Author:
schwenkel
Message:

Modularization of all lagrangian particle model code components

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/time_integration.f90

    r4010 r4017  
    544544               do_sum, dt_3d, dt_averaging_input, dt_averaging_input_pr, dt_coupling,              &
    545545               dt_data_output_av, dt_disturb, dt_do2d_xy, dt_do2d_xz, dt_do2d_yz, dt_do3d,         &
    546                dt_domask,dt_dopts, dt_dopr, dt_dopr_listing, dt_dots, dt_dvrp, dt_run_control,     &
     546               dt_domask,dt_dopts, dt_dopr, dt_dopr_listing, dt_dots, dt_run_control,              &
    547547               end_time, first_call_lpm, first_call_mas, galilei_transformation, humidity,         &
    548548               indoor_model, intermediate_timestep_count, intermediate_timestep_count_max,         &
     
    557557               time_do2d_xz, time_do2d_yz, time_do3d, time_domask, time_dopr, time_dopr_av,        &
    558558               time_dopr_listing, time_dopts, time_dosp, time_dosp_av, time_dots, time_do_av,      &
    559                time_do_sla, time_disturb, time_dvrp, time_run_control, time_since_reference_point, &
     559               time_do_sla, time_disturb, time_run_control, time_since_reference_point,            &
    560560               turbulent_inflow, turbulent_outflow, urban_surface,                                 &
    561561               use_initial_profile_as_reference, use_single_reference_value, u_gtrans, v_gtrans,   &
     
    591591        ONLY:  lsm_boundary_condition, lsm_energy_balance, lsm_soil_model, skip_time_do_lsm
    592592
    593     USE lpm_mod,                                                                                   &
    594         ONLY:  lpm
     593    USE lagrangian_particle_model_mod,                                                             &
     594        ONLY:  lpm_data_output_ptseries
    595595
    596596    USE lsf_nudging_mod,                                                                           &
     
    846846       ENDIF
    847847    ENDIF
    848 
    849 #if defined( __dvrp_graphics )
    850 !
    851 !-- Time measurement with dvrp software 
    852     CALL DVRP_LOG_EVENT( 2, current_timestep_number )
    853 #endif
    854848
    855849    CALL location_message( 'atmosphere (and/or ocean) time-stepping', 'start' )
     
    1003997               .AND.  intermediate_timestep_count == 1 )                                           &
    1004998          THEN
    1005              CALL lpm
     999             CALL module_interface_actions( 'after_prognostic_equations' )
    10061000             first_call_lpm = .FALSE.
    10071001          ENDIF
     
    15411535          ENDIF
    15421536       ENDDO
    1543        time_dvrp          = time_dvrp        + dt_3d
    15441537       IF ( time_since_reference_point >= skip_time_dosp )  THEN
    15451538          time_dosp       = time_dosp        + dt_3d
     
    18381831               ( time_since_reference_point >= particle_advection_start  .AND.                     &
    18391832                 first_call_lpm ) )  THEN
    1840              CALL data_output_ptseries
     1833             CALL lpm_data_output_ptseries
    18411834             time_dopts = MOD( time_dopts, MAX( dt_dopts, dt_3d ) )
    18421835          ENDIF
    18431836       ENDIF
    1844 
    1845 !
    1846 !--    Output of dvrp-graphics (isosurface, particles, slicer)
    1847 #if defined( __dvrp_graphics )
    1848        CALL DVRP_LOG_EVENT( -2, current_timestep_number-1 )
    1849 #endif
    1850        IF ( time_dvrp >= dt_dvrp )  THEN
    1851           CALL data_output_dvrp
    1852           time_dvrp = MOD( time_dvrp, MAX( dt_dvrp, dt_3d ) )
    1853        ENDIF
    1854 #if defined( __dvrp_graphics )
    1855        CALL DVRP_LOG_EVENT( 2, current_timestep_number )
    1856 #endif
    18571837
    18581838!
     
    19341914    IF ( myid == 0 )  CALL finish_progress_bar
    19351915
    1936 #if defined( __dvrp_graphics )
    1937     CALL DVRP_LOG_EVENT( -2, current_timestep_number )
    1938 #endif
    1939 
    19401916    CALL location_message( 'atmosphere (and/or ocean) time-stepping', 'finished' )
    19411917
Note: See TracChangeset for help on using the changeset viewer.