add handling of fill value geo-locations

TomBlock · TomBlock · commit 1f6e76bcb1be · 2021-05-04T16:35:47.000+02:00
diff --git a/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessing.java b/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessing.java
@@ -71,6 +71,10 @@ private static InterpolationContext createInterpolationContext_2D(Array lonArray
 
                 final float lon = lonArray.getFloat(lonIdx);
                 final float lat = latArray.getFloat(latIdx);
+                if (!(isValidLon(lon) && isValidLat(lat))) {
+                    // we cannot interpolate here tb 2021-05-04
+                    continue;
+                }
 
                 // + detect four era5 corner-points for interpolation
                 // + calculate longitude delta -> a
@@ -92,14 +96,7 @@ private static InterpolationContext createInterpolationContext_2D(Array lonArray
                     yMax = era5_Y_min;
                 }
 
-                final double era5LonMin = era5_X_min * 0.25 - 180.0;
-                final double era5LatMin = 90.0 - era5_Y_min * 0.25;
-
-                // we have a quarter degree raster and need to normalize the distance tb 2020-11-20
-                final double lonDelta = (lon - era5LonMin) * 4.0;
-                final double latDelta = (era5LatMin - lat) * 4.0;
-
-                final BilinearInterpolator interpolator = new BilinearInterpolator(lonDelta, latDelta, era5_X_min, era5_Y_min);
+                final BilinearInterpolator interpolator = createInterpolator(lon, lat, era5_X_min, era5_Y_min);
                 context.set(x, y, interpolator);
             }
 
@@ -110,6 +107,17 @@ private static InterpolationContext createInterpolationContext_2D(Array lonArray
         return context;
     }
 
+    static BilinearInterpolator createInterpolator(float lon, float lat, int era5_X_min, int era5_Y_min) {
+        final double era5LonMin = era5_X_min * 0.25 - 180.0;
+        final double era5LatMin = 90.0 - era5_Y_min * 0.25;
+
+        // we have a quarter degree raster and need to normalize the distance tb 2020-11-20
+        final double lonDelta = (lon - era5LonMin) * 4.0;
+        final double latDelta = (era5LatMin - lat) * 4.0;
+
+        return new BilinearInterpolator(lonDelta, latDelta, era5_X_min, era5_Y_min);
+    }
+
     private static InterpolationContext createInterpolationContext_1D(Array lonArray, Array latArray) {
         final InterpolationContext context = new InterpolationContext(1, 1);
 
@@ -119,14 +127,7 @@ private static InterpolationContext createInterpolationContext_1D(Array lonArray
         final int era5_X_min = getEra5LonMin(lon);
         final int era5_Y_min = getEra5LatMin(lat);
 
-        final double era5LonMin = era5_X_min * 0.25 - 180.0;
-        final double era5LatMin = 90.0 - era5_Y_min * 0.25;
-
-        // we have a quarter degree raster and need to normalize the distance tb 2020-11-20
-        final double lonDelta = (lon - era5LonMin) * 4.0;
-        final double latDelta = (era5LatMin - lat) * 4.0;
-
-        final BilinearInterpolator interpolator = new BilinearInterpolator(lonDelta, latDelta, era5_X_min, era5_Y_min);
+        final BilinearInterpolator interpolator = createInterpolator(lon, lat, era5_X_min, era5_Y_min);
         context.set(0, 0, interpolator);
 
         final Rectangle era5Rect = new Rectangle(era5_X_min, era5_Y_min, 2, 2);
@@ -135,6 +136,14 @@ private static InterpolationContext createInterpolationContext_1D(Array lonArray
         return context;
     }
 
+    static boolean isValidLon(float lon) {
+        return lon >= -180.f && lon <= 180.f ;
+    }
+
+    static boolean isValidLat(float lat) {
+        return lat >= -90.f && lat <= 90.f ;
+    }
+
     @Override
     protected void prepare(NetcdfFile reader, NetcdfFileWriter writer) {
         final Dimension matchupCountDimension = reader.findDimension(FiduceoConstants.MATCHUP_COUNT);
diff --git a/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/InterpolationContext.java b/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/InterpolationContext.java
@@ -17,12 +17,7 @@ class InterpolationContext {
 
     BilinearInterpolator get(int x, int y) {
         checkBoundaries(x, y);
-
-        final BilinearInterpolator interpolator = interpolators[y][x];
-        if (interpolator == null) {
-            throw new IllegalArgumentException("Interpolator not set at " + x + ", " + y);
-        }
-        return interpolator;
+        return interpolators[y][x];
     }
 
     public void set(int x, int y, BilinearInterpolator interpolator) {
diff --git a/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java b/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java
@@ -6,17 +6,17 @@
 import ucar.ma2.DataType;
 import ucar.ma2.Index;
 import ucar.ma2.InvalidRangeException;
-import ucar.nc2.*;
 import ucar.nc2.Dimension;
+import ucar.nc2.*;
 
 import java.awt.*;
 import java.io.IOException;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 import static com.bc.fiduceo.post.plugin.era5.VariableUtils.*;
 
-class MatchupFields extends FieldsProcessor{
+class MatchupFields extends FieldsProcessor {
 
     private static final int SECS_PER_HOUR = 3600;
 
@@ -113,6 +113,8 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                     // iterate over time stamps
                     for (int t = 0; t < numTimeSteps; t++) {
                         timeIndex.set(m, t);
+                        targetIndex.set(m, t);
+
                         final int timeStamp = targetTimeArray.getInt(timeIndex);
                         VariableCache.CacheEntry cacheEntry = variableCache.get(variableKey, timeStamp);
 
@@ -121,6 +123,10 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                         subset = NetCDFUtils.scaleIfNecessary(cacheEntry.variable, subset);
                         final Index subsetIndex = subset.getIndex();
                         final BilinearInterpolator bilinearInterpolator = interpolationContext.get(0, 0);
+                        if (bilinearInterpolator == null) {
+                            targetArray.setFloat(targetIndex, TemplateVariable.getFillValue());
+                            continue;
+                        }
 
                         subsetIndex.set(0, 0);
                         final float c00 = subset.getFloat(subsetIndex);
@@ -135,7 +141,6 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                         final float c11 = subset.getFloat(subsetIndex);
                         final double interpolated = bilinearInterpolator.interpolate(c00, c10, c01, c11);
 
-                        targetIndex.set(m, t);
                         targetArray.setFloat(targetIndex, (float) interpolated);
                     }
                 }
diff --git a/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java b/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java
@@ -225,7 +225,6 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                 final int width = shape[1];
                 final int height = shape[0];
 
-                //final Rectangle era5RasterPosition = Era5PostProcessing.getEra5RasterPosition(geoRegion);
                 final InterpolationContext interpolationContext = Era5PostProcessing.getInterpolationContext(lonLayer, latLayer);
                 final Rectangle layerRegion = interpolationContext.getEra5Region();
 
@@ -250,7 +249,14 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                     if (rank == 2) {
                         for (int y = 0; y < height; y++) {
                             for (int x = 0; x < width; x++) {
+                                targetIndex.set(m, y, x);
+
                                 final BilinearInterpolator interpolator = interpolationContext.get(x, y);
+                                if (interpolator == null) {
+                                    targetArray.setFloat(targetIndex, TemplateVariable.getFillValue());
+                                    continue;
+                                }
+
                                 final int offsetX = interpolator.getXMin() - layerRegion.x;
                                 final int offsetY = interpolator.getYMin() - layerRegion.y;
 
@@ -267,15 +273,22 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                                 final float c11 = subset.getFloat(subsetIndex);
 
                                 final double interpolate = interpolator.interpolate(c00, c01, c10, c11);
-                                targetIndex.set(m, y, x);
+
                                 targetArray.setFloat(targetIndex, (float) interpolate);
                             }
                         }
                     } else if (rank == 3) {
                         for (int z = 0; z < numLayers; z++) {
                             for (int y = 0; y < height; y++) {
                                 for (int x = 0; x < width; x++) {
+                                    targetIndex.set(m, z, y, x);
+
                                     final BilinearInterpolator interpolator = interpolationContext.get(x, y);
+                                    if (interpolator == null) {
+                                        targetArray.setFloat(targetIndex, TemplateVariable.getFillValue());
+                                        continue;
+                                    }
+
                                     final int offsetX = interpolator.getXMin() - layerRegion.x;
                                     final int offsetY = interpolator.getYMin() - layerRegion.y;
 
@@ -292,7 +305,7 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                                     final float c11 = subset.getFloat(subsetIndex);
 
                                     final double interpolate = interpolator.interpolate(c00, c01, c10, c11);
-                                    targetIndex.set(m, z, y, x);
+
                                     targetArray.setFloat(targetIndex, (float) interpolate);
                                 }
                             }
diff --git a/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/TemplateVariable.java b/post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/TemplateVariable.java
@@ -20,7 +20,7 @@ class TemplateVariable {
         this.is3d = is3d;
     }
 
-    float getFillValue() {
+    static float getFillValue() {
         return FILL_VALUE;
     }
 
diff --git a/post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessingTest.java b/post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessingTest.java
@@ -6,8 +6,7 @@
 
 import java.awt.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 public class Era5PostProcessingTest {
 
@@ -68,7 +67,7 @@ public void testGetInterpolationContext_singlePixel() {
     }
 
     @Test
-    public void testgetEra5Collection_fromConfig() {
+    public void testGetEra5Collection_fromConfig() {
         final Configuration configuration = new Configuration();
         configuration.setNWPAuxDir("/yamas/strange/path");
         configuration.setEra5Collection("Hamasuki");
@@ -78,7 +77,7 @@ public void testgetEra5Collection_fromConfig() {
     }
 
     @Test
-    public void testgetEra5Collection_fromPath_unknown() {
+    public void testGetEra5Collection_fromPath_unknown() {
         final Configuration configuration = new Configuration();
         configuration.setNWPAuxDir("/yamas/strange/path");
 
@@ -87,7 +86,7 @@ public void testgetEra5Collection_fromPath_unknown() {
     }
 
     @Test
-    public void testgetEra5Collection_fromPath() {
+    public void testGetEra5Collection_fromPath() {
         final Configuration configuration = new Configuration();
 
         configuration.setNWPAuxDir("/data/era5");
@@ -133,4 +132,24 @@ public void testGetLatMin() {
         assertEquals(448, Era5PostProcessing.getEra5LatMin(-22.19f));
         assertEquals(719, Era5PostProcessing.getEra5LatMin(-89.95f));
     }
+
+    @Test
+    public void testIsValidLon() {
+        assertTrue(Era5PostProcessing.isValidLon(12.8f));
+        assertTrue(Era5PostProcessing.isValidLon(-176.3f));
+
+        assertFalse(Era5PostProcessing.isValidLon(1087f));
+        assertFalse(Era5PostProcessing.isValidLon(9.96921E36f));
+        assertFalse(Era5PostProcessing.isValidLon(Float.NaN));
+    }
+
+    @Test
+    public void testIsValidLat() {
+        assertTrue(Era5PostProcessing.isValidLat(33.9f));
+        assertTrue(Era5PostProcessing.isValidLat(-76.3f));
+
+        assertFalse(Era5PostProcessing.isValidLat(-92.6f));
+        assertFalse(Era5PostProcessing.isValidLat(9.96921E36f));
+        assertFalse(Era5PostProcessing.isValidLat(Float.NaN));
+    }
 }
diff --git a/post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/InterpolationContextTest.java b/post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/InterpolationContextTest.java
@@ -4,21 +4,15 @@
 
 import java.awt.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 public class InterpolationContextTest {
 
     @Test
     public void testConstructEmpty() {
         final InterpolationContext context = new InterpolationContext(3, 5);
 
-        try {
-            context.get(1, 2);
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException expected) {
-        }
+        assertNull(context.get(1, 2));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TemplateVariable {`
`20`	`20`	`this.is3d = is3d;`
`21`	`21`	`}`
`22`	`22`
`23`		`- float getFillValue() {`
	`23`	`+ static float getFillValue() {`
`24`	`24`	`return FILL_VALUE;`
`25`	`25`	`}`
`26`	`26`