Skip to content

GEOPY-1966: Convert both joint params to BaseData #147

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

Merged
domfournier merged 4 commits into from
Feb 18, 2025
Merged

GEOPY-1966: Convert both joint params to BaseData #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4232c2a
more cleanup
benk-mira Feb 12, 2025
6e36017
Merge branch 'develop' into GEOPY-1966
benk-mira Feb 14, 2025
4b40970
Update joint params to BaseData
benk-mira Feb 14, 2025
57dc66e
remove write_default_uijson
benk-mira Feb 14, 2025
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
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class DCBatch2DForwardDriver(BaseBatch2DDriver):

_params_class = DCBatch2DForwardOptions
_params_2d_class = DC2DForwardOptions
_validations = {}
_validations = None


class DCBatch2DInversionDriver(BaseBatch2DDriver):
"""Direct Current batch 2D inversion driver."""

_params_class = DCBatch2DInversionOptions
_params_2d_class = DC2DInversionOptions
_validations = {}
_validations = None
5 changes: 3 additions & 2 deletions simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from __future__ import annotations

from pathlib import Path
from typing import ClassVar

from geoh5py.data import FloatData
Expand Down Expand Up @@ -41,7 +42,7 @@ class DCBatch2DForwardOptions(BaseForwardOptions):

name: ClassVar[str] = "Direct Current Pseudo 3D Forward"
title: ClassVar[str] = "Direct Current (DC) 2D Batch Forward"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/direct_current_batch2d_forward.ui.json"
)

Expand Down Expand Up @@ -76,7 +77,7 @@ class DCBatch2DInversionOptions(BaseInversionOptions):

name: ClassVar[str] = "Direct Current Pseudo 3D Inversion"
title: ClassVar[str] = "Direct Current (DC) 2D Batch Inversion"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/direct_current_batch2d_inversion.ui.json"
)

Expand Down
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/direct_current/three_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class DC3DForwardDriver(InversionDriver):
"""Direct Current 3D forward driver."""

_params_class = DC3DForwardOptions
_validation = {}
_validation = None


class DC3DInversionDriver(InversionDriver):
"""Direct Current 3D inversion driver."""

_params_class = DC3DInversionOptions
_validation = {}
_validation = None
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/direct_current/two_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class DC2DForwardDriver(Base2DDriver):
"""Direct Current 2D forward driver."""

_params_class = DC2DForwardOptions
_validations = {}
_validations = None


class DC2DInversionDriver(Base2DDriver):
"""Direct Current 2D inversion driver."""

_params_class = DC2DInversionOptions
_validations = {}
_validations = None
5 changes: 3 additions & 2 deletions simpeg_drivers/electricals/direct_current/two_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from __future__ import annotations

from pathlib import Path
from typing import ClassVar

from geoh5py.data import DataAssociationEnum, FloatData, ReferencedData
Expand Down Expand Up @@ -38,7 +39,7 @@ class DC2DForwardOptions(BaseForwardOptions):

name: ClassVar[str] = "Direct Current 2D Forward"
title: ClassVar[str] = "Direct Current 2D Forward"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/direct_current_2d_forward.ui.json"
)

Expand Down Expand Up @@ -66,7 +67,7 @@ class DC2DInversionOptions(BaseInversionOptions):

name: ClassVar[str] = "Direct Current 2D Inversion"
title: ClassVar[str] = "Direct Current 2D Inversion"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/direct_current_2d_inversion.ui.json"
)

Expand Down
6 changes: 3 additions & 3 deletions simpeg_drivers/electricals/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def create_drape_mesh(self) -> DrapeModel:
class BaseBatch2DDriver(LineSweepDriver):
"""Base class for batch 2D DC and IP forward and inversion drivers."""

_params_class: type(BaseForwardOptions, BaseInversionOptions)
_params_2d_class: type(BaseForwardOptions, BaseInversionOptions)
_validations: dict
_params_class: type[BaseForwardOptions | BaseInversionOptions]
_params_2d_class: type[BaseForwardOptions | BaseInversionOptions]
_validations = None
_model_list: list[str] = []

def __init__(self, params):
Expand Down
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver):

_params_class = IPBatch2DForwardOptions
_params_2d_class = IP2DForwardOptions
_validations = {}
_validations = None
_model_list = ["conductivity_model"]


Expand All @@ -36,5 +36,5 @@ class IPBatch2DInversionDriver(BaseBatch2DDriver):

_params_class = IPBatch2DInversionOptions
_params_2d_class = IP2DInversionOptions
_validations = {}
_validations = None
_model_list = ["conductivity_model"]
5 changes: 3 additions & 2 deletions simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from __future__ import annotations

