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

Timestamp:

Nov 22, 2019 12:09:09 PM (5 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/init_pegrid.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_pegrid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! changed message PA0467
+! 
+! 4264 2019-10-15 16:00:23Z scharf
 ! corrected error message string
 ! 
@@ -237 +240 @@
 !-- Get coordinates of left and right neighbor on PE grid
     IF ( y_shift /= 0 ) THEN
-
-       IF ( bc_lr /= 'cyclic'  .OR.  bc_ns /= 'cyclic' )  THEN
-          message_string = 'y_shift /= 0 is only allowed for cyclic ' //       &
-                           'boundary conditions in both directions '
-          CALL message( 'check_parameters', 'PA0467', 1, 2, 0, 6, 0 )
-       ENDIF
-       IF ( TRIM( psolver ) /= 'multigrid' .AND.                               &
-            TRIM( psolver ) /= 'multigrid_noopt')                              &
-       THEN
-          message_string = 'y_shift /= 0 requires a multigrid pressure solver '
-          CALL message( 'check_parameters', 'PA0468', 1, 2, 0, 6, 0 )
-       ENDIF
-
-       CALL MPI_CART_COORDS( comm2d, pright, ndim, rcoord, ierr )
-       CALL MPI_CART_COORDS( comm2d, pleft, ndim, lcoord, ierr )
-
-!
-!--    If the x(y)-coordinate of the right (left) neighbor is smaller (greater)
-!--    than that of the calling process, then the calling process is located on
-!--    the right (left) boundary of the processor grid. In that case,
-!--    the y-coordinate of that neighbor is increased (decreased) by y_shift.
-!--    The rank of the process with that coordinate is then inquired and the
-!--    neighbor rank for MPI_SENDRECV, pright (pleft) is set to it.
-!--    In this way, the calling process receives a new right (left) neighbor
-!--    for all future MPI_SENDRECV calls. That neighbor has a y-coordinate
-!--    of y+(-)y_shift, where y is the original right (left) neighbor's
-!--    y-coordinate. The modulo-operation ensures that if the neighbor's
-!--    y-coordinate exceeds the grid-boundary, it will be relocated to
-!--    the opposite part of the grid cyclicly.
-       IF ( rcoord(1) < pcoord(1) ) THEN
-          rcoord(2) = MODULO( rcoord(2) + y_shift, pdims(2) )
-          CALL MPI_CART_RANK( comm2d, rcoord, pright, ierr )
-       ENDIF
-
-       IF ( lcoord(1) > pcoord(1) ) THEN
-          lcoord(2) = MODULO( lcoord(2) - y_shift, pdims(2) )
-          CALL MPI_CART_RANK( comm2d, lcoord, pleft, ierr )
+       IF ( bc_lr == 'cyclic' ) THEN
+          IF ( TRIM( psolver ) /= 'multigrid' .AND.                            &
+                TRIM( psolver ) /= 'multigrid_noopt')                          &
+          THEN
+             message_string = 'y_shift /= 0 requires a multigrid pressure solver '
+             CALL message( 'check_parameters', 'PA0468', 1, 2, 0, 6, 0 )
+          ENDIF
+
+          CALL MPI_CART_COORDS( comm2d, pright, ndim, rcoord, ierr )
+          CALL MPI_CART_COORDS( comm2d, pleft, ndim, lcoord, ierr )
+
+!   
+!--       If the x(y)-coordinate of the right (left) neighbor is smaller (greater)
+!--       than that of the calling process, then the calling process is located on
+!--       the right (left) boundary of the processor grid. In that case,
+!--       the y-coordinate of that neighbor is increased (decreased) by y_shift.
+!--       The rank of the process with that coordinate is then inquired and the
+!--       neighbor rank for MPI_SENDRECV, pright (pleft) is set to it.
+!--       In this way, the calling process receives a new right (left) neighbor
+!--       for all future MPI_SENDRECV calls. That neighbor has a y-coordinate
+!--       of y+(-)y_shift, where y is the original right (left) neighbor's
+!--       y-coordinate. The modulo-operation ensures that if the neighbor's
+!--       y-coordinate exceeds the grid-boundary, it will be relocated to
+!--       the opposite part of the grid cyclicly.
+          IF ( rcoord(1) < pcoord(1) ) THEN
+             rcoord(2) = MODULO( rcoord(2) + y_shift, pdims(2) )
+             CALL MPI_CART_RANK( comm2d, rcoord, pright, ierr )
+          ENDIF
+
+          IF ( lcoord(1) > pcoord(1) ) THEN
+             lcoord(2) = MODULO( lcoord(2) - y_shift, pdims(2) )
+             CALL MPI_CART_RANK( comm2d, lcoord, pleft, ierr )
+          ENDIF
+         
+       ELSE
+!
+!--       y-shift for non-cyclic boundary conditions is only implemented 
+!--       for the turbulence recycling method in inflow_turbulence.f90
+          IF ( .NOT. turbulent_inflow )  THEN
+             message_string = 'y_shift /= 0 is only allowed for cyclic ' //    &
+                              'boundary conditions in both directions '  //    &
+                              'or with turbulent_inflow == .TRUE.'
+             CALL message( 'check_parameters', 'PA0467', 1, 2, 0, 6, 0 )
+          ENDIF
        ENDIF
     ENDIF