Changeset 495 for trunk/SRC/Computation

Timestamp:

04/17/14 10:49:43 (10 years ago)

Author:

pinsard

Message:

fix thanks to coding rules; typo; dupe empty lines; trailing blanks

Location:

trunk/SRC/Computation

Files:

• bsf.pro (modified) (3 diffs)
• curl.pro (modified) (2 diffs)
• div.pro (modified) (2 diffs)
• e3t_3d.pro (modified) (3 diffs)
• e3u_3d.pro (modified) (3 diffs)
• e3v_3d.pro (modified) (3 diffs)
• e3w_3d.pro (modified) (2 diffs)
• grad.pro (modified) (2 diffs)
• msf.pro (modified) (5 diffs)

trunk/SRC/Computation/bsf.pro

@@ -30 +30 @@
 ; @returns {type=2D xy array}
 ; barotropic stream function in Sv
-; 
+;
 ; @uses
 ; <pro>cm_4mesh</pro>
@@ -42 +42 @@
 ; - to be valid, mask must be equal to 0 at the bottom and on each
 ;   side of the domain along x direction
-; - define the common variables (of cm_4data) 
+; - define the common variables (of cm_4data)
 ;       varname = 'BSF'
 ;       varunit = 'Sv'
-;       vargrid = 'F' 
+;       vargrid = 'F'
 ;
 ; @examples
@@ -93 +93 @@
   IF keyword_set(refpoint) THEN BEGIN
     refind = neighbor(refpoint[0], refpoint[1], glamf[firstx:lastx, firsty:lasty], gphif[firstx:lastx, firsty:lasty], SPHERE = key_onearth)
-    IF n_elements(refvalue) EQ 0 THEN refval = - bsf[refind[0]] ELSE refval = refvalue - bsf[refind[0]] 
+    IF n_elements(refvalue) EQ 0 THEN refval = - bsf[refind[0]] ELSE refval = refvalue - bsf[refind[0]]
     bsf = temporary(bsf) + refval
   ENDIF

trunk/SRC/Computation/curl.pro

@@ -27 +27 @@
 ; @keyword MILLION {default=0}{type=scalar: 0 or 1}
 ; Activate to multiply returned array by 1.e6
-; 
+;
 ; @keyword _EXTRA
 ; Used to declare that this routine accepts inherited keywords
@@ -88 +88 @@
 ;
   gr = litchamp(uu, /grid)
-  IF gr NE '' THEN BEGIN 
+  IF gr NE '' THEN BEGIN
     IF gr NE 'U' THEN return, report('the first parameter is not located on U grid, but on '+ strtrim(gr, 2) +'grid')
-  ENDIF 
+  ENDIF
   gr = litchamp(vv, /grid)
-  IF gr NE '' THEN BEGIN 
+  IF gr NE '' THEN BEGIN
     IF gr NE 'V' THEN return, report('the second parameter is not located on V grid, but on '+ strtrim(gr, 2) +'grid')
-  ENDIF 
+  ENDIF
   u = litchamp(uu)
   v = litchamp(vv)

trunk/SRC/Computation/div.pro

@@ -26 +26 @@
 ; @keyword MILLION {default=0}{type=scalar: 0 or 1}
 ; Activate to multiply returned array by 1.e6
-; 
+;
 ; @keyword _EXTRA
 ; Used to declare that this routine accepts inherited keywords
@@ -86 +86 @@
 ;
   gr = litchamp(uu, /grid)
-  IF gr NE '' THEN BEGIN 
+  IF gr NE '' THEN BEGIN
     IF gr NE 'U' THEN return, report('the first parameter is not located on U grid, but on '+ strtrim(gr, 2) +'grid')
-  ENDIF 
+  ENDIF
   gr = litchamp(vv, /grid)
-  IF gr NE '' THEN BEGIN 
+  IF gr NE '' THEN BEGIN
     IF gr NE 'V' THEN return, report('the second parameter is not located on V grid, but on '+ strtrim(gr, 2) +'grid')
-  ENDIF 
+  ENDIF
   u = litchamp(uu)
   v = litchamp(vv)

trunk/SRC/Computation/e3t_3d.pro

@@ -28 +28 @@
 ;
 ;-
-function e3t_3d, e1 = e1, e2 = e2, fstx = fstx, lstx = lstx, fsty = fsty, lsty = lsty 
+function e3t_3d, e1 = e1, e2 = e2, fstx = fstx, lstx = lstx, fsty = fsty, lsty = lsty
 ;
   compile_opt idl2, strictarrsubs
@@ -48 +48 @@
   ENDCASE
   e3t3d = arr2d[*] # e3t[firstzt:lastzt]
-  e3t3d = reform(e3t3d, nx, ny, nzt, /overwrite)    
+  e3t3d = reform(e3t3d, nx, ny, nzt, /overwrite)
 ;
   IF keyword_set(key_partialstep) THEN BEGIN
@@ -60 +60 @@
     ok2 = inter(sea, where(bottom2 GE 0 AND bottom2 LT nzt))
 ; apply e3t_ps to e3t_3D at the bottom of the ocean
-    IF ok[0]  NE -1 THEN BEGIN 
+    IF ok[0]  NE -1 THEN BEGIN
 ; the bottom of the ocean in 3D index is:
       bottom  = (lindgen(nx*ny))[ok ] + nx*ny*(temporary(bottom ))[ok ]
       e3t3d[temporary(bottom )] = arr2d[ok ] * (e3t_ps[fstx:lstx, fsty:lsty])[ok ]
     ENDIF
