added support of GMPEs that don't make use of tectonic region type

larsbutler · Nov 22, 2011 · 7ada782 · 7ada782
1 parent 24e073e
commit 7ada782
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/java/org/opensha/sha/calc/HazardCurveCalculator.java b/java/org/opensha/sha/calc/HazardCurveCalculator.java
@@ -395,8 +395,7 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
             // set the IMR according to the tectonic region of the source (if
             // there is more than one)
             TectonicRegionType trt = source.getTectonicRegionType();
-            ScalarIntensityMeasureRelationshipAPI imr =
-                    TRTUtils.getIMRForTRT(imrMap, trt);
+            ScalarIntensityMeasureRelationshipAPI imr = imrMap.get(trt);
 
             // compute the source's distance from the site and skip if it's too
             // far away

diff --git a/java/org/opensha/sha/calc/disaggregation/DisaggregationCalculator.java b/java/org/opensha/sha/calc/disaggregation/DisaggregationCalculator.java
@@ -302,8 +302,7 @@ public boolean disaggregate(double iml, Site site,
             // set the IMR according to the tectonic region of the source (if
             // there is more than one)
             TectonicRegionType trt = source.getTectonicRegionType();
-            ScalarIntensityMeasureRelationshipAPI imr =
-                    TRTUtils.getIMRForTRT(imrMap, trt);
+            ScalarIntensityMeasureRelationshipAPI imr = imrMap.get(trt);
 
             // if (numSourcesToShow > 0)
             // sourceDissaggMap.put(sourceName, new ArrayList());