--- trunk/libf/dyn3d/grad.f90 2012/01/30 14:37:26 60 +++ trunk/dyn3d/grad.f 2014/08/29 13:00:05 103 @@ -4,40 +4,28 @@ contains - SUBROUTINE grad(klevel, pg, pgx, pgy) + SUBROUTINE grad(klevel, g, gx, gy) ! From LMDZ4/libf/dyn3d/grad.F, version 1.1.1.1 2004/05/19 12:53:05 ! P. Le Van ! Calcul des composantes covariantes en x et y du gradient de g. - USE dimens_m, ONLY : iim - USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1 + USE dimens_m, ONLY: iim, jjm INTEGER, intent(in):: klevel - REAL, intent(in):: pg(ip1jmp1, klevel) - REAL, intent(out):: pgx(ip1jmp1, klevel) , pgy(ip1jm, klevel) + REAL, intent(in):: g(iim + 1, jjm + 1, klevel) + REAL, intent(out):: gx(iim + 1, jjm + 1, klevel) , gy(iim + 1, jjm, klevel) ! Local: - INTEGER l, ij + INTEGER i, j !---------------------------------------------------------------- - DO l = 1, klevel - DO ij = 1, ip1jmp1 - 1 - pgx(ij, l) = pg(ij +1, l) - pg(ij, l) - end DO - - ! correction pour pgx(ip1, j, l) - ! pgx(iip1, j, l)= pgx(1, j, l) - DO ij = iip1, ip1jmp1, iip1 - pgx(ij, l) = pgx(ij -iim, l) - end DO - - DO ij = 1, ip1jm - pgy(ij, l) = pg(ij, l) - pg(ij +iip1, l) - end DO - end DO + forall (i = 1:iim) gx(i, :, :) = g(i + 1, :, :) - g(i, :, :) + gx(iim + 1, :, :)= gx(1, :, :) + + forall (j = 1:jjm) gy(:, j, :) = g(:, j, :) - g(:, j + 1, :) END SUBROUTINE grad