Skip to content

Commit 6690fb5

Browse files
committed
Merge branch 'release/0.3.0' into GEOPY-2152
2 parents 62e86be + 1832850 commit 6690fb5

34 files changed

Lines changed: 653 additions & 657 deletions

simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": "0.3.0-alpha.1",
2+
"version": "0.3.0-alpha.4",
33
"title": "Direct Current (DC) 2D Forward",
44
"icon": "PotentialElectrode",
5-
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/stable/intro.html",
5+
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/",
66
"conda_environment": "simpeg_drivers",
77
"run_command": "simpeg_drivers.driver",
88
"geoh5": "",
@@ -184,7 +184,7 @@
184184
"enabled": false,
185185
"label": "Number of CPUs",
186186
"value": 1,
187-
"visible": true
187+
"visible": false
188188
},
189189
"solver_type": {
190190
"choiceList": [
@@ -225,9 +225,9 @@
225225
"value": false,
226226
"tooltip": "Generates a file for sweeping parameters instead of running the application."
227227
},
228-
"distributed_workers": "",
229228
"n_workers": "",
230229
"n_threads": "",
231230
"max_ram": "",
232-
"performance_report": false
231+
"performance_report": false,
232+
"distributed_workers": ""
233233
}

simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": "0.3.0-alpha.1",
2+
"version": "0.3.0-alpha.4",
33
"title": "Direct Current (DC) 2D Inversion",
44
"icon": "PotentialElectrode",
5-
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/stable/intro.html",
5+
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/",
66
"conda_environment": "simpeg_drivers",
77
"run_command": "simpeg_drivers.driver",
88
"geoh5": "",
@@ -392,7 +392,7 @@
392392
"auto_scale_misfits": {
393393
"group": "Cooling schedule/target",
394394
"label": "Auto-scale misfits",
395-
"value": true,
395+
"value": false,
396396
"verbose": 3,
397397
"visible": true,
398398
"tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor."
@@ -519,7 +519,7 @@
519519
"enabled": false,
520520
"label": "Number of CPUs",
521521
"value": 1,
522-
"visible": true
522+
"visible": false
523523
},
524524
"solver_type": {
525525
"choiceList": [
@@ -570,9 +570,9 @@
570570
"value": false,
571571
"tooltip": "Generates a file for sweeping parameters instead of running the application."
572572
},
573-
"distributed_workers": "",
574573
"n_workers": "",
575574
"n_threads": "",
576575
"max_ram": "",
577-
"performance_report": false
576+
"performance_report": false,
577+
"distributed_workers": ""
578578
}

simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": "0.3.0-alpha.1",
2+
"version": "0.3.0-alpha.4",
33
"title": "Direct Current (DC) 3D Forward",
44
"icon": "PotentialElectrode",
5-
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/stable/intro.html",
5+
"documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/",
66
"conda_environment": "simpeg_drivers",
77
"run_command": "simpeg_drivers.driver",
88
"geoh5": "",
@@ -27,7 +27,7 @@
2727
"value": "",
2828
"optional": true,
2929
"enabled": false,
30-
"tooltip": "Select a mesh for the inversion."
30+
"tooltip": "Select a mesh for the inversion"
3131
},
3232
"model_type": {
3333
"choiceList": [
@@ -37,7 +37,7 @@
3737
"main": true,
3838
"group": "Mesh and models",
3939
"label": "Model units",
40-
"tooltip": "Select the units of the model.",
40+
"tooltip": "Select the units of the model",
4141
"value": "Conductivity (S/m)"
4242
},
4343
"starting_model": {
@@ -68,7 +68,7 @@
6868
"value": "",
6969
"optional": true,
7070
"enabled": true,
71-
"tooltip": "Select a topography object to define the active cells for inversion."
71+
"tooltip": "Select a topography object to define the active cells for inversion"
7272
},
7373
"topography": {
7474
"association": [
@@ -81,7 +81,7 @@
8181
"optional": true,
8282
"enabled": false,
8383
"label": "Elevation channel",
84-
"tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object.",
84+
"tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object",
8585
"parent": "topography_object",
8686
"dependency": "topography_object",
8787
"dependencyType": "enabled",
@@ -101,7 +101,7 @@
101101
"dependency": "topography_object",
102102
"dependencyType": "disabled",
103103
"label": "Active model",
104-
"tooltip": "Provide the active cell boolean model directly if topography not set.",
104+
"tooltip": "Provide the active cell boolean model directly if topography not set",
105105
"parent": "mesh",
106106
"value": ""
107107
},
@@ -113,7 +113,7 @@
113113
"enabled": false,
114114
"label": "Number of CPUs",
115115
"value": 1,
116-
"visible": true
116+
"visible": false
117117
},
118118
"solver_type": {
119119
"choiceList": [
@@ -135,7 +135,7 @@
135135
"min": 1,
136136
"max": 1000,
137137
"verbose": 2,
138-
"tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library."
138+
"tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library"
139139
},
140140
"max_chunk_size": {
141141
"min": 0,
@@ -146,7 +146,7 @@
146146
"value": 128,
147147
"verbose": 3,
148148
"visible": false,
149-
"tooltip": "Limit the chunk size used by Dask for distributed computation."
149+
"tooltip": "Limit the chunk size used by Dask for distributed computation"
150150
},
151151
"out_group": {
152152
"label": "SimPEG group",
@@ -156,18 +156,18 @@
156156
"visible": true,
157157
"optional": true,
158158
"enabled": false,
159-
"tooltip": "Optionally set the SimPEG group to which results will be saved."
159+
"tooltip": "Optionally set the SimPEG group to which results will be saved"
160160
},
161161
"generate_sweep": {
162162
"label": "Generate sweep file",
163163
"group": "Python run preferences",
164164
"main": true,
165165
"value": false,
166-
"tooltip": "Generates a file for sweeping parameters instead of running the application."
166+
"tooltip": "Generates a file for sweeping parameters instead of running the application"
167167
},
168-
"distributed_workers": "",
169168
"n_workers": "",
170169
"n_threads": "",
171170
"max_ram": "",
172-
"performance_report": false
171+
"performance_report": false,
172+
"distributed_workers": ""
173173
}

0 commit comments

Comments
 (0)