Changeset 407 for palm/trunk/SOURCE

Timestamp:

Dec 1, 2009 3:01:15 PM (15 years ago)

Author:

maronga

Message:

humidity for non-flat topography implemented, re-adjustments for lcxt4

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (2 diffs)
• check_parameters.f90 (modified) (3 diffs)
• init_3d_model.f90 (modified) (2 diffs)
• parin.f90 (modified) (2 diffs)
• prognostic_equations.f90 (modified) (1 diff)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -1 +1 @@
 New:
 ---
+humidity=.T. is now usable for runs with topography. wall_humidityflux and 
+wall_scalarflux are the corresponding new parin arrays.
+(check_parameters, init_3d_model, parin)
 
+check parameters, init_3d_model, parin
 
 Changed:
@@ -19 +23 @@
 
 Bugfix: initial data assignments to some dvrp arrays changed due to error
-messages from gfortran compiler (modules=
+messages from gfortran compiler (modules)
 
 calc_precipitation, modules, sum_up_3d_data, time_integration

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Enabled passive scalar/humidity wall fluxes for non-flat topography
 !
 ! Former revisions:
@@ -331 +331 @@
        IF ( cloud_droplets )  THEN
           WRITE( action, '(A)' )  'cloud_droplets = .TRUE.'
-       ENDIF
-       IF ( humidity )  THEN
-          WRITE( action, '(A)' )  'humidity = .TRUE.'
        ENDIF
        IF ( .NOT. prandtl_layer )  THEN
@@ -858 +855 @@
           q_vertical_gradient_level = s_vertical_gradient_level
           surface_waterflux         = surface_scalarflux
+          wall_humidityflux         = wall_scalarflux
        ENDIF
 

palm/trunk/SOURCE/init_3d_model.f90

@@ -8 +8 @@
 ! -----------------
 ! var_ts is replaced by dots_max 
-!
+! Enabled passive scalar/humidity wall fluxes for non-flat topography
 !
 ! Former revisions:
@@ -735 +735 @@
              IF ( constant_waterflux )  THEN
                 qsws   = surface_waterflux
+!
+!--             Over topography surface_waterflux is replaced by 
+!--             wall_humidityflux(0)
+                IF ( TRIM( topography ) /= 'flat' )  THEN
+                   wall_qflux = wall_humidityflux
+                   DO  i = nxl-1, nxr+1
+                      DO  j = nys-1, nyn+1
+                         IF ( nzb_s_inner(j,i) /= 0 )  THEN
+                            qsws(j,i) = wall_qflux(0)
+                         ENDIF
+                      ENDDO
+                   ENDDO
+                ENDIF
                 IF ( ASSOCIATED( qsws_m ) )  qsws_m = qsws
              ENDIF

palm/trunk/SOURCE/parin.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! +wall_humidityflux, wall_scalarflux
 !
 ! Former revisions:
@@ -131 +131 @@
              use_surface_fluxes, use_top_fluxes, use_ug_for_galilei_tr, &
              use_upstream_for_tke, vg_surface, vg_vertical_gradient, &
-             vg_vertical_gradient_level, v_bulk, wall_adjustment, wall_heatflux
+             vg_vertical_gradient_level, v_bulk, wall_adjustment, &
+             wall_heatflux, wall_humidityflux, wall_scalarflux
 
 

palm/trunk/SOURCE/prognostic_equations.f90

@@ -405 +405 @@
        ENDIF
     ENDIF
-          
+
 !
 !-- pt-tendency terms with no communication