diff --git a/src/OCE/DIA/diaar5.F90 b/src/OCE/DIA/diaar5.F90 index dd14adce4c7909af3ad1296e69b1446d9cf563fd..c90cea702ea532aee148d302057cc161672bdf5a 100644 --- a/src/OCE/DIA/diaar5.F90 +++ b/src/OCE/DIA/diaar5.F90 @@ -79,7 +79,6 @@ CONTAINS REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z2d, zpe ! 2D workspace REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: z3d, zrhd, ztpot, zgdept ! 3D workspace (zgdept: needed to use the substitute) REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: ztsn ! 4D workspace - !!-------------------------------------------------------------------- IF( ln_timing ) CALL timing_start('dia_ar5') @@ -318,6 +317,7 @@ CONTAINS ! INTEGER :: ji, jj, jk REAL(wp), DIMENSION(A2D(nn_hls)) :: z2d + !!---------------------------------------------------------------------- z2d(:,:) = puflx(:,:,1) DO_3D( 0, 0, 0, 0, 1, jpkm1 ) @@ -355,7 +355,7 @@ CONTAINS !! ** Purpose : initialization for AR5 diagnostic computation !!---------------------------------------------------------------------- INTEGER :: inum - INTEGER :: ik, idep + INTEGER :: ik INTEGER :: ji, jj, jk ! dummy loop indices REAL(wp) :: zztmp REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: zsaldta ! Jan/Dec levitus salinity @@ -384,9 +384,9 @@ CONTAINS zvol0 (:,:) = 0._wp thick0(:,:) = 0._wp DO_3D( 1, 1, 1, 1, 1, jpkm1 ) ! interpolation of salinity at the last ocean level (i.e. the partial step) - idep = tmask(ji,jj,jk) * e3t_0(ji,jj,jk) - zvol0 (ji,jj) = zvol0 (ji,jj) + idep * e1e2t(ji,jj) - thick0(ji,jj) = thick0(ji,jj) + idep + zztmp = tmask(ji,jj,jk) * e3t_0(ji,jj,jk) + zvol0 (ji,jj) = zvol0 (ji,jj) + zztmp * e1e2t(ji,jj) + thick0(ji,jj) = thick0(ji,jj) + zztmp END_3D vol0 = glob_sum( 'diaar5', zvol0 ) DEALLOCATE( zvol0 )