Skip to content

Commit bca4d6c

Browse files
authored
Merge pull request #376 from MiraGeoscience/GEOPY-2795
GEOPY-2795: Update dictionary to choose driver from run_command
2 parents 155e6f0 + a19d09a commit bca4d6c

5 files changed

Lines changed: 19 additions & 1 deletion

File tree

simpeg_drivers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def assets_path() -> Path:
131131
),
132132
"joint surveys": (
133133
"simpeg_drivers.joint.joint_surveys",
134-
{"inversion": "JointSurveyDriver"},
134+
{"inversion": "JointSurveysDriver"},
135135
),
136136
"magnetic scalar": (
137137
"simpeg_drivers.potential_fields.magnetic_scalar",

simpeg_drivers/joint/joint_cross_gradient/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
# (see LICENSE file at the root of this source code package). '
88
# '
99
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
10+
11+
from .driver import JointCrossGradientDriver
12+
from .options import JointCrossGradientOptions

simpeg_drivers/joint/joint_petrophysics/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
# (see LICENSE file at the root of this source code package). '
88
# '
99
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
10+
11+
from .driver import JointPetrophysicsDriver
12+
from .options import JointPetrophysicsOptions

simpeg_drivers/joint/joint_surveys/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
# (see LICENSE file at the root of this source code package). '
88
# '
99
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
10+
11+
from .driver import JointSurveysDriver
12+
from .options import JointSurveysOptions

tests/uijson_test.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import numpy as np
1717
import pytest
1818
from geoapps_utils.driver.data import BaseData
19+
from geoapps_utils.run import load_ui_json_as_dict
1920
from geoh5py import Workspace
2021
from geoh5py.ui_json import InputFile
2122
from geoh5py.ui_json.annotations import Deprecated
@@ -357,3 +358,11 @@ def test_legacy_uijson(tmp_path: Path, caplog):
357358
assert "The Batch2D classes will be deprecated" in caplog.text
358359

359360
assert driver.models
361+
362+
363+
def test_driver_from_uijson():
364+
path = Path(__file__).resolve().parent / "legacy/v0.2.1"
365+
366+
for file in path.glob("*.ui.json"):
367+
input_file = load_ui_json_as_dict(file)
368+
assert from_input_file(input_file)

0 commit comments

Comments
 (0)