Changeset 197 for palm/trunk/SOURCE/flow_statistics.f90

Timestamp:

Sep 16, 2008 3:29:03 PM (16 years ago)

Author:

raasch

Message:

further adjustments for SGI and other small changes

File:

• palm/trunk/SOURCE/flow_statistics.f90 (modified) (6 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! Spline timeseries splptx etc. removed, timeseries w'u', w'v', w'q' (k=0)
+! added
 ! Bugfix: divide sums(k,8) (e) and sums(k,34) (e*) by ngp_2dh_s_inner(k,sr) 
 ! (like other scalars)
@@ -109 +111 @@
        sums_l(nzb+9,pr_palm,0)  = sums_divold_l(sr)  ! old divergence from pres
        sums_l(nzb+10,pr_palm,0) = sums_divnew_l(sr)  ! new divergence from pres
-!--    WARNING: next four lines still may have to be adjusted for OpenMP 
-       sums_l(nzb:nzb+2,pr_palm-1,0)    = sums_up_fraction_l(1,1:3,sr)! upstream
-       sums_l(nzb+3:nzb+5,pr_palm-1,0)  = sums_up_fraction_l(2,1:3,sr)! parts
-       sums_l(nzb+6:nzb+8,pr_palm-1,0)  = sums_up_fraction_l(3,1:3,sr)! from
-       sums_l(nzb+9:nzb+11,pr_palm-1,0) = sums_up_fraction_l(4,1:3,sr)! spline
 
 !
@@ -380 +377 @@
              sums_l(nzb+3,pr_palm,tn) = sums_l(nzb+3,pr_palm,tn) + &
                                         ts(j,i)   * rmask(j,i,sr)
+             IF ( humidity )  THEN
+                sums_l(nzb+12,pr_palm,tn) = sums_l(nzb+12,pr_palm,tn) + &
+                                            qs(j,i)   * rmask(j,i,sr)
+             ENDIF
           ENDDO
        ENDDO
@@ -807 +808 @@
 !--    above the topography, they are being divided by ngp_2dh(sr)
        sums(nzb:nzb+3,pr_palm)    = sums(nzb:nzb+3,pr_palm)    / &
+                                    ngp_2dh(sr)
+       sums(nzb+12,pr_palm)       = sums(nzb+12,pr_palm)       / &    ! qs
                                     ngp_2dh(sr)
 !--    eges, e*
@@ -882 +885 @@
        hom(:,1,68,sr) = sums(:,68)     ! w*p*
        hom(:,1,69,sr) = sums(:,69)     ! w"e + w"p"/rho
+       hom(:,1,70,sr) = sums(:,70)     ! q*2
 
        hom(:,1,pr_palm-1,sr) = sums(:,pr_palm-1)
@@ -999 +1003 @@
        ts_value(17,sr) = hom(nzb,1,4,sr)            ! pt(0)
        ts_value(18,sr) = hom(nzb+1,1,4,sr)          ! pt(zp)
-       ts_value(19,sr) = hom(nzb+9,1,pr_palm-1,sr)  ! splptx
-       ts_value(20,sr) = hom(nzb+10,1,pr_palm-1,sr) ! splpty
-       ts_value(21,sr) = hom(nzb+11,1,pr_palm-1,sr) ! splptz
+       ts_value(19,sr) = hom(nzb+1,1,pr_palm,sr)    ! u'w'    at k=0
+       ts_value(20,sr) = hom(nzb+2,1,pr_palm,sr)    ! v'w'    at k=0
+       ts_value(21,sr) = hom(nzb+12,1,pr_palm,sr)   ! w'q'    at k=0
+
        IF ( ts_value(5,sr) /= 0.0 )  THEN
           ts_value(22,sr) = ts_value(4,sr)**2 / &