Changeset 485 for palm/trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/init_3d_model.f90

    r482 r485  
    77! Current revisions:
    88! -----------------
    9 !
     9! calculation of ngp_3d + ngp_3d_inner changed because they have now 64 bit
    1010!
    1111! Former revisions:
     
    112112    INTEGER ::  i, ind_array(1), j, k, sr
    113113
    114     INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_2dh_l, ngp_3d_inner_l
     114    INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_2dh_l
    115115
    116116    INTEGER, DIMENSION(:,:), ALLOCATABLE ::  ngp_2dh_outer_l,  &
     
    120120
    121121    REAL, DIMENSION(1:2) ::  volume_flow_area_l, volume_flow_initial_l
     122
     123    REAL, DIMENSION(:), ALLOCATABLE ::  ngp_3d_inner_l, ngp_3d_inner_tmp
    122124
    123125
     
    128130              ngp_3d_inner(0:statistic_regions),                            &
    129131              ngp_3d_inner_l(0:statistic_regions),                          &
     132              ngp_3d_inner_tmp(0:statistic_regions),                        &
    130133              sums_divnew_l(0:statistic_regions),                           &
    131134              sums_divold_l(0:statistic_regions) )
     
    15201523    ngp_2dh_l         = 0
    15211524    ngp_2dh           = 0
    1522     ngp_3d_inner_l    = 0
     1525    ngp_3d_inner_l    = 0.0
    15231526    ngp_3d_inner      = 0
    15241527    ngp_3d            = 0
     
    15511554    sr = statistic_regions + 1
    15521555#if defined( __parallel )
    1553     CALL MPI_ALLREDUCE( ngp_2dh_l(0), ngp_2dh(0), sr, MPI_INTEGER, MPI_SUM,  &
     1556    CALL MPI_ALLREDUCE( ngp_2dh_l(0), ngp_2dh(0), sr, MPI_INTEGER, MPI_SUM,   &
    15541557                        comm2d, ierr )
    1555     CALL MPI_ALLREDUCE( ngp_2dh_outer_l(0,0), ngp_2dh_outer(0,0), (nz+2)*sr, &
     1558    CALL MPI_ALLREDUCE( ngp_2dh_outer_l(0,0), ngp_2dh_outer(0,0), (nz+2)*sr,  &
    15561559                        MPI_INTEGER, MPI_SUM, comm2d, ierr )
    1557     CALL MPI_ALLREDUCE( ngp_2dh_s_inner_l(0,0), ngp_2dh_s_inner(0,0),        &
     1560    CALL MPI_ALLREDUCE( ngp_2dh_s_inner_l(0,0), ngp_2dh_s_inner(0,0),         &
    15581561                        (nz+2)*sr, MPI_INTEGER, MPI_SUM, comm2d, ierr )
    1559     CALL MPI_ALLREDUCE( ngp_3d_inner_l(0), ngp_3d_inner(0), sr, MPI_INTEGER, &
     1562    CALL MPI_ALLREDUCE( ngp_3d_inner_l(0), ngp_3d_inner_tmp(0), sr, MPI_REAL, &
    15601563                        MPI_SUM, comm2d, ierr )
     1564    ngp_3d_inner = INT( ngp_3d_inner_tmp, KIND = SELECTED_INT_KIND( 18 ) )
    15611565#else
    15621566    ngp_2dh         = ngp_2dh_l
    15631567    ngp_2dh_outer   = ngp_2dh_outer_l
    15641568    ngp_2dh_s_inner = ngp_2dh_s_inner_l
    1565     ngp_3d_inner    = ngp_3d_inner_l
     1569    ngp_3d_inner    = INT( ngp_3d_inner_l, KIND = SELECTED_INT_KIND( 18 ) )
    15661570#endif
    15671571
    1568     ngp_3d = ngp_2dh * ( nz + 2 )
     1572    ngp_3d = INT( ngp_2dh * ( nz + 2 ), KIND = SELECTED_INT_KIND( 18 ) )
    15691573
    15701574!
     
    15761580    ngp_2dh_s_inner = MAX( 1, ngp_2dh_s_inner(:,:) )
    15771581
    1578     DEALLOCATE( ngp_2dh_l, ngp_2dh_outer_l, ngp_3d_inner_l )
     1582    DEALLOCATE( ngp_2dh_l, ngp_2dh_outer_l, ngp_3d_inner_l, ngp_3d_inner_tmp )
    15791583
    15801584
  • palm/trunk/SOURCE/modules.f90

    r482 r485  
    55! Current revisions:
    66! -----------------
    7 !
     7! ngp_3d, ngp_3d_inner changed to 64 bit
    88!
    99! Former revisions:
     
    828828                nz = 0, nza, nzb, nzb_diff, nzt, nzta, nzt_diff
    829829
     830    INTEGER( KIND = SELECTED_INT_KIND(18) ), DIMENSION(:), ALLOCATABLE ::      &
     831                ngp_3d, ngp_3d_inner   ! need to have 64 bit for grids > 2E9
     832
    830833    INTEGER, DIMENSION(:), ALLOCATABLE ::                                      &
    831                 ngp_2dh, ngp_3d, ngp_3d_inner,                                 &
    832                 nnx_pe, nny_pe, nxl_mg, nxr_mg, nyn_mg, nys_mg, nzt_mg
     834                ngp_2dh, nnx_pe, nny_pe, nxl_mg, nxr_mg, nyn_mg, nys_mg, nzt_mg
    833835
    834836    INTEGER, DIMENSION(:,:), ALLOCATABLE ::                                    &
Note: See TracChangeset for help on using the changeset viewer.