diff --git a/etc/peer/README.md b/etc/peer/README.md new file mode 100644 index 0000000000000000000000000000000000000000..413cc96790a1447fc9620665f690681bd4264b34 --- /dev/null +++ b/etc/peer/README.md @@ -0,0 +1,17 @@ +# PEER Test Cases + +The PEER PSHA verification project developed a number of source models for the purpose of +examining the sensitivity of seismic hazard to different PSHA implementations (codes). +These test cases are used as end-to-end unit tests in `nshmp-haz`. + +For more information, including source model specifications, result tables, and summary report, +please see the [PEER Probabilistic Seismic Hazard Analysis Code Verification Report - +2018/03](https://peer.berkeley.edu/sites/default/files/2018_03_hale_final_8.13.18.pdf). + +## Implementation Notes + +- Most test cases have a version that matches the target results, but that run slowly, as + well as a'fast' implementations with coarser discretizations. +- Set1, Cases 8a, b, and c implementations are the same as the Set1, Case2 'fast' versions. +- Set2, Case1 (disagreggation) was skipped; implemented in OpenSHA. +- Set3 tests are not yet implemented. diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/fault-config.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/fault-config.json new file mode 100644 index 0000000000000000000000000000000000000000..a9f7a3125bd0b51e451edf2ad4e8ff51ea9b1d27 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/fault-config.json @@ -0,0 +1,7 @@ +{ + "surface-spacing": 0.1, + "rupture-scaling": "PEER", + "rupture-floating": "ON", + "dip-slip-model": null, + "dip-tree": null +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/features/set1-case8a.geojson b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/features/set1-case8a.geojson new file mode 100644 index 0000000000000000000000000000000000000000..665633643c4409bc58b519d1d7cb968f9b934c26 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/features/set1-case8a.geojson @@ -0,0 +1,21 @@ +{ + "type": "Feature", + "id": 1, + "geometry": { + "type": "LineString", + "coordinates": [ + [-122.00000, 38.22480], + [-122.00000, 38.00000] + ] + }, + "properties": { + "name": "Set1-Case8a fault", + "state": "CA", + "upper-depth": 0.0, + "lower-depth": 12.0, + "dip": 90.0, + "rake": 0.0, + "rate-type": "RECURRENCE", + "length": 25.0 + } +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-config.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-config.json new file mode 100644 index 0000000000000000000000000000000000000000..a0def60f99a8bcba9a16458e10af5bef3facaa92 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-config.json @@ -0,0 +1,6 @@ +{ + "epistemic-tree": null, + "aleatory-properties": null, + "minimum-magnitude": 5.0, + "nshm-bin-model": true +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-map.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-map.json new file mode 100644 index 0000000000000000000000000000000000000000..c6acf9800f5abd66e26f7899398846876125149e --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/mfd-map.json @@ -0,0 +1,13 @@ +{ + "set1-case8a-mfd": [ + { + "id": "set1-case8a", + "weight": 1.0, + "value": { + "type": "SINGLE", + "m": 6.0, + "rate": 0.016042517 + } + } + ] +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/set1-case8a/rupture-set.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/set1-case8a/rupture-set.json new file mode 100644 index 0000000000000000000000000000000000000000..77584e2b8370a18c3a931da2188581f835478b8f --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/set1-case8a/rupture-set.json @@ -0,0 +1,5 @@ +{ + "name": "PEER Set1-Case8a", + "id": 1, + "mfd-tree": "set1-case8a-mfd" +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/source-tree.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/source-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..803f0bf2e985e8578cc4c9b2b65aa1f84b8f89e3 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/source-tree.json @@ -0,0 +1,6 @@ +[ + { + "id": "set1-case8a", + "weight": 1.0 + } +] diff --git a/etc/peer/models/Set1-Case8a/active-crust/fault-sources/tree-info.json b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/tree-info.json new file mode 100644 index 0000000000000000000000000000000000000000..18ee12cf40f0cba8a8107798a74577822f713f8d --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/fault-sources/tree-info.json @@ -0,0 +1,3 @@ +{ + "id": 2 +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/gmm-config.json b/etc/peer/models/Set1-Case8a/active-crust/gmm-config.json new file mode 100644 index 0000000000000000000000000000000000000000..6a13b46fd427ef13901cc18fe5e36b81a83aad6c --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/gmm-config.json @@ -0,0 +1,5 @@ +{ + "max-distance": 200.0, + "epistemic-model": null, + "epistemic-tree": null +} diff --git a/etc/peer/models/Set1-Case8a/active-crust/gmm-tree.json b/etc/peer/models/Set1-Case8a/active-crust/gmm-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..8392687bb5778aed9e7ac67063c89c1fa5ec6e1f --- /dev/null +++ b/etc/peer/models/Set1-Case8a/active-crust/gmm-tree.json @@ -0,0 +1,3 @@ +[ + { "id": "SADIGH_97", "weight": 1.0 } +] diff --git a/etc/peer/models/Set1-Case8a/calc-config.json b/etc/peer/models/Set1-Case8a/calc-config.json new file mode 100644 index 0000000000000000000000000000000000000000..a337705d0acad883ad5a8c700a2b74f155fc3d0d --- /dev/null +++ b/etc/peer/models/Set1-Case8a/calc-config.json @@ -0,0 +1,12 @@ +{ + "hazard": { + "exceedanceModel": "TRUNCATION_OFF", + "valueFormat": "POISSON_PROBABILITY", + "imts": ["PGA"], + "customImls": { + "PGA": [ + 0.001, 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, + 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1.0] + } + } +} diff --git a/etc/peer/models/Set1-Case8a/model-info.json b/etc/peer/models/Set1-Case8a/model-info.json new file mode 100644 index 0000000000000000000000000000000000000000..abb6a5ec286edf83e2bbd51a543c5483f2bfe935 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/model-info.json @@ -0,0 +1,4 @@ +{ + "name": "PEER Set1-Case8a", + "site-class-vs30": { "BC": 760 } +} diff --git a/etc/peer/models/Set1-Case8a/sites.csv b/etc/peer/models/Set1-Case8a/sites.csv new file mode 100644 index 0000000000000000000000000000000000000000..a52a1da8aedf21d070d540365d7e0de78cf159e9 --- /dev/null +++ b/etc/peer/models/Set1-Case8a/sites.csv @@ -0,0 +1,8 @@ +name, lon, lat +PEER S1-Fault-Site1, -122.0, 38.113 +PEER S1-Fault-Site2, -122.114, 38.113 +PEER S1-Fault-Site3, -122.57, 38.111 +PEER S1-Fault-Site4, -122.0, 38.0 +PEER S1-Fault-Site5, -122.0, 37.91 +PEER S1-Fault-Site6, -122.0, 38.225 +PEER S1-Fault-Site7, -121.886, 38.113 diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/fault-config.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/fault-config.json new file mode 100644 index 0000000000000000000000000000000000000000..5d731d0b5e27c6f4a3cd2dc4a5dfda9b68eaaefa --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/fault-config.json @@ -0,0 +1,7 @@ +{ + "surface-spacing": 0.05, + "rupture-scaling": "PEER", + "rupture-floating": "ON", + "dip-slip-model": null, + "dip-tree": null +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/features/set1-case8b.geojson b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/features/set1-case8b.geojson new file mode 100644 index 0000000000000000000000000000000000000000..a39b6c732785793c9dccfc28ac1b581def4539a4 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/features/set1-case8b.geojson @@ -0,0 +1,21 @@ +{ + "type": "Feature", + "id": 1, + "geometry": { + "type": "LineString", + "coordinates": [ + [-122.00000, 38.22480], + [-122.00000, 38.00000] + ] + }, + "properties": { + "name": "Set1-Case8b fault", + "state": "CA", + "upper-depth": 0.0, + "lower-depth": 12.0, + "dip": 90.0, + "rake": 0.0, + "rate-type": "RECURRENCE", + "length": 25.0 + } +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-config.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-config.json new file mode 100644 index 0000000000000000000000000000000000000000..a0def60f99a8bcba9a16458e10af5bef3facaa92 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-config.json @@ -0,0 +1,6 @@ +{ + "epistemic-tree": null, + "aleatory-properties": null, + "minimum-magnitude": 5.0, + "nshm-bin-model": true +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-map.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-map.json new file mode 100644 index 0000000000000000000000000000000000000000..a5f5b6096477e23383a566fafa313a662d0f16b7 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/mfd-map.json @@ -0,0 +1,13 @@ +{ + "set1-case8b-mfd": [ + { + "id": "set1-case8b", + "weight": 1.0, + "value": { + "type": "SINGLE", + "m": 6.0, + "rate": 0.016042517 + } + } + ] +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/set1-case8b/rupture-set.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/set1-case8b/rupture-set.json new file mode 100644 index 0000000000000000000000000000000000000000..c14ffcab0df50bb1801d40bc0d3ec5fbc6b3ba0f --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/set1-case8b/rupture-set.json @@ -0,0 +1,5 @@ +{ + "name": "PEER Set1-Case8b", + "id": 1, + "mfd-tree": "set1-case8b-mfd" +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/source-tree.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/source-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..e6f34672bccd56f420f0d1c139775b7f70151382 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/source-tree.json @@ -0,0 +1,6 @@ +[ + { + "id": "set1-case8b", + "weight": 1.0 + } +] diff --git a/etc/peer/models/Set1-Case8b/active-crust/fault-sources/tree-info.json b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/tree-info.json new file mode 100644 index 0000000000000000000000000000000000000000..18ee12cf40f0cba8a8107798a74577822f713f8d --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/fault-sources/tree-info.json @@ -0,0 +1,3 @@ +{ + "id": 2 +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/gmm-config.json b/etc/peer/models/Set1-Case8b/active-crust/gmm-config.json new file mode 100644 index 0000000000000000000000000000000000000000..6a13b46fd427ef13901cc18fe5e36b81a83aad6c --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/gmm-config.json @@ -0,0 +1,5 @@ +{ + "max-distance": 200.0, + "epistemic-model": null, + "epistemic-tree": null +} diff --git a/etc/peer/models/Set1-Case8b/active-crust/gmm-tree.json b/etc/peer/models/Set1-Case8b/active-crust/gmm-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..8392687bb5778aed9e7ac67063c89c1fa5ec6e1f --- /dev/null +++ b/etc/peer/models/Set1-Case8b/active-crust/gmm-tree.json @@ -0,0 +1,3 @@ +[ + { "id": "SADIGH_97", "weight": 1.0 } +] diff --git a/etc/peer/models/Set1-Case8b/calc-config.json b/etc/peer/models/Set1-Case8b/calc-config.json new file mode 100644 index 0000000000000000000000000000000000000000..22745632b862b5ab240d1d330b917fc9421f507b --- /dev/null +++ b/etc/peer/models/Set1-Case8b/calc-config.json @@ -0,0 +1,13 @@ +{ + "hazard": { + "exceedanceModel": "TRUNCATION_UPPER_ONLY", + "truncationLevel": 2.0, + "valueFormat": "POISSON_PROBABILITY", + "imts": ["PGA"], + "customImls": { + "PGA": [ + 0.001, 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, + 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1.0] + } + } +} diff --git a/etc/peer/models/Set1-Case8b/model-info.json b/etc/peer/models/Set1-Case8b/model-info.json new file mode 100644 index 0000000000000000000000000000000000000000..4aad25644fe75856adb6116af27b6932503981f3 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/model-info.json @@ -0,0 +1,4 @@ +{ + "name": "PEER Set1-Case8b", + "site-class-vs30": { "BC": 760 } +} diff --git a/etc/peer/models/Set1-Case8b/sites.csv b/etc/peer/models/Set1-Case8b/sites.csv new file mode 100644 index 0000000000000000000000000000000000000000..a52a1da8aedf21d070d540365d7e0de78cf159e9 --- /dev/null +++ b/etc/peer/models/Set1-Case8b/sites.csv @@ -0,0 +1,8 @@ +name, lon, lat +PEER S1-Fault-Site1, -122.0, 38.113 +PEER S1-Fault-Site2, -122.114, 38.113 +PEER S1-Fault-Site3, -122.57, 38.111 +PEER S1-Fault-Site4, -122.0, 38.0 +PEER S1-Fault-Site5, -122.0, 37.91 +PEER S1-Fault-Site6, -122.0, 38.225 +PEER S1-Fault-Site7, -121.886, 38.113 diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/fault-config.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/fault-config.json new file mode 100644 index 0000000000000000000000000000000000000000..5d731d0b5e27c6f4a3cd2dc4a5dfda9b68eaaefa --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/fault-config.json @@ -0,0 +1,7 @@ +{ + "surface-spacing": 0.05, + "rupture-scaling": "PEER", + "rupture-floating": "ON", + "dip-slip-model": null, + "dip-tree": null +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/features/set1-case8c.geojson b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/features/set1-case8c.geojson new file mode 100644 index 0000000000000000000000000000000000000000..1fa517f9405411fcfbe75684f374b20886cb46eb --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/features/set1-case8c.geojson @@ -0,0 +1,21 @@ +{ + "type": "Feature", + "id": 1, + "geometry": { + "type": "LineString", + "coordinates": [ + [-122.00000, 38.22480], + [-122.00000, 38.00000] + ] + }, + "properties": { + "name": "Set1-Case8c fault", + "state": "CA", + "upper-depth": 0.0, + "lower-depth": 12.0, + "dip": 90.0, + "rake": 0.0, + "rate-type": "RECURRENCE", + "length": 25.0 + } +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-config.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-config.json new file mode 100644 index 0000000000000000000000000000000000000000..a0def60f99a8bcba9a16458e10af5bef3facaa92 --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-config.json @@ -0,0 +1,6 @@ +{ + "epistemic-tree": null, + "aleatory-properties": null, + "minimum-magnitude": 5.0, + "nshm-bin-model": true +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-map.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-map.json new file mode 100644 index 0000000000000000000000000000000000000000..91d141d4d251d36a1fc89cd2126ffe5662254edb --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/mfd-map.json @@ -0,0 +1,13 @@ +{ + "set1-case8c-mfd": [ + { + "id": "set1-case8c", + "weight": 1.0, + "value": { + "type": "SINGLE", + "m": 6.0, + "rate": 0.016042517 + } + } + ] +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/set1-case8c/rupture-set.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/set1-case8c/rupture-set.json new file mode 100644 index 0000000000000000000000000000000000000000..829f5c62fa23251556fefbd644a59d89973ec29b --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/set1-case8c/rupture-set.json @@ -0,0 +1,5 @@ +{ + "name": "PEER Set1-Case8c", + "id": 1, + "mfd-tree": "set1-case8c-mfd" +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/source-tree.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/source-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..9e8613e9ed1b22d316b5fae0d06f140cc19ae4ef --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/source-tree.json @@ -0,0 +1,6 @@ +[ + { + "id": "set1-case8c", + "weight": 1.0 + } +] diff --git a/etc/peer/models/Set1-Case8c/active-crust/fault-sources/tree-info.json b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/tree-info.json new file mode 100644 index 0000000000000000000000000000000000000000..18ee12cf40f0cba8a8107798a74577822f713f8d --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/fault-sources/tree-info.json @@ -0,0 +1,3 @@ +{ + "id": 2 +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/gmm-config.json b/etc/peer/models/Set1-Case8c/active-crust/gmm-config.json new file mode 100644 index 0000000000000000000000000000000000000000..6a13b46fd427ef13901cc18fe5e36b81a83aad6c --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/gmm-config.json @@ -0,0 +1,5 @@ +{ + "max-distance": 200.0, + "epistemic-model": null, + "epistemic-tree": null +} diff --git a/etc/peer/models/Set1-Case8c/active-crust/gmm-tree.json b/etc/peer/models/Set1-Case8c/active-crust/gmm-tree.json new file mode 100644 index 0000000000000000000000000000000000000000..8392687bb5778aed9e7ac67063c89c1fa5ec6e1f --- /dev/null +++ b/etc/peer/models/Set1-Case8c/active-crust/gmm-tree.json @@ -0,0 +1,3 @@ +[ + { "id": "SADIGH_97", "weight": 1.0 } +] diff --git a/etc/peer/models/Set1-Case8c/calc-config.json b/etc/peer/models/Set1-Case8c/calc-config.json new file mode 100644 index 0000000000000000000000000000000000000000..ea889a1fa7f0be438a691ed496928c6919d85b77 --- /dev/null +++ b/etc/peer/models/Set1-Case8c/calc-config.json @@ -0,0 +1,13 @@ +{ + "hazard": { + "exceedanceModel": "TRUNCATION_UPPER_ONLY", + "truncationLevel": 3.0, + "valueFormat": "POISSON_PROBABILITY", + "imts": ["PGA"], + "customImls": { + "PGA": [ + 0.001, 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, + 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1.0] + } + } +} diff --git a/etc/peer/models/Set1-Case8c/model-info.json b/etc/peer/models/Set1-Case8c/model-info.json new file mode 100644 index 0000000000000000000000000000000000000000..4aad25644fe75856adb6116af27b6932503981f3 --- /dev/null +++ b/etc/peer/models/Set1-Case8c/model-info.json @@ -0,0 +1,4 @@ +{ + "name": "PEER Set1-Case8b", + "site-class-vs30": { "BC": 760 } +} diff --git a/etc/peer/models/Set1-Case8c/sites.csv b/etc/peer/models/Set1-Case8c/sites.csv new file mode 100644 index 0000000000000000000000000000000000000000..a52a1da8aedf21d070d540365d7e0de78cf159e9 --- /dev/null +++ b/etc/peer/models/Set1-Case8c/sites.csv @@ -0,0 +1,8 @@ +name, lon, lat +PEER S1-Fault-Site1, -122.0, 38.113 +PEER S1-Fault-Site2, -122.114, 38.113 +PEER S1-Fault-Site3, -122.57, 38.111 +PEER S1-Fault-Site4, -122.0, 38.0 +PEER S1-Fault-Site5, -122.0, 37.91 +PEER S1-Fault-Site6, -122.0, 38.225 +PEER S1-Fault-Site7, -121.886, 38.113 diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTests.java index 72fd9fa162cd739d615e37985b3a5e79e0fa0cc3..7569f4907eff8a6d399a06ca067722d77fe6a8e2 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/peer/PeerTests.java @@ -26,6 +26,9 @@ import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case6; import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case6_Fast; import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case7; import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case7_Fast; +import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case8a; +import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case8b; +import gov.usgs.earthquake.nshmp.model.peer.PeerTestArgumentProviders.Set1Case8c; class PeerTests { @@ -170,30 +173,29 @@ class PeerTests { PeerTest.test(modelName, model, site, expected, TOL, EXEC); } - // @ParameterizedTest(name = "{0}, Site={index}") - // @ArgumentsSource(Set1Case8a.class) - // @DisplayName("Set1 Case8a") - // final void set1Case8a(String modelName, HazardModel model, Site - // site, double[] expected) { - // PeerTest.test(modelName, model, site, expected, TOL, EXEC); - // } - // - // @ParameterizedTest(name = "{0}, Site={index}") - // @ArgumentsSource(Set1Case8b.class) - // @DisplayName("Set1 Case8b") - // final void set1Case8b(String modelName, HazardModel model, Site - // site, double[] expected) { - // PeerTest.test(modelName, model, site, expected, TOL, EXEC); - // } - // - // @ParameterizedTest(name = "{0}, Site={index}") - // @ArgumentsSource(Set1Case8c.class) - // @DisplayName("Set1 Case8c") - // final void set1Case8c(String modelName, HazardModel model, Site - // site, double[] expected) { - // PeerTest.test(modelName, model, site, expected, TOL, EXEC); - // } - // + @ParameterizedTest(name = "{0}, Site={index}") + @ArgumentsSource(Set1Case8a.class) + @DisplayName("Set1 Case8a") + final void set1Case8a(String modelName, HazardModel model, Site site, + double[] expected) { + PeerTest.test(modelName, model, site, expected, TOL, EXEC); + } + + @ParameterizedTest(name = "{0}, Site={index}") + @ArgumentsSource(Set1Case8b.class) + @DisplayName("Set1 Case8b") + final void set1Case8b(String modelName, HazardModel model, Site site, + double[] expected) { + PeerTest.test(modelName, model, site, expected, TOL, EXEC); + } + + @ParameterizedTest(name = "{0}, Site={index}") + @ArgumentsSource(Set1Case8c.class) + @DisplayName("Set1 Case8c") + final void set1Case8c(String modelName, HazardModel model, Site site, double[] expected) { + PeerTest.test(modelName, model, site, expected, TOL, EXEC); + } + // @Disabled // @ParameterizedTest(name = "{0}, Site={index}") // @ArgumentsSource(Set1Case10.class)