Merge pull request #52 from Loop3D/dev

Dev

Author: lachlangrose

.gitignore

@@ -129,4 +129,4 @@ examples/*/*.png
 docs/source/test/*
 examples/*.png
 dev/scalar_field
-dev/unconf
+dev/unconf

LoopStructural/__init__.py

@@ -29,7 +29,7 @@
 ch.setFormatter(formatter)
 ch.setLevel(logging.WARNING)
 loggers = {}
-__version__ = '1.0.5'
+__version__ = '1.0.6-dev'
 from .modelling.core.geological_model import GeologicalModel
 from .visualisation.model_visualisation import LavaVuModelViewer
 from .visualisation.map_viewer import MapView

LoopStructural/interpolators/base_structured_3d_support.py

@@ -67,10 +67,10 @@ def maximum(self,maximum):
         """
         update the number of steps to fit new boundary
         """
-        maximum = np.array(maximum)
+        maximum = np.array(maximum,dtype=float)
         length = maximum-self.origin
         length /= self.step_vector
-        self.nsteps = np.ceil(length).astype(int)
+        self._nsteps = np.ceil(length).astype(int)
     @property
     def n_nodes(self):
         return np.product(self.nsteps)

LoopStructural/interpolators/discrete_interpolator.py

@@ -156,8 +156,9 @@ def add_constraints_to_least_squares(self, A, B, idc, name='undefined'):
         A = np.array(A)
         B = np.array(B)
         idc = np.array(idc)
-
         nr = A.shape[0]
+        #logger.debug('Adding constraints to interpolator: {} {} {}'.format(A.shape[0]))
+        # print(A.shape,B.shape,idc.shape)
         if A.shape != idc.shape:
             return
 
@@ -491,6 +492,8 @@ def _solve(self, solver='cg', **kwargs):
             True if the interpolation is run
 
         """
+        logger.info("Solving interpolation for {}".format(self.propertyname))
+
         self.c = np.zeros(self.support.n_nodes)
         self.c[:] = np.nan
         damp = True
@@ -531,7 +534,7 @@ def _solve(self, solver='cg', **kwargs):
             logger.warning("Solver not run, no scalar field")
         # if solution is all 0, probably didn't work
         if np.all(self.c[self.region] == 0):
-            logger.warning("No solution, scalar field 0. Add more data.")
+            logger.warning("No solution, {} scalar field 0. Add more data.".format(self.propertyname))
 
     def update(self):
         """

LoopStructural/interpolators/finite_difference_interpolator.py

@@ -75,7 +75,6 @@ def _setup_interpolator(self, **kwargs):
         -------
 
         """
-
         for key in kwargs:
             self.up_to_date = False
             if 'regularisation' in kwargs: