corrected dimension reducing

Author: TomBlock

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java

@@ -66,8 +66,8 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
             // - get variable
             // - get data array
             final int numMatches = NetCDFUtils.getDimensionLength(FiduceoConstants.MATCHUP_COUNT, reader);
-            final int[] nwpShape = new int[]{1};
-            final int[] nwpOffset = new int[]{0};
+            final int[] nwpShape = new int[]{1, 1, 1};
+            final int[] nwpOffset = new int[]{0, 0, 0};
             final Index timeIndex = targetTimeArray.getIndex();
             final Set<String> variableKeys = variables.keySet();
             final HashMap<String, Array> targetArrays = allocateTargetData(writer, variables);
@@ -80,8 +80,8 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                 for (int m = 0; m < numMatches; m++) {
                     nwpOffset[0] = m;
 
-                    final Array lonLayer = lonArray.section(nwpOffset, nwpShape).reduce();
-                    final Array latLayer = latArray.section(nwpOffset, nwpShape).reduce();
+                    final Array lonLayer = lonArray.section(nwpOffset, nwpShape);
+                    final Array latLayer = latArray.section(nwpOffset, nwpShape);
 
                     final InterpolationContext interpolationContext = Era5PostProcessing.getInterpolationContext(lonLayer, latLayer);
                     final Rectangle layerRegion = interpolationContext.getEra5Region();
@@ -94,6 +94,7 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                         final int timeStamp = targetTimeArray.getInt(timeIndex);
                         final Variable variable = variableCache.get(variableKey, timeStamp);
 
+                        // read and get rid of fake z-dimension
                         Array subset = variable.read(offset, shape).reduce();
                         subset = NetCDFUtils.scaleIfNecessary(variable, subset);
                         final Index subsetIndex = subset.getIndex();

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/VariableUtils.java

@@ -113,7 +113,7 @@ static Array readGeolocationVariable(com.bc.fiduceo.core.Dimension dimension, Ne
             final MAMath.ScaleOffset scaleOffset = new MAMath.ScaleOffset(scaleFactor, addOffset);
             rawData = MAMath.convert2Unpacked(rawData, scaleOffset);
         }
-        return rawData.reduce();
+        return rawData;
     }
 
     static HashMap<String, Array> allocateTargetData(NetcdfFileWriter writer, Map<String, TemplateVariable> variables) {