Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions openquake/calculators/tests/logictree_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,23 @@ def test_case_83(self):
[fname_ex] = export(('hcurves/mean', 'csv'), self.calc.datastore)
self.assertEqualFiles(fname_em, fname_ex)

def test_case_83_eb(self):
# event based sampling with double extendModel
self.run_calc(case_83.__file__, 'job_eb.ini')

[f] = export(('ruptures', 'csv'), self.calc.datastore)
self.assertEqualFiles('expected/ruptures.csv', f)

[fname] = export(('avg_gmf', 'csv'), self.calc.datastore)
self.assertEqualFiles('expected/avg_gmf.csv', fname)

df = view('event_based_mfd', self.calc.datastore)
self.assertEqual(str(df), '''\
freq occ_rate
mag
4.0 2.83 2.75
4.5 1.63 1.64''')

def test_case_84(self):
# test maxMagGRRelativeNoMoBalance
self.run_calc(case_84.__file__, 'job.ini')
Expand Down
1 change: 1 addition & 0 deletions openquake/qa_tests_data/logictree/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@
| case\_79 | Tests disagg\_by\_src with semicolon sources |
| case\_80 | Tests areaSourceGeometryAbsolute |
| case\_83 | Tests extendModel and reqv |
| case\_83\_eb | Double extendModel with event based sampling |
| case\_84 | Tests maxMagGRRelativeNoMoBalance uncertainty |
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#,,,,"generated_by='OpenQuake engine 3.26.0-gitffd30f9b93', start_date='2026-05-26T02:52:25', checksum=604676802"
custom_site_id,lon,lat,gmv_PGA,gsd_PGA
7zzzzzzz,0.00000E+00,0.00000E+00,5.24745E-03,5.28803E+00
38 changes: 38 additions & 0 deletions openquake/qa_tests_data/logictree/case_83/expected/ruptures.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#,,,,,,,,,,"generated_by='OpenQuake engine 3.26.0-gitffd30f9b93', start_date='2026-05-26T02:52:25', checksum=604676802, investigation_time=1.0, ses_per_logic_tree_path=1"
rup_id,source_id,multiplicity,mag,centroid_lon,centroid_lat,centroid_depth,trt,strike,dip,rake
0,1;0,20,4.000000E+00,0.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
1073741824,1;1,3,4.000000E+00,0.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
2147483648,1;2,6,4.000000E+00,0.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
3221225472,1;3,4,4.000000E+00,0.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
4294967296,2;0,17,4.000000E+00,1.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
5368709120,2;1,10,4.000000E+00,1.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
6442450944,2;2,11,4.000000E+00,1.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
7516192768,2;3,7,4.000000E+00,1.000000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
8589934592,3;0,27,4.500000E+00,5.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
9663676416,3;1,15,4.500000E+00,5.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
10737418240,3;2,15,4.500000E+00,5.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
11811160064,3;3,10,4.500000E+00,5.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
12884901888,4;0,8,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
13958643712,4;1,13,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
15032385536,4;2,8,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
16106127360,4;3,1,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
17179869184,5;0,25,4.000000E+00,1.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
18253611008,5;1,15,4.000000E+00,1.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
19327352832,5;2,9,4.000000E+00,1.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
20401094656,5;3,14,4.000000E+00,1.000000E-01,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
21474836480,6;0,21,4.000000E+00,1.100000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
22548578304,6;1,15,4.000000E+00,1.100000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
23622320128,6;2,11,4.000000E+00,1.100000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
24696061952,6;3,9,4.000000E+00,1.100000E+00,0.000000E+00,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
25769803776,7;0,14,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
26843545600,7;1,14,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
27917287424,7;2,11,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
28991029248,7;3,7,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
30064771072,8;0,15,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
31138512896,8;1,14,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
32212254720,8;2,5,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
33285996544,8;3,6,4.000000E+00,0.000000E+00,7.700000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
34359738368,9;0,28,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
35433480192,9;1,14,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
36507222016,9;2,16,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
37580963840,9;3,8,4.500000E+00,5.000000E-01,5.000000E-01,4.000000E+00,active shallow crust,0.000000E+00,9.000000E+01,0.000000E+00
33 changes: 33 additions & 0 deletions openquake/qa_tests_data/logictree/case_83/job_eb.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[general]

description = 2x2 extendModel
calculation_mode = event_based

[geometry]

sites = 0.0 0.0

[logic_tree]

number_of_logic_tree_samples = 100
source_model_logic_tree_file = source_model_logic_tree_extendModel.xml
gsim_logic_tree_file = gsim_logic_tree.xml

[erf]

rupture_mesh_spacing = 1.0
width_of_mfd_bin = 1.0

[site_params]

reference_vs30_type = measured
reference_vs30_value = 800.0
reference_depth_to_2pt5km_per_sec = 2.5
reference_depth_to_1pt0km_per_sec = 50.0

[calculation]

investigation_time = 1
intensity_measure_types_and_levels = {"PGA": logscale(0.005, 3.00, 5)}
truncation_level = 2.0
maximum_distance = 200.0