Skip to content
Snippets Groups Projects
Commit 2fd60753 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

Update to return reader

parent dab59967
No related branches found
No related tags found
2 merge requests!96Production Release | nshmp-ws-static,!94Dynamic indices
......@@ -11,6 +11,7 @@ import gov.usgs.earthquake.nshmp.netcdf.data.BoundingData;
import gov.usgs.earthquake.nshmp.netcdf.data.NetcdfData;
import gov.usgs.earthquake.nshmp.netcdf.data.NetcdfShape;
import gov.usgs.earthquake.nshmp.netcdf.data.StaticData;
import gov.usgs.earthquake.nshmp.netcdf.reader.Reader;
/**
* Abstarct class for NetCDF types: hazard curves and ground motions.
......@@ -39,8 +40,9 @@ public abstract class Netcdf<T> {
}
dataType = NetcdfDataType.getDataType(netcdfPath);
netcdfData = getNetcdfData(netcdfPath);
netcdfShape = buildNetcdfShape();
var reader = getNetcdfData(netcdfPath);
netcdfData = reader.netcdfData();
netcdfShape = reader.netcdfShape();
}
/**
......@@ -91,7 +93,5 @@ public abstract class Netcdf<T> {
*/
public abstract T staticData(Location site, NehrpSiteClass siteClass);
abstract NetcdfShape buildNetcdfShape();
abstract NetcdfData getNetcdfData(Path netcdfPath);
abstract Reader getNetcdfData(Path netcdfPath);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment