Changeset 481 for trunk/SRC

Timestamp:

12/17/12 11:30:19 (12 years ago)

Author:

smasson

Message:

add more flexibility in imoms3 interpolation

File:

• trunk/SRC/Interpolation/compute_fromreg_imoms3_weigaddr.pro (modified) (7 diffs)

trunk/SRC/Interpolation/compute_fromreg_imoms3_weigaddr.pro

@@ -84 +84 @@
 ; alon is it regularly spaced?
   step = alon-shift(alon, 1)
-  step[0] = step[0] + 360.
-  IF total((step-step[0]) GE 1.e-6) NE 0 THEN noregx = 1
+  step = step[1:jpia-1L]
+  IF total(abs(step-step[0]) GE 1.e-6) NE 0 THEN noregx = 1
 ; we extend the longitude range of alon (-> easy interpolation even
 ; near minalon and maxalon)
-  toadd = 10*jpia/360+1
-  alon = [alon[jpia-toadd:jpia-1]-360., alon[*], alon[0:toadd-1]+360.]
-  jpia = jpia+2*toadd
+  IF max(step)*(jpia+1) GE 360 THEN BEGIN ; if we are really periodic
+    toadd = 10*jpia/360+1
+    alon = [alon[jpia-toadd:jpia-1]-360., alon[*], alon[0:toadd-1]+360.]
+    jpia = jpia+2*toadd
+  ENDIF ELSE toadd = 0L
 ; alat
   revy = alat[0] GT alat[1]
@@ -99 +101 @@
   step = alat-shift(alat, 1)
   step = step[1:jpja - 1L]
-  IF total((step-step[0]) GE 1.e-6) NE 0 THEN noregy = 1
+  IF total(abs(step-step[0]) GE 1.e-6) NE 0 THEN noregy = 1
 ;
   if keyword_set(nonorthernline) then BEGIN
@@ -174 +176 @@
       IF i MOD 10000 EQ 0 THEN print, i
       newlat = spl_incr(alat[ilat[i]-1L:ilat[i]+2L], [-1., 0., 1., 2.], olat[short[i]])
-      IF newlat LE 0 THEN stop
+      IF newlat LT 0 THEN stop
       IF newlat GT 1 THEN stop
       wy0[i] = imoms3(newlat+1)
@@ -217 +219 @@
       IF i MOD 10000 EQ 0 THEN print, i
       newlon = spl_incr(alon[ilon[i]-1L:ilon[i]+2L], [-1., 0., 1., 2.], olon[short[i]])
-      IF newlon LE 0 THEN stop
-      IF newlon GT 1 THEN stop
+      IF newlon LT 0 THEN stop
+      IF newlon GE 1 THEN stop
       wx0[i] = imoms3(newlon+1)
       wx1[i] = imoms3(newlon)
@@ -345 +347 @@
         IF i MOD 10000 EQ 0 THEN print, i
         newlon = spl_incr(alon[ilon[i]-1L:ilon[i]+2L], [-1., 0., 1., 2.], olon[short[i]])
-        IF newlon LE 0 THEN stop
-        IF newlon GT 1 THEN stop
+        IF newlon LT 0 THEN stop
+        IF newlon GE 1 THEN stop
         wx0[i] = imoms3(newlon+1)
         wx1[i] = imoms3(newlon)
@@ -427 +429 @@
         IF i MOD 10000 EQ 0 THEN print, i
         newlon = spl_incr(alon[ilon[i]-1L:ilon[i]+2L], [-1., 0., 1., 2.], olon[short[i]])
-        IF newlon LE 0 THEN stop
-        IF newlon GT 1 THEN stop
+        IF newlon LT 0 THEN stop
+        IF newlon GE 1 THEN stop
         wx0[i] = imoms3(newlon+1)
         wx1[i] = imoms3(newlon)
@@ -493 +495 @@
         IF i MOD 10000 EQ 0 THEN print, i
         newlon = spl_incr(alon[ilon[i]-1L:ilon[i]+2L], [-1., 0., 1., 2.], olon[short[i]])
-        IF newlon LE 0 THEN stop
-        IF newlon GT 1 THEN stop
+        IF newlon LT 0 THEN stop
+        IF newlon GE 1 THEN stop
         wx0[i] = imoms3(newlon+1)
         wx1[i] = imoms3(newlon)