Changeset 133

Timestamp:

06/02/09 16:42:05 (15 years ago)

Author:

ericg

Message:

divergence macro make_wdiv.pro updated for time series

File:

• trunk/procs/macros/make_wdiv.pro (modified) (1 diff)

trunk/procs/macros/make_wdiv.pro

@@ -36 +36 @@
 
    grille,mask,glam,gphi,gdep,nx,ny,nz,premierx,premiery,premierz,dernierx,derniery,dernierz 
-   wdiv =  (var_x.data - shift(var_x.data, -1, 0))/e1t[premierx:dernierx, premiery:derniery] + (var_y.data-shift(var_y.data, 0, -1))/e2t[premierx:dernierx, premiery:derniery]
+
+stop
+
+   IF jpt EQ 1 THEN BEGIN 
+      wdiv =  (var_x.data - shift(var_x.data, -1, 0))/e1t[premierx:dernierx, premiery:derniery] + (var_y.data-shift(var_y.data, 0, -1))/e2t[premierx:dernierx, premiery:derniery]
+   ENDIF ELSE BEGIN 
+      e1t3d = reform(reform(e1t[premierx:dernierx, premiery:derniery], nx*ny)#replicate(1, jpt), nx, ny, jpt)
+      e2t3d = reform(reform(e2t[premierx:dernierx, premiery:derniery], nx*ny)#replicate(1, jpt), nx, ny, jpt)
+      wdiv =  (var_x.data - shift(var_x.data, -1, 0, 0))/e1t3d + (var_y.data-shift(var_y.data, 0, -1, 0))/e2t3d
+   ENDELSE 
 
    field = {name: '', data: wdiv, legend: '', units: '', origin: '', dim: 0, direc:''}