Skip to content

Commit

Permalink
removed updateCurrRuptures parameter; it wasn't being used
Browse files Browse the repository at this point in the history
  • Loading branch information
larsbutler committed Nov 22, 2011
1 parent b10ac8f commit e4fddb3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
7 changes: 2 additions & 5 deletions java/org/opensha/sha/calc/HazardCurveCalculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public DiscretizedFuncAPI getAverageEventSetHazardCurve(

for (int i = 0; i < numEventSets; i++) {
ArrayList<EqkRupture> events = eqkRupForecast.drawRandomEventSet();
getEventSetHazardCurve(hazCurve, site, imr, events, false);
getEventSetHazardCurve(hazCurve, site, imr, events);
for (int x = 0; x < numPts; x++)
hazFunction.set(x, hazFunction.getY(x) + hazCurve.getY(x));
}
Expand Down Expand Up @@ -549,15 +549,12 @@ public DiscretizedFuncAPI getAverageEventSetHazardCurve(
* : selected IMR object
* @param eqkRupForecast
* : selected Earthquake rup forecast
* @param updateCurrRuptures
* : tells whether to update current ruptures (for the
* getCurrRuptures() method used for progress bars)
* @return
*/
public DiscretizedFuncAPI getEventSetHazardCurve(
DiscretizedFuncAPI hazFunction, Site site,
ScalarIntensityMeasureRelationshipAPI imr,
ArrayList<EqkRupture> eqkRupList, boolean updateCurrRuptures)
ArrayList<EqkRupture> eqkRupList)
throws java.rmi.RemoteException {

ArbitrarilyDiscretizedFunc condProbFunc =
Expand Down
5 changes: 1 addition & 4 deletions java/org/opensha/sha/calc/HazardCurveCalculatorAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,12 @@ public DiscretizedFuncAPI getAverageEventSetHazardCurve(
* : selected IMR object
* @param eqkRupForecast
* : selected Earthquake rup forecast
* @param updateCurrRuptures
* : tells whether to update current ruptures (for the
* getCurrRuptures() method used for progress bars)
* @return
*/
public DiscretizedFuncAPI getEventSetHazardCurve(
DiscretizedFuncAPI hazFunction, Site site,
ScalarIntensityMeasureRelationshipAPI imr,
ArrayList<EqkRupture> eqkRupList, boolean updateCurrRuptures)
ArrayList<EqkRupture> eqkRupList)
throws java.rmi.RemoteException;

}

0 comments on commit e4fddb3

Please sign in to comment.