Changeset 4329 for palm/trunk/SOURCE/subsidence_mod.f90
- Timestamp:
- Dec 10, 2019 3:46:36 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/subsidence_mod.f90
r4182 r4329 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Renamed wall_flags_0 to wall_flags_static_0 28 ! 29 ! 4182 2019-08-22 15:20:23Z scharf 27 30 ! Corrected "Former revisions" section 28 31 ! … … 152 155 USE indices, & 153 156 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt, & 154 wall_flags_ 0157 wall_flags_static_0 155 158 156 159 USE kinds … … 186 189 ( var(k+1,j,i) - var(k,j,i) ) * ddzu(k+1) * & 187 190 MERGE( 1.0_wp, 0.0_wp, & 188 BTEST( wall_flags_ 0(k,j,i), 0 ) )191 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 189 192 ELSE ! large-scale ascent 190 193 tmp_tend = - w_subs(k) * & 191 194 ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) * & 192 195 MERGE( 1.0_wp, 0.0_wp, & 193 BTEST( wall_flags_ 0(k,j,i), 0 ) )196 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 194 197 ENDIF 195 198 … … 200 203 * weight_substep(intermediate_timestep_count) & 201 204 * MERGE( 1.0_wp, 0.0_wp, & 202 BTEST( wall_flags_ 0(k,j,i), 0 ) )205 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 203 206 ENDIF 204 207 ENDDO … … 266 269 267 270 USE indices, & 268 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb, nzt, wall_flags_ 0271 ONLY: nxl, nxlg, nxrg, nyng, nys, nysg, nzb, nzt, wall_flags_static_0 269 272 270 273 USE kinds … … 297 300 * ddzu(k+1) & 298 301 * MERGE( 1.0_wp, 0.0_wp, & 299 BTEST( wall_flags_ 0(k,j,i), 0 ) )302 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 300 303 ELSE ! large-scale ascent 301 304 tmp_tend = - w_subs(k) * ( var(k,j,i) - var(k-1,j,i) ) * ddzu(k) & 302 305 * MERGE( 1.0_wp, 0.0_wp, & 303 BTEST( wall_flags_ 0(k,j,i), 0 ) )306 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 304 307 ENDIF 305 308 … … 310 313 * weight_substep(intermediate_timestep_count)& 311 314 * MERGE( 1.0_wp, 0.0_wp, & 312 BTEST( wall_flags_ 0(k,j,i), 0 ) )315 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 313 316 ENDIF 314 317 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.