Skip to content

NSHM23 ERF version updates #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinmilner merged 1 commit into from
Aug 5, 2026
Merged

NSHM23 ERF version updates #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/scratch/kevin/ThreadedHazardCurveCalcExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.opensha.sha.calc.HazardCurveCalculator;
import org.opensha.sha.calc.sourceFilters.SourceFilterManager;
import org.opensha.sha.calc.sourceFilters.SourceFilters;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.util.NSHM23_RegionLoader;
import org.opensha.sha.gui.infoTools.IMT_Info;
import org.opensha.sha.imr.AttenRelRef;
Expand All @@ -26,7 +26,7 @@ public class ThreadedHazardCurveCalcExample {

public static void main(String[] args) throws IOException {
// ERF
NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();
erf.getTimeSpan().setDuration(1d);
erf.updateForecast();

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/scratch/kevin/miscFigures/SingleEventAndFullHazardCurve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution;
import org.opensha.sha.earthquake.faultSysSolution.util.FaultSectionUtils;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
import org.opensha.sha.faultSurface.FaultSection;
import org.opensha.sha.faultSurface.RuptureSurface;
import org.opensha.sha.gui.infoTools.IMT_Info;
Expand All @@ -48,7 +48,7 @@ public class SingleEventAndFullHazardCurve {

public static void main(String[] args) throws IOException {
ModuleArchive.VERBOSE_DEFAULT = false;
NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();

File outputDir = new File("/tmp");

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.opensha.sha.earthquake.param.BackgroundRupType;
import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.util.NSHM23_RegionLoader;
import org.opensha.sha.earthquake.util.GridCellSupersamplingSettings;
import org.opensha.sha.earthquake.util.GriddedSeismicitySettings;
Expand All @@ -33,7 +33,7 @@
public class GriddedHazardBenchmark {

public static void main(String[] args) throws IOException {
NSHM23_WUS_BranchAveragedERF erf = new NSHM23_WUS_BranchAveragedERF();
NSHM23_BranchAveragedERF erf = new NSHM23_BranchAveragedERF();
erf.setParameter(IncludeBackgroundParam.NAME, IncludeBackgroundOption.ONLY);

GriddedSeismicitySettings settings = erf.getGriddedSeismicitySettings();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.opensha.sha.earthquake.param.BackgroundRupType;
import org.opensha.sha.earthquake.param.IncludeBackgroundOption;
import org.opensha.sha.earthquake.param.IncludeBackgroundParam;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_WUS_BranchAveragedERF;
import org.opensha.sha.earthquake.rupForecastImpl.nshm23.erf.NSHM23_BranchAveragedERF;
import org.opensha.sha.earthquake.util.GridCellSupersamplingSettings;
import org.opensha.sha.earthquake.util.GriddedFiniteRuptureSettings;
import org.opensha.sha.earthquake.util.GriddedSeismicitySettings;
Expand All @@ -53,7 +53,7 @@
public class GriddedHazardSingleSiteComparison {

public static void main(String[] args) throws IOException {
BaseFaultSystemSolutionERF erf = new NSHM23_WUS_BranchAveragedERF();
BaseFaultSystemSolutionERF erf = new NSHM23_BranchAveragedERF();
erf.updateForecast();

// PointSourceDistanceCorrections corrType = PointSourceDistanceCorrections.ANALYTICAL_TWENTY_POINT;
Expand Down
Loading