Skip to content

Commit fbf908a

Browse files
michelesmicheles
authored
Merge pull request #9071 from gem/checksum
Fixed event based calculations with same ID sources
2 parents e9b4983 + 5138fdb commit fbf908a

File tree

4 files changed

+135
-95
lines changed

4 files changed

+135
-95
lines changed

‎openquake/hazardlib/source_reader.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ def find_false_duplicates(smdict):
238238
raise RuntimeError('Mutually exclusive sources cannot be '
239239
'duplicated: %s', srcid)
240240
add_checksums(srcs)
241-
gb = general.groupby(srcs, checksum)
241+
gb = general.AccumDict(accum=[])
242+
for src in srcs:
243+
gb[checksum(src)].append(src)
242244
if len(gb) > 1:
243245
for i, same_checksum in enumerate(gb.values()):
244246
# sources with the same checksum get the same ID

‎openquake/qa_tests_data/event_based/case_20/expected/gmf-data-from-ruptures.csv‎

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,65 @@
1-
#,,,,"generated_by='OpenQuake engine 3.18.0-git3f93e21a24', start_date='2023-07-14T04:53:11', checksum=3742584473"
1+
#,,,,"generated_by='OpenQuake engine 3.18.0-git04444a59c7', start_date='2023-10-04T16:33:16', checksum=2977844980"
22
event_id,gmv_SA(0.3),gmv_SA(0.6),gmv_SA(1.0),custom_site_id
3-
1,7.39445E-04,2.03284E-03,1.38521E-03,c1txrpmf
4-
1,5.62777E-04,1.75161E-03,9.29147E-04,c1w3u4c3
5-
6,1.27934E-03,4.04214E-04,2.50486E-04,c1w3u4c3
6-
7,7.56569E-04,1.40643E-03,6.59393E-04,c1w3u4c3
7-
10,1.08127E-03,7.42591E-04,4.26406E-04,c1w3u4c3
8-
11,1.81348E-03,1.99604E-03,1.25445E-03,c1txrpmf
9-
11,2.43840E-03,3.86453E-03,1.10191E-03,c1w3u4c3
10-
13,4.40885E-04,1.22535E-03,5.93562E-04,c1txrpmf
11-
13,9.05396E-04,1.03396E-03,2.62410E-03,c1w3u4c3
12-
15,7.08990E-04,4.34963E-04,1.62236E-03,c1w3u4c3
13-
18,6.92802E-04,3.28518E-03,1.69545E-03,c1w3u4c3
14-
21,1.55410E-03,1.14017E-03,6.36485E-03,c1txrpmf
15-
21,1.11743E-03,2.46330E-03,3.43374E-03,c1w3u4c3
16-
65,1.47971E-03,2.01810E-03,9.81421E-04,c1txrpmf
17-
65,3.96314E-03,4.56423E-03,5.04561E-03,c1w3u4c3
18-
75,1.69008E-03,1.68726E-03,1.25782E-03,c1txrpmf
19-
75,1.24087E-03,1.62022E-03,3.38564E-03,c1w3u4c3
20-
76,1.20797E-03,3.64468E-03,2.38983E-03,c1txrpmf
21-
76,2.47482E-03,6.59607E-03,1.53538E-03,c1w3u4c3
22-
78,2.18562E-04,3.99479E-04,1.10568E-03,c1txrpmf
23-
93,2.93877E-04,1.41364E-03,1.01450E-03,c1txrpmf
24-
93,7.29648E-04,1.74656E-03,1.43393E-03,c1w3u4c3
25-
101,9.03757E-04,1.05598E-03,7.03979E-04,c1w3u4c3
26-
104,6.11454E-04,9.19983E-04,1.77365E-03,c1txrpmf
27-
104,6.25839E-04,1.19832E-03,4.56650E-04,c1w3u4c3
28-
105,4.54718E-04,8.27544E-04,2.02774E-03,c1txrpmf
29-
105,1.84327E-03,8.51180E-04,4.94437E-04,c1w3u4c3
30-
108,2.02766E-03,4.40716E-04,4.84083E-04,c1w3u4c3
31-
116,6.60874E-04,1.72200E-03,9.90966E-04,c1w3u4c3
32-
120,2.29052E-04,3.55081E-04,2.65242E-03,c1w3u4c3
33-
124,1.11576E-03,5.81100E-04,7.91215E-03,c1w3u4c3
34-
144,7.36873E-04,1.19368E-03,1.52521E-03,c1w3u4c3
35-
147,1.18689E-03,1.50702E-03,3.03040E-04,c1w3u4c3
36-
157,2.20791E-04,1.30886E-03,6.32925E-04,c1w3u4c3
37-
160,8.02777E-04,2.35805E-03,1.30697E-03,c1txrpmf
38-
160,1.34752E-03,7.05958E-03,2.73758E-03,c1w3u4c3
39-
178,1.42759E-04,1.62145E-03,7.16927E-04,c1w3u4c3
40-
190,1.25212E-03,1.00305E-03,5.52259E-04,c1txrpmf
41-
190,8.69734E-04,1.18367E-03,8.91021E-04,c1w3u4c3
42-
195,1.99226E-03,4.45581E-03,3.05700E-03,c1txrpmf
43-
195,1.07843E-03,3.21590E-03,2.14144E-03,c1w3u4c3
44-
205,1.04472E-03,4.82105E-04,8.57362E-04,c1w3u4c3
45-
217,3.18710E-04,7.00687E-04,1.06440E-03,c1w3u4c3
46-
224,8.28404E-05,1.62393E-04,1.08395E-03,c1txrpmf
3+
2,4.67584E-04,2.50772E-03,1.62946E-03,c1txrpmf
4+
2,2.12163E-03,1.71060E-03,3.01792E-03,c1w3u4c3
5+
6,5.43240E-04,6.02002E-04,1.22731E-03,c1txrpmf
6+
6,6.79266E-04,1.58734E-03,1.42864E-03,c1w3u4c3
7+
7,6.58129E-04,6.74713E-04,1.48729E-03,c1w3u4c3
8+
9,6.05965E-04,1.49577E-03,5.73840E-04,c1txrpmf
9+
9,1.35898E-03,2.03406E-03,2.59713E-03,c1w3u4c3
10+
11,1.11027E-03,9.59320E-04,7.51236E-04,c1txrpmf
11+
11,4.17326E-03,1.72128E-03,1.73101E-03,c1w3u4c3
12+
12,5.62568E-04,4.21046E-04,1.34357E-03,c1txrpmf
13+
21,9.90214E-04,1.25627E-03,4.45698E-04,c1txrpmf
14+
21,4.14257E-03,2.03203E-03,9.39591E-04,c1w3u4c3
15+
29,3.74023E-04,3.67597E-03,1.22650E-02,c1w3u4c3
16+
32,1.35381E-03,1.53965E-03,1.19123E-03,c1w3u4c3
17+
39,5.32643E-04,1.84010E-03,9.88678E-04,c1txrpmf
18+
39,9.51681E-04,1.04418E-03,2.91036E-03,c1w3u4c3
19+
41,6.73904E-04,5.79590E-04,2.40874E-03,c1txrpmf
20+
41,1.10847E-03,1.00368E-03,2.15310E-03,c1w3u4c3
21+
47,4.88684E-04,1.09342E-03,2.88561E-04,c1w3u4c3
22+
48,2.09517E-03,2.07618E-03,4.90583E-03,c1txrpmf
23+
48,2.58517E-03,1.56627E-03,1.19849E-03,c1w3u4c3
24+
53,1.16596E-03,8.07227E-04,9.58579E-04,c1txrpmf
25+
53,1.98101E-03,2.32981E-03,1.09653E-03,c1w3u4c3
26+
54,1.91503E-03,8.32233E-04,6.93120E-03,c1txrpmf
27+
54,8.42487E-04,3.22856E-03,2.81364E-03,c1w3u4c3
28+
56,8.48222E-04,4.69676E-04,1.04076E-03,c1w3u4c3
29+
60,3.12935E-04,1.23222E-03,1.29778E-03,c1w3u4c3
30+
63,9.14317E-04,8.97416E-04,1.48345E-03,c1txrpmf
31+
63,1.15902E-03,3.41678E-03,2.33529E-03,c1w3u4c3
32+
80,5.83399E-04,8.92781E-04,1.76978E-03,c1w3u4c3
33+
96,3.85611E-04,1.32780E-03,2.05356E-04,c1txrpmf
34+
96,1.33008E-03,6.70790E-04,3.58188E-04,c1w3u4c3
35+
97,7.75211E-04,1.02147E-03,5.32726E-04,c1w3u4c3
36+
103,4.01621E-04,3.23317E-04,1.45693E-03,c1txrpmf
37+
104,9.34872E-05,1.29696E-03,4.69756E-04,c1w3u4c3
38+
105,1.68999E-03,1.44047E-03,4.54180E-04,c1txrpmf
39+
105,2.56190E-03,2.42542E-03,1.13589E-03,c1w3u4c3
40+
112,8.02425E-04,1.14561E-03,3.84377E-04,c1txrpmf
41+
112,1.08887E-03,2.23771E-03,7.55433E-04,c1w3u4c3
42+
119,3.02980E-04,5.76877E-04,2.00193E-03,c1w3u4c3
43+
120,1.70445E-04,5.50408E-04,1.51431E-03,c1txrpmf
44+
120,1.20618E-03,2.29659E-03,7.96983E-03,c1w3u4c3
45+
122,8.23991E-04,1.79116E-03,1.09207E-03,c1w3u4c3
46+
123,1.11069E-03,6.14169E-04,1.12589E-03,c1w3u4c3
47+
136,1.00508E-03,3.87749E-04,2.53307E-04,c1txrpmf
48+
136,7.77317E-04,7.92797E-04,2.24141E-03,c1w3u4c3
49+
143,1.44054E-03,8.69188E-04,1.44618E-03,c1txrpmf
50+
143,3.39730E-03,8.08199E-03,2.48844E-03,c1w3u4c3
51+
144,1.45326E-04,4.70564E-04,1.98557E-03,c1txrpmf
52+
145,9.26348E-04,1.36405E-03,1.15128E-03,c1txrpmf
53+
145,1.38894E-03,1.12922E-03,1.74530E-03,c1w3u4c3
54+
146,1.09302E-03,1.60311E-03,1.23138E-03,c1txrpmf
55+
146,2.47407E-03,2.36412E-03,2.81117E-03,c1w3u4c3
56+
163,8.76889E-04,1.78600E-03,5.73522E-04,c1w3u4c3
57+
183,6.60748E-04,1.18300E-03,1.56104E-03,c1txrpmf
58+
183,1.56817E-03,2.69617E-03,1.11186E-03,c1w3u4c3
59+
184,2.23895E-03,1.06136E-03,1.97294E-03,c1txrpmf
60+
184,3.12506E-03,2.16864E-03,3.99747E-03,c1w3u4c3
61+
202,1.80816E-03,8.60551E-04,1.99141E-03,c1w3u4c3
62+
203,9.85266E-04,1.05245E-03,3.18482E-04,c1w3u4c3
63+
204,9.77028E-04,7.61807E-04,1.31732E-03,c1w3u4c3
64+
209,3.06234E-04,1.23747E-03,4.23095E-04,c1w3u4c3
65+
223,4.16495E-04,2.39927E-04,1.27572E-03,c1w3u4c3

