From 5f6185540952a9136f1d3703b5d0243ad0794c3b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 25 Sep 2022 11:18:17 -0600
Subject: [PATCH 1/5] cybershake and m9 regions
---
.../gmm-model/los-angeles-cybershake.geojson | 24 +++++
site-data/gmm-model/seattle-m9.geojson | 92 +++++++++++++++++++
2 files changed, 116 insertions(+)
create mode 100644 site-data/gmm-model/los-angeles-cybershake.geojson
create mode 100644 site-data/gmm-model/seattle-m9.geojson
diff --git a/site-data/gmm-model/los-angeles-cybershake.geojson b/site-data/gmm-model/los-angeles-cybershake.geojson
new file mode 100644
index 0000000..3813b57
--- /dev/null
+++ b/site-data/gmm-model/los-angeles-cybershake.geojson
@@ -0,0 +1,24 @@
+{
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[
+ [-119.66000, 34.28000],
+ [-119.97172, 34.43575],
+ [-119.76298, 34.51493],
+ [-119.39952, 34.70065],
+ [-119.19960, 34.79709],
+ [-118.64526, 34.70718],
+ [-117.98979, 34.45032],
+ [-117.74823, 34.11186],
+ [-117.49204, 33.91388],
+ [-117.39105, 33.26888],
+ [-118.17976, 33.49368],
+ [-119.66000, 34.28000]
+ ]]
+ },
+ "properties": {
+ "name": "Los Angeles, CyberShake",
+ "id": "LA_CYBERSHAKE"
+ }
+}
diff --git a/site-data/gmm-model/seattle-m9.geojson b/site-data/gmm-model/seattle-m9.geojson
new file mode 100644
index 0000000..89df2bb
--- /dev/null
+++ b/site-data/gmm-model/seattle-m9.geojson
@@ -0,0 +1,92 @@
+{
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[
+ [-122.81668, 47.600582],
+ [-122.82232, 47.622847],
+ [-122.83142, 47.636651],
+ [-122.84324, 47.652848],
+ [-122.8479, 47.667883],
+ [-122.84724, 47.684156],
+ [-122.83867, 47.710118],
+ [-122.8273, 47.72766],
+ [-122.82931, 47.743914],
+ [-122.83479, 47.752917],
+ [-122.84657, 47.764891],
+ [-122.8423, 47.779375],
+ [-122.84338, 47.793222],
+ [-122.85433, 47.808814],
+ [-122.85449, 47.820257],
+ [-122.83146, 47.836662],
+ [-122.80478, 47.848869],
+ [-122.77353, 47.853267],
+ [-122.73583, 47.843842],
+ [-122.69643, 47.840438],
+ [-122.65528, 47.840042],
+ [-122.60064, 47.832467],
+ [-122.56478, 47.82419],
+ [-122.52537, 47.817122],
+ [-122.49143, 47.821466],
+ [-122.44762, 47.823425],
+ [-122.41091, 47.816315],
+ [-122.38938, 47.80614],
+ [-122.36696, 47.793554],
+ [-122.34817, 47.790592],
+ [-122.32763, 47.793053],
+ [-122.29459, 47.799755],
+ [-122.26871, 47.811252],
+ [-122.22404, 47.821573],
+ [-122.18111, 47.819831],
+ [-122.13639, 47.814463],
+ [-122.08541, 47.802459],
+ [-122.04875, 47.79525],
+ [-122.0264, 47.783812],
+ [-122.01031, 47.770562],
+ [-121.97637, 47.741044],
+ [-121.95048, 47.719952],
+ [-121.93712, 47.697053],
+ [-121.91841, 47.674147],
+ [-121.89704, 47.645812],
+ [-121.89173, 47.622909],
+ [-121.8891, 47.600609],
+ [-121.89447, 47.583136],
+ [-121.92209, 47.578333],
+ [-121.94614, 47.580153],
+ [-121.96395, 47.585583],
+ [-121.99246, 47.585588],
+ [-122.03165, 47.577749],
+ [-122.07262, 47.577733],
+ [-122.11805, 47.577098],
+ [-122.16526, 47.580062],
+ [-122.2, 47.579412],
+ [-122.24273, 47.573314],
+ [-122.26765,47.569651],
+ [-122.30598, 47.575596],
+ [-122.33714, 47.572508],
+ [-122.35495, 47.571859],
+ [-122.40489, 47.581964],
+ [-122.42092, 47.581914],
+ [-122.43784, 47.580655],
+ [-122.43791, 47.590298],
+ [-122.46554, 47.592616],
+ [-122.46561, 47.602258],
+ [-122.52451, 47.611684],
+ [-122.57982, 47.617483],
+ [-122.60567, 47.618574],
+ [-122.63595, 47.615421],
+ [-122.66531, 47.61106],
+ [-122.69378, 47.606697],
+ [-122.72141, 47.607155],
+ [-122.73565, 47.605872],
+ [-122.77839, 47.602618],
+ [-122.80421, 47.60126],
+ [-122.81667, 47.59998]
+ ]]
+ },
+ "properties": {
+ "name": "Seattle, M9",
+ "id": "SEATTLE_M9"
+
+ }
+}
\ No newline at end of file
--
GitLab
From 3c83919e13b24ff40f87306a3c9871c6e93dfb0c Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 25 Sep 2022 11:37:09 -0600
Subject: [PATCH 2/5] site-data readme
---
README.md | 4 +-
site-data/README.md | 7 +
site-data/gmm-model/seattle-m9.geojson | 179 ++++++++++++-------------
3 files changed, 98 insertions(+), 92 deletions(-)
create mode 100644 site-data/README.md
diff --git a/README.md b/README.md
index 171f1b3..efbdd99 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ For details on the format of this model, see the *nshmp-haz*
## Site Files
-The `map-conus.geojson` file defines the latitude-longitude range over which the USGS computes
-maps of seismic hazard from this model. The `sites-conus.geojson` and `sites-conus.csv` files
+The `map.geojson` file defines the latitude-longitude range over which the USGS computes
+maps of seismic hazard from this model. The `sites.geojson` and `sites.csv` files
contain the test sites at which the USGS performs more detailed comparisons between model editions.
See the *nshmp-haz* user guide [site specification section][5] for more details on these files.
diff --git a/site-data/README.md b/site-data/README.md
new file mode 100644
index 0000000..41a427c
--- /dev/null
+++ b/site-data/README.md
@@ -0,0 +1,7 @@
+# Site Data
+
+This directory contains data and information required by GMMs to enable site or region specific
+behavior. The `basin` directory contains <i>z</i><sub>1.0</sub> and <i>z</i><sub>2.5</sub> values
+for Western U.S. basins. The `margin` directory contains sediment thickness, <i>z<sub>Sed</sub></i>
+data for the Gulf and Atlantic coastal plains. The `gmm-model` directory defines areas over which
+simulation based results are applied.
diff --git a/site-data/gmm-model/seattle-m9.geojson b/site-data/gmm-model/seattle-m9.geojson
index 89df2bb..b66a9ec 100644
--- a/site-data/gmm-model/seattle-m9.geojson
+++ b/site-data/gmm-model/seattle-m9.geojson
@@ -1,92 +1,91 @@
{
- "type": "Feature",
- "geometry": {
- "type": "Polygon",
- "coordinates": [[
- [-122.81668, 47.600582],
- [-122.82232, 47.622847],
- [-122.83142, 47.636651],
- [-122.84324, 47.652848],
- [-122.8479, 47.667883],
- [-122.84724, 47.684156],
- [-122.83867, 47.710118],
- [-122.8273, 47.72766],
- [-122.82931, 47.743914],
- [-122.83479, 47.752917],
- [-122.84657, 47.764891],
- [-122.8423, 47.779375],
- [-122.84338, 47.793222],
- [-122.85433, 47.808814],
- [-122.85449, 47.820257],
- [-122.83146, 47.836662],
- [-122.80478, 47.848869],
- [-122.77353, 47.853267],
- [-122.73583, 47.843842],
- [-122.69643, 47.840438],
- [-122.65528, 47.840042],
- [-122.60064, 47.832467],
- [-122.56478, 47.82419],
- [-122.52537, 47.817122],
- [-122.49143, 47.821466],
- [-122.44762, 47.823425],
- [-122.41091, 47.816315],
- [-122.38938, 47.80614],
- [-122.36696, 47.793554],
- [-122.34817, 47.790592],
- [-122.32763, 47.793053],
- [-122.29459, 47.799755],
- [-122.26871, 47.811252],
- [-122.22404, 47.821573],
- [-122.18111, 47.819831],
- [-122.13639, 47.814463],
- [-122.08541, 47.802459],
- [-122.04875, 47.79525],
- [-122.0264, 47.783812],
- [-122.01031, 47.770562],
- [-121.97637, 47.741044],
- [-121.95048, 47.719952],
- [-121.93712, 47.697053],
- [-121.91841, 47.674147],
- [-121.89704, 47.645812],
- [-121.89173, 47.622909],
- [-121.8891, 47.600609],
- [-121.89447, 47.583136],
- [-121.92209, 47.578333],
- [-121.94614, 47.580153],
- [-121.96395, 47.585583],
- [-121.99246, 47.585588],
- [-122.03165, 47.577749],
- [-122.07262, 47.577733],
- [-122.11805, 47.577098],
- [-122.16526, 47.580062],
- [-122.2, 47.579412],
- [-122.24273, 47.573314],
- [-122.26765,47.569651],
- [-122.30598, 47.575596],
- [-122.33714, 47.572508],
- [-122.35495, 47.571859],
- [-122.40489, 47.581964],
- [-122.42092, 47.581914],
- [-122.43784, 47.580655],
- [-122.43791, 47.590298],
- [-122.46554, 47.592616],
- [-122.46561, 47.602258],
- [-122.52451, 47.611684],
- [-122.57982, 47.617483],
- [-122.60567, 47.618574],
- [-122.63595, 47.615421],
- [-122.66531, 47.61106],
- [-122.69378, 47.606697],
- [-122.72141, 47.607155],
- [-122.73565, 47.605872],
- [-122.77839, 47.602618],
- [-122.80421, 47.60126],
- [-122.81667, 47.59998]
- ]]
- },
- "properties": {
- "name": "Seattle, M9",
- "id": "SEATTLE_M9"
-
- }
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[
+ [-122.81668, 47.600582],
+ [-122.82232, 47.622847],
+ [-122.83142, 47.636651],
+ [-122.84324, 47.652848],
+ [-122.8479, 47.667883],
+ [-122.84724, 47.684156],
+ [-122.83867, 47.710118],
+ [-122.8273, 47.72766],
+ [-122.82931, 47.743914],
+ [-122.83479, 47.752917],
+ [-122.84657, 47.764891],
+ [-122.8423, 47.779375],
+ [-122.84338, 47.793222],
+ [-122.85433, 47.808814],
+ [-122.85449, 47.820257],
+ [-122.83146, 47.836662],
+ [-122.80478, 47.848869],
+ [-122.77353, 47.853267],
+ [-122.73583, 47.843842],
+ [-122.69643, 47.840438],
+ [-122.65528, 47.840042],
+ [-122.60064, 47.832467],
+ [-122.56478, 47.82419],
+ [-122.52537, 47.817122],
+ [-122.49143, 47.821466],
+ [-122.44762, 47.823425],
+ [-122.41091, 47.816315],
+ [-122.38938, 47.80614],
+ [-122.36696, 47.793554],
+ [-122.34817, 47.790592],
+ [-122.32763, 47.793053],
+ [-122.29459, 47.799755],
+ [-122.26871, 47.811252],
+ [-122.22404, 47.821573],
+ [-122.18111, 47.819831],
+ [-122.13639, 47.814463],
+ [-122.08541, 47.802459],
+ [-122.04875, 47.79525],
+ [-122.0264, 47.783812],
+ [-122.01031, 47.770562],
+ [-121.97637, 47.741044],
+ [-121.95048, 47.719952],
+ [-121.93712, 47.697053],
+ [-121.91841, 47.674147],
+ [-121.89704, 47.645812],
+ [-121.89173, 47.622909],
+ [-121.8891, 47.600609],
+ [-121.89447, 47.583136],
+ [-121.92209, 47.578333],
+ [-121.94614, 47.580153],
+ [-121.96395, 47.585583],
+ [-121.99246, 47.585588],
+ [-122.03165, 47.577749],
+ [-122.07262, 47.577733],
+ [-122.11805, 47.577098],
+ [-122.16526, 47.580062],
+ [-122.2, 47.579412],
+ [-122.24273, 47.573314],
+ [-122.26765,47.569651],
+ [-122.30598, 47.575596],
+ [-122.33714, 47.572508],
+ [-122.35495, 47.571859],
+ [-122.40489, 47.581964],
+ [-122.42092, 47.581914],
+ [-122.43784, 47.580655],
+ [-122.43791, 47.590298],
+ [-122.46554, 47.592616],
+ [-122.46561, 47.602258],
+ [-122.52451, 47.611684],
+ [-122.57982, 47.617483],
+ [-122.60567, 47.618574],
+ [-122.63595, 47.615421],
+ [-122.66531, 47.61106],
+ [-122.69378, 47.606697],
+ [-122.72141, 47.607155],
+ [-122.73565, 47.605872],
+ [-122.77839, 47.602618],
+ [-122.80421, 47.60126],
+ [-122.81667, 47.59998]
+ ]]
+ },
+ "properties": {
+ "name": "Seattle, M9",
+ "id": "SEATTLE_M9"
+ }
}
\ No newline at end of file
--
GitLab
From 54770d72237298a4db09e1c322fd92f9c58ef4d6 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 25 Sep 2022 11:52:33 -0600
Subject: [PATCH 3/5] rename gmm-model to simulation
---
site-data/README.md | 2 +-
.../{gmm-model => simulation}/los-angeles-cybershake.geojson | 0
site-data/{gmm-model => simulation}/seattle-m9.geojson | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename site-data/{gmm-model => simulation}/los-angeles-cybershake.geojson (100%)
rename site-data/{gmm-model => simulation}/seattle-m9.geojson (100%)
diff --git a/site-data/README.md b/site-data/README.md
index 41a427c..1d6e0b7 100644
--- a/site-data/README.md
+++ b/site-data/README.md
@@ -3,5 +3,5 @@
This directory contains data and information required by GMMs to enable site or region specific
behavior. The `basin` directory contains <i>z</i><sub>1.0</sub> and <i>z</i><sub>2.5</sub> values
for Western U.S. basins. The `margin` directory contains sediment thickness, <i>z<sub>Sed</sub></i>
-data for the Gulf and Atlantic coastal plains. The `gmm-model` directory defines areas over which
+data for the Gulf and Atlantic coastal plains. The `simulation` directory defines areas over which
simulation based results are applied.
diff --git a/site-data/gmm-model/los-angeles-cybershake.geojson b/site-data/simulation/los-angeles-cybershake.geojson
similarity index 100%
rename from site-data/gmm-model/los-angeles-cybershake.geojson
rename to site-data/simulation/los-angeles-cybershake.geojson
diff --git a/site-data/gmm-model/seattle-m9.geojson b/site-data/simulation/seattle-m9.geojson
similarity index 100%
rename from site-data/gmm-model/seattle-m9.geojson
rename to site-data/simulation/seattle-m9.geojson
--
GitLab
From f99905ba29cc51dda2eb8bf04fc8454262f477de Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Sep 2022 10:39:08 -0600
Subject: [PATCH 4/5] change dir name to gmm-flag
---
site-data/README.md | 4 ++--
.../{simulation => gmm-flag}/los-angeles-cybershake.geojson | 0
site-data/{simulation => gmm-flag}/seattle-m9.geojson | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename site-data/{simulation => gmm-flag}/los-angeles-cybershake.geojson (100%)
rename site-data/{simulation => gmm-flag}/seattle-m9.geojson (100%)
diff --git a/site-data/README.md b/site-data/README.md
index 1d6e0b7..725acdc 100644
--- a/site-data/README.md
+++ b/site-data/README.md
@@ -3,5 +3,5 @@
This directory contains data and information required by GMMs to enable site or region specific
behavior. The `basin` directory contains <i>z</i><sub>1.0</sub> and <i>z</i><sub>2.5</sub> values
for Western U.S. basins. The `margin` directory contains sediment thickness, <i>z<sub>Sed</sub></i>
-data for the Gulf and Atlantic coastal plains. The `simulation` directory defines areas over which
-simulation based results are applied.
+data for the Gulf and Atlantic coastal plains. The `gmm-flag` directory defines areas over which
+region-specific behavior may be applied in a GMM.
diff --git a/site-data/simulation/los-angeles-cybershake.geojson b/site-data/gmm-flag/los-angeles-cybershake.geojson
similarity index 100%
rename from site-data/simulation/los-angeles-cybershake.geojson
rename to site-data/gmm-flag/los-angeles-cybershake.geojson
diff --git a/site-data/simulation/seattle-m9.geojson b/site-data/gmm-flag/seattle-m9.geojson
similarity index 100%
rename from site-data/simulation/seattle-m9.geojson
rename to site-data/gmm-flag/seattle-m9.geojson
--
GitLab
From b4c14fd84893e0eb0be36cf03900ecbdcc73e72f Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Sep 2022 21:21:50 -0600
Subject: [PATCH 5/5] wus logic tree update for bssa 14 cyber
---
active-crust/gmm-tree.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/active-crust/gmm-tree.json b/active-crust/gmm-tree.json
index 6a94f67..1129f14 100644
--- a/active-crust/gmm-tree.json
+++ b/active-crust/gmm-tree.json
@@ -1,6 +1,7 @@
[
{ "id": "ASK_14_BASIN", "weight": 0.25 },
- { "id": "BSSA_14_BASIN", "weight": 0.25 },
+ { "id": "BSSA_14_BASIN", "weight": 0.1875 },
+ { "id": "BSSA_14_CYBERSHAKE_CENTERED", "weight": 0.0625 },
{ "id": "CB_14_BASIN", "weight": 0.25 },
{ "id": "CY_14_BASIN", "weight": 0.25 }
]
--
GitLab