Changeset 13153


Ignore:
Timestamp:
2020-06-24T15:23:31+02:00 (5 months ago)
Author:
andmirek
Message:

Ticket #2482: fixes after testing with ifort

Location:
NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/ICE/icedyn_adv_umx.F90

    r13149 r13153  
    5959   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zbetup, zbetdo, zti_ups, ztj_ups 
    6060   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zt_u, zt_v 
     61   REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zudy, zvdx, zcu_box, zcv_box 
     62   REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zati1, zati2 
     63   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zu_cat, zv_cat 
     64   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zua_ho, zva_ho, zua_ups,zva_ups 
     65   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   z1_ai , z1_aip, zhvar 
     66   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zhi_max, zhs_max, zhip_max 
     67   ! 
     68   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::   zuv_ho, zvv_ho, zuv_ups, zvv_ups, z1_vi, z1_vs 
     69 
    6170 
    6271   ! 
     
    110119!     REAL(wp), DIMENSION(jpi,jpj,jpl) ::   z1_ai , z1_aip, zhvar 
    111120!     REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zhi_max, zhs_max, zhip_max 
    112       REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zudy, zvdx, zcu_box, zcv_box 
    113       REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zati1, zati2 
    114       REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zu_cat, zv_cat 
    115       REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zua_ho, zva_ho, zua_ups, zva_ups 
    116       REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   z1_ai , z1_aip, zhvar 
    117       REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zhi_max, zhs_max, zhip_max 
    118       ! 
    119       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::   zuv_ho, zvv_ho, zuv_ups, zvv_ups, z1_vi, z1_vs  
    120121      !!---------------------------------------------------------------------- 
    121122      ! 
  • NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/DYN/dynldf_lap_blp.F90

    r13149 r13153  
    2525   PUBLIC dyn_ldf_lap  ! called by dynldf.F90 
    2626   PUBLIC dyn_ldf_blp  ! called by dynldf.F90 
     27 
     28   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) :: zulap, zvlap 
     29   REAL(wp), ALLOCATABLE, DIMENSION(:, :) :: zcur, zdiv 
    2730 
    2831   !! * Substitutions 
     
    5558      REAL(wp) ::   zsign        ! local scalars 
    5659      REAL(wp) ::   zua, zva     ! local scalars 
    57       REAL(wp), DIMENSION(jpi,jpj) ::   zcur, zdiv 
    58 !     REAL(wp), ALLOCATABLE, DIMENSION(:, :) :: zcur, zdiv 
     60!     REAL(wp), DIMENSION(jpi,jpj) ::   zcur, zdiv 
    5961      !!---------------------------------------------------------------------- 
    6062      ! 
     
    6567            WRITE(numout,*) '~~~~~~~ ' 
    6668         ENDIF 
    67 !        ALLOCATE(zcur(jpi,jpj), zdiv(jpi,jpj)) 
     69         IF(kpass == 1) ALLOCATE(zcur(jpi,jpj), zdiv(jpi,jpj)) 
    6870      ENDIF 
    6971      ! 
     
    127129      ! 
    128130!     REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zulap, zvlap   ! laplacian at u- and v-point 
    129       REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) :: zulap, zvlap 
    130131      !!---------------------------------------------------------------------- 
    131132      ! 
  • NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/ZDF/zdfphy.F90

    r13081 r13153  
    257257      !                       !==  Kz from chosen turbulent closure  ==!   (avm_k, avt_k) 
    258258      ! 
    259       zsh2(:, :) = 0. 
     259      zsh2(:, :, :) = 0. 
    260260      IF( l_zdfsh2 )   &         !* shear production at w-points (energy conserving form) 
    261261         CALL zdf_sh2( ub, vb, un, vn, avm_k,   &     ! <<== in 
Note: See TracChangeset for help on using the changeset viewer.