Changeset 465 for trunk

Timestamp:

05/08/11 22:11:19 (13 years ago)

Author:

smasson

Message:

bugfix for roms

Location:

trunk/SRC

Files:

• Grid/computegrid.pro (modified) (3 diffs)
• ToBeReviewed/INIT/initncdf.pro (modified) (1 diff)

trunk/SRC/Grid/computegrid.pro

@@ -373 +373 @@
   ENDIF ELSE BEGIN
     jpiglo = long(nx)
-    IF keyword_set(romsh) THEN jpiglo = jpiglo - 1    
     IF n_elements(xminmesh) NE 0 THEN ixminmesh = long(xminmesh[0]) ELSE ixminmesh  = 0l
     IF n_elements(xmaxmesh) NE 0 THEN ixmaxmesh = long(xmaxmesh[0]) ELSE ixmaxmesh  = jpiglo-1
@@ -396 +395 @@
   ENDIF ELSE BEGIN 
     jpjglo = long(ny)
-    IF keyword_set(romsh) THEN jpjglo = jpjglo - 1
     IF n_elements(yminmesh) NE 0 THEN iyminmesh = long(yminmesh[0]) ELSE iyminmesh  = 0l
     IF n_elements(ymaxmesh) NE 0 THEN iymaxmesh = long(ymaxmesh[0]) ELSE iymaxmesh  = jpjglo-1
@@ -1073 +1071 @@
   if tmask[0] NE -1 then BEGIN
     tmask = byte(temporary(tmask))
-    IF keyword_set(romsh) THEN tmask = tmask[0:jpiglo-1, 0:jpjglo-1]
     IF n_elements(mask) EQ nxx*nyy AND nzz GT 1 THEN BEGIN
       tmask = tmask[*]#replicate(1b, nzz)

trunk/SRC/ToBeReviewed/INIT/initncdf.pro

@@ -144 +144 @@
 ;
   ncdf_close, cdfid
-;
+;----------------------------------------------------------
+  IF keyword_set(romsgrid) THEN BEGIN ; remove last column/row
+    sz = size(tmask)
+    nx = sz[1] & ny = sz[2]
+    xaxis = xaxis[0:nx-2, 0:ny-2]
+    yaxis = yaxis[0:nx-2, 0:ny-2]
+    romsh = romsh[0:nx-2, 0:ny-2]
+    CASE sz[0] OF
+      2:tmask = tmask[0:nx-2, 0:ny-2]
+      3:tmask = tmask[0:nx-2, 0:ny-2, *]
+    ENDCASE
+  ENDIF
 ;----------------------------------------------------------
 ; call compute the grid