Changeset 2232 for palm/trunk/SOURCE/interaction_droplets_ptq.f90

Timestamp:

May 30, 2017 5:47:52 PM (7 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

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

palm/trunk/SOURCE/interaction_droplets_ptq.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments to new topography concept
 ! 
 ! Former revisions:
@@ -106 +106 @@
            
        USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb_s_inner, nzt
+           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
            
        USE kinds
@@ -114 +114 @@
        IMPLICIT NONE
 
-       INTEGER(iwp) ::  i !<
-       INTEGER(iwp) ::  j !<
-       INTEGER(iwp) ::  k !<
+       INTEGER(iwp) ::  i    !< running index x direction
+       INTEGER(iwp) ::  j    !< running index y direction 
+       INTEGER(iwp) ::  k    !< running index z direction
 
+       REAL(wp) ::  flag     !< flag to mask topography grid points
  
        DO  i = nxl, nxr
           DO  j = nys, nyn
-             DO  k = nzb_s_inner(j,i)+1, nzt
-                q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i)
-                pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k)
+             DO  k = nzb+1, nzt
+!
+!--             Predetermine flag to mask topography
+                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
+
+                q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i) * flag
+                pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k)   &
+                                                        * flag
              ENDDO
           ENDDO
@@ -145 +151 @@
 
        USE indices,                                                            &
-           ONLY:  nzb_s_inner, nzt
+           ONLY:  nzb, nzt, wall_flags_0
 
        USE kinds,                                                              &
@@ -154 +160 @@
        IMPLICIT NONE
 
-       INTEGER(iwp) ::  i !<
-       INTEGER(iwp) ::  j !<
-       INTEGER(iwp) ::  k !<
+       INTEGER(iwp) ::  i    !< running index x direction
+       INTEGER(iwp) ::  j    !< running index y direction 
+       INTEGER(iwp) ::  k    !< running index z direction
+
+       REAL(wp) ::  flag     !< flag to mask topography grid points
 
 
-       DO  k = nzb_s_inner(j,i)+1, nzt
-          q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i)
-          pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k)
+       DO  k = nzb+1, nzt
+!
+!--       Predetermine flag to mask topography
+          flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
+
+          q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i) * flag
+          pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k) * flag
        ENDDO