Changeset 1374


Ignore:
Timestamp:
Apr 25, 2014 12:55:07 PM (7 years ago)
Author:
raasch
Message:

bugfixes:
missing variables added to ONLY lists in USE statements (advec_s_bc, advec_s_pw, advec_s_up, advec_ws, buoyancy, diffusion_e, diffusion_s, fft_xy, flow_statistics, palm, prognostic_equations)
missing module kinds added (cuda_fft_interfaces)
dpk renamed dp (fft_xy)
missing dependency for check_open added (Makefile)
variables removed from acc-present-list (diffusion_e, diffusion_w, diffusivities, production_e, wall_fluxes)
syntax errors removed from openacc-branch (flow_statistics)
USE-statement for nopointer-case added (swap_timelevel)

Location:
palm/trunk/SOURCE
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/Makefile

    r1366 r1374  
    2020# Current revisions:
    2121# ------------------
    22 #
     22# bugfix: missing dependency added for check_open
    2323#
    2424# Former revisions:
     
    267267calc_spectra.o: modules.o cpulog.o fft_xy.o mod_kinds.o
    268268check_for_restart.o: modules.o mod_kinds.o
    269 check_open.o: modules.o mod_kinds.o
     269check_open.o: modules.o mod_kinds.o mod_particle_attributes.o
    270270check_parameters.o: modules.o mod_kinds.o subsidence.o
    271271close_file.o: modules.o mod_kinds.o
  • palm/trunk/SOURCE/advec_s_bc.f90

    r1362 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    9191
    9292    USE indices,                                                               &
    93         ONLY:  nx, nxl, nxr, nyn, nys, nzb, nzt
     93        ONLY:  nx, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
    9494
    9595    USE kinds
  • palm/trunk/SOURCE/advec_s_pw.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    8383
    8484       USE indices,                                                            &
    85            ONLY:  nxl, nxr, nyn, nys, nzb_s_inner, nzt
     85           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,&
     86                  nzt
    8687
    8788       USE kinds
     
    136137
    137138       USE indices,                                                            &
    138            ONLY:  nzb_s_inner, nzt
     139           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
    139140
    140141       USE kinds
  • palm/trunk/SOURCE/advec_s_up.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    8383
    8484       USE indices,                                                            &
    85            ONLY:  nxl, nxr, nyn, nys, nzb_s_inner, nzt
     85           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,&
     86                  nzt
    8687
    8788       USE kinds
     
    160161
    161162       USE indices,                                                            &
    162            ONLY:  nzb_s_inner, nzt
     163           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
    163164
    164165       USE kinds
  • palm/trunk/SOURCE/advec_ws.f90

    r1362 r1374  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    389389
    390390       USE indices,                                                            &
    391            ONLY:  nxl, nxr, nyn, nys, nzb, nzb_max, nzt, wall_flags_0
     391           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_max,    &
     392                  nzt, wall_flags_0
    392393
    393394       USE kinds
     
    22302231
    22312232       USE indices,                                                           &
    2232            ONLY:  nxl, nxr, nyn, nys, nzb, nzb_max, nzt, wall_flags_0
     2233           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_max,   &
     2234                  nzt, wall_flags_0
    22332235           
    22342236       USE kinds
     
    27492751!
    27502752!--    Computation of fluxes and tendency terms
    2751        !$acc kernels present( ddzw, sk, tend, u, v, w, wall_flags_0, wall_flags_00 )
     2753       !$acc kernels present( ddzw, sk, tend, u, v, w, wall_flags_0 )
    27522754       DO  i = i_left, i_right
    27532755          DO  j = j_south, j_north
     
    35453547!
    35463548!--    Computation of fluxes and tendency terms
    3547        !$acc  kernels present( ddzw, tend, u, v, w, wall_flags_0, wall_flags_00 )
     3549       !$acc  kernels present( ddzw, tend, u, v, w, wall_flags_0 )
    35483550       DO i = i_left, i_right
    35493551          DO  j = j_south, j_north
     
    43494351!
    43504352!--    Computation of fluxes and tendency terms
    4351        !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0, wall_flags_00 )
     4353       !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0 )
    43524354       DO  i = i_left, i_right
    43534355          DO  j = j_south, j_north
  • palm/trunk/SOURCE/buoyancy.f90

    r1366 r1374  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    110110
    111111       USE indices,                                                            &
    112            ONLY:  nxl, nxlu, nxr, nyn, nys, nzb_s_inner, nzt
     112           ONLY:  nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nzb,       &
     113                  nzb_s_inner, nzt
    113114
    114115       USE kinds
     
    205206
    206207       USE indices,                                                            &
    207            ONLY:  i_left, i_right, j_north, j_south, nxl, nxlu, nxr, nyn, nys, &
    208                   nzb_s_inner, nzt
     208           ONLY:  i_left, i_right, j_north, j_south, nxl, nxlg, nxlu, nxr,    &
     209                  nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner, nzt
    209210
    210211       USE kinds
     
    308309
    309310       USE indices,                                                            &
    310            ONLY:  nzb_s_inner, nzt
     311           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
    311312
    312313       USE kinds
  • palm/trunk/SOURCE/cuda_fft_interfaces.f90

    r1321 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! bugfix: missing module kinds added
    2323!
    2424! Former revisions:
     
    5757
    5858#if defined ( __cuda_fft )
     59
     60    USE kinds
    5961
    6062    INTEGER(iwp) ::  CUFFT_FORWARD = -1   !:
  • palm/trunk/SOURCE/diffusion_e.f90

    r1341 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! missing variables added to ONLY list
     23! rif removed from acc-present-list
    2324!
    2425! Former revisions:
     
    113114           
    114115       USE indices,                                                            &
    115            ONLY:  nxl, nxr, nyn, nys, nzb, nzb_s_inner, nzt
     116           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,&
     117                  nzt
    116118           
    117119       USE kinds
     
    317319           
    318320       USE indices,                                                            &
    319            ONLY:  i_left, i_right, j_north, j_south, nzb_s_inner, nzt
     321           ONLY:  i_left, i_right, j_north, j_south, nxlg, nxrg, nyng, nysg,   &
     322                  nzb, nzb_s_inner, nzt
    320323           
    321324       USE kinds
     
    349352
    350353          !$acc kernels present( ddzu, ddzw, dd2zu, diss, e, km, l_grid ) &
    351           !$acc         present( nzb_s_inner, rif, tend, var, zu, zw )
     354          !$acc         present( nzb_s_inner, tend, var, zu, zw )
    352355          DO  i = i_left, i_right
    353356             DO  j = j_south, j_north
     
    416419
    417420          !$acc kernels present( ddzu, ddzw, dd2zu, diss, e, km, l_grid ) &
    418           !$acc         present( nzb_s_inner, rif, tend, var, zu, zw )
     421          !$acc         present( nzb_s_inner, tend, var, zu, zw )
    419422          DO  i = i_left, i_right
    420423             DO  j = j_south, j_north
     
    513516           
    514517       USE indices,                                                            &
    515            ONLY:  nzb, nzb_s_inner, nzt
     518           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
    516519           
    517520       USE kinds
  • palm/trunk/SOURCE/diffusion_s.f90

    r1341 r1374  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! missing variables added to ONLY list
    2323!
    2424! Former revisions:
     
    9898       
    9999       USE indices,                                                            &
    100            ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg,                  &
     100           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb,             &
    101101                  nzb_diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff
    102102       
     
    224224       USE indices, &
    225225           ONLY: i_left, i_right, j_north, j_south, nxlg, nxrg, nyng, nysg,    &
    226                  nzb_diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff
     226                 nzb, nzb_diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff
    227227           
    228228       USE kinds
     
    351351       
    352352       USE indices,                                                            &
    353            ONLY:  nxlg, nxrg, nyng, nysg, nzb_diff_s_inner, nzb_s_inner,       &
     353           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_diff_s_inner, nzb_s_inner,  &
    354354                  nzb_s_outer, nzt, nzt_diff
    355355       
  • palm/trunk/SOURCE/diffusion_w.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! vsws + vswst removed from acc-present-list
    2323!
    2424! Former revisions:
     
    262262       ENDIF
    263263
    264        !$acc kernels present ( u, v, w, km, tend, vsws, vswst )    &
     264       !$acc kernels present ( u, v, w, km, tend )                             &
    265265       !$acc         present ( ddzu, ddzw, fwxm, fwxp, fwym, fwyp, wall_w_x, wall_w_y )           &
    266266       !$acc         present ( nzb_w_inner, nzb_w_outer )
  • palm/trunk/SOURCE/diffusivities.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! rif removed from acc-present-list
    2323!
    2424! Former revisions:
     
    114114!
    115115!-- Data declerations for accelerators
    116     !$acc data present( dd2zu, e, km, kh, l_grid, l_wall, nzb_s_inner, rif, var )
     116    !$acc data present( dd2zu, e, km, kh, l_grid, l_wall, nzb_s_inner, var )
    117117    !$acc kernels
    118118
  • palm/trunk/SOURCE/fft_xy.f90

    r1373 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! bugfixes: missing variables added to ONLY list, dpk renamed dp
    2323!
    2424! Former revisions:
     
    117117   
    118118    USE transpose_indices,                                                     &
    119         ONLY:  nyn_x, nys_x, nzb_x, nzb_y, nzt_x, nzt_y
     119        ONLY:  nxl_y, nxr_y, nyn_x, nys_x, nzb_x, nzb_y, nzt_x, nzt_y
    120120
    121121    IMPLICIT NONE
     
    390390       REAL(wp), DIMENSION(6*(nx+1)) ::  work2  !:
    391391#elif defined( __cuda_fft )
    392        COMPLEX(dpk), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) ::          &
     392       COMPLEX(dp), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) ::           &
    393393          ar_tmp  !:
    394394       !$acc declare create( ar_tmp )
     
    10331033       REAL(wp), DIMENSION(6*(ny+1)) ::  work2  !:
    10341034#elif defined( __cuda_fft )
    1035        COMPLEX(dpk), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) ::          &
     1035       COMPLEX(dp), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) ::           &
    10361036          ar_tmp  !:
    10371037       !$acc declare create( ar_tmp )
  • palm/trunk/SOURCE/flow_statistics.f90

    r1366 r1374  
    2121! Current revisions:
    2222! -----------------
    23 !
     23! bugfix: syntax errors removed from openacc-branch
     24! missing variables added to ONLY-lists
    2425!
    2526! Former revisions:
     
    14071408    USE indices,                                                               &
    14081409        ONLY:  ngp_2dh, ngp_2dh_s_inner, ngp_3d, ngp_3d_inner, ngp_sums, nxl,  &
    1409                nxr, nyn, nys, nzb, nzb_diff_s_inner, nzb_s_inner, nzt, nzt_diff
     1410               nxr, nyn, nys, nzb, nzb_diff_s_inner, nzb_s_inner, nzt,         &
     1411               nzt_diff, rflags_invers
    14101412       
    14111413    USE kinds
     
    14421444    REAL(wp) ::  ust              !:
    14431445    REAL(wp) ::  ust2             !:
    1444     REAL(wp) ::  u2,              !:
     1446    REAL(wp) ::  u2               !:
    14451447    REAL(wp) ::  vst              !:
    14461448    REAL(wp) ::  vst2             !:
     
    20342036                   s1 = s1 - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) )              &
    20352037                                    * ( vpt(k+1,j,i) - vpt(k,j,i) )            &
    2036                                     * ddzu(k+1) * rmask(j,i,sr)
     2038                                    * ddzu(k+1) * rmask(j,i,sr)                &
    20372039                                    * rflags_invers(j,i,k+1)
    20382040                   s2 = s2 - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) )              &
  • palm/trunk/SOURCE/palm.f90

    r1321 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! bugfix: module arrays_3d added
    2323!
    2424! Former revisions:
     
    8383!------------------------------------------------------------------------------!
    8484
     85    USE arrays_3d
    8586
    8687    USE control_parameters,                                                    &
    8788        ONLY:  coupling_char, coupling_mode, do2d_at_begin, do3d_at_begin,     &
    8889               io_blocks, io_group, large_scale_forcing, nudging,              &
    89                simulated_time, simulated_time_chr, version, write_binary
     90               simulated_time, simulated_time_chr, version, wall_heatflux, write_binary
    9091
    9192    USE cpulog,                                                                &
    9293        ONLY:  cpu_log, log_point, cpu_statistics
    9394
     95    USE grid_variables,                                                        &
     96        ONLY:  fxm, fxp, fym, fyp, fwxm, fwxp, fwym, fwyp, wall_e_x, wall_e_y, &
     97               wall_u, wall_v, wall_w_x, wall_w_y
     98
     99    USE indices,                                                               &
     100        ONLY:  ngp_2dh, ngp_2dh_s_inner, nzb_diff_s_inner, nzb_diff_s_outer, nzb_diff_u, nzb_diff_v,     &
     101               nzb_s_inner, nzb_s_outer, nzb_u_inner, nzb_u_outer, nzb_v_inner,&
     102               nzb_v_outer, nzb_w_inner, nzb_w_outer, rflags_invers,           &
     103               rflags_s_inner, wall_flags_0, wall_flags_00
     104
    94105    USE kinds
    95106
     
    104115
    105116    USE pegrid
     117
     118    USE statistics,                                                            &
     119        ONLY:  hom, rmask, weight_pres, weight_substep
    106120
    107121#if defined( __openacc )
  • palm/trunk/SOURCE/production_e.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! nzb_s_outer removed from acc-present-list
    2323!
    2424! Former revisions:
     
    780780!--    Calculate TKE production by shear
    781781       !$acc kernels present( ddzw, dd2zu, kh, km, nzb_diff_s_inner, nzb_diff_s_outer ) &
    782        !$acc         present( nzb_s_inner, nzb_s_outer, pt, q, ql, qsws, qswst, rho )   &
     782       !$acc         present( nzb_s_inner, pt, q, ql, qsws, qswst, rho )                &
    783783       !$acc         present( shf, tend, tswst, u, v, vpt, w, wall_e_x, wall_e_y )      &
    784784       !$acc         copyin( u_0, v_0 )
  • palm/trunk/SOURCE/prognostic_equations.f90

    r1366 r1374  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! missing variables added to ONLY lists
    2323!
    2424! Former revisions:
     
    139139               flux_l_pt, flux_l_q, flux_l_qr, flux_l_sa, nr, nr_p, nrsws,     &
    140140               nrswst, pt, ptdf_x, ptdf_y, pt_init, pt_p, prho, q, q_init,     &
    141                q_p, qsws, qswst, qr, qr_p, qrsws, qrswst, rdf, rdf_sc, rho,    &
    142                sa, sa_init, sa_p, saswsb, saswst, shf, tend, te_m, tnr_m,      &
    143                tpt_m, tq_m, tqr_m, tsa_m, tswst, tu_m, tv_m, tw_m, u, ug, u_p, &
    144                v, vg, vpt, v_p, w, w_p
     141               q_p, qsws, qswst, qr, qr_p, qrsws, qrswst, rdf, rdf_sc,         &
     142               ref_state, rho, sa, sa_init, sa_p, saswsb, saswst, shf, tend,   &
     143               te_m, tnr_m, tpt_m, tq_m, tqr_m, tsa_m, tswst, tu_m, tv_m,      &
     144               tw_m, u, ug, u_p, v, vg, vpt, v_p, w, w_p
    145145       
    146146    USE control_parameters,                                                    &
     
    245245        ONLY:  production_e, production_e_acc
    246246
     247    USE statistics,                                                            &
     248        ONLY:  hom
     249
    247250    USE subsidence_mod,                                                        &
    248251        ONLY:  subsidence
     
    17571760!
    17581761!-- u-velocity component
    1759 !++ Statistics still not ported to accelerators
     1762!++ Statistics still not completely ported to accelerators
    17601763    !$acc update device( hom, ref_state )
    17611764    CALL cpu_log( log_point(5), 'u-equation', 'start' )
  • palm/trunk/SOURCE/swap_timelevel.f90

    r1321 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! bugfix: use-statement for nopointer-case added
    2323!
    2424! Former revisions:
     
    6262!------------------------------------------------------------------------------!
    6363
     64#if defined( __nopointer )
     65    USE arrays_3d,                                                             &
     66        ONLY:  e, e_p, nr, nr_p, pt, pt_p, q, q_p, qr, qr_p, sa, sa_p, u, u_p, &
     67               v, v_p, w, w_p
     68#else
    6469    USE arrays_3d,                                                             &
    6570        ONLY:  e, e_1, e_2, e_p, nr, nr_1, nr_2, nr_p, pt, pt_1, pt_2, pt_p, q,&
    6671               q_1, q_2, q_p, qr, qr_1, qr_2, qr_p, sa, sa_1, sa_2, sa_p, u,   &
    6772               u_1, u_2, u_p, v, v_1, v_2, v_p, w, w_1, w_2, w_p
     73#endif
    6874
    6975    USE cpulog,                                                                &
  • palm/trunk/SOURCE/wall_fluxes.f90

    r1354 r1374  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! pt removed from acc-present-list
    2323!
    2424! Former revisions:
     
    849849       max_outer = MAXVAL( nzb_diff_s_outer(nys:nyn,nxl:nxr) ) - 2
    850850
    851        !$acc kernels present( nzb_diff_s_inner, nzb_diff_s_outer, pt, rif_wall ) &
     851       !$acc kernels present( nzb_diff_s_inner, nzb_diff_s_outer, rif_wall )  &
    852852       !$acc         present( u, v, w, wall, wall_flux, z0 )
    853853       DO  i = i_left, i_right
Note: See TracChangeset for help on using the changeset viewer.