Changeset 4297

Timestamp:

Nov 21, 2019 10:37:50 AM (5 years ago)

Author:

oliver.maas

Message:

In case of turbulent inflow: Adjusted recycling_yshift, so that y-shift can be given as multiples of PE (as in y_shift for cyclic BCs).

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• header.f90 (modified) (3 diffs)
• inflow_turbulence.f90 (modified) (2 diffs)
• modules.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! 4172 2019-08-20 11:55:33Z oliver.maas
+! adjust message to the modified parameter recycling_yshift
+! 
+! 11:55:33Z oliver.maas
 ! Check if a cross section is specified if any output cross-section quantity
 ! is given
@@ -2971 +2974 @@
        recycling_plane = recycling_width / dx
 !
-!--    Because the y-shift is done with a distance of INT( npey / 2 ) no shift
+!--    recycling_yshift will have no effect with only one pe in y-direction
 !--    is possible if there is only one PE in y direction.
-       IF ( recycling_yshift .AND. pdims(2) < 2 )  THEN
-          WRITE( message_string, * )  'recycling_yshift = .T. requires more',  &
-                                      ' than one processor in y direction'
-          CALL message( 'check_parameters', 'PA0421', 1, 2, 0, 6, 0 )
+       IF ( ( recycling_yshift /= 0 ) .AND. pdims(2) < 2 )  THEN
+          WRITE( message_string, * )  'recycling_yshift will have no '  //     &
+                                      'effect with only one pe in y-direction.'
+          CALL message( 'check_parameters', 'PA0421', 0, 0, 0, 6, 0 )
        ENDIF
 

palm/trunk/SOURCE/header.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! adjusted message to the changed parameter recycling_yshift
+! 
+! 4227 2019-09-10 18:04:34Z gronemeier
 ! implement new palm_date_time_mod
 ! 
@@ -920 +923 @@
        WRITE ( io, 318 )  use_cmax, pt_damping_width, pt_damping_factor       
        IF ( turbulent_inflow )  THEN
-          IF ( .NOT. recycling_yshift ) THEN
+          IF ( recycling_yshift == 0 ) THEN
              WRITE ( io, 319 )  recycling_width, recycling_plane, &
                                 inflow_damping_height, inflow_damping_width
           ELSE
-             WRITE ( io, 322 )  recycling_width, recycling_plane, &
+             WRITE ( io, 322 )  recycling_yshift, recycling_width, recycling_plane, &
                                 inflow_damping_height, inflow_damping_width
           END IF
@@ -1737 +1740 @@
               ' ----------------')
 322 FORMAT ('       turbulence recycling at inflow switched on'/ &
-            '       y shift of the recycled inflow turbulence switched on'/ &
+            '       y shift of the recycled inflow turbulence is',I3,' PE'/ &
             '       width of recycling domain: ',F7.1,' m   grid index: ',I4/ &
             '       inflow damping height: ',F6.1,' m   width: ',F6.1,' m'/)

palm/trunk/SOURCE/inflow_turbulence.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! changed recycling_yshift so that the y-shift can be a multiple of PE
+! instead of y-shift of a half domain width
+! 
+! 4183 2019-08-23 07:33:16Z oliver.maas
 ! simplified steering of recycling of absolute values by initialization 
 ! parameter recycling_method_for_thermodynamic_quantities
@@ -240 +244 @@
 !
 !-- y-shift for inflow_dist
-!-- Shift inflow_dist in positive y direction by a distance of INT( npey / 2 )
-    IF ( recycling_yshift .AND. myidx == id_inflow ) THEN
+!-- 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
+
 !
 !--    Calculate the ID of the PE which sends data to this PE (prev) and of the
 !--    PE which receives data from this PE (next).
-       IF ( myidy >= INT( pdims(2) / 2 ) ) THEN
-          prev = myidy - INT( pdims(2) / 2 )
-       ELSE
-          prev = pdims(2) - ( INT( pdims(2) / 2 ) - myidy )
-       ENDIF
-     
-       IF ( myidy < pdims(2) - INT( pdims(2) / 2 ) ) THEN
-          next = myidy + INT( pdims(2) / 2 )
-       ELSE
-          next = INT( pdims(2) / 2 ) - ( pdims(2) - myidy )
-       ENDIF
-
+       prev = MODULO(myidy - recycling_yshift , pdims(2))
+       next = MODULO(myidy + recycling_yshift , pdims(2))
+       
        local_inflow_dist = 0.0_wp
 

palm/trunk/SOURCE/modules.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! changed variable type of recycling_yshift from LOGICAL to INTEGER
+! 
+! 4293 2019-11-12 14:44:01Z Giersch
 ! Add origin_date_time
 ! 
@@ -642 +645 @@
     INTEGER(iwp) ::  vg_vertical_gradient_level_ind(10) = -9999  !< grid index values of vg_vertical_gradient_level(s)
     INTEGER(iwp) ::  subs_vertical_gradient_level_i(10) = -9999  !< grid index values of subs_vertical_gradient_level(s)
-
+    INTEGER(iwp) ::  recycling_yshift = 0                        !< namelist parameter
     INTEGER(iwp), DIMENSION(0:1) ::  ntdim_2d_xy  !< number of output intervals for 2d data (xy)
     INTEGER(iwp), DIMENSION(0:1) ::  ntdim_2d_xz  !< number of output intervals for 2d data (xz)
@@ -735 +738 @@
     LOGICAL ::  rans_tke_l = .FALSE.                             !< use TKE-l turbulence closure for RANS mode
     LOGICAL ::  read_svf = .FALSE.                               !< ENVPAR namelist parameter to steer input of svf (ENVPAR is provided by palmrun)
-    LOGICAL ::  recycling_yshift = .FALSE.                       !< namelist parameter
     LOGICAL ::  run_control_header = .FALSE.                     !< onetime output of RUN_CONTROL header
     LOGICAL ::  run_coupled = .TRUE.                             !< internal switch telling PALM to run in coupled mode (i.e. to exchange surface data) in case of atmosphere-ocean coupling