Skip to content

Commit bda7d3b

Browse files
committed
(FEATURE) adding nice print to GeologicalModel
1 parent 3bc0928 commit bda7d3b

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

LoopStructural/modelling/core/geological_model.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,19 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
129129
self.feature_name_index = {}
130130
self.data = None
131131
self.nsteps = nsteps
132-
132+
self._str = 'Instance of LoopStructural.GeologicalModel \n'
133+
self._str += '------------------------------------------ \n'
133134
# we want to rescale the model area so that the maximum length is
134135
# 1
135136
self.origin = np.array(origin).astype(float)
136-
logger.info('Model origin: {} {} {}'.format(self.origin[0],self.origin[1],self.origin[2]))
137-
137+
originstr = 'Model origin: {} {} {}'.format(self.origin[0],self.origin[1],self.origin[2])
138+
logger.info(originstr)
139+
self._str+=originstr+'\n'
138140
self.maximum = np.array(maximum).astype(float)
139-
logger.info('Model maximum: {} {} {}'.format(self.maximum[0],self.maximum[1],self.maximum[2]))
141+
maximumstr = 'Model maximum: {} {} {}'.format(self.maximum[0],self.maximum[1],self.maximum[2])
142+
logger.info(maximumstr)
143+
self._str+=maximumstr+'\n'
144+
140145
lengths = self.maximum - self.origin
141146
self.scale_factor = 1.
142147
self.bounding_box = np.zeros((2, 3))
@@ -145,7 +150,11 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
145150
if rescale:
146151
self.scale_factor = np.max(lengths)
147152
logger.info('Rescaling model using scale factor {}'.format(self.scale_factor))
148-
153+
self._str+='Model rescale factor: {} \n'.format(self.scale_factor)
154+
self._str+='The model contains {} GeologicalFeatures'.format(len(self.features))
155+
self._str+=''
156+
self._str += '------------------------------------------ \n'
157+
self._str += ''
149158
self.bounding_box /= self.scale_factor
150159
self.support = {}
151160
self.reuse_supports = reuse_supports
@@ -156,6 +165,8 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
156165
'nsteps': nsteps,
157166
'reuse_supports': reuse_supports}}
158167

168+
def __str__(self):
169+
return self._str
159170

160171
@classmethod
161172
def from_map2loop_directory(cls, m2l_directory,**kwargs):

0 commit comments

Comments
 (0)