Changeset 1406 for palm

Timestamp:

May 16, 2014 1:47:01 PM (11 years ago)

Author:

raasch

Message:

 

Location:

palm/trunk/SOURCE

Files:

• init_3d_model.f90 (modified) (2 diffs)
• poisfft.f90 (modified) (2 diffs)
• tridia_solver.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! bugfix: setting of initial velocities at k=1 to zero not in case of a
+! no-slip boundary condition for uv
 ! 
 ! Former revisions:
@@ -782 +783 @@
 !--       in the limiting formula!). The original values are stored to be later
 !--       used for volume flow control.
-          DO  i = nxlg, nxrg
-             DO  j = nysg, nyng
-                u(nzb:nzb_u_inner(j,i)+1,j,i) = 0.0_wp
-                v(nzb:nzb_v_inner(j,i)+1,j,i) = 0.0_wp
-             ENDDO
-          ENDDO
+          IF ( ibc_uv_b /= 1 )  THEN
+             DO  i = nxlg, nxrg
+                DO  j = nysg, nyng
+                   u(nzb:nzb_u_inner(j,i)+1,j,i) = 0.0_wp
+                   v(nzb:nzb_v_inner(j,i)+1,j,i) = 0.0_wp
+                ENDDO
+             ENDDO
+          ENDIF
 
           IF ( humidity  .OR.  passive_scalar )  THEN

palm/trunk/SOURCE/poisfft.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! bugfix for pgi 14.4: declare create moved after array declaration
 !
 ! Former revisions:
@@ -220 +220 @@
 
        REAL(wp), DIMENSION(1:nz,nys:nyn,nxl:nxr) ::  ar      !:
+       REAL(wp), DIMENSION(nys:nyn,nxl:nxr,1:nz) ::  ar_inv  !:
        !$acc declare create( ar_inv )
-       REAL(wp), DIMENSION(nys:nyn,nxl:nxr,1:nz) ::  ar_inv  !:
 
        REAL(wp), DIMENSION(:,:,:),   ALLOCATABLE ::  ar1      !:

palm/trunk/SOURCE/tridia_solver.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! bugfix for pgi 14.4: declare create moved after array declaration
 ! 
 ! Former revisions:
@@ -336 +336 @@
           REAL(wp)     ::  ar(nxl_z:nxr_z,nys_z:nyn_z,1:nz) !: 
 
+          REAL(wp), DIMENSION(nxl_z:nxr_z,nys_z:nyn_z,0:nz-1) ::  ar1 !:
           !$acc declare create( ar1 )
-          REAL(wp), DIMENSION(nxl_z:nxr_z,nys_z:nyn_z,0:nz-1) ::  ar1 !: 
 
 !