diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java index 46ed521df15328e9d2ac625e6eea4339276efc40..6754d0204170a468118ff89f09d189538b96b658 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java @@ -491,6 +491,9 @@ final class DisaggDataset { case FAULT_SYSTEM: putOrAddSystem((SystemContributor) disaggContributor); break; + case INTERFACE_SYSTEM: + putOrAddSystem((SystemContributor) disaggContributor); + break; default: putOrAddSource((SourceContributor) disaggContributor); } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java index 890106785db1f3056302bf8fb36924b9900306fb..4487a2ffa73b0290a1ee1b2102d3bf529f5583ba 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java @@ -91,6 +91,8 @@ final class Disaggregator { return processClusterSources(); case FAULT_SYSTEM: return processSystemSources(); + case INTERFACE_SYSTEM: + return processSystemSources(); default: return processSources(); } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java index 35f95b04b91cc4afe43a1caff2c8cbfdf137de07..1e1e7b639f6a7a0f81e49ed8680c66b8e6619395 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java @@ -258,7 +258,7 @@ public final class HazardExport { private static String magsFilename(Site site) { String baseName = String.format( - "%.2f,%.2f.csv", + "%s,%s.csv", site.location().longitude, site.location().latitude); return site.name().equals(Site.NO_NAME) diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java index 33b893b1b72d3f3a3d480c425394de8ce937e33d..b3de9e2e29cda55ad6d03cd683ac549074471783 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java @@ -1907,7 +1907,9 @@ public enum Gmm { SILVA_02, SOMERVILLE_01, TP_05, - TORO_97_MW)), + TORO_97_MW, + CONUS_STABLE_CRUST_2014_FAULT, + CONUS_STABLE_CRUST_2014_GRID)), WUS_14_ACTIVE_CRUST( "2014 Active Crust (WUS)",