|
56 | 56 |
|
57 | 57 | intrusions = True |
58 | 58 | try: |
59 | | - # from LoopStructural.modelling.intrusions import IntrusionNetwork |
60 | 59 | from LoopStructural.modelling.intrusions import IntrusionBuilder |
61 | 60 |
|
62 | | - # from LoopStructural.modelling.intrusions import IntrusionBody |
63 | 61 | from LoopStructural.modelling.intrusions import IntrusionFrameBuilder |
64 | 62 | except ImportError as e: |
65 | 63 | print(e) |
@@ -96,8 +94,8 @@ class GeologicalModel: |
96 | 94 |
|
97 | 95 | def __init__( |
98 | 96 | self, |
99 | | - origin, |
100 | | - maximum, |
| 97 | + origin: np.ndarray, |
| 98 | + maximum: np.ndarray, |
101 | 99 | data=None, |
102 | 100 | rescale=False, |
103 | 101 | nsteps=(50, 50, 25), |
@@ -1186,35 +1184,13 @@ def create_and_add_intrusion( |
1186 | 1184 | intrusion_builder.lateral_extent_model = intrusion_lateral_extent_model |
1187 | 1185 | intrusion_builder.vertical_extent_model = intrusion_vertical_extent_model |
1188 | 1186 |
|
1189 | | - # # -- Create intrusion feature |
1190 | | - # intrusion_feature = IntrusionFeature( |
1191 | | - # intrusion_name, model=self |
1192 | | - # ) |
1193 | | - |
1194 | | - # if intrusion_lateral_extent_model == None: |
1195 | | - # logger.error( |
1196 | | - # "Specify conceptual model function for intrusion lateral extent" |
1197 | | - # ) |
1198 | | - # else: |
1199 | | - # intrusion_feature.lateral_extent_model = intrusion_lateral_extent_model |
1200 | | - |
1201 | | - # if intrusion_vertical_extent_model == None: |
1202 | | - # logger.error( |
1203 | | - # "Specify conceptual model function for intrusion vertical extent" |
1204 | | - # ) |
1205 | | - # else: |
1206 | | - # intrusion_feature.vertical_extent_model = intrusion_vertical_extent_model |
1207 | | - |
1208 | | - # logger.info("setting data for thresholds simulation") |
| 1187 | + |
1209 | 1188 | intrusion_builder.set_data_for_extent_simulation(intrusion_data) |
1210 | 1189 | intrusion_builder.build_arguments = { |
1211 | 1190 | "lateral_extent_sgs_parameters": lateral_extent_sgs_parameters, |
1212 | 1191 | "vertical_extent_sgs_parameters": vertical_extent_sgs_parameters, |
1213 | 1192 | } |
1214 | | - # intrusion_builder.vertical_extent_sgs_parameters = vertical_extent_sgs_parameters |
1215 | | - # intrusion_builder.lateral_extent_sgs_parameters = lateral_extent_sgs_parameters |
1216 | | - # intrusion_builder.set_l_sgs_GSLIBparameters(lateral_extent_sgs_parameters) |
1217 | | - # intrusion_builder.set_g_sgs_GSLIBparameters(vertical_extent_sgs_parameters) |
| 1193 | + |
1218 | 1194 | intrusion_feature = intrusion_builder.feature |
1219 | 1195 | self._add_feature(intrusion_feature) |
1220 | 1196 |
|
|
0 commit comments