Changeset 56 for palm/trunk/SOURCE/diffusion_u.f90

Timestamp:

Mar 8, 2007 1:57:07 PM (17 years ago)

Author:

raasch

Message:

further checkin of preliminary changes

File:

• palm/trunk/SOURCE/diffusion_u.f90 (modified) (4 diffs)

palm/trunk/SOURCE/diffusion_u.f90

@@ -34 +34 @@
 !------------------------------------------------------------------------------!
 
+    USE wall_fluxes_mod
+
     PRIVATE
     PUBLIC diffusion_u
@@ -61 +63 @@
        REAL    ::  z0(nys-1:nyn+1,nxl-1:nxr+1)
        REAL    ::  tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1)
-       REAL, DIMENSION(nzb:nzt+1)      ::  usvs
        REAL, DIMENSION(:,:),   POINTER ::  usws
        REAL, DIMENSION(:,:,:), POINTER ::  km, u, v, w
+       REAL, DIMENSION(nzb:nzt+1,nys:nyn,nxl:nxr+uxrp) ::  usvs
+
+!
+!--    First calculate horizontal momentum flux u'v' at vertical walls,
+!--    if neccessary
+       IF ( topography /= 'flat' )  THEN
+          CALL wall_fluxes( usvs, 1.0, 0.0, 0.0, 0.0, uxrp, 0, nzb_u_inner, &
+                            nzb_u_outer, wall_u )
+       ENDIF
 
        DO  i = nxl, nxr+uxrp
@@ -103 +113 @@
 !--          Wall functions at the north and south walls, respectively
              IF ( wall_u(j,i) /= 0.0 )  THEN
-
-!
-!--             Calculate the horizontal momentum flux u'v'
-                CALL wall_fluxes( i, j, nzb_u_inner(j,i)+1, nzb_u_outer(j,i),  &
-                                  usvs, 1.0, 0.0, 0.0, 0.0 )
 
                 DO  k = nzb_u_inner(j,i)+1, nzb_u_outer(j,i)
@@ -139 +144 @@
                                 + kmym_x * ( v(k,j,i) - v(k,j,i-1) ) * ddx     &
                                                   )                            &
-                                     + wall_u(j,i) * usvs(k)                   &
+                                     + wall_u(j,i) * usvs(k,j,i)               &
                                    ) * ddy
                 ENDDO