Changeset 531 for palm/trunk/SOURCE

Timestamp:

Apr 21, 2010 6:47:21 AM (14 years ago)

Author:

heinze

Message:

call of subsidence added in prognostic equations for humidity/passive scalar, some bugfixes

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• flow_statistics.f90 (modified) (2 diffs)
• modules.f90 (modified) (2 diffs)
• prognostic_equations.f90 (modified) (5 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: unit of hyp changed to dbar 
 !
 ! Former revisions:
@@ -2205 +2205 @@
           CASE ( 'hyp' )
              dopr_index(i) = 72
-             dopr_unit(i)  = 'kPa'
+             dopr_unit(i)  = 'dbar'
              hom(:,2,72,:) = SPREAD( zu, 2, statistic_regions+1 )
 

palm/trunk/SOURCE/flow_statistics.f90

@@ -880 +880 @@
        hom(:,1,39,sr) = sums(:,38) / ( sums(:,32) + 1E-20 )**1.5    ! Sw
        hom(:,1,40,sr) = sums(:,40)     ! p
-       hom(:,1,45,sr) = sums(:,45)     ! w"q"
+       hom(:,1,45,sr) = sums(:,45)     ! w"vpt"
        hom(:,1,46,sr) = sums(:,46)     ! w*vpt*       
        hom(:,1,47,sr) = sums(:,45) + sums(:,46)    ! wvpt
@@ -907 +907 @@
        hom(:,1,70,sr) = sums(:,70)     ! q*2
        hom(:,1,71,sr) = sums(:,71)     ! prho
-       hom(:,1,72,sr) = hyp * 1E-4     ! hyp in kPa
+       hom(:,1,72,sr) = hyp * 1E-4     ! hyp in dbar
 
        hom(:,1,pr_palm-1,sr) = sums(:,pr_palm-1)

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Current revisions:
 ! -----------------
-! 
+! character length of dopr_unit enlarged
 !
 ! Former revisions:
@@ -1019 +1019 @@
              ( 'unknown', i9 = 1, dots_max-23 ) /)
 
-    CHARACTER (LEN=7), DIMENSION(300) ::  dopr_unit = 'unknown'
+    CHARACTER (LEN=9), DIMENSION(300) ::  dopr_unit = 'unknown'
 
     CHARACTER (LEN=7), DIMENSION(0:1,100) ::  do2d_unit, do3d_unit

palm/trunk/SOURCE/prognostic_equations.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! add call of subsidence in the equation for humidity / passive scalar
 !
 ! Former revisions:
@@ -658 +658 @@
 !--          Sink or source of scalar concentration due to canopy elements
              IF ( plant_canopy ) CALL plant_canopy_model( i, j, 5 )
+
+!
+!--          If required compute influence of large-scale subsidence/ascent
+             IF ( large_scale_subsidence ) THEN
+                CALL subsidence ( i, j, tend, q, q_init )
+             ENDIF
 
              CALL user_actions( i, j, 'q-tendency' )
@@ -1110 +1116 @@
           ENDIF
 
-
           CALL user_actions( i, j, 'pt-tendency' )
 
@@ -1223 +1228 @@
 !--          Sink or source of scalar concentration due to canopy elements
              IF ( plant_canopy ) CALL plant_canopy_model( i, j, 5 )
+
+
+!--          If required compute influence of large-scale subsidence/ascent
+             IF ( large_scale_subsidence ) THEN
+                CALL subsidence ( i, j, tend, q, q_init )
+             ENDIF
 
 
@@ -1907 +1918 @@
        IF ( plant_canopy ) CALL plant_canopy_model( 5 )
 
+!
+!--    If required compute influence of large-scale subsidence/ascent
+       IF ( large_scale_subsidence ) THEN
+         CALL subsidence ( tend, q, q_init )
+       ENDIF
+
        CALL user_actions( 'q-tendency' )