Changeset 69 for trunk/ToBeReviewed/GRILLE

Timestamp:

05/11/06 12:35:53 (18 years ago)

Author:

smasson

Message:

debug + new xxx

Location:

trunk/ToBeReviewed/GRILLE

Files:

• .idlwave_catalog (modified) (2 diffs)
• changegrid.pro (modified) (3 diffs)
• cmpgrid.pro (modified) (3 diffs)
• grille.pro (modified) (7 diffs)
• whichgrid.pro (deleted)

trunk/ToBeReviewed/GRILLE/.idlwave_catalog

@@ -2 +2 @@
 ;; IDLWAVE catalog for library saxo
 ;; Automatically Generated -- do not edit.
-;; Created by idlwave_catalog on Tue Jan 24 17:06:19 2006
+;; Created by idlwave_catalog on Thu May  4 08:42:55 2006
 ;;
 (setq idlwave-library-catalog-libname "saxo")
@@ -18 +18 @@
    ("umask" fun nil (lib "umask.pro" nil "saxo") "Result = %s" (nil))
    ("v2t" fun nil (lib "v2t.pro" nil "saxo") "Result = %s(temp)" (nil))
-   ("vmask" fun nil (lib "vmask.pro" nil "saxo") "Result = %s" (nil))
-   ("readmesh" pro nil (lib "whichgrid.pro" nil "saxo") "%s, filename, filetype" (nil ("_extra")))
-   ("getgridparameter" fun nil (lib "whichgrid.pro" nil "saxo") "Result = %s(top)" (nil))
-   ("showgridparameter" pro nil (lib "whichgrid.pro" nil "saxo") "%s, basetop" (nil ("_EXTRA") ("EDITABLE")))
-   ("give_file_type_choice" fun nil (lib "whichgrid.pro" nil "saxo") "Result = %s" (nil ("type")))
-   ("whichgrid_event" pro nil (lib "whichgrid.pro" nil "saxo") "%s, event" (nil))
-   ("whichgrid" fun nil (lib "whichgrid.pro" nil "saxo") "Result = %s(name)" (nil ("_EXTRA") ("PARENT")))))
+   ("vmask" fun nil (lib "vmask.pro" nil "saxo") "Result = %s" (nil))))

trunk/ToBeReviewed/GRILLE/changegrid.pro

@@ -1 +1 @@
 function changegrid, newgrid
 ;
-@common
+@cm_4mesh
 ;
 ;
@@ -9 +9 @@
 ;
    ccmeshparameters = newgrid
-   jpiglo = newgrid.jpiglo
-   jpjglo = newgrid.jpjglo
-   jpkglo = newgrid.jpkglo
-   jpi = newgrid.jpi
-   jpj = newgrid.jpj
-   jpk = newgrid.jpk
+
    ixminmesh = newgrid.ixminmesh
    ixmaxmesh = newgrid.ixmaxmesh
@@ -21 +16 @@
    izminmesh = newgrid.izminmesh
    izmaxmesh = newgrid.izmaxmesh
-   key_shift = newgrid.key_shift
-   boundary = newgrid.boundary
 ;
 ; read the new file
 ;
-   if newgrid.filetype EQ 'batch file' THEN BEGIN 
-      createpro, '@'+strmid(newgrid.filename[0], 0, strlen(newgrid.filename)-4) $
-          , filename = myuniquetmpdir +'for_createpro.pro'
-      return, 1
-   ENDIF ELSE BEGIN 
-      readmesh, newgrid.filename, newgrid.filetype, glamboundary = boundary
-   ENDELSE
-;
-;
-   key_periodic = newgrid.key_periodic
-;   
-   @updateold
-   domdef
-   if newgrid.triangulation EQ 1 then triangles_list = triangule() $
-   ELSE triangles_list = -1
+   loadgrid, newgrid.filename
 ;
   IF NOT keyword_set(key_forgetold) THEN BEGIN

trunk/ToBeReviewed/GRILLE/cmpgrid.pro

@@ -12 +12 @@
    if n_elements(ccmeshparameters) EQ 0 then return, 1
 ;
