Changeset 13153 for NEMO/branches

Timestamp:

2020-06-24T15:23:31+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2482: fixes after testing with ifort

Location:

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src

Files:

• ICE/icedyn_adv_umx.F90 (modified) (2 diffs)
• OCE/DYN/dynldf_lap_blp.F90 (modified) (4 diffs)
• OCE/ZDF/zdfphy.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/ICE/icedyn_adv_umx.F90

@@ -59 +59 @@
    REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zbetup, zbetdo, zti_ups, ztj_ups
    REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zt_u, zt_v
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zudy, zvdx, zcu_box, zcv_box
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zati1, zati2
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zu_cat, zv_cat
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zua_ho, zva_ho, zua_ups,zva_ups
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   z1_ai , z1_aip, zhvar
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zhi_max, zhs_max, zhip_max
+   !
+   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::   zuv_ho, zvv_ho, zuv_ups, zvv_ups, z1_vi, z1_vs
+
 
    !
@@ -110 +119 @@
 !     REAL(wp), DIMENSION(jpi,jpj,jpl) ::   z1_ai , z1_aip, zhvar
 !     REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zhi_max, zhs_max, zhip_max
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zudy, zvdx, zcu_box, zcv_box
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::   zati1, zati2
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zu_cat, zv_cat
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zua_ho, zva_ho, zua_ups, zva_ups
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   z1_ai , z1_aip, zhvar
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::   zhi_max, zhs_max, zhip_max
-      !
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   ::   zuv_ho, zvv_ho, zuv_ups, zvv_ups, z1_vi, z1_vs 
       !!----------------------------------------------------------------------
       !

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/DYN/dynldf_lap_blp.F90

@@ -25 +25 @@
    PUBLIC dyn_ldf_lap  ! called by dynldf.F90
    PUBLIC dyn_ldf_blp  ! called by dynldf.F90
+
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) :: zulap, zvlap
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :) :: zcur, zdiv
 
    !! * Substitutions
@@ -55 +58 @@
       REAL(wp) ::   zsign        ! local scalars
       REAL(wp) ::   zua, zva     ! local scalars
-      REAL(wp), DIMENSION(jpi,jpj) ::   zcur, zdiv
-!     REAL(wp), ALLOCATABLE, DIMENSION(:, :) :: zcur, zdiv
+!     REAL(wp), DIMENSION(jpi,jpj) ::   zcur, zdiv
       !!----------------------------------------------------------------------
       !
@@ -65 +67 @@
             WRITE(numout,*) '~~~~~~~ '
          ENDIF
-!        ALLOCATE(zcur(jpi,jpj), zdiv(jpi,jpj))
+         IF(kpass == 1) ALLOCATE(zcur(jpi,jpj), zdiv(jpi,jpj))
       ENDIF
       !
@@ -127 +129 @@
       !
 !     REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zulap, zvlap   ! laplacian at u- and v-point
-      REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) :: zulap, zvlap
       !!----------------------------------------------------------------------
       !

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/ZDF/zdfphy.F90

@@ -257 +257 @@
       !                       !==  Kz from chosen turbulent closure  ==!   (avm_k, avt_k)
       !
-      zsh2(:, :) = 0.
+      zsh2(:, :, :) = 0.
       IF( l_zdfsh2 )   &         !* shear production at w-points (energy conserving form)
          CALL zdf_sh2( ub, vb, un, vn, avm_k,   &     ! <<== in