Changeset 3786 for palm/trunk
- Timestamp:
- Mar 6, 2019 4:58:03 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 4 edited
-
bulk_cloud_model_mod.f90 (modified) (4 diffs)
-
indoor_model_mod.f90 (modified) (7 diffs)
-
land_surface_model_mod.f90 (modified) (4 diffs)
-
mod_particle_attributes.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/bulk_cloud_model_mod.f90
r3767 r3786 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unsed variables removed 28 ! 29 ! 3767 2019-02-27 08:18:02Z raasch 27 30 ! unused variable for file index removed from rrd-subroutines parameter list 28 31 ! … … 723 726 724 727 USE statistics, & 725 ONLY: hom, statistic_regions , pr_palm728 ONLY: hom, statistic_regions 726 729 727 730 IMPLICIT NONE … … 821 824 IMPLICIT NONE 822 825 823 INTEGER(iwp) :: i !<824 INTEGER(iwp) :: j !<825 INTEGER(iwp) :: k !<826 826 ! 827 827 !-- Liquid water content … … 893 893 INTEGER(iwp) :: i !< 894 894 INTEGER(iwp) :: j !< 895 INTEGER(iwp) :: k !<896 895 897 896 CALL location_message( 'initializing bulk cloud module', .FALSE. ) -
palm/trunk/SOURCE/indoor_model_mod.f90
r3759 r3786 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variables removed 29 ! 30 ! 3759 2019-02-21 15:53:45Z suehring 28 31 ! - Calculation of total building volume 29 32 ! - Several bugfixes … … 161 164 162 165 INTEGER(iwp) :: num_build !< total number of buildings in domain 163 164 REAL(wp) :: volume_fraction165 166 REAL(wp), DIMENSION(:), ALLOCATABLE :: t_in !< dummy array for indoor temperature for the167 !< total building volume at each discrete height level168 REAL(wp), DIMENSION(:), ALLOCATABLE :: t_in_l !< dummy array for indoor temperature for the169 !< local building volume fraction at each discrete height level170 166 171 167 ! … … 205 201 REAL(wp) :: phi_sol !< [W] solar loads 206 202 REAL(wp) :: phi_st !<! [W] mass specific thermal load implied non thermal mass 207 REAL(wp) :: q_emission !< emissions, in first version = 0, option for second part of the project203 ! REAL(wp) :: q_emission !< emissions, in first version = 0, option for second part of the project 208 204 REAL(wp) :: q_wall_win !< heat flux from indoor into wall/window 209 205 REAL(wp) :: q_waste_heat !< waste heat, sum of waste heat over the roof to Palm 210 REAL(wp) :: q_waste_heat_bldg !< [W/building] waste heat of the complete building, in Palm sum of all indoor_model-calculations206 ! REAL(wp) :: q_waste_heat_bldg !< [W/building] waste heat of the complete building, in Palm sum of all indoor_model-calculations 211 207 REAL(wp) :: schedule_d !< activation for internal loads (low or high + low) 212 208 REAL(wp) :: skip_time_do_indoor = 0.0_wp !< [s] Indoor model is not called before this time … … 222 218 REAL(wp) :: theta_s !<! [degree_C] surface temperature of the RC-node 223 219 REAL(wp) :: time_indoor = 0.0_wp !< [s] time since last call of indoor model 224 REAL(wp) :: time_utc_hour !< Time in hours per day (UTC) 225 REAL(wp) :: ventilation_int_loads !< Zuteilung der GebÀude fÃŒr Verlauf/AktivitÀt der LÃŒftung und internen Lasten 220 ! REAL(wp) :: time_utc_hour !< Time in hours per day (UTC) 226 221 227 222 REAL(wp) :: f_sr !< [-] factor surface reduction … … 405 400 406 401 INTEGER(iwp) :: bt !< local building type 407 INTEGER(iwp) :: fa !< running index for facade elements of each building408 402 INTEGER(iwp) :: i !< running index along x-direction 409 403 INTEGER(iwp) :: j !< running index along y-direction … … 434 428 INTEGER(iwp), DIMENSION(0:numprocs-1) :: num_buildings_l !< number of buildings with different ID on local subdomain 435 429 436 REAL(wp), DIMENSION(:), ALLOCATABLE :: local_weight !< dummy representing fraction of local on total building volume,437 !< height dependent438 430 REAL(wp), DIMENSION(:), ALLOCATABLE :: volume !< total building volume at each discrete height level 439 431 REAL(wp), DIMENSION(:), ALLOCATABLE :: volume_l !< total building volume at each discrete height level, … … 984 976 USE arrays_3d, & 985 977 ONLY: ddzw, dzw 986 987 USE basic_constants_and_equations_mod, &988 ONLY: c_p989 990 USE control_parameters, &991 ONLY: rho_surface992 978 993 979 USE date_and_time_mod, & -
palm/trunk/SOURCE/land_surface_model_mod.f90
r3767 r3786 25 25 ! ----------------- 26 26 ! $Id$ 27 ! further unused variables removed 28 ! 29 ! 3767 2019-02-27 08:18:02Z raasch 27 30 ! unused variable for file index removed from rrd-subroutines parameter list 28 31 ! … … 2584 2587 2585 2588 INTEGER(iwp) :: i !< running index 2586 INTEGER(iwp) :: i_off !< index offset of surface element, seen from atmospheric grid point2587 2589 INTEGER(iwp) :: j !< running index 2588 INTEGER(iwp) :: j_off !< index offset of surface element, seen from atmospheric grid point2589 2590 INTEGER(iwp) :: k !< running index 2590 2591 INTEGER(iwp) :: kn !< running index … … 6561 6562 IMPLICIT NONE 6562 6563 6563 INTEGER(iwp) :: i !<6564 6564 INTEGER(iwp) :: k !< 6565 6565 INTEGER(iwp) :: l !< running index surface orientation … … 7262 7262 IMPLICIT NONE 7263 7263 7264 INTEGER(iwp) :: i, j, k, l,m !< running indices7264 INTEGER(iwp) :: i, j, k, m !< running indices 7265 7265 7266 7266 -
palm/trunk/SOURCE/mod_particle_attributes.f90
r3720 r3786 25 25 ! ----------------- 26 26 ! $Id$ 27 ! interoperable C datatypes introduced in particle type to avoid compiler warnings 28 ! 29 ! 3720 2019-02-06 13:19:55Z knoop 27 30 ! time_prel replaced by last_particle_release_time 28 31 ! … … 217 220 REAL(wp), DIMENSION(:), ALLOCATABLE :: log_z_z0 !< Precalculate LOG(z/z0) 218 221 219 222 ! 223 !-- WARNING: For compatibility of derived types, the BIND attribute is required, and interoperable C 224 !-- datatypes must be used. These type are hard wired here! So changes in working precision (wp, iwp) 225 !-- will not affect the particle_type! 226 !-- The main reason for introducing the interoperable datatypes was to avoid compiler warnings of 227 !-- the gfortran compiler. 228 !-- The BIND attribite is required because of C_F_POINTER usage in the pmc particle interface. 220 229 TYPE, BIND(C) :: particle_type 221 REAL( wp):: aux1 !< auxiliary multi-purpose feature222 REAL( wp):: aux2 !< auxiliary multi-purpose feature223 REAL( wp):: radius !< radius of particle224 REAL( wp):: age !< age of particle225 REAL( wp):: age_m !<226 REAL( wp):: dt_sum !<227 REAL( wp):: e_m !< interpolated sgs tke228 REAL( wp):: origin_x !< origin x-position of particle (changed cyclic bc)229 REAL( wp):: origin_y !< origin y-position of particle (changed cyclic bc)230 REAL( wp):: origin_z !< origin z-position of particle (changed cyclic bc)231 REAL( wp):: rvar1 !<232 REAL( wp):: rvar2 !<233 REAL( wp):: rvar3 !<234 REAL( wp):: speed_x !< speed of particle in x235 REAL( wp):: speed_y !< speed of particle in y236 REAL( wp):: speed_z !< speed of particle in z237 REAL( wp):: weight_factor !< weighting factor238 REAL( wp):: x !< x-position239 REAL( wp):: y !< y-position240 REAL( wp):: z !< z-position241 INTEGER( iwp) :: class !< radius class needed for collision242 INTEGER( iwp) :: group !< number of particle group243 INTEGER( idp) :: id !< particle ID (64 bit integer)230 REAL(C_DOUBLE) :: aux1 !< auxiliary multi-purpose feature 231 REAL(C_DOUBLE) :: aux2 !< auxiliary multi-purpose feature 232 REAL(C_DOUBLE) :: radius !< radius of particle 233 REAL(C_DOUBLE) :: age !< age of particle 234 REAL(C_DOUBLE) :: age_m !< 235 REAL(C_DOUBLE) :: dt_sum !< 236 REAL(C_DOUBLE) :: e_m !< interpolated sgs tke 237 REAL(C_DOUBLE) :: origin_x !< origin x-position of particle (changed cyclic bc) 238 REAL(C_DOUBLE) :: origin_y !< origin y-position of particle (changed cyclic bc) 239 REAL(C_DOUBLE) :: origin_z !< origin z-position of particle (changed cyclic bc) 240 REAL(C_DOUBLE) :: rvar1 !< 241 REAL(C_DOUBLE) :: rvar2 !< 242 REAL(C_DOUBLE) :: rvar3 !< 243 REAL(C_DOUBLE) :: speed_x !< speed of particle in x 244 REAL(C_DOUBLE) :: speed_y !< speed of particle in y 245 REAL(C_DOUBLE) :: speed_z !< speed of particle in z 246 REAL(C_DOUBLE) :: weight_factor !< weighting factor 247 REAL(C_DOUBLE) :: x !< x-position 248 REAL(C_DOUBLE) :: y !< y-position 249 REAL(C_DOUBLE) :: z !< z-position 250 INTEGER(C_INT) :: class !< radius class needed for collision 251 INTEGER(C_INT) :: group !< number of particle group 252 INTEGER(C_LONG_LONG) :: id !< particle ID (64 bit integer) 244 253 LOGICAL(C_BOOL) :: particle_mask !< if this parameter is set to false the particle will be deleted 245 INTEGER( iwp) :: block_nr !< number for sorting (removable?)254 INTEGER(C_INT) :: block_nr !< number for sorting (removable?) 246 255 END TYPE particle_type 247 256
Note: See TracChangeset
for help on using the changeset viewer.
