Ignore:
Timestamp:
Jun 18, 2019 10:32:41 AM (2 years ago)
Author:
suehring
Message:

diagnostic output: Modularize diagnostic output, rename subroutines; formatting adjustments; allocate arrays only when required; add output of uu, vv, ww to enable variance calculation via temporal EC method; radiation: bugfix in masked data output; flow_statistics: Correct conversion to kinematic vertical scalar fluxes in case of pw-scheme and statistic regions

File:
1 edited

Legend:

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

    r4029 r4039  
    2525! -----------------
    2626! $Id$
     27! Rename subroutines in module for diagnostic quantities
     28!
     29! 4029 2019-06-14 14:04:35Z raasch
    2730! exchange of ghost points and boundary conditions separated for chemical species and SALSA module,
    2831! bugfix: decycling of chemistry species after nesting data transfer
     
    578581
    579582    USE diagnostic_output_quantities_mod,                                                          &
    580         ONLY:  diagnostic_output_quantities_calculate,                                             &
     583        ONLY:  doq_calculate,                                                                      &
    581584               timestep_number_at_prev_calc
    582585
     
    17301733          IF ( time_do_sla >= dt_averaging_input )  THEN
    17311734             IF ( current_timestep_number > timestep_number_at_prev_calc )                         &
    1732                 CALL diagnostic_output_quantities_calculate
     1735                CALL doq_calculate
    17331736
    17341737             CALL sum_up_3d_data
     
    18111814       IF ( time_do2d_xy >= dt_do2d_xy  .AND.  time_since_reference_point >= skip_time_do2d_xy )  THEN
    18121815          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
    1813              CALL diagnostic_output_quantities_calculate
     1816             CALL doq_calculate
    18141817
    18151818          CALL data_output_2d( 'xy', 0 )
     
    18191822          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
    18201823
    1821              CALL diagnostic_output_quantities_calculate
     1824             CALL doq_calculate
    18221825          CALL data_output_2d( 'xz', 0 )
    18231826          time_do2d_xz = MOD( time_do2d_xz, MAX( dt_do2d_xz, dt_3d ) )
     
    18251828       IF ( time_do2d_yz >= dt_do2d_yz  .AND.  time_since_reference_point >= skip_time_do2d_yz )  THEN
    18261829          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
    1827              CALL diagnostic_output_quantities_calculate
     1830             CALL doq_calculate
    18281831
    18291832          CALL data_output_2d( 'yz', 0 )
     
    18351838       IF ( time_do3d >= dt_do3d  .AND.  time_since_reference_point >= skip_time_do3d )  THEN
    18361839          IF ( current_timestep_number > timestep_number_at_prev_calc )                            &
    1837              CALL diagnostic_output_quantities_calculate
     1840             CALL doq_calculate
    18381841
    18391842          CALL data_output_3d( 0 )
     
    18471850               .AND.  time_since_reference_point >= skip_time_domask(mid) )  THEN
    18481851             IF ( current_timestep_number > timestep_number_at_prev_calc )                         &
    1849                 CALL diagnostic_output_quantities_calculate
     1852                CALL doq_calculate
    18501853
    18511854             CALL data_output_mask( 0 )
Note: See TracChangeset for help on using the changeset viewer.