-    IF ok2[0] NE -1 THEN BEGIN 
+    IF ok2[0] NE -1 THEN BEGIN
       bottom2 = (lindgen(nx*ny))[ok2] + nx*ny*(temporary(bottom2))[ok2]
       e3t3d[temporary(bottom2)] = arr2d[ok2] * (e3t_ps[fstx:lstx, fsty:lsty])[ok2]
     ENDIF
-; 
+;
   ENDIF
 ;

trunk/SRC/Computation/e3u_3d.pro

@@ -34 +34 @@
 @cm_4mesh
 ;
-  IF keyword_set(key_partialstep) THEN lastx = ( lastxu + 1 ) < ( jpi - 1 ) ELSE lastx = lastxu 
+  IF keyword_set(key_partialstep) THEN lastx = ( lastxu + 1 ) < ( jpi - 1 ) ELSE lastx = lastxu
   nx = lastx - firstxu + 1
 ; get e3t 3D
@@ -41 +41 @@
   IF keyword_set(key_partialstep) THEN BEGIN
 ;
-; Rebuild the U-point 3D partial steps array from T-point 3D e3t_3D array 
+; Rebuild the U-point 3D partial steps array from T-point 3D e3t_3D array
 ;
     tmp = shift(e3t3d, -1, 0, 0)
@@ -59 +59 @@
 ;
     IF nx EQ nxu + 1 THEN e3u3d = (temporary(e3u3d))[0:nx-2, *, *]
-;    
+;
   ENDIF ELSE e3u3d = temporary(e3t3d)
 ;

trunk/SRC/Computation/e3v_3d.pro

@@ -40 +40 @@
 ;
   IF keyword_set(key_partialstep) THEN BEGIN
-; Rebuild the V-point 3D partial steps array from T-point 3D e3t_3D array 
+; Rebuild the V-point 3D partial steps array from T-point 3D e3t_3D array
     tmp = shift(e3t3d, 0, -1, 0)
     IF ny EQ nyv THEN tmp[*, ny-1, *] = e3t3d[*, ny-1, *]
@@ -48 +48 @@
 ;
     IF ny EQ nyv + 1 THEN e3v3d = (temporary(e3v3d))[*, 0:ny-2, *]
-;    
+;
   ENDIF ELSE e3v3d = temporary(e3t3d)
 ;
@@ -63 +63 @@
   return, e3v3d
 END
-

trunk/SRC/Computation/e3w_3d.pro

@@ -42 +42 @@
   ENDCASE
   e3w_3d = arr2d[*] # e3w[firstzw:lastzw]
-  e3w_3d = reform(e3w_3d, nxt, nyt, nzw, /overwrite)    
+  e3w_3d = reform(e3w_3d, nxt, nyt, nzw, /overwrite)
 ;
   IF keyword_set(key_partialstep) THEN BEGIN
@@ -64 +64 @@
     ENDIF
   ENDIF
-; 
+;
   return, e3w_3d
 END
-

trunk/SRC/Computation/grad.pro

@@ -9 +9 @@
 ; @param FIELD
 ; The field for which we want to compute the gradient. A 2D (xy),
-; 3D (xyz or yt) or 4D (xyzt) array or a structure readable by 
+; 3D (xyz or yt) or 4D (xyzt) array or a structure readable by
 ; <pro>litchamp</pro> and containing a 2D (xy), 3D (xyz or yt) or 4D (xyzt) array.
 ; Note that the dimension of the array must suit the domain dimension.
@@ -18 +18 @@
 ; @keyword MILLION {default=0}{type=scalar: 0 or 1}
 ; Activate to multiply returned array by 1.e6
-; 
+;
 ; @keyword _EXTRA
 ; Used to declare that this routine accepts inherited keywords

trunk/SRC/Computation/msf.pro

@@ -35 +35 @@
 ; @returns {type=2D yz array}
 ; meridional stream function in Sv
-; 
+;
 ; @uses
 ; <pro>cm_4mesh</pro>
@@ -47 +47 @@
 ; - to be valid, mask must be equal to 0 at the bottom and on each
 ;   side of the domain along x direction
-; - define the common variables (of cm_4data) 
+; - define the common variables (of cm_4data)
 ;       varname = 'MSF'
 ;       varunit = 'Sv'
@@ -100 +100 @@
 ;
 ; current -> transport
-  IF NOT keyword_set(transport) THEN vn = temporary(vn) * e3v_3d(/e1) 
+  IF NOT keyword_set(transport) THEN vn = temporary(vn) * e3v_3d(/e1)
   vtr = temporary(vn) * msk
 ;
@@ -110 +110 @@
     maskout = reverse(temporary(maskout), 2)
   ENDIF
-;  
-; defaut computation:
+;
+; default computation:
 ;  msf = 1.e-6 * total(total(temporary(vtr), 1), 2, /cumulative)
 ; but we force the computation from bottom to up.
@@ -132 +132 @@
 
   IF (jpiglo EQ 182 AND jpjglo EQ 149) OR (jpiglo EQ 722 AND jpjglo EQ 511) $
-     OR (jpiglo EQ 1442 AND jpjglo EQ 1021) OR (jpiglo EQ 4322 AND jpjglo EQ 3059) THEN BEGIN 
+     OR (jpiglo EQ 1442 AND jpjglo EQ 1021) OR (jpiglo EQ 4322 AND jpjglo EQ 3059) THEN BEGIN
 ; find the i index with the northest latitude
     ind = (where(gphit[firstx:lastx, firsty:lasty] EQ max(gphit[firstx:lastx, firsty:lasty])))[0] mod nx