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

Timestamp:

Sep 28, 2020 9:21:45 AM (4 years ago)

Author:

suehring

Message:

Revise profile and timeseries averaging of land-surface quantities

File:

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

palm/trunk/SOURCE/flow_statistics.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! Revise averaging of land-surface quantities
+!
+! 4672 2020-09-09 21:27:32Z pavelkrc
 ! OpenACC bugfix
 !
@@ -1414 +1417 @@
              j = surf_lsm_h(0)%j(m)
 
-             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(0)%ghf(m)       * rmask(j,i,sr)
-                sums_l(nzb,94,tn)  = sums_l(nzb,94,tn) + surf_lsm_h(0)%qsws_liq(m)  * rmask(j,i,sr)
-                sums_l(nzb,95,tn)  = sums_l(nzb,95,tn) + surf_lsm_h(0)%qsws_soil(m) * rmask(j,i,sr)
-                sums_l(nzb,96,tn)  = sums_l(nzb,96,tn) + surf_lsm_h(0)%qsws_veg(m)  * rmask(j,i,sr)
-                sums_l(nzb,97,tn)  = sums_l(nzb,97,tn) + surf_lsm_h(0)%r_a(m)       * rmask(j,i,sr)
-                sums_l(nzb,98,tn)  = sums_l(nzb,98,tn) + surf_lsm_h(0)%r_s(m)       * rmask(j,i,sr)
-             ENDIF
+             sums_l(nzb,93,tn)  = sums_l(nzb,93,tn) + surf_lsm_h(0)%ghf(m)       * rmask(j,i,sr)
+             sums_l(nzb,94,tn)  = sums_l(nzb,94,tn) + surf_lsm_h(0)%qsws_liq(m)  * rmask(j,i,sr)
+             sums_l(nzb,95,tn)  = sums_l(nzb,95,tn) + surf_lsm_h(0)%qsws_soil(m) * rmask(j,i,sr)
+             sums_l(nzb,96,tn)  = sums_l(nzb,96,tn) + surf_lsm_h(0)%qsws_veg(m)  * rmask(j,i,sr)
+             sums_l(nzb,97,tn)  = sums_l(nzb,97,tn) + surf_lsm_h(0)%r_a(m)       * rmask(j,i,sr)
+             sums_l(nzb,98,tn)  = sums_l(nzb,98,tn) + surf_lsm_h(0)%r_s(m)       * rmask(j,i,sr)
           ENDDO
           !$OMP END PARALLEL
@@ -1433 +1434 @@
              i = surf_lsm_h(0)%i(m)
              j = surf_lsm_h(0)%j(m)
-
-             IF ( i >= nxl  .AND.  i <= nxr  .AND.  j >= nys  .AND.  j <= nyn )  THEN
-
-                DO  k = nzb_soil, nzt_soil
-                   sums_l(k,89,tn)  = sums_l(k,89,tn)  + t_soil_h(0)%var_2d(k,m) * rmask(j,i,sr)
-                   sums_l(k,91,tn)  = sums_l(k,91,tn)  + m_soil_h(0)%var_2d(k,m) * rmask(j,i,sr)
-                ENDDO
-             ENDIF
+             DO  k = nzb_soil, nzt_soil
+                sums_l(k,89,tn)  = sums_l(k,89,tn)  + t_soil_h(0)%var_2d(k,m) * rmask(j,i,sr)
+                sums_l(k,91,tn)  = sums_l(k,91,tn)  + m_soil_h(0)%var_2d(k,m) * rmask(j,i,sr)
+             ENDDO
           ENDDO
           !$OMP END PARALLEL
@@ -1806 +1803 @@
           sums(k,55:63)         = sums(k,55:63)         / ngp_2dh(sr)
           sums(k,81:88)         = sums(k,81:88)         / ngp_2dh(sr)
-          sums(k,89:112)        = sums(k,89:112)        / ngp_2dh(sr)
+
+          IF ( land_surface  .AND.  surf_lsm_h(0)%ns_tot > 0 )  THEN
+             sums(k,89:98) = sums(k,89:98)              / surf_lsm_h(0)%ns_tot
+          ENDIF
+
+          sums(k,99:112)        = sums(k,99:112)        / ngp_2dh(sr)
           sums(k,114)           = sums(k,114)           / ngp_2dh(sr)
           sums(k,117)           = sums(k,117)           / ngp_2dh(sr)