Changeset 4301 for palm/trunk/SOURCE/inflow_turbulence.f90

Timestamp:

Nov 22, 2019 12:09:09 PM (4 years ago)

Author:

oliver.maas

Message:

Deleted parameter recycling_yshift. y-shift in case of non-cyclic boundary conditions and turbulent_inflow = .TRUE. is now steered by parameter y_shift, that is also used in case of cyclic boundary conditions.

File:

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

palm/trunk/SOURCE/inflow_turbulence.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! use y_shift instead of old parameter recycling_yshift
+! 
+! 4297 2019-11-21 10:37:50Z oliver.maas
 ! changed recycling_yshift so that the y-shift can be a multiple of PE
 ! instead of y-shift of a half domain width
@@ -55 +58 @@
         
     USE control_parameters,                                                    &
-        ONLY:  humidity, passive_scalar, recycling_plane, recycling_yshift,    &
+        ONLY:  humidity, passive_scalar, recycling_plane, y_shift,    &
                recycling_method_for_thermodynamic_quantities
         
@@ -87 +90 @@
        inflow_dist        !< turbulence signal of vars, added at inflow boundary
     REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,7,nbgp) ::                         &
-       local_inflow_dist  !< auxiliary variable for inflow_dist, used for yshift
+       local_inflow_dist  !< auxiliary variable for inflow_dist, used for y-shift
     
     CALL cpu_log( log_point(40), 'inflow_turbulence', 'start' )
@@ -245 +248 @@
 !-- y-shift for inflow_dist
 !-- Shift inflow_dist in positive y direction by a number of
-!-- PEs equal to recycling_yshift
-    IF ( ( recycling_yshift /= 0 ) .AND. myidx == id_inflow ) THEN
+!-- PEs equal to y_shift
+    IF ( ( y_shift /= 0 ) .AND. myidx == id_inflow ) THEN
 
 !
 !--    Calculate the ID of the PE which sends data to this PE (prev) and of the
 !--    PE which receives data from this PE (next).
-       prev = MODULO(myidy - recycling_yshift , pdims(2))
-       next = MODULO(myidy + recycling_yshift , pdims(2))
+       prev = MODULO(myidy - y_shift , pdims(2))
+       next = MODULO(myidy + y_shift , pdims(2))
        
        local_inflow_dist = 0.0_wp