Changeset 129 for palm/trunk/SOURCE/diffusion_s.f90

Timestamp:

Oct 30, 2007 12:12:24 PM (16 years ago)

Author:

letzel

Message:

prognostic_equations include the respective wall_*flux in the parameter list of
calls of diffusion_s. Same as before, only the values of wall_heatflux(0:4)
can be assigned. At present, wall_humidityflux, wall_qflux, wall_salinityflux,
wall_scalarflux are kept zero. diffusion_s uses the respective wall_*flux
instead of wall_heatflux. This update serves two purposes:

• it avoids errors in calculations with humidity/scalar/salinity and prescribed

non-zero wall_heatflux,

• it prepares PALM for a possible assignment of wall fluxes of

humidity/scalar/salinity in a future release.

Bugfix: assignment of fluxes at walls

Updates to documentation:
chapter_4.2.html#mode_dvrp
chapter_3.5.4.html#time_series

Default for mrun options -q and -n is "sla3" for lctit. Queues bes1 and bes2
removed. DOC/misc/Tsubame.html updated.

Modified default paths (/work/...) for lctit in .mrun.config.default

File:

• palm/trunk/SOURCE/diffusion_s.f90 (modified) (7 diffs)

palm/trunk/SOURCE/diffusion_s.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! replace wall_heatflux by wall_s_flux that is now included in the parameter 
+! list, bugfix for assignment of fluxes at walls
 !
 ! Former revisions:
@@ -45 +46 @@
 ! Call for all grid points
 !------------------------------------------------------------------------------!
-    SUBROUTINE diffusion_s( ddzu, ddzw, kh, s, s_flux_b, s_flux_t, tend )
+    SUBROUTINE diffusion_s( ddzu, ddzw, kh, s, s_flux_b, s_flux_t, &
+                            wall_s_flux, tend )
 
        USE control_parameters
@@ -57 +59 @@
        REAL    ::  ddzu(1:nzt+1), ddzw(1:nzt+1)
        REAL    ::  tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1)
+       REAL    ::  wall_s_flux(0:4)
        REAL, DIMENSION(:,:),   POINTER ::  s_flux_b, s_flux_t
        REAL, DIMENSION(:,:,:), POINTER ::  kh, s
@@ -86 +89 @@
                                           + 0.5 * ( fwxp(j,i) *               &
                         ( kh(k,j,i) + kh(k,j,i+1) ) * ( s(k,j,i+1)-s(k,j,i) ) &
-                        - ( 1.0 - fwxp(j,i) ) * wall_heatflux(1)              &
+                        + ( 1.0 - fwxp(j,i) ) * wall_s_flux(1)                &
                                                    -fwxm(j,i) *               &
                         ( kh(k,j,i) + kh(k,j,i-1) ) * ( s(k,j,i)-s(k,j,i-1) ) &
-                        + ( 1.0 - fwxm(j,i) ) * wall_heatflux(3)              &
+                        + ( 1.0 - fwxm(j,i) ) * wall_s_flux(2)                &
                                                   ) * ddx2                    &
                                           + 0.5 * ( fwyp(j,i) *               &
                         ( kh(k,j,i) + kh(k,j+1,i) ) * ( s(k,j+1,i)-s(k,j,i) ) &
-                        - ( 1.0 - fwyp(j,i) ) * wall_heatflux(2)              &
+                        + ( 1.0 - fwyp(j,i) ) * wall_s_flux(3)                &
                                                    -fwym(j,i) *               &
                         ( kh(k,j,i) + kh(k,j-1,i) ) * ( s(k,j,i)-s(k,j-1,i) ) &
-                        + ( 1.0 - fwym(j,i) ) * wall_heatflux(4)              &
+                        + ( 1.0 - fwym(j,i) ) * wall_s_flux(4)                &
                                                   ) * ddy2
                 ENDDO
@@ -156 +159 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE diffusion_s_ij( i, j, ddzu, ddzw, kh, s, s_flux_b, s_flux_t, &
-                               tend )
+                               wall_s_flux, tend )
 
        USE control_parameters
@@ -168 +171 @@
        REAL    ::  ddzu(1:nzt+1), ddzw(1:nzt+1)
        REAL    ::  tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1)
+       REAL    ::  wall_s_flux(0:4)
        REAL, DIMENSION(:,:),   POINTER ::  s_flux_b, s_flux_t
        REAL, DIMENSION(:,:,:), POINTER ::  kh, s
@@ -195 +199 @@
                                           + 0.5 * ( fwxp(j,i) *               &
                         ( kh(k,j,i) + kh(k,j,i+1) ) * ( s(k,j,i+1)-s(k,j,i) ) &
-                        - ( 1.0 - fwxp(j,i) ) * wall_heatflux(1)              &
+                        + ( 1.0 - fwxp(j,i) ) * wall_s_flux(1)                &
                                                    -fwxm(j,i) *               &
                         ( kh(k,j,i) + kh(k,j,i-1) ) * ( s(k,j,i)-s(k,j,i-1) ) &
-                        + ( 1.0 - fwxm(j,i) ) * wall_heatflux(3)              &
+                        + ( 1.0 - fwxm(j,i) ) * wall_s_flux(2)                &
                                                   ) * ddx2                    &
                                           + 0.5 * ( fwyp(j,i) *               &
                         ( kh(k,j,i) + kh(k,j+1,i) ) * ( s(k,j+1,i)-s(k,j,i) ) &
-                        - ( 1.0 - fwyp(j,i) ) * wall_heatflux(2)              &
+                        + ( 1.0 - fwyp(j,i) ) * wall_s_flux(3)                &
                                                    -fwym(j,i) *               &
                         ( kh(k,j,i) + kh(k,j-1,i) ) * ( s(k,j,i)-s(k,j-1,i) ) &
-                        + ( 1.0 - fwym(j,i) ) * wall_heatflux(4)              &
+                        + ( 1.0 - fwym(j,i) ) * wall_s_flux(4)                &
                                                   ) * ddy2
           ENDDO