Changeset 56 for palm/trunk/SOURCE/diffusion_w.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_w.f90 (modified) (5 diffs)

palm/trunk/SOURCE/diffusion_w.f90

@@ -28 +28 @@
 ! Diffusion term of the w-component
 !------------------------------------------------------------------------------!
+
+    USE wall_fluxes_mod
 
     PRIVATE
@@ -59 +61 @@
        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)      ::  wsus, wsvs
        REAL, DIMENSION(:,:,:), POINTER ::  km, u, v, w
-
+       REAL, DIMENSION(nzb:nzt+1,nys:nyn,nxl:nxr) ::  wsus, wsvs
+
+
+!
+!--    First calculate horizontal momentum flux w'u' and/or w'v' at vertical
+!--    walls, if neccessary
+       IF ( topography /= 'flat' )  THEN
+          CALL wall_fluxes( wsus, 0.0, 0.0, 0.0, 1.0, 0, 0, nzb_w_inner, &
+                            nzb_w_outer, wall_w_x )
+          CALL wall_fluxes( wsvs, 0.0, 0.0, 1.0, 0.0, 0, 0, nzb_w_inner, &
+                            nzb_w_outer, wall_w_y )
+       ENDIF
 
        DO  i = nxl, nxr
@@ -115 +127 @@
              IF ( wall_w_x(j,i) /= 0.0  .OR.  wall_w_y(j,i) /= 0.0 )  THEN
 
-!
-!--             Calculate the horizontal momentum fluxes w'u' and/or w'v'
-                IF ( wall_w_x(j,i) /= 0.0 )  THEN
-                   CALL wall_fluxes( i, j, nzb_w_inner(j,i)+1,              &
-                                     nzb_w_outer(j,i), wsus, 0.0, 0.0, 0.0, &
-                                     1.0 )
-                ELSE
-                   wsus = 0.0
-                ENDIF
-
-                IF ( wall_w_y(j,i) /= 0.0 )  THEN
-                   CALL wall_fluxes( i, j, nzb_w_inner(j,i)+1,              &
-                                     nzb_w_outer(j,i), wsvs, 0.0, 0.0, 1.0, &
-                                     0.0 )
-                ELSE
-                   wsvs = 0.0
-                ENDIF
-
                 DO  k = nzb_w_inner(j,i)+1, nzb_w_outer(j,i)
 !
@@ -171 +165 @@
                           + kmxm_z * ( u(k+1,j,i)   - u(k,j,i)   ) * ddzu(k+1) &
                                                    )                           &
-                                     + wall_w_x(j,i) * wsus(k)                 &
+                                     + wall_w_x(j,i) * wsus(k,j,i)             &
                                    ) * ddx                                     &
                                  + (   fwyp(j,i) * (                           &
@@ -181 +175 @@
                           + kmym_z * ( v(k+1,j,i)   - v(k,j,i)   ) * ddzu(k+1) &
                                                    )                           &
-                                     + wall_w_y(j,i) * wsvs(k)                 &
+                                     + wall_w_y(j,i) * wsvs(k,j,i)             &
                                    ) * ddy                                     &
                                  + 2.0 * (                                     &