diff --git a/build.gradle b/build.gradle index 24e8df7a..e254bbe3 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ */ apply plugin: 'java-library' +apply plugin: 'eclipse' ext { parentProject = 'opensha' @@ -12,7 +13,7 @@ apply from: '../opensha/build-common.gradle' dependencies { - api "ghsc:nshmp-lib:1.8.4" + api 'org.opensha:opensha-nshmp-lib:1.8.4-opensha.1' implementation 'org.apache.pdfbox:pdfbox:2.0.6' implementation 'org.apache.commons:commons-collections4:4.1' diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/model/NshmUtil.java deleted file mode 100644 index 5bd8b4cf..00000000 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -package gov.usgs.earthquake.nshmp.model; - -import org.opensha.commons.data.Site; -import org.opensha.sha.util.TectonicRegionType; - -import gov.usgs.earthquake.nshmp.geo.Location; -import gov.usgs.earthquake.nshmp.geo.LocationList; -import gov.usgs.earthquake.nshmp.geo.Locations; - -class NshmUtil { - - static Location siteToNshmLocation(Site site) { - return Location.create( - site.getLocation().getLatitude(), - site.getLocation().getLatitude()); - } - - static org.opensha.commons.geo.Location toOpenShaLocation(Location loc) { - return new org.opensha.commons.geo.Location(loc.latitude, loc.longitude, loc.depth); - } - - static org.opensha.commons.geo.LocationList toOpenShaLocationList(LocationList locs) { - org.opensha.commons.geo.LocationList out = new org.opensha.commons.geo.LocationList(); - locs.forEach(loc -> out.add(toOpenShaLocation(loc))); - return out; - } - - static Location fromOpenShaLocation(org.opensha.commons.geo.Location loc) { - return Location.create(loc.lon, loc.lat, loc.depth); - } - - static double distance(Site site, RuptureSet ruptureSet) { - Location p1 = fromOpenShaLocation(site.getLocation()); - Location p2 = ruptureSet.location(p1); - return Locations.horzDistanceFast(p1, p2); - } - - static double distance(Site site, GridSource source) { - Location p1 = fromOpenShaLocation(site.getLocation()); - Location p2 = source.location(p1); - return Locations.horzDistanceFast(p1, p2); - } - - static TectonicRegionType tectonicSettingToType( - TectonicSetting setting, SourceType type) { - switch (setting) { - case ACTIVE_CRUST: - return TectonicRegionType.ACTIVE_SHALLOW; - case STABLE_CRUST: - return TectonicRegionType.STABLE_SHALLOW; - case SUBDUCTION: - return (type == SourceType.SLAB || type == SourceType.INTRASLAB_GRID) - ? TectonicRegionType.SUBDUCTION_SLAB - : TectonicRegionType.SUBDUCTION_INTERFACE; - case VOLCANIC: - return TectonicRegionType.VOLCANIC; - default: - throw new UnsupportedOperationException(); - } - } -} diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmErf.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmErf.java similarity index 73% rename from src/main/java/gov/usgs/earthquake/nshmp/model/NshmErf.java rename to src/main/java/org/opensha/nshmp/shaded/model/NshmErf.java index 723bcf18..b1b33244 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmErf.java +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmErf.java @@ -1,4 +1,4 @@ -package gov.usgs.earthquake.nshmp.model; +package org.opensha.nshmp.shaded.model; import static java.util.stream.Collectors.toList; import static org.opensha.sha.util.TectonicRegionType.ACTIVE_SHALLOW; @@ -26,13 +26,13 @@ import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import gov.usgs.earthquake.nshmp.data.Indexing; -import gov.usgs.earthquake.nshmp.model.SystemRuptureSet.SystemRupture; -import gov.usgs.earthquake.nshmp.tree.Branch; +import org.opensha.nshmp.shaded.data.NshmpIndexing; +import org.opensha.nshmp.shaded.model.NshmpSystemRuptureSet.SystemRupture; +import org.opensha.nshmp.shaded.tree.NshmpBranch; public class NshmErf extends AbstractERF { - private final HazardModel model; + private final NshmpHazardModel model; private final List allSources; private final Multimap sourceMap; @@ -46,10 +46,10 @@ public class NshmErf extends AbstractERF { public NshmErf(Path path, Set trts, IncludeBackgroundOption gridOption) { - this(HazardModel.load(path), trts, gridOption); + this(NshmpHazardModel.load(path), trts, gridOption); } - public NshmErf(HazardModel model, Set trts, + public NshmErf(NshmpHazardModel model, Set trts, IncludeBackgroundOption gridOption) { this.model = model; allSources = new ArrayList<>(); @@ -78,29 +78,29 @@ private void init() { setTimeSpan(timeSpan); // nshmp-haz initializers - Multimap trees = model.trees(); - for (Entry entry : trees.entries()) { + Multimap trees = model.trees(); + for (Entry entry : trees.entries()) { - TectonicSetting setting = entry.getKey(); - SourceTree tree = entry.getValue(); - SourceType type = tree.type(); + NshmpTectonicSetting setting = entry.getKey(); + NshmpSourceTree tree = entry.getValue(); + NshmpSourceType type = tree.type(); - if (setting == TectonicSetting.SUBDUCTION) { - if ((type == SourceType.INTERFACE || type == SourceType.INTERFACE_CLUSTER - || type == SourceType.INTERFACE_GRID || type == SourceType.INTERFACE_SYSTEM) && !subInterface) { + if (setting == NshmpTectonicSetting.SUBDUCTION) { + if ((type == NshmpSourceType.INTERFACE || type == NshmpSourceType.INTERFACE_CLUSTER + || type == NshmpSourceType.INTERFACE_GRID || type == NshmpSourceType.INTERFACE_SYSTEM) && !subInterface) { continue; } - if ((type == SourceType.SLAB || type == SourceType.INTRASLAB_GRID) && !subSlab) { + if ((type == NshmpSourceType.SLAB || type == NshmpSourceType.INTRASLAB_GRID) && !subSlab) { continue; } } - if (setting == TectonicSetting.STABLE_CRUST && !stableCrust) { + if (setting == NshmpTectonicSetting.STABLE_CRUST && !stableCrust) { continue; } - if (setting == TectonicSetting.ACTIVE_CRUST && !activeCrust) { + if (setting == NshmpTectonicSetting.ACTIVE_CRUST && !activeCrust) { continue; } - if (setting == TectonicSetting.VOLCANIC && !volcanic) { + if (setting == NshmpTectonicSetting.VOLCANIC && !volcanic) { continue; } @@ -120,7 +120,7 @@ public Multimap sourceMap() { return sourceMap; } - private List initTree(SourceTree tree) { + private List initTree(NshmpSourceTree tree) { List sources = new ArrayList<>(); double duration = getTimeSpan().getDuration(); tree.stream() @@ -153,94 +153,94 @@ public int compare(NshmSource o1, NshmSource o2) { } private List sourcesFromBranch( - Branch branch, + NshmpBranch branch, double duration) { - RuptureSet ruptureSet = branch.value(); + NshmpRuptureSet ruptureSet = branch.value(); double weight = branch.weight(); switch (ruptureSet.type()) { case GRID: - GriddedRuptureSet grs = (GriddedRuptureSet) ruptureSet; + NshmpGriddedRuptureSet grs = (NshmpGriddedRuptureSet) ruptureSet; return (grid) ? gridRuptureSetToSources(grs, weight, duration) : List.of(); case ZONE: - GriddedRuptureSet zrs = (GriddedRuptureSet) ruptureSet; + NshmpGriddedRuptureSet zrs = (NshmpGriddedRuptureSet) ruptureSet; return (faults) ? gridRuptureSetToSources(zrs, weight, duration) : List.of(); case INTERFACE_GRID: - GriddedRuptureSet igrs = (GriddedRuptureSet) ruptureSet; + NshmpGriddedRuptureSet igrs = (NshmpGriddedRuptureSet) ruptureSet; return (subInterface && grid) ? gridRuptureSetToSources(igrs, weight, duration) : List.of(); case INTRASLAB_GRID: - GriddedRuptureSet isgrs = (GriddedRuptureSet) ruptureSet; + NshmpGriddedRuptureSet isgrs = (NshmpGriddedRuptureSet) ruptureSet; return (subSlab && grid) ? gridRuptureSetToSources(isgrs, weight, duration) : List.of(); case SLAB: - GriddedRuptureSet slabRuptures = (GriddedRuptureSet) ruptureSet; + NshmpGriddedRuptureSet slabRuptures = (NshmpGriddedRuptureSet) ruptureSet; return (subSlab && grid) ? gridRuptureSetToSources(slabRuptures, weight, duration) : List.of(); case FAULT_CLUSTER: - ClusterRuptureSet crs = (ClusterRuptureSet) ruptureSet; + NshmpClusterRuptureSet crs = (NshmpClusterRuptureSet) ruptureSet; return (faults) ? clusterRuptureSetToSources(crs, weight, duration) : List.of(); case FAULT_SYSTEM: - SystemRuptureSet srs = (SystemRuptureSet) ruptureSet; + NshmpSystemRuptureSet srs = (NshmpSystemRuptureSet) ruptureSet; return (faults) ? systemRuptureSetToSources(srs, weight, duration) : List.of(); case INTERFACE: return (subInterface && faults) - ? iterableRuptureSetToSources((IterableRuptureSet) ruptureSet, weight, duration) + ? iterableRuptureSetToSources((NshmpIterableRuptureSet) ruptureSet, weight, duration) : List.of(); case INTERFACE_CLUSTER: - ClusterRuptureSet icrs = (ClusterRuptureSet) ruptureSet; + NshmpClusterRuptureSet icrs = (NshmpClusterRuptureSet) ruptureSet; return (subInterface && faults) ? clusterRuptureSetToSources(icrs, weight, duration) : List.of(); case INTERFACE_SYSTEM: - SystemRuptureSet isrs = (SystemRuptureSet) ruptureSet; + NshmpSystemRuptureSet isrs = (NshmpSystemRuptureSet) ruptureSet; return (faults) ? systemRuptureSetToSources(isrs, weight, duration) : List.of(); default: return (faults) - ? iterableRuptureSetToSources((IterableRuptureSet) ruptureSet, weight, duration) + ? iterableRuptureSetToSources((NshmpIterableRuptureSet) ruptureSet, weight, duration) : List.of(); } } private static List gridRuptureSetToSources( - GriddedRuptureSet ruptureSet, + NshmpGriddedRuptureSet ruptureSet, double weight, double duration) { List sources = new ArrayList<>(); - for (GridSource gridSource : ruptureSet) { + for (NshmpGridSource gridSource : ruptureSet) { sources.add(new NshmSource.Point(gridSource, weight, duration)); } return sources; } private static List iterableRuptureSetToSources( - IterableRuptureSet ruptureSet, + NshmpIterableRuptureSet ruptureSet, double weight, double duration) { @@ -248,7 +248,7 @@ private static List iterableRuptureSetToSources( } private static List systemRuptureSetToSources( - SystemRuptureSet srs, + NshmpSystemRuptureSet srs, double weight, double duration) { @@ -256,14 +256,14 @@ private static List systemRuptureSetToSources( .map(section -> new NshmSurface(section)) .collect(Collectors.toList()); - // SystemRuptureSet.stream() not supported but should be. + // NshmpSystemRuptureSet.stream() not supported but should be. // Iterator should work, even if it isn't used in nshm calc // pathways List sources = new ArrayList<>(srs.size()); for (int i = 0; i < srs.size(); i++) { SystemRupture source = (SystemRupture) srs.get(i); - int[] sectionIndices = Indexing.bitsToIndices(source.bitset()); + int[] sectionIndices = NshmpIndexing.bitsToIndices(source.bitset()); List ruptureSurfaces = IntStream.of(sectionIndices) .mapToObj(surfaces::get) .collect(Collectors.toList()); @@ -273,7 +273,7 @@ private static List systemRuptureSetToSources( } private static List clusterRuptureSetToSources( - ClusterRuptureSet crs, + NshmpClusterRuptureSet crs, double weight, double duration) { diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmErfTest.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmErfTest.java similarity index 86% rename from src/main/java/gov/usgs/earthquake/nshmp/model/NshmErfTest.java rename to src/main/java/org/opensha/nshmp/shaded/model/NshmErfTest.java index 068bebf9..f022a433 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmErfTest.java +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmErfTest.java @@ -1,4 +1,4 @@ -package gov.usgs.earthquake.nshmp.model; +package org.opensha.nshmp.shaded.model; import java.awt.geom.Point2D; import java.nio.file.Path; @@ -30,13 +30,13 @@ 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(-66.117, 18.465); - // static gov.usgs.earthquake.nshmp.geo.Location testLoc = - // gov.usgs.earthquake.nshmp.geo.Location.create(-80, 33.2); + static org.opensha.nshmp.shaded.geo.NshmpLocation testLoc = + org.opensha.nshmp.shaded.geo.NshmpLocation.create(-66.117, 18.465); + // static org.opensha.nshmp.shaded.geo.NshmpLocation testLoc = + // org.opensha.nshmp.shaded.geo.NshmpLocation.create(-80, 33.2); - // static gov.usgs.earthquake.nshmp.geo.Location testLoc = - // gov.usgs.earthquake.nshmp.geo.Location.create(-110, 37.5); + // static org.opensha.nshmp.shaded.geo.NshmpLocation testLoc = + // org.opensha.nshmp.shaded.geo.NshmpLocation.create(-110, 37.5); public static void main(String[] args) { @@ -44,16 +44,16 @@ public static void main(String[] args) { // EnumSet.of(TectonicRegionType.STABLE_SHALLOW); Set trts = EnumSet.noneOf(TectonicRegionType.class); - HazardModel model = HazardModel.load(MODEL); + NshmpHazardModel model = NshmpHazardModel.load(MODEL); NshmErf erf = new NshmErf(model, trts, IncludeBackgroundOption.INCLUDE); System.out.println("NSHM ERF size: " + erf.getNumSources()); erf.getTimeSpan().setDuration(1.0); erf.updateForecast(); - System.out.println(Models.mfd( + System.out.println(NshmpModels.mfd( model, - TectonicSetting.SUBDUCTION, - Optional.of(SourceType.INTERFACE))); + NshmpTectonicSetting.SUBDUCTION, + Optional.of(NshmpSourceType.INTERFACE))); // for (ProbEqkSource src : erf) { // @@ -66,7 +66,7 @@ public static void main(String[] args) { // if (ptSrc.loc.equals(testLoc)) { // System.out.println(testLoc); // System.out.println(ptSrc.mfd); - // for (Rupture rup : ptSrc) { + // for (NshmpRupture rup : ptSrc) { // PointSourceFinite.FiniteSurface surf = // (PointSourceFinite.FiniteSurface) rup.surface(); // System.out.println(surf.mag + " " + surf.zTor + " " + surf.dip()); @@ -87,7 +87,7 @@ public static void main(String[] args) { System.out.println(true); NshmSource.Point ptSrc = (NshmSource.Point) nshmSrc; - GridSource nhPtSrc = (GridSource) nshmSrc.delegate(); + NshmpGridSource nhPtSrc = (NshmpGridSource) nshmSrc.delegate(); // PointSourceFixedStrike ptSrc = (PointSourceFixedStrike) nshmSrc; diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmRupture.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmRupture.java similarity index 74% rename from src/main/java/gov/usgs/earthquake/nshmp/model/NshmRupture.java rename to src/main/java/org/opensha/nshmp/shaded/model/NshmRupture.java index 5c01ef44..d8ec7e19 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmRupture.java +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmRupture.java @@ -1,9 +1,9 @@ -package gov.usgs.earthquake.nshmp.model; +package org.opensha.nshmp.shaded.model; import org.opensha.sha.earthquake.ProbEqkRupture; import org.opensha.sha.faultSurface.RuptureSurface; -import gov.usgs.earthquake.nshmp.Maths; +import org.opensha.nshmp.shaded.NshmpMaths; class NshmRupture extends ProbEqkRupture { @@ -20,7 +20,7 @@ class NshmRupture extends ProbEqkRupture { super( mag, rake, - Maths.rateToProbability(rate * weight, duration), + NshmpMaths.rateToProbability(rate * weight, duration), surface, null); this.rate = rate; diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmSource.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmSource.java similarity index 85% rename from src/main/java/gov/usgs/earthquake/nshmp/model/NshmSource.java rename to src/main/java/org/opensha/nshmp/shaded/model/NshmSource.java index de1e570e..9aafb9b6 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmSource.java +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmSource.java @@ -1,4 +1,4 @@ -package gov.usgs.earthquake.nshmp.model; +package org.opensha.nshmp.shaded.model; import java.util.ArrayList; import java.util.List; @@ -11,8 +11,8 @@ import org.opensha.sha.faultSurface.CompoundSurface; import org.opensha.sha.faultSurface.RuptureSurface; -import gov.usgs.earthquake.nshmp.Maths; -import gov.usgs.earthquake.nshmp.model.SystemRuptureSet.SystemRupture; +import org.opensha.nshmp.shaded.NshmpMaths; +import org.opensha.nshmp.shaded.model.NshmpSystemRuptureSet.SystemRupture; public abstract class NshmSource extends ProbEqkSource { @@ -53,18 +53,18 @@ public Object getDelegate() { return delegate; } - static class Fault extends NshmSource { + static class Fault extends NshmSource { private final List ruptures; Fault( - IterableRuptureSet delegate, + NshmpIterableRuptureSet delegate, double weight, double duration) { super(delegate, delegate.name(), delegate.id()); this.ruptures = new ArrayList<>(); - for (Rupture rupture : delegate) { + for (NshmpRupture rupture : delegate) { ruptures.add(new NshmRupture( rupture.magnitude(), rupture.rake(), @@ -93,19 +93,19 @@ public ProbEqkRupture getRupture(int index) { @Override public void setDuration(double duration) { ruptures.forEach(rup -> rup.setProbability( - Maths.rateToProbability( + NshmpMaths.rateToProbability( rup.rate * rup.weight, duration))); } } - static class Point extends NshmSource { + static class Point extends NshmSource { final double weight; double duration; Point( - GridSource delegate, + NshmpGridSource delegate, double weight, double duration) { @@ -121,12 +121,12 @@ public double getMinDistance(Site site) { @Override public int getNumRuptures() { - return ((GridSource) delegate).size(); + return ((NshmpGridSource) delegate).size(); } @Override public ProbEqkRupture getRupture(int index) { - Rupture rupture = ((GridSource) delegate).get(index); + NshmpRupture rupture = ((NshmpGridSource) delegate).get(index); return new NshmRupture( rupture.magnitude(), rupture.rake(), @@ -148,7 +148,7 @@ static class System extends NshmSource { final NshmRupture rupture; System( - SystemRuptureSet ruptureSet, + NshmpSystemRuptureSet ruptureSet, SystemRupture delegate, double weight, double duration, @@ -186,7 +186,7 @@ public ProbEqkRupture getRupture(int index) { @Override public void setDuration(double duration) { - double p = Maths.rateToProbability( + double p = NshmpMaths.rateToProbability( rupture.rate * rupture.weight, duration); rupture.setProbability(p); diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmSurface.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmSurface.java similarity index 80% rename from src/main/java/gov/usgs/earthquake/nshmp/model/NshmSurface.java rename to src/main/java/org/opensha/nshmp/shaded/model/NshmSurface.java index 96e1e201..01255398 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/model/NshmSurface.java +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmSurface.java @@ -1,4 +1,4 @@ -package gov.usgs.earthquake.nshmp.model; +package org.opensha.nshmp.shaded.model; import java.util.ListIterator; @@ -12,13 +12,13 @@ import org.opensha.sha.faultSurface.cache.CacheEnabledSurface; import org.opensha.sha.faultSurface.cache.SurfaceDistances; -import gov.usgs.earthquake.nshmp.fault.surface.DefaultGriddedSurface; -import gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface; -import gov.usgs.earthquake.nshmp.model.GridSource.PointSurface; -import gov.usgs.earthquake.nshmp.model.GridSourceFinite.FiniteSurface; +import org.opensha.nshmp.shaded.fault.surface.NshmpDefaultGriddedSurface; +import org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface; +import org.opensha.nshmp.shaded.model.NshmpGridSource.PointSurface; +import org.opensha.nshmp.shaded.model.NshmpGridSourceFinite.FiniteSurface; /** - * Rupture surface implementation for USGS NSHMs. Most methods throw an + * NshmpRupture surface implementation for USGS NSHMs. Most methods throw an * UnsupportedOperationException except those required for hazard calculations * with current GMMs (dip, width, rRup, rJb, rX, zTor) * @@ -26,14 +26,14 @@ */ public class NshmSurface implements CacheEnabledSurface { - private final gov.usgs.earthquake.nshmp.fault.surface.RuptureSurface delegate; + private final org.opensha.nshmp.shaded.fault.surface.NshmpRuptureSurface delegate; // distance metrics for reference site; this should // work for single threaded calculations private Location location; - private Distance distance; + private NshmpDistance distance; - public NshmSurface(gov.usgs.earthquake.nshmp.fault.surface.RuptureSurface delegate) { + public NshmSurface(org.opensha.nshmp.shaded.fault.surface.NshmpRuptureSurface delegate) { this.delegate = delegate; } @@ -53,15 +53,15 @@ public Location centroid() { @Override public double getAveRupTopDepth() { - if (delegate instanceof DefaultGriddedSurface) { - return ((DefaultGriddedSurface) delegate).get(0, 0).depth; + if (delegate instanceof NshmpDefaultGriddedSurface) { + return ((NshmpDefaultGriddedSurface) delegate).get(0, 0).depth; } return delegate.depth(); } @Override public double getAveRupBottomDepth() { - if (delegate instanceof DefaultGriddedSurface) { - return ((DefaultGriddedSurface) delegate).get(((DefaultGriddedSurface) delegate).getNumRows()-1, 0).depth; + if (delegate instanceof NshmpDefaultGriddedSurface) { + return ((NshmpDefaultGriddedSurface) delegate).get(((NshmpDefaultGriddedSurface) delegate).getNumRows()-1, 0).depth; } return delegate.depth() + delegate.width()*Math.sin(Math.toRadians(delegate.dip())); } @@ -109,7 +109,7 @@ private void setDistances(Location location) { public Location getFirstLocOnUpperEdge() { // this will only be asked for by OpenSHA CompoundSurface return NshmUtil.toOpenShaLocation( - ((gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface) delegate) + ((org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface) delegate) .getFirstLocOnUpperEdge()); } @@ -117,21 +117,21 @@ public Location getFirstLocOnUpperEdge() { public Location getLastLocOnUpperEdge() { // this will only be asked for by OpenSHA CompoundSurface return NshmUtil.toOpenShaLocation( - ((gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface) delegate) + ((org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface) delegate) .getLastLocOnUpperEdge()); } @Override public Location getFirstLocOnLowerEdge() { // this will only be asked for by OpenSHA CompoundSurface - gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface gridDelegate = (gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface) delegate; + org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface gridDelegate = (org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface) delegate; return NshmUtil.toOpenShaLocation(gridDelegate.getLocation(gridDelegate.getNumRows()-1, 0)); } @Override public Location getLastLocOnLowerEdge() { // this will only be asked for by OpenSHA CompoundSurface - gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface gridDelegate = (gov.usgs.earthquake.nshmp.fault.surface.GriddedSurface) delegate; + org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface gridDelegate = (org.opensha.nshmp.shaded.fault.surface.NshmpGriddedSurface) delegate; return NshmUtil.toOpenShaLocation(gridDelegate.getLocation(gridDelegate.getNumRows()-1, gridDelegate.getNumCols()-1)); } @@ -139,7 +139,7 @@ public Location getLastLocOnLowerEdge() { @Override public SurfaceDistances calcDistances(Location location) { - Distance distance = delegate.distanceTo(NshmUtil.fromOpenShaLocation(location)); + NshmpDistance distance = delegate.distanceTo(NshmUtil.fromOpenShaLocation(location)); return new SurfaceDistances.Precomputed(location, distance.rRup, distance.rJB, distance.rX); } @@ -164,7 +164,7 @@ public LocationList getEvenlyDiscritizedListOfLocsOnSurface() { return LocationList.of(NshmUtil.toOpenShaLocation(((PointSurface) delegate).loc)); } return NshmUtil.toOpenShaLocationList( - ((GriddedSurface) delegate).getEvenlyDiscritizedListOfLocsOnSurface()); + ((NshmpGriddedSurface) delegate).getEvenlyDiscritizedListOfLocsOnSurface()); } @Override diff --git a/src/main/java/org/opensha/nshmp/shaded/model/NshmUtil.java b/src/main/java/org/opensha/nshmp/shaded/model/NshmUtil.java new file mode 100644 index 00000000..f23e5967 --- /dev/null +++ b/src/main/java/org/opensha/nshmp/shaded/model/NshmUtil.java @@ -0,0 +1,61 @@ +package org.opensha.nshmp.shaded.model; + +import org.opensha.commons.data.Site; +import org.opensha.sha.util.TectonicRegionType; + +import org.opensha.nshmp.shaded.geo.NshmpLocation; +import org.opensha.nshmp.shaded.geo.NshmpLocationList; +import org.opensha.nshmp.shaded.geo.NshmpLocations; + +class NshmUtil { + + static NshmpLocation siteToNshmLocation(Site site) { + return NshmpLocation.create( + site.getLocation().getLatitude(), + site.getLocation().getLatitude()); + } + + static org.opensha.commons.geo.Location toOpenShaLocation(NshmpLocation loc) { + return new org.opensha.commons.geo.Location(loc.latitude, loc.longitude, loc.depth); + } + + static org.opensha.commons.geo.LocationList toOpenShaLocationList(NshmpLocationList locs) { + org.opensha.commons.geo.LocationList out = new org.opensha.commons.geo.LocationList(); + locs.forEach(loc -> out.add(toOpenShaLocation(loc))); + return out; + } + + static NshmpLocation fromOpenShaLocation(org.opensha.commons.geo.Location loc) { + return NshmpLocation.create(loc.lon, loc.lat, loc.depth); + } + + static double distance(Site site, NshmpRuptureSet ruptureSet) { + NshmpLocation p1 = fromOpenShaLocation(site.getLocation()); + NshmpLocation p2 = ruptureSet.location(p1); + return NshmpLocations.horzDistanceFast(p1, p2); + } + + static double distance(Site site, NshmpGridSource source) { + NshmpLocation p1 = fromOpenShaLocation(site.getLocation()); + NshmpLocation p2 = source.location(p1); + return NshmpLocations.horzDistanceFast(p1, p2); + } + + static TectonicRegionType tectonicSettingToType( + NshmpTectonicSetting setting, NshmpSourceType type) { + switch (setting) { + case ACTIVE_CRUST: + return TectonicRegionType.ACTIVE_SHALLOW; + case STABLE_CRUST: + return TectonicRegionType.STABLE_SHALLOW; + case SUBDUCTION: + return (type == NshmpSourceType.SLAB || type == NshmpSourceType.INTRASLAB_GRID) + ? TectonicRegionType.SUBDUCTION_SLAB + : TectonicRegionType.SUBDUCTION_INTERFACE; + case VOLCANIC: + return TectonicRegionType.VOLCANIC; + default: + throw new UnsupportedOperationException(); + } + } +} diff --git a/src/main/java/scratch/kevin/nshm23/SingleSiteHazardAndDataComparisonPageGen.java b/src/main/java/scratch/kevin/nshm23/SingleSiteHazardAndDataComparisonPageGen.java index a4b563b3..43f55a21 100644 --- a/src/main/java/scratch/kevin/nshm23/SingleSiteHazardAndDataComparisonPageGen.java +++ b/src/main/java/scratch/kevin/nshm23/SingleSiteHazardAndDataComparisonPageGen.java @@ -78,9 +78,9 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSurface; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSurface; import scratch.UCERF3.erf.FaultSystemSolutionERF; public class SingleSiteHazardAndDataComparisonPageGen { @@ -168,7 +168,7 @@ public static void main(String[] args) throws IOException { if (cmd.hasOption("comp-nshm-erf")) { Preconditions.checkState(!cmd.hasOption("comp-sol"), "Can't supply both --comp-nshm-erf and --comp-sol"); Path path = Path.of(cmd.getOptionValue("comp-nshm-erf")); - HazardModel model = HazardModel.load(path); + NshmpHazardModel model = NshmpHazardModel.load(path); // TODO subduction option? Set trts = EnumSet.of(TectonicRegionType.ACTIVE_SHALLOW, diff --git a/src/main/java/scratch/kevin/nshm23/U3SiteHazardAddWrapped18.java b/src/main/java/scratch/kevin/nshm23/U3SiteHazardAddWrapped18.java index a7829b28..0d4ec226 100644 --- a/src/main/java/scratch/kevin/nshm23/U3SiteHazardAddWrapped18.java +++ b/src/main/java/scratch/kevin/nshm23/U3SiteHazardAddWrapped18.java @@ -32,7 +32,7 @@ import org.opensha.sha.util.NEHRP_TestCity; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; public class U3SiteHazardAddWrapped18 { diff --git a/src/main/java/scratch/kevin/nshm23/WrapperMiscTests.java b/src/main/java/scratch/kevin/nshm23/WrapperMiscTests.java index 6511565a..9813d2f4 100644 --- a/src/main/java/scratch/kevin/nshm23/WrapperMiscTests.java +++ b/src/main/java/scratch/kevin/nshm23/WrapperMiscTests.java @@ -12,10 +12,10 @@ import org.opensha.sha.faultSurface.RuptureSurface; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.SourceTree; -import gov.usgs.earthquake.nshmp.model.TectonicSetting; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpSourceTree; +import org.opensha.nshmp.shaded.model.NshmpTectonicSetting; public class WrapperMiscTests { @@ -24,11 +24,11 @@ public static void main(String[] args) { File modelDir = new File(modelsDir, "nshm-conus-6.0.0"); - HazardModel model = HazardModel.load(modelDir.toPath()); -// TectonicSetting setting = TectonicSetting.ACTIVE_CRUST; -// Collection trees = model.trees().get(setting); + NshmpHazardModel model = NshmpHazardModel.load(modelDir.toPath()); +// NshmpTectonicSetting setting = NshmpTectonicSetting.ACTIVE_CRUST; +// Collection trees = model.trees().get(setting); // System.out.println("Iterating over "+trees.size()+" trees"); -// for (SourceTree tree : trees) { +// for (NshmpSourceTree tree : trees) { // System.out.println(tree); // tree. // } diff --git a/src/main/java/scratch/kevin/nshm23/figures/FullCONUSHazardPageGen.java b/src/main/java/scratch/kevin/nshm23/figures/FullCONUSHazardPageGen.java index 0f6b400e..782c72a5 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/FullCONUSHazardPageGen.java +++ b/src/main/java/scratch/kevin/nshm23/figures/FullCONUSHazardPageGen.java @@ -50,8 +50,8 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.kevin.nshm23.MomentRateCompNSHM18; import scratch.kevin.nshm23.SimpleSmoothHazardMapCalc; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen; @@ -983,7 +983,7 @@ else if (hazDiff < 0 && moDiff < 0) trts.add(TectonicRegionType.SUBDUCTION_SLAB); } - HazardModel model = HazardModel.load(erfPath); + NshmpHazardModel model = NshmpHazardModel.load(erfPath); NshmErf faultERF = new NshmErf(model, trts, IncludeBackgroundOption.EXCLUDE); System.out.println("NSHM Fault ERF size: " + faultERF.getNumSources()); faultERF.getTimeSpan().setDuration(1.0); diff --git a/src/main/java/scratch/kevin/nshm23/figures/LengthDistCompPlot.java b/src/main/java/scratch/kevin/nshm23/figures/LengthDistCompPlot.java index 4fa0fafa..43114618 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/LengthDistCompPlot.java +++ b/src/main/java/scratch/kevin/nshm23/figures/LengthDistCompPlot.java @@ -45,7 +45,7 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.UCERF3.analysis.TablesAndPlotsGen; public class LengthDistCompPlot { diff --git a/src/main/java/scratch/kevin/nshm23/figures/ObservedUncertainMFDComparisons.java b/src/main/java/scratch/kevin/nshm23/figures/ObservedUncertainMFDComparisons.java index 5102d721..a6ac90c4 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/ObservedUncertainMFDComparisons.java +++ b/src/main/java/scratch/kevin/nshm23/figures/ObservedUncertainMFDComparisons.java @@ -56,7 +56,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Table; -import gov.usgs.earthquake.nshmp.model.HazardModel; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; public class ObservedUncertainMFDComparisons { @@ -281,7 +281,7 @@ public static void main(String[] args) throws IOException { // conus east NSHM23_BaseRegion baseReg = AnalysisRegions.CONUS_EAST; Set trts = EnumSet.of(TectonicRegionType.ACTIVE_SHALLOW, TectonicRegionType.STABLE_SHALLOW); - HazardModel model = HazardModel.load(modelDir.toPath()); + NshmpHazardModel model = NshmpHazardModel.load(modelDir.toPath()); Table mfds = Regional_MFD_Plots.calcModelMFDs( model, trts, new NSHM23_BaseRegion[] {baseReg}, refIncrMFD); modelSupraCml = mfds.get(baseReg, MFDType.SUPRA_ONLY).getCumRateDistWithOffset(); diff --git a/src/main/java/scratch/kevin/nshm23/figures/Regional_MFD_Plots.java b/src/main/java/scratch/kevin/nshm23/figures/Regional_MFD_Plots.java index c9736301..b64b3223 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/Regional_MFD_Plots.java +++ b/src/main/java/scratch/kevin/nshm23/figures/Regional_MFD_Plots.java @@ -70,8 +70,8 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; class Regional_MFD_Plots { @@ -106,8 +106,8 @@ private static void doCompEast() throws IOException { AnalysisRegions.CONUS_EAST }; - HazardModel nshm23 = HazardModel.load(NSHM23_WRAPPED.toPath()); - HazardModel nshm18 = HazardModel.load(NSHM18.toPath()); + NshmpHazardModel nshm23 = NshmpHazardModel.load(NSHM23_WRAPPED.toPath()); + NshmpHazardModel nshm18 = NshmpHazardModel.load(NSHM18.toPath()); boolean subduction = false; Set trts = EnumSet.of(TectonicRegionType.ACTIVE_SHALLOW, @@ -148,8 +148,8 @@ private static void doCompCascadia() throws IOException { NSHM23_RegionLoader.CATCH_ALL_REGION }; - HazardModel nshm23 = HazardModel.load(NSHM23_WRAPPED.toPath()); - HazardModel nshm18 = HazardModel.load(NSHM18.toPath()); + NshmpHazardModel nshm23 = NshmpHazardModel.load(NSHM23_WRAPPED.toPath()); + NshmpHazardModel nshm18 = NshmpHazardModel.load(NSHM18.toPath()); EvenlyDiscretizedFunc refMFD = FaultSysTools.initEmptyMFD(9.45); @@ -197,7 +197,7 @@ private static void doCompNSHM18() throws IOException { System.out.println("Calculating Model MFDs"); Table modelMFDs = calcSolMFDs(modelSol, analysis, refMFD); - HazardModel nshm18 = HazardModel.load(NSHM18.toPath()); + NshmpHazardModel nshm18 = NshmpHazardModel.load(NSHM18.toPath()); boolean subduction = false; Set trts = EnumSet.of(TectonicRegionType.ACTIVE_SHALLOW, @@ -796,7 +796,7 @@ static Table calcSolMFDs( } static Table calcModelMFDs( - HazardModel model, Set trts, NSHM23_BaseRegion[] regions, EvenlyDiscretizedFunc refMFD) throws IOException { + NshmpHazardModel model, Set trts, NSHM23_BaseRegion[] regions, EvenlyDiscretizedFunc refMFD) throws IOException { ExecutorService exec = Executors.newFixedThreadPool(FaultSysTools.defaultNumThreads()); NshmErf faultERF = new NshmErf(model, trts, IncludeBackgroundOption.EXCLUDE); @@ -824,7 +824,7 @@ static Table calcModelMFDs( } static Table calcCascadiaModelMFDs( - HazardModel model, NSHM23_BaseRegion[] regions, EvenlyDiscretizedFunc refMFD) throws IOException { + NshmpHazardModel model, NSHM23_BaseRegion[] regions, EvenlyDiscretizedFunc refMFD) throws IOException { ExecutorService exec = Executors.newFixedThreadPool(FaultSysTools.defaultNumThreads()); NshmErf faultERF = new NshmErf(model, Set.of(TectonicRegionType.SUBDUCTION_INTERFACE), IncludeBackgroundOption.EXCLUDE); diff --git a/src/main/java/scratch/kevin/nshm23/figures/WUS_EastOfAttenBoundaryMFDs.java b/src/main/java/scratch/kevin/nshm23/figures/WUS_EastOfAttenBoundaryMFDs.java index adb5e111..a7d3da99 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/WUS_EastOfAttenBoundaryMFDs.java +++ b/src/main/java/scratch/kevin/nshm23/figures/WUS_EastOfAttenBoundaryMFDs.java @@ -31,8 +31,8 @@ import org.opensha.sha.magdist.IncrementalMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen.RegionalParticipationResult; @@ -72,7 +72,7 @@ public static void main(String[] args) throws IOException { Set trts = EnumSet.of(TectonicRegionType.ACTIVE_SHALLOW, TectonicRegionType.STABLE_SHALLOW); - HazardModel model = HazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-conus-5.3.0")); + NshmpHazardModel model = NshmpHazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-conus-5.3.0")); NshmErf faultERF = new NshmErf(model, trts, IncludeBackgroundOption.EXCLUDE); System.out.println("NSHM Fault ERF size: " + faultERF.getNumSources()); faultERF.getTimeSpan().setDuration(1.0); diff --git a/src/main/java/scratch/kevin/nshm23/figures/WUS_HazardChangePageGen.java b/src/main/java/scratch/kevin/nshm23/figures/WUS_HazardChangePageGen.java index c37ac653..3a215e43 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/WUS_HazardChangePageGen.java +++ b/src/main/java/scratch/kevin/nshm23/figures/WUS_HazardChangePageGen.java @@ -59,8 +59,8 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.kevin.nshm23.SimpleSmoothHazardMapCalc; import scratch.kevin.nshm23.MomentRateCompNSHM18; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen; @@ -1126,7 +1126,7 @@ else if (hazDiff < 0 && moDiff < 0) trts.add(TectonicRegionType.SUBDUCTION_SLAB); } - HazardModel model = HazardModel.load(erfPath); + NshmpHazardModel model = NshmpHazardModel.load(erfPath); NshmErf faultERF = new NshmErf(model, trts, IncludeBackgroundOption.EXCLUDE); System.out.println("NSHM Fault ERF size: " + faultERF.getNumSources()); faultERF.getTimeSpan().setDuration(1.0); diff --git a/src/main/java/scratch/kevin/nshm23/figures/WrapperComparisonPageGen.java b/src/main/java/scratch/kevin/nshm23/figures/WrapperComparisonPageGen.java index 48347c6c..588dec87 100644 --- a/src/main/java/scratch/kevin/nshm23/figures/WrapperComparisonPageGen.java +++ b/src/main/java/scratch/kevin/nshm23/figures/WrapperComparisonPageGen.java @@ -31,8 +31,8 @@ import com.google.common.base.Preconditions; import com.google.common.io.Files; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.kevin.nshm23.SimpleSmoothHazardMapCalc; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen; import scratch.kevin.nshm23.SingleSiteHazardAndDataComparisonPageGen.RegionalParticipationResult; @@ -67,8 +67,8 @@ public static void main(String[] args) throws IOException { GeographicMapMaker mapMaker = new RupSetMapMaker(List.of(), reg); mapMaker.setDefaultPlotWidthPixels(1200); - HazardModel model1 = HazardModel.load(new File(modelsDir, dirName1).toPath()); - HazardModel model2 = HazardModel.load(new File(modelsDir, dirName2).toPath()); + NshmpHazardModel model1 = NshmpHazardModel.load(new File(modelsDir, dirName1).toPath()); + NshmpHazardModel model2 = NshmpHazardModel.load(new File(modelsDir, dirName2).toPath()); GriddedRegion gridReg = new GriddedRegion(reg, 0.1, GriddedRegion.ANCHOR_0_0); GriddedRegion smoothHazGridReg = new GriddedRegion(reg, 0.1, GriddedRegion.ANCHOR_0_0); diff --git a/src/main/java/scratch/kevin/nshm23/wrapper/MPJ_WrapperHazardCalc.java b/src/main/java/scratch/kevin/nshm23/wrapper/MPJ_WrapperHazardCalc.java index 7df60fa7..e5f795e6 100644 --- a/src/main/java/scratch/kevin/nshm23/wrapper/MPJ_WrapperHazardCalc.java +++ b/src/main/java/scratch/kevin/nshm23/wrapper/MPJ_WrapperHazardCalc.java @@ -60,7 +60,7 @@ import com.google.common.primitives.Doubles; import edu.usc.kmilner.mpj.taskDispatch.MPJTaskCalculator; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; import mpi.MPI; public class MPJ_WrapperHazardCalc extends MPJTaskCalculator { diff --git a/src/main/java/scratch/kevin/nshm23/wrapper/NshmErfTest.java b/src/main/java/scratch/kevin/nshm23/wrapper/NshmErfTest.java index e652f13e..bf0c7bb9 100644 --- a/src/main/java/scratch/kevin/nshm23/wrapper/NshmErfTest.java +++ b/src/main/java/scratch/kevin/nshm23/wrapper/NshmErfTest.java @@ -21,7 +21,7 @@ import org.opensha.sha.imr.param.SiteParams.Vs30_Param; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; public class NshmErfTest { diff --git a/src/main/java/scratch/kevin/nshm23/wrapper/SingleSiteVerificationTest.java b/src/main/java/scratch/kevin/nshm23/wrapper/SingleSiteVerificationTest.java index 0446688a..c70bb211 100644 --- a/src/main/java/scratch/kevin/nshm23/wrapper/SingleSiteVerificationTest.java +++ b/src/main/java/scratch/kevin/nshm23/wrapper/SingleSiteVerificationTest.java @@ -48,8 +48,8 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSurface; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSurface; import scratch.UCERF3.erf.FaultSystemSolutionERF; public class SingleSiteVerificationTest { diff --git a/src/main/java/scratch/kevin/nshm23/wrapper/WrapperHazardCalc.java b/src/main/java/scratch/kevin/nshm23/wrapper/WrapperHazardCalc.java index a60909ca..7f8b0e35 100644 --- a/src/main/java/scratch/kevin/nshm23/wrapper/WrapperHazardCalc.java +++ b/src/main/java/scratch/kevin/nshm23/wrapper/WrapperHazardCalc.java @@ -45,7 +45,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; public class WrapperHazardCalc { diff --git a/src/main/java/scratch/kevin/nshm23/wrapper/WrapperSumMFD.java b/src/main/java/scratch/kevin/nshm23/wrapper/WrapperSumMFD.java index 51516cc0..5cbd909a 100644 --- a/src/main/java/scratch/kevin/nshm23/wrapper/WrapperSumMFD.java +++ b/src/main/java/scratch/kevin/nshm23/wrapper/WrapperSumMFD.java @@ -12,7 +12,7 @@ import org.opensha.sha.magdist.IncrementalMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; public class WrapperSumMFD { diff --git a/src/main/java/scratch/kevin/pointSources/DippingFaultTests.java b/src/main/java/scratch/kevin/pointSources/DippingFaultTests.java index c6a352e5..3898192d 100644 --- a/src/main/java/scratch/kevin/pointSources/DippingFaultTests.java +++ b/src/main/java/scratch/kevin/pointSources/DippingFaultTests.java @@ -60,10 +60,10 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.gmm.Gmm; -import gov.usgs.earthquake.nshmp.gmm.GmmInput; -import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel; -import gov.usgs.earthquake.nshmp.gmm.Imt; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotionModel; +import org.opensha.nshmp.shaded.gmm.NshmpImt; import net.mahdilamb.colormap.Colors; public class DippingFaultTests { @@ -116,13 +116,13 @@ public double getScalar(double rJB, double rRup) { // } // }, // SIMPLE_GMPE("Simple GMPE") { -// GroundMotionModel gmm; +// NshmpGroundMotionModel gmm; // @Override // public double getScalar(double rJB, double rRup) { // if (gmm == null) -//// gmm = Gmm.BJF_97.instance(Imt.PGA); -// gmm = Gmm.ASK_14_BASE.instance(Imt.PGA); -// GmmInput input = GmmInput.builder().withDefaults().rX(1d).rJB(rJB).rRup(rRup).build(); +//// gmm = NshmpGmm.BJF_97.instance(NshmpImt.PGA); +// gmm = NshmpGmm.ASK_14_BASE.instance(NshmpImt.PGA); +// NshmpGmmInput input = NshmpGmmInput.builder().withDefaults().rX(1d).rJB(rJB).rRup(rRup).build(); // return -gmm.calc(input).get(0).value().mean(); // } }; diff --git a/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java b/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java index 736c2f9b..b8b4ffed 100644 --- a/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java +++ b/src/main/java/scratch/kevin/pointSources/GriddedHazardBenchmark.java @@ -28,7 +28,7 @@ import com.google.common.base.Stopwatch; -import gov.usgs.earthquake.nshmp.gmm.Gmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; public class GriddedHazardBenchmark { @@ -60,7 +60,7 @@ public static void main(String[] args) throws IOException { int numToCalc = 1000; ScalarIMR gmm = AttenRelRef.NGAWest_2014_AVG_NOIDRISS.get(); -// ScalarIMR gmm = new NSHMP_GMM_Wrapper.Single(Gmm.COMBINED_ACTIVE_CRUST_2023); +// ScalarIMR gmm = new NSHMP_GMM_Wrapper.Single(NshmpGmm.COMBINED_ACTIVE_CRUST_2023); // ScalarIMR gmm = AttenRelRef.USGS_NSHM23_ACTIVE.get(); gmm.setIntensityMeasure(PGA_Param.NAME); HazardCurveCalculator calc = new HazardCurveCalculator(new SourceFilterManager(SourceFilters.TRT_DIST_CUTOFFS)); diff --git a/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java b/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java index 11cb2f25..7679f5e7 100644 --- a/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java +++ b/src/main/java/scratch/kevin/pointSources/GriddedHazardSingleSiteComparison.java @@ -47,7 +47,7 @@ import org.opensha.sha.util.FocalMech; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.gmm.Gmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; import net.mahdilamb.colormap.Colors; public class GriddedHazardSingleSiteComparison { @@ -96,7 +96,7 @@ public static void main(String[] args) throws IOException { compSettings = settings.forSurfaceType(BackgroundRupType.POINT).forDistanceCorrection(compCorrType.get()); compSettings = compSettings.forSupersamplingSettings(compSSSettings); -// ScalarIMR gmm = new NSHMP_GMM_Wrapper.Single(Gmm.COMBINED_ACTIVE_CRUST_2023); +// ScalarIMR gmm = new NSHMP_GMM_Wrapper.Single(NshmpGmm.COMBINED_ACTIVE_CRUST_2023); ScalarIMR gmm = AttenRelRef.USGS_NSHM23_ACTIVE.get(); gmm.setIntensityMeasure(PGA_Param.NAME); diff --git a/src/main/java/scratch/kevin/pointSources/paperFigs2026/NSHM23GriddedStatsTexWriter.java b/src/main/java/scratch/kevin/pointSources/paperFigs2026/NSHM23GriddedStatsTexWriter.java index b35eab91..a6b263e9 100644 --- a/src/main/java/scratch/kevin/pointSources/paperFigs2026/NSHM23GriddedStatsTexWriter.java +++ b/src/main/java/scratch/kevin/pointSources/paperFigs2026/NSHM23GriddedStatsTexWriter.java @@ -28,8 +28,8 @@ import com.google.common.base.Joiner; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import scratch.kevin.latex.LaTeXUtils; public class NSHM23GriddedStatsTexWriter { @@ -99,7 +99,7 @@ public static void main(String[] args) throws IOException { } texFW.flush(); - HazardModel model = HazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-conus-6.1.3")); + NshmpHazardModel model = NshmpHazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-conus-6.1.3")); Region ceus = NSHM23_RegionLoader.SeismicityRegions.CONUS_EAST.load(); for (IncludeBackgroundOption bgOption : IncludeBackgroundOption.values()) { diff --git a/src/main/java/scratch/kevin/prvi25/GMMFilterTests.java b/src/main/java/scratch/kevin/prvi25/GMMFilterTests.java index 121a956f..13270a82 100644 --- a/src/main/java/scratch/kevin/prvi25/GMMFilterTests.java +++ b/src/main/java/scratch/kevin/prvi25/GMMFilterTests.java @@ -25,8 +25,8 @@ import org.opensha.sha.imr.param.SiteParams.Vs30_Param; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.gmm.GmmInput; -import gov.usgs.earthquake.nshmp.gmm.GroundMotion; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotion; class GMMFilterTests { @@ -66,8 +66,8 @@ public static void main(String[] args) { System.out.println("\t\t\tTrunc is "+gmm.getParameter(SigmaTruncTypeParam.NAME).getValue()); if (gmm.getOtherParams().containsParameter(SigmaTruncLevelParam.NAME)) System.out.println("\t\t\tTrunc level is "+gmm.getParameter(SigmaTruncLevelParam.NAME).getValue()); - gmm.setCurrentGmmInput(GmmInput.builder().withDefaults().build()); - gov.usgs.earthquake.nshmp.tree.LogicTree gmmTree = gmm.getGroundMotionTree(); + gmm.setCurrentGmmInput(NshmpGmmInput.builder().withDefaults().build()); + org.opensha.nshmp.shaded.tree.NshmpLogicTree gmmTree = gmm.getGroundMotionTree(); System.out.println("\t\t\tTree has "+gmmTree.size()+" values: "+gmmTree); } } diff --git a/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java b/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java index 136e9015..553068d1 100644 --- a/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java +++ b/src/main/java/scratch/kevin/prvi25/GMMTreeCalcDebug.java @@ -53,16 +53,16 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.gmm.Gmm; -import gov.usgs.earthquake.nshmp.gmm.GmmInput; -import gov.usgs.earthquake.nshmp.gmm.GroundMotion; -import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel; -import gov.usgs.earthquake.nshmp.gmm.Imt; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotion; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotionModel; +import org.opensha.nshmp.shaded.gmm.NshmpImt; public class GMMTreeCalcDebug { public static void main(String[] args) throws IOException { - simpleGMMTest(Gmm.PRVI_2025_ACTIVE_CRUST, Imt.PGA); + simpleGMMTest(NshmpGmm.PRVI_2025_ACTIVE_CRUST, NshmpImt.PGA); // System.exit(0); // Site site = new Site(new Location(18.4653, -66.1167)); Site site = new Site(new Location(18, -68)); @@ -306,14 +306,14 @@ public DiscretizedFunc get() { private static final boolean RATE_CURVES = false; - private static final GmmInput defaultInput = GmmInput.builder().withDefaults().mag(7d).rJB(10d).rRup(10d).rX(1d).dip(90d).width(15d) + private static final NshmpGmmInput defaultInput = NshmpGmmInput.builder().withDefaults().mag(7d).rJB(10d).rRup(10d).rX(1d).dip(90d).width(15d) .zTor(0d).zHyp(5d).rake(0d).vs30(760).z1p0(0.2).z2p5(1d).build(); - private static void simpleGMMTest(Gmm avgGMM, Imt imt) { + private static void simpleGMMTest(NshmpGmm avgGMM, NshmpImt imt) { System.out.println("GMM input: "+defaultInput); - GroundMotionModel avgModel = avgGMM.instance(imt); + NshmpGroundMotionModel avgModel = avgGMM.instance(imt); System.out.println("Average GMM: "+avgGMM); - gov.usgs.earthquake.nshmp.tree.LogicTree avgTree = avgModel.calc(defaultInput); + org.opensha.nshmp.shaded.tree.NshmpLogicTree avgTree = avgModel.calc(defaultInput); System.out.println("Average tree:\n"+avgTree); } diff --git a/src/main/java/scratch/kevin/prvi25/InterfacePointMagCutTests.java b/src/main/java/scratch/kevin/prvi25/InterfacePointMagCutTests.java index 6e25ef43..4f7d17d3 100644 --- a/src/main/java/scratch/kevin/prvi25/InterfacePointMagCutTests.java +++ b/src/main/java/scratch/kevin/prvi25/InterfacePointMagCutTests.java @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.gmm.Gmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; public class InterfacePointMagCutTests { @@ -53,9 +53,9 @@ public static void main(String[] args) throws IOException { // ScalarIMR gmm = AttenRelRef.USGS_PRVI_INTERFACE.get(); -// Gmm gmmRef = Gmm.AG_20_GLOBAL_INTERFACE; -// Gmm gmmRef = Gmm.KBCG_20_GLOBAL_INTERFACE; - Gmm gmmRef = Gmm.PSBAH_20_GLOBAL_INTERFACE; +// NshmpGmm gmmRef = NshmpGmm.AG_20_GLOBAL_INTERFACE; +// NshmpGmm gmmRef = NshmpGmm.KBCG_20_GLOBAL_INTERFACE; + NshmpGmm gmmRef = NshmpGmm.PSBAH_20_GLOBAL_INTERFACE; ScalarIMR gmm = new NSHMP_GMM_Wrapper.Single(gmmRef, gmmRef.toString(), gmmRef.name(), false, null); gmm.setIntensityMeasure(PGA_Param.NAME); diff --git a/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java b/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java index 252735f5..05432d59 100644 --- a/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java +++ b/src/main/java/scratch/kevin/prvi25/SiteHazCompNSHMPHaz.java @@ -47,14 +47,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import gov.usgs.earthquake.nshmp.gmm.Gmm; -import gov.usgs.earthquake.nshmp.gmm.GmmInput; -import gov.usgs.earthquake.nshmp.gmm.GroundMotion; -import gov.usgs.earthquake.nshmp.gmm.GroundMotions; -import gov.usgs.earthquake.nshmp.gmm.UsgsPrviBackbone2025; -import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints; -import gov.usgs.earthquake.nshmp.gmm.GmmInput.Field; -import gov.usgs.earthquake.nshmp.tree.LogicTree; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotion; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotions; +import org.opensha.nshmp.shaded.gmm.NshmpUsgsPrviBackbone2025; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput.Constraints; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput.Field; +import org.opensha.nshmp.shaded.tree.NshmpLogicTree; import net.mahdilamb.colormap.Colors; public class SiteHazCompNSHMPHaz { @@ -64,25 +64,25 @@ public static void main(String[] args) throws IOException { Preconditions.checkState(outputDir.exists() || outputDir.mkdir(), "Output directory %s does not exist and could not be created", outputDir.getAbsolutePath()); -// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(Gmm.ASK_14_BASE); +// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(NshmpGmm.ASK_14_BASE); // CSVFile inCSV = CSVFile.readFile(new File("/home/kevin/Downloads/" // + "prvi-0.2s-ask14base-crustalFaultOnly-PRVI_2025_ACTIVE_CRUST_NO_EPI_SIGMA_NGA.csv"), true); -// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(Gmm.PRVI_2025_ACTIVE_CRUST); +// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(NshmpGmm.PRVI_2025_ACTIVE_CRUST); //// gmm.setGroundMotionTreeFilter(new GroundMotionLogicTreeFilter.StringMatching( -////// UsgsPrviBackbone2025.SIGMA_NGA_ID, -//// GroundMotions.EPI_OFF +////// NshmpUsgsPrviBackbone2025.SIGMA_NGA_ID, +//// NshmpGroundMotions.EPI_OFF //// )); // CSVFile inCSV = CSVFile.readFile(new File("/home/kevin/Downloads/" // + "prvi-0.2s-prvi25active-crustalFaultOnly-curves.csv"), true); NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.WeightedCombination( - WeightedList.of(new WeightedValue<>(Gmm.PRVI_2025_ACTIVE_CRUST, 0.5), - new WeightedValue<>(Gmm.PRVI_2025_ACTIVE_CRUST_ADJUSTED, 0.5)), "Name", "Name"); -// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(Gmm.TOTAL_TREE_PRVI_ACTIVE_CRUST_2025); + WeightedList.of(new WeightedValue<>(NshmpGmm.PRVI_2025_ACTIVE_CRUST, 0.5), + new WeightedValue<>(NshmpGmm.PRVI_2025_ACTIVE_CRUST_ADJUSTED, 0.5)), "Name", "Name"); +// NSHMP_GMM_Wrapper gmm = new NSHMP_GMM_Wrapper.Single(NshmpGmm.TOTAL_TREE_PRVI_ACTIVE_CRUST_2025); // gmm.setGroundMotionTreeFilter(new GroundMotionLogicTreeFilter.StringMatching( -// UsgsPrviBackbone2025.SIGMA_NGA_ID, -// GroundMotions.EPI_OFF +// NshmpUsgsPrviBackbone2025.SIGMA_NGA_ID, +// NshmpGroundMotions.EPI_OFF // )); CSVFile inCSV = CSVFile.readFile(new File("/home/kevin/Downloads/" + "prvi-0.2s-prvi25activeTotal-crustalFaultOnly-curves.csv"), true); @@ -96,11 +96,11 @@ public static void main(String[] args) throws IOException { gmm.getOtherParams().setValue(SigmaTruncLevelParam.NAME, 3d); - System.out.println("Zhype used ? Gmm.PRVI_2025_ACTIVE_CRUST: "+Gmm.PRVI_2025_ACTIVE_CRUST.constraints().get(Field.ZHYP).isPresent()); - System.out.println("Zhype used ? Gmm.PRVI_2025_ACTIVE_CRUST: "+Gmm.TOTAL_TREE_PRVI_ACTIVE_CRUST_2025.constraints().get(Field.ZHYP).isPresent()); + System.out.println("Zhype used ? NshmpGmm.PRVI_2025_ACTIVE_CRUST: "+NshmpGmm.PRVI_2025_ACTIVE_CRUST.constraints().get(Field.ZHYP).isPresent()); + System.out.println("Zhype used ? NshmpGmm.PRVI_2025_ACTIVE_CRUST: "+NshmpGmm.TOTAL_TREE_PRVI_ACTIVE_CRUST_2025.constraints().get(Field.ZHYP).isPresent()); if (gmm instanceof NSHMP_GMM_Wrapper.Single) { - Gmm singleGMM = ((NSHMP_GMM_Wrapper.Single)gmm).getGmmRef(); + NshmpGmm singleGMM = ((NSHMP_GMM_Wrapper.Single)gmm).getGmmRef(); Constraints constraints = singleGMM.constraints(); for (Field field : Field.values()) { if (constraints.get(field).isPresent()) { @@ -179,8 +179,8 @@ public static void main(String[] args) throws IOException { for (int r=0; r gmmTree = gmm.getGroundMotionTree(); + NshmpGmmInput gmmInput = gmm.getCurrentGmmInput(); + NshmpLogicTree gmmTree = gmm.getGroundMotionTree(); System.out.println("FSS rup "+testRupID+", ERF source "+testSourceID+" ("+r+")"); System.out.println(gmmInput); System.out.println(gmmTree); diff --git a/src/main/java/scratch/kevin/prvi25/SlabTestModGridProvWriter.java b/src/main/java/scratch/kevin/prvi25/SlabTestModGridProvWriter.java index 309cddcb..ce594a22 100644 --- a/src/main/java/scratch/kevin/prvi25/SlabTestModGridProvWriter.java +++ b/src/main/java/scratch/kevin/prvi25/SlabTestModGridProvWriter.java @@ -70,8 +70,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; public class SlabTestModGridProvWriter { @@ -107,7 +107,7 @@ public static void main(String[] args) throws IOException { GriddedRegion fullGrid = new GriddedRegion(PRVI25_SeismicityRegions.CRUSTAL.load(), 0.1, GriddedRegion.ANCHOR_0_0); // write out 2003 as is, and keep track of the overall rate and PDF while we're at it - HazardModel prevModel = HazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); + NshmpHazardModel prevModel = NshmpHazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); // needs to be include for slab and interface NshmErf subERF = new NshmErf(prevModel, Set.of(TectonicRegionType.SUBDUCTION_SLAB), IncludeBackgroundOption.INCLUDE); diff --git a/src/main/java/scratch/kevin/prvi25/figures/IndividualMFDPlots.java b/src/main/java/scratch/kevin/prvi25/figures/IndividualMFDPlots.java index dc173fa9..2531a86b 100644 --- a/src/main/java/scratch/kevin/prvi25/figures/IndividualMFDPlots.java +++ b/src/main/java/scratch/kevin/prvi25/figures/IndividualMFDPlots.java @@ -68,7 +68,7 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmErf; import net.mahdilamb.colormap.Colors; import scratch.kevin.latex.LaTeXUtils; import scratch.kevin.prvi25.SubductionCombinedModelCreator; diff --git a/src/main/java/scratch/kevin/prvi25/figures/SeismicityPDFFigures.java b/src/main/java/scratch/kevin/prvi25/figures/SeismicityPDFFigures.java index d319a613..2548d3e4 100644 --- a/src/main/java/scratch/kevin/prvi25/figures/SeismicityPDFFigures.java +++ b/src/main/java/scratch/kevin/prvi25/figures/SeismicityPDFFigures.java @@ -50,8 +50,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Range; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import static scratch.kevin.prvi25.figures.PRVI_Paths.*; @@ -89,7 +89,7 @@ public static void main(String[] args) throws IOException { plotPDFs(subOutputDir, "sub_slab_m5", 5, avgDecluster, avgSmooth, fullGrid, "Intraslab", PRVI25_SeismicityRegions.CAR_INTRASLAB, PRVI25_SeismicityRegions.MUE_INTRASLAB); - HazardModel prevModel = HazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); + NshmpHazardModel prevModel = NshmpHazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); // needs to be include for slab and interface NshmErf subERF = new NshmErf(prevModel, Set.of(TectonicRegionType.SUBDUCTION_SLAB, TectonicRegionType.SUBDUCTION_INTERFACE), IncludeBackgroundOption.INCLUDE); diff --git a/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java b/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java index 4f09e49b..fde0c0cb 100644 --- a/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java +++ b/src/main/java/scratch/kevin/prvi25/figures/SiteHazardInvestigationsPageGen.java @@ -68,8 +68,8 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.HazardModel; -import gov.usgs.earthquake.nshmp.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmpHazardModel; +import org.opensha.nshmp.shaded.model.NshmErf; import net.mahdilamb.colormap.Colors; public class SiteHazardInvestigationsPageGen { @@ -94,7 +94,7 @@ public static void main(String[] args) throws IOException { disaggIndvERF.setGriddedSeismicitySettings(erf.getGriddedSeismicitySettings().forSupersamplingSettings(null)); disaggIndvERF.updateForecast(); - HazardModel prevModel = HazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); + NshmpHazardModel prevModel = NshmpHazardModel.load(Path.of("/home/kevin/OpenSHA/nshm23/nshmp-haz-models/nshm-prvi-2003-main")); // needs to be include for slab and interface NshmErf prevERF = new NshmErf(prevModel, EnumSet.allOf(TectonicRegionType.class), IncludeBackgroundOption.INCLUDE); diff --git a/src/main/java/scratch/kevin/simulators/ruptures/CatalogGMPE_Compare.java b/src/main/java/scratch/kevin/simulators/ruptures/CatalogGMPE_Compare.java index 5bfa6aef..881255f1 100644 --- a/src/main/java/scratch/kevin/simulators/ruptures/CatalogGMPE_Compare.java +++ b/src/main/java/scratch/kevin/simulators/ruptures/CatalogGMPE_Compare.java @@ -65,7 +65,7 @@ import com.google.common.collect.Lists; import com.google.common.primitives.Doubles; -import gov.usgs.earthquake.nshmp.gmm.Gmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; import scratch.kevin.bbp.BBP_Module.VelocityModel; import scratch.kevin.bbp.BBP_Site; import scratch.kevin.bbp.BBP_SourceFile; @@ -616,7 +616,7 @@ public static void main(String[] args) throws ZipException, IOException { // AttenRelRef rotDGMPE = null; // AttenRelSupplier[] gmpeRefs = { -// new NSHMP_AttenRelSupplier(Gmm.AG_20_GLOBAL_INTERFACE, "AG2020_Global", false) +// new NSHMP_AttenRelSupplier(NshmpGmm.AG_20_GLOBAL_INTERFACE, "AG2020_Global", false) // }; // IMT[] imts = { IMT.SA2P0, IMT.SA3P0, IMT.SA5P0, IMT.SA10P0 }; // AttenRelRef rotDGMPE = null; diff --git a/src/main/java/scratch/kevin/simulators/ruptures/subduction/CrustalAndSubductionPageGen.java b/src/main/java/scratch/kevin/simulators/ruptures/subduction/CrustalAndSubductionPageGen.java index 38377ce2..7eac9ca4 100644 --- a/src/main/java/scratch/kevin/simulators/ruptures/subduction/CrustalAndSubductionPageGen.java +++ b/src/main/java/scratch/kevin/simulators/ruptures/subduction/CrustalAndSubductionPageGen.java @@ -69,7 +69,7 @@ import com.google.common.collect.Table.Cell; import com.google.common.primitives.Doubles; -import gov.usgs.earthquake.nshmp.gmm.Gmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; import scratch.kevin.bbp.BBP_Module.VelocityModel; import scratch.kevin.bbp.BBP_Site; import scratch.kevin.simCompare.MultiRupGMPE_ComparePageGen; @@ -209,7 +209,7 @@ public static void main(String[] args) throws IOException { // AttenRelSupplier subductionGMM = AttenRelRef.ZHAO_2006; AttenRelSupplier subductionGMM = new NSHMP_AttenRelSupplier( - Gmm.AG_20_GLOBAL_INTERFACE, "AG2020 (Global)", false); + NshmpGmm.AG_20_GLOBAL_INTERFACE, "AG2020 (Global)", false); AttenRelSupplier crustalGMM = AttenRelRef.ASK_2014; Quantity[] mapQuantities = {Quantity.SUM_SQ}; diff --git a/src/main/java/scratch/kevin/ucerf3/PureScratch.java b/src/main/java/scratch/kevin/ucerf3/PureScratch.java index 811e7fba..a1a4917f 100644 --- a/src/main/java/scratch/kevin/ucerf3/PureScratch.java +++ b/src/main/java/scratch/kevin/ucerf3/PureScratch.java @@ -228,14 +228,14 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import gov.usgs.earthquake.nshmp.gmm.Gmm; -import gov.usgs.earthquake.nshmp.gmm.GmmInput; -import gov.usgs.earthquake.nshmp.gmm.GroundMotion; -import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel; -import gov.usgs.earthquake.nshmp.gmm.Imt; -import gov.usgs.earthquake.nshmp.mfd.Mfd.Properties.GutenbergRichter; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSurface; +import org.opensha.nshmp.shaded.gmm.NshmpGmm; +import org.opensha.nshmp.shaded.gmm.NshmpGmmInput; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotion; +import org.opensha.nshmp.shaded.gmm.NshmpGroundMotionModel; +import org.opensha.nshmp.shaded.gmm.NshmpImt; +import org.opensha.nshmp.shaded.mfd.NshmpMfd.Properties.GutenbergRichter; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSurface; import net.mahdilamb.colormap.Colors; import scratch.UCERF3.enumTreeBranches.DeformationModels; import scratch.UCERF3.enumTreeBranches.FaultModels; @@ -2724,7 +2724,7 @@ private static void test320() throws IOException { private static void test321() throws IOException { // NSHMP_GMM_EpistemicBranchLevel level = new NSHMP_GMM_EpistemicBranchLevel( -// NSHMP_GMM_EpistemicBranchLevel.buildNodes(Gmm.USGS_PRVI_ACTIVE_CRUST, "Active", true), "Crustal GMM", "CrustalGMM"); +// NSHMP_GMM_EpistemicBranchLevel.buildNodes(NshmpGmm.USGS_PRVI_ACTIVE_CRUST, "Active", true), "Crustal GMM", "CrustalGMM"); // System.out.println("Level name: "+level.getName()); // System.out.println("Level short name: "+level.getShortName()); // for (NSHMP_GMM_Branch branch : level.getNodes()) { @@ -3164,7 +3164,7 @@ private static void test340() throws IOException { } private static void test341() throws IOException { - GroundMotionModel gmm = Gmm.COMBINED_PRVI_INTRASLAB_2025.instance(Imt.SA0P2); + NshmpGroundMotionModel gmm = NshmpGmm.COMBINED_PRVI_INTRASLAB_2025.instance(NshmpImt.SA0P2); double depth = 80d; double rJB = 0d; @@ -3177,10 +3177,10 @@ private static void test341() throws IOException { double vs30 = 760; double width = 0d; - GmmInput input = GmmInput.builder().dip(dip).distances(rJB, rRup, rX).mag(mag).rake(rake).vs30(vs30) + NshmpGmmInput input = NshmpGmmInput.builder().dip(dip).distances(rJB, rRup, rX).mag(mag).rake(rake).vs30(vs30) .width(width).z1p0(Double.NaN).z2p5(Double.NaN).zSed(Double.NaN).zHyp(depth).zTor(depth).build(); System.out.println(input); - gov.usgs.earthquake.nshmp.tree.LogicTree result = gmm.calc(input); + org.opensha.nshmp.shaded.tree.NshmpLogicTree result = gmm.calc(input); System.out.println("Ground motion logic tree:\n"+result); System.out.println("weighted mean="+(float)Math.exp(NSHMP_GMM_Wrapper.getWeightedMean(result)) +", sigma="+(float)NSHMP_GMM_Wrapper.getWeightedStdDev(result)); diff --git a/src/main/java/scratch/ned/nshm23/AK_FSS_creator.java b/src/main/java/scratch/ned/nshm23/AK_FSS_creator.java index 4655dcae..25a8975d 100644 --- a/src/main/java/scratch/ned/nshm23/AK_FSS_creator.java +++ b/src/main/java/scratch/ned/nshm23/AK_FSS_creator.java @@ -35,8 +35,8 @@ import com.google.common.base.Preconditions; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; import scratch.ned.nshm23.CEUS_FSS_creator.FaultModelEnum; public class AK_FSS_creator { diff --git a/src/main/java/scratch/ned/nshm23/AK_FaultZones_creator.java b/src/main/java/scratch/ned/nshm23/AK_FaultZones_creator.java index b022c2b2..c3e09336 100644 --- a/src/main/java/scratch/ned/nshm23/AK_FaultZones_creator.java +++ b/src/main/java/scratch/ned/nshm23/AK_FaultZones_creator.java @@ -17,8 +17,8 @@ import org.opensha.sha.magdist.SummedMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; import scratch.ned.nshm23.CEUS_FaultZones_creator.NSHM_SrcZoneData; public class AK_FaultZones_creator { diff --git a/src/main/java/scratch/ned/nshm23/AleutianArc_FSS_Creator.java b/src/main/java/scratch/ned/nshm23/AleutianArc_FSS_Creator.java index 748f0e1d..269d523a 100644 --- a/src/main/java/scratch/ned/nshm23/AleutianArc_FSS_Creator.java +++ b/src/main/java/scratch/ned/nshm23/AleutianArc_FSS_Creator.java @@ -15,9 +15,9 @@ import org.opensha.sha.magdist.SummedMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.fault.surface.ApproxGriddedSurface; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.fault.surface.NshmpApproxGriddedSurface; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; import scratch.ned.nshm23.CEUS_FSS_creator.FaultModelEnum; public class AleutianArc_FSS_Creator { @@ -511,13 +511,13 @@ public static void main(String[] args) { // getFaultSystemSolution(nshmModelDirPath, FaultModelEnum.GEOLOGIC_WIDE); - // THIS IS HOW PETER CREATES THE SURFACE (FROM gov.usgs.earthquake.nshmp.model.InterfaceSource.InterfaceSource(Builder)) + // THIS IS HOW PETER CREATES THE SURFACE (FROM the shaded NSHMP InterfaceSource builder) // upperTrace = feature.traces.get(0); // upperTraceLength = upperTrace.length(); // lowerTrace = feature.traces.get(feature.traces.size() - 1); // lowerTraceLength = lowerTrace.length(); // -// surface = new ApproxGriddedSurface(upperTrace, lowerTrace, config.surfaceSpacing); +// surface = new NshmpApproxGriddedSurface(upperTrace, lowerTrace, config.surfaceSpacing); // THIS IS OURS (same constructor arguments): // ApproxEvenlyGriddedSurface surf; diff --git a/src/main/java/scratch/ned/nshm23/CEUS_FSS_creator.java b/src/main/java/scratch/ned/nshm23/CEUS_FSS_creator.java index fe841fb1..d57585ce 100644 --- a/src/main/java/scratch/ned/nshm23/CEUS_FSS_creator.java +++ b/src/main/java/scratch/ned/nshm23/CEUS_FSS_creator.java @@ -34,8 +34,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; /** * This class creates a list of fault system solutions (FSS) out of the 2023 CEUS fault-based sources. All fault diff --git a/src/main/java/scratch/ned/nshm23/CEUS_FaultZones_creator.java b/src/main/java/scratch/ned/nshm23/CEUS_FaultZones_creator.java index ef08d1e5..5bae92f6 100644 --- a/src/main/java/scratch/ned/nshm23/CEUS_FaultZones_creator.java +++ b/src/main/java/scratch/ned/nshm23/CEUS_FaultZones_creator.java @@ -28,8 +28,8 @@ import org.opensha.sha.magdist.IncrementalMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; /** @@ -755,7 +755,7 @@ public static void main(String[] args) { ////// System.out.println(id+"\t"+src.getName()); //// // -78 38 //// if(Math.abs(loc.getLatitude()-targetLoc.getLatitude())<0.0001 && Math.abs(loc.getLongitude()-targetLoc.getLongitude())<0.0001) { -////// gov.usgs.earthquake.nshmp.model.NshmSource.Point +////// org.opensha.nshmp.shaded.model.NshmSource.Point ////// double strike = src.getDelegate().get(0).surface().strike(); //// int numSurfPts = src.getRupture(0).getRuptureSurface().getEvenlyDiscretizedNumLocs(); //// System.out.println(s+"\t"+id+"\t"+src.getNumRuptures()+"\t"+mMinSrc+"\t"+mMaxSrc+"\t"+ diff --git a/src/main/java/scratch/ned/nshm23/Cascadia_FSS_creator.java b/src/main/java/scratch/ned/nshm23/Cascadia_FSS_creator.java index c2a5f4bb..a3039ecb 100644 --- a/src/main/java/scratch/ned/nshm23/Cascadia_FSS_creator.java +++ b/src/main/java/scratch/ned/nshm23/Cascadia_FSS_creator.java @@ -15,9 +15,9 @@ import org.opensha.sha.magdist.SummedMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.fault.surface.ApproxGriddedSurface; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.fault.surface.NshmpApproxGriddedSurface; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; import scratch.ned.nshm23.CEUS_FSS_creator.FaultModelEnum; public class Cascadia_FSS_creator { @@ -509,13 +509,13 @@ public static void main(String[] args) { // System.out.println("Trace:\n\n"+sect.getFaultTrace()); // System.exit(0); - // THIS IS HOW PETER CREATES THE SURFACE (FROM gov.usgs.earthquake.nshmp.model.InterfaceSource.InterfaceSource(Builder)) + // THIS IS HOW PETER CREATES THE SURFACE (FROM the shaded NSHMP InterfaceSource builder) // upperTrace = feature.traces.get(0); // upperTraceLength = upperTrace.length(); // lowerTrace = feature.traces.get(feature.traces.size() - 1); // lowerTraceLength = lowerTrace.length(); // -// surface = new ApproxGriddedSurface(upperTrace, lowerTrace, config.surfaceSpacing); +// surface = new NshmpApproxGriddedSurface(upperTrace, lowerTrace, config.surfaceSpacing); // THIS IS OURS (same constructor arguments): // ApproxEvenlyGriddedSurface surf; diff --git a/src/main/java/scratch/ned/nshm23/MiscPlots.java b/src/main/java/scratch/ned/nshm23/MiscPlots.java index 763475bb..e20dd798 100644 --- a/src/main/java/scratch/ned/nshm23/MiscPlots.java +++ b/src/main/java/scratch/ned/nshm23/MiscPlots.java @@ -41,8 +41,8 @@ import org.opensha.sha.magdist.SummedMagFreqDist; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSurface; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSurface; import scratch.UCERF3.enumTreeBranches.ScalingRelationships; import scratch.ned.FSS_Inversion2019.PlottingUtils; diff --git a/src/main/java/scratch/ned/nshm23/NshmErfTest.java b/src/main/java/scratch/ned/nshm23/NshmErfTest.java index bf2d1a53..36d077a2 100644 --- a/src/main/java/scratch/ned/nshm23/NshmErfTest.java +++ b/src/main/java/scratch/ned/nshm23/NshmErfTest.java @@ -20,8 +20,8 @@ import org.opensha.sha.imr.param.SiteParams.Vs30_Param; import org.opensha.sha.util.TectonicRegionType; -import gov.usgs.earthquake.nshmp.model.NshmErf; -import gov.usgs.earthquake.nshmp.model.NshmSource; +import org.opensha.nshmp.shaded.model.NshmErf; +import org.opensha.nshmp.shaded.model.NshmSource; public class NshmErfTest {