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

Fixed demo broken by the basing term refactoring #10149

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Fixed demo broken by the basing term refactoring #10149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion openquake/hazardlib/gsim/can20/can_shm6_active_crust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def _check_imts(imts):
+ str(MAX_SA) + 's.')


# NB: this is calling the basin term
def _get_site_scaling_ba14(kind, region, C, pga_rock, sites, period, rjb):
"""
Returns the site-scaling term (equation 5), broken down into a
Expand Down Expand Up @@ -291,7 +292,7 @@ class CanadaSHM6_ActiveCrust_AbrahamsonEtAl2014(AbrahamsonEtAl2014):

See also header in CanadaSHM6_ActiveCrust.py
"""
REQUIRES_SITES_PARAMETERS = {'vs30measured', 'vs30'}
REQUIRES_SITES_PARAMETERS = {'vs30measured', 'vs30', 'z1pt0'}

def compute(self, ctx: np.recarray, imts, mean, sig, tau, phi):
"""
Expand Down
4 changes: 2 additions & 2 deletions openquake/hazardlib/gsim/can20/can_shm6_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CanadaSHM6_Interface_AbrahamsonEtAl2015SInter(AbrahamsonEtAl2015SInter):
"""
MAX_SA = 10.
MIN_SA = 0.05
DEFINED_FOR_INTENSITY_MEASURE_TYPES = set([PGA, PGV, SA])
DEFINED_FOR_INTENSITY_MEASURE_TYPES = {PGA, PGV, SA}

def compute(self, ctx: np.recarray, imts, mean, sig, tau, phi):
"""
Expand Down Expand Up @@ -260,7 +260,7 @@ class CanadaSHM6_Interface_AtkinsonMacias2009(AtkinsonMacias2009):
"""

REQUIRES_DISTANCES = {'rrup', 'rjb'}
REQUIRES_SITES_PARAMETERS = {'vs30'}
REQUIRES_SITES_PARAMETERS = {'vs30', 'z1pt0'}
DEFINED_FOR_INTENSITY_MEASURE_TYPES = {PGA, PGV, SA}

def compute(self, ctx: np.recarray, imts, mean, sig, tau, phi):
Expand Down
Loading