Skip to content

grib2: do not emit Grib2_Statistical_Process_Type attribute when Variable has no intervals #1602

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
lesserwhirls merged 1 commit into from
Sep 15, 2026
Merged

grib2: do not emit Grib2_Statistical_Process_Type attribute when Variable has no intervals #1602

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: 2 additions & 2 deletions grib/src/main/java/ucar/nc2/grib/collection/Grib2Collection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ else if (vindex.getProbabilityName() != null && !vindex.getProbabilityName().isE
v.addAttribute(new Attribute("Grib2_Generating_Process_Type", vindex.getGenProcessType()));
}

String statType = cust2.getStatisticName(vindex.getIntvType());
if (statType != null) {
if (vindex.getIntvType() >= 0) {
String statType = cust2.getStatisticName(vindex.getIntvType());
v.addAttribute(new Attribute("Grib2_Statistical_Process_Type", statType));
}

Expand Down
22 changes: 7 additions & 15 deletions grib/src/main/java/ucar/nc2/grib/collection/Grib2Iosp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ static String makeVariableNameFromTable(Grib2Tables cust, GribCollectionImmutabl

if (vindex.getIntvType() >= 0) {
String statName = cust.getStatisticNameShort(vindex.getIntvType());
if (statName != null) {
f.format("_%s", statName);
}
f.format("_%s", statName);
}

if (vindex.getSpatialStatisticalProcessType() >= 0) {
Expand Down Expand Up @@ -109,20 +107,14 @@ static String makeVariableLongName(Grib2Tables cust, GribCollectionImmutable.Var
f.format("%s", gp.getName());
}

if (vindex.getIntvType() >= 0 && vindex.getIntvName() != null && !vindex.getIntvName().isEmpty()) {
String intvName = cust.getStatisticNameShort(vindex.getIntvType());
if (intvName == null || intvName.equalsIgnoreCase("Missing")) {
intvName = cust.getStatisticNameShort(vindex.getIntvType());
}
if (intvName == null) {
f.format(" (%s)", vindex.getIntvName());
if (vindex.getIntvType() >= 0) {
String intvName = vindex.getIntvName();
String statName = cust.getStatisticNameShort(vindex.getIntvType());
if (intvName != null && !intvName.isEmpty()) {
f.format(" (%s %s)", intvName, statName);
} else {
f.format(" (%s %s)", vindex.getIntvName(), intvName);
f.format(" (%s)", statName);
}

} else if (vindex.getIntvType() >= 0) {
String intvName = cust.getStatisticNameShort(vindex.getIntvType());
f.format(" (%s)", intvName);
}
Comment thread
lesserwhirls marked this conversation as resolved.

if (vindex.getSpatialStatisticalProcessType() >= 0) {
Expand Down
3 changes: 3 additions & 0 deletions grib/src/main/java/ucar/nc2/grib/grib2/table/FslHrrrLocalTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.nio.charset.StandardCharsets;
import ucar.nc2.grib.GribTables;
import ucar.nc2.grib.grib2.Grib2Parameter;

import javax.annotation.Nonnull;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -105,6 +107,7 @@ public String getLevelName(int id) {
return super.getLevelName(id);
}

@Nonnull
public String getStatisticNameShort(int id) {
if (id == 255) {
return "Interval";
Expand Down
6 changes: 5 additions & 1 deletion grib/src/main/java/ucar/nc2/grib/grib2/table/Grib2Tables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
package ucar.nc2.grib.grib2.table;

import com.google.common.collect.ImmutableList;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import thredds.featurecollection.TimeUnitConverter;
import ucar.nc2.grib.GribNumbers;
Expand Down Expand Up @@ -236,6 +238,7 @@ public String getCategory(int discipline, int category) {
return (entry == null) ? null : entry.getName();
}

@Nonnull
public String getStatisticName(int id) {
String result = getCodeTableValue("4.10", id); // WMO
if (result == null) {
Expand All @@ -244,9 +247,10 @@ public String getStatisticName(int id) {
return result;
}

@Nonnull
public String getStatisticNameShort(int id) {
GribStatType stat = GribStatType.getStatTypeFromGrib2(id);
return (stat == null) ? "UnknownStatType-" + id : stat.toString();
return (stat == null) ? String.format("UnknownStatType%d", id) : stat.toString();
}
Comment thread
lesserwhirls marked this conversation as resolved.

@Override
Expand Down
14 changes: 8 additions & 6 deletions grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
package ucar.nc2.grib.grib2.table;

import com.google.common.collect.ImmutableList;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.jdom2.Element;
import org.jdom2.JDOMException;
Expand Down Expand Up @@ -298,6 +300,7 @@ public String getLevelNameShort(int id) {
//////////////////////////////////////////////////////////////

@Override
@Nonnull
public String getStatisticNameShort(int id) {
switch (id) {
case 192:
Expand Down Expand Up @@ -381,18 +384,17 @@ public GribStatType getStatType(int id) {
private static Map<Integer, String> statName; // shared by all instances

@Override
@Nullable
@Nonnull
public String getStatisticName(int id) {
if (id < 192)
return super.getStatisticName(id);
if (statName == null)
statName = initTable410();
if (statName == null)
return null;
return statName.get(id);
String result = statName.get(id);
return result != null ? result : getStatisticNameShort(id);
}
Comment thread
lesserwhirls marked this conversation as resolved.

@Nullable
@Nonnull
private Map<Integer, String> initTable410() {
String path = config.getPath() + "Table4.10.xml";
try (InputStream is = GribResourceReader.getInputStream(path)) {
Expand All @@ -412,7 +414,7 @@ private Map<Integer, String> initTable410() {

} catch (IOException | JDOMException ioe) {
logger.error("Cant read " + path, ioe);
return null;
return Collections.emptyMap();
}
}

Expand Down
Binary file added grib/src/test/data/gfs.t00z.pgrb2.1p00.f003
View file
Open in desktop
Binary file not shown.
39 changes: 39 additions & 0 deletions grib/src/test/java/ucar/nc2/grib/grib2/TestPdsInterval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package ucar.nc2.grib.grib2;

import org.junit.Test;
import ucar.nc2.Attribute;
import ucar.nc2.NetcdfFile;
import ucar.nc2.NetcdfFiles;
import ucar.nc2.Variable;

import javax.annotation.Nullable;
import java.io.IOException;

import static com.google.common.truth.Truth.assertThat;

public class TestPdsInterval {

private static void assertStatType(@Nullable Variable v, String expected) {
Attribute grib2StatType = v.findAttribute("Grib2_Statistical_Process_Type");
assertThat(grib2StatType.getStringValue()).isEqualTo(expected);
}

@Test
public void testStatisticalProcessTypeAttributeExists() throws IOException {
try (NetcdfFile nc = NetcdfFiles.open("../grib/src/test/data/gfs.t00z.pgrb2.1p00.f003")) {
assertStatType(nc.findVariable("Albedo_surface_3_Hour_Average"), "Average");
assertStatType(nc.findVariable("Maximum_temperature_height_above_ground_3_Hour_Maximum"), "Maximum");
assertStatType(nc.findVariable("Minimum_temperature_height_above_ground_3_Hour_Minimum"), "Minimum");
assertStatType(nc.findVariable("Total_precipitation_surface_3_Hour_Accumulation"), "Accumulation");
}
}

@Test
public void testStatisticalProcessTypeAttributeNotPresent() throws IOException {
try (NetcdfFile nc = NetcdfFiles.open("../grib/src/test/data/gfs.t00z.pgrb2.1p00.f003")) {
Variable v = nc.findVariable("Convective_available_potential_energy_surface");
assertThat(v.findAttribute("Grib2_Statistical_Process_Type")).isNull();
}
}

}