Changeset 159

Timestamp:

08/28/06 16:50:01 (18 years ago)

Author:

smasson

Message:

bugfix in grad.pro

Location:

trunk/SRC

Files:

• Documentation/xmldoc/savesaxo.sh (modified) (1 diff)
• ToBeReviewed/CALCULS/grad.pro (modified) (12 diffs)
• ToBeReviewed/PLOTS/DESSINE/pltv.pro (modified) (1 prop)

trunk/SRC/Documentation/xmldoc/savesaxo.sh

@@ -56 +56 @@
 set -u
 #
-docompileall=0
+docompileall=1
 dohtml=0
 dooldtest=0
 doidlwavedoc=0
-doidldoc_html=1
+doidldoc_html=0
 doidldoc_assistant=0
 doTARsrc=0

trunk/SRC/ToBeReviewed/CALCULS/grad.pro

@@ -46 +46 @@
 ;
    res = litchamp(field)
-   taille=size(res)
-   grille, mask, glam, gphi, gdep, nx, ny,nz,firstx,firsty,firstz,lastx, lasty, lastz     
+   taille = size(res)
+   grille, mask, glam, gphi, gdep, nx, ny, nz $
+           , firstx, firsty, firstz, lastx, lasty, lastz     
    if n_elements(valmask) EQ 0 then valmask = 1e20
    case strupcase(vargrid) of
@@ -56 +57 @@
                newmask = (umask())[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'U'
-               domdef, glamt[firstx, 0], glamu[lastx, 0] $
-                , gphit[0, firsty], gphiu[0, lasty], gridtype = ['T','U']
+               firstxu = firstxt & lastxu = lastxt & nxu = nxt 
+               firstyu = firstyt & lastyu = lastyt & nyu = nyt
             END
             'y':BEGIN
@@ -63 +64 @@
                newmask = (vmask())[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'V'
-               domdef, glamt[firstx, 0], glamv[lastx, 0] $
-                , gphit[0, firsty], gphiv[0, lasty], gridtype = ['T','V']
+               firstxv = firstxt & lastxv = lastxt & nxv = nxt 
+               firstyv = firstyt & lastyv = lastyt & nyv = nyt
             END
             'z':BEGIN
@@ -70 +71 @@
                newmask = mask
                vargrid = 'W'
+               firstzw = firstzt & lastzw = lastzt & nzw = nzt 
             END
             ELSE:return, report('Bad definition of direction argument')
@@ -76 +78 @@
       'W':BEGIN
          case direc of
-            'x':divi = e1u[firstx:lastx, firsty:lasty]
-            'y':divi = e2v[firstx:lastx, firsty:lasty]
+            'x':BEGIN 
+               divi = e1u[firstx:lastx, firsty:lasty]
+               newmask = (umask())[firstx:lastx, firsty:lasty, firstz:lastz]
+               vargrid = 'U'
+               firstxu = firstxt & lastxu = lastxt & nxu = nxt 
+               firstyu = firstyt & lastyu = lastyt & nyu = nyt
+            END
+            'y':BEGIN
+               divi = e2v[firstx:lastx, firsty:lasty]
+               newmask = (vmask())[firstx:lastx, firsty:lasty, firstz:lastz]
+               vargrid = 'V'
+               firstxv = firstxt & lastxv = lastxt & nxv = nxt 
+               firstyv = firstyt & lastyv = lastyt & nyv = nyt
+            END
             'z':BEGIN
                divi = e3t[firstz:lastz]
                newmask = mask
                vargrid = 'T'
+               firstzt = firstzw & lastzt = lastzw & nzt = nzw 
             END
             ELSE:return, report('Bad definition of direction argument')
@@ -92 +107 @@
                newmask = tmask[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'T'
-               domdef, glamt[firstx, 0], glamu[lastx] $
-                , gphit[0, firsty], gphiu[0, lasty], gridtype = ['T','U']
+               firstxt = firstxu & lastxt = lastxu & nxt = nxu 
+               firstyt = firstyu & lastyt = lastyu & nyt = nyu
             END
             'y':BEGIN
@@ -99 +114 @@
                newmask = (fmask())[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'F'
-               domdef, glamu[firstx, 0], glamf[lastx, 0] $
-                , gphiu[0, firsty], gphif[0, lasty], gridtype = ['U','F']
+               firstxf = firstxu & lastxf = lastxu & nxf = nxu 
+               firstyf = firstyu & lastyf = lastyu & nyf = nyu
             END
             'z':BEGIN
@@ -106 +121 @@
                newmask = mask
                vargrid = 'W'
+               firstzw = firstzt & lastzw = lastzt & nzw = nzt 
             END
             ELSE:return, report('Bad definition of direction argument')
@@ -116 +132 @@
                newmask = (fmask())[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'F'
-               domdef, glamv[firstx, 0], glamf[lastx, 0] $
-                , gphiv[0, firsty], gphif[0, lasty], gridtype = ['V','F']
+               firstxf = firstxv & lastxf = lastxv & nxf = nxv
+               firstyf = firstyv & lastyf = lastyv & nyf = nyv
             END
             'y':BEGIN
@@ -123 +139 @@
                newmask = tmask[firstx:lastx, firsty:lasty, firstz:lastz]
                vargrid = 'T'
-               domdef, glamt[firstx, 0], glamv[lastx, 0] $
-                , gphit[0, firsty], gphiv[0, lasty], gridtype = ['T','V']
+               firstxt = firstxv & lastxt = lastxv & nxt = nxv
+               firstyt = firstyv & lastyt = lastyv & nyt = nyv
             END
             'z':BEGIN
@@ -130 +146 @@
                newmask = mask
                vargrid = 'W'
+               firstzw = firstzt & lastzw = lastzt & nzw = nzt 
             END
             ELSE:return, report('Bad definition of direction argument')
@@ -145 +162 @@
    ENDCASE
    res = fitintobox(res)
+   IF n_elements(res) EQ 1 AND res[0] EQ -1 THEN return, res
    case 1 of
 ;----------------------------------------------------------------------------