Changeset 94 for palm/trunk/SOURCE/diffusion_e.f90

Timestamp:

Jun 1, 2007 3:25:22 PM (17 years ago)

Author:

raasch

Message:

preliminary uncomplete changes for ocean version

File:

• palm/trunk/SOURCE/diffusion_e.f90 (modified) (11 diffs)

palm/trunk/SOURCE/diffusion_e.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Adjustment of mixing length calculation for the ocean version. zw added to
+! argument list.
+! This is also a bugfix, because the height above the topography is now
+! used instead of the height above level k=0.
 !
 ! Former revisions:
@@ -48 +51 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, theta, &
-                            rif, tend, zu )
+                            rif, tend, zu, zw )
 
        USE control_parameters
@@ -60 +63 @@
        REAL            ::  dpt_dz, l_stable, phi_m
        REAL            ::  ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt+1), &
-                           l_grid(1:nzt), zu(0:nzt+1)
+                           l_grid(1:nzt), zu(0:nzt+1), zw(0:nzt+1)
        REAL, DIMENSION(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) :: diss, tend
        REAL, DIMENSION(:,:), POINTER   ::  rif
@@ -98 +101 @@
 !--                Adjustment of the mixing length
                    IF ( wall_adjustment )  THEN
-                      l(k,j)  = MIN( wall_adjustment_factor * zu(k), l_grid(k),&
-                                     l_stable )
-                      ll(k,j) = MIN( wall_adjustment_factor * zu(k), l_grid(k) )
+                      l(k,j)  = MIN( wall_adjustment_factor *          &
+                                     ( zu(k) - zw(nzb_s_inner(j,i)) ), &
+                                     l_grid(k), l_stable )
+                      ll(k,j) = MIN( wall_adjustment_factor *          &
+                                     ( zu(k) - zw(nzb_s_inner(j,i)) ), &
+                                     l_grid(k) )
                    ELSE
                       l(k,j)  = MIN( l_grid(k), l_stable )
@@ -106 +112 @@
                    ENDIF
                    IF ( adjust_mixing_length  .AND.  prandtl_layer )  THEN
-                      l(k,j)  = MIN( l(k,j),  kappa * zu(k) / phi_m )
-                      ll(k,j) = MIN( ll(k,j), kappa * zu(k) / phi_m )
+                      l(k,j)  = MIN( l(k,j),  kappa *                          &
+                                              ( zu(k) - zw(nzb_s_inner(j,i)) ) &
+                                              / phi_m )
+                      ll(k,j) = MIN( ll(k,j), kappa *                          &
+                                              ( zu(k) - zw(nzb_s_inner(j,i)) ) &
+                                              / phi_m )
                    ENDIF
 
@@ -180 +190 @@
 !--                Adjustment of the mixing length
                    IF ( wall_adjustment )  THEN
-                      l(k,j)  = MIN( wall_adjustment_factor * zu(k), l_grid(k),&
-                                     l_stable )
-                      ll(k,j) = MIN( wall_adjustment_factor * zu(k), l_grid(k) )
+                      l(k,j)  = MIN( wall_adjustment_factor *          &
+                                     ( zu(k) - zw(nzb_s_inner(j,i)) ), &
+                                     l_grid(k), l_stable )
+                      ll(k,j) = MIN( wall_adjustment_factor *          &
+                                     ( zu(k) - zw(nzb_s_inner(j,i)) ), &
+                                     l_grid(k) )
                    ELSE
                       l(k,j)  = MIN( l_grid(k), l_stable )
@@ -188 +201 @@
                    ENDIF
                    IF ( adjust_mixing_length  .AND.  prandtl_layer )  THEN
-                      l(k,j)  = MIN( l(k,j),  kappa * zu(k) / phi_m )
-                      ll(k,j) = MIN( ll(k,j), kappa * zu(k) / phi_m )
+                      l(k,j)  = MIN( l(k,j),  kappa *                          &
+                                              ( zu(k) - zw(nzb_s_inner(j,i)) ) &
+                                              / phi_m )
+                      ll(k,j) = MIN( ll(k,j), kappa *                          &
+                                              ( zu(k) - zw(nzb_s_inner(j,i)) ) &
+                                              / phi_m )
                    ENDIF
 
@@ -253 +270 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE diffusion_e_ij( i, j, ddzu, dd2zu, ddzw, diss, e, km, l_grid, &
-                               theta, rif, tend, zu )
+                               theta, rif, tend, zu, zw )
 
        USE control_parameters
@@ -265 +282 @@
        REAL            ::  dpt_dz, l_stable, phi_m
        REAL            ::  ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt+1), &
-                           l_grid(1:nzt), zu(0:nzt+1)
+                           l_grid(1:nzt), zu(0:nzt+1), zw(0:nzt+1)
        REAL, DIMENSION(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) ::  diss, tend
        REAL, DIMENSION(:,:), POINTER   ::  rif
@@ -301 +318 @@
 !--       Adjustment of the mixing length
           IF ( wall_adjustment )  THEN
-             l(k)  = MIN( wall_adjustment_factor * zu(k), l_grid(k), l_stable )
-             ll(k) = MIN( wall_adjustment_factor * zu(k), l_grid(k) )
+             l(k)  = MIN( wall_adjustment_factor *                     &
+                          ( zu(k) - zw(nzb_s_inner(j,i)) ), l_grid(k), &
+                          l_stable )
+             ll(k) = MIN( wall_adjustment_factor *                     &
+                          ( zu(k) - zw(nzb_s_inner(j,i)) ), l_grid(k) )
           ELSE
              l(k)  = MIN( l_grid(k), l_stable )
@@ -308 +328 @@
           ENDIF
           IF ( adjust_mixing_length  .AND.  prandtl_layer )  THEN
-             l(k)  = MIN( l(k),  kappa * zu(k) / phi_m )
-             ll(k) = MIN( ll(k), kappa * zu(k) / phi_m )
+             l(k)  = MIN( l(k),  kappa * &
+                                 ( zu(k) - zw(nzb_s_inner(j,i)) ) / phi_m )
+             ll(k) = MIN( ll(k), kappa * &
+                                 ( zu(k) - zw(nzb_s_inner(j,i)) ) / phi_m )
           ENDIF