Changeset 114 for trunk/SRC/ToBeReviewed/PLOTS/VECTEUR/vecteur.pro

Timestamp:

06/19/06 16:14:56 (18 years ago)

Author:

smasson

Message:

new compilation options (compile_opt idl2, strictarrsubs) in each routine

File:

• trunk/SRC/ToBeReviewed/PLOTS/VECTEUR/vecteur.pro (modified) (11 diffs)

trunk/SRC/ToBeReviewed/PLOTS/VECTEUR/vecteur.pro

@@ -81 +81 @@
 ; angle peut etre un tableau.
 ;
+;
+  compile_opt idl2, strictarrsubs
+;
 @common
 ; quelle est la longeur en coordonnees normales d''un trait qui fera 1
@@ -103 +106 @@
 ; normalise le vecteur
 ;
+;
+  compile_opt idl2, strictarrsubs
+;
    IF n_elements(w) NE 0 THEN BEGIN 
       norme = sqrt(u^2.+v^2.+w^2.)
       ind = where(norme NE 0)
-      u(ind) = u(ind)/norme[ind]
-      v(ind) = v(ind)/norme[ind]
-      w(ind) = w(ind)/norme[ind]
+      u[ind] = u[ind]/norme[ind]
+      v[ind] = v[ind]/norme[ind]
+      w[ind] = w[ind]/norme[ind]
    ENDIF ELSE BEGIN
       norme = sqrt(u^2.+v^2.)
       ind = where(norme NE 0)
-      u(ind) = u(ind)/norme[ind]
-      v(ind) = v(ind)/norme[ind]
+      u[ind] = u[ind]/norme[ind]
+      v[ind] = v[ind]/norme[ind]
    ENDELSE 
 END
@@ -120 +126 @@
              , VECTCOLOR = vectcolor, VECTTHICK = vectthick, VECTREFPOS = vectrefpos $
              , VECTREFFORMAT = vectrefformat, NOVECTREF = novectref, _extra = extra
+;
+  compile_opt idl2, strictarrsubs
+;
 @common
    tempsun = systime(1)         ; pour key_performance
@@ -202 +211 @@
    r = cv_coord(from_sphere=coord_sphe,/to_rect,/degrees)
 ;
-   x0 = reform(r(0, *), nx, ny)
-   y0 = reform(r(1, *), nx, ny)
-   z0 = reform(r(2, *), nx, ny)
+   x0 = reform(r[0, *], nx, ny)
+   y0 = reform(r[1, *], nx, ny)
+   z0 = reform(r[2, *], nx, ny)
 ;
 ; etape 1, b)
 ;
 ; Construction du vecteur nu (resp. nv), vecteur norme porte par
-; l''axe des points u(i,j) et u(i-1,j) (resp v(i,j) et v(i,j-1))
+; l''axe des points u[i,j] et u[i-1,j] (resp v[i,j] et v[i,j-1])
 ; qui definissent pour chaque point sur la shere les directions locales
 ; associee a u et v. ces vecteurs definissent un repere orthonorme
@@ -219 +228 @@
    radius = replicate(1,nxgd*nygd)
    IF finite(glamu[0]*gphiu[0]) NE 0 THEN $
-     coord_sphe = transpose([ [(glamu[indice2d])[*]], [(gphiu[indice2d])[*]], [radius(*)] ]) $
-   ELSE coord_sphe = transpose([ [(glamf[indice2d])[*]], [(gphit[indice2d])[*]], [radius(*)] ])
+     coord_sphe = transpose([ [(glamu[indice2d])[*]], [(gphiu[indice2d])[*]], [radius[*]] ]) $
+   ELSE coord_sphe = transpose([ [(glamf[indice2d])[*]], [(gphit[indice2d])[*]], [radius[*]] ])
    r = cv_coord(from_sphere=coord_sphe,/to_rect,/degrees)
 ; coordonnes de points de la grille u en cartesien
-   ux = reform(r(0, *), nxgd, nygd)
-   uy = reform(r(1, *), nxgd, nygd)
-   uz = reform(r(2, *), nxgd, nygd)
+   ux = reform(r[0, *], nxgd, nygd)
+   uy = reform(r[1, *], nxgd, nygd)
+   uz = reform(r[2, *], nxgd, nygd)
 ; calcul de nu 
    nux = ux-shift(ux, 1, 0)
@@ -242 +251 @@
 ; definition de nv
    IF finite(glamv[0]*gphiv[0]) NE 0 THEN $
