Changeset 3538 for palm/trunk/SOURCE/advec_v_up.f90
- Timestamp:
- Nov 20, 2018 10:55:41 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_v_up.f90
r2718 r3538 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Remove unnecessary double-masking of topography 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 104 107 105 108 USE indices, & 106 ONLY: nxl, nxr, nyn, nysv, nzb, nzt , wall_flags_0109 ONLY: nxl, nxr, nyn, nysv, nzb, nzt 107 110 108 111 USE kinds … … 129 132 IF ( ukomp > 0.0_wp ) THEN 130 133 tend(k,j,i) = tend(k,j,i) - ukomp * & 131 ( v(k,j,i) - v(k,j,i-1) ) * ddx & 132 * MERGE( 1.0_wp, 0.0_wp, & 133 BTEST( wall_flags_0(k,j,i), 2 ) ) 134 ( v(k,j,i) - v(k,j,i-1) ) * ddx 134 135 ELSE 135 136 tend(k,j,i) = tend(k,j,i) - ukomp * & 136 ( v(k,j,i+1) - v(k,j,i) ) * ddx & 137 * MERGE( 1.0_wp, 0.0_wp, & 138 BTEST( wall_flags_0(k,j,i), 2 ) ) 137 ( v(k,j,i+1) - v(k,j,i) ) * ddx 139 138 ENDIF 140 139 ! … … 143 142 IF ( vkomp > 0.0_wp ) THEN 144 143 tend(k,j,i) = tend(k,j,i) - vkomp * & 145 ( v(k,j,i) - v(k,j-1,i) ) * ddy & 146 * MERGE( 1.0_wp, 0.0_wp, & 147 BTEST( wall_flags_0(k,j,i), 2 ) ) 144 ( v(k,j,i) - v(k,j-1,i) ) * ddy 148 145 ELSE 149 146 tend(k,j,i) = tend(k,j,i) - vkomp * & 150 ( v(k,j+1,i) - v(k,j,i) ) * ddy & 151 * MERGE( 1.0_wp, 0.0_wp, & 152 BTEST( wall_flags_0(k,j,i), 2 ) ) 147 ( v(k,j+1,i) - v(k,j,i) ) * ddy 153 148 ENDIF 154 149 ! … … 158 153 IF ( wkomp > 0.0_wp ) THEN 159 154 tend(k,j,i) = tend(k,j,i) - wkomp * & 160 ( v(k,j,i) - v(k-1,j,i) ) * ddzu(k) & 161 * MERGE( 1.0_wp, 0.0_wp, & 162 BTEST( wall_flags_0(k,j,i), 2 ) ) 155 ( v(k,j,i) - v(k-1,j,i) ) * ddzu(k) 163 156 ELSE 164 157 tend(k,j,i) = tend(k,j,i) - wkomp * & 165 ( v(k+1,j,i) - v(k,j,i) ) * ddzu(k+1) & 166 * MERGE( 1.0_wp, 0.0_wp, & 167 BTEST( wall_flags_0(k,j,i), 2 ) ) 158 ( v(k+1,j,i) - v(k,j,i) ) * ddzu(k+1) 168 159 ENDIF 169 160 … … 192 183 193 184 USE indices, & 194 ONLY: nzb, nzt , wall_flags_0185 ONLY: nzb, nzt 195 186 196 187 USE kinds … … 215 206 IF ( ukomp > 0.0_wp ) THEN 216 207 tend(k,j,i) = tend(k,j,i) - ukomp * & 217 ( v(k,j,i) - v(k,j,i-1) ) * ddx & 218 * MERGE( 1.0_wp, 0.0_wp, & 219 BTEST( wall_flags_0(k,j,i), 2 ) ) 208 ( v(k,j,i) - v(k,j,i-1) ) * ddx 220 209 ELSE 221 210 tend(k,j,i) = tend(k,j,i) - ukomp * & 222 ( v(k,j,i+1) - v(k,j,i) ) * ddx & 223 * MERGE( 1.0_wp, 0.0_wp, & 224 BTEST( wall_flags_0(k,j,i), 2 ) ) 211 ( v(k,j,i+1) - v(k,j,i) ) * ddx 225 212 ENDIF 226 213 ! … … 229 216 IF ( vkomp > 0.0_wp ) THEN 230 217 tend(k,j,i) = tend(k,j,i) - vkomp * & 231 ( v(k,j,i) - v(k,j-1,i) ) * ddy & 232 * MERGE( 1.0_wp, 0.0_wp, & 233 BTEST( wall_flags_0(k,j,i), 2 ) ) 218 ( v(k,j,i) - v(k,j-1,i) ) * ddy 234 219 ELSE 235 220 tend(k,j,i) = tend(k,j,i) - vkomp * & 236 ( v(k,j+1,i) - v(k,j,i) ) * ddy & 237 * MERGE( 1.0_wp, 0.0_wp, & 238 BTEST( wall_flags_0(k,j,i), 2 ) ) 221 ( v(k,j+1,i) - v(k,j,i) ) * ddy 239 222 ENDIF 240 223 ! … … 243 226 IF ( wkomp > 0.0_wp ) THEN 244 227 tend(k,j,i) = tend(k,j,i) - wkomp * & 245 ( v(k,j,i) - v(k-1,j,i) ) * ddzu(k) & 246 * MERGE( 1.0_wp, 0.0_wp, & 247 BTEST( wall_flags_0(k,j,i), 2 ) ) 228 ( v(k,j,i) - v(k-1,j,i) ) * ddzu(k) 248 229 ELSE 249 230 tend(k,j,i) = tend(k,j,i) - wkomp * & 250 ( v(k+1,j,i) - v(k,j,i) ) * ddzu(k+1) & 251 * MERGE( 1.0_wp, 0.0_wp, & 252 BTEST( wall_flags_0(k,j,i), 2 ) ) 231 ( v(k+1,j,i) - v(k,j,i) ) * ddzu(k+1) 253 232 ENDIF 254 233
Note: See TracChangeset
for help on using the changeset viewer.