Skip to content

Commit be85fbb

Browse files
committed
Merge remote-tracking branch 'upstream/release/0.3.0' into develop
# 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 # py-3.10.conda-lock.yml # py-3.11.conda-lock.yml # py-3.12.conda-lock.yml # pyproject.toml # recipe.yaml # simpeg_drivers/__init__.py
2 parents 748e289 + c1d75e1 commit be85fbb

50 files changed

Lines changed: 1054 additions & 790 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/python_deploy_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
3030
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
3131
with:
32-
virtual-repo-names: '["public-conda-prod"]'
32+
virtual-repo-names: '["public-noremote-conda-prod"]'
3333
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
3434
secrets:
3535
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

pyproject.toml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,32 @@ documentation = "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/"
1313
homepage = "https://www.mirageoscience.com/mining-industry-software/python-integration/"
1414
readme = "package.rst"
1515

16+
keywords = [
17+
"direct current resistivity",
18+
"earth science",
19+
"electromagnetics",
20+
"geoh5",
21+
"geophysics",
22+
"geoscience",
23+
"inverse problems",
24+
"inversion",
25+
"modeling",
26+
"modelling",
27+
"open science",
28+
"simpeg",
29+
]
30+
31+
classifiers = [
32+
"Development Status :: 4 - Beta",
33+
"Intended Audience :: Science/Research",
34+
"Intended Audience :: Developers",
35+
"Natural Language :: English",
36+
"Topic :: Scientific/Engineering",
37+
"Topic :: Scientific/Engineering :: Mathematics",
38+
"Topic :: Scientific/Engineering :: Physics",
39+
"Topic :: Software Development :: Libraries :: Python Modules",
40+
]
41+
1642
packages = [
1743
{ include = "simpeg_drivers" },
1844
{ include = "simpeg_drivers-assets" },

recipe.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ requirements:
2828
# Mira packages
2929
- geoapps-utils >=0.6.0a1, <0.7.dev
3030
- geoh5py >=0.12.0a1, <0.13.dev
31-
- mira-simpeg >=0.23.0.1a1, <0.23.1.dev
31+
- mira-simpeg >=0.23.0.1a3, <0.23.1.dev
3232
- octree-creation-app >=0.4.0a1, <0.5.dev
3333
- param-sweeps >=0.3.0a1, <0.4.dev
3434
# direct dependencies
@@ -64,10 +64,8 @@ tests:
6464

6565
- script:
6666
- pytest --ignore=tests/version_test.py
67-
- pip list
6867
requirements:
6968
run:
70-
- pip
7169
- pytest
7270
files:
7371
source:

simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json

Lines changed: 7 additions & 3 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,5 +225,9 @@
225225
"value": false,
226226
"tooltip": "Generates a file for sweeping parameters instead of running the application."
227227
},
228+
"n_workers": "",
229+
"n_threads": "",
230+
"max_ram": "",
231+
"performance_report": false,
228232
"distributed_workers": ""
229233
}

simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json

Lines changed: 8 additions & 4 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,5 +570,9 @@
570570
"value": false,
571571
"tooltip": "Generates a file for sweeping parameters instead of running the application."
572572
},
573+
"n_workers": "",
574+
"n_threads": "",
575+
"max_ram": "",
576+
"performance_report": false,
573577
"distributed_workers": ""
574578
}

simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json

Lines changed: 16 additions & 12 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,14 +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+
"n_workers": "",
169+
"n_threads": "",
170+
"max_ram": "",
171+
"performance_report": false,
168172
"distributed_workers": ""
169173
}

0 commit comments

Comments
 (0)