-   coord_sphe = transpose([ [(glamv[indice2d])[*]], [(gphiv[indice2d])[*]], [radius(*)] ]) $
-   ELSE coord_sphe = transpose([ [(glamt[indice2d])[*]], [(gphif[indice2d])[*]], [radius(*)] ])                
+   coord_sphe = transpose([ [(glamv[indice2d])[*]], [(gphiv[indice2d])[*]], [radius[*]] ]) $
+   ELSE coord_sphe = transpose([ [(glamt[indice2d])[*]], [(gphif[indice2d])[*]], [radius[*]] ])                
    r = cv_coord(from_sphere=coord_sphe,/to_rect,/degrees)
 ; coordonnes de points de la grille v en cartesien
-   vx = reform(r(0, *), nxgd, nygd)
-   vy = reform(r(1, *), nxgd, nygd)
-   vz = reform(r(2, *), nxgd, nygd)
+   vx = reform(r[0, *], nxgd, nygd)
+   vy = reform(r[1, *], nxgd, nygd)
+   vz = reform(r[2, *], nxgd, nygd)
 ; calcul de nv 
    nvx = vx-shift(vx, 0, 1)
@@ -290 +299 @@
 ; coordonnees de la pointe en spherique
 
-   coord_rect = transpose([ [x1(*)], [y1(*)], [z1(*)] ])
+   coord_rect = transpose([ [x1[*]], [y1[*]], [z1[*]] ])
    r = cv_coord(from_rect=coord_rect,/to_sphere,/degrees)
-   glam1 = reform(r(0, *), nx, ny)
-   gphi1 = reform(r(1, *), nx, ny)
+   glam1 = reform(r[0, *], nx, ny)
+   gphi1 = reform(r[1, *], nx, ny)
 
 ;
@@ -303 +312 @@
 ;
    ind = where(glam1 LT !x.range[0] AND glam1+360. LE !x.range[1])
-   if ind[0] NE -1 then glam1(ind) = glam1(ind)+360.
+   if ind[0] NE -1 then glam1[ind] = glam1[ind]+360.
    ind = where(glam1 GT !x.range[1] AND glam1-360. GE !x.range[0])
-   if ind[0] NE -1 then glam1(ind) = glam1(ind)-360.
+   if ind[0] NE -1 then glam1[ind] = glam1[ind]-360.
 
    ind = where(glam LT !x.range[0] AND glam+360. LE !x.range[1])
-   if ind[0] NE -1 then glam(ind) = glam(ind)+360.
+   if ind[0] NE -1 then glam[ind] = glam[ind]+360.
    ind = where(glam  GT !x.range[1] AND glam-360. GE !x.range[0])
-   if ind[0] NE -1 then glam(ind) = glam(ind)-360.
+   if ind[0] NE -1 then glam[ind] = glam[ind]-360.
 ;
 ;
@@ -316 +325 @@
 ;
    r = convert_coord(glam,gphi,/data,/to_normal) 
-   x0 = r(0, *)                 ; coordonnes normales du debut de la fleche
-   y0 = r(1, *)                 ; 
+   x0 = r[0, *]                 ; coordonnes normales du debut de la fleche
+   y0 = r[1, *]                 ; 
    
    r = convert_coord(glam1,gphi1,/data,/to_normal) 
-   x1 = r(0, *)                 ; coordonnes normales de la fin de la fleche (avant scaling)
-   y1 = r(1, *)                 ; 
+   x1 = r[0, *]                 ; coordonnes normales de la fin de la fleche (avant scaling)
+   y1 = r[1, *]                 ; 
 ;
 ; tests pour eviter que des fleches soient dessineees hors du domaine
@@ -384 +393 @@
 ;
    r = cv_coord(from_polar = transpose([ [dirpol[*]], [norme[*]] ]), /to_rect)
-   composantex = r(0, *)
-   composantey = r(1, *)
+   composantex = r[0, *]
+   composantey = r[1, *]
 ;
    x1 = x0+composantex
@@ -395 +404 @@
 
    points = where(msk EQ 1)
-   IF points[0] NE -1 THEN arrow, x0(points), y0(points), x1(points), y1(points), /norm $
+   IF points[0] NE -1 THEN arrow, x0[points], y0[points], x1[points], y1[points], /norm $
     , hsize = -.2, COLOR = vectcolor, THICK = vectthick
 ;