‎openquake/qa_tests_data/event_based/case_20/expected/gmf-data.csv‎

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,65 @@
1-
#,,,,"generated_by='OpenQuake engine 3.18.0-git3f93e21a24', start_date='2023-07-14T04:53:08', checksum=3742584473"
1+
#,,,,"generated_by='OpenQuake engine 3.18.0-git04444a59c7', start_date='2023-10-04T16:33:14', checksum=2977844980"
22
event_id,gmv_SA(0.3),gmv_SA(0.6),gmv_SA(1.0),custom_site_id
3-
1,7.39445E-04,2.03284E-03,1.38521E-03,c1txrpmf
4-
1,5.62777E-04,1.75161E-03,9.29147E-04,c1w3u4c3
5-
6,1.27934E-03,4.04214E-04,2.50486E-04,c1w3u4c3
6-
7,7.56569E-04,1.40643E-03,6.59393E-04,c1w3u4c3
7-
10,1.08127E-03,7.42591E-04,4.26406E-04,c1w3u4c3
8-
11,1.81348E-03,1.99604E-03,1.25445E-03,c1txrpmf
9-
11,2.43840E-03,3.86453E-03,1.10191E-03,c1w3u4c3
10-
13,4.40885E-04,1.22535E-03,5.93562E-04,c1txrpmf
11-
13,9.05396E-04,1.03396E-03,2.62410E-03,c1w3u4c3
12-
15,7.08990E-04,4.34963E-04,1.62236E-03,c1w3u4c3
13-
18,6.92802E-04,3.28518E-03,1.69545E-03,c1w3u4c3
14-
21,1.55410E-03,1.14017E-03,6.36485E-03,c1txrpmf
15-
21,1.11743E-03,2.46330E-03,3.43374E-03,c1w3u4c3
16-
65,1.47971E-03,2.01810E-03,9.81421E-04,c1txrpmf
17-
65,3.96314E-03,4.56423E-03,5.04561E-03,c1w3u4c3
18-
75,1.69008E-03,1.68726E-03,1.25782E-03,c1txrpmf
19-
75,1.24087E-03,1.62022E-03,3.38564E-03,c1w3u4c3
20-
76,1.20797E-03,3.64468E-03,2.38983E-03,c1txrpmf
21-
76,2.47482E-03,6.59607E-03,1.53538E-03,c1w3u4c3
22-
78,2.18562E-04,3.99479E-04,1.10568E-03,c1txrpmf
23-
93,2.93877E-04,1.41364E-03,1.01450E-03,c1txrpmf
24-
93,7.29648E-04,1.74656E-03,1.43393E-03,c1w3u4c3
25-
101,9.03757E-04,1.05598E-03,7.03979E-04,c1w3u4c3
26-
104,6.11454E-04,9.19983E-04,1.77365E-03,c1txrpmf
27-
104,6.25839E-04,1.19832E-03,4.56650E-04,c1w3u4c3
28-
105,4.54718E-04,8.27544E-04,2.02774E-03,c1txrpmf
29-
105,1.84327E-03,8.51180E-04,4.94437E-04,c1w3u4c3
30-
108,2.02766E-03,4.40716E-04,4.84083E-04,c1w3u4c3
31-
116,6.60874E-04,1.72200E-03,9.90966E-04,c1w3u4c3
32-
120,2.29052E-04,3.55081E-04,2.65242E-03,c1w3u4c3
33-
124,1.11576E-03,5.81100E-04,7.91215E-03,c1w3u4c3
34-
144,7.36873E-04,1.19368E-03,1.52521E-03,c1w3u4c3
35-
147,1.18689E-03,1.50702E-03,3.03040E-04,c1w3u4c3
36-
157,2.20791E-04,1.30886E-03,6.32925E-04,c1w3u4c3
37-
160,8.02777E-04,2.35805E-03,1.30697E-03,c1txrpmf
38-
160,1.34752E-03,7.05958E-03,2.73758E-03,c1w3u4c3
39-
178,1.42759E-04,1.62145E-03,7.16927E-04,c1w3u4c3
40-
190,1.25212E-03,1.00305E-03,5.52259E-04,c1txrpmf
41-
190,8.69734E-04,1.18367E-03,8.91021E-04,c1w3u4c3
42-
195,1.99226E-03,4.45581E-03,3.05700E-03,c1txrpmf
43-
195,1.07843E-03,3.21590E-03,2.14144E-03,c1w3u4c3
44-
205,1.04472E-03,4.82105E-04,8.57362E-04,c1w3u4c3
45-
217,3.18710E-04,7.00687E-04,1.06440E-03,c1w3u4c3
46-
224,8.28404E-05,1.62393E-04,1.08395E-03,c1txrpmf
3+
2,4.67584E-04,2.50772E-03,1.62946E-03,c1txrpmf
4+
2,2.12163E-03,1.71060E-03,3.01792E-03,c1w3u4c3
5+
6,5.43240E-04,6.02002E-04,1.22731E-03,c1txrpmf
6+
6,6.79266E-04,1.58734E-03,1.42864E-03,c1w3u4c3
7+
7,6.58129E-04,6.74713E-04,1.48729E-03,c1w3u4c3
8+
9,6.05965E-04,1.49577E-03,5.73840E-04,c1txrpmf
9+
9,1.35898E-03,2.03406E-03,2.59713E-03,c1w3u4c3
10+
11,1.11027E-03,9.59320E-04,7.51236E-04,c1txrpmf
11+
11,4.17326E-03,1.72128E-03,1.73101E-03,c1w3u4c3
12+
12,5.62568E-04,4.21046E-04,1.34357E-03,c1txrpmf
13+
21,9.90214E-04,1.25627E-03,4.45698E-04,c1txrpmf
14+
21,4.14257E-03,2.03203E-03,9.39591E-04,c1w3u4c3
15+
29,3.74023E-04,3.67597E-03,1.22650E-02,c1w3u4c3
16+
32,1.35381E-03,1.53965E-03,1.19123E-03,c1w3u4c3
17+
39,5.32643E-04,1.84010E-03,9.88678E-04,c1txrpmf
18+
39,9.51681E-04,1.04418E-03,2.91036E-03,c1w3u4c3
19+
41,6.73904E-04,5.79590E-04,2.40874E-03,c1txrpmf
20+
41,1.10847E-03,1.00368E-03,2.15310E-03,c1w3u4c3
21+
47,4.88684E-04,1.09342E-03,2.88561E-04,c1w3u4c3
22+
48,2.09517E-03,2.07618E-03,4.90583E-03,c1txrpmf
23+
48,2.58517E-03,1.56627E-03,1.19849E-03,c1w3u4c3
24+
53,1.16596E-03,8.07227E-04,9.58579E-04,c1txrpmf
25+
53,1.98101E-03,2.32981E-03,1.09653E-03,c1w3u4c3
26+
54,1.91503E-03,8.32233E-04,6.93120E-03,c1txrpmf
27+
54,8.42487E-04,3.22856E-03,2.81364E-03,c1w3u4c3
28+
56,8.48222E-04,4.69676E-04,1.04076E-03,c1w3u4c3
29+
60,3.12935E-04,1.23222E-03,1.29778E-03,c1w3u4c3
30+
63,9.14317E-04,8.97416E-04,1.48345E-03,c1txrpmf
31+
63,1.15902E-03,3.41678E-03,2.33529E-03,c1w3u4c3
32+
80,5.83399E-04,8.92781E-04,1.76978E-03,c1w3u4c3
33+
96,3.85611E-04,1.32780E-03,2.05356E-04,c1txrpmf
34+
96,1.33008E-03,6.70790E-04,3.58188E-04,c1w3u4c3
35+
97,7.75211E-04,1.02147E-03,5.32726E-04,c1w3u4c3
36+
103,4.01621E-04,3.23317E-04,1.45693E-03,c1txrpmf
37+
104,9.34872E-05,1.29696E-03,4.69756E-04,c1w3u4c3
38+
105,1.68999E-03,1.44047E-03,4.54180E-04,c1txrpmf
39+
105,2.56190E-03,2.42542E-03,1.13589E-03,c1w3u4c3
40+
112,8.02425E-04,1.14561E-03,3.84377E-04,c1txrpmf
41+
112,1.08887E-03,2.23771E-03,7.55433E-04,c1w3u4c3
42+
119,3.02980E-04,5.76877E-04,2.00193E-03,c1w3u4c3
43+
120,1.70445E-04,5.50408E-04,1.51431E-03,c1txrpmf
44+
120,1.20618E-03,2.29659E-03,7.96983E-03,c1w3u4c3
45+
122,8.23991E-04,1.79116E-03,1.09207E-03,c1w3u4c3
46+
123,1.11069E-03,6.14169E-04,1.12589E-03,c1w3u4c3
47+
136,1.00508E-03,3.87749E-04,2.53307E-04,c1txrpmf
48+
136,7.77317E-04,7.92797E-04,2.24141E-03,c1w3u4c3
49+
143,1.44054E-03,8.69188E-04,1.44618E-03,c1txrpmf
50+
143,3.39730E-03,8.08199E-03,2.48844E-03,c1w3u4c3
51+
144,1.45326E-04,4.70564E-04,1.98557E-03,c1txrpmf
52+
145,9.26348E-04,1.36405E-03,1.15128E-03,c1txrpmf
53+
145,1.38894E-03,1.12922E-03,1.74530E-03,c1w3u4c3
54+
146,1.09302E-03,1.60311E-03,1.23138E-03,c1txrpmf
55+
146,2.47407E-03,2.36412E-03,2.81117E-03,c1w3u4c3
56+
163,8.76889E-04,1.78600E-03,5.73522E-04,c1w3u4c3
57+
183,6.60748E-04,1.18300E-03,1.56104E-03,c1txrpmf
58+
183,1.56817E-03,2.69617E-03,1.11186E-03,c1w3u4c3
59+
184,2.23895E-03,1.06136E-03,1.97294E-03,c1txrpmf
60+
184,3.12506E-03,2.16864E-03,3.99747E-03,c1w3u4c3
61+
202,1.80816E-03,8.60551E-04,1.99141E-03,c1w3u4c3
62+
203,9.85266E-04,1.05245E-03,3.18482E-04,c1w3u4c3
63+
204,9.77028E-04,7.61807E-04,1.31732E-03,c1w3u4c3
64+
209,3.06234E-04,1.23747E-03,4.23095E-04,c1w3u4c3
65+
223,4.16495E-04,2.39927E-04,1.27572E-03,c1w3u4c3

