Changeset 192 for trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

Timestamp:

09/22/06 11:37:08 (18 years ago)

Author:

smasson

Message:

several bugfix + new strsed

File:

• trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro (modified) (4 diffs)

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -67 +67 @@
 ; (the first 1D array with unlimited dimension) is not the good one.
 ;
-; @keyword HFILENAME {default=FILENAME}{type=string}
-; For ROMS outputs. The filename of the file where h vriable should be read
-;
 ; @keyword ZETAFILENAME {default=FILENAME}{type=string}
 ; For ROMS outputs. The filename of the file where zeta vriable should be read
@@ -103 +100 @@
                     , TOUT = tout, NOSTRUCT = nostruct, CONT_NOFILL = CONT_NOFILL, INIT = init $
                     , GRID = grid, FBASE2TBASE = fbase2tbase, CALLITSELF = callitself $
-                    , HFILENAME = hfilename, ZETAFILENAME = zetafilename, ZETAZERO = zetazero $
+                    , ZETAFILENAME = zetafilename, ZETAZERO = zetazero $
                     , _EXTRA = ex
 ;---------------------------------------------------------
@@ -567 +564 @@
       ENDFOR
       CASE 1 OF
-        keyword_set(hfilename):  $
-           hroms = read_ncdf('h', 0, 0, FILENAME = hfilename $
-                             , /TIMESTEP, /NOSTRUCT, CONT_NOFILL = CONT_NOFILL $
-                             , GRID = vargrid, /CALLITSELF, _EXTRA = ex)
-        (where(allvarnames EQ 'h'))[0] NE -1: $
-           hroms = read_ncdf('h', 0, 0, FILENAME = filename $
-                             , /TIMESTEP, /NOSTRUCT, CONT_NOFILL = CONT_NOFILL $
-                             , GRID = vargrid, /CALLITSELF, _EXTRA = ex)
-        ELSE:return, report('The variable h was not found in the file, please use the keyword HFILENAME to specify the name of a file containing h')
-      ENDCASE
-      CASE 1 OF
         keyword_set(zetazero):zeta = fltarr(nx, ny, jpt)
         keyword_set(zetafilename):  $
@@ -589 +575 @@
         ELSE:return, report('The variable zeta was not found in the file, please use the keyword ZETAFILENAME to specify the name of a file containing zeta or use  keyword ZETAZERO to define zeta to 0.')
       ENDCASE
-      romszinfos = {h:temporary(hroms), zeta:temporary(zeta), theta_s:theta_s, theta_b:theta_b, hc:hc}
+      romszinfos = {h:romszinfos.h, zeta:temporary(zeta), theta_s:theta_s, theta_b:theta_b, hc:hc}
     ENDIF ELSE romszinfos = {h:-1, zeta:-1, theta_s:-1, theta_b:-1, hc:-1}
   ENDIF