Skip to content

Commit

Permalink
Merge pull request #9 from mhearne-usgs/bugfix
Browse files Browse the repository at this point in the history
changed instances of SZintra to SZINtra to match the fecodes.csv data…
  • Loading branch information
mhearne-usgs committed Dec 3, 2015
2 parents 4ff49e6 + 40e3e04 commit c99542f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions strec/gmpe.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,15 +788,15 @@ def getSZGMPE(self,fmstring,depthzone,depth,eq2,eq3a,eq3b,acrdepth,plungevals):
gmpe = 'SZinter'
else:
if eq3b:
gmpe = 'SZintra'
gmpe = 'SZIntra'
else:
if depth > acrdepth:
gmpe = 'ACRde'
else:
gmpe = 'ACRsh'
else:
if eq3b:
gmpe = 'SZintra'
gmpe = 'SZIntra'
else:
if depth > acrdepth:
gmpe = 'ACRde'
Expand All @@ -809,26 +809,26 @@ def getSZGMPE(self,fmstring,depthzone,depth,eq2,eq3a,eq3b,acrdepth,plungevals):
warning = 'No focal mechanism available'
else:
if eq3b:
gmpe = 'SZintra'
gmpe = 'SZIntra'
else:
if depth > acrdepth:
gmpe = 'ACRde'
else:
gmpe = 'ACRsh'
else:
if eq3b:
gmpe = 'SZintra'
gmpe = 'SZIntra'
else:
if depth > acrdepth:
gmpe = 'ACRde'
else:
gmpe = 'ACRsh'
elif depthzone == 'deep':
if eq3b:
gmpe = 'SZintra'
gmpe = 'SZIntra'
else:
warning = 'Event above interface'
gmpe = 'SZintra'
gmpe = 'SZIntra'

return gmpe,warning

Expand Down

0 comments on commit c99542f

Please sign in to comment.