From 1df172e2cb4afbdc3ef88dc3edba9001caee5c2b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 2 Mar 2022 14:58:25 -0700
Subject: [PATCH 1/2] lib increment and cleaning
---
gradle.properties | 2 +-
src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index bc1f8a0e2..b71523789 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ micronautRxVersion = 2.1.1
micronautPluginVersion = 3.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 0.9.10
+nshmpLibVersion = 0.9.11
nshmpWsUtilsVersion = 0.1.7
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
index f9fc796fb..d893b3a1c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
@@ -12,7 +12,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.OptionalDouble;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
@@ -177,7 +176,7 @@ public class HazardCalc {
CalcConfig config,
List<Site> sites,
Path out,
- Logger log) throws IOException, InterruptedException, ExecutionException {
+ Logger log) throws IOException {
int threadCount = config.performance.threadCount.value();
final ExecutorService exec = initExecutor(threadCount);
--
GitLab
From 65eb70ca4f416106050198bbc5fdcc8fea277656 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 2 Mar 2022 15:11:53 -0700
Subject: [PATCH 2/2] site-data changes from lib
---
.../java/gov/usgs/earthquake/nshmp/DisaggCalc.java | 9 +++++++--
.../java/gov/usgs/earthquake/nshmp/HazardCalc.java | 10 +++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index b54668199..9d9087042 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
@@ -52,6 +52,7 @@ import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.internal.Logging;
import gov.usgs.earthquake.nshmp.model.HazardModel;
+import gov.usgs.earthquake.nshmp.model.SiteData;
/**
* Disaggregate probabilistic seismic hazard at a return period of interest or
@@ -165,7 +166,10 @@ public class DisaggCalc {
: OptionalDouble.empty();
/* Sites */
- List<Site> sites = Sites.fromCsv(siteFile, model.siteData(), vs30);
+ SiteData siteData = config.hazard.useSiteData
+ ? model.siteData()
+ : SiteData.EMPTY;
+ List<Site> sites = Sites.fromCsv(siteFile, siteData, vs30);
log.info("Sites: " + sites.size());
Set<Imt> modelImts = model.config().hazard.imts;
@@ -288,7 +292,8 @@ public class DisaggCalc {
log.info(PROGRAM + " (return period): calculating ...");
- HazardExport handler = HazardExport.create(model, config, sites, out);
+ boolean namedSites = sites.get(0).name() != Site.NO_NAME;
+ HazardExport handler = HazardExport.create(model, config, namedSites, out);
Path disaggDir = out.resolve("disagg");
Files.createDirectory(disaggDir);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
index d893b3a1c..6b26713ef 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
@@ -110,10 +110,13 @@ public class HazardCalc {
log.info("");
Path out = createOutputDir(config.output.directory);
+ SiteData siteData = config.hazard.useSiteData
+ ? model.siteData()
+ : SiteData.EMPTY;
if (config.hazard.vs30s.isEmpty()) {
- List<Site> sites = readSites(args[1], model.siteData(), OptionalDouble.empty(), log);
+ List<Site> sites = readSites(args[1], siteData, OptionalDouble.empty(), log);
log.info("Sites: " + Sites.toString(sites));
calc(model, config, sites, out, log);
@@ -121,7 +124,7 @@ public class HazardCalc {
for (double vs30 : config.hazard.vs30s) {
log.info("Vs30 batch: " + vs30);
- List<Site> sites = readSites(args[1], model.siteData(), OptionalDouble.of(vs30), log);
+ List<Site> sites = readSites(args[1], siteData, OptionalDouble.of(vs30), log);
log.info("Sites: " + Sites.toString(sites));
Path vs30dir = out.resolve("vs30-" + ((int) vs30));
Files.createDirectory(vs30dir);
@@ -183,7 +186,8 @@ public class HazardCalc {
log.info("Threads: " + ((ThreadPoolExecutor) exec).getCorePoolSize());
log.info(PROGRAM + ": calculating ...");
- HazardExport handler = HazardExport.create(model, config, sites, out);
+ boolean namedSites = sites.get(0).name() != Site.NO_NAME;
+ HazardExport handler = HazardExport.create(model, config, namedSites, out);
Stopwatch stopwatch = Stopwatch.createStarted();
int logInterval = sites.size() < 100 ? 1 : sites.size() < 1000 ? 10 : 100;
--
GitLab