Changeset 1560 for palm

Timestamp:

Mar 6, 2015 10:48:54 AM (10 years ago)

Author:

keck

Message:

implemented possibility of adding a y shift to the recycled inflow turbulence

Location:

palm/trunk/SOURCE

Files:

• header.f90 (modified) (3 diffs)
• inflow_turbulence.f90 (modified) (6 diffs)
• modules.f90 (modified) (2 diffs)
• parin.f90 (modified) (3 diffs)
• read_var_list.f90 (modified) (2 diffs)

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! output for recycling y shift
 ! 
 ! Former revisions:
@@ -1101 +1101 @@
        WRITE ( io, 318 )  use_cmax, pt_damping_width, pt_damping_factor       
        IF ( turbulent_inflow )  THEN
-          WRITE ( io, 319 )  recycling_width, recycling_plane, &
-                             inflow_damping_height, inflow_damping_width
+          IF ( .NOT. recycling_yshift ) THEN
+             WRITE ( io, 319 )  recycling_width, recycling_plane, &
+                                inflow_damping_height, inflow_damping_width
+          ELSE
+             WRITE ( io, 322 )  recycling_width, recycling_plane, &
+                                inflow_damping_height, inflow_damping_width
+          END IF
        ENDIF
     ENDIF
@@ -2047 +2052 @@
 321 FORMAT (//' Initial profiles:'/ &
               ' ----------------')
