Ignore:
Timestamp:
Jul 19, 2018 8:45:38 AM (3 years ago)
Author:
raasch
Message:

output of PALM code revision number in palmrun header, some preprocessor define strings removed, small revisions in configuration files

File:
1 edited

Legend:

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

    r3136 r3151  
    2828! -----------------
    2929! $Id$
     30! remaining preprocessor define strings __check removed
     31!
     32! 3136 2018-07-16 14:48:21Z suehring
    3033! Limit also roughness length for heat and moisture where necessary
    3134!
     
    372375
    373376!-- configuration parameters (they can be setup in PALM config)
    374     LOGICAL                                        ::  usm_material_model = .TRUE.        !< flag parameter indicating wheather the  model of heat in materials is used
    375     LOGICAL                                        ::  usm_anthropogenic_heat = .FALSE.   !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used
    376     LOGICAL                                        ::  force_radiation_call_l = .FALSE.   !< flag parameter for unscheduled radiation model calls
    377     LOGICAL                                        ::  indoor_model = .FALSE.              !< whether to use the indoor model
    378     LOGICAL                                        ::  read_wall_temp_3d = .FALSE.
    379 
    380 
    381     INTEGER(iwp)                                   ::  building_type = 1                  !< default building type (preleminary setting)
    382     INTEGER(iwp)                                   ::  land_category = 2                  !< default category for land surface
    383     INTEGER(iwp)                                   ::  wall_category = 2                  !< default category for wall surface over pedestrian zone
    384     INTEGER(iwp)                                   ::  pedestrian_category = 2            !< default category for wall surface in pedestrian zone
    385     INTEGER(iwp)                                   ::  roof_category = 2                  !< default category for root surface
    386     REAL(wp)                                       ::  roughness_concrete = 0.001_wp      !< roughness length of average concrete surface
     377    LOGICAL ::  usm_material_model = .TRUE.        !< flag parameter indicating wheather the  model of heat in materials is used
     378    LOGICAL ::  usm_anthropogenic_heat = .FALSE.   !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used
     379    LOGICAL ::  force_radiation_call_l = .FALSE.   !< flag parameter for unscheduled radiation model calls
     380    LOGICAL ::  indoor_model = .FALSE.             !< whether to use the indoor model
     381    LOGICAL ::  read_wall_temp_3d = .FALSE.
     382
     383
     384    INTEGER(iwp) ::  building_type = 1               !< default building type (preleminary setting)
     385    INTEGER(iwp) ::  land_category = 2               !< default category for land surface
     386    INTEGER(iwp) ::  wall_category = 2               !< default category for wall surface over pedestrian zone
     387    INTEGER(iwp) ::  pedestrian_category = 2         !< default category for wall surface in pedestrian zone
     388    INTEGER(iwp) ::  roof_category = 2               !< default category for root surface
     389    REAL(wp)     ::  roughness_concrete = 0.001_wp   !< roughness length of average concrete surface
    387390!
    388391!-- Indices of input attributes for (above) ground floor level
     
    54625465            ENDIF
    54635466           
    5464 #if defined( __parallel ) && ! defined ( __check )
     5467#if defined( __parallel )
    54655468            CALL MPI_BARRIER( comm2d, ierr )
    54665469#endif
     
    54965499            ENDIF
    54975500           
    5498 #if defined( __parallel ) && ! defined ( __check )
     5501#if defined( __parallel )
    54995502            CALL MPI_BARRIER( comm2d, ierr )
    55005503#endif
     
    68166819
    68176820            ENDIF
    6818 #if defined( __parallel ) && ! defined ( __check )
     6821#if defined( __parallel )
    68196822            CALL MPI_BARRIER( comm2d, ierr )
    68206823#endif
    68216824        ENDDO
    68226825       
    6823         !
     6826!
    68246827!--     check completeness and formal correctness of the data
    68256828        DO i = nxlg, nxrg
     
    72537256                CALL message( 'usm_read_wall_temperature', 'PA0523', 1, 2, 0, 6, 0 )
    72547257            ENDIF
    7255 #if defined( __parallel ) && ! defined ( __check )
     7258#if defined( __parallel )
    72567259            CALL MPI_BARRIER( comm2d, ierr )
    72577260#endif
Note: See TracChangeset for help on using the changeset viewer.