Skip to content

Commit 77af24f

Browse files
author
Lachlan Grose
committed
fix: adding logger to intrusion body
added bool flag for intrusion import
1 parent 3db132b commit 77af24f

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

LoopStructural/modelling/core/geological_model.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@
2929
from LoopStructural.utils.helper import (all_heading, gradient_vec_names,
3030
strike_dip_vector)
3131

32-
from LoopStructural.modelling.intrusions import IntrusionNetwork
33-
from LoopStructural.modelling.intrusions import IntrusionBuilder
34-
from LoopStructural.modelling.intrusions import IntrusionBody
35-
from LoopStructural.modelling.intrusions import IntrusionFeature
36-
32+
intrusions = True
33+
try:
34+
from LoopStructural.modelling.intrusions import IntrusionNetwork
35+
from LoopStructural.modelling.intrusions import IntrusionBuilder
36+
from LoopStructural.modelling.intrusions import IntrusionBody
37+
from LoopStructural.modelling.intrusions import IntrusionFeature
38+
except ImportError:
39+
intrusions = False
3740
from LoopStructural.utils import getLogger, log_to_file
3841
logger = getLogger(__name__)
3942

@@ -1011,6 +1014,9 @@ def create_and_add_intrusion(self, intrusion_name, intrusion_frame_name = None,
10111014
intrusion feature
10121015
10131016
"""
1017+
if intrusions == False:
1018+
logger.error("Libraries not installed")
1019+
raise Exception("Libraries not installed")
10141020
feature_data = self.data[self.data['feature_name'] == intrusion_name].copy()
10151021

10161022
# Create and build Intrusion Network

LoopStructural/modelling/intrusions/intrusion_body.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import numpy as np
22
import pandas as pd
33

4+
from LoopStructural.utils import getLogger
5+
logger = getLogger(__name__)
46
#GSLIB library
57
try:
68
import geostatspy.GSLIB as GSLIB # GSLIB utilities, viz and wrapped functions
@@ -516,6 +518,8 @@ def simulate_s_thresholds(self):
516518
ndmin = self.simulation_s_parameters.get('ndmin'); ndmax = self.simulation_s_parameters.get('ndmax')
517519
radius = self.simulation_s_parameters.get('radius')
518520

521+
if geostats is None:
522+
raise Exception('geostats is not installed')
519523
s_min_simulation = geostats.sgsim(inputsimdata_minS,'coord1','ref_coord','s_residual',wcol=-1,scol=-1,
520524
tmin=tmin,tmax=tmax,itrans=itrans,ismooth=0,dftrans=0,tcol=0,twtcol=0,
521525
zmin=zmin,zmax=zmax,ltail=1,ltpar=0.0,utail=1,utpar=0.3,nsim=1,

0 commit comments

Comments
 (0)