Changeset 4157 for palm


Ignore:
Timestamp:
Aug 14, 2019 9:19:12 AM (21 months ago)
Author:
suehring
Message:

chem_emissions: Replace global arrays also in mode_emis branch; diagnostic output: restructure initialization in order to work also when data output during spin-up is enabled; radiation: give informative message on raytracing distance only by core zero not by all cores

Location:
palm/trunk/SOURCE
Files:
4 edited

Legend:

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

    r4154 r4157  
    2727! -----------------
    2828! $Id$
     29! Replace global arrays also in mode_emis branch
     30!
     31! 4154 2019-08-13 13:35:59Z suehring
    2932! Replace global arrays for emissions by local ones.
    3033!
     
    899902
    900903                IF  (  .NOT.  ALLOCATED( emis_distribution) )  THEN
    901                    ALLOCATE( emis_distribution(1,0:ny,0:nx,n_matched_vars) )
     904                   ALLOCATE( emis_distribution(1,nys:nyn,nxl:nxr,n_matched_vars) )
    902905                ENDIF
    903906
     
    907910
    908911                IF  (  .NOT.  ALLOCATED( emis_distribution) )  THEN
    909                    ALLOCATE( emis_distribution(1,0:ny,0:nx,n_matched_vars) )
     912                   ALLOCATE( emis_distribution(1,nys:nyn,nxl:nxr,n_matched_vars) )
    910913                ENDIF
    911914
     
    915918
    916919                IF  (  .NOT.  ALLOCATED( emis_distribution) )  THEN
    917                    ALLOCATE( emis_distribution(nzb:nzt+1,0:ny,0:nx,n_matched_vars) )
     920                   ALLOCATE( emis_distribution(nzb:nzt+1,nys:nyn,nxl:nxr,n_matched_vars) )
    918921                ENDIF
    919922 
  • palm/trunk/SOURCE/diagnostic_output_quantities_mod.f90

    r4132 r4157  
    2525! -----------------
    2626! $Id$
     27! Initialization restructured, in order to work also when data output during
     28! spin-up is enabled.
     29!
     30! 4132 2019-08-02 12:34:17Z suehring
    2731! Bugfix in masked data output
    2832!
     
    158162           doq_output_mask,                                                    &
    159163           doq_init,                                                           &
    160            doq_prepare,                                                        &
    161164           doq_wrd_local
    162165!          doq_rrd_local,                                                      &
     
    816819   
    817820    INTEGER(iwp) ::  ivar   !< loop index over all 2d/3d/mask output quantities
     821
    818822!
    819823!-- Next line is to avoid compiler warnings about unused variables
    820824    IF ( timestep_number_at_prev_calc == 0 )  CONTINUE
     825!
     826!-- Preparatory steps and initialization of output arrays
     827    IF ( .NOT.  prepared_diagnostic_output_quantities )  CALL doq_prepare
    821828
    822829    initialized_diagnostic_output_quantities = .FALSE.
     
    882889
    883890!     CALL cpu_log( log_point(41), 'calculate_quantities', 'start' )
    884 !
    885 !-- Preparatory steps and initialization of output arrays
    886     IF ( .NOT.  prepared_diagnostic_output_quantities )     CALL doq_prepare
    887     IF ( .NOT.  initialized_diagnostic_output_quantities )  CALL doq_init
     891
    888892!
    889893!-- Save timestep number to check in time_integration if doq_calculate
  • palm/trunk/SOURCE/module_interface.f90

    r4132 r4157  
    2525! -----------------
    2626! $Id$
     27! Call doq_init from module interface
     28!
     29! 4132 2019-08-02 12:34:17Z suehring
    2730! Bugfix in masked data output for diagnostic quantities
    2831!
     
    270273               doq_check_data_output,                                          &
    271274               doq_define_netcdf_grid,                                         &
     275               doq_init,                                                       &
    272276               doq_output_2d,                                                  &
    273277               doq_output_3d,                                                  &
     
    10301034    IF ( radiation           )  CALL radiation_init
    10311035
     1036    CALL doq_init
     1037
    10321038    IF ( user_module_enabled )  CALL user_init
    10331039
  • palm/trunk/SOURCE/radiation_model_mod.f90

    r4148 r4157  
    2828! -----------------
    2929! $Id$
     30! Give informative message on raytracing distance only by core zero
     31!
     32! 4148 2019-08-08 11:26:00Z suehring
    3033! Comments added
    3134!
     
    63016304          WRITE(message_string, '(a,f6.1)') 'Max_raytracing_dist is set less than ' // &
    63026305               'double the urban surface layer height, i.e. ', mrl
    6303           CALL message('radiation_interaction_init', 'PA0521', 0, 0, -1, 6, 0)
     6306          CALL message('radiation_interaction_init', 'PA0521', 0, 0, 0, 6, 0 )
    63046307       ENDIF
    63056308!        IF ( max_raytracing_dist <= mrl ) THEN
Note: See TracChangeset for help on using the changeset viewer.