+; does ccmeshparameters contains the new parameters ?
+;
+   if (where(strlowcase(tag_names(ccmeshparameters)) EQ 'key_partialstep'))[0] EQ -1 then return, 1
+;
 ; we compare the structure which caracterise the grid whith
 ; ccmeshparameters
 ;
-;
    case 1 of
-      ccmeshparameters.filename NE newgrid.filename:
-      ccmeshparameters.filetype NE newgrid.filetype:
       ccmeshparameters.jpiglo NE newgrid.jpiglo:
       ccmeshparameters.jpjglo NE newgrid.jpjglo:
@@ -25 +26 @@
       ccmeshparameters.jpj NE newgrid.jpj:
       ccmeshparameters.jpk NE newgrid.jpk:
+      array_equal(ccmeshparameters.glaminfo, newgrid.glaminfo) EQ 0:
+      array_equal(ccmeshparameters.gphiinfo, newgrid.gphiinfo) EQ 0:
       ccmeshparameters.ixminmesh NE newgrid.ixminmesh:
       ccmeshparameters.ixmaxmesh NE newgrid.ixmaxmesh:
@@ -32 +35 @@
       ccmeshparameters.izmaxmesh NE newgrid.izmaxmesh:
       ccmeshparameters.key_shift NE newgrid.key_shift:
+      ccmeshparameters.key_periodic NE newgrid.key_periodic:
+      array_equal(ccmeshparameters.key_stride, newgrid.key_stride) EQ 0:
+      ccmeshparameters.key_gridtype NE newgrid.key_gridtype:
+      ccmeshparameters.key_yreverse NE newgrid.key_yreverse:
+      ccmeshparameters.key_zreverse NE newgrid.key_zreverse:
+      ccmeshparameters.key_partialstep NE newgrid.key_partialstep:
+      ccmeshparameters.key_onearth NE newgrid.key_onearth:
       ELSE:return, 0
    endcase

trunk/ToBeReviewed/GRILLE/grille.pro

@@ -107 +107 @@
       lasty = lastyt
 ;vecteurs 2d
-      IF n_elements(glam) NE 1 THEN glam = glamt[firstx:lastx, firsty:lasty]
-      IF n_elements(gphi) NE 1 THEN gphi = gphit[firstx:lastx, firsty:lasty]
-      IF n_elements(e1) NE 1 THEN e1 = e1t[firstx:lastx, firsty:lasty]
-      IF n_elements(e2) NE 1 THEN e2 = e2t[firstx:lastx, firsty:lasty]
+      IF arg_present(glam) THEN glam = glamt[firstx:lastx, firsty:lasty]
+      IF arg_present(gphi) THEN gphi = gphit[firstx:lastx, firsty:lasty]
+      IF arg_present(e1) THEN e1 = e1t[firstx:lastx, firsty:lasty]
+      IF arg_present(e2) THEN e2 = e2t[firstx:lastx, firsty:lasty]
 ;vecteurs 3d
       IF keyword_set(forplt) THEN mask = tmask[firstx:lastx, firsty:lasty, firstz] $
-      ELSE IF n_elements(mask) NE 1 THEN mask = tmask[firstx:lastx, firsty:lasty, firstz:lastz]
+      ELSE IF arg_present(mask) THEN mask = tmask[firstx:lastx, firsty:lasty, firstz:lastz]
     end
 ;------------------------------------------------------------
@@ -127 +127 @@
       lasty = lastyu
 ;vecteurs 2d
-      IF n_elements(glam) NE 1 THEN glam = glamu[firstx:lastx, firsty:lasty]
-      IF n_elements(gphi) NE 1 THEN gphi = gphiu[firstx:lastx, firsty:lasty]
+      IF arg_present(glam) THEN glam = glamu[firstx:lastx, firsty:lasty]
+      IF arg_present(gphi) THEN gphi = gphiu[firstx:lastx, firsty:lasty]
       if keyword_set(forplt) then BEGIN
         mask = 1b-tmask[firstx:lastx, firsty:lasty, firstz]
@@ -158 +158 @@
         endif
       ENDIF