from pathlib import Path
from typing import ClassVar

from geoh5py.data import FloatData
Expand Down Expand Up @@ -41,7 +42,7 @@ class IPBatch2DForwardOptions(BaseForwardOptions):

name: ClassVar[str] = "Induced Polarization Pseudo 3D Forward"
title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Forward"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/induced_polarization_batch2d_forward.ui.json"
)

Expand Down Expand Up @@ -75,7 +76,7 @@ class IPBatch2DInversionOptions(BaseInversionOptions):

name: ClassVar[str] = "Induced Polarization Pseudo 3D Inversion"
title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Inversion"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/induced_polarization_batch2d_inversion.ui.json"
)

Expand Down
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ class IP3DForwardDriver(InversionDriver):
"""Induced Polarization 3D forward driver."""

_params_class = IP3DForwardOptions
_validations = {}
_validations = None


class IP3DInversionDriver(InversionDriver):
"""Induced Polarization 3D inversion driver."""

_params_class = IP3DInversionOptions
_validations = {}
_validations = None
4 changes: 2 additions & 2 deletions simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ class IP2DForwardDriver(Base2DDriver):
"""Induced Polarization 2D forward driver."""

_params_class = IP2DForwardOptions
_validations = {}
_validations = None


class IP2DInversionDriver(Base2DDriver):
"""Induced Polarization 2D inversion driver."""

_params_class = IP2DInversionOptions
_validations = {}
_validations = None
5 changes: 3 additions & 2 deletions simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from __future__ import annotations

from pathlib import Path
from typing import ClassVar

from geoh5py.data import FloatData
Expand All @@ -37,7 +38,7 @@ class IP2DForwardOptions(BaseForwardOptions):

name: ClassVar[str] = "Induced Polarization 2D Forward"
title: ClassVar[str] = "Induced Polarization 2D Forward"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/induced_polarization_2d_forward.ui.json"
)

Expand Down Expand Up @@ -67,7 +68,7 @@ class IP2DInversionOptions(BaseInversionOptions):

name: ClassVar[str] = "Induced Polarization 2D Inversion"
title: ClassVar[str] = "Induced Polarization 2D Inversion"
default_ui_json: ClassVar[str] = (
default_ui_json: ClassVar[Path] = (
assets_path() / "uijson/induced_polarization_2d_inversion.ui.json"
)

Expand Down
4 changes: 2 additions & 2 deletions simpeg_drivers/electromagnetics/frequency_domain/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FDEMForwardDriver(InversionDriver):
"""Frequency Domain Electromagnetic forward driver."""

_params_class = FDEMForwardOptions
_validations = {}
_validations = None

def __init__(self, params: FDEMForwardOptions):
super().__init__(params)
Expand All @@ -33,4 +33,4 @@ class FDEMInversionDriver(InversionDriver):
"""Frequency Domain Electromagnetic inversion driver."""

_params_class = FDEMInversionOptions
_validations = {}
_validations = None
4 changes: 2 additions & 2 deletions simpeg_drivers/electromagnetics/time_domain/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TDEMForwardDriver(InversionDriver):
"""Time Domain Electromagnetic forward driver."""

_params_class = TDEMForwardOptions
_validations = {}
_validations = None

def get_tiles(self) -> list[np.ndarray]:
"""
Expand Down Expand Up @@ -88,7 +88,7 @@ class TDEMInversionDriver(InversionDriver):
"""Time Domain Electromagnetic inversion driver."""

_params_class = TDEMInversionOptions
_validations = {}
_validations = None

def get_tiles(self) -> list[np.ndarray]:
"""
Expand Down
89 changes: 0 additions & 89 deletions simpeg_drivers/joint/constants.py
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions simpeg_drivers/joint/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

from simpeg_drivers.components.factories import SaveDataGeoh5Factory
from simpeg_drivers.driver import InversionDriver
from simpeg_drivers.joint.params import BaseJointParams
from simpeg_drivers.joint.params import BaseJointOptions
from simpeg_drivers.utils.utils import simpeg_group_to_driver


class BaseJointDriver(InversionDriver):
def __init__(self, params: BaseJointParams):
def __init__(self, params: BaseJointOptions):
self._directives = None
self._drivers = None
self._wires = None
Expand Down
2 changes: 1 addition & 1 deletion simpeg_drivers/joint/joint_cross_gradient/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''


from .params import JointCrossGradientParams
from .params import JointCrossGradientOptions

# pylint: disable=unused-import
# flake8: noqa
Loading
Loading