Changeset 13 for trunk/ToBeReviewed/GRILLE/f2v.pro

Timestamp:

04/28/06 14:18:03 (18 years ago)

Author:

pinsard

Message:

upgrade of GRILLE/Utilities according to cerbere.lodyc.jussieu.fr: /usr/home/smasson/SAXO_RD/ : files

File:

• trunk/ToBeReviewed/GRILLE/f2v.pro (copied) (copied from trunk/GRILLE/f2v.pro) (6 diffs)

trunk/ToBeReviewed/GRILLE/f2v.pro

@@ -38 +38 @@
 ;------------------------------------------------------------
 FUNCTION f2v, temp
-@common
+;---------------------------------------------------------
+@cm_4mesh
+@cm_4data
+@cm_4cal
+  IF NOT keyword_set(key_forgetold) THEN BEGIN
+@updatenew
+  ENDIF
+;---------------------------------------------------------
    res = temp
 ;on force nxt=nxf, etc ...
-   premierxv = premierxf
-   dernierxv = dernierxf
-   premieryv = premieryf
-   dernieryv = dernieryf
+   firstxv = firstxf
+   lastxv = lastxf
+   firstyv = firstyf
+   lastyv = lastyf
    nxv = nxf
    nyv = nyf
    vargrid = 'V'
    if NOT keyword_set(valmask) then valmask = 1e20
-   lon1 = glamv[premierxv, 0]
-   lon2 = glamf[dernierxf, 0]
+   lon1 = glamv[firstxv, 0]
+   lon2 = glamf[lastxf, 0]
 
 ; cas sur la taille du tableau et application 
@@ -60 +67 @@
             taille[1] eq nxf and taille[2] eq nyf:
             taille[1] eq jpi and taille[2] eq jpj: $
-             res=res[premierxf:dernierxf, premieryf:dernieryf]
+             res=res[firstxf:lastxf, firstyf:lastyf]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          endcase
-         mask = (fmask())[premierxf:dernierxf, premieryf:dernieryf, 0]
+         mask = (fmask())[firstxf:lastxf, firstyf:lastyf, 0]
          terre = where(mask EQ 0) 
          IF terre[0] NE -1 THEN res[terre] = !values.f_nan
          res = 0.5*(res + shift(res, 1, 0))
-         if NOT (keyword_set(key_periodique) AND nxf EQ jpi) then res[0, *] = !values.f_nan
-         mask = (vmask())[premierxf:dernierxf, premieryf:dernieryf, 0]
+         if NOT (keyword_set(key_periodic) AND nxf EQ jpi) then res[0, *] = !values.f_nan
+         mask = (vmask())[firstxf:lastxf, firstyf:lastyf, 0]
          terre = where(mask EQ 0) 
          IF terre[0] NE -1 THEN res[terre] = valmask
@@ -77 +84 @@
             taille[1] eq nxf and taille[2] eq nyf AND taille[3] EQ nzt:
             taille[1] eq nxf and taille[2] eq nyf AND taille[3] EQ jpk: $
-             res=res[*, *, premierzt:dernierzt]
+             res=res[*, *, firstzt:lastzt]
             taille[1] eq nxf and taille[2] eq nyf AND taille[3] EQ jpt:
             taille[1] eq jpi and taille[2] eq jpj AND taille[3] EQ jpk: $
-             res=res[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt]
+             res=res[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt]
             taille[1] eq jpi and taille[2] eq jpj AND taille[3] EQ jpt: $
-             res=res[premierxf:dernierxf, premieryf:dernieryf, *]
+             res=res[firstxf:lastxf, firstyf:lastyf, *]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          ENDCASE
          if taille[3] EQ jpt then begin
-            mask = (fmask())[premierxf:dernierxf, premieryf:dernieryf, dernierzt*(nzt NE jpk)]
+            mask = (fmask())[firstxf:lastxf, firstyf:lastyf, lastzt*(nzt NE jpk)]
             mask = temporary(mask[*])#replicate(1, jpt)
             mask = reform(mask, nxf, nyf, jpt, /over)
-         ENDIF ELSE mask = (fmask())[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt]
+         ENDIF ELSE mask = (fmask())[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt]
          terre = where(temporary(mask) EQ 0) 
          IF terre[0] NE -1 THEN res[temporary(terre)] = !values.f_nan
          res = 0.5*(res + shift(res, 1, 0, 0))
-         if NOT (keyword_set(key_periodique) AND nxf EQ jpi) then res[0, *, *] = !values.f_nan
+         if NOT (keyword_set(key_periodic) AND nxf EQ jpi) then res[0, *, *] = !values.f_nan
          if taille[3] EQ jpt then BEGIN
-            mask = tmask[premierxf:dernierxf, premieryf:dernieryf, dernierzt*(nzt NE jpk)]
+            mask = tmask[firstxf:lastxf, firstyf:lastyf, lastzt*(nzt NE jpk)]
             mask = temporary(mask[*])#replicate(1, jpt)
             mask = reform(mask, nxf, nyf, jpt, /over)
-         ENDIF ELSE mask = (vmask())[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt]
+         ENDIF ELSE mask = (vmask())[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt]
          terre = where(temporary(mask) EQ 0) 
          IF terre[0] NE -1 THEN res[temporary(terre)] = valmask
@@ -107 +114 @@
             taille[1] eq nxf and taille[2] eq nyf AND taille[3] EQ nzt AND taille[4] EQ jpt:
             taille[1] eq nxf and taille[2] eq nyf AND taille[3] EQ jpk AND taille[4] EQ jpt: $
-             res=res[*, *, premierzt:dernierzt, *]
+             res=res[*, *, firstzt:lastzt, *]
             taille[1] eq jpi and taille[2] eq jpj AND taille[3] EQ jpk AND taille[4] EQ jpt: $
-             res=res[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt, *]
+             res=res[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt, *]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          ENDCASE
-         mask = (fmask())[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt]
+         mask = (fmask())[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt]
          mask = temporary(mask[*])#replicate(1, jpt)
          mask = reform(mask, nxf, nyf, nzt, jpt, /over)
@@ -119 +126 @@
          IF terre[0] NE -1 THEN res[temporary(terre)] = !values.f_nan
          res = 0.5*(res + shift(res, 1, 0, 0, 0))
-         if NOT (keyword_set(key_periodique) AND nxf EQ jpi) then res[0, *, *, *] = !values.f_nan
-         mask = (vmask())[premierxf:dernierxf, premieryf:dernieryf, premierzt:dernierzt]
+         if NOT (keyword_set(key_periodic) AND nxf EQ jpi) then res[0, *, *, *] = !values.f_nan
+         mask = (vmask())[firstxf:lastxf, firstyf:lastyf, firstzt:lastzt]
          mask = temporary(mask[*])#replicate(1, jpt)
          mask = reform(mask, nxf, nyf, nzt, jpt, /over)
@@ -128 +135 @@
    endcase
 
+   IF NOT keyword_set(key_forgetold) THEN BEGIN
+   @updateold
+   ENDIF 
+   
    return, res
 END