From f4bde7d648c61e22fd4ed3170f00fc3eb5b3464b Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Wed, 3 Nov 2021 11:58:35 -0600 Subject: [PATCH] site string fix for logging --- src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java | 3 ++- src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java | 2 +- src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java index 4c8224c72..3719b7301 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java @@ -23,6 +23,7 @@ import gov.usgs.earthquake.nshmp.calc.Hazard; import gov.usgs.earthquake.nshmp.calc.HazardCalcs; import gov.usgs.earthquake.nshmp.calc.HazardExport; import gov.usgs.earthquake.nshmp.calc.Site; +import gov.usgs.earthquake.nshmp.calc.Sites; import gov.usgs.earthquake.nshmp.calc.ThreadCount; import gov.usgs.earthquake.nshmp.internal.Logging; import gov.usgs.earthquake.nshmp.model.HazardModel; @@ -98,7 +99,7 @@ public class DisaggCalc { log.info(""); List<Site> sites = HazardCalc.readSites(args[1], config, model.siteData(), log); - log.info("Sites: " + sites); + log.info("Sites: " + Sites.toString(sites)); double returnPeriod = config.disagg.returnPeriod; diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java index 8218dc569..9773931f4 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java @@ -109,7 +109,7 @@ public class HazardCalc { log.info(""); List<Site> sites = readSites(args[1], config, model.siteData(), log); - log.info("Sites: " + sites); + log.info("Sites: " + Sites.toString(sites)); Path out = calc(model, config, sites, log); diff --git a/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java index b923a90b8..8c59131d9 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java @@ -27,6 +27,7 @@ import gov.usgs.earthquake.nshmp.calc.CalcConfig; import gov.usgs.earthquake.nshmp.calc.EqRate; import gov.usgs.earthquake.nshmp.calc.EqRateExport; import gov.usgs.earthquake.nshmp.calc.Site; +import gov.usgs.earthquake.nshmp.calc.Sites; import gov.usgs.earthquake.nshmp.calc.ThreadCount; import gov.usgs.earthquake.nshmp.internal.Logging; import gov.usgs.earthquake.nshmp.model.HazardModel; @@ -107,7 +108,7 @@ public class RateCalc { log.info(""); List<Site> sites = HazardCalc.readSites(args[1], config, model.siteData(), log); - log.info("Sites: " + sites); + log.info("Sites: " + Sites.toString(sites)); Path out = calc(model, config, sites, log); log.info(PROGRAM + ": finished"); -- GitLab