Changeset 1007 for palm/trunk/SOURCE/data_output_mask.f90
- Timestamp:
- Sep 19, 2012 2:30:36 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_mask.f90
r772 r1007 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! Bugfix: calculation of pr must depend on the particle weighting factor, 7 ! missing calculation of ql_vp added 6 8 ! 7 9 ! Former revisions: … … 159 161 s_r4 = 0.0 160 162 DO n = psi, psi+prt_count(k,j,i)-1 161 s_r3 = s_r3 + particles(n)%radius**3 162 s_r4 = s_r4 + particles(n)%radius**4 163 s_r3 = s_r3 + particles(n)%radius**3 * & 164 particles(n)%weight_factor 165 s_r4 = s_r4 + particles(n)%radius**4 * & 166 particles(n)%weight_factor 163 167 ENDDO 164 168 IF ( s_r3 /= 0.0 ) THEN … … 213 217 to_be_resorted => q_av 214 218 ENDIF 215 219 216 220 CASE ( 'ql' ) 217 221 IF ( av == 0 ) THEN … … 237 241 CASE ( 'ql_vp' ) 238 242 IF ( av == 0 ) THEN 239 to_be_resorted => ql_vp 240 ELSE 243 DO i = nxl, nxr 244 DO j = nys, nyn 245 DO k = nzb, nz_do3d 246 psi = prt_start_index(k,j,i) 247 DO n = psi, psi+prt_count(k,j,i)-1 248 tend(k,j,i) = tend(k,j,i) + & 249 particles(n)%weight_factor / & 250 prt_count(k,j,i) 251 ENDDO 252 ENDDO 253 ENDDO 254 ENDDO 255 CALL exchange_horiz( tend, nbgp ) 256 DO i = 1, mask_size_l(mid,1) 257 DO j = 1, mask_size_l(mid,2) 258 DO k = 1, mask_size_l(mid,3) 259 local_pf(i,j,k) = tend(mask_k(mid,k), & 260 mask_j(mid,j),mask_i(mid,i)) 261 ENDDO 262 ENDDO 263 ENDDO 264 resorted = .TRUE. 265 ELSE 266 CALL exchange_horiz( ql_vp_av, nbgp ) 241 267 to_be_resorted => ql_vp_av 242 268 ENDIF … … 264 290 to_be_resorted => rho_av 265 291 ENDIF 266 292 267 293 CASE ( 's' ) 268 294 IF ( av == 0 ) THEN … … 271 297 to_be_resorted => s_av 272 298 ENDIF 273 299 274 300 CASE ( 'sa' ) 275 301 IF ( av == 0 ) THEN … … 278 304 to_be_resorted => sa_av 279 305 ENDIF 280 306 281 307 CASE ( 'u' ) 282 308 IF ( av == 0 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.