Skip to content

Allow non-VariableDS variables with lat/lon dimensions #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tombrauer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow non-VariableDS variables with lat/lon dimensions #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions vortex-api/src/main/java/mil/army/usace/hec/vortex/io/NetcdfDataReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ public static Set<String> getVariables(String path) {
if (isSelectableVariable(variable)) {
VariableDS variableDS = (VariableDS) variable;
List<CoordinateSystem> coordinateSystems = variableDS.getCoordinateSystems();

boolean isLatLon = ncd.findCoordinateAxis(AxisType.Lon) != null
&& ncd.findCoordinateAxis(AxisType.Lat) != null;

if (!coordinateSystems.isEmpty() || isLatLon) {
if (!coordinateSystems.isEmpty()) {
variableNames.add(variable.getFullName());
}
}
Expand Down Expand Up @@ -126,8 +122,10 @@ private static boolean isLatLon(NetcdfDataset ncd) {

private static boolean isSelectableVariable(Variable variable) {
boolean isVariableDS = variable instanceof VariableDS;
boolean isNotAxis = !(variable instanceof CoordinateAxis);
return isVariableDS && isNotAxis;
boolean isLatLon = variable.findDimensionIndex("latitude") >= 0
&& variable.findDimensionIndex("longitude") >= 0;

return isVariableDS || isLatLon;
}

static Grid scaleGrid(Grid grid, Unit<?> cellUnits, Unit<?> csUnits) {
Expand Down