-      IF n_elements(e1) NE 1 THEN e1  = e1u[firstx:lastx, firsty:lasty]
-      IF n_elements(e2) NE 1 THEN e2  = e2u[firstx:lastx, firsty:lasty]
+      IF arg_present(e1) THEN e1  = e1u[firstx:lastx, firsty:lasty]
+      IF arg_present(e2) THEN e2  = e2u[firstx:lastx, firsty:lasty]
 ;vecteurs 3d
       IF keyword_set(forplt) THEN mask = (umask())[firstx:lastx, firsty:lasty, firstz] $
-      ELSE IF n_elements(mask) NE 1 THEN mask = (umask())[firstx:lastx, firsty:lasty, firstz:lastz]
+      ELSE IF arg_present(mask) THEN mask = (umask())[firstx:lastx, firsty:lasty, firstz:lastz]
     end
 ;------------------------------------------------------------
@@ -177 +177 @@
       lasty = lastyv
 ;vecteurs 2d
-      IF n_elements(glam) NE 1 THEN glam = glamv[firstx:lastx, firsty:lasty]
-      IF n_elements(gphi) NE 1 THEN gphi = gphiv[firstx:lastx, firsty:lasty]
+      IF arg_present(glam) THEN glam = glamv[firstx:lastx, firsty:lasty]
+      IF arg_present(gphi) THEN gphi = gphiv[firstx:lastx, firsty:lasty]
       if keyword_set(forplt) then BEGIN 
         mask = 1b-tmask[firstx:lastx, firsty:lasty, firstz]
@@ -208 +208 @@
         endif
       ENDIF
-      IF n_elements(e1) NE 1 THEN e1  = e1v[firstx:lastx, firsty:lasty]
-      IF n_elements(e2) NE 1 THEN e2  = e2v[firstx:lastx, firsty:lasty]
+      IF arg_present(e1) THEN e1  = e1v[firstx:lastx, firsty:lasty]
+      IF arg_present(e2) THEN e2  = e2v[firstx:lastx, firsty:lasty]
 ;vecteurs 3d
       IF keyword_set(forplt) THEN mask = (vmask())[firstx:lastx, firsty:lasty, firstz] $
-      ELSE IF n_elements(mask) NE 1 THEN mask = (vmask())[firstx:lastx, firsty:lasty, firstz:lastz]
+      ELSE IF arg_present(mask) THEN mask = (vmask())[firstx:lastx, firsty:lasty, firstz:lastz]
     end
 ;------------------------------------------------------------
@@ -227 +227 @@
       lasty = lastyf
 ;vecteurs 2d
-      IF n_elements(glam) NE 1 THEN glam = glamf[firstx:lastx, firsty:lasty]
-      IF n_elements(gphi) NE 1 THEN gphi = gphif[firstx:lastx, firsty:lasty]
+      IF arg_present(glam) THEN glam = glamf[firstx:lastx, firsty:lasty]
+      IF arg_present(gphi) THEN gphi = gphif[firstx:lastx, firsty:lasty]
       if keyword_set(forplt) then BEGIN 
         mask = 1b-tmask[firstx:lastx, firsty:lasty, firstz]
@@ -268 +268 @@
         endif
       ENDIF
-      IF n_elements(e1) NE 1 THEN e1  = e1f[firstx:lastx, firsty:lasty]
-      IF n_elements(e2) NE 1 THEN e2  = e2f[firstx:lastx, firsty:lasty]
+      IF arg_present(e1) THEN e1  = e1f[firstx:lastx, firsty:lasty]
+      IF arg_present(e2) THEN e2  = e2f[firstx:lastx, firsty:lasty]
 ;vecteurs 3d
       IF keyword_set(forplt) THEN mask = (fmask())[firstx:lastx, firsty:lasty, firstz] $
-      ELSE IF n_elements(mask) NE 1 THEN mask = (fmask())[firstx:lastx, firsty:lasty, firstz:lastz]
+      ELSE IF arg_present(mask) THEN mask = (fmask())[firstx:lastx, firsty:lasty, firstz:lastz]
     END
 ;------------------------------------------------------------