Skip to content

Add support for EDDGridFromNcFiles to have variables with different dimensions #401

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

Merged
ChrisJohnNOAA merged 1 commit into from
Dec 4, 2025
Merged

Add support for EDDGridFromNcFiles to have variables with different dimensions #401

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGridFromNcLow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ private boolean hasDimensionByName(List<Dimension> dims, EDVGridAxis axis, List<
if ((var.getFullName().equals(axis.sourceName())
|| var.getFullName().equals(axis.destinationName()))
&& var.getDimensions().size() == 1) {
return true;
if (dims.indexOf(var.getDimension(0)) != -1) {
return true;
}
}
}
return false;
Expand Down
22 changes: 15 additions & 7 deletions WEB-INF/classes/gov/noaa/pfel/erddap/dataset/GridDataAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,11 @@ public PAOne getAxisValueAsPAOne(int av, PAOne paOne) {
* @return paOne, for convenience
*/
public PAOne getDataValueAsPAOne(int dv, PAOne paOne) {
return paOne.readFrom(
partialDataValues[dv],
(int) partialIndex.getIndex()); // safe since partialIndex size checked when constructed
int index = (int) partialIndex.getIndex();
if (partialDataValues[dv].size() <= index) {
return paOne.readFrom(partialDataValues[dv].missingValue());
}
return paOne.readFrom(partialDataValues[dv], index);
}

/**
Expand All @@ -815,8 +817,11 @@ public PAOne getDataValueAsPAOne(int dv, PAOne paOne) {
* @return the data value
*/
public double getDataValueAsDouble(int dv) {
return partialDataValues[dv].getDouble(
(int) partialIndex.getIndex()); // safe since partialIndex size checked when constructed
int index = (int) partialIndex.getIndex();
if (partialDataValues[dv].size() <= index) {
return partialDataValues[dv].missingValue().getDouble();
}
return partialDataValues[dv].getDouble(index);
}

/**
Expand All @@ -827,8 +832,11 @@ public double getDataValueAsDouble(int dv) {
* @return the data value
*/
public String getDataValueAsString(int dv) {
return partialDataValues[dv].getString(
(int) partialIndex.getIndex()); // safe since partialIndex size checked when constructed
int index = (int) partialIndex.getIndex();
if (partialDataValues[dv].size() <= index) {
return partialDataValues[dv].missingValue().getString();
}
return partialDataValues[dv].getString(index);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<erddapcontent.download.version>content1.0.1</erddapcontent.download.version>
<erddapreffiles.download.version>1.0.0</erddapreffiles.download.version>
<netcdfJavaVersion>5.9.1</netcdfJavaVersion>
<test.resources.version>test1.05</test.resources.version>
<test.resources.version>test1.06</test.resources.version>
<jettyVersion>12.1.3</jettyVersion>
<error-prone.version>2.41.0</error-prone.version>
<prometheusVersion>1.4.1</prometheusVersion>
Expand Down
Loading