Skip to content

Commit 7033425

Browse files
authored
Merge pull request #367 from MiraGeoscience/GEOPY-2594
GEOPY-2594: PGI failure on petrophysical model with air cells
2 parents b1ad7f4 + fae0697 commit 7033425

3 files changed

Lines changed: 20 additions & 10 deletions

File tree

simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
"label": "Uncertainty",
4545
"parent": "data_object",
4646
"dependency": "z_imag_channel",
47-
"dependencyType": "show",
47+
"dependencyType": "enabled",
48+
"enabled": false,
4849
"value": ""
4950
},
5051
"z_real_channel": {
@@ -75,7 +76,8 @@
7576
"label": "Uncertainty",
7677
"parent": "data_object",
7778
"dependency": "z_real_channel",
78-
"dependencyType": "show",
79+
"dependencyType": "enabled",
80+
"enabled": false,
7981
"value": ""
8082
},
8183
"u_cell_size": {

simpeg_drivers-assets/uijson/fdem_inversion.ui.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"label": "Uncertainty",
6767
"parent": "data_object",
6868
"dependency": "z_imag_channel",
69-
"dependencyType": "show",
69+
"dependencyType": "enabled",
70+
"enabled": false,
7071
"value": ""
7172
},
7273
"z_real_channel": {
@@ -97,7 +98,8 @@
9798
"label": "Uncertainty",
9899
"parent": "data_object",
99100
"dependency": "z_real_channel",
100-
"dependencyType": "show",
101+
"dependencyType": "enabled",
102+
"enabled": false,
101103
"value": ""
102104
},
103105
"y_imag_channel": {
@@ -128,7 +130,8 @@
128130
"label": "Uncertainty",
129131
"parent": "data_object",
130132
"dependency": "y_imag_channel",
131-
"dependencyType": "show",
133+
"dependencyType": "enabled",
134+
"enabled": false,
132135
"value": ""
133136
},
134137
"y_real_channel": {
@@ -159,7 +162,8 @@
159162
"label": "Uncertainty",
160163
"parent": "data_object",
161164
"dependency": "y_real_channel",
162-
"dependencyType": "show",
165+
"dependencyType": "enabled",
166+
"enabled": false,
163167
"value": ""
164168
},
165169
"x_imag_channel": {
@@ -190,7 +194,8 @@
190194
"label": "Uncertainty",
191195
"parent": "data_object",
192196
"dependency": "x_imag_channel",
193-
"dependencyType": "show",
197+
"dependencyType": "enabled",
198+
"enabled": false,
194199
"value": ""
195200
},
196201
"x_real_channel": {
@@ -221,7 +226,8 @@
221226
"label": "Uncertainty",
222227
"parent": "data_object",
223228
"dependency": "x_real_channel",
224-
"dependencyType": "show",
229+
"dependencyType": "enabled",
230+
"enabled": false,
225231
"value": ""
226232
},
227233
"mesh": {

simpeg_drivers/components/models.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from geoapps_utils.utils.importing import GeoAppsError
1818
from geoapps_utils.utils.numerical import weighted_average
1919
from geoh5py.data import Data, FloatData, NumericData
20-
from geoh5py.data.data_type import GeometricDataValueMapType
20+
from geoh5py.data.data_type import GeometricDataValueMapType, ReferencedValueMapType
2121
from geoh5py.objects import ObjectBase
2222
from simpeg.utils.mat_utils import (
2323
dip_azimuth2cartesian,
@@ -662,7 +662,9 @@ def obj_2_mesh(data: Data, destination: ObjectBase) -> np.ndarray:
662662

663663
values = data.values.astype(float)
664664

665-
if isinstance(data.entity_type, GeometricDataValueMapType):
665+
if isinstance(
666+
data.entity_type, GeometricDataValueMapType | ReferencedValueMapType
667+
):
666668
values[values == 0] = np.nan
667669

668670
full_vector = weighted_average(xyz_in, xyz_out, [values], n=1)[0]

0 commit comments

Comments
 (0)