Skip to content

Commit 7d9c3db

Browse files
authored
Merge pull request #20 from MTgeophysics/updates
- bumpversion
2 parents 6ef5970 + e6260f9 commit 7d9c3db

File tree

7 files changed

+28
-24
lines changed

7 files changed

+28
-24
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.0.5
2+
current_version = 2.0.6
33
files = setup.py mtpy/__init__.py README.md docs/source/conf.py
44
commit = True
55
tag = True

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Documentation Status](https://readthedocs.org/projects/mtpy-v2/badge/?version=latest)](https://mtpy-v2.readthedocs.io/en/latest/?badge=latest)
88
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/MTgeophysics/mtpy-v2/main)
99

10-
## Version 2.0.5
10+
## Version 2.0.6
1111

1212
# Description
1313

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
#
6868

6969
# The short X.Y version.
70-
version = "2.0.5"
70+
version = "2.0.6"
7171
# The full version, including alpha/beta/rc tags.
72-
release = "2.0.5"
72+
release = "2.0.6"
7373

7474
# The language for content autogenerated by Sphinx. Refer to documentation
7575
# for a list of supported languages.

mtpy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from mtpy.imaging.mtcolors import MT_CMAP_DICT, register_cmaps
1919

2020

21-
__version__ = "2.0.5"
21+
__version__ = "2.0.6"
2222
__all__ = ["MT", "MTData", "MTCollection"]
2323

2424
# =============================================================================

mtpy/core/mt.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ def __deepcopy__(self, memo):
110110
continue
111111

112112
setattr(result, k, deepcopy(v, memo))
113+
result.logger = self.logger
113114
return result
114115

115116
def copy(self):
@@ -987,9 +988,7 @@ def add_white_noise(self, value, inplace=True):
987988
] = self._transfer_function.transfer_function.real * (
988989
noise_real
989990
) + (
990-
1j
991-
* self._transfer_function.transfer_function.imag
992-
* noise_imag
991+
1j * self._transfer_function.transfer_function.imag * noise_imag
993992
)
994993

995994
self._transfer_function["transfer_function_error"] = (
@@ -1003,9 +1002,7 @@ def add_white_noise(self, value, inplace=True):
10031002
] = self._transfer_function.transfer_function.real * (
10041003
noise_real
10051004
) + (
1006-
1j
1007-
* self._transfer_function.transfer_function.imag
1008-
* noise_imag
1005+
1j * self._transfer_function.transfer_function.imag * noise_imag
10091006
)
10101007

10111008
self._transfer_function["transfer_function_error"] = (

mtpy/core/mt_data.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ def mt_list(self, value):
227227
"""
228228
At this point not implemented, mainly here for inheritance of MTStations
229229
"""
230+
if len(self.values()) != 0:
231+
self.logger.warning("mt_list cannot be set.")
230232
pass
231233

232234
@property
@@ -262,6 +264,7 @@ def add_station(
262264
survey=None,
263265
compute_relative_location=True,
264266
interpolate_periods=None,
267+
compute_model_error=False,
265268
):
266269
"""
267270
Add a MT object
@@ -295,6 +298,18 @@ def add_station(
295298

296299
m = m.interpolate(interpolate_periods, bounds_error=False)
297300

301+
if compute_model_error:
302+
m.compute_model_z_errors(
303+
error_value=self.z_model_error.error_value,
304+
error_type=self.z_model_error.error_type,
305+
floor=self.z_model_error.floor,
306+
)
307+
m.compute_model_t_errors(
308+
error_value=self.t_model_error.error_value,
309+
error_type=self.t_model_error.error_type,
310+
floor=self.t_model_error.floor,
311+
)
312+
298313
self.__setitem__(f"{validate_name(m.survey)}.{m.station}", m)
299314

300315
if compute_relative_location:
@@ -531,9 +546,7 @@ def interpolate(self, new_periods, f_type="period", inplace=True):
531546
)
532547

533548
else:
534-
mt_data.add_station(
535-
new_mt_obj, compute_relative_location=False
536-
)
549+
mt_data.add_station(new_mt_obj, compute_relative_location=False)
537550

538551
if not inplace:
539552
return mt_data
@@ -557,9 +570,7 @@ def rotate(self, rotation_angle, inplace=True):
557570
if not inplace:
558571
rot_mt_obj = mt_obj.copy()
559572
rot_mt_obj.rotation_angle = rotation_angle
560-
mt_data.add_station(
561-
rot_mt_obj, compute_relative_location=False
562-
)
573+
mt_data.add_station(rot_mt_obj, compute_relative_location=False)
563574
else:
564575
mt_obj.rotation_angle = rotation_angle
565576

@@ -657,12 +668,8 @@ def compute_model_errors(
657668
self.t_model_error.floor = t_floor
658669

659670
for mt_obj in self.values():
660-
mt_obj.compute_model_z_errors(
661-
**self.z_model_error.error_parameters
662-
)
663-
mt_obj.compute_model_t_errors(
664-
**self.t_model_error.error_parameters
665-
)
671+
mt_obj.compute_model_z_errors(**self.z_model_error.error_parameters)
672+
mt_obj.compute_model_t_errors(**self.t_model_error.error_parameters)
666673

667674
def get_nearby_stations(self, station_key, radius, radius_units="m"):
668675
"""

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
test_suite="tests",
6666
tests_require=test_requirements,
6767
url="https://github.com/MTgeophysics/mtpy-v2",
68-
version="2.0.5",
68+
version="2.0.6",
6969
zip_safe=False,
7070
package_data={"": []},
7171
)

0 commit comments

Comments
 (0)