From a9a2b4dfc634f81ab8fed6d847efc4dd567db974 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 8 Feb 2022 14:55:45 -0700
Subject: [PATCH] bathc logging improvements
---
.../gov/usgs/earthquake/nshmp/DisaggCalc.java | 16 +++++++++-------
.../gov/usgs/earthquake/nshmp/HazardCalc.java | 9 +++++----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index 1250ee5b8..2b268e5b9 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
@@ -280,7 +280,7 @@ public class DisaggCalc {
log.info(PROGRAM + " (return period): calculating ...");
- HazardExport handler = HazardExport.create(model, config, sites, log);
+ HazardExport handler = HazardExport.create(model, config, sites);
Path disaggDir = handler.outputDir().resolve("disagg");
Files.createDirectory(disaggDir);
@@ -310,17 +310,18 @@ public class DisaggCalc {
GSON.toJson(response, writer);
writer.close();
- if (i % logInterval == 0) {
+ int count = i + 1;
+ if (count % logInterval == 0) {
log.info(String.format(
" %s of %s sites completed in %s",
- i + 1, sites.size(), stopwatch));
+ count, sites.size(), stopwatch));
}
}
handler.expire();
log.info(String.format(
PROGRAM + " (return period): %s sites completed in %s",
- handler.resultCount(), handler.elapsedTime()));
+ sites.size(), stopwatch.stop()));
exec.shutdown();
return handler.outputDir();
@@ -396,16 +397,17 @@ public class DisaggCalc {
GSON.toJson(response, writer);
writer.close();
- if (i % logInterval == 0) {
+ int count = i + 1;
+ if (count % logInterval == 0) {
log.info(String.format(
" %s of %s sites completed in %s",
- i + 1, sites.size(), stopwatch));
+ count, sites.size(), stopwatch));
}
}
log.info(String.format(
PROGRAM + " (IML): %s sites completed in %s",
- sites.size(), stopwatch));
+ sites.size(), stopwatch.stop()));
exec.shutdown();
return outDir;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
index 9815cc2b2..3342bca22 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
@@ -172,7 +172,7 @@ public class HazardCalc {
log.info("Threads: " + ((ThreadPoolExecutor) exec).getCorePoolSize());
log.info(PROGRAM + ": calculating ...");
- HazardExport handler = HazardExport.create(model, config, sites, log);
+ HazardExport handler = HazardExport.create(model, config, sites);
CalcTask.Builder calcTask = new CalcTask.Builder(model, config, exec);
WriteTask.Builder writeTask = new WriteTask.Builder(handler);
@@ -184,10 +184,11 @@ public class HazardCalc {
Site site = sites.get(i);
Hazard hazard = calcTask.withSite(site).call();
out = exec.submit(writeTask.withResult(hazard));
- if (i % logInterval == 0) {
+ int count = i + 1;
+ if (count % logInterval == 0) {
log.info(String.format(
" %s of %s sites completed in %s",
- i + 1, sites.size(), stopwatch));
+ count, sites.size(), stopwatch));
}
}
/* Block shutdown until last task is returned. */
@@ -197,7 +198,7 @@ public class HazardCalc {
exec.shutdown();
log.info(String.format(
PROGRAM + ": %s sites completed in %s",
- handler.resultCount(), handler.elapsedTime()));
+ handler.resultCount(), stopwatch.stop()));
return outputDir;
}
--
GitLab