Changeset 509 for trunk/SRC/Interpolation

Timestamp:

12/19/19 10:27:05 (5 years ago)

Author:

smasson

Message:

commit old minor bugfix

File:

• trunk/SRC/Interpolation/compute_fromirr_bilinear_weigaddr.pro (modified) (9 diffs)

trunk/SRC/Interpolation/compute_fromirr_bilinear_weigaddr.pro

@@ -64 +64 @@
 ;-
 PRO compute_fromirr_bilinear_weigaddr, olonin, olat, omsk, alonin, alat, amsk $
-                                     , weig, addr
+                                     , weig, addr, lonref1 = lonref1, onplane = onplane, notuse_neighbor = notuse_neighbor
 ;
   compile_opt idl2, strictarrsubs
@@ -76 +76 @@
   jpio = (size(olonin, /dimensions))[0]
   jpjo = (size(olonin, /dimensions))[1]
+;
 ; mask check
   IF n_elements(omsk) EQ 1 AND omsk[0] EQ -1 THEN BEGIN
@@ -114 +115 @@
   ENDELSE
 ;
+  IF n_elements(lonref1) EQ 0 THEN lonref1 = 0.
+  lonref2 = lonref1 + 360.
 ; longitude, between 0 and 360
-  alon = alonin MOD 360
-  out = where(alon LT 0)
-  IF out[0] NE -1 THEN alon[out] = alon[out]+360
-  olon = olonin MOD 360
-  out = where(olon LT 0)
-  IF out[0] NE -1 THEN olon[out] = olon[out]+360
+  alon = (alonin + 720. ) MOD 360.
+; longitude, between lonref1 and lonref2
+  out = where(alon LT lonref1)
+  IF out[0] NE -1 THEN alon[out] = alon[out] + 360.
+  out = where(alon GT lonref2)
+  IF out[0] NE -1 THEN alon[out] = alon[out] - 360.
+; longitude, between 0 and 360
+  olon = ( olonin + 720. ) MOD 360.
+; longitude, between lonref1 and lonref2
+  out = where(olon LT lonref1)
+  IF out[0] NE -1 THEN olon[out] = olon[out] + 360.
+  out = where(olon GT lonref2)
+  IF out[0] NE -1 THEN olon[out] = olon[out] - 360.
 ;
 ; we work only on the output grid water points
@@ -168 +178 @@
 ;
   delta = max([(360./jpio), (180./jpjo)])* 3.
+  print,  routine, ' total loop length = ' , nawater
   FOR n = 0L, nawater-1 DO BEGIN
 ; control print
@@ -184 +195 @@
       END
 ; if we are near the longitude periodicity area
-      xx LE delta OR xx GE (360-delta):BEGIN
+      xx LE (lonref1+delta) OR xx GE (lonref2-delta):BEGIN
         lat1 = yy-delta
         lat2 = yy+delta
-        good = where((minxcell LE 2*delta OR maxxcell GE (360-2*delta)) AND maxycell GE lat1 AND minycell LE lat2)
+        good = where((minxcell LE (lonref1+2*delta) OR maxxcell GE (lonref2-2*delta)) AND maxycell GE lat1 AND minycell LE lat2)
         onsphere = 1
       END
@@ -203 +214 @@
           (jpio EQ 720  OR jpio EQ 722 ) AND (jpjo EQ 522  OR jpjo EQ 521  OR jpjo EQ 520 ):onsphere = yy GT 40
           (jpio EQ 1440 OR jpio EQ 1442) AND (jpjo EQ 1021 OR jpjo EQ 1020 OR jpjo EQ 1019):onsphere = yy GT 40
-          ELSE:onsphere = 1
+          ELSE:onsphere = 1 - keyword_set(onplane) 
         ENDCASE
       END
@@ -264 +275 @@
         ENDCASE
       ENDIF ELSE foraddr[n] = -1
-    ENDIF ELSE foraddr[n] = -1
+    ENDIF ELSE foraddr[n] =  -1
   ENDFOR
+  
+  IF keyword_set(notuse_neighbor) THEN BEGIN  ; don't do anything for bad points -> they will have no addr/weig like land points
+    ok = where(foraddr NE -1, nawater)   ; keep only the points that are above a water oceanic cell.
+    foraddr = foraddr[ok]
+    forweight = forweight[ok, *]
+    awater = awater[temporary(ok)]
+  ENDIF
+  
 ; do we have some water atmospheric points that are not located in an water oceanic cell?
   bad = where(foraddr EQ -1)
@@ -281 +300 @@
     neig = lonarr(n_elements(bad))
     onsphere = 1
+    print,  routine, ' total loop length = ', n_elements(bad)
     FOR i = 0L, n_elements(bad)-1L DO BEGIN
       IF (i MOD 500) EQ 0 THEN print, routine, ' i = ', i
@@ -289 +309 @@
         ytmp GE (90-delta):keep = where(goodlat GE 90-3*delta, cnt)
 ; if we are near the longitude periodicity area
-        xtmp LE delta OR xtmp GE (360-delta):keep = where((goodlon LE 3*delta OR goodlon GE (360-3*delta)) $
+        xtmp LE (lonref1+delta) OR xtmp GE (lonref2-delta):keep = where((goodlon LE (lonref1+3*delta) OR goodlon GE (lonref2-3*delta)) $
                                                           AND goodlat GE (ytmp-3*delta) AND goodlat LE (ytmp+3*delta), cnt)
 ; other cases