Infer VortexDataType if type is UNDEFINED

Tom Brauer · Tom Brauer · commit 43d405f66650 · 2024-11-29T08:47:55.000-08:00
In VortexGrid::dataType infer the data type if the current type is undefined.
diff --git a/vortex-api/src/main/java/mil/army/usace/hec/vortex/VortexGrid.java b/vortex-api/src/main/java/mil/army/usace/hec/vortex/VortexGrid.java
@@ -315,7 +315,7 @@ public Duration interval() {
     }
 
     public VortexDataType dataType() {
-        return dataType != null ? dataType : inferDataType();
+        return dataType != null && dataType != VortexDataType.UNDEFINED ? dataType : inferDataType();
     }
 
     public float[][][] data3D() {

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public Duration interval() {`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`public VortexDataType dataType() {`
`318`		`- return dataType != null ? dataType : inferDataType();`
	`318`	`+ return dataType != null && dataType != VortexDataType.UNDEFINED ? dataType : inferDataType();`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`public float[][][] data3D() {`