Skip to content
Snippets Groups Projects
Commit 010047ce authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

increment lib; disagg epsilon edits

parent 7ce8d406
No related branches found
No related tags found
2 merge requests!593Production Release | nshm-haz,!585App work
......@@ -10,7 +10,7 @@ micronautRxVersion = 2.1.1
micronautPluginVersion = 3.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmpLibVersion = 0.9.0
nshmpLibVersion = 0.9.1
nshmpWsUtilsVersion = 0.1.7
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
......
......@@ -32,6 +32,7 @@ import com.google.gson.GsonBuilder;
import gov.usgs.earthquake.nshmp.calc.CalcConfig;
import gov.usgs.earthquake.nshmp.calc.Disaggregation;
import gov.usgs.earthquake.nshmp.calc.Disaggs;
import gov.usgs.earthquake.nshmp.calc.Hazard;
import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
import gov.usgs.earthquake.nshmp.calc.Site;
......@@ -251,6 +252,7 @@ public class DisaggEpsilon {
Site site = sites.get(i);
Map<Imt, Double> spectrum = rtrSpectra.get(i);
// use IMLs from site spectra
Hazard hazard = HazardCalcs.hazard(model, config, site, exec);
Disaggregation disagg = Disaggregation.atImls(hazard, spectrum, exec);
......@@ -261,7 +263,9 @@ public class DisaggEpsilon {
site,
imt,
spectrum.get(imt));
Response response = new Response(imtMetadata, disagg.toJsonCompact(imt));
Response response = new Response(
imtMetadata,
Disaggs.resultWithGmmAndType(disagg, imt));
responses.add(response);
}
Result result = new Result(responses);
......
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