Changeset 13 for trunk/ToBeReviewed/GRILLE/u2t.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/u2t.pro (copied) (copied from trunk/GRILLE/u2t.pro) (6 diffs)

trunk/ToBeReviewed/GRILLE/u2t.pro

@@ -38 +38 @@
 ;------------------------------------------------------------
 FUNCTION u2t, temp
-@common
+;---------------------------------------------------------
+@cm_4mesh
+@cm_4data
+@cm_4cal
+  IF NOT keyword_set(key_forgetold) THEN BEGIN
+@updatenew
+  ENDIF
+;---------------------------------------------------------
    res = temp
 ;on force nxt=nxu, etc ...
-   premierxt = premierxu
-   dernierxt = dernierxu
-   premieryt = premieryu
-   dernieryt = dernieryu
+   firstxt = firstxu
+   lastxt = lastxu
+   firstyt = firstyu
+   lastyt = lastyu
    nxt = nxu
    nyt = nyu
    vargrid = 'T'
    if NOT keyword_set(valmask) then valmask = 1e20
-   lon1 = glamt[premierxt, 0]
-   lon2 = glamu[dernierxu, 0]
+   lon1 = glamt[firstxt, 0]
+   lon2 = glamu[lastxu, 0]
 ;
 ; cas sur la taille du tableau et application 
@@ -60 +67 @@
             taille[1] eq nxu and taille[2] eq nyu:
             taille[1] eq jpi and taille[2] eq jpj: $
-             res=res[premierxu:dernierxu, premieryu:dernieryu]
+             res=res[firstxu:lastxu, firstyu:lastyu]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          endcase
-         mask = (umask())[premierxu:dernierxu, premieryu:dernieryu, 0]
+         mask = (umask())[firstxu:lastxu, firstyu:lastyu, 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 nxu EQ jpi) then res[0, *] = !values.f_nan
-         mask = tmask[premierxu:dernierxu, premieryu:dernieryu, 0]
+         if NOT (keyword_set(key_periodic) AND nxu EQ jpi) then res[0, *] = !values.f_nan
+         mask = tmask[firstxu:lastxu, firstyu:lastyu, 0]
          terre = where(mask EQ 0) 
          IF terre[0] NE -1 THEN res[terre] = valmask
@@ -77 +84 @@
             taille[1] eq nxu and taille[2] eq nyu AND taille[3] EQ nzt:
             taille[1] eq nxu and taille[2] eq nyu AND taille[3] EQ jpk: $
-             res=res[*, *, premierzt:dernierzt]
+             res=res[*, *, firstzt:lastzt]
             taille[1] eq nxu and taille[2] eq nyu AND taille[3] EQ jpt:
             taille[1] eq jpi and taille[2] eq jpj AND taille[3] EQ jpk: $
-             res=res[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt]
+             res=res[firstxu:lastxu, firstyu:lastyu, firstzt:lastzt]
             taille[1] eq jpi and taille[2] eq jpj AND taille[3] EQ jpt: $
-             res=res[premierxu:dernierxu, premieryu:dernieryu, *]
+             res=res[firstxu:lastxu, firstyu:lastyu, *]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          ENDCASE
          if taille[3] EQ jpt then begin
-            mask = (umask())[premierxu:dernierxu, premieryu:dernieryu, dernierzt*(nzt NE jpk)]
+            mask = (umask())[firstxu:lastxu, firstyu:lastyu, lastzt*(nzt NE jpk)]
             mask = temporary(mask[*])#replicate(1, jpt)
             mask = reform(mask, nxu, nyu, jpt, /over)
-         ENDIF ELSE mask = (umask())[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt]
+         ENDIF ELSE mask = (umask())[firstxu:lastxu, firstyu:lastyu, 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 nxu EQ jpi) then res[0, *, *] = !values.f_nan
+         if NOT (keyword_set(key_periodic) AND nxu EQ jpi) then res[0, *, *] = !values.f_nan
          if taille[3] EQ jpt then BEGIN
-            mask = tmask[premierxu:dernierxu, premieryu:dernieryu, dernierzt*(nzt NE jpk)]
+            mask = tmask[firstxu:lastxu, firstyu:lastyu, lastzt*(nzt NE jpk)]
             mask = temporary(mask[*])#replicate(1, jpt)
             mask = reform(mask, nxu, nyu, jpt, /over)
-         ENDIF ELSE mask = tmask[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt]
+         ENDIF ELSE mask = tmask[firstxu:lastxu, firstyu:lastyu, firstzt:lastzt]
          terre = where(temporary(mask) EQ 0) 
          IF terre[0] NE -1 THEN res[temporary(terre)] = valmask
@@ -107 +114 @@
             taille[1] eq nxu and taille[2] eq nyu AND taille[3] EQ nzt AND taille[4] EQ jpt:
             taille[1] eq nxu and taille[2] eq nyu 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[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt, *]
+             res=res[firstxu:lastxu, firstyu:lastyu, firstzt:lastzt, *]
             else: $
              return, report('Probleme d''adequation entre les tailles du domaine et de la boite.')
          ENDCASE
-         mask = (umask())[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt]
+         mask = (umask())[firstxu:lastxu, firstyu:lastyu, firstzt:lastzt]
          mask = temporary(mask[*])#replicate(1, jpt)
          mask = reform(mask, nxu, nyu, 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 nxu EQ jpi) then res[0, *, *, *] = !values.f_nan
-         mask = tmask[premierxu:dernierxu, premieryu:dernieryu, premierzt:dernierzt]
+         if NOT (keyword_set(key_periodic) AND nxu EQ jpi) then res[0, *, *, *] = !values.f_nan
+         mask = tmask[firstxu:lastxu, firstyu:lastyu, firstzt:lastzt]
          mask = temporary(mask[*])#replicate(1, jpt)
          mask = reform(mask, nxu, nyu, nzt, jpt, /over)
@@ -128 +135 @@
    endcase
 
+  IF NOT keyword_set(key_forgetold) THEN BEGIN
+   @updateold
+  ENDIF 
+  
    return, res
 END