From e4ed979fb2780296d1075d4d015fd46088155276 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Tue, 8 Feb 2022 10:08:49 -0700 Subject: [PATCH] readme edits --- etc/examples/2-custom-config/README.md | 16 +++++++++++----- etc/examples/3-sites-file/README.md | 12 +++++++++--- .../gov/usgs/earthquake/nshmp/HazardMaps.java | 6 +++--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/etc/examples/2-custom-config/README.md b/etc/examples/2-custom-config/README.md index b0ddba75a..fee21af31 100644 --- a/etc/examples/2-custom-config/README.md +++ b/etc/examples/2-custom-config/README.md @@ -18,7 +18,7 @@ In this example we've overridden the configuration supplied by the model. Specif * The `imls` (intensity measure levels or x-values) of the resultant curves have been explicitely defined for each `imt`. -See the [configuration specification]../../../docs/pages/Calculation-Configuration.md) +See the [configuration specification](../../../docs/pages/Calculation-Configuration.md) for details on default values and supported options and formats. __Results directory structure:__ @@ -26,14 +26,20 @@ __Results directory structure:__ ```text 2-custom-config/ └─ hazout/ - ├─ config.json + ├─ calc-config.json ├─ HazardCalc.log ├─ PGA/ - │ └─ curves.csv + │ ├─ curves.csv + │ ├─ curves-truncated.csv + │ └─ map.csv ├─ SA0P2/ - │ └─ curves.csv + │ ├─ curves.csv + │ ├─ curves-truncated.csv + │ └─ map.csv └─ SA1P0/ - └─ curves.csv + ├─ curves.csv + ├─ curves-truncated.csv + └─ map.csv ``` <!-- markdownlint-disable MD001 --> diff --git a/etc/examples/3-sites-file/README.md b/etc/examples/3-sites-file/README.md index 2db9bb997..97139d49d 100644 --- a/etc/examples/3-sites-file/README.md +++ b/etc/examples/3-sites-file/README.md @@ -27,11 +27,17 @@ __Results directory structure:__ ├─ config.json ├─ HazardCalc.log ├─ PGA/ - │ └─ curves.csv + │ ├─ curves.csv + │ ├─ curves-truncated.csv + │ └─ map.csv ├─ SA0P2/ - │ └─ curves.csv + │ ├─ curves.csv + │ ├─ curves-truncated.csv + │ └─ map.csv └─ SA1P0/ - └─ curves.csv + ├─ curves.csv + ├─ curves-truncated.csv + └─ map.csv ``` <!-- markdownlint-disable MD001 --> diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java index 976bebc16..b4580ef94 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java @@ -86,9 +86,9 @@ public class HazardMaps { Path curvesPath, List<Integer> returnPeriods, Logger log) throws IOException { - log.info(PROGRAM + ": Creating hazard map dataset:"); - log.info("\tReturn periods: " + returnPeriods.toString()); - log.info("\tPath: " + curvesPath.toAbsolutePath().toString()); + log.info(PROGRAM + ": Creating hazard map datasets..."); + log.info(" Return periods: " + returnPeriods.toString()); + log.info(" Path: " + curvesPath.toAbsolutePath().toString()); if (Files.isDirectory(curvesPath)) { CurvesVisitor curvesFinder = new CurvesVisitor(returnPeriods); -- GitLab