diff --git a/src/org/opensha2/calc/Site.java b/src/org/opensha2/calc/Site.java index dde2da60d06d866c1d3df8f659ae10250f1ed291..9baa45477f1354bd5cc7aa675aab2d3c9d748281 100644 --- a/src/org/opensha2/calc/Site.java +++ b/src/org/opensha2/calc/Site.java @@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; diff --git a/src/org/opensha2/calc/SiteSet.java b/src/org/opensha2/calc/SiteSet.java index f74692571409a3c179dd1621775e4e9d4eaccb03..4e184bffb86def0fe5c776101e6484f2175d2a8a 100644 --- a/src/org/opensha2/calc/SiteSet.java +++ b/src/org/opensha2/calc/SiteSet.java @@ -47,7 +47,7 @@ import com.google.gson.JsonObject; * * @author Peter Powers */ -final class SiteSet implements Iterable<Site> { +public final class SiteSet implements Iterable<Site> { final private GriddedRegion region; final private Builder builder; diff --git a/src/org/opensha2/programs/HazardCalc.java b/src/org/opensha2/programs/HazardCalc.java index b1309a2b79ebc44552077efbd81f80ebc1ea8700..fd80ab11fc5eb773250a2ccf9413dc6d89d463ae 100644 --- a/src/org/opensha2/programs/HazardCalc.java +++ b/src/org/opensha2/programs/HazardCalc.java @@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs; import org.opensha2.calc.Hazard; import org.opensha2.calc.Results; import org.opensha2.calc.Site; +import org.opensha2.calc.SiteSet; import org.opensha2.eq.model.HazardModel; import org.opensha2.gmm.Imt; import org.opensha2.util.Logging; @@ -118,7 +119,7 @@ public class HazardCalc { Iterable<Site> sites = config.sites(); if (argCount > 2) { Path sitePath = Paths.get(args[2]); - sites = Site.fromCsv(sitePath); + sites = SiteSet.fromCsv(sitePath); log.info(""); StringBuilder sb = new StringBuilder() .append("Site config:")