distance calc update

Author: pmpowers-usgs

src/main/java/gov/usgs/earthquake/nshmp/model/NshmErfTest.java

@@ -30,10 +30,10 @@ public class NshmErfTest {
   // private static final Path MODEL = Path.of("../nshm-conus-2018-5.x-maint");
   private static final Path MODEL = Path.of("../nshm-prvi");
 
-  // static gov.usgs.earthquake.nshmp.geo.Location testLoc =
-  // gov.usgs.earthquake.nshmp.geo.Location.create(-122, 39.0);
-  static gov.usgs.earthquake.nshmp.geo.Location testLoc =
-      gov.usgs.earthquake.nshmp.geo.Location.create(-80, 33.2);
+   static gov.usgs.earthquake.nshmp.geo.Location testLoc =
+       gov.usgs.earthquake.nshmp.geo.Location.create(-66.117, 18.465);
+//  static gov.usgs.earthquake.nshmp.geo.Location testLoc =
+//      gov.usgs.earthquake.nshmp.geo.Location.create(-80, 33.2);
 
   // static gov.usgs.earthquake.nshmp.geo.Location testLoc =
   // gov.usgs.earthquake.nshmp.geo.Location.create(-110, 37.5);
@@ -125,16 +125,18 @@ public static void main(String[] args) {
       }
     }
 
-    // calcHazard(erf);
+     calcHazard(erf);
   }
 
   private static void calcHazard(NshmErf erf) {
     ScalarIMR gmpe = new ASK_2014_Wrapper();
     gmpe.setParamDefaults();
     gmpe.setIntensityMeasure(PGA_Param.NAME);
 
-    Site site = new Site(new Location(34, -118)); // Los Angeles
+    Site site = new Site(new Location(18.465, -66.117)); // San Juan
+//    Site site = new Site(new Location(34, -118)); // Los Angeles
     // Site site = new Site(new Location(40.75, -111.90)); // Salt lake City
+    
 
     for (Parameter<?> param : gmpe.getSiteParams()) {
       site.addParameter((Parameter<?>) param.clone());

src/main/java/gov/usgs/earthquake/nshmp/model/NshmSurface.java

@@ -156,6 +156,10 @@ public LocationList getEvenlyDiscritizedListOfLocsOnSurface() {
 	public double getAveLength() {
 		return delegate.length();
 	}
+	
+  @Override public double getQuickDistance(Location siteLoc) {
+    return calcQuickDistance(siteLoc);
+  }
 
 	// Unnecessary methods for hazard calculations
 
@@ -168,7 +172,6 @@ public double getAveLength() {
 	@Override public FaultTrace getEvenlyDiscritizedUpperEdge() { throw new UnsupportedOperationException(); }
 	@Override public LocationList getEvenlyDiscritizedLowerEdge() { throw new UnsupportedOperationException(); }
 	@Override public double getAveGridSpacing() { throw new UnsupportedOperationException(); }
-	@Override public double getQuickDistance(Location siteLoc) { throw new UnsupportedOperationException(); }
 	@Override public double getAveDipDirection() { throw new UnsupportedOperationException(); }
 	@Override public FaultTrace getUpperEdge() { throw new UnsupportedOperationException(); }
 	@Override public double getFractionOfSurfaceInRegion(Region region) { throw new UnsupportedOperationException(); }