Skip to content

Commit d9e924e

Browse files
domfournierdomfournier
committed
Merge branch 'develop' into GEOPY-2467
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # environments/py-3.11-linux-64-dev.conda.lock.yml # environments/py-3.11-linux-64.conda.lock.yml # environments/py-3.11-win-64-dev.conda.lock.yml # environments/py-3.11-win-64.conda.lock.yml # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml
2 parents 88664e0 + 172e135 commit d9e924e

9 files changed

Lines changed: 723 additions & 4 deletions

File tree

‎simpeg_drivers-assets/uijson/plate_simulation.ui.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
"simulation": {
1111
"main": true,
1212
"label": "SimPEG Group",
13-
"groupType": "{55ed3daf-c192-4d4b-a439-60fa987fe2b8}",
13+
"groupType": [
14+
"{55ed3daf-c192-4d4b-a439-60fa987fe2b8}",
15+
"{BB50AC61-A657-4926-9C82-067658E246A0}"
16+
],
1417
"value": "",
1518
"enabled": true,
1619
"tooltip": "Forward modelling SimPEG Group with at least the topography and survey set"
@@ -245,7 +248,7 @@
245248
"out_group": {
246249
"label": "Simulation group",
247250
"value": "",
248-
"groupType": "{BB50AC61-A657-4926-9C82-067658E246A0}",
251+
"groupType": "{55ed3daf-c192-4d4b-a439-60fa987fe2b8}",
249252
"visible": true,
250253
"optional": true,
251254
"enabled": false

‎simpeg_drivers-assets/uijson/plate_sweep.ui.json‎

Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
1+
{
2+
"version": "0.2.0-alpha.1",
3+
"title": "Plate Sweep",
4+
"icon": "maxwellplate",
5+
"documentation": "https://mirageoscience-plate-simulation.readthedocs-hosted.com/en/latest/",
6+
"conda_environment": "simpeg_drivers",
7+
"run_command": "simpeg_drivers.plate_simulation.sweep.driver",
8+
"geoh5": "",
9+
"monitoring_directory": "",
10+
"template": {
11+
"main": true,
12+
"group": "Options",
13+
"label": "Plate simulation",
14+
"groupType": [
15+
"{55ed3daf-c192-4d4b-a439-60fa987fe2b8}",
16+
"{BB50AC61-A657-4926-9C82-067658E246A0}"
17+
],
18+
"value": "",
19+
"enabled": true,
20+
"tooltip": "Plate simulation options that will be overwritten by sweep parameters."
21+
},
22+
"workdir": {
23+
"main": true,
24+
"group": "Options",
25+
"label": "Working directory",
26+
"fileDescription": [
27+
"Directory"
28+
],
29+
"fileType": [
30+
"directory"
31+
],
32+
"directoryOnly": true,
33+
"optional": true,
34+
"enabled": false,
35+
"value": ""
36+
},
37+
"background_start": {
38+
"main": true,
39+
"group": "Background",
40+
"label": "starting",
41+
"value": 2000.0
42+
},
43+
"background_stop": {
44+
"main": true,
45+
"group": "Background",
46+
"optional": true,
47+
"enabled": false,
48+
"label": "ending",
49+
"value": 2000.0
50+
},
51+
"background_count": {
52+
"main": true,
53+
"group": "Background",
54+
"dependency": "background_stop",
55+
"dependencyType": "enabled",
56+
"enabled": false,
57+
"label": "number of samples",
58+
"value": 1
59+
},
60+
"overburden_start": {
61+
"main": true,
62+
"group": "Overburden",
63+
"label": "starting",
64+
"value": 8000.0
65+
},
66+
"overburden_stop": {
67+
"main": true,
68+
"group": "Overburden",
69+
"optional": true,
70+
"enabled": false,
71+
"label": "ending",
72+
"value": 8000.0
73+
},
74+
"overburden_count": {
75+
"main": true,
76+
"group": "Overburden",
77+
"dependency": "overburden_stop",
78+
"dependencyType": "enabled",
79+
"enabled": false,
80+
"label": "number of samples",
81+
"value": 1
82+
},
83+
"thickness_start": {
84+
"main": true,
85+
"group": "Thickness",
86+
"label": "starting",
87+
"value": 200.0
88+
},
89+
"thickness_stop": {
90+
"main": true,
91+
"group": "Thickness",
92+
"optional": true,
93+
"enabled": false,
94+
"label": "ending",
95+
"value": 200.0
96+
},
97+
"thickness_count": {
98+
"main": true,
99+
"group": "Thickness",
100+
"dependency": "thickness_stop",
101+
"dependencyType": "enabled",
102+
"enabled": false,
103+
"label": "number of samples",
104+
"value": 1
105+
},
106+
"plate_start": {
107+
"main": true,
108+
"group": "Plate",
109+
"label": "starting",
110+
"value": 20.0
111+
},
112+
"plate_stop": {
113+
"main": true,
114+
"group": "Plate",
115+
"optional": true,
116+
"enabled": false,
117+
"label": "ending",
118+
"value": 20.0
119+
},
120+
"plate_count": {
121+
"main": true,
122+
"group": "Plate",
123+
"dependency": "plate_stop",
124+
"dependencyType": "enabled",
125+
"enabled": false,
126+
"label": "number of samples",
127+
"value": 1
128+
},
129+
"width_start": {
130+
"main": true,
131+
"group": "Width",
132+
"label": "starting",
133+
"value": 90.0
134+
},
135+
"width_stop": {
136+
"main": true,
137+
"group": "Width",
138+
"optional": true,
139+
"enabled": false,
140+
"label": "ending",
141+
"value": 90.0
142+
},
143+
"width_count": {
144+
"main": true,
145+
"group": "Width",
146+
"dependency": "width_stop",
147+
"dependencyType": "enabled",
148+
"enabled": false,
149+
"label": "number of samples",
150+
"value": 1
151+
},
152+
"strike_length_start": {
153+
"main": true,
154+
"group": "Strike length",
155+
"label": "starting",
156+
"value": 800.0
157+
},
158+
"strike_length_stop": {
159+
"main": true,
160+
"group": "Strike length",
161+
"optional": true,
162+
"enabled": false,
163+
"label": "ending",
164+
"value": 800.0
165+
},
166+
"strike_length_count": {
167+
"main": true,
168+
"group": "Strike length",
169+
"dependency": "strike_length_stop",
170+
"dependencyType": "enabled",
171+
"enabled": false,
172+
"label": "number of samples",
173+
"value": 1
174+
},
175+
"dip_length_start": {
176+
"main": true,
177+
"group": "Dip length",
178+
"label": "starting",
179+
"value": 800.0
180+
},
181+
"dip_length_stop": {
182+
"main": true,
183+
"group": "Dip length",
184+
"optional": true,
185+
"enabled": false,
186+
"label": "ending",
187+
"value": 800.0
188+
},
189+
"dip_length_count": {
190+
"main": true,
191+
"group": "Dip length",
192+
"dependency": "dip_length_stop",
193+
"dependencyType": "enabled",
194+
"enabled": false,
195+
"label": "number of samples",
196+
"value": 1
197+
},
198+
"dip_start": {
199+
"main": true,
200+
"group": "Dip",
201+
"label": "starting",
202+
"value": 60.0
203+
},
204+
"dip_stop": {
205+
"main": true,
206+
"group": "Dip",
207+
"optional": true,
208+
"enabled": false,
209+
"label": "ending",
210+
"value": 60.0
211+
},
212+
"dip_count": {
213+
"main": true,
214+
"group": "Dip",
215+
"dependency": "dip_stop",
216+
"dependencyType": "enabled",
217+
"enabled": false,
218+
"label": "number of samples",
219+
"value": 1
220+
},
221+
"out_group": {
222+
"label": "SimPEGGroup",
223+
"value": "",
224+
"groupType": "{55ed3daf-c192-4d4b-a439-60fa987fe2b8}",
225+
"visible": true,
226+
"optional": true,
227+
"enabled": false
228+
}
229+
}

‎simpeg_drivers/plate_simulation/options.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ class PlateSimulationOptions(BaseData):
127127
default_ui_json: ClassVar[Path] = assets_path() / "uijson/plate_simulation.ui.json"
128128
title: ClassVar[str] = "Plate Simulation"
129129
run_command: ClassVar[str] = "simpeg_drivers.plate_simulation.driver"
130-
out_group: UIJsonGroup | None = None
130+
out_group: SimPEGGroup | UIJsonGroup | None = None
131131

132132
mesh: MeshOptions
133133
model: ModelOptions
134-
simulation: SimPEGGroup
134+
simulation: SimPEGGroup | UIJsonGroup
135135

136136
def simulation_parameters(self) -> BaseForwardOptions:
137137
"""

‎simpeg_drivers/plate_simulation/sweep/__init__.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
2+
# Copyright (c) 2025 Mira Geoscience Ltd. '
3+
# '
4+
# This file is part of simpeg-drivers package. '
5+
# '
6+
# simpeg-drivers is distributed under the terms and conditions of the MIT License '
7+
# (see LICENSE file at the root of this source code package). '
8+
# '
9+
# '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

0 commit comments

Comments
 (0)