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

Timestamp:

Dec 6, 2017 4:03:27 PM (6 years ago)

Author:

raasch

Message:

file attributes and activation strings in .palm.iofiles revised, file extensions for nesting, masked output, wind turbine data, etc. changed

File:

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

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! unit number for file containing turbulence generator data changed to 90
+! bugfix: preprocessor directives added for MPI specific code
+! 
+! 2576 2017-10-24 13:49:46Z Giersch
 ! Definition of a new function called stg_skip_var_list to skip module 
 ! parameters during reading restart data
@@ -312 +316 @@
     IMPLICIT NONE
 
+#if defined( __parallel )
     INTEGER(KIND=MPI_ADDRESS_KIND) :: extent !< extent of new MPI type
     INTEGER(KIND=MPI_ADDRESS_KIND) :: tob=0  !< dummy variable
+#endif
 
     INTEGER(iwp) :: j                        !> loop index
@@ -362 +368 @@
                tu(nzb:nzt+1),  tv(nzb:nzt+1),  tw(nzb:nzt+1)   )
 
+#if defined( __parallel )
 !
 !-- Define MPI type used in stg_generate_seed_yz to gather vertical splitted
@@ -391 +398 @@
        displs(j) = 0 + (nzt_x-nzb_x+1) * (j-1)
     ENDDO
+#endif
 
 !
@@ -408 +416 @@
 !-- zw: lwy, lwz, tw, r31, r32, r33, d3
 !-- WARNING: zz is not used at the moment
-    OPEN( 24, FILE='STG_PROFILES'//TRIM( coupling_char ), STATUS='OLD',        &
+    OPEN( 90, FILE='STG_PROFILES'//TRIM( coupling_char ), STATUS='OLD',        &
                    FORM='FORMATTED')
 
     ! Skip header
-    READ( 24, * )
+    READ( 90, * )
 
     DO  k = nzb, nzt+1
-       READ( 24, * ) zz, luy, luz, tu(k), lvy, lvz, tv(k), lwy, lwz, tw(k),    &
+       READ( 90, * ) zz, luy, luz, tu(k), lvy, lvz, tv(k), lwy, lwz, tw(k),    &
                      r11(k), r21(k), r22(k), r31(k), r32(k), r33(k),           &
                      d1, d2, d3, d5
@@ -438 +446 @@
     ENDDO
 
-    CLOSE(24)
+    CLOSE( 90 )
 
 !