Ignore:
Timestamp:
Dec 14, 2017 5:12:51 PM (4 years ago)
Author:
kanani
Message:

Merge of branch palm4u into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/average_3d_data.f90

    r2292 r2696  
    11!> @file average_3d_data.f90
    22!------------------------------------------------------------------------------!
    3 ! This file is part of PALM.
     3! This file is part of the PALM model system.
    44!
    55! PALM is free software: you can redistribute it and/or modify it under the
     
    2525! -----------------
    2626! $Id$
     27! Implement call for turbulence_closure_mod (TG)
     28! Implementation of chemistry module (FK)
     29!
     30! 2292 2017-06-20 09:51:42Z schwenkel
    2731! Implementation of new microphysic scheme: cloud_scheme = 'morrison'
    2832! includes two more prognostic equations for cloud drop concentration (nc) 
     
    112116    USE averaging
    113117
     118#if defined( __chem )
     119    USE chemistry_model_mod,                                                   &
     120        ONLY:  chem_3d_data_averaging
     121#endif
     122
    114123    USE control_parameters,                                                    &
    115         ONLY:  average_count_3d, doav, doav_n, land_surface, urban_surface,    &
    116                varnamelength
     124        ONLY:  air_chemistry, average_count_3d, doav, doav_n, land_surface,    &
     125               urban_surface, varnamelength
    117126
    118127    USE cpulog,                                                                &
     
    130139        ONLY:  radiation, radiation_3d_data_averaging
    131140
     141    USE turbulence_closure_mod,                                                &
     142        ONLY:  tcm_3d_data_averaging
     143
    132144    USE urban_surface_mod,                                                     &
    133145        ONLY:  usm_average_3d_data
     146
     147
    134148
    135149
     
    459473          CASE DEFAULT
    460474!
     475!--          Turbulence closure module
     476             CALL tcm_3d_data_averaging( 'average', doav(ii) )
     477
     478!
    461479!--          Land surface quantity
    462480             IF ( land_surface )  THEN
    463481                CALL lsm_3d_data_averaging( 'average', doav(ii) )
    464482             ENDIF
    465 
    466483!
    467484!--          Radiation quantity
     
    469486                CALL radiation_3d_data_averaging( 'average', doav(ii) )
    470487             ENDIF
    471 
     488!
     489!--          Chemistry quantity
     490#if defined( __chem )
     491             IF ( air_chemistry )  THEN
     492                CALL chem_3d_data_averaging( 'average', doav(ii) )
     493             ENDIF
     494#endif
    472495!
    473496!--          User-defined quantity
Note: See TracChangeset for help on using the changeset viewer.