From cd9dc9bfd298ba78c250e431bbea7ac80bb1f182 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Fri, 14 Apr 2017 11:08:41 -0600 Subject: [PATCH] example config updates --- etc/examples/2-custom-config/config.json | 4 ++-- etc/examples/3-sites-file/config.json | 2 +- etc/examples/4-hazard-map/config.json | 2 +- etc/examples/5-complex-model/config-map.json | 2 +- etc/examples/5-complex-model/config-sites.json | 2 +- etc/examples/6-enhanced-output/config.json | 2 +- etc/examples/7-deaggregation/config.json | 2 +- etc/examples/8-probabilities/config-map.json | 6 +++--- etc/examples/8-probabilities/config-sites.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/examples/2-custom-config/config.json b/etc/examples/2-custom-config/config.json index 81bf35969..dedc561bf 100644 --- a/etc/examples/2-custom-config/config.json +++ b/etc/examples/2-custom-config/config.json @@ -1,9 +1,9 @@ { - "curve": { + "hazard": { "exceedanceModel": "TRUNCATION_UPPER_ONLY", "truncationLevel": 3.0, "imts": ["PGA", "SA0P2", "SA1P0"], - "valueType": "POISSON_PROBABILITY", + "valueFormat": "POISSON_PROBABILITY", "customImls": { "PGA": [0.0050, 0.0070, 0.0098, 0.0137, 0.0192, 0.0269, 0.0376, 0.0527, 0.0738, 0.103, 0.145, 0.203, 0.284, 0.397, 0.556, 0.778, 1.09, 1.52, 2.2, 3.3], "SA0P2": [0.0050, 0.0075, 0.0113, 0.0169, 0.0253, 0.0380, 0.0570, 0.0854, 0.128, 0.192, 0.288, 0.432, 0.649, 0.973, 1.46, 2.19, 3.28, 4.92, 7.38], diff --git a/etc/examples/3-sites-file/config.json b/etc/examples/3-sites-file/config.json index 36b538061..2176e0eaa 100644 --- a/etc/examples/3-sites-file/config.json +++ b/etc/examples/3-sites-file/config.json @@ -1,5 +1,5 @@ { - "curve": { + "hazard": { "exceedanceModel": "TRUNCATION_UPPER_ONLY", "truncationLevel": 3.0, "imts": ["PGA", "SA0P2", "SA1P0"], diff --git a/etc/examples/4-hazard-map/config.json b/etc/examples/4-hazard-map/config.json index 3f0c87702..d5e60bba4 100644 --- a/etc/examples/4-hazard-map/config.json +++ b/etc/examples/4-hazard-map/config.json @@ -1,5 +1,5 @@ { - "curve": { + "hazard": { "exceedanceModel": "TRUNCATION_UPPER_ONLY", "truncationLevel": 3.0, "imts": ["PGA", "SA0P2", "SA1P0"] diff --git a/etc/examples/5-complex-model/config-map.json b/etc/examples/5-complex-model/config-map.json index 9a474d5bc..eb5b93211 100644 --- a/etc/examples/5-complex-model/config-map.json +++ b/etc/examples/5-complex-model/config-map.json @@ -1,5 +1,5 @@ { - "curve": { + "hazard": { "imts": ["SA1P0", "SA2P0"] }, "output": { diff --git a/etc/examples/5-complex-model/config-sites.json b/etc/examples/5-complex-model/config-sites.json index 5ead4a5a4..5db53ac58 100644 --- a/etc/examples/5-complex-model/config-sites.json +++ b/etc/examples/5-complex-model/config-sites.json @@ -1,5 +1,5 @@ { - "curve": { + "hazard": { "imts": ["SA1P0", "SA2P0"] }, "output": { diff --git a/etc/examples/6-enhanced-output/config.json b/etc/examples/6-enhanced-output/config.json index 02ae2a887..1023392b3 100644 --- a/etc/examples/6-enhanced-output/config.json +++ b/etc/examples/6-enhanced-output/config.json @@ -1,6 +1,6 @@ { "output": { - "curveTypes": ["TOTAL", "GMM", "SOURCE"], + "dataTypes": ["TOTAL", "GMM", "SOURCE"], "flushLimit": 1 } } diff --git a/etc/examples/7-deaggregation/config.json b/etc/examples/7-deaggregation/config.json index 87347bfc4..e7d352617 100644 --- a/etc/examples/7-deaggregation/config.json +++ b/etc/examples/7-deaggregation/config.json @@ -1,6 +1,6 @@ { "output": { - "curveTypes": ["TOTAL", "GMM"], + "dataTypes": ["TOTAL", "GMM"], "flushLimit": 1 } } diff --git a/etc/examples/8-probabilities/config-map.json b/etc/examples/8-probabilities/config-map.json index 1cee52136..44e663c7e 100644 --- a/etc/examples/8-probabilities/config-map.json +++ b/etc/examples/8-probabilities/config-map.json @@ -1,11 +1,11 @@ { "output": { - "curveTypes": ["SOURCE"] + "dataTypes": ["SOURCE"] }, "rate": { "distance": 10.0, - "values": "POISSON_PROBABILITY", - "distribution": "CUMULATIVE", + "valueFormat": "POISSON_PROBABILITY", + "distributionFormat": "CUMULATIVE", "timespan": 50.0 } } diff --git a/etc/examples/8-probabilities/config-sites.json b/etc/examples/8-probabilities/config-sites.json index e5e9a3a8b..2c5b56ccf 100644 --- a/etc/examples/8-probabilities/config-sites.json +++ b/etc/examples/8-probabilities/config-sites.json @@ -1,5 +1,5 @@ { "output": { - "curveTypes": ["SOURCE"] + "dataTypes": ["SOURCE"] } } -- GitLab