diff --git a/gradle.properties b/gradle.properties index 7d1f97a19d19aece332aac8b05f8a0430b4d30a3..e032ed5c7248ce7be883ba92d40ba11663bb4acb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ micronautVersion = 3.2.3 micronautRxVersion = 2.1.1 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 -nshmpLibVersion = 1.3.1 +nshmpLibVersion = 1.3.2 nshmpWsUtilsVersion = 0.3.11 openApiVersion = 4.0.0 shadowVersion = 7.1.2 diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java index 921cce17f15e4bcae871255cb0aa8bc86cf49b27..87e61aa9529bcf70be4d635fb9c6d6e12f0fd559 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java @@ -31,8 +31,8 @@ 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 +140,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 +196,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;