Changeset 4551 for palm/trunk

Timestamp:

Jun 2, 2020 10:22:25 AM (4 years ago)

Author:

suehring

Message:

Bugfix in summation for statistical regions

File:

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

palm/trunk/SOURCE/flow_statistics.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in summation for statistical regions
+! 
+! 4521 2020-05-06 11:39:49Z schwenkel
 ! Rename variable
 ! 
@@ -1501 +1504 @@
              IF ( i >= nxl  .AND.  i <= nxr  .AND.                             &
                   j >= nys  .AND.  j <= nyn )  THEN
-                sums_l(nzb,93,tn)  = sums_l(nzb,93,tn) + surf_lsm_h%ghf(m)
-                sums_l(nzb,94,tn)  = sums_l(nzb,94,tn) + surf_lsm_h%qsws_liq(m)
-                sums_l(nzb,95,tn)  = sums_l(nzb,95,tn) + surf_lsm_h%qsws_soil(m)
-                sums_l(nzb,96,tn)  = sums_l(nzb,96,tn) + surf_lsm_h%qsws_veg(m)
-                sums_l(nzb,97,tn)  = sums_l(nzb,97,tn) + surf_lsm_h%r_a(m)
-                sums_l(nzb,98,tn) = sums_l(nzb,98,tn)+ surf_lsm_h%r_s(m)
+                sums_l(nzb,93,tn)  = sums_l(nzb,93,tn) + surf_lsm_h%ghf(m)       * rmask(j,i,sr)
+                sums_l(nzb,94,tn)  = sums_l(nzb,94,tn) + surf_lsm_h%qsws_liq(m)  * rmask(j,i,sr)
+                sums_l(nzb,95,tn)  = sums_l(nzb,95,tn) + surf_lsm_h%qsws_soil(m) * rmask(j,i,sr)
+                sums_l(nzb,96,tn)  = sums_l(nzb,96,tn) + surf_lsm_h%qsws_veg(m)  * rmask(j,i,sr)
+                sums_l(nzb,97,tn)  = sums_l(nzb,97,tn) + surf_lsm_h%r_a(m)       * rmask(j,i,sr)
+                sums_l(nzb,98,tn)  = sums_l(nzb,98,tn) + surf_lsm_h%r_s(m)       * rmask(j,i,sr)
              ENDIF
           ENDDO
@@ -1643 +1646 @@
                 + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) )  &
                             - 0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) )**2&
-                + w(k,j,i)**2                                        ) * flag
+                + w(k,j,i)**2                                        ) * flag * rmask(j,i,sr)
 
                    sums_ll(k,2) = sums_ll(k,2) + 0.5_wp * w(k,j,i)             &
                                        * ( ( p(k,j,i) + p(k+1,j,i) )           &
                                          / momentumflux_output_conversion(k) ) &
-                                       * flag
+                                       * flag * rmask(j,i,sr)
 
                 ENDDO
@@ -1684 +1687 @@
                  - (km(k-1,j,i)+km(k,j,i)) * (e(k,j,i)-e(k-1,j,i)) * ddzu(k)   &
                                                                 ) * ddzw(k)    &
-                                                                  * flag
+                                                                  * flag * rmask(j,i,sr)
 
                    sums_l(k,69,tn) = sums_l(k,69,tn) - 0.5_wp * (              &
                    (km(k,j,i)+km(k+1,j,i)) * (e(k+1,j,i)-e(k,j,i)) * ddzu(k+1) &
-                                                                )  * flag
+                                                                )  * flag * rmask(j,i,sr)
 
                 ENDDO
@@ -2082 +2085 @@
           hom(:,1,96,sr)  = sums(:,96)             ! qsws_veg
           hom(:,1,97,sr)  = sums(:,97)             ! r_a
-          hom(:,1,98,sr) = sums(:,98)              ! r_s
+          hom(:,1,98,sr)  = sums(:,98)             ! r_s
 
        ENDIF