Changeset 421 for trunk/SRC

Timestamp:

02/02/10 09:47:19 (14 years ago)

Author:

smasson

Message:

make sure that x[y]min[max]mesh are properly used

Location:

trunk/SRC

Files:

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

trunk/SRC/Grid/computegrid.pro

@@ -232 +232 @@
 ; if (we did not activate /plain and xminmesh, xmaxmesh, yminmesh,
 ; ymaxmesh keywords are defined to their default values), we redefine
-; xminmesh, xmaxmesh, yminmesh, ymaxmesh in order to reove the
+; xminmesh, xmaxmesh, yminmesh, ymaxmesh in order to remove the
 ; overlapping part and/or to open the domain (avoid it be forced
 ; to use cell_fill = 1).
@@ -362 +362 @@
   IF strlen(key_gridtype) EQ 3 THEN fullcgrid = 1
 ;
-  IF n_elements(xminmesh) NE 0 AND n_elements(xmaxmesh) NE 0 THEN BEGIN
+  IF n_elements(xminmesh) NE 0 OR n_elements(xmaxmesh) NE 0 THEN BEGIN
+    IF n_elements(xminmesh) EQ 0 THEN xminmesh = ixminmesh
+    IF n_elements(xmaxmesh) EQ 0 THEN xmaxmesh = ixmaxmesh
     IF nx EQ jpi AND xminmesh EQ ixminmesh AND xmaxmesh EQ ixmaxmesh THEN xalreadycut = 1
   ENDIF
@@ -383 +385 @@
   ENDELSE
 
-  IF n_elements(yminmesh) NE 0 AND n_elements(ymaxmesh) NE 0 THEN BEGIN
+  IF n_elements(yminmesh) NE 0 OR n_elements(ymaxmesh) NE 0 THEN BEGIN
+    IF n_elements(yminmesh) EQ 0 THEN yminmesh = iyminmesh
+    IF n_elements(ymaxmesh) EQ 0 THEN ymaxmesh = iymaxmesh
     IF ny EQ jpj AND yminmesh EQ iyminmesh AND ymaxmesh EQ iymaxmesh THEN yalreadycut = 1
   ENDIF

trunk/SRC/ToBeReviewed/INIT/initncdf.pro

@@ -24 +24 @@
 ; x/yaxis = keyword_set(start1) + findgen(jpi/jpj)
 ; this forces key_onearth = 0
+;
+; @keyword XMINMESH {default=0L}{type=scalar}
+; Define common (cm_4mesh) variables ixminmesh used to define the localization
+; of the first point of the grid along the x direction in a zoom of the original grid
+;
+; @keyword YMINMESH {default=0L}{type=scalar}
+; Define common (cm_4mesh) variables iyminmesh used to define the localization
+; of the first point of the grid along the y direction in a zoom of the original grid
+;
+; @keyword XMAXMESH {default=jpiglo-1}{type=scalar}
+; Define common (cm_4mesh) variables ixmaxmesh used to define the localization
+; of the last point of the grid along the x direction in a zoom of the original grid
+; Note that if XMAXMESH < 0 then ixmaxmesh is defined as ixmaxmesh = jpiglo -1 + xmaxmesh
+;
+; @keyword YMAXMESH {default=jpjglo-1}{type=scalar}
+; Define common (cm_4mesh) variables iymaxmesh used to define the localization
+; of the last point of the grid along the y direction in a zoom of the original grid
+; Note that if YMAXMESH < 0 then iymaxmesh is defined as iymaxmesh = jpjglo -1 + ymaxmesh
 ;
 ; @keyword ZINDEX {default=0}{type=scalar: 0 or 1}
@@ -55 +73 @@
 ;-
 PRO initncdf, ncfilein $
+              , XMINMESH = xminmesh, XMAXMESH = xmaxmesh $
+              , YMINMESH = yminmesh, YMAXMESH = ymaxmesh $
               , ZAXISNAME=zaxisname, START1=start1 $
               , XYINDEX=xyindex, ZINDEX=zindex $
@@ -86 +106 @@
 ; find the x/yaxis
  ncdf_getaxis, cdfid, dimidx, dimidy, xaxis, yaxis $
+               , XMINMESH = xminmesh, XMAXMESH = xmaxmesh $
+               , YMINMESH = yminmesh, YMAXMESH = ymaxmesh $
                , START1 = start1, XYINDEX = xyindex, ROMSGRID = romsgrid, _extra = ex
 ;----------------------------------------------------------