(BUGFIX) changing tolerance for pyamg

Author: lachlangrose

LoopStructural/interpolators/discrete_interpolator.py

@@ -440,7 +440,7 @@ def _solve_cg(self, A, B, precon=None, **kwargs):
             cgargs['M'] = precon(A)
         return sla.cg(A, B, **cgargs)[0][:self.nx]
 
-    def _solve_pyamg(self, A, B):
+    def _solve_pyamg(self, A, B, tol=1e-8,x0=None,**kwargs):
         """
         Solve least squares system using pyamg algorithmic multigrid solver
 
@@ -454,7 +454,8 @@ def _solve_pyamg(self, A, B):
 
         """
         import pyamg
-        return pyamg.solve(A, B, verb=False)[:self.nx]
+        logger.info("Solving using pyamg: tol {}".format(tol))
+        return pyamg.solve(A, B, tol=tol, x0=x0, verb=False)[:self.nx]
 
     def _solve(self, solver='cg', **kwargs):
         """
@@ -500,7 +501,7 @@ def _solve(self, solver='cg', **kwargs):
         if solver == 'pyamg':
             try:
                 logger.info("Solving with pyamg solve")
-                self.c[self.region] = self._solve_pyamg(A, B)
+                self.c[self.region] = self._solve_pyamg(A, B,**kwargs)
             except ImportError:
                 logger.warn("Pyamg not installed using cg instead")
                 self.c[self.region] = self._solve_cg(A, B)

LoopStructural/modelling/core/geological_model.py

@@ -151,7 +151,7 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
             self.scale_factor = np.max(lengths)
             logger.info('Rescaling model using scale factor {}'.format(self.scale_factor))
         self._str+='Model rescale factor: {} \n'.format(self.scale_factor)
-        self._str+='The model contains {} GeologicalFeatures'.format(len(self.features))
+        self._str+='The model contains {} GeologicalFeatures \n'.format(len(self.features))
         self._str+=''
         self._str += '------------------------------------------ \n'
         self._str += ''
@@ -168,6 +168,9 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
     def __str__(self):
         return self._str
 
+    def _ipython_key_completions_(self):
+        return self.feature_name_index.keys()
+        
     @classmethod
     def from_map2loop_directory(cls, m2l_directory,**kwargs):
         """Alternate constructor for a geological model using m2l output
@@ -229,6 +232,12 @@ def __getitem__(self, feature_name):
         """
         return self.get_feature_by_name(feature_name)
 
+    def feature_names(self):
+        return self.feature_name_index.keys()
+
+    def fault_names(self):
+        pass
+
     def check_inialisation(self):
         if self.data is None:
             logger.error("Data not associated with GeologicalModel. Run set_data")
@@ -270,6 +279,7 @@ def _add_feature(self, feature):
                         (feature.name, self.feature_name_index[feature.name]))
             self.features[self.feature_name_index[feature.name]] = feature
         else:
+            self._str += 'GeologicalFeature: {} of type - {} \n'.format(feature.name,feature.type)
             self.features.append(feature)
             self.feature_name_index[feature.name] = len(self.features) - 1
             logger.info("Adding %s to model at location %i" % (