Changeset 458

Timestamp:

04/12/11 09:45:09 (13 years ago)

Author:

smasson

Message:

supress call to execute in ncdf_meshread

File:

• trunk/SRC/Grid/ncdf_meshread.pro (modified) (2 diffs)

trunk/SRC/Grid/ncdf_meshread.pro

@@ -324 +324 @@
     name = varinq.name
 @read_ncdf_varget
-    IF strmid(name, 0, 2) EQ 'e3' THEN command = namevar[i]+' = temporary(res)' $
-    ELSE command = namevar[i]+' = float(temporary(res))'
-    nothing = execute(command)
+    CASE namevar[i] OF
+      'glamt':glamt = float(temporary(res))
+      'glamu':glamu = float(temporary(res))
+      'glamv':glamv = float(temporary(res))
+      'glamf':glamf = float(temporary(res))
+      'gphit':gphit = float(temporary(res))
+      'gphiu':gphiu = float(temporary(res))
+      'gphiv':gphiv = float(temporary(res))
+      'gphif':gphif = float(temporary(res))
+      'e1t':e1t = float(temporary(res))
+      'e1u':e1u = float(temporary(res))
+      'e1v':e1v = float(temporary(res))
+      'e1f':e1f = float(temporary(res))
+      'e2t':e2t = float(temporary(res))
+      'e2u':e2u = float(temporary(res))
+      'e2v':e2v = float(temporary(res))
+      'e2f':e2f = float(temporary(res))
+      'hdept':hdept = float(temporary(res))
+      'hdepw':hdepw = float(temporary(res))
+      'e3t_ps':e3t_ps = temporary(res)
+      'e3tp':e3t_ps = temporary(res)
+      'e3w_ps':e3w_ps = temporary(res)
+      'e3wp':e3w_ps = temporary(res)
+    ENDCASE
   ENDFOR
-; for compatibility with old versions of meshmask/partial steps
-; change e3[tw]p to e3[tw]_ps
-  IF n_elements(e3tp) NE 0 THEN e3t_ps = temporary(e3tp)
-  IF n_elements(e3wp) NE 0 THEN e3w_ps = temporary(e3wp)
 ; in the case of key_stride ne [1, 1, 1] redefine f points
 ; coordinates: they must be in the middle of 3 T points
@@ -532 +549 @@
   IF (where(allvarname EQ 'e3t_0'))[0] NE -1 THEN fnamevar = ['e3t_0', 'e3w_0', 'gdept_0', 'gdepw_0'] $
   ELSE                                            fnamevar = ['e3t', 'e3w', 'gdept', 'gdepw'] 
-  namevar = ['e3t', 'e3w', 'gdept', 'gdepw']
-  for i = 0, n_elements(namevar)-1 do begin
+  for i = 0, n_elements(fnamevar)-1 do begin
     varinq = ncdf_varinq(cdfid, fnamevar[i])
     CASE n_elements(varinq.dim) OF
-      4:BEGIN
-        command = 'ncdf_varget,cdfid,fnamevar[i],'+namevar[i] $
-                   +',offset = [0,0,izminmesh,0], count = [1,1,jpk,1]'
-        if key_stride[2] NE 1 then command = command+', stride=[1,1,key_stride[2],1]'
-      END
-      2:BEGIN
-        command = 'ncdf_varget,cdfid,fnamevar[i],'+namevar[i] $
-                   +',offset = [izminmesh,0], count = [jpk,1]'
-        if key_stride[2] NE 1 then command = command+', stride=key_stride[2]'
-      END
-      1:BEGIN
-        command = 'ncdf_varget,cdfid,fnamevar[i],'+namevar[i] $
-                   +',offset = [izminmesh], count = [jpk]'
-        if key_stride[2] NE 1 then command = command+', stride=key_stride[2]'
-      END
+      4:ncdf_varget,cdfid,fnamevar[i],tmp,offset = [0,0,izminmesh,0], count = [1,1,jpk,1], stride=[1,1,key_stride[2],1]
+      2:ncdf_varget,cdfid,fnamevar[i],tmp,offset = [izminmesh,0], count = [jpk,1], stride=[key_stride[2], 1]
+      1:ncdf_varget,cdfid,fnamevar[i],tmp,offset = [izminmesh], count = [jpk], stride=key_stride[2]
     ENDCASE
-    nothing = execute(command)
-    IF strmid(fnamevar[i], 0, 2) NE  'e3' THEN BEGIN
-      command = namevar[i]+'=float('+namevar[i]+')'    
-      nothing = execute(command)
-    ENDIF
-    command = 'if size('+namevar[i]+', /n_dimension) gt 0 then '+namevar[i]+' = reform('+namevar[i]+', /over)'
-    nothing = execute(command)
+    if size(tmp, /n_dimension) gt 0 then tmp = reform(tmp, /over)
+    CASE fnamevar[i] OF
+      'gdept':gdept = float(tmp)
+      'gdept_0':gdept = float(tmp)
+      'gdepw':gdepw = float(tmp)
+      'gdepw_0':gdepw = float(tmp)
+      'e3t':e3t = tmp
+      'e3t_0':e3t = tmp
+      'e3w':e3w = tmp
+      'e3w_0':e3w = tmp
+    ENDCASE
   ENDFOR
 ;-------------------------------------------------------