xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #4707 Store double values as floats." into omaha_16.2.1

Browse source 
Former-commit-id: f2886135b15a0b924f34f98b8c2c65db8239abda
This commit is contained in:
Richard Peter 2015-09-08 09:05:51 -05:00 • committed by Gerrit Code Review
commit 2b17d4a25b
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/PointSetNetcdfDecoder.java
View file

@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.Buffer; import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.DoubleBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.LongBuffer; import java.nio.LongBuffer;
@ -260,8 +259,18 @@ public class PointSetNetcdfDecoder {
fillValue = fillAttribute.getNumericValue(); fillValue = fillAttribute.getNumericValue();
} }
switch (dataType) { switch (dataType) {
case DOUBLE:
/*
* At this point in time(2015) there are no known cases of data
* being sent as a double and actually needing the extra precision,
* also not all pieces of CAVE currently support doubles so the
* precision would not be needed anyway. AMSR-2 derived surface wind
* speed is being needlessly sent as doubles. Because of all this,
* just convert doubles to floats.
*/
case FLOAT: case FLOAT:
float[] fdata = (float[]) dataVariable.read().copyTo1DJavaArray(); float[] fdata = (float[]) dataVariable.read().get1DJavaArray(
float.class);
if (fillValue != null) { if (fillValue != null) {
float ffill = fillValue.floatValue(); float ffill = fillValue.floatValue();
for (int i = 0; i < fdata.length; i += 1) { for (int i = 0; i < fdata.length; i += 1) {
@ -273,31 +282,22 @@ public class PointSetNetcdfDecoder {
numericData = FloatBuffer.wrap(fdata); numericData = FloatBuffer.wrap(fdata);
break; break;
case BYTE: case BYTE:
byte[] bdata = (byte[]) dataVariable.read().copyTo1DJavaArray(); byte[] bdata = (byte[]) dataVariable.read().get1DJavaArray(
byte.class);
numericData = ByteBuffer.wrap(bdata); numericData = ByteBuffer.wrap(bdata);
break; break;
case SHORT: case SHORT:
short[] sdata = (short[]) dataVariable.read().copyTo1DJavaArray(); short[] sdata = (short[]) dataVariable.read().get1DJavaArray(
short.class);
numericData = ShortBuffer.wrap(sdata); numericData = ShortBuffer.wrap(sdata);
break; break;
case DOUBLE:
double[] ddata = (double[]) dataVariable.read().copyTo1DJavaArray();
if (fillValue != null) {
double dfill = fillValue.doubleValue();
for (int i = 0; i < ddata.length; i += 1) {
if (ddata[i] == dfill) {
ddata[i] = Double.NaN;
}
}
}
numericData = DoubleBuffer.wrap(ddata);
break;
case INT: case INT:
int[] idata = (int[]) dataVariable.read().copyTo1DJavaArray(); int[] idata = (int[]) dataVariable.read().get1DJavaArray(int.class);
numericData = IntBuffer.wrap(idata); numericData = IntBuffer.wrap(idata);
break; break;
case LONG: case LONG:
long[] ldata = (long[]) dataVariable.read().copyTo1DJavaArray(); long[] ldata = (long[]) dataVariable.read().get1DJavaArray(
long.class);
numericData = LongBuffer.wrap(ldata); numericData = LongBuffer.wrap(ldata);
break; break;
default: default: