--- trunk/libf/dyn3d/conf_dat2d.f90 2010/03/05 16:43:45 25 +++ trunk/dyn3d/conf_dat2d.f 2015/02/03 19:30:48 122 @@ -1,14 +1,13 @@ module conf_dat2d_m - ! From conf_dat2d.F, version 1.2 2006/01/27 15:14:22 - IMPLICIT NONE contains SUBROUTINE conf_dat2d(xd, yd, xf, yf, champd, interbar) - ! Auteur : P. Le Van + ! From conf_dat2d.F, version 1.2 2006/01/27 15:14:22 + ! Author : P. Le Van ! Ce sous-programme configure le champ de données 2D 'champd' et ! les longitudes et latitudes de telle façon qu'on ait - pi à pi @@ -27,8 +26,7 @@ ! If required, the longitudes and latitudes are finally replaced ! by their mid-values. - use numer_rec, only: assert_eq - use comconst, only: pi + use nr_util, only: assert_eq, pi REAL, intent(in):: xd(:) ! (longitudes, in degrees or radians, in increasing order, from 0° @@ -38,12 +36,11 @@ ! (latitudes, in degrees or radians, in increasing or decreasing ! order, from pole to pole) - LOGICAL, intent(in), optional:: interbar REAL, intent(out):: xf(:), yf(:) ! longitudes and latitudes, in rad REAL, intent(inout):: champd(:, :) + LOGICAL, intent(in), optional:: interbar - ! Variables locales: - + ! Local: INTEGER lons, lats LOGICAL radianlon ! "xd" is in degrees logical invlon ! "xd" contains longitudes between 0 and 2 pi @@ -106,8 +103,8 @@ end do xf(i:) = xf(i:) - 2 * pi - xf(:) = cshift(xf, shift=i - 1) - champd(:, :) = cshift(champd, shift=i - 1) + xf(:) = cshift(xf, shift = i - 1) + champd(:, :) = cshift(champd, shift = i - 1) ENDIF IF (yd(1) < yd(lats)) THEN