Changeset 114 for trunk/SRC/ToBeReviewed/CALCULS/norme.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/CALCULS/norme.pro (modified) (11 diffs)

trunk/SRC/ToBeReviewed/CALCULS/norme.pro

@@ -70 +70 @@
 FUNCTION norme, composanteu, composantev, BOXZOOM = boxzoom, DIREC = direc, _extra = ex
 ;---------------------------------------------------------
+;
+  compile_opt idl2, strictarrsubs
+;
 @cm_4mesh
 @cm_4data
@@ -197 +200 @@
 ; construction de u et v aux pts T
 ;-----------------------------------------------------------
-         a=u(0,*,*)
+         a=u[0,*,*]
          u=(u+shift(u,1,0,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then u(0,*,*)=a
-         a=v(*,0,*)
+         if NOT keyword_set(key_periodic) OR nx NE jpi then u[0,*,*]=a
+         a=v[*,0,*]
          v=(v+shift(v,0,1,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then v(*,0,*)=a
+         if NOT keyword_set(key_periodic) OR nx NE jpi then v[*,0,*]=a
 ;----------------------------------------------------------------------------
 ; attribution du mask et des tableau de longitude et latitude
@@ -215 +218 @@
          if landv[0] NE -1 then v[landv] = 0
          res=sqrt(u^2+v^2)
-         if NOT keyword_set(key_periodic) OR nx NE jpi then res(0,*, *)=!values.f_nan
-         res(*,0, *)=!values.f_nan
+         if NOT keyword_set(key_periodic) OR nx NE jpi then res[0,*, *]=!values.f_nan
+         res[*,0, *]=!values.f_nan
          mask = where(mask eq 0)
-         IF mask[0] NE -1 THEN res(mask) = valmask
+         IF mask[0] NE -1 THEN res[mask] = valmask
 ; moyennes en tous genres
          domdef, (glamt[indice2d])[0, 0], (glamu[indice2d])[nx-1, 0],(gphit[indice2d])[0, 0], (gphiv[indice2d])[0, ny-1], vert1, vert2, /meme
@@ -257 +260 @@
 ; construction de u et v aux pts T
 ;-----------------------------------------------------------
-         a=u(0,*,*)
+         a=u[0,*,*]
          u=(u+shift(u,1,0,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then u(0,*,*)=a
-         a=v(*,0,*)
+         if NOT keyword_set(key_periodic) OR nx NE jpi then u[0,*,*]=a
+         a=v[*,0,*]
          v=(v+shift(v,0,1,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then v(*,0,*)=a
+         if NOT keyword_set(key_periodic) OR nx NE jpi then v[*,0,*]=a
 ;----------------------------------------------------------------------------
 ; attribution du mask et des tableau de longitude et latitude
@@ -280 +283 @@
          if landv[0] NE -1 then v[landv] = 0
          res=sqrt(u^2+v^2)
-         if NOT keyword_set(key_periodic) OR nx NE jpi then res(0,*, *)=!values.f_nan
-         res(*,0, *)=!values.f_nan
+         if NOT keyword_set(key_periodic) OR nx NE jpi then res[0,*, *]=!values.f_nan
+         res[*,0, *]=!values.f_nan
          mask = where(mask eq 0)
          IF mask[0] NE -1 THEN BEGIN 
@@ -288 +291 @@
             mask = (temporary(mask))[*]#replicate(1, jpt)
             mask =temporary(mask[*]) + temporary(coeftps[*])
-            res(temporary(mask)) = valmask
+            res[temporary(mask)] = valmask
          ENDIF
 ; moyennes en tous genres
@@ -344 +347 @@
 ; construction de u et v aux pts T
 ;-----------------------------------------------------------
-         a=u(0,*,*,*)
+         a=u[0,*,*,*]
          u=(u+shift(u,1,0,0,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then u(0,*,*,*)=a
-         a=v(*,0,*,*)
+         if NOT keyword_set(key_periodic) OR nx NE jpi then u[0,*,*,*]=a
+         a=v[*,0,*,*]
          v=(v+shift(v,0,1,0,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then v(*,0,*,*)=a
+         if NOT keyword_set(key_periodic) OR nx NE jpi then v[*,0,*,*]=a
 ;----------------------------------------------------------------------------
 ; attribution du mask et des tableau de longitude et latitude
@@ -362 +365 @@
          if landv[0] NE -1 then v[landv] = 0
          res=sqrt(u^2+v^2)
-         if NOT keyword_set(key_periodic) OR nx NE jpi then res(0,*, *, *)=!values.f_nan
-         res(*,0, *, *)=!values.f_nan
+         if NOT keyword_set(key_periodic) OR nx NE jpi then res[0,*, *, *]=!values.f_nan
+         res[*,0, *, *]=!values.f_nan
          mask = where(mask eq 0)
          IF mask[0] NE -1 THEN BEGIN 
@@ -370 +373 @@
             mask = (temporary(mask))[*]#replicate(1, jpt)
             mask =temporary(mask[*]) + temporary(coeftps[*])
-            res(temporary(mask)) = valmask
+            res[temporary(mask)] = valmask
          ENDIF
 ; moyennes en tous genres
@@ -416 +419 @@
 ; construction de u et v aux pts T
 ;-----------------------------------------------------------
-         a=u(0,*)
+         a=u[0,*]
          u=(u+shift(u,1,0))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then u(0,*)=a
-         a=v(*,0)
+         if NOT keyword_set(key_periodic) OR nx NE jpi then u[0,*]=a
+         a=v[*,0]
          v=(v+shift(v,0,1))/2.
-         if NOT keyword_set(key_periodic) OR nx NE jpi then v(*,0)=a
+         if NOT keyword_set(key_periodic) OR nx NE jpi then v[*,0]=a
 ;----------------------------------------------------------------------------
 ; attribution du mask et des tableau de longitude et latitude
@@ -439 +442 @@
          if landv[0] NE -1 then v[landv] = 0
          res=sqrt(u^2+v^2)
-         if NOT keyword_set(key_periodic) OR nx NE jpi then res(0,*)=!values.f_nan
-         res(*,0)=!values.f_nan
+         if NOT keyword_set(key_periodic) OR nx NE jpi then res[0,*]=!values.f_nan
+         res[*,0]=!values.f_nan
          mask = where(mask eq 0)
-         IF mask[0] NE -1 THEN res(mask) = valmask
+         IF mask[0] NE -1 THEN res[mask] = valmask
 ; moyennes en tous genres
          domdef, (glamt[indice2d])[0, 0], (glamu[indice2d])[nx-1, 0],(gphit[indice2d])[0, 0], (gphiv[indice2d])[0, ny-1], vert1, vert2, /meme