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

WIP: Add declustering #9465

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

WIP: Add declustering #9465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f5e6a80
Add declustering options with Reasenberg and Zaliapin declustering
kirstybayliss May 8, 2023
ecc702e
tests for Zaliapin declustering
kirstybayliss May 8, 2023
43a94df
Reasenberg test - something is not right here!
kirstybayliss May 10, 2023
941fbd7
Fixes to Reasenberg algorithm to use default distance and test for Re…
kirstybayliss Jun 12, 2023
f32b8bc
Fixed so that mainshock flag returns 0 for mainshocks (previously ret…
kirstybayliss Jun 12, 2023
c2f6d29
tidying
kirstybayliss Jun 12, 2023
2d62899
add nni to enhanced outputs of Zaliapin declustering
kirstybayliss Aug 1, 2023
f1a9abe
small updates
kirstybayliss Nov 7, 2023
d555f23
tidying declustering functions
kirstybayliss Feb 13, 2024
f43b555
Merge remote-tracking branch 'origin' into add_declustering
kirstybayliss Feb 19, 2024
1902949
removing typo
kirstybayliss Feb 19, 2024
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
9 changes: 9 additions & 0 deletions openquake/hmtk/parsers/catalogue/csv_catalogue_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ class CsvCatalogueWriter(BaseCatalogueWriter):

# Because the catalogues TOTAL_ATTRIBUTE_LIST is randomly ordered,
# the preferred output order is given as a list here

OUTPUT_LIST = [
"eventID",
"Agency",
Expand All @@ -182,6 +183,12 @@ class CsvCatalogueWriter(BaseCatalogueWriter):
"magnitude",
"sigmaMagnitude",
"magnitudeType",
'str1',
'dip1',
'rake1',
'str2',
'dip2',
'rake2'
]

def write_file(self, catalogue, flag_vector=None, magnitude_table=None):
Expand Down Expand Up @@ -256,6 +263,7 @@ def apply_purging(self, catalogue, flag_vector, magnitude_table):
class CsvGCMTCatalogueWriter(CsvCatalogueWriter):
"""
Writes GCMT catalogue to csv file

"""

OUTPUT_LIST = [
Expand Down Expand Up @@ -299,6 +307,7 @@ class CsvGCMTCatalogueWriter(CsvCatalogueWriter):
"plunge_t",
]


def write_file(self, catalogue, flag_vector=None, magnitude_table=None):
"""
Writes the catalogue to file, purging events if necessary.
Expand Down
1 change: 1 addition & 0 deletions openquake/hmtk/parsers/catalogue/gcmt_ndk_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ def to_hmtk(self, use_centroid=True):
iloc
] = gcmt.hypocentre.latitude
self.catalogue.data["depth"][iloc] = gcmt.hypocentre.depth

# Moment, magnitude and relative errors
self.catalogue.data["moment"][iloc] = gcmt.moment
self.catalogue.data["magnitude"][iloc] = gcmt.magnitude
Expand Down
13 changes: 13 additions & 0 deletions openquake/hmtk/seismicity/catalogue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ class Catalogue(object):
"depthError",
"magnitude",
"sigmaMagnitude",
'str1',
'dip1',
'rake1',
'str2',
'dip2',
'rake2'
]

INT_ATTRIBUTE_LIST = ["year", "month", "day", "hour", "minute", "flag"]
Expand Down Expand Up @@ -110,6 +116,13 @@ class Catalogue(object):
"magnitude",
"sigmaMagnitude",
"magnitudeType",
'str1',
'dip1',
'rake1',
'str2',
'dip2',
'rake2'

]

def __init__(self):
Expand Down
Loading
Loading