Changeset 2232 for palm/trunk/SOURCE/disturb_field.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/disturb_field.f90 (modified) (6 diffs)

palm/trunk/SOURCE/disturb_field.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Modify referenced parameter for disturb_field, instead of nzb_uv_inner, pass
+! character to identify the respective grid (u- or v-grid). 
+! Set perturbations within topography to zero using flags.
 ! 
 ! Former revisions:
@@ -70 +72 @@
 !> order in every case. The perturbation range is steered by dist_range.
 !------------------------------------------------------------------------------!
- SUBROUTINE disturb_field( nzb_uv_inner, dist1, field )
+ SUBROUTINE disturb_field( var_char, dist1, field )
  
 
-    USE control_parameters,   &
+    USE control_parameters,                                                    &
         ONLY:  dist_nxl, dist_nxr, dist_nyn, dist_nys, dist_range,             &
                disturbance_amplitude, disturbance_created,                     &
@@ -83 +85 @@
         
     USE indices,                                                               &
-        ONLY:  nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
+        ONLY:  nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_max, &
+               nzt, wall_flags_0
         
     USE kinds
@@ -96 +99 @@
     IMPLICIT NONE
 
-    INTEGER(iwp) ::  i  !<
-    INTEGER(iwp) ::  j  !<
-    INTEGER(iwp) ::  k  !<
-    
-    INTEGER(iwp) ::  nzb_uv_inner(nysg:nyng,nxlg:nxrg) !<
+    CHARACTER (LEN = *) ::  var_char !< flag to distinguish betwenn u- and v-component
+
+    INTEGER(iwp) ::  flag_nr !< number of respective flag for u- or v-grid 
+    INTEGER(iwp) ::  i       !< index variable
+    INTEGER(iwp) ::  j       !< index variable
+    INTEGER(iwp) ::  k       !< index variable
 
     REAL(wp) ::  randomnumber  !<
@@ -111 +115 @@
 
     CALL cpu_log( log_point(20), 'disturb_field', 'start' )
-
+!
+!-- Set flag number, 20 for u-grid, 21 for v-grid, required to mask topography
+    flag_nr = MERGE( 20, 21, TRIM(var_char) == 'u' )
 !
 !-- Create an additional temporary array and initialize the arrays needed
@@ -224 +230 @@
        DO  i = nxlg, nxrg
           DO  j = nysg, nyng
-             dist1(nzb:nzb_uv_inner(j,i)+1,j,i) = 0.0_wp
+             DO  k = nzb, nzb_max
+                dist1(k,j,i) = MERGE( dist1(k,j,i), 0.0_wp,                    &
+                                      BTEST( wall_flags_0(k,j,i), flag_nr )    &
+                                    )
+             ENDDO
           ENDDO
        ENDDO