Skip to content
Snippets Groups Projects

Increment lib site fix

21 files
+ 982
968
Compare changes
  • Side-by-side
  • Inline
Files
21
@@ -31,6 +31,7 @@ import gov.usgs.earthquake.nshmp.calc.Hazard;
import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
import io.swagger.v3.core.util.Yaml;
@@ -140,7 +141,10 @@ class NshmTestUtils {
private static Map<String, XySequence> generateActual(
NshmModel nshmModel,
NamedLocation location) {
Site site = Site.builder().location(location.location()).build();
Site site = createSite(
location.location(),
nshmModel.model.siteData());
CalcConfig config = CalcConfig.copyOf(nshmModel.model.config())
.imts(nshmModel.nshm.imts())
@@ -193,6 +197,16 @@ class NshmTestUtils {
Files.write(resultPath, json.getBytes());
}
private static Site createSite(Location loc, SiteData siteData) {
Site.Builder builder = Site.builder().location(loc);
SiteData.Values values = siteData.get(loc);
values.z1p0.ifPresent(builder::z1p0);
values.z2p5.ifPresent(builder::z2p5);
values.zSed.ifPresent(builder::zSed);
builder.gmmTrees(values.gmmTrees);
return builder.build();
}
private static class Curve {
double[] xs;
double[] ys;
Loading