Changeset 880


Ignore:
Timestamp:
Apr 13, 2012 6:28:59 AM (10 years ago)
Author:
raasch
Message:

Bugfix: preprocessor statements for parallel execution added

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

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

    r867 r880  
    44! Current revisions:
    55! -----------------
    6 !
     6! gathered_size, subdomain_size moved to control_parameters
    77!
    88! Former revisions:
     
    515515                dosp_time_count = 0, dots_time_count = 0, &
    516516                do2d_xy_n = 0, do2d_xz_n = 0, do2d_yz_n = 0, do3d_avs_n = 0, &
    517                 dp_level_ind_b = 0, &
    518                 dvrp_filecount = 0, dz_stretch_level_index, gamma_mg, &
     517                dp_level_ind_b = 0, dvrp_filecount = 0, &
     518                dz_stretch_level_index, gamma_mg, gathered_size, &
    519519                grid_level, ibc_e_b, ibc_p_b, ibc_p_t, ibc_pt_b, ibc_pt_t, &
    520520                ibc_q_b, ibc_q_t, ibc_sa_t, ibc_uv_b, ibc_uv_t, &
     
    529529                nz_do1d, nz_do3d = -9999, outflow_damping_width = -1, &
    530530                pch_index = 0, prt_time_count = 0, recycling_plane, runnr = 0, &
    531                 skip_do_avs = 0, terminate_coupled = 0, &
     531                skip_do_avs = 0, subdomain_size, terminate_coupled = 0, &
    532532                terminate_coupled_remote = 0, timestep_count = 0
    533533
     
    13211321#endif
    13221322
    1323     INTEGER ::  comm1dx, comm1dy, comm2d, comm_inter, comm_palm, gathered_size,&
    1324                 ierr, myidx, myidy, ndim = 2, ngp_a, ngp_o, ngp_xy, ngp_y,     &
    1325                 pleft, pnorth, pright, psouth,                                 &
    1326                 sendrecvcount_xy, sendrecvcount_yz, sendrecvcount_zx,          &
    1327                 sendrecvcount_zyd, sendrecvcount_yxd, subdomain_size,          &
     1323    INTEGER ::  comm1dx, comm1dy, comm2d, comm_inter, comm_palm, ierr, myidx,  &
     1324                myidy, ndim = 2, ngp_a, ngp_o, ngp_xy, ngp_y, pleft, pnorth,   &
     1325                pright, psouth, sendrecvcount_xy, sendrecvcount_yz,            &
     1326                sendrecvcount_zx, sendrecvcount_zyd, sendrecvcount_yxd,        &
    13281327                type_x, type_x_int, type_xy, type_y, type_y_int
    13291328
  • palm/trunk/SOURCE/poismg.f90

    r879 r880  
    9191!-- on PE0, is larger than the number of grid points of an PE, than array
    9292!-- p3 will be enlarged.
    93 #if defined( __parallel )
    9493    IF ( gathered_size > subdomain_size )  THEN
    9594       ALLOCATE( p3(nzb:nzt_mg(mg_switch_to_pe0_level)+1,nys_mg(               &
     
    10099       ALLOCATE ( p3(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
    101100    ENDIF
    102 #else
    103    ALLOCATE ( p3(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
    104 #endif
    105101 
    106102!
  • palm/trunk/SOURCE/surface_coupler.f90

    r710 r880  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: preprocessor statements for parallel execution added
    77!
    88! Former revisions:
     
    390390
    391391  SUBROUTINE interpolate_to_atmos( tag )
     392
     393#if defined( __parallel )
    392394
    393395    USE arrays_3d
     
    454456    CALL MPI_BARRIER( comm2d, ierr )
    455457
     458#endif
     459
    456460  END SUBROUTINE interpolate_to_atmos
    457461
    458462
    459463  SUBROUTINE interpolate_to_ocean( tag )
     464
     465#if defined( __parallel )
    460466
    461467    USE arrays_3d
     
    518524    CALL MPI_BARRIER( comm2d, ierr ) 
    519525
     526#endif
     527
    520528  END SUBROUTINE interpolate_to_ocean
Note: See TracChangeset for help on using the changeset viewer.