Changeset 4346 for palm/trunk/SOURCE/subsidence_mod.f90
- Timestamp:
- Dec 18, 2019 11:55:56 AM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/subsidence_mod.f90
r4329 r4346 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduction of wall_flags_total_0, which currently sets bits based on static 28 ! topography information used in wall_flags_static_0 29 ! 30 ! 4329 2019-12-10 15:46:36Z motisi 27 31 ! Renamed wall_flags_0 to wall_flags_static_0 28 32 ! … … 155 159 USE indices, & 156 160 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt, & 157 wall_flags_ static_0161 wall_flags_total_0 158 162 159 163 USE kinds … … 189 193 ( var(k+1,j,i) - var(k,j,i) ) * ddzu(k+1) * & 190 194 MERGE( 1.0_wp, 0.0_wp, & 191 BTEST( wall_flags_static_0(k,j,i), 0 ) )195 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 192 196 ELSE ! large-scale ascent 193 197 tmp_tend = - w_subs(k) * & 194 198 ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) * & 195 199 MERGE( 1.0_wp, 0.0_wp, & 196 BTEST( wall_flags_static_0(k,j,i), 0 ) )200 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 197 201 ENDIF 198 202 … … 203 207 * weight_substep(intermediate_timestep_count) & 204 208 * MERGE( 1.0_wp, 0.0_wp, & 205 BTEST( wall_flags_static_0(k,j,i), 0 ) )209 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 206 210 ENDIF 207 211 ENDDO … … 269 273 270 274 USE indices, & 271 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb, nzt, wall_flags_static_0 275 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb, nzt, & 276 wall_flags_total_0 272 277 273 278 USE kinds … … 300 305 * ddzu(k+1) & 301 306 * MERGE( 1.0_wp, 0.0_wp, & 302 BTEST( wall_flags_static_0(k,j,i), 0 ) )307 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 303 308 ELSE ! large-scale ascent 304 309 tmp_tend = - w_subs(k) * ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) & 305 310 * MERGE( 1.0_wp, 0.0_wp, & 306 BTEST( wall_flags_static_0(k,j,i), 0 ) )311 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 307 312 ENDIF 308 313 … … 313 318 * weight_substep(intermediate_timestep_count)& 314 319 * MERGE( 1.0_wp, 0.0_wp, & 315 BTEST( wall_flags_static_0(k,j,i), 0 ) )320 BTEST( wall_flags_total_0(k,j,i), 0 ) ) 316 321 ENDIF 317 322 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.