From bff4cd53f590ddeb0d6958c33c63b219a4bfb316 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 11 Apr 2025 14:06:03 -0700 Subject: [PATCH 1/3] Bulk rename to options modules --- simpeg_drivers/components/data.py | 2 +- simpeg_drivers/components/factories/misfit_factory.py | 2 +- .../components/factories/receiver_factory.py | 2 +- simpeg_drivers/components/factories/simpeg_factory.py | 2 +- .../components/factories/simulation_factory.py | 2 +- simpeg_drivers/components/factories/source_factory.py | 2 +- simpeg_drivers/components/factories/survey_factory.py | 2 +- simpeg_drivers/components/locations.py | 2 +- simpeg_drivers/components/meshes.py | 2 +- simpeg_drivers/components/topography.py | 2 +- simpeg_drivers/components/windows.py | 2 +- .../sensitivity_cutoff/driver.py | 4 ++-- .../sensitivity_cutoff/{params.py => options.py} | 0 simpeg_drivers/driver.py | 11 ++++++----- simpeg_drivers/electricals/__init__.py | 2 +- .../direct_current/pseudo_three_dimensions/driver.py | 8 ++++---- .../pseudo_three_dimensions/{params.py => options.py} | 4 ++-- .../direct_current/three_dimensions/__init__.py | 2 +- .../direct_current/three_dimensions/driver.py | 6 +++--- .../three_dimensions/{params.py => options.py} | 2 +- .../direct_current/two_dimensions/__init__.py | 2 +- .../direct_current/two_dimensions/driver.py | 6 +++--- .../two_dimensions/{params.py => options.py} | 2 +- simpeg_drivers/electricals/driver.py | 4 ++-- .../pseudo_three_dimensions/driver.py | 8 ++++---- .../pseudo_three_dimensions/{params.py => options.py} | 4 ++-- .../induced_polarization/three_dimensions/__init__.py | 2 +- .../induced_polarization/three_dimensions/driver.py | 6 +++--- .../three_dimensions/{params.py => options.py} | 2 +- .../induced_polarization/two_dimensions/__init__.py | 2 +- .../induced_polarization/two_dimensions/driver.py | 6 +++--- .../two_dimensions/{params.py => options.py} | 2 +- simpeg_drivers/electricals/{params.py => options.py} | 0 simpeg_drivers/electromagnetics/base_1d_driver.py | 2 +- .../electromagnetics/frequency_domain/__init__.py | 2 +- .../electromagnetics/frequency_domain/driver.py | 6 +++--- .../frequency_domain/{params.py => options.py} | 2 +- .../electromagnetics/frequency_domain_1d/driver.py | 6 +++--- .../frequency_domain_1d/{params.py => options.py} | 2 +- simpeg_drivers/electromagnetics/time_domain/driver.py | 6 +++--- .../time_domain/{params.py => options.py} | 2 +- .../electromagnetics/time_domain_1d/__init__.py | 2 +- .../electromagnetics/time_domain_1d/driver.py | 6 +++--- .../time_domain_1d/{params.py => options.py} | 2 +- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/joint/joint_cross_gradient/__init__.py | 2 +- simpeg_drivers/joint/joint_cross_gradient/driver.py | 4 ++-- .../joint_cross_gradient/{params.py => options.py} | 2 +- simpeg_drivers/joint/joint_surveys/__init__.py | 2 +- simpeg_drivers/joint/joint_surveys/driver.py | 4 ++-- .../joint/joint_surveys/{params.py => options.py} | 2 +- simpeg_drivers/joint/{params.py => options.py} | 2 +- .../natural_sources/magnetotellurics/__init__.py | 2 +- .../natural_sources/magnetotellurics/driver.py | 6 +++--- .../magnetotellurics/{params.py => options.py} | 2 +- simpeg_drivers/natural_sources/tipper/__init__.py | 2 +- simpeg_drivers/natural_sources/tipper/driver.py | 6 +++--- .../natural_sources/tipper/{params.py => options.py} | 2 +- simpeg_drivers/{params.py => options.py} | 0 simpeg_drivers/potential_fields/__init__.py | 6 +++--- simpeg_drivers/potential_fields/gravity/__init__.py | 2 +- simpeg_drivers/potential_fields/gravity/driver.py | 6 +++--- .../gravity/{params.py => options.py} | 2 +- .../potential_fields/magnetic_scalar/__init__.py | 2 +- .../potential_fields/magnetic_scalar/driver.py | 6 +++--- .../magnetic_scalar/{params.py => options.py} | 2 +- .../potential_fields/magnetic_vector/__init__.py | 2 +- .../potential_fields/magnetic_vector/driver.py | 6 +++--- .../magnetic_vector/{params.py => options.py} | 2 +- simpeg_drivers/utils/tile_estimate.py | 2 +- simpeg_drivers/utils/utils.py | 2 +- tests/data_test.py | 4 ++-- tests/driver_test.py | 2 +- tests/locations_test.py | 2 +- tests/meshes_test.py | 2 +- tests/models_test.py | 2 +- tests/run_tests/driver_airborne_fem_1d_test.py | 4 ++-- tests/run_tests/driver_airborne_tem_1d_test.py | 4 ++-- tests/run_tests/driver_airborne_tem_test.py | 4 ++-- tests/run_tests/driver_dc_2d_test.py | 4 ++-- tests/run_tests/driver_dc_b2d_test.py | 6 +++--- tests/run_tests/driver_dc_test.py | 4 ++-- tests/run_tests/driver_fem_test.py | 4 ++-- tests/run_tests/driver_grav_test.py | 2 +- tests/run_tests/driver_ground_tem_test.py | 4 ++-- tests/run_tests/driver_ip_2d_test.py | 2 +- tests/run_tests/driver_ip_b2d_test.py | 6 +++--- tests/run_tests/driver_ip_test.py | 2 +- tests/run_tests/driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mag_automesh_test.py | 2 +- tests/run_tests/driver_mag_test.py | 2 +- tests/run_tests/driver_mt_test.py | 4 ++-- tests/run_tests/driver_mvi_test.py | 2 +- tests/run_tests/driver_rotated_gradients_test.py | 2 +- tests/run_tests/driver_tile_estimator_test.py | 2 +- tests/run_tests/driver_tipper_test.py | 2 +- tests/run_tests/sensitivity_cutoff_test.py | 4 ++-- tests/topography_test.py | 2 +- tests/uijson_test.py | 4 ++-- 100 files changed, 157 insertions(+), 156 deletions(-) rename simpeg_drivers/depth_of_investigation/sensitivity_cutoff/{params.py => options.py} (100%) rename simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/{params.py => options.py} (97%) rename simpeg_drivers/electricals/direct_current/three_dimensions/{params.py => options.py} (96%) rename simpeg_drivers/electricals/direct_current/two_dimensions/{params.py => options.py} (98%) rename simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/{params.py => options.py} (97%) rename simpeg_drivers/electricals/induced_polarization/three_dimensions/{params.py => options.py} (97%) rename simpeg_drivers/electricals/induced_polarization/two_dimensions/{params.py => options.py} (98%) rename simpeg_drivers/electricals/{params.py => options.py} (100%) rename simpeg_drivers/electromagnetics/frequency_domain/{params.py => options.py} (97%) rename simpeg_drivers/electromagnetics/frequency_domain_1d/{params.py => options.py} (98%) rename simpeg_drivers/electromagnetics/time_domain/{params.py => options.py} (97%) rename simpeg_drivers/electromagnetics/time_domain_1d/{params.py => options.py} (99%) rename simpeg_drivers/joint/joint_cross_gradient/{params.py => options.py} (96%) rename simpeg_drivers/joint/joint_surveys/{params.py => options.py} (97%) rename simpeg_drivers/joint/{params.py => options.py} (98%) rename simpeg_drivers/natural_sources/magnetotellurics/{params.py => options.py} (98%) rename simpeg_drivers/natural_sources/tipper/{params.py => options.py} (97%) rename simpeg_drivers/{params.py => options.py} (100%) rename simpeg_drivers/potential_fields/gravity/{params.py => options.py} (98%) rename simpeg_drivers/potential_fields/magnetic_scalar/{params.py => options.py} (98%) rename simpeg_drivers/potential_fields/magnetic_vector/{params.py => options.py} (98%) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index af65554c..26be8d76 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -18,7 +18,7 @@ from geoh5py.workspace import Workspace from simpeg_drivers.components.meshes import InversionMesh - from simpeg_drivers.params import InversionBaseOptions + from simpeg_drivers.options import InversionBaseOptions from copy import deepcopy from re import findall diff --git a/simpeg_drivers/components/factories/misfit_factory.py b/simpeg_drivers/components/factories/misfit_factory.py index 52c6c4f8..d8642d90 100644 --- a/simpeg_drivers/components/factories/misfit_factory.py +++ b/simpeg_drivers/components/factories/misfit_factory.py @@ -19,7 +19,7 @@ from simpeg_drivers.components.data import InversionData from simpeg_drivers.components.meshes import InversionMesh - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions import numpy as np from geoh5py.objects import Octree diff --git a/simpeg_drivers/components/factories/receiver_factory.py b/simpeg_drivers/components/factories/receiver_factory.py index a27e9060..9a052329 100644 --- a/simpeg_drivers/components/factories/receiver_factory.py +++ b/simpeg_drivers/components/factories/receiver_factory.py @@ -20,7 +20,7 @@ if TYPE_CHECKING: from geoapps_utils.driver.params import BaseParams - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions import numpy as np from geoapps_utils.utils.transformations import rotate_xyz diff --git a/simpeg_drivers/components/factories/simpeg_factory.py b/simpeg_drivers/components/factories/simpeg_factory.py index 44d92db0..8e2cf885 100644 --- a/simpeg_drivers/components/factories/simpeg_factory.py +++ b/simpeg_drivers/components/factories/simpeg_factory.py @@ -18,7 +18,7 @@ if TYPE_CHECKING: from geoapps_utils.driver.params import BaseParams - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions # TODO Redesign simpeg factory to avoid pylint arguments-differ complaint diff --git a/simpeg_drivers/components/factories/simulation_factory.py b/simpeg_drivers/components/factories/simulation_factory.py index e2567b09..11809d91 100644 --- a/simpeg_drivers/components/factories/simulation_factory.py +++ b/simpeg_drivers/components/factories/simulation_factory.py @@ -20,7 +20,7 @@ if TYPE_CHECKING: from geoapps_utils.driver.params import BaseParams - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions from pathlib import Path diff --git a/simpeg_drivers/components/factories/source_factory.py b/simpeg_drivers/components/factories/source_factory.py index 15ee7cc5..efbb1fb7 100644 --- a/simpeg_drivers/components/factories/source_factory.py +++ b/simpeg_drivers/components/factories/source_factory.py @@ -29,7 +29,7 @@ if TYPE_CHECKING: from geoapps_utils.driver.params import BaseParams - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions class SourcesFactory(SimPEGFactory): diff --git a/simpeg_drivers/components/factories/survey_factory.py b/simpeg_drivers/components/factories/survey_factory.py index 9c9a5fb1..ca78655d 100644 --- a/simpeg_drivers/components/factories/survey_factory.py +++ b/simpeg_drivers/components/factories/survey_factory.py @@ -19,7 +19,7 @@ if TYPE_CHECKING: from geoapps_utils.driver.params import BaseParams - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions import numpy as np import simpeg.electromagnetics.time_domain as tdem diff --git a/simpeg_drivers/components/locations.py b/simpeg_drivers/components/locations.py index 0739afe3..da691066 100644 --- a/simpeg_drivers/components/locations.py +++ b/simpeg_drivers/components/locations.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from geoh5py.workspace import Workspace - from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions + from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions import numpy as np from geoh5py.objects import ObjectBase, Points diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index c4005baf..2bc9722f 100644 --- a/simpeg_drivers/components/meshes.py +++ b/simpeg_drivers/components/meshes.py @@ -24,7 +24,7 @@ from octree_creation_app.utils import octree_2_treemesh, treemesh_2_octree from scipy.sparse import csr_matrix, identity -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions from simpeg_drivers.utils.meshes import auto_mesh_parameters from simpeg_drivers.utils.utils import drape_2_tensor diff --git a/simpeg_drivers/components/topography.py b/simpeg_drivers/components/topography.py index 5664c17c..34ff9ecb 100644 --- a/simpeg_drivers/components/topography.py +++ b/simpeg_drivers/components/topography.py @@ -19,7 +19,7 @@ from geoh5py.workspace import Workspace from simpeg_drivers.components.meshes import InversionMesh - from simpeg_drivers.params import BaseOptions + from simpeg_drivers.options import BaseOptions import warnings diff --git a/simpeg_drivers/components/windows.py b/simpeg_drivers/components/windows.py index b31361c4..48d611c7 100644 --- a/simpeg_drivers/components/windows.py +++ b/simpeg_drivers/components/windows.py @@ -18,7 +18,7 @@ from geoapps_utils.driver.params import BaseParams from geoh5py.workspace import Workspace - from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions + from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions import numpy as np from geoh5py.objects import Grid2D, PotentialElectrode diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py index 72ebfee4..ec2d3cba 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py @@ -28,7 +28,7 @@ from geoapps_utils.driver.driver import BaseDriver from geoh5py.data import FloatData -from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.params import ( +from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.options import ( SensitivityCutoffParams, ) @@ -107,7 +107,7 @@ class SensitivityCutoffDriver(BaseDriver): below the provided cutoff percentage. """ - _params_class = SensitivityCutoffParams + _options_class = SensitivityCutoffParams def __init__(self, params: SensitivityCutoffParams): super().__init__(params) diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py similarity index 100% rename from simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py rename to simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index e2bbcab1..68dec72a 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -59,11 +59,11 @@ InversionWindow, ) from simpeg_drivers.components.factories import DirectivesFactory, MisfitFactory -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, ) -from simpeg_drivers.joint.params import BaseJointOptions +from simpeg_drivers.joint.options import BaseJointOptions from simpeg_drivers.utils.utils import tile_locations from simpeg_drivers.utils.regularization import cell_neighbors, set_rotated_operators @@ -72,7 +72,7 @@ class InversionDriver(BaseDriver): - _params_class = BaseForwardOptions | BaseInversionOptions + _options_class = BaseForwardOptions | BaseInversionOptions _inversion_type: str | None = None _validations = None @@ -582,7 +582,7 @@ def start(cls, filepath: str | Path, driver_class=None): ) with ifile.data["geoh5"].open(mode="r+"): - params = driver_class._params_class.build(ifile) + params = driver_class._options_class.build(ifile) driver = driver_class(params) driver.run() @@ -654,6 +654,7 @@ def get_path(self, filepath: str | Path) -> str: if __name__ == "__main__": - file = Path(sys.argv[1]).resolve() + # file = Path(sys.argv[1]).resolve() + file = r"C:\Users\dominiquef\Desktop\Tests\late_em_1em3_WS.ui.json" InversionDriver.start(file) sys.stdout.close() diff --git a/simpeg_drivers/electricals/__init__.py b/simpeg_drivers/electricals/__init__.py index df1e0e2a..3549e870 100644 --- a/simpeg_drivers/electricals/__init__.py +++ b/simpeg_drivers/electricals/__init__.py @@ -15,7 +15,7 @@ DC3DForwardOptions, DC3DInversionOptions, ) -from .induced_polarization.three_dimensions.params import ( +from .induced_polarization.three_dimensions.options import ( IP3DForwardOptions, IP3DInversionOptions, ) diff --git a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py index 0ea8333f..6cb8ac9e 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py @@ -11,11 +11,11 @@ from __future__ import annotations -from simpeg_drivers.electricals.direct_current.pseudo_three_dimensions.params import ( +from simpeg_drivers.electricals.direct_current.pseudo_three_dimensions.options import ( DCBatch2DForwardOptions, DCBatch2DInversionOptions, ) -from simpeg_drivers.electricals.direct_current.two_dimensions.params import ( +from simpeg_drivers.electricals.direct_current.two_dimensions.options import ( DC2DForwardOptions, DC2DInversionOptions, ) @@ -25,7 +25,7 @@ class DCBatch2DForwardDriver(BaseBatch2DDriver): """Direct Current batch 2D forward driver.""" - _params_class = DCBatch2DForwardOptions + _options_class = DCBatch2DForwardOptions _params_2d_class = DC2DForwardOptions _validations = None @@ -33,6 +33,6 @@ class DCBatch2DForwardDriver(BaseBatch2DDriver): class DCBatch2DInversionDriver(BaseBatch2DDriver): """Direct Current batch 2D inversion driver.""" - _params_class = DCBatch2DInversionOptions + _options_class = DCBatch2DInversionOptions _params_2d_class = DC2DInversionOptions _validations = None diff --git a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/options.py similarity index 97% rename from simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py rename to simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/options.py index 9afe88fa..54300f91 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/options.py @@ -18,10 +18,10 @@ from geoh5py.objects import Octree, PotentialElectrode from simpeg_drivers import assets_path -from simpeg_drivers.electricals.params import ( +from simpeg_drivers.electricals.options import ( FileControlOptions, ) -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, DrapeModelOptions, diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py b/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py index 317ec4e2..85dfcc27 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import DC3DForwardOptions, DC3DInversionOptions +from .options import DC3DForwardOptions, DC3DInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py index a714498d..59e7b668 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py @@ -13,18 +13,18 @@ from simpeg_drivers.driver import InversionDriver -from .params import DC3DForwardOptions, DC3DInversionOptions +from .options import DC3DForwardOptions, DC3DInversionOptions class DC3DForwardDriver(InversionDriver): """Direct Current 3D forward driver.""" - _params_class = DC3DForwardOptions + _options_class = DC3DForwardOptions _validation = None class DC3DInversionDriver(InversionDriver): """Direct Current 3D inversion driver.""" - _params_class = DC3DInversionOptions + _options_class = DC3DInversionOptions _validation = None diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/three_dimensions/options.py similarity index 96% rename from simpeg_drivers/electricals/direct_current/three_dimensions/params.py rename to simpeg_drivers/electricals/direct_current/three_dimensions/options.py index 7550478e..5417c484 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/options.py @@ -17,7 +17,7 @@ from geoh5py.data import FloatData from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions class DC3DForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py b/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py index 717653c5..e47f63e3 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import DC2DForwardOptions, DC2DInversionOptions +from .options import DC2DForwardOptions, DC2DInversionOptions __all__ = ["DC2DForwardOptions", "DC2DInversionOptions"] diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py index effb412c..edb3913b 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py @@ -13,18 +13,18 @@ from simpeg_drivers.electricals.driver import Base2DDriver -from .params import DC2DForwardOptions, DC2DInversionOptions +from .options import DC2DForwardOptions, DC2DInversionOptions class DC2DForwardDriver(Base2DDriver): """Direct Current 2D forward driver.""" - _params_class = DC2DForwardOptions + _options_class = DC2DForwardOptions _validations = None class DC2DInversionDriver(Base2DDriver): """Direct Current 2D inversion driver.""" - _params_class = DC2DInversionOptions + _options_class = DC2DInversionOptions _validations = None diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py b/simpeg_drivers/electricals/direct_current/two_dimensions/options.py similarity index 98% rename from simpeg_drivers/electricals/direct_current/two_dimensions/params.py rename to simpeg_drivers/electricals/direct_current/two_dimensions/options.py index d5b9f88e..e168a689 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/options.py @@ -19,7 +19,7 @@ from pydantic import BaseModel, ConfigDict, field_validator, model_validator from simpeg_drivers import assets_path -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, DrapeModelOptions, diff --git a/simpeg_drivers/electricals/driver.py b/simpeg_drivers/electricals/driver.py index b690418a..66f96779 100644 --- a/simpeg_drivers/electricals/driver.py +++ b/simpeg_drivers/electricals/driver.py @@ -30,7 +30,7 @@ from simpeg_drivers.components.windows import InversionWindow from simpeg_drivers.driver import InversionDriver from simpeg_drivers.line_sweep.driver import LineSweepDriver -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, LineSelectionOptions, @@ -80,7 +80,7 @@ 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] + _options_class: type[BaseForwardOptions | BaseInversionOptions] _params_2d_class: type[BaseForwardOptions | BaseInversionOptions] _validations = None _model_list: list[str] = [] diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py index 2347059c..2f37e47f 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py @@ -12,11 +12,11 @@ from __future__ import annotations from simpeg_drivers.electricals.driver import BaseBatch2DDriver -from simpeg_drivers.electricals.induced_polarization.pseudo_three_dimensions.params import ( +from simpeg_drivers.electricals.induced_polarization.pseudo_three_dimensions.options import ( IPBatch2DForwardOptions, IPBatch2DInversionOptions, ) -from simpeg_drivers.electricals.induced_polarization.two_dimensions.params import ( +from simpeg_drivers.electricals.induced_polarization.two_dimensions.options import ( IP2DForwardOptions, IP2DInversionOptions, ) @@ -25,7 +25,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver): """Induced Polarization batch 2D forward driver.""" - _params_class = IPBatch2DForwardOptions + _options_class = IPBatch2DForwardOptions _params_2d_class = IP2DForwardOptions _validations = None _model_list = ["conductivity_model"] @@ -34,7 +34,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver): class IPBatch2DInversionDriver(BaseBatch2DDriver): """Induced Polarization batch 2D inversion driver.""" - _params_class = IPBatch2DInversionOptions + _options_class = IPBatch2DInversionOptions _params_2d_class = IP2DInversionOptions _validations = None _model_list = ["conductivity_model"] diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/options.py similarity index 97% rename from simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py rename to simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/options.py index 7bb47a70..3d4732de 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/options.py @@ -18,10 +18,10 @@ from geoh5py.objects import Octree, PotentialElectrode from simpeg_drivers import assets_path -from simpeg_drivers.electricals.params import ( +from simpeg_drivers.electricals.options import ( FileControlOptions, ) -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, DrapeModelOptions, diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py index 73277c14..dab8d512 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import ( +from .options import ( IP3DForwardOptions, IP3DInversionOptions, ) diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py index eef7788e..777e0c78 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py @@ -13,7 +13,7 @@ from simpeg_drivers.driver import InversionDriver -from .params import ( +from .options import ( IP3DForwardOptions, IP3DInversionOptions, ) @@ -22,12 +22,12 @@ class IP3DForwardDriver(InversionDriver): """Induced Polarization 3D forward driver.""" - _params_class = IP3DForwardOptions + _options_class = IP3DForwardOptions _validations = None class IP3DInversionDriver(InversionDriver): """Induced Polarization 3D inversion driver.""" - _params_class = IP3DInversionOptions + _options_class = IP3DInversionOptions _validations = None diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/options.py similarity index 97% rename from simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py rename to simpeg_drivers/electricals/induced_polarization/three_dimensions/options.py index b4ec8254..ddad7421 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/options.py @@ -17,7 +17,7 @@ from geoh5py.data import FloatData from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions class IP3DForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py index 13970f47..17f6233d 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import ( +from .options import ( IP2DForwardOptions, IP2DInversionOptions, ) diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py index b46167fd..cd02c79d 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py @@ -13,7 +13,7 @@ from simpeg_drivers.electricals.driver import Base2DDriver -from .params import ( +from .options import ( IP2DForwardOptions, IP2DInversionOptions, ) @@ -22,12 +22,12 @@ class IP2DForwardDriver(Base2DDriver): """Induced Polarization 2D forward driver.""" - _params_class = IP2DForwardOptions + _options_class = IP2DForwardOptions _validations = None class IP2DInversionDriver(Base2DDriver): """Induced Polarization 2D inversion driver.""" - _params_class = IP2DInversionOptions + _options_class = IP2DInversionOptions _validations = None diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/options.py similarity index 98% rename from simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py rename to simpeg_drivers/electricals/induced_polarization/two_dimensions/options.py index 1cdda7e8..1bbef88f 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/options.py @@ -18,7 +18,7 @@ from geoh5py.objects import DrapeModel from simpeg_drivers import assets_path -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, DrapeModelOptions, diff --git a/simpeg_drivers/electricals/params.py b/simpeg_drivers/electricals/options.py similarity index 100% rename from simpeg_drivers/electricals/params.py rename to simpeg_drivers/electricals/options.py diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index 96242169..7766f8bb 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -32,7 +32,7 @@ class Base1DDriver(InversionDriver): """Base 1D driver for electromagnetic simulations.""" - _params_class = None + _options_class = None _validations = None def __init__(self, workspace: Workspace, **kwargs): diff --git a/simpeg_drivers/electromagnetics/frequency_domain/__init__.py b/simpeg_drivers/electromagnetics/frequency_domain/__init__.py index 49293842..3036db9a 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/__init__.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import ( +from .options import ( FDEMForwardOptions, FDEMInversionOptions, ) diff --git a/simpeg_drivers/electromagnetics/frequency_domain/driver.py b/simpeg_drivers/electromagnetics/frequency_domain/driver.py index 19fbe0cb..733204b5 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/driver.py @@ -13,7 +13,7 @@ from simpeg_drivers.driver import InversionDriver -from .params import ( +from .options import ( FDEMForwardOptions, FDEMInversionOptions, ) @@ -22,7 +22,7 @@ class FDEMForwardDriver(InversionDriver): """Frequency Domain Electromagnetic forward driver.""" - _params_class = FDEMForwardOptions + _options_class = FDEMForwardOptions _validations = None def __init__(self, params: FDEMForwardOptions): @@ -32,5 +32,5 @@ def __init__(self, params: FDEMForwardOptions): class FDEMInversionDriver(InversionDriver): """Frequency Domain Electromagnetic inversion driver.""" - _params_class = FDEMInversionOptions + _options_class = FDEMInversionOptions _validations = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain/params.py b/simpeg_drivers/electromagnetics/frequency_domain/options.py similarity index 97% rename from simpeg_drivers/electromagnetics/frequency_domain/params.py rename to simpeg_drivers/electromagnetics/frequency_domain/options.py index f0ae20bf..d42ef380 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/params.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/options.py @@ -22,7 +22,7 @@ ) from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions, EMDataMixin +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions, EMDataMixin Receivers: TypeAlias = ( diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py index f0e99923..469fbaaa 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py @@ -13,7 +13,7 @@ from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver -from .params import ( +from .options import ( FDEM1DForwardOptions, FDEM1DInversionOptions, ) @@ -22,12 +22,12 @@ class FDEM1DForwardDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic forward driver.""" - _params_class = FDEM1DForwardOptions + _options_class = FDEM1DForwardOptions _validations = None class FDEM1DInversionDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic inversion driver.""" - _params_class = FDEM1DInversionOptions + _options_class = FDEM1DInversionOptions _validations = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py similarity index 98% rename from simpeg_drivers/electromagnetics/frequency_domain_1d/params.py rename to simpeg_drivers/electromagnetics/frequency_domain_1d/options.py index 25806a0d..c9478e90 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py @@ -21,7 +21,7 @@ FDEMForwardOptions, FDEMInversionOptions, ) -from simpeg_drivers.params import DrapeModelOptions +from simpeg_drivers.options import DrapeModelOptions class FDEM1DForwardOptions(FDEMForwardOptions): diff --git a/simpeg_drivers/electromagnetics/time_domain/driver.py b/simpeg_drivers/electromagnetics/time_domain/driver.py index ffc61240..ef02069e 100644 --- a/simpeg_drivers/electromagnetics/time_domain/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain/driver.py @@ -19,7 +19,7 @@ from simpeg_drivers.driver import InversionDriver from simpeg_drivers.utils.utils import tile_locations -from .params import ( +from .options import ( TDEMForwardOptions, TDEMInversionOptions, ) @@ -84,7 +84,7 @@ def tile_large_group_transmitters( class TDEMForwardDriver(InversionDriver): """Time Domain Electromagnetic forward driver.""" - _params_class = TDEMForwardOptions + _options_class = TDEMForwardOptions _validations = None def get_tiles(self) -> list[np.ndarray]: @@ -107,7 +107,7 @@ def get_tiles(self) -> list[np.ndarray]: class TDEMInversionDriver(InversionDriver): """Time Domain Electromagnetic inversion driver.""" - _params_class = TDEMInversionOptions + _options_class = TDEMInversionOptions _validations = None def get_tiles(self) -> list[np.ndarray]: diff --git a/simpeg_drivers/electromagnetics/time_domain/params.py b/simpeg_drivers/electromagnetics/time_domain/options.py similarity index 97% rename from simpeg_drivers/electromagnetics/time_domain/params.py rename to simpeg_drivers/electromagnetics/time_domain/options.py index 95ab42ca..e3fd2066 100644 --- a/simpeg_drivers/electromagnetics/time_domain/params.py +++ b/simpeg_drivers/electromagnetics/time_domain/options.py @@ -22,7 +22,7 @@ ) from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions, EMDataMixin +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions, EMDataMixin Receivers: TypeAlias = ( diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py b/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py index 735bc24e..7af431ad 100644 --- a/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py +++ b/simpeg_drivers/electromagnetics/time_domain_1d/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import ( +from .options import ( TDEM1DForwardOptions, TDEM1DInversionOptions, ) diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py index 7727f835..fdecb6b1 100644 --- a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py @@ -13,7 +13,7 @@ from simpeg_drivers.electromagnetics.base_1d_driver import Base1DDriver -from .params import ( +from .options import ( TDEM1DForwardOptions, TDEM1DInversionOptions, ) @@ -22,12 +22,12 @@ class TDEM1DForwardDriver(Base1DDriver): """Time Domain 1D Electromagnetic forward driver.""" - _params_class = TDEM1DForwardOptions + _options_class = TDEM1DForwardOptions _validations = None class TDEM1DInversionDriver(Base1DDriver): """Time Domain 1D Electromagnetic inversion driver.""" - _params_class = TDEM1DInversionOptions + _options_class = TDEM1DInversionOptions _validations = None diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/params.py b/simpeg_drivers/electromagnetics/time_domain_1d/options.py similarity index 99% rename from simpeg_drivers/electromagnetics/time_domain_1d/params.py rename to simpeg_drivers/electromagnetics/time_domain_1d/options.py index cd2bd76a..257e52bd 100644 --- a/simpeg_drivers/electromagnetics/time_domain_1d/params.py +++ b/simpeg_drivers/electromagnetics/time_domain_1d/options.py @@ -22,7 +22,7 @@ ) from simpeg_drivers import assets_path -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, DrapeModelOptions, diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 133312ae..fc90167a 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -29,7 +29,7 @@ from simpeg_drivers.components.factories import SaveDataGeoh5Factory from simpeg_drivers.driver import InversionDriver -from simpeg_drivers.joint.params import BaseJointOptions +from simpeg_drivers.joint.options import BaseJointOptions from simpeg_drivers.utils.utils import simpeg_group_to_driver diff --git a/simpeg_drivers/joint/joint_cross_gradient/__init__.py b/simpeg_drivers/joint/joint_cross_gradient/__init__.py index 0d9bf0f2..b5379757 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/__init__.py +++ b/simpeg_drivers/joint/joint_cross_gradient/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import JointCrossGradientOptions +from .options import JointCrossGradientOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/joint/joint_cross_gradient/driver.py b/simpeg_drivers/joint/joint_cross_gradient/driver.py index 9eb7bcfe..c49a1da0 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/driver.py +++ b/simpeg_drivers/joint/joint_cross_gradient/driver.py @@ -27,11 +27,11 @@ ) from simpeg_drivers.joint.driver import BaseJointDriver -from .params import JointCrossGradientOptions +from .options import JointCrossGradientOptions class JointCrossGradientDriver(BaseJointDriver): - _params_class = JointCrossGradientOptions + _options_class = JointCrossGradientOptions _validations = None def __init__(self, params: JointCrossGradientOptions): diff --git a/simpeg_drivers/joint/joint_cross_gradient/params.py b/simpeg_drivers/joint/joint_cross_gradient/options.py similarity index 96% rename from simpeg_drivers/joint/joint_cross_gradient/params.py rename to simpeg_drivers/joint/joint_cross_gradient/options.py index 4b5f2477..923429ed 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/params.py +++ b/simpeg_drivers/joint/joint_cross_gradient/options.py @@ -17,7 +17,7 @@ from geoh5py.objects import Octree from simpeg_drivers import assets_path -from simpeg_drivers.joint.params import BaseJointOptions +from simpeg_drivers.joint.options import BaseJointOptions class JointCrossGradientOptions(BaseJointOptions): diff --git a/simpeg_drivers/joint/joint_surveys/__init__.py b/simpeg_drivers/joint/joint_surveys/__init__.py index 08da2366..135890c7 100644 --- a/simpeg_drivers/joint/joint_surveys/__init__.py +++ b/simpeg_drivers/joint/joint_surveys/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import JointSurveysOptions +from .options import JointSurveysOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/joint/joint_surveys/driver.py b/simpeg_drivers/joint/joint_surveys/driver.py index 288c0ca4..3f3122e7 100644 --- a/simpeg_drivers/joint/joint_surveys/driver.py +++ b/simpeg_drivers/joint/joint_surveys/driver.py @@ -20,7 +20,7 @@ from simpeg_drivers.components.factories import DirectivesFactory, SaveModelGeoh5Factory from simpeg_drivers.joint.driver import BaseJointDriver -from .params import JointSurveysOptions +from .options import JointSurveysOptions logger = getLogger(__name__) @@ -29,7 +29,7 @@ class JointSurveyDriver(BaseJointDriver): """Joint surveys inversion driver""" - _params_class = JointSurveysOptions + _options_class = JointSurveysOptions _validations = None def __init__(self, params: JointSurveysOptions): diff --git a/simpeg_drivers/joint/joint_surveys/params.py b/simpeg_drivers/joint/joint_surveys/options.py similarity index 97% rename from simpeg_drivers/joint/joint_surveys/params.py rename to simpeg_drivers/joint/joint_surveys/options.py index ec7d6d57..79c46069 100644 --- a/simpeg_drivers/joint/joint_surveys/params.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -18,7 +18,7 @@ from pydantic import model_validator from simpeg_drivers import assets_path -from simpeg_drivers.joint.params import BaseJointOptions +from simpeg_drivers.joint.options import BaseJointOptions class JointSurveysOptions(BaseJointOptions): diff --git a/simpeg_drivers/joint/params.py b/simpeg_drivers/joint/options.py similarity index 98% rename from simpeg_drivers/joint/params.py rename to simpeg_drivers/joint/options.py index 139e304f..abf871c3 100644 --- a/simpeg_drivers/joint/params.py +++ b/simpeg_drivers/joint/options.py @@ -21,7 +21,7 @@ from pydantic import ConfigDict, field_validator, model_validator import simpeg_drivers -from simpeg_drivers.params import ActiveCellsOptions, SolverType +from simpeg_drivers.options import ActiveCellsOptions, SolverType class BaseJointOptions(BaseData): diff --git a/simpeg_drivers/natural_sources/magnetotellurics/__init__.py b/simpeg_drivers/natural_sources/magnetotellurics/__init__.py index 9197c4b9..05b199d1 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/__init__.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import MTForwardOptions, MTInversionOptions +from .options import MTForwardOptions, MTInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/natural_sources/magnetotellurics/driver.py b/simpeg_drivers/natural_sources/magnetotellurics/driver.py index 609c3b56..da6aa6ca 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/driver.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/driver.py @@ -13,18 +13,18 @@ from simpeg_drivers.driver import InversionDriver -from .params import MTForwardOptions, MTInversionOptions +from .options import MTForwardOptions, MTInversionOptions class MTForwardDriver(InversionDriver): """Magnetotellurics forward driver.""" - _params_class = MTForwardOptions + _options_class = MTForwardOptions _validations = None class MTInversionDriver(InversionDriver): """Magnetotellurics inversion driver.""" - _params_class = MTInversionOptions + _options_class = MTInversionOptions _validations = None diff --git a/simpeg_drivers/natural_sources/magnetotellurics/params.py b/simpeg_drivers/natural_sources/magnetotellurics/options.py similarity index 98% rename from simpeg_drivers/natural_sources/magnetotellurics/params.py rename to simpeg_drivers/natural_sources/magnetotellurics/options.py index 3d8de712..ff78a043 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/params.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/options.py @@ -19,7 +19,7 @@ from geoh5py.objects import MTReceivers from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions, EMDataMixin +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions, EMDataMixin class MTForwardOptions(EMDataMixin, BaseForwardOptions): diff --git a/simpeg_drivers/natural_sources/tipper/__init__.py b/simpeg_drivers/natural_sources/tipper/__init__.py index f9e29ee4..5f3d15ca 100644 --- a/simpeg_drivers/natural_sources/tipper/__init__.py +++ b/simpeg_drivers/natural_sources/tipper/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import TipperForwardOptions, TipperInversionOptions +from .options import TipperForwardOptions, TipperInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/natural_sources/tipper/driver.py b/simpeg_drivers/natural_sources/tipper/driver.py index a79774fd..41acbda8 100644 --- a/simpeg_drivers/natural_sources/tipper/driver.py +++ b/simpeg_drivers/natural_sources/tipper/driver.py @@ -13,18 +13,18 @@ from simpeg_drivers.driver import InversionDriver -from .params import TipperForwardOptions, TipperInversionOptions +from .options import TipperForwardOptions, TipperInversionOptions class TipperForwardDriver(InversionDriver): """Tipper forward driver.""" - _params_class = TipperForwardOptions + _options_class = TipperForwardOptions _validations = None class TipperInversionDriver(InversionDriver): """Tipper inversion driver.""" - _params_class = TipperInversionOptions + _options_class = TipperInversionOptions _validations = None diff --git a/simpeg_drivers/natural_sources/tipper/params.py b/simpeg_drivers/natural_sources/tipper/options.py similarity index 97% rename from simpeg_drivers/natural_sources/tipper/params.py rename to simpeg_drivers/natural_sources/tipper/options.py index 40723196..b657a0dd 100644 --- a/simpeg_drivers/natural_sources/tipper/params.py +++ b/simpeg_drivers/natural_sources/tipper/options.py @@ -19,7 +19,7 @@ from geoh5py.objects import TipperReceivers from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions, EMDataMixin +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions, EMDataMixin class TipperForwardOptions(EMDataMixin, BaseForwardOptions): diff --git a/simpeg_drivers/params.py b/simpeg_drivers/options.py similarity index 100% rename from simpeg_drivers/params.py rename to simpeg_drivers/options.py diff --git a/simpeg_drivers/potential_fields/__init__.py b/simpeg_drivers/potential_fields/__init__.py index 5719cb6f..659f8ed6 100644 --- a/simpeg_drivers/potential_fields/__init__.py +++ b/simpeg_drivers/potential_fields/__init__.py @@ -9,12 +9,12 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .gravity.params import GravityForwardOptions, GravityInversionOptions -from .magnetic_scalar.params import ( +from .gravity.options import GravityForwardOptions, GravityInversionOptions +from .magnetic_scalar.options import ( MagneticForwardOptions, MagneticInversionOptions, ) -from .magnetic_vector.params import ( +from .magnetic_vector.options import ( MVIForwardOptions, MVIInversionOptions, ) diff --git a/simpeg_drivers/potential_fields/gravity/__init__.py b/simpeg_drivers/potential_fields/gravity/__init__.py index b144f1ec..c1440636 100644 --- a/simpeg_drivers/potential_fields/gravity/__init__.py +++ b/simpeg_drivers/potential_fields/gravity/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import GravityForwardOptions, GravityInversionOptions +from .options import GravityForwardOptions, GravityInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/potential_fields/gravity/driver.py b/simpeg_drivers/potential_fields/gravity/driver.py index 805a77f3..cc5727f7 100644 --- a/simpeg_drivers/potential_fields/gravity/driver.py +++ b/simpeg_drivers/potential_fields/gravity/driver.py @@ -12,7 +12,7 @@ from __future__ import annotations from simpeg_drivers.driver import InversionDriver -from simpeg_drivers.potential_fields.gravity.params import ( +from simpeg_drivers.potential_fields.gravity.options import ( GravityForwardOptions, GravityInversionOptions, ) @@ -21,12 +21,12 @@ class GravityForwardDriver(InversionDriver): """Gravity forward driver.""" - _params_class = GravityForwardOptions + _options_class = GravityForwardOptions _validations = None class GravityInversionDriver(InversionDriver): """Gravity inversion driver.""" - _params_class = GravityInversionOptions + _options_class = GravityInversionOptions _validations = None diff --git a/simpeg_drivers/potential_fields/gravity/params.py b/simpeg_drivers/potential_fields/gravity/options.py similarity index 98% rename from simpeg_drivers/potential_fields/gravity/params.py rename to simpeg_drivers/potential_fields/gravity/options.py index 1be787df..177231bf 100644 --- a/simpeg_drivers/potential_fields/gravity/params.py +++ b/simpeg_drivers/potential_fields/gravity/options.py @@ -17,7 +17,7 @@ from geoh5py.data import FloatData from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions class GravityForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py b/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py index 95a0c2a6..010867c0 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import MagneticForwardOptions, MagneticInversionOptions +from .options import MagneticForwardOptions, MagneticInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py index c546212c..1789b959 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py @@ -12,7 +12,7 @@ from __future__ import annotations from simpeg_drivers.driver import InversionDriver -from simpeg_drivers.potential_fields.magnetic_scalar.params import ( +from simpeg_drivers.potential_fields.magnetic_scalar.options import ( MagneticForwardOptions, MagneticInversionOptions, ) @@ -21,12 +21,12 @@ class MagneticForwardDriver(InversionDriver): """Magnetic forward driver.""" - _params_class = MagneticForwardOptions + _options_class = MagneticForwardOptions _validations = None class MagneticInversionDriver(InversionDriver): """Magnetic inversion driver.""" - _params_class = MagneticInversionOptions + _options_class = MagneticInversionOptions _validations = None diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/params.py b/simpeg_drivers/potential_fields/magnetic_scalar/options.py similarity index 98% rename from simpeg_drivers/potential_fields/magnetic_scalar/params.py rename to simpeg_drivers/potential_fields/magnetic_scalar/options.py index d032e15a..7e202416 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/params.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/options.py @@ -17,7 +17,7 @@ from geoh5py.data import FloatData from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions class MagneticForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/potential_fields/magnetic_vector/__init__.py b/simpeg_drivers/potential_fields/magnetic_vector/__init__.py index 2f630c96..dedf2f28 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/__init__.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/__init__.py @@ -9,7 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -from .params import MVIForwardOptions, MVIInversionOptions +from .options import MVIForwardOptions, MVIInversionOptions # pylint: disable=unused-import # flake8: noqa diff --git a/simpeg_drivers/potential_fields/magnetic_vector/driver.py b/simpeg_drivers/potential_fields/magnetic_vector/driver.py index 2db7ba5c..6adb1a8b 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/driver.py @@ -15,20 +15,20 @@ from simpeg_drivers.driver import InversionDriver -from .params import MVIForwardOptions, MVIInversionOptions +from .options import MVIForwardOptions, MVIInversionOptions class MVIForwardDriver(InversionDriver): """Magnetic Vector forward driver.""" - _params_class = MVIForwardOptions + _options_class = MVIForwardOptions _validations = None class MVIInversionDriver(InversionDriver): """Magnetic Vector inversion driver.""" - _params_class = MVIInversionOptions + _options_class = MVIInversionOptions _validations = None @property diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/options.py similarity index 98% rename from simpeg_drivers/potential_fields/magnetic_vector/params.py rename to simpeg_drivers/potential_fields/magnetic_vector/options.py index ef0b9973..fa5bf436 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/options.py @@ -19,7 +19,7 @@ from pydantic import model_validator from simpeg_drivers import assets_path -from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions +from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions class MVIForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/utils/tile_estimate.py b/simpeg_drivers/utils/tile_estimate.py index 11b9e1a0..5b7564bd 100644 --- a/simpeg_drivers/utils/tile_estimate.py +++ b/simpeg_drivers/utils/tile_estimate.py @@ -71,7 +71,7 @@ class TileEstimator(BaseDriver): creating more tiles. """ - _params_class = TileParameters + _options_class = TileParameters def __init__(self, params: TileParameters): self._driver: InversionDriver | None = None diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index 3075b4e4..da296bd8 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -882,6 +882,6 @@ def simpeg_group_to_driver(group: SimPEGGroup, workspace: Workspace) -> Inversio inversion_driver = getattr(module, class_name) ifile.set_data_value("out_group", group) - params = inversion_driver._params_class.build(ifile) # pylint: disable=protected-access + params = inversion_driver._options_class.build(ifile) # pylint: disable=protected-access return inversion_driver(params) diff --git a/tests/data_test.py b/tests/data_test.py index 11ed82a9..82288b5d 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -22,11 +22,11 @@ from octree_creation_app.utils import treemesh_2_octree from simpeg_drivers.components import InversionData -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields.magnetic_vector.driver import ( MVIInversionDriver, ) -from simpeg_drivers.potential_fields.magnetic_vector.params import ( +from simpeg_drivers.potential_fields.magnetic_vector.options import ( MVIInversionOptions, ) from simpeg_drivers.utils.testing import Geoh5Tester, setup_inversion_workspace diff --git a/tests/driver_test.py b/tests/driver_test.py index a0c44fd9..aa99564e 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -12,7 +12,7 @@ import numpy as np -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import GravityInversionOptions from simpeg_drivers.potential_fields.gravity.driver import GravityInversionDriver from simpeg_drivers.utils.testing import setup_inversion_workspace diff --git a/tests/locations_test.py b/tests/locations_test.py index 1a8f6cf1..997e07a2 100644 --- a/tests/locations_test.py +++ b/tests/locations_test.py @@ -17,7 +17,7 @@ from geoh5py.objects import Grid2D, Points from simpeg_drivers.components.locations import InversionLocations -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MVIInversionOptions from simpeg_drivers.utils.testing import Geoh5Tester, setup_inversion_workspace diff --git a/tests/meshes_test.py b/tests/meshes_test.py index 686c03d8..5ed2ba25 100644 --- a/tests/meshes_test.py +++ b/tests/meshes_test.py @@ -20,7 +20,7 @@ from octree_creation_app.utils import treemesh_2_octree from simpeg_drivers.components import InversionMesh -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MVIInversionOptions from simpeg_drivers.utils.testing import Geoh5Tester, setup_inversion_workspace diff --git a/tests/models_test.py b/tests/models_test.py index b7855427..3e5f741e 100644 --- a/tests/models_test.py +++ b/tests/models_test.py @@ -20,7 +20,7 @@ InversionModel, InversionModelCollection, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MVIInversionOptions from simpeg_drivers.potential_fields.magnetic_vector.driver import ( MVIInversionDriver, diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py index 12e090be..87528e29 100644 --- a/tests/run_tests/driver_airborne_fem_1d_test.py +++ b/tests/run_tests/driver_airborne_fem_1d_test.py @@ -22,11 +22,11 @@ FDEM1DForwardDriver, FDEM1DInversionDriver, ) -from simpeg_drivers.electromagnetics.frequency_domain_1d.params import ( +from simpeg_drivers.electromagnetics.frequency_domain_1d.options import ( FDEM1DForwardOptions, FDEM1DInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_airborne_tem_1d_test.py b/tests/run_tests/driver_airborne_tem_1d_test.py index 452f9044..e0b55afa 100644 --- a/tests/run_tests/driver_airborne_tem_1d_test.py +++ b/tests/run_tests/driver_airborne_tem_1d_test.py @@ -21,11 +21,11 @@ TDEM1DForwardDriver, TDEM1DInversionDriver, ) -from simpeg_drivers.electromagnetics.time_domain_1d.params import ( +from simpeg_drivers.electromagnetics.time_domain_1d.options import ( TDEM1DForwardOptions, TDEM1DInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index b90de30f..a8df18a5 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -21,11 +21,11 @@ TDEMForwardDriver, TDEMInversionDriver, ) -from simpeg_drivers.electromagnetics.time_domain.params import ( +from simpeg_drivers.electromagnetics.time_domain.options import ( TDEMForwardOptions, TDEMInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 69a789a9..706cb51e 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -21,11 +21,11 @@ DC2DForwardDriver, DC2DInversionDriver, ) -from simpeg_drivers.electricals.direct_current.two_dimensions.params import ( +from simpeg_drivers.electricals.direct_current.two_dimensions.options import ( DC2DForwardOptions, DC2DInversionOptions, ) -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( ActiveCellsOptions, DrapeModelOptions, LineSelectionOptions, diff --git a/tests/run_tests/driver_dc_b2d_test.py b/tests/run_tests/driver_dc_b2d_test.py index 160dc80b..6c8f9540 100644 --- a/tests/run_tests/driver_dc_b2d_test.py +++ b/tests/run_tests/driver_dc_b2d_test.py @@ -21,14 +21,14 @@ DCBatch2DForwardDriver, DCBatch2DInversionDriver, ) -from simpeg_drivers.electricals.direct_current.pseudo_three_dimensions.params import ( +from simpeg_drivers.electricals.direct_current.pseudo_three_dimensions.options import ( DCBatch2DForwardOptions, DCBatch2DInversionOptions, ) -from simpeg_drivers.electricals.params import ( +from simpeg_drivers.electricals.options import ( FileControlOptions, ) -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( ActiveCellsOptions, DrapeModelOptions, LineSelectionOptions, diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index 44cfe52c..2431af89 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -19,11 +19,11 @@ DC3DForwardDriver, DC3DInversionDriver, ) -from simpeg_drivers.electricals.direct_current.three_dimensions.params import ( +from simpeg_drivers.electricals.direct_current.three_dimensions.options import ( DC3DForwardOptions, DC3DInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index b5d95e3c..624c1719 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -22,11 +22,11 @@ FDEMForwardDriver, FDEMInversionDriver, ) -from simpeg_drivers.electromagnetics.frequency_domain.params import ( +from simpeg_drivers.electromagnetics.frequency_domain.options import ( FDEMForwardOptions, FDEMInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index 38d1980d..b30cdc32 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -18,7 +18,7 @@ from geoh5py.workspace import Workspace from pytest import raises -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( GravityForwardOptions, GravityInversionOptions, diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index 46a257d4..a0677fb3 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -21,11 +21,11 @@ TDEMForwardDriver, TDEMInversionDriver, ) -from simpeg_drivers.electromagnetics.time_domain.params import ( +from simpeg_drivers.electromagnetics.time_domain.options import ( TDEMForwardOptions, TDEMInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index c7ccb03c..0190bed6 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -23,7 +23,7 @@ IP2DForwardDriver, IP2DInversionDriver, ) -from simpeg_drivers.params import ActiveCellsOptions, LineSelectionOptions +from simpeg_drivers.options import ActiveCellsOptions, LineSelectionOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py index ee80b1ea..24959d41 100644 --- a/tests/run_tests/driver_ip_b2d_test.py +++ b/tests/run_tests/driver_ip_b2d_test.py @@ -20,14 +20,14 @@ IPBatch2DForwardDriver, IPBatch2DInversionDriver, ) -from simpeg_drivers.electricals.induced_polarization.pseudo_three_dimensions.params import ( +from simpeg_drivers.electricals.induced_polarization.pseudo_three_dimensions.options import ( IPBatch2DForwardOptions, IPBatch2DInversionOptions, ) -from simpeg_drivers.electricals.params import ( +from simpeg_drivers.electricals.options import ( FileControlOptions, ) -from simpeg_drivers.params import ( +from simpeg_drivers.options import ( ActiveCellsOptions, DrapeModelOptions, LineSelectionOptions, diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index d8989fe0..a768c53c 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -22,7 +22,7 @@ IP3DForwardDriver, IP3DInversionDriver, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 4e36ec7b..1348cedc 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -25,7 +25,7 @@ ) from simpeg_drivers.joint.joint_cross_gradient import JointCrossGradientOptions from simpeg_drivers.joint.joint_cross_gradient.driver import JointCrossGradientDriver -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( GravityForwardOptions, GravityInversionOptions, diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 38228676..dce8f18c 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -16,7 +16,7 @@ from simpeg_drivers.joint.joint_surveys import JointSurveysOptions from simpeg_drivers.joint.joint_surveys.driver import JointSurveyDriver -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( GravityForwardOptions, GravityInversionOptions, diff --git a/tests/run_tests/driver_mag_automesh_test.py b/tests/run_tests/driver_mag_automesh_test.py index 355b3ded..28ca4cbd 100644 --- a/tests/run_tests/driver_mag_automesh_test.py +++ b/tests/run_tests/driver_mag_automesh_test.py @@ -16,7 +16,7 @@ from dask.distributed import LocalCluster, performance_report from geoh5py.workspace import Workspace -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( MagneticForwardOptions, MagneticInversionOptions, diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py index 3d79c44e..baeffa15 100644 --- a/tests/run_tests/driver_mag_test.py +++ b/tests/run_tests/driver_mag_test.py @@ -16,7 +16,7 @@ from dask.distributed import LocalCluster, performance_report from geoh5py.workspace import Workspace -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( MagneticForwardOptions, MagneticInversionOptions, diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 964ff67a..e95093b7 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -22,11 +22,11 @@ MTForwardDriver, MTInversionDriver, ) -from simpeg_drivers.natural_sources.magnetotellurics.params import ( +from simpeg_drivers.natural_sources.magnetotellurics.options import ( MTForwardOptions, MTInversionOptions, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index 458afac4..3a1f4cb9 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -19,7 +19,7 @@ from geoh5py.workspace import Workspace from pytest import warns -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( MVIForwardOptions, MVIInversionOptions, diff --git a/tests/run_tests/driver_rotated_gradients_test.py b/tests/run_tests/driver_rotated_gradients_test.py index 1858258a..63234d53 100644 --- a/tests/run_tests/driver_rotated_gradients_test.py +++ b/tests/run_tests/driver_rotated_gradients_test.py @@ -19,7 +19,7 @@ from geoh5py.workspace import Workspace from pytest import raises -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import ( GravityForwardOptions, GravityInversionOptions, diff --git a/tests/run_tests/driver_tile_estimator_test.py b/tests/run_tests/driver_tile_estimator_test.py index f124b026..8f7737ec 100644 --- a/tests/run_tests/driver_tile_estimator_test.py +++ b/tests/run_tests/driver_tile_estimator_test.py @@ -14,7 +14,7 @@ import numpy as np -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MagneticInversionOptions from simpeg_drivers.potential_fields.magnetic_scalar.driver import ( MagneticInversionDriver, diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index 3ce97738..7165e7dc 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -24,7 +24,7 @@ TipperForwardDriver, TipperInversionDriver, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace from simpeg_drivers.utils.utils import get_inversion_output diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py index afd05b67..6f522260 100644 --- a/tests/run_tests/sensitivity_cutoff_test.py +++ b/tests/run_tests/sensitivity_cutoff_test.py @@ -18,10 +18,10 @@ from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.driver import ( SensitivityCutoffDriver, ) -from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.params import ( +from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.options import ( SensitivityCutoffParams, ) -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import GravityInversionOptions from simpeg_drivers.potential_fields.gravity.driver import GravityInversionDriver from simpeg_drivers.utils.testing import setup_inversion_workspace diff --git a/tests/topography_test.py b/tests/topography_test.py index 02ddda02..dfb96024 100644 --- a/tests/topography_test.py +++ b/tests/topography_test.py @@ -15,7 +15,7 @@ import numpy as np from simpeg_drivers.components import InversionTopography -from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MVIInversionOptions from simpeg_drivers.utils.testing import Geoh5Tester, setup_inversion_workspace diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 8dce6281..97c3a079 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -19,8 +19,8 @@ from pydantic import AliasChoices, Field import simpeg_drivers -from simpeg_drivers.params import ActiveCellsOptions -from simpeg_drivers.potential_fields.gravity.params import GravityInversionOptions +from simpeg_drivers.options import ActiveCellsOptions +from simpeg_drivers.potential_fields.gravity.options import GravityInversionOptions from simpeg_drivers.potential_fields.gravity.uijson import GravityInversionUIJson from simpeg_drivers.uijson import SimPEGDriversUIJson from simpeg_drivers.utils.testing import setup_inversion_workspace From fc44150b7dea474425b903ed6ba33aa166bb8f30 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 15 Apr 2025 14:40:52 -0700 Subject: [PATCH 2/3] Fix for sens_cutoff and tile estimator --- .../depth_of_investigation/sensitivity_cutoff/driver.py | 6 +++--- .../depth_of_investigation/sensitivity_cutoff/options.py | 2 +- simpeg_drivers/utils/tile_estimate.py | 2 +- tests/run_tests/sensitivity_cutoff_test.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py index ec2d3cba..c2651666 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py @@ -29,7 +29,7 @@ from geoh5py.data import FloatData from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.options import ( - SensitivityCutoffParams, + SensitivityCutoffOptions, ) @@ -107,9 +107,9 @@ class SensitivityCutoffDriver(BaseDriver): below the provided cutoff percentage. """ - _options_class = SensitivityCutoffParams + _params_class = SensitivityCutoffOptions - def __init__(self, params: SensitivityCutoffParams): + def __init__(self, params: SensitivityCutoffOptions): super().__init__(params) def run(self): diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py index ab9f2117..07790e9e 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py @@ -32,7 +32,7 @@ from simpeg_drivers import assets_path -class SensitivityCutoffParams(BaseData): +class SensitivityCutoffOptions(BaseData): """ Sensitivity cutoff parameters for depth of investigation studies. diff --git a/simpeg_drivers/utils/tile_estimate.py b/simpeg_drivers/utils/tile_estimate.py index 5b7564bd..11b9e1a0 100644 --- a/simpeg_drivers/utils/tile_estimate.py +++ b/simpeg_drivers/utils/tile_estimate.py @@ -71,7 +71,7 @@ class TileEstimator(BaseDriver): creating more tiles. """ - _options_class = TileParameters + _params_class = TileParameters def __init__(self, params: TileParameters): self._driver: InversionDriver | None = None diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py index 6f522260..f4388810 100644 --- a/tests/run_tests/sensitivity_cutoff_test.py +++ b/tests/run_tests/sensitivity_cutoff_test.py @@ -19,7 +19,7 @@ SensitivityCutoffDriver, ) from simpeg_drivers.depth_of_investigation.sensitivity_cutoff.options import ( - SensitivityCutoffParams, + SensitivityCutoffOptions, ) from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import GravityInversionOptions @@ -79,7 +79,7 @@ def test_sensitivity_percent_cutoff_run(tmp_path): with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5: sensitivity = geoh5.get_entity("Iteration_1_sensitivities")[0] mesh = sensitivity.parent - params = SensitivityCutoffParams( + params = SensitivityCutoffOptions( geoh5=geoh5, mesh=mesh, sensitivity_model=sensitivity, @@ -105,7 +105,7 @@ def test_sensitivity_cutoff_percentile_run(tmp_path): with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5: sensitivity = geoh5.get_entity("Iteration_1_sensitivities")[0] mesh = sensitivity.parent - params = SensitivityCutoffParams( + params = SensitivityCutoffOptions( geoh5=geoh5, mesh=mesh, sensitivity_model=sensitivity, @@ -133,7 +133,7 @@ def test_sensitivity_cutoff_log_percent_run(tmp_path): with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5: sensitivity = geoh5.get_entity("Iteration_1_sensitivities")[0] mesh = sensitivity.parent - params = SensitivityCutoffParams( + params = SensitivityCutoffOptions( geoh5=geoh5, mesh=mesh, sensitivity_model=sensitivity, From 73498164a34edbf7f7382c31263742c4170ac384 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 16 Apr 2025 10:21:55 -0700 Subject: [PATCH 3/3] Change back __main__ of driver --- simpeg_drivers/driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 68dec72a..55032d9e 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -654,7 +654,6 @@ def get_path(self, filepath: str | Path) -> str: if __name__ == "__main__": - # file = Path(sys.argv[1]).resolve() - file = r"C:\Users\dominiquef\Desktop\Tests\late_em_1em3_WS.ui.json" + file = Path(sys.argv[1]).resolve() InversionDriver.start(file) sys.stdout.close()