Changeset 485 for palm

Timestamp:

Feb 5, 2010 10:57:51 AM (15 years ago)

Author:

raasch

Message:

ngp_p3d changed to 64 bit integer

Location:

palm/trunk/SOURCE

Files:

• init_3d_model.f90 (modified) (7 diffs)
• modules.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Current revisions:
 ! -----------------
-! 
+! calculation of ngp_3d + ngp_3d_inner changed because they have now 64 bit
 !
 ! Former revisions:
@@ -112 +112 @@
     INTEGER ::  i, ind_array(1), j, k, sr
 
-    INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_2dh_l, ngp_3d_inner_l
+    INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_2dh_l
 
     INTEGER, DIMENSION(:,:), ALLOCATABLE ::  ngp_2dh_outer_l,  &
@@ -120 +120 @@
 
     REAL, DIMENSION(1:2) ::  volume_flow_area_l, volume_flow_initial_l
+
+    REAL, DIMENSION(:), ALLOCATABLE ::  ngp_3d_inner_l, ngp_3d_inner_tmp
 
 
@@ -128 +130 @@
               ngp_3d_inner(0:statistic_regions),                            &
               ngp_3d_inner_l(0:statistic_regions),                          &
+              ngp_3d_inner_tmp(0:statistic_regions),                        &
               sums_divnew_l(0:statistic_regions),                           &
               sums_divold_l(0:statistic_regions) )
@@ -1520 +1523 @@
     ngp_2dh_l         = 0
     ngp_2dh           = 0
-    ngp_3d_inner_l    = 0
+    ngp_3d_inner_l    = 0.0
     ngp_3d_inner      = 0
     ngp_3d            = 0
@@ -1551 +1554 @@
     sr = statistic_regions + 1
 #if defined( __parallel )
-    CALL MPI_ALLREDUCE( ngp_2dh_l(0), ngp_2dh(0), sr, MPI_INTEGER, MPI_SUM,  &
+    CALL MPI_ALLREDUCE( ngp_2dh_l(0), ngp_2dh(0), sr, MPI_INTEGER, MPI_SUM,   &
                         comm2d, ierr )
-    CALL MPI_ALLREDUCE( ngp_2dh_outer_l(0,0), ngp_2dh_outer(0,0), (nz+2)*sr, &
+    CALL MPI_ALLREDUCE( ngp_2dh_outer_l(0,0), ngp_2dh_outer(0,0), (nz+2)*sr,  &
                         MPI_INTEGER, MPI_SUM, comm2d, ierr )
-    CALL MPI_ALLREDUCE( ngp_2dh_s_inner_l(0,0), ngp_2dh_s_inner(0,0),        &
+    CALL MPI_ALLREDUCE( ngp_2dh_s_inner_l(0,0), ngp_2dh_s_inner(0,0),         &
                         (nz+2)*sr, MPI_INTEGER, MPI_SUM, comm2d, ierr )
-    CALL MPI_ALLREDUCE( ngp_3d_inner_l(0), ngp_3d_inner(0), sr, MPI_INTEGER, &
+    CALL MPI_ALLREDUCE( ngp_3d_inner_l(0), ngp_3d_inner_tmp(0), sr, MPI_REAL, &
                         MPI_SUM, comm2d, ierr )
+    ngp_3d_inner = INT( ngp_3d_inner_tmp, KIND = SELECTED_INT_KIND( 18 ) )
 #else
     ngp_2dh         = ngp_2dh_l
     ngp_2dh_outer   = ngp_2dh_outer_l
     ngp_2dh_s_inner = ngp_2dh_s_inner_l
-    ngp_3d_inner    = ngp_3d_inner_l
+    ngp_3d_inner    = INT( ngp_3d_inner_l, KIND = SELECTED_INT_KIND( 18 ) )
 #endif
 
-    ngp_3d = ngp_2dh * ( nz + 2 )
+    ngp_3d = INT( ngp_2dh * ( nz + 2 ), KIND = SELECTED_INT_KIND( 18 ) )
 
 !
@@ -1576 +1580 @@
     ngp_2dh_s_inner = MAX( 1, ngp_2dh_s_inner(:,:) ) 
 
-    DEALLOCATE( ngp_2dh_l, ngp_2dh_outer_l, ngp_3d_inner_l )
+    DEALLOCATE( ngp_2dh_l, ngp_2dh_outer_l, ngp_3d_inner_l, ngp_3d_inner_tmp )
 
 

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Current revisions:
 ! -----------------
-! 
+! ngp_3d, ngp_3d_inner changed to 64 bit
 !
 ! Former revisions:
@@ -828 +828 @@
                 nz = 0, nza, nzb, nzb_diff, nzt, nzta, nzt_diff
 
+    INTEGER( KIND = SELECTED_INT_KIND(18) ), DIMENSION(:), ALLOCATABLE ::      &
+                ngp_3d, ngp_3d_inner   ! need to have 64 bit for grids > 2E9
+
     INTEGER, DIMENSION(:), ALLOCATABLE ::                                      &
-                ngp_2dh, ngp_3d, ngp_3d_inner,                                 &
-                nnx_pe, nny_pe, nxl_mg, nxr_mg, nyn_mg, nys_mg, nzt_mg
+                ngp_2dh, nnx_pe, nny_pe, nxl_mg, nxr_mg, nyn_mg, nys_mg, nzt_mg
 
     INTEGER, DIMENSION(:,:), ALLOCATABLE ::                                    &