Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions simpeg_drivers/components/factories/entity_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ def _build(self, inversion_data: InversionData):
cells = self.params.data_object.transmitters.cells

if getattr(self.params.data_object, "tx_id_property", None) is not None:
self.params.data_object.tx_id_property.copy(parent=entity)
tx_id = self.params.data_object.tx_id_property.copy(parent=entity)
entity.tx_id_property = tx_id

if isinstance(
self.params.data_object.transmitters,
Expand All @@ -119,13 +120,25 @@ def _build(self, inversion_data: InversionData):
self.params.data_object.transmitters
)

entity.transmitters = self.params.data_object.transmitters.copy(
transmitters = self.params.data_object.transmitters.copy(
copy_complement=False,
vertices=vertices,
cells=cells,
parent=self.params.out_group,
copy_children=False,
)

if (
getattr(self.params.data_object.transmitters, "tx_id_property", None)
is not None
):
tx_id = self.params.data_object.transmitters.tx_id_property.copy(
parent=transmitters
)
transmitters.tx_id_property = tx_id

entity.transmitters = transmitters

tx_freq = self.params.data_object.transmitters.get_data("Tx frequency")
if tx_freq:
tx_freq[0].copy(parent=entity.transmitters)
Expand Down
2 changes: 2 additions & 0 deletions tests/run_tests/driver_ground_tem_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def test_ground_tem_fwr_run(
fwr_driver = TimeDomainElectromagneticsDriver(params)

survey.transmitters.remove_cells([15])
survey.tx_id_property.name = "tx_id"
assert fwr_driver.inversion_data.survey.source_list[0].n_segments == 16

if pytest:
Expand Down Expand Up @@ -232,6 +233,7 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
output = get_inversion_output(
driver.params.geoh5.h5file, driver.params.out_group.uid
)
assert driver.inversion_data.entity.tx_id_property.name == "tx_id"
output["data"] = orig_dBzdt
if pytest:
check_target(output, target_run, tolerance=0.5)
Expand Down
7 changes: 5 additions & 2 deletions tests/version_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import simpeg_drivers


def get_version():
def get_pyproject_version():
path = Path(__file__).resolve().parents[1] / "pyproject.toml"

with open(str(path), encoding="utf-8") as file:
Expand All @@ -62,7 +62,10 @@ def get_conda_recipe_version():


def test_version_is_consistent():
assert simpeg_drivers.__version__ == get_version()
assert simpeg_drivers.__version__ == get_pyproject_version()
normalized_conda_version = Version(get_conda_recipe_version())
normalized_version = Version(simpeg_drivers.__version__)
assert normalized_conda_version == normalized_version


def test_conda_version_is_pep440():
Expand Down