Changeset 2232 for palm/trunk/SOURCE/subsidence_mod.f90
- Timestamp:
- May 30, 2017 5:47:52 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/subsidence_mod.f90
r2101 r2232 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! Adjustments to new topography and surface concept 23 23 ! 24 24 ! Former revisions: … … 195 195 196 196 USE indices, & 197 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nz b_s_inner,&198 nzt197 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt, & 198 wall_flags_0 199 199 200 200 USE kinds … … 225 225 DO j = nys, nyn 226 226 227 DO k = nzb _s_inner(j,i)+1, nzt227 DO k = nzb+1, nzt 228 228 IF ( w_subs(k) < 0.0_wp ) THEN ! large-scale subsidence 229 229 tmp_tend = - w_subs(k) * & 230 ( var(k+1,j,i) - var(k,j,i) ) * ddzu(k+1) 230 ( var(k+1,j,i) - var(k,j,i) ) * ddzu(k+1) * & 231 MERGE( 1.0_wp, 0.0_wp, & 232 BTEST( wall_flags_0(k,j,i), 0 ) ) 231 233 ELSE ! large-scale ascent 232 234 tmp_tend = - w_subs(k) * & 233 ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) 235 ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) * & 236 MERGE( 1.0_wp, 0.0_wp, & 237 BTEST( wall_flags_0(k,j,i), 0 ) ) 234 238 ENDIF 235 239 … … 238 242 IF ( large_scale_forcing ) THEN 239 243 sums_ls_l(k,ls_index) = sums_ls_l(k,ls_index) + tmp_tend & 240 * weight_substep(intermediate_timestep_count) 244 * weight_substep(intermediate_timestep_count) & 245 * MERGE( 1.0_wp, 0.0_wp, & 246 BTEST( wall_flags_0(k,j,i), 0 ) ) 241 247 ENDIF 242 248 ENDDO … … 304 310 305 311 USE indices, & 306 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb _s_inner, nzb, nzt312 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb, nzt, wall_flags_0 307 313 308 314 USE kinds … … 330 336 ! 331 337 !-- Influence of w_subsidence on the current tendency term 332 DO k = nzb _s_inner(j,i)+1, nzt338 DO k = nzb+1, nzt 333 339 IF ( w_subs(k) < 0.0_wp ) THEN ! large-scale subsidence 334 tmp_tend = - w_subs(k) * ( var(k+1,j,i) - var(k,j,i) ) * ddzu(k+1) 340 tmp_tend = - w_subs(k) * ( var(k+1,j,i) - var(k,j,i) ) & 341 * ddzu(k+1) & 342 * MERGE( 1.0_wp, 0.0_wp, & 343 BTEST( wall_flags_0(k,j,i), 0 ) ) 335 344 ELSE ! large-scale ascent 336 tmp_tend = - w_subs(k) * ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) 345 tmp_tend = - w_subs(k) * ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) & 346 * MERGE( 1.0_wp, 0.0_wp, & 347 BTEST( wall_flags_0(k,j,i), 0 ) ) 337 348 ENDIF 338 349 … … 341 352 IF ( large_scale_forcing ) THEN 342 353 sums_ls_l(k,ls_index) = sums_ls_l(k,ls_index) + tmp_tend & 343 * weight_substep(intermediate_timestep_count) 354 * weight_substep(intermediate_timestep_count)& 355 * MERGE( 1.0_wp, 0.0_wp, & 356 BTEST( wall_flags_0(k,j,i), 0 ) ) 344 357 ENDIF 345 358 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.