+322 FORMAT ('       turbulence recycling at inflow switched on'/ &
+            '       y shift of the recycled inflow turbulence switched on'/ &
+            '       width of recycling domain: ',F7.1,' m   grid index: ',I4/ &
+            '       inflow damping height: ',F6.1,' m   width: ',F6.1,' m'/q)
 325 FORMAT (//' List output:'/ &
              ' -----------'//  &

palm/trunk/SOURCE/inflow_turbulence.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Option recycling_yshift added. If this option is switched on, the turbulence
+! data, which is mapped from the recycling plane to the inflow, is shifted in
+! y direction (by ny * dy / 2 )
 ! 
 ! Former revisions:
@@ -59 +61 @@
         
     USE control_parameters,                                                    &
-        ONLY:  recycling_plane
+        ONLY:  recycling_plane, recycling_yshift
         
     USE cpulog,                                                                &
@@ -81 +83 @@
     INTEGER(iwp) ::  k        !:
     INTEGER(iwp) ::  l        !:
+    INTEGER(iwp) ::  next     !:
     INTEGER(iwp) ::  ngp_ifd  !:
     INTEGER(iwp) ::  ngp_pr   !:
+    INTEGER(iwp) ::  prev     !:
 
     REAL(wp), DIMENSION(nzb:nzt+1,5,nbgp)           ::                         &
        avpr, avpr_l  !:
     REAL(wp), DIMENSION(nzb:nzt+1,nysg:nyng,5,nbgp) ::                         &
-       inflow_dist   !:
+       inflow_dist, local_inflow_dist  !:
 
     CALL cpu_log( log_point(40), 'inflow_turbulence', 'start' )
@@ -190 +194 @@
     IF ( myidx == id_recycling  .AND.  myidx /= id_inflow )  THEN
 
-       CALL MPI_SEND( inflow_dist(nzb,nysg,1,1), ngp_ifd, MPI_REAL, &
+       CALL MPI_SEND( inflow_dist(nzb,nysg,1,1), ngp_ifd, MPI_REAL,            &
                       id_inflow, 1, comm1dx, ierr )
 
@@ -196 +200 @@
 
        inflow_dist = 0.0_wp
-       CALL MPI_RECV( inflow_dist(nzb,nysg,1,1), ngp_ifd, MPI_REAL, &
+       CALL MPI_RECV( inflow_dist(nzb,nysg,1,1), ngp_ifd, MPI_REAL,            &
                       id_recycling, 1, comm1dx, status, ierr )
 
     ENDIF
+
+    
+    IF ( recycling_yshift .AND. myidx == id_inflow ) THEN
+
+       IF ( pdims(2) >= 2 ) THEN
+ 
+          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
+
+       ENDIF
+
+       local_inflow_dist = 0.0_wp
+    
+       CALL MPI_SENDRECV( inflow_dist(nzb,nysg,1,1), ngp_ifd, MPI_REAL,        &
+                          next, 1, local_inflow_dist(nzb,nysg,1,1), ngp_ifd,   &
+                          MPI_REAL, prev, 1, comm1dy, status, ierr )
+       
+    ENDIF
+
 #endif
 
@@ -205 +237 @@
 !-- Add the disturbance at the inflow
     IF ( nxl == 0 )  THEN
-
-       DO  j = nysg, nyng
-          DO  k = nzb, nzt + 1
-
-              u(k,j,-nbgp+1:0) = mean_inflow_profiles(k,1) + &
-                           inflow_dist(k,j,1,1:nbgp) * inflow_damping_factor(k)
-              v(k,j,-nbgp:-1)  = mean_inflow_profiles(k,2) + &
-                           inflow_dist(k,j,2,1:nbgp) * inflow_damping_factor(k)
-              w(k,j,-nbgp:-1)  =                             &
+       
+       IF ( recycling_yshift ) THEN       
+
+          DO  j = nysg, nyng
+             DO  k = nzb, nzt + 1
+
+                u(k,j,-nbgp+1:0) = mean_inflow_profiles(k,1) +                 &
+                                   local_inflow_dist(k,j,1,1:nbgp) *           &
+                                   inflow_damping_factor(k)
+                v(k,j,-nbgp:-1)  = mean_inflow_profiles(k,2) +                 &
+                                   local_inflow_dist(k,j,2,1:nbgp) *           &
+                                   inflow_damping_factor(k)
+                w(k,j,-nbgp:-1)  =                                             &
+                                   local_inflow_dist(k,j,3,1:nbgp) *           &
+                                   inflow_damping_factor(k)
+                pt(k,j,-nbgp:-1) = mean_inflow_profiles(k,4) +                 &
+                                   local_inflow_dist(k,j,4,1:nbgp) *           &
+                                   inflow_damping_factor(k)
+                e(k,j,-nbgp:-1)  = mean_inflow_profiles(k,5) +                 &
+                                   local_inflow_dist(k,j,5,1:nbgp) *           &
+                                   inflow_damping_factor(k)
+                e(k,j,-nbgp:-1)  = MAX( e(k,j,-nbgp:-1), 0.0_wp )
+
+             ENDDO
+          ENDDO
+
+       ELSE
+
+          DO  j = nysg, nyng
+             DO  k = nzb, nzt + 1
+ 
+                 u(k,j,-nbgp+1:0) = mean_inflow_profiles(k,1) +                   &
+                              inflow_dist(k,j,1,1:nbgp) * inflow_damping_factor(k)
+                 v(k,j,-nbgp:-1)  = mean_inflow_profiles(k,2) +                   &
+                              inflow_dist(k,j,2,1:nbgp) * inflow_damping_factor(k)
+                 w(k,j,-nbgp:-1)  =                                               &
                            inflow_dist(k,j,3,1:nbgp) * inflow_damping_factor(k)
-              pt(k,j,-nbgp:-1) = mean_inflow_profiles(k,4) + &
+                 pt(k,j,-nbgp:-1) = mean_inflow_profiles(k,4) +                   &
                            inflow_dist(k,j,4,1:nbgp) * inflow_damping_factor(k)
-              e(k,j,-nbgp:-1)  = mean_inflow_profiles(k,5) + &
+                 e(k,j,-nbgp:-1)  = mean_inflow_profiles(k,5) +                   &
                            inflow_dist(k,j,5,1:nbgp) * inflow_damping_factor(k)
-              e(k,j,-nbgp:-1)  = MAX( e(k,j,-nbgp:-1), 0.0_wp )
-
-          ENDDO
-       ENDDO
-
-    ENDIF
+                 e(k,j,-nbgp:-1)  = MAX( e(k,j,-nbgp:-1), 0.0_wp )
+
+             ENDDO
+          ENDDO
+
+       ENDIF
+    
+    ENDIF
+
 
     CALL cpu_log( log_point(40), 'inflow_turbulence', 'stop' )

palm/trunk/SOURCE/modules.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! +recycling_yshift
 ! 
 ! Former revisions:
@@ -669 +669 @@
                 prandtl_layer = .TRUE., &
                 precipitation = .FALSE., &
-                random_heatflux = .FALSE., &
+                random_heatflux = .FALSE., recycling_yshift = .FALSE.,&
                 run_control_header = .FALSE., run_coupled = .TRUE., &
                 scalar_rayleigh_damping = .TRUE., sloping_surface = .FALSE., &

palm/trunk/SOURCE/parin.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! +recycling_yshift
 ! 
 ! Former revisions:
@@ -214 +214 @@
                q_vertical_gradient_level, random_generator,                    &
                random_heatflux, rayleigh_damping_factor,                       &
-               rayleigh_damping_height, recycling_width, reference_state,      &
-               residual_limit, restart_time, return_addres, return_username,   &
+               rayleigh_damping_height, recycling_width, recycling_yshift,     &
+               reference_state, residual_limit,                                &
+               restart_time, return_addres, return_username,                   &
                revision, rif_max, rif_min, roughness_length, runnr,            &
                run_identifier, sa_surface, sa_vertical_gradient,               &
@@ -307 +308 @@
              q_vertical_gradient, q_vertical_gradient_level,                   &
              random_generator, random_heatflux,                                &
-             rayleigh_damping_factor, rayleigh_damping_height, recycling_width,&
+             rayleigh_damping_factor, rayleigh_damping_height,                 &
+             recycling_width, recycling_yshift,                                &
              reference_state, residual_limit,                                  &
              rif_max, rif_min, roughness_length, sa_surface,                   &

palm/trunk/SOURCE/read_var_list.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! +recycling_yshift
 ! 
 ! Former revisions:
@@ -528 +528 @@
           CASE ( 'recycling_width' )
              READ ( 13 )  recycling_width
+          CASE ( 'recycling_yshift' )
+             READ ( 13 ) recycling_yshift
           CASE ( 'reference_state' )
              READ ( 13 )  reference_state