Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@micheles
micheles committed Sep 20, 2024
1 parent b6ef624 commit 1aa6f61
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 53 deletions.
7 changes: 4 additions & 3 deletions openquake/calculators/postproc/median_spectrum.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,10 @@ def main(dstore):
for (grp_id, site_id), mhs in res.items():
median_spectrum[grp_id, site_id] = np.exp(mhs)
dstore.create_dset('median_spectrum', median_spectrum)
dstore.set_shape_descr(
'median_spectrum', grp_id=Gr, site_id=N,
imt=list(oqp.imtls), poe=oqp.poes)
dstore.set_shape_descr('median_spectrum',
grp_id=Gr, site_id=N,
period=[imt.period for imt in oqp.imt_periods()],
poe=oqp.poes)

if __name__ == '__main__':
sap.run(main)
100 changes: 50 additions & 50 deletions openquake/qa_tests_data/postproc/case_median_spectrum/expected/median_spectrum.csv
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
#,,,,"generated_by='OpenQuake engine 3.21.0-git1db6adb886', start_date='2024-09-20T11:30:32', checksum=230393933"
grp_id,site_id,imt,poe,value
0,0,PGA,2.10500E-03,3.31599E-01
0,0,PGA,4.04000E-04,3.06499E-01
0,0,SA(0.1),2.10500E-03,6.24428E-01
0,0,SA(0.1),4.04000E-04,6.19966E-01
0,0,SA(0.2),2.10500E-03,6.54682E-01
0,0,SA(0.2),4.04000E-04,5.94265E-01
0,0,SA(0.3),2.10500E-03,5.90987E-01
0,0,SA(0.3),4.04000E-04,5.89325E-01
0,0,SA(0.4),2.10500E-03,4.96764E-01
0,0,SA(0.4),4.04000E-04,4.94007E-01
0,0,SA(0.5),2.10500E-03,4.32329E-01
0,0,SA(0.5),4.04000E-04,4.28877E-01
0,0,SA(0.75),2.10500E-03,3.24144E-01
0,0,SA(0.75),4.04000E-04,3.23598E-01
0,0,SA(1.0),2.10500E-03,2.45315E-01
0,0,SA(1.0),4.04000E-04,2.45792E-01
0,0,SA(1.2),2.10500E-03,1.97547E-01
0,0,SA(1.2),4.04000E-04,1.96980E-01
0,0,SA(1.5),2.10500E-03,1.50057E-01
0,0,SA(1.5),4.04000E-04,1.48639E-01
0,0,SA(1.75),2.10500E-03,1.24527E-01
0,0,SA(1.75),4.04000E-04,1.24286E-01
0,0,SA(2.0),2.10500E-03,1.06440E-01
0,0,SA(2.0),4.04000E-04,1.06766E-01
1,0,PGA,2.10500E-03,7.18177E-01
1,0,PGA,4.04000E-04,8.13180E-01
1,0,SA(0.1),2.10500E-03,7.68451E-01
1,0,SA(0.1),4.04000E-04,8.13321E-01
1,0,SA(0.2),2.10500E-03,8.52199E-01
1,0,SA(0.2),4.04000E-04,8.81202E-01
1,0,SA(0.3),2.10500E-03,8.54638E-01
1,0,SA(0.3),4.04000E-04,9.15437E-01
1,0,SA(0.4),2.10500E-03,8.18553E-01
1,0,SA(0.4),4.04000E-04,8.90924E-01
1,0,SA(0.5),2.10500E-03,7.89180E-01
1,0,SA(0.5),4.04000E-04,8.72071E-01
1,0,SA(0.75),2.10500E-03,7.45135E-01
1,0,SA(0.75),4.04000E-04,8.55866E-01
1,0,SA(1.0),2.10500E-03,6.97034E-01
1,0,SA(1.0),4.04000E-04,8.23156E-01
1,0,SA(1.2),2.10500E-03,6.54432E-01
1,0,SA(1.2),4.04000E-04,7.85751E-01
1,0,SA(1.5),2.10500E-03,6.14676E-01
1,0,SA(1.5),4.04000E-04,7.52602E-01
1,0,SA(1.75),2.10500E-03,5.88741E-01
1,0,SA(1.75),4.04000E-04,7.33380E-01
1,0,SA(2.0),2.10500E-03,5.65541E-01
1,0,SA(2.0),4.04000E-04,7.15171E-01
#,,,,"generated_by='OpenQuake engine 3.21.0-gitb6ef624f6a', start_date='2024-09-20T11:40:14', checksum=230393933"
grp_id,site_id,period,poe,value
0,0,0.00000E+00,2.10500E-03,3.31599E-01
0,0,0.00000E+00,4.04000E-04,3.06499E-01
0,0,1.00000E-01,2.10500E-03,6.24428E-01
0,0,1.00000E-01,4.04000E-04,6.19966E-01
0,0,2.00000E-01,2.10500E-03,6.54682E-01
0,0,2.00000E-01,4.04000E-04,5.94265E-01
0,0,3.00000E-01,2.10500E-03,5.90987E-01
0,0,3.00000E-01,4.04000E-04,5.89325E-01
0,0,4.00000E-01,2.10500E-03,4.96764E-01
0,0,4.00000E-01,4.04000E-04,4.94007E-01
0,0,5.00000E-01,2.10500E-03,4.32329E-01
0,0,5.00000E-01,4.04000E-04,4.28877E-01
0,0,7.50000E-01,2.10500E-03,3.24144E-01
0,0,7.50000E-01,4.04000E-04,3.23598E-01
0,0,1.00000E+00,2.10500E-03,2.45315E-01
0,0,1.00000E+00,4.04000E-04,2.45792E-01
0,0,1.20000E+00,2.10500E-03,1.97547E-01
0,0,1.20000E+00,4.04000E-04,1.96980E-01
0,0,1.50000E+00,2.10500E-03,1.50057E-01
0,0,1.50000E+00,4.04000E-04,1.48639E-01
0,0,1.75000E+00,2.10500E-03,1.24527E-01
0,0,1.75000E+00,4.04000E-04,1.24286E-01
0,0,2.00000E+00,2.10500E-03,1.06440E-01
0,0,2.00000E+00,4.04000E-04,1.06766E-01
1,0,0.00000E+00,2.10500E-03,7.18177E-01
1,0,0.00000E+00,4.04000E-04,8.13180E-01
1,0,1.00000E-01,2.10500E-03,7.68451E-01
1,0,1.00000E-01,4.04000E-04,8.13321E-01
1,0,2.00000E-01,2.10500E-03,8.52199E-01
1,0,2.00000E-01,4.04000E-04,8.81202E-01
1,0,3.00000E-01,2.10500E-03,8.54638E-01
1,0,3.00000E-01,4.04000E-04,9.15437E-01
1,0,4.00000E-01,2.10500E-03,8.18553E-01
1,0,4.00000E-01,4.04000E-04,8.90924E-01
1,0,5.00000E-01,2.10500E-03,7.89180E-01
1,0,5.00000E-01,4.04000E-04,8.72071E-01
1,0,7.50000E-01,2.10500E-03,7.45135E-01
1,0,7.50000E-01,4.04000E-04,8.55866E-01
1,0,1.00000E+00,2.10500E-03,6.97034E-01
1,0,1.00000E+00,4.04000E-04,8.23156E-01
1,0,1.20000E+00,2.10500E-03,6.54432E-01
1,0,1.20000E+00,4.04000E-04,7.85751E-01
1,0,1.50000E+00,2.10500E-03,6.14676E-01
1,0,1.50000E+00,4.04000E-04,7.52602E-01
1,0,1.75000E+00,2.10500E-03,5.88741E-01
1,0,1.75000E+00,4.04000E-04,7.33380E-01
1,0,2.00000E+00,2.10500E-03,5.65541E-01
1,0,2.00000E+00,4.04000E-04,7.15171E-01

0 comments on commit 1aa6f61

Please sign in to comment.