Changeset 2232 for palm/trunk/SOURCE/advec_u_up.f90
- Timestamp:
- May 30, 2017 5:47:52 PM (7 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/advec_u_up.f90 (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_u_up.f90
r2101 r2232 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! topography representation via flags 23 23 ! 24 24 ! Former revisions: … … 95 95 96 96 USE indices, & 97 ONLY: nxlu, nxr, nyn, nys, nzb _u_inner, nzt97 ONLY: nxlu, nxr, nyn, nys, nzb, nzt, wall_flags_0 98 98 99 99 USE kinds … … 113 113 DO i = nxlu, nxr 114 114 DO j = nys, nyn 115 DO k = nzb _u_inner(j,i)+1, nzt115 DO k = nzb+1, nzt 116 116 ! 117 117 !-- x-direction … … 119 119 IF ( ukomp > 0.0_wp ) THEN 120 120 tend(k,j,i) = tend(k,j,i) - ukomp * & 121 ( u(k,j,i) - u(k,j,i-1) ) * ddx 121 ( u(k,j,i) - u(k,j,i-1) ) * ddx & 122 * MERGE( 1.0_wp, 0.0_wp, & 123 BTEST( wall_flags_0(k,j,i), 1 ) ) 122 124 ELSE 123 125 tend(k,j,i) = tend(k,j,i) - ukomp * & 124 ( u(k,j,i+1) - u(k,j,i) ) * ddx 126 ( u(k,j,i+1) - u(k,j,i) ) * ddx & 127 * MERGE( 1.0_wp, 0.0_wp, & 128 BTEST( wall_flags_0(k,j,i), 1 ) ) 125 129 ENDIF 126 130 ! … … 130 134 IF ( vkomp > 0.0_wp ) THEN 131 135 tend(k,j,i) = tend(k,j,i) - vkomp * & 132 ( u(k,j,i) - u(k,j-1,i) ) * ddy 136 ( u(k,j,i) - u(k,j-1,i) ) * ddy & 137 * MERGE( 1.0_wp, 0.0_wp, & 138 BTEST( wall_flags_0(k,j,i), 1 ) ) 133 139 ELSE 134 140 tend(k,j,i) = tend(k,j,i) - vkomp * & 135 ( u(k,j+1,i) - u(k,j,i) ) * ddy 141 ( u(k,j+1,i) - u(k,j,i) ) * ddy & 142 * MERGE( 1.0_wp, 0.0_wp, & 143 BTEST( wall_flags_0(k,j,i), 1 ) ) 136 144 ENDIF 137 145 ! … … 141 149 IF ( wkomp > 0.0_wp ) THEN 142 150 tend(k,j,i) = tend(k,j,i) - wkomp * & 143 ( u(k,j,i) - u(k-1,j,i) ) * ddzu(k) 151 ( u(k,j,i) - u(k-1,j,i) ) * ddzu(k) & 152 * MERGE( 1.0_wp, 0.0_wp, & 153 BTEST( wall_flags_0(k,j,i), 1 ) ) 144 154 ELSE 145 155 tend(k,j,i) = tend(k,j,i) - wkomp * & 146 ( u(k+1,j,i) - u(k,j,i) ) * ddzu(k+1) 156 ( u(k+1,j,i) - u(k,j,i) ) * ddzu(k+1) & 157 * MERGE( 1.0_wp, 0.0_wp, & 158 BTEST( wall_flags_0(k,j,i), 1 ) ) 147 159 ENDIF 148 160 … … 171 183 172 184 USE indices, & 173 ONLY: nzb _u_inner, nzt185 ONLY: nzb, nzt, wall_flags_0 174 186 175 187 USE kinds … … 187 199 188 200 189 DO k = nzb _u_inner(j,i)+1, nzt201 DO k = nzb+1, nzt 190 202 ! 191 203 !-- x-direction … … 193 205 IF ( ukomp > 0.0_wp ) THEN 194 206 tend(k,j,i) = tend(k,j,i) - ukomp * & 195 ( u(k,j,i) - u(k,j,i-1) ) * ddx 207 ( u(k,j,i) - u(k,j,i-1) ) * ddx & 208 * MERGE( 1.0_wp, 0.0_wp, & 209 BTEST( wall_flags_0(k,j,i), 1 ) ) 196 210 ELSE 197 211 tend(k,j,i) = tend(k,j,i) - ukomp * & 198 ( u(k,j,i+1) - u(k,j,i) ) * ddx 212 ( u(k,j,i+1) - u(k,j,i) ) * ddx & 213 * MERGE( 1.0_wp, 0.0_wp, & 214 BTEST( wall_flags_0(k,j,i), 1 ) ) 199 215 ENDIF 200 216 ! … … 204 220 IF ( vkomp > 0.0_wp ) THEN 205 221 tend(k,j,i) = tend(k,j,i) - vkomp * & 206 ( u(k,j,i) - u(k,j-1,i) ) * ddy 222 ( u(k,j,i) - u(k,j-1,i) ) * ddy & 223 * MERGE( 1.0_wp, 0.0_wp, & 224 BTEST( wall_flags_0(k,j,i), 1 ) ) 207 225 ELSE 208 226 tend(k,j,i) = tend(k,j,i) - vkomp * & 209 ( u(k,j+1,i) - u(k,j,i) ) * ddy 227 ( u(k,j+1,i) - u(k,j,i) ) * ddy & 228 * MERGE( 1.0_wp, 0.0_wp, & 229 BTEST( wall_flags_0(k,j,i), 1 ) ) 210 230 ENDIF 211 231 ! … … 214 234 IF ( wkomp > 0.0_wp ) THEN 215 235 tend(k,j,i) = tend(k,j,i) - wkomp * & 216 ( u(k,j,i) - u(k-1,j,i) ) * ddzu(k) 236 ( u(k,j,i) - u(k-1,j,i) ) * ddzu(k) & 237 * MERGE( 1.0_wp, 0.0_wp, & 238 BTEST( wall_flags_0(k,j,i), 1 ) ) 217 239 ELSE 218 240 tend(k,j,i) = tend(k,j,i) - wkomp * & 219 ( u(k+1,j,i) - u(k,j,i) ) * ddzu(k+1) 241 ( u(k+1,j,i) - u(k,j,i) ) * ddzu(k+1) & 242 * MERGE( 1.0_wp, 0.0_wp, & 243 BTEST( wall_flags_0(k,j,i), 1 ) ) 220 244 ENDIF 221 245
Note: See TracChangeset
for help on using the changeset viewer.