‎openquake/qa_tests_data/event_based/case_7/expected/hazard_curve-mean.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#,,,,,,,,,"generated_by='OpenQuake engine 3.17.0-git55f5880caf', start_date='2023-04-25T06:56:51', checksum=290072677, kind='mean', investigation_time=1.0, imt='PGA'"
1+
#,,,,,,,,,"generated_by='OpenQuake engine 3.18.0-git04444a59c7', start_date='2023-10-04T16:33:14', checksum=290072677, kind='mean', investigation_time=1.0, imt='PGA'"
22
lon,lat,depth,poe-0.0050000,poe-0.0192000,poe-0.1030000,poe-0.1450000,poe-0.7780000,poe-1.0900000,poe-1.5200000
3-
0.00000,0.00000,0.00000,2.609857E-01,7.658638E-02,5.215830E-03,2.750659E-03,0.000000E+00,0.000000E+00,0.000000E+00
4-
0.00000,1.00000,0.00000,2.093741E-01,7.474553E-02,5.424267E-03,3.045203E-03,0.000000E+00,0.000000E+00,0.000000E+00
5-
0.00000,2.50000,0.00000,4.613860E-02,3.493848E-03,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00
3+
0.00000,0.00000,0.00000,2.608726E-01,6.986345E-02,5.293743E-03,2.940984E-03,2.854877E-04,9.516258E-05,0.000000E+00
4+
0.00000,1.00000,0.00000,2.080709E-01,7.102583E-02,5.034561E-03,2.759715E-03,0.000000E+00,0.000000E+00,0.000000E+00
5+
0.00000,2.50000,0.00000,4.856298E-02,3.416797E-03,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00

0 commit comments

Comments
 (0)