Changeset 4444 for palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

Timestamp:

Mar 5, 2020 3:59:50 PM (4 years ago)

Author:

raasch

Message:

bugfix: cpp-directives for serial mode added

File:

• palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: cpp-directives for serial mode added, dummy statements to prevent compile errors added
+! 
+! 4442 2020-03-04 19:21:13Z suehring
 ! Set back turbulent length scale to 8 x grid spacing in the parametrized mode
 ! (was accidantly changed).
@@ -286 +289 @@
     INTEGER(iwp) ::  nzb_y_stg          !< lower bound of z coordinate (required for transposing z on PEs along y)
     INTEGER(iwp) ::  nzt_y_stg          !< upper bound of z coordinate (required for transposing z on PEs along y)
+#if defined( __parallel )
     INTEGER(iwp) ::  stg_type_xz        !< MPI type for full z range
     INTEGER(iwp) ::  stg_type_xz_small  !< MPI type for small z range
     INTEGER(iwp) ::  stg_type_yz        !< MPI type for full z range
     INTEGER(iwp) ::  stg_type_yz_small  !< MPI type for small z range
+#endif
 
     INTEGER(iwp), DIMENSION(3) ::  nr_non_topo_xz = 0 !< number of non-topography grid points at xz cross-sections,
@@ -296 +301 @@
                                                       !< required for bias correction of imposed perturbations
     
+#if defined( __parallel )
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  displs_xz      !< displacement for MPI_GATHERV
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  recv_count_xz  !< receive count for MPI_GATHERV
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  displs_yz      !< displacement for MPI_GATHERV
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  recv_count_yz  !< receive count for MPI_GATHERV
+#endif
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  nux            !< length scale of u in x direction (in gp)
     INTEGER(iwp), DIMENSION(:), ALLOCATABLE ::  nuy            !< length scale of u in y direction (in gp)
@@ -595 +602 @@
     INTEGER(iwp) :: j                        !> loop index
     INTEGER(iwp) :: k                        !< index
+#if defined( __parallel )
     INTEGER(iwp) :: newtype                  !< dummy MPI type
     INTEGER(iwp) :: realsize                 !< size of REAL variables
+#endif
 
     INTEGER(iwp), DIMENSION(3) ::  nr_non_topo_xz_l = 0 !< number of non-topography grid points at xz-cross-section on subdomain
@@ -612 +621 @@
     REAL(wp) :: lwy     !< length scale for w in y direction
     REAL(wp) :: lwz     !< length scale for w in z direction
+#if defined( __parallel )
     REAL(wp) :: nnz     !< increment used to determine processor decomposition of z-axis along x and y direction
+#endif
     REAL(wp) :: zz      !< height
 
@@ -622 +633 @@
 !-- Create mpi-datatypes for exchange in case of non-local but distributed 
 !-- computation of the velocity seeds. This option is useful in 
-!-- case large turbulent length scales are presentm, where the computational
-!-- effort becomes large and need to be parallelized. For parametrized
+!-- case large turbulent length scales are present, where the computational
+!-- effort becomes large and need to be parallelized. For parameterized
 !-- turbulence the length scales are small and computing the velocity seeds
 !-- locally is faster (no overhead by communication).
@@ -1892 +1903 @@
 #else
        f_n(nzb+1:nzt+1,nys:nyn) = f_n_l(nzb_x_stg:nzt_x_stg+1,nys:nyn)
+!
+!--    Next line required to avoid compile errors because of unused dummy arguments
+       IF ( id_left == 0 )  id_right = 0
 #endif
 
@@ -2073 +2087 @@
 #else
        f_n(nzb+1:nzt+1,nxl:nxr) = f_n_l(nzb_y_stg:nzt_y_stg+1,nxl:nxr)
+!
+!--    Next line required to avoid compile errors because of unused dummy arguments
+       IF ( id_north == 0 )  id_south = 0
 #endif