Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use 'residents' instead of 'occupants_avg' or 'occupants_night' when calculating consequences for 'homeless' #8972

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Use 'residents' instead of 'occupants_avg' or 'occupants_night' when calculating consequences for 'homeless' #8972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
435589b
Use 'residents' instead of 'occupants_avg' or 'occupants_night' when …
ptormene Aug 31, 2023
19bfa60
Fix a typo
ptormene Aug 31, 2023
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
4 changes: 2 additions & 2 deletions openquake/risklib/scientific.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,7 @@ def consequence(consequence, coeffs, asset, dmgdist, loss_type):
elif consequence == 'fatalities':
return dmgdist @ coeffs * asset['occupants_night']
elif consequence == 'homeless':
return dmgdist @ coeffs * asset['occupants_avg']
return dmgdist @ coeffs * asset['residents']


def get_agg_value(consequence, agg_values, agg_id, xltype):
Expand All @@ -1667,7 +1667,7 @@ def get_agg_value(consequence, agg_values, agg_id, xltype):
elif consequence == 'fatalities':
return aval['occupants_night']
elif consequence == 'homeless':
return aval['occupants_night']
return aval['residents']
elif consequence in ('loss', 'losses'):
if xltype.endswith('_ins'):
xltype = xltype[:-4]
Expand Down
Loading