Skip to content
Snippets Groups Projects
Commit 5f36a4a2 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

Merge branch 'disagg-interface-sys-fix' into 'main'

Disagg interface system fix

See merge request ghsc/users/pmpowers/nshmp-lib!24
parents d0fbc67e 07b981dd
No related branches found
No related tags found
1 merge request!436Prvi gmm 251
......@@ -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);
}
......
......@@ -91,6 +91,8 @@ final class Disaggregator {
return processClusterSources();
case FAULT_SYSTEM:
return processSystemSources();
case INTERFACE_SYSTEM:
return processSystemSources();
default:
return processSources();
}
......
......@@ -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)
......
......@@ -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)",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment