Changeset 451 for trunk/SRC/Grid/ncdf_meshread.pro

Timestamp:

03/22/11 10:33:45 (13 years ago)

Author:

smasson

Message:

update meshmask related file for full compatibility with partial steps

File:

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

trunk/SRC/Grid/ncdf_meshread.pro

@@ -281 +281 @@
 ; for the variables related to the partial steps
   allvarname =  ncdf_listvars(cdfid)
+;
+  key_partialstep = 0
+  hdept = -1
+  hdepw = -1
   IF (where(allvarname EQ 'hdept'))[0] NE -1 THEN BEGIN
     key_partialstep = 1
     namevar = [namevar, 'hdept', 'hdepw']
-  ENDIF ELSE BEGIN
-    key_partialstep = 0
-    hdept = -1
-    hdepw = -1
-  ENDELSE
+  ENDIF
+; is gdept a real 3D array?
+  IF (where(allvarname EQ 'gdept' ))[0] NE -1 THEN BEGIN
+    varinq = ncdf_varinq(cdfid, 'gdept')
+    if varinq.ndims GE 3 THEN BEGIN
+      ncdf_diminq, cdfid, varinq.dim[0], name, iii
+      ncdf_diminq, cdfid, varinq.dim[1], name, jjj
+      ncdf_diminq, cdfid, varinq.dim[2], name, kkk
+      IF iii EQ jpiglo AND jjj EQ jpjglo AND kkk EQ jpkglo THEN key_gdep_3d = 1
+    ENDIF   
+  ENDIF   
 ; for compatibility with old versions of meshmask/partial steps
-  IF (where(allvarname EQ 'e3tp'))[0] NE -1 THEN $
-    namevar = [namevar, 'e3tp', 'e3wp'] ELSE BEGIN
-    e3t_ps = -1
-    e3w_ps = -1
-  ENDELSE
-  IF (where(allvarname EQ 'e3t_ps'))[0] NE -1 $
-  THEN namevar = [namevar, 'e3t_ps', 'e3w_ps' ]ELSE BEGIN
-    e3t_ps = -1
-    e3w_ps = -1
-  ENDELSE
-  IF (where(allvarname EQ 'e3u_ps'))[0] NE -1 $
-  THEN namevar = [namevar, 'e3u_ps', 'e3v_ps'] ELSE BEGIN
-    e3u_ps = -1
-    e3v_ps = -1
-  ENDELSE
+  e3t_ps = -1
+  e3w_ps = -1
+  IF (where(allvarname EQ 'e3tp'  ))[0] NE -1 THEN namevar = [namevar, 'e3tp', 'e3wp']
+  IF (where(allvarname EQ 'e3t_ps'))[0] NE -1 THEN namevar = [namevar, 'e3t_ps', 'e3w_ps' ]
+; is e3t a real 3D array?
+  IF (where(allvarname EQ 'e3t'   ))[0] NE -1 THEN BEGIN
+    varinq = ncdf_varinq(cdfid, 'e3t')
+    if varinq.ndims GE 3 THEN BEGIN
+      ncdf_diminq, cdfid, varinq.dim[0], name, iii
+      ncdf_diminq, cdfid, varinq.dim[1], name, jjj
+      ncdf_diminq, cdfid, varinq.dim[2], name, kkk
+      IF iii EQ jpiglo AND jjj EQ jpjglo AND kkk EQ jpkglo THEN BEGIN
+        key_e3_3d = 1
+        key_partialstep = 1
+      ENDIF
+    ENDIF   
+  ENDIF
 ;
 ; read all the 2d variables
@@ -312 +324 @@
     name = varinq.name
 @read_ncdf_varget
-    command = namevar[i]+'=float(temporary(res))'
+    IF strmid(name, 0, 2) EQ 'e3' THEN command = namevar[i]+' = temporary(res)' $
+    ELSE command = namevar[i]+' = float(temporary(res))'
     nothing = execute(command)
   ENDFOR
@@ -403 +416 @@
     tmask = byte(res)
   ENDELSE
+; if e3t is true 3D array...
+  IF keyword_set(key_e3_3d)  THEN BEGIN
+    bottom = 0 > ( total(tmask, 3)-1 )
+    bottom = lindgen(jpi, jpj) + jpi*jpj*temporary(bottom)
+;
+    varinq = ncdf_varinq(cdfid, 'e3t')
+    name = varinq.name
+@read_ncdf_varget
+    e3t_ps = (temporary(res))[bottom] * tmask[*, *, 0]
+;
+    varinq = ncdf_varinq(cdfid, 'e3w')
+    name = varinq.name
+@read_ncdf_varget
+    e3w_ps = (temporary(res))[bottom] * tmask[*, *, 0]
+  ENDIF
+; if gdep is true 3D array...
+  IF keyword_set(key_gdep_3d) THEN BEGIN
+    bottom = 0 > ( total(tmask, 3)-1 )
+    bottom = lindgen(jpi, jpj) + jpi*jpj*temporary(bottom)
+;
+    varinq = ncdf_varinq(cdfid, 'gdept')
+    name = varinq.name
+@read_ncdf_varget
+    hdept = (temporary(res))[bottom] * tmask[*, *, 0]
+;
+    bottom = jpi*jpj + temporary(bottom)
+    varinq = ncdf_varinq(cdfid, 'gdepw')
+    name = varinq.name
+@read_ncdf_varget
+    hdepw = (temporary(res))[bottom] * tmask[*, *, 0]
+  ENDIF
 ; boundary conditions used to compute umask.
   IF ncdf_varid(cdfid, 'umask') NE -1 THEN BEGIN