Changeset 1353 for palm/trunk/SOURCE/buoyancy.f90
- Timestamp:
- Apr 8, 2014 3:21:23 PM (10 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/buoyancy.f90 (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/buoyancy.f90
r1328 r1353 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! REAL constants provided with KIND-attribute 23 23 ! 24 24 ! Former revisions: … … 133 133 DO j = nys, nyn 134 134 DO k = nzb_s_inner(j,i)+1, nzt-1 135 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5 * ( & 136 ( var(k,j,i) - ref_state(k) ) / ref_state(k) + & 137 ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) & 138 ) 135 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp * & 136 ( & 137 ( var(k,j,i) - ref_state(k) ) / ref_state(k) + & 138 ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) & 139 ) 139 140 ENDDO 140 141 ENDDO … … 154 155 DO k = nzb_s_inner(j,i)+1, nzt-1 155 156 tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface * & 156 0.5 * ( ( pt(k,j,i-1) + pt(k,j,i) ) &157 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &158 ) / pt_surface157 0.5_wp * ( ( pt(k,j,i-1) + pt(k,j,i) ) & 158 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) & 159 ) / pt_surface 159 160 ENDDO 160 161 ENDDO … … 167 168 DO k = nzb_s_inner(j,i)+1, nzt-1 168 169 tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface * & 169 0.5 * ( ( pt(k,j,i) + pt(k+1,j,i) ) &170 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &171 ) / pt_surface170 0.5_wp * ( ( pt(k,j,i) + pt(k+1,j,i) ) & 171 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) & 172 ) / pt_surface 172 173 ENDDO 173 174 ENDDO … … 231 232 !$acc loop independent vector 232 233 DO k = nzb_s_inner(j,i)+1, nzt-1 233 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5 * ( & 234 ( var(k,j,i) - ref_state(k) ) / ref_state(k) + & 235 ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) & 236 ) 234 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp * & 235 ( & 236 ( var(k,j,i) - ref_state(k) ) / ref_state(k) + & 237 ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) & 238 ) 237 239 ENDDO 238 240 ENDDO … … 253 255 DO k = nzb_s_inner(j,i)+1, nzt-1 254 256 tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface * & 255 0.5 * ( ( pt(k,j,i-1) + pt(k,j,i) ) &256 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &257 ) / pt_surface257 0.5_wp * ( ( pt(k,j,i-1) + pt(k,j,i) ) & 258 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) & 259 ) / pt_surface 258 260 ENDDO 259 261 ENDDO … … 266 268 DO k = nzb_s_inner(j,i)+1, nzt-1 267 269 tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface * & 268 0.5 * ( ( pt(k,j,i) + pt(k+1,j,i) ) &269 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &270 ) / pt_surface270 0.5_wp * ( ( pt(k,j,i) + pt(k+1,j,i) ) & 271 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) & 272 ) / pt_surface 271 273 ENDDO 272 274 ENDDO … … 328 330 !-- Normal case: horizontal surface 329 331 DO k = nzb_s_inner(j,i)+1, nzt-1 330 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5 * (&332 tend(k,j,i) = tend(k,j,i) + atmos_ocean_sign * g * 0.5_wp * ( & 331 333 ( var(k,j,i) - ref_state(k) ) / ref_state(k) + & 332 334 ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) & 333 )335 ) 334 336 ENDDO 335 337 … … 345 347 DO k = nzb_s_inner(j,i)+1, nzt-1 346 348 tend(k,j,i) = tend(k,j,i) + g * sin_alpha_surface * & 347 0.5 * ( ( pt(k,j,i-1) + pt(k,j,i) ) &348 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &349 ) / pt_surface349 0.5_wp * ( ( pt(k,j,i-1) + pt(k,j,i) ) & 350 - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) & 351 ) / pt_surface 350 352 ENDDO 351 353 … … 354 356 DO k = nzb_s_inner(j,i)+1, nzt-1 355 357 tend(k,j,i) = tend(k,j,i) + g * cos_alpha_surface * & 356 0.5 * ( ( pt(k,j,i) + pt(k+1,j,i) ) &357 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &358 ) / pt_surface358 0.5_wp * ( ( pt(k,j,i) + pt(k+1,j,i) ) & 359 - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) & 360 ) / pt_surface 359 361 ENDDO 360 362 … … 430 432 !$OMP PARALLEL PRIVATE( i, j, k, tn ) 431 433 !$ tn = omp_get_thread_num() 432 sums_l(:,pr,tn) = 0.0 434 sums_l(:,pr,tn) = 0.0_wp 433 435 !$OMP DO 434 436 DO i = nxl, nxr
Note: See TracChangeset
for help on using the changeset viewer.
