Changeset 1103 for palm/trunk/SOURCE

Timestamp:

Feb 20, 2013 2:15:53 AM (12 years ago)

Author:

raasch

Message:

small bugfixes; mrun and subjob scripts are made bash compatible; further adjustments for lckyuh

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• poisfft.f90 (modified) (8 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: turbulent inflow must not require cyclic fill in restart runs
 !
 ! Former revisions:
@@ -3436 +3436 @@
 !
 !-- Turbulent inflow requires that 3d arrays have been cyclically filled with
-!-- data from prerun
-    IF ( turbulent_inflow  .AND.  initializing_actions /= 'cyclic_fill' )  THEN
+!-- data from prerun in the first main run
+    IF ( turbulent_inflow  .AND.  initializing_actions /= 'cyclic_fill'  .AND. &
+         initializing_actions /= 'read_restart_data' )  THEN
        message_string = 'turbulent_inflow = .T. requires ' // &
                         'initializing_actions = ''cyclic_fill'' '

palm/trunk/SOURCE/poisfft.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! tri, ar, and ar1 arguments in tridia-routines (2d) are removed because they
+! sometimes cause segmentation faults with intel 12.1 compiler
 !
 ! Former revisions:
@@ -370 +371 @@
        DO  j = nys_z, nyn_z
           IF ( j <= nnyh )  THEN
-             CALL maketri( tri, j )
+             CALL maketri( j )
           ELSE
-             CALL maketri( tri, ny+1-j )
+             CALL maketri( ny+1-j )
           ENDIF
-          CALL split( tri )
-          CALL substi( ar, ar1, tri, j )
+          CALL split
+          CALL substi( j )
        ENDDO
 !$OMP  END PARALLEL
@@ -381 +382 @@
 !
 !--    First y-level.
-       CALL maketri( tri, nys_z )
-       CALL split( tri )
-       CALL substi( ar, ar1, tri, 0 )
+       CALL maketri( nys_z )
+       CALL split
+       CALL substi( 0 )
 
 !
 !--    Further y-levels.
        DO  j = 1, nnyh - 1
-          CALL maketri( tri, j )
-          CALL split( tri )
-          CALL substi( ar, ar1, tri, j )
-          CALL substi( ar, ar1, tri, ny+1-j )
+          CALL maketri( j )
+          CALL split
+          CALL substi( j )
+          CALL substi( ny+1-j )
        ENDDO
-       CALL maketri( tri, nnyh )
-       CALL split( tri )
-       CALL substi( ar, ar1, tri, nnyh+nys )
+       CALL maketri( nnyh )
+       CALL split
+       CALL substi( nnyh+nys )
 #endif
 
     CONTAINS
 
-       SUBROUTINE maketri( tri, j )
+       SUBROUTINE maketri( j )
 
 !------------------------------------------------------------------------------!
@@ -416 +417 @@
           REAL    ::  a, c
           REAL    ::  ll(nxl_z:nxr_z)
-          REAL    ::  tri(5,nxl_z:nxr_z,0:nz-1)
 
 
@@ -476 +476 @@
 
 
-       SUBROUTINE substi( ar, ar1, tri, j )
+       SUBROUTINE substi( j )
 
 !------------------------------------------------------------------------------!
@@ -487 +487 @@
 
           INTEGER ::  i, j, k
-          REAL    ::  ar1(nxl_z:nxr_z,0:nz-1)
-          REAL    ::  tri(5,nxl_z:nxr_z,0:nz-1)
-#if defined( __parallel )
-          REAL    ::  ar(nxl_z:nxr_z,nys_z:nyn_z,1:nz)
-#else
-          REAL    ::  ar(1:nz,nys_z:nyn_z,nxl_z:nxr_z)
-#endif
 
 !
@@ -559 +552 @@
 
 
-       SUBROUTINE split( tri )
+       SUBROUTINE split
 
 !------------------------------------------------------------------------------!
@@ -568 +561 @@
 
           INTEGER ::  i, k
-          REAL    ::  tri(5,nxl_z:nxr_z,0:nz-1)
 
 !