LoopStructural 1.0.9__cp36-cp36m-win32.whl

LoopStructural/modelling/core/geological_model.py

@@ -0,0 +1,1513 @@
+"""
+Main entry point for creating a geological model
+"""
+import logging
+
+import numpy as np
+import pandas as pd
+from LoopStructural.datasets import normal_vector_headers
+from LoopStructural.interpolators.discrete_fold_interpolator import \
+    DiscreteFoldInterpolator as DFI
+from LoopStructural.interpolators.finite_difference_interpolator import \
+    FiniteDifferenceInterpolator as FDI
+from LoopStructural.interpolators.piecewiselinear_interpolator import \
+    PiecewiseLinearInterpolator as PLI
+
+
+from LoopStructural.interpolators.structured_grid import StructuredGrid
+from LoopStructural.interpolators.structured_tetra import TetMesh
+from LoopStructural.modelling.fault.fault_segment import FaultSegment
+from LoopStructural.modelling.fault import FaultBuilder
+from LoopStructural.modelling.features import (GeologicalFeatureInterpolator,
+                                               RegionFeature,
+                                               StructuralFrameBuilder,
+                                               UnconformityFeature)
+from LoopStructural.modelling.fold import FoldRotationAngle
+from LoopStructural.modelling.fold.fold import FoldEvent
+from LoopStructural.modelling.fold.foldframe import FoldFrame
+from LoopStructural.utils.exceptions import LoopBaseException
+from LoopStructural.utils.helper import (all_heading, gradient_vec_names,
+                                         strike_dip_vector)
+
+from LoopStructural.utils import getLogger, log_to_file
+logger = getLogger(__name__)
+
+
+
+def _calculate_average_intersection(series_builder, fold_frame, fold,
+                                    **kwargs):
+    """
+
+    Parameters
+    ----------
+    series_builder
+    fold_frame
+    fold
+
+    Returns
+    -------
+
+    """
+    l2 = fold_frame.calculate_intersection_lineation(
+        series_builder)
+    fold.fold_axis = np.mean(l2, axis=0)
+
+
+class GeologicalModel:
+    """
+    A geological model is the recipe for building a 3D model and  can include
+    the rescaling of the model between 0 and 1.
+
+    Attributes
+    ----------
+    features : list
+        Contains all features youngest to oldest
+    feature_name_index : dict
+        maps feature name to the list index of the features
+    data : pandas dataframe
+        the dataframe used for building the geological model
+    nsteps : tuple/np.array(3,dtype=int)
+        the number of steps x,y,z to evaluate the model
+    origin : tuple/np.array(3,dtype=doubles)
+        the origin of the model box
+    parameters : dict
+        a dictionary tracking the parameters used to build the model
+    scale_factor : double
+        the scale factor used to rescale the model
+
+
+    """
+    def __init__(self, origin, maximum, rescale=True, nsteps=(50, 50, 25),
+                 reuse_supports=False, logfile=None, loglevel='info'):
+        """
+        Parameters
+        ----------
+        origin : numpy array
+            specifying the origin of the model
+        maximum : numpy array
+            specifying the maximum extent of the model
+        rescale : bool
+            whether to rescale the model to between 0/1
+
+        Examples
+        --------
+        Demo data
+        
+        >>> from LoopStructural.datasets import load_claudius
+        >>> from LoopStructural import GeologicalModel
+        
+        >>> data, bb = load_claudius()
+        
+        >>> model = GeologicalModel(bb[:,0],bb[:,1] 
+        >>> model.set_model_data(data)
+        >>> model.create_and_add_foliation('strati')
+        
+        >>> y = np.linspace(model.bounding_box[0, 1], model.bounding_box[1, 1],
+                        nsteps[1])
+        >>> z = np.linspace(model.bounding_box[1, 2], model.bounding_box[0, 2],
+                        nsteps[2])
+        >>> xx, yy, zz = np.meshgrid(x, y, z, indexing='ij')
+        >>> xyz = np.array([xx.flatten(), yy.flatten(), zz.flatten()]).T
+        >>> model.evaluate_feature_value('strati',xyz,scale=False)
+
+
+        """
+        # print('tet')
+        if logfile:
+            self.logfile = logfile
+            log_to_file(logfile,loglevel)
+        
+        logger.info('Initialising geological model')
+        self.features = []
+        self.feature_name_index = {}
+        self.data = None
+        self.nsteps = nsteps
+        self._str = 'Instance of LoopStructural.GeologicalModel \n'
+        self._str += '------------------------------------------ \n'
+        # we want to rescale the model area so that the maximum length is
+        # 1
+        self.origin = np.array(origin).astype(float)
+        originstr = 'Model origin: {} {} {}'.format(self.origin[0],self.origin[1],self.origin[2])
+        logger.info(originstr)
+        self._str+=originstr+'\n'
+        self.maximum = np.array(maximum).astype(float)
+        maximumstr = 'Model maximum: {} {} {}'.format(self.maximum[0],self.maximum[1],self.maximum[2])
+        logger.info(maximumstr)
+        self._str+=maximumstr+'\n'
+
+        lengths = self.maximum - self.origin
+        self.scale_factor = 1.
+        self.bounding_box = np.zeros((2, 3))
+        self.bounding_box[1, :] = self.maximum - self.origin
+        self.bounding_box[1, :] = self.maximum - self.origin
+        if rescale:
+            self.scale_factor = float(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 \n'.format(len(self.features))
+        self._str+=''
+        self._str += '------------------------------------------ \n'
+        self._str += ''
+        self.bounding_box /= self.scale_factor
+        self.support = {}
+        self.reuse_supports = reuse_supports
+        if self.reuse_supports:
+            logger.warning("Supports are shared between geological features \n"
+                                "this may cause unexpected behaviour and should only\n"
+                                "be use by advanced users")
+        logger.info('Reusing interpolation supports: {}'.format(self.reuse_supports))
+        self.stratigraphic_column = None
+        self.parameters = {'features': [], 'model': {'bounding_box': self.origin.tolist() + self.maximum.tolist(),
+                                                     'rescale': rescale,
+                                                     'nsteps': nsteps,
+                                                     'reuse_supports': reuse_supports}}
+        
+    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
+
+        Uses the information saved in the map2loop files to build a geological model.
+        You can specify kwargs for building foliation using foliation_params and for 
+        faults using fault_params.  faults is a flag that allows for the faults to be skipped.
+
+        Parameters
+        ----------
+        m2l_directory : string
+            path to map2loop directory
+
+        Returns
+        -------
+        (GeologicalModel, dict)
+            the created geological model and a dictionary of the map2loop data
+        """
+        from LoopStructural.utils import build_model, process_map2loop
+        logger.info('LoopStructural model initialised from m2l directory: {}'.format(m2l_directory))
+        m2lflags = kwargs.pop('m2lflags',{})
+        m2l_data = process_map2loop(m2l_directory,m2lflags)
+        return build_model(m2l_data,**kwargs), m2l_data
+
+    @classmethod
+    def from_file(cls, file):
+        """Load a geological model from file
+
+        Parameters
+        ----------
+        file : string
+            path to the file
+
+        Returns
+        -------
+        GeologicalModel
+            the geological model object
+        """        
+        try:
+            import dill as pickle
+        except ImportError:
+            logger.error("Cannot import from file, dill not installed")
+            return None
+        model = pickle.load(open(file,'rb'))
+        if type(model) == GeologicalModel:
+            logger.info('GeologicalModel initialised from file')
+            return model
+        else:
+            logger.error('{} does not contain a geological model'.format(file))
+            return None
+        
+    def __getitem__(self, feature_name):
+        """Accessor for feature in features using feature_name_index
+
+        Parameters
+        ----------
+        feature_name : string
+            name of the feature to return
+        """
+        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")
+            return False
+        
+    def to_file(self, file):
+        """Save a model to a pickle file requires dill
+
+        Parameters
+        ----------
+        file : string
+            path to file location
+        """        
+        try:
+            import dill as pickle
+        except ImportError:
+            logger.error("Cannot write to file, dill not installed \n"
+                        "pip install dill")
+            return
+        try:
+            logger.info('Writing GeologicalModel to: {}'.format(file))
+            pickle.dump(self,open(file,'wb'))
+        except pickle.PicklingError:
+            logger.error('Error saving file')
+
+    def _add_feature(self, feature):
+        """
+        Add a feature to the model stack
+
+        Parameters
+        ----------
+        feature : GeologicalFeature
+            the geological feature to add
+
+        """
+
+        if feature.name in self.feature_name_index:
+            logger.info("Feature %s already exists at %i, overwriting" %
+                        (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" % (
+                feature.name, len(self.features)))
+        self._add_domain_fault_above(feature)
+        self._add_unconformity_above(feature)
+        feature.set_model(self)
+    
+    def data_for_feature(self,feature_name):
+        return self.data.loc[self.data['feature_name'] == feature_name,:]
+        
+    def set_model_data(self, data):
+        """
+        Set the data array for the model
+
+        Parameters
+        ----------
+        data : pandas data frame
+            with column headers corresponding to the
+         type, X, Y, Z, nx, ny, nz, val, strike, dip, dip_dir, plunge,
+         plunge_dir, azimuth
+
+        Returns
+        -------
+        Note
+        ----
+        Type can be any unique identifier for the feature the data point
+        'eg' 'S0', 'S2', 'F1_axis'
+        it is then used by the create functions to get the correct data
+        """
+        if type(data) != pd.DataFrame:
+            logger.warning(
+                "Data is not a pandas data frame, trying to read data frame "
+                "from csv")
+            try:
+                data = pd.read_csv(data)
+            except:
+                logger.error("Could not load pandas data frame from data")
+        logger.info('Adding data to GeologicalModel with {} data points'.format(len(data)))
+        self.data = data.copy()
+        self.data['X'] -= self.origin[0]
+        self.data['Y'] -= self.origin[1]
+        self.data['Z'] -= self.origin[2]
+        self.data['X'] /= self.scale_factor
+        self.data['Y'] /= self.scale_factor
+        self.data['Z'] /= self.scale_factor
+        if 'type' in self.data:
+            logger.warning("'type' is depreciated replace with 'feature_name' \n")
+            self.data.rename(columns={'type':'feature_name'},inplace=True)
+        for h in all_heading():
+            if h not in self.data:
+                self.data[h] = np.nan
+                if h == 'w':
+                    self.data[h] = 1.
+                if h == 'coord':
+                    self.data[h] = 0
+        
+        if 'strike' in self.data and 'dip' in self.data:
+            logger.info('Converting strike and dip to vectors')
+            mask = np.all(~np.isnan(self.data.loc[:, ['strike', 'dip']]),
+                          axis=1)
+            self.data.loc[mask, gradient_vec_names()] = strike_dip_vector(
+                self.data.loc[mask, 'strike'], self.data.loc[mask, 'dip'])
+            self.data.drop(['strike', 'dip'], axis=1, inplace=True)
+        #     self.data.loc
+        # if 'nx' in self.data and 'ny' in self.data and 'nz' in self.data:
+        #     mask = np.all(~np.isnan(self.data.loc[:, ['nx', 'ny','nz']]),
+        #                   axis=1)
+        #     self.data.loc[mask,['nx', 'ny','nz']] /= self.scale_factor
+    def extend_model_data(self, newdata):
+        """
+        Extends the data frame
+
+        Parameters
+        ----------
+        newdata : pandas data frame
+            data to add to the existing dataframe
+        Returns
+        -------
+        """
+        logger.warning("Extend data is untested and may have unexpected consequences")
+        data_temp = newdata.copy()
+        data_temp['X'] -= self.origin[0]
+        data_temp['Y'] -= self.origin[1]
+        data_temp['Z'] -= self.origin[2]
+        data_temp['X'] /= self.scale_factor
+        data_temp['Y'] /= self.scale_factor
+        data_temp['Z'] /= self.scale_factor
+        self.data.concat([self.data, data_temp], sort=True)
+
+    def set_stratigraphic_column(self, stratigraphic_column,cmap='tab20'):
+        """
+        Adds a stratigraphic column to the model
+
+        Parameters
+        ----------
+        stratigraphic_column : dictionary
+        cmap : matplotlib.cmap
+        Returns
+        -------
+
+        Notes
+        -----
+        stratigraphic_column is a nested dictionary with the format
+        {'group':
+                {'series1':
+                            {'min':0., 'max':10.,'id':0,'colour':}
+                }
+        }
+
+        """
+        # if the colour for a unit hasn't been specified we can just sample from 
+        # a colour map e.g. tab20
+        logger.info('Adding stratigraphic column to model')
+        random_colour = True
+        n_units=0
+        for g in stratigraphic_column.keys():
+            for u in stratigraphic_column[g].keys():
+                if 'colour' in stratigraphic_column[g][u]:
+                    random_colour = False
+                    break
+                n_units+=1
+        if random_colour:
+            import matplotlib.cm as cm
+            cmap = cm.get_cmap(cmap,n_units)
+            cmap_colours = cmap.colors
+            ci = 0
+            for g in stratigraphic_column.keys():
+                for u in stratigraphic_column[g].keys():
+                    stratigraphic_column[g][u]['colour'] = cmap_colours[ci,:]
+        
+        self.stratigraphic_column = stratigraphic_column
+
+    def create_from_feature_list(self, features):
+        """Initialises a model from a dictionary containing the features
+
+        Parameters
+        ----------
+        features : [type]
+            [description]
+
+        Raises
+        ------
+        LoopBaseException
+            [description]
+        """        
+        for f in features:
+            featuretype = f.pop('featuretype', None)
+            if featuretype is None:
+                raise LoopBaseException
+            if featuretype == 'strati':
+                self.create_and_add_foliation(f)
+            # if featuretype == 'fault':
+            #     self.create_and_add_fault(f)
+            if featuretype == 'folded_strati':
+                self.create_and_add_folded_foliation(f)
+
+    def get_interpolator(self, interpolatortype='PLI', nelements=1e5,
+                         buffer=0.2, element_volume = None, **kwargs):
+        """
+        Returns an interpolator given the arguments, also constructs a
+        support for a discrete interpolator
+
+        Parameters
+        ----------
+        interpolatortype : string
+            define the interpolator type
+        nelements : int
+            number of elements in the interpolator
+        buffer : double or numpy array 3x1
+            value(s) between 0,1 specifying the buffer around the bounding box
+        data_bb : bool
+            whether to use the model boundary or the boundary around
+        kwargs : no kwargs used, this just catches any additional arguments
+
+        Returns
+        -------
+        """
+        # get an interpolator for
+        interpolator = None
+        bb = np.copy(self.bounding_box)
+        # add a buffer to the interpolation domain, this is necessary for
+        # faults but also generally a good
+        # idea to avoid boundary problems
+        # buffer = bb[1, :]
+        buffer = (bb[1,:]-bb[0,:])*buffer
+        bb[0, :] -= buffer  # *(bb[1,:]-bb[0,:])
+        bb[1, :] += buffer  # *(bb[1,:]-bb[0,:])
+        box_vol = (bb[1, 0]-bb[0, 0]) * (bb[1, 1]-bb[0, 1]) * (bb[1, 2]-bb[0, 2])
+        if interpolatortype == "PLI":
+            if element_volume is None:
+                nelements /= 5
+                element_volume = box_vol / nelements
+            # calculate the step vector of a regular cube
+            step_vector = np.zeros(3)
+            step_vector[:] = element_volume ** (1. / 3.)
+            # step_vector /= np.array([1,1,2])
+            # number of steps is the length of the box / step vector
+            nsteps = np.ceil((bb[1, :] - bb[0, :]) / step_vector).astype(int)
+            # create a structured grid using the origin and number of steps
+            if self.reuse_supports:
+                mesh_id = 'mesh_{}'.format(nelements)
+                mesh = self.support.get(mesh_id,
+                                        TetMesh(origin=bb[0, :], nsteps=nsteps,
+                                                step_vector=step_vector))
+                if mesh_id not in self.support:
+                    self.support[mesh_id] = mesh
+            else:
+                mesh = TetMesh(origin=bb[0, :], nsteps=nsteps, step_vector=step_vector)
+            logger.info("Creating regular tetrahedron mesh with %i elements \n"
+                        "for modelling using PLI" % (mesh.ntetra))
+
+            return PLI(mesh)
+
+        if interpolatortype == 'FDI':
+
+            # find the volume of one element
+            if element_volume is None:
+                element_volume = box_vol / nelements
+            # calculate the step vector of a regular cube
+            step_vector = np.zeros(3)
+            step_vector[:] = element_volume ** (1. / 3.)
+            # number of steps is the length of the box / step vector
+            nsteps = np.ceil((bb[1, :] - bb[0, :]) / step_vector).astype(int)
+            if np.any(np.less(nsteps, 3)):
+                logger.error("Cannot create interpolator: number of steps is too small")
+                return None
+            # create a structured grid using the origin and number of steps
+            if self.reuse_supports:
+                grid_id = 'grid_{}'.format(nelements)
+                grid = self.support.get(grid_id, StructuredGrid(origin=bb[0, :],
+                                                            nsteps=nsteps,
+                                                            step_vector=step_vector))
+                if grid_id not in self.support:
+                    self.support[grid_id] = grid
+            else:
+                grid = StructuredGrid(origin=bb[0, :], nsteps=nsteps,step_vector=step_vector)
+            logger.info("Creating regular grid with %i elements \n"
+                        "for modelling using FDI" % grid.n_elements)
+            return FDI(grid)
+
+        if interpolatortype == "DFI":  # "fold" in kwargs:
+            if element_volume is None:
+                nelements /= 5
+                element_volume = box_vol / nelements
+            # calculate the step vector of a regular cube
+            step_vector = np.zeros(3)
+            step_vector[:] = element_volume ** (1. / 3.)
+            # number of steps is the length of the box / step vector
+            nsteps = np.ceil((bb[1, :] - bb[0, :]) / step_vector).astype(int)
+            # create a structured grid using the origin and number of steps
+            mesh = kwargs.get('mesh', TetMesh(origin=bb[0, :], nsteps=nsteps,
+                                              step_vector=step_vector))
+            logger.info("Creating regular tetrahedron mesh with %i elements \n"
+                        "for modelling using DFI" % mesh.ntetra)
+            return DFI(mesh, kwargs['fold'])
+        if interpolatortype == 'Surfe' or interpolatortype == 'surfe':
+            # move import of surfe to where we actually try and use it
+            try:
+                from LoopStructural.interpolators.surfe_wrapper import \
+                    SurfeRBFInterpolator as Surfe
+
+                surfe = True
+
+            except ImportError:
+                surfe = False
+            if not surfe:
+                logger.warning("Cannot import Surfe, try another interpolator")
+                raise ImportError
+            method = kwargs.get('method', 'single_surface')
+            logger.info("Using surfe interpolator")
+            return Surfe(method)
+        logger.warning("No interpolator")
+        return interpolator
+
+    def create_and_add_foliation(self, series_surface_data, **kwargs):
+        """
+        Parameters
+        ----------
+        series_surface_data : string
+            corresponding to the feature_name in the data
+        kwargs
+
+        Returns
+        -------
+        feature : GeologicalFeature
+            the created geological feature
+        """
+        if self.check_inialisation() == False:
+            return False
+        self.parameters['features'].append({'feature_type': 'foliation', 'feature_name': series_surface_data, **kwargs})
+        interpolator = self.get_interpolator(**kwargs)
+        series_builder = GeologicalFeatureInterpolator(interpolator,
+                                                       name=series_surface_data,
+                                                       **kwargs)
+        # add data
+        series_data = self.data[self.data['feature_name'] == series_surface_data]
+        if series_data.shape[0] == 0:
+            logger.warning("No data for %s, skipping" % series_surface_data)
+            return
+        series_builder.add_data_from_data_frame(series_data)
+        self._add_faults(series_builder)
+
+        # build feature
+        # series_feature = series_builder.build(**kwargs)
+        series_feature = series_builder.feature
+        series_builder.build_arguments = kwargs
+        series_feature.type = 'series'
+        # see if any unconformities are above this feature if so add region
+        # self._add_unconformity_above(series_feature)self._add_feature(series_feature)
+        self._add_feature(series_feature)
+        return series_feature
+
+    def create_and_add_dtm(self, series_surface_data, **kwargs):
+        """
+        Parameters
+        ----------
+        series_surface_data : string
+            corresponding to the feature_name in the data
+        kwargs
+
+        Returns
+        -------
+        feature : GeologicalFeature
+            the created geological feature
+        """
+        if self.check_inialisation() == False:
+            return False
+        self.parameters['features'].append({'feature_type': 'foliation', 'feature_name': series_surface_data, **kwargs})
+        interpolator = self.get_interpolator(**kwargs)
+        series_builder = GeologicalFeatureInterpolator(interpolator,
+                                                       name=series_surface_data,
+                                                       **kwargs)
+        # add data
+        series_data = self.data[self.data['feature_name'] == series_surface_data]
+        if series_data.shape[0] == 0:
+            logger.warning("No data for %s, skipping" % series_surface_data)
+            return
+        series_builder.add_data_from_data_frame(series_data)
+        # self._add_faults(series_builder)
+
+        # build feature
+        # series_feature = series_builder.build(**kwargs)
+        series_feature = series_builder.feature
+        series_builder.build_arguments = kwargs
+        series_feature.type = 'dtm'
+        # see if any unconformities are above this feature if so add region
+        # self._add_unconformity_above(series_feature)self._add_feature(series_feature)
+        self._add_feature(series_feature)
+        return series_feature
+        
+    def create_and_add_fold_frame(self, foldframe_data, **kwargs):
+        """
+        Parameters
+        ----------
+        foldframe_data : string
+            unique string in feature_name column
+
+        kwargs
+
+        Returns
+        -------
+        fold_frame : FoldFrame
+            the created fold frame
+        """
+        if self.check_inialisation() == False:
+            return False
+        self.parameters['features'].append({'feature_type': 'fold_frame', 'feature_name': foldframe_data, **kwargs})
+        # create fault frame
+        interpolator = self.get_interpolator(**kwargs)
+        #
+        fold_frame_builder = StructuralFrameBuilder(interpolator,
+                                                    name=foldframe_data,
+                                                    **kwargs)
+        # add data
+        fold_frame_data = self.data[self.data['feature_name'] == foldframe_data]
+        fold_frame_builder.add_data_from_data_frame(fold_frame_data)
+        self._add_faults(fold_frame_builder[0])
+        self._add_faults(fold_frame_builder[1])
+        self._add_faults(fold_frame_builder[2])
+
+        fold_frame = fold_frame_builder.build(frame=FoldFrame, **kwargs)
+        # for i in range(3):
+        #     self._add_unconformity_above(fold_frame[i])
+        fold_frame.type = 'structuralframe'
+        self._add_feature(fold_frame)
+        
+        return fold_frame
+
+    def create_and_add_folded_foliation(self, foliation_data, fold_frame=None, svario=True,
+                                        **kwargs):
+        """
+        Create a folded foliation field from data and a fold frame
+
+        Parameters
+        ----------
+        foliation_data : str
+            unique string in type column of data frame
+        fold_frame :  FoldFrame
+        svario  : Boolean
+            whether to calculate svariograms, saves time if avoided
+        kwargs
+            additional kwargs to be passed through to other functions
+
+        Returns
+        -------
+        feature : GeologicalFeature
+            created geological feature
+        """
+        if self.check_inialisation() == False:
+            return False
+        self.parameters['features'].append(
+            {'feature_type': 'fold_foliation', 'feature_name': foliation_data, 'fold_frame': fold_frame, **kwargs})
+        if fold_frame is None:
+            logger.info("Using last feature as fold frame")
+            fold_frame = self.features[-1]
+        assert type(fold_frame) == FoldFrame, "Please specify a FoldFrame"
+        fold = FoldEvent(fold_frame,name='Fold_{}'.format(foliation_data))
+        fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
+        series_builder = GeologicalFeatureInterpolator(
+            interpolator=fold_interpolator,
+            name=foliation_data)
+
+        series_builder.add_data_from_data_frame(
+            self.data[self.data['feature_name'] == foliation_data])
+        self._add_faults(series_builder)
+        series_builder.add_data_to_interpolator(True)
+        fold_axis = kwargs.get('fold_axis',None)
+        if fold_axis is not None:
+            fold_axis = np.array(fold_axis)
+            if len(fold_axis.shape) == 1:
+                fold.fold_axis = fold_axis
+        
+        if "av_fold_axis" in kwargs:
+            _calculate_average_intersection(series_builder, fold_frame, fold)
+        if fold.fold_axis is None:
+            far, fad = fold_frame.calculate_fold_axis_rotation(
+                series_builder)
+            fold_axis_rotation = FoldRotationAngle(far, fad,svario=svario)
+            a_wl = kwargs.get("axis_wl", None)
+            if 'axis_function' in kwargs:
+                # allow predefined function to be used
+                fold_axis_rotation.set_function(kwargs['axis_function'])
+            else:
+                fold_axis_rotation.fit_fourier_series(wl=a_wl)
+            fold.fold_axis_rotation = fold_axis_rotation
+        # give option of passing own fold limb rotation function
+        flr, fld = fold_frame.calculate_fold_limb_rotation(
+            series_builder)
+        fold_limb_rotation = FoldRotationAngle(flr, fld,svario=svario)
+        l_wl = kwargs.get("limb_wl", None)
+        if 'limb_function' in kwargs:
+            # allow for predefined functions to be used
+            fold_limb_rotation.set_function(kwargs['limb_function'])
+        else:
+            fold_limb_rotation.fit_fourier_series(wl=l_wl,**kwargs)
+        fold.fold_limb_rotation = fold_limb_rotation
+        # fold_limb_fitter = kwargs.get("fold_limb_function",
+        # _interpolate_fold_limb_rotation_angle)
+        # fold_limb_fitter(series_builder, fold_frame, fold, result, **kwargs)
+        kwargs['fold_weights'] = kwargs.get('fold_weights', {})
+
+        self._add_faults(series_builder)
+        # build feature
+        kwargs['cgw'] = 0.
+        kwargs['fold'] = fold
+        # series_feature = series_builder.build(**kwargs)
+        series_feature = series_builder.feature
+        series_builder.build_arguments = kwargs
+        series_feature.type = 'series'
+        series_feature.fold = fold
+        # see if any unconformities are above this feature if so add region
+        # self._add_unconformity_above(series_feature)self._add_feature(series_feature)
+        # result['support'] = series_feature.get_interpolator().support
+        self._add_feature(series_feature)
+        return series_feature
+
+    def create_and_add_folded_fold_frame(self, fold_frame_data,
+                                         fold_frame=None,
+                                         **kwargs):
+        """
+
+        Parameters
+        ----------
+        fold_frame_data : string
+            name of the feature to be added
+
+        fold_frame : StructuralFrame, optional
+            the fold frame for the fold if not specified uses last feature added
+
+        kwargs
+
+        Returns
+        -------
+        fold_frame : FoldFrame
+            created fold frame
+        """
+        if self.check_inialisation() == False:
+            return False
+        self.parameters['features'].append(
+            {'feature_type': 'folded_fold_frame', 'feature_name': fold_frame_data, 'fold_frame': fold_frame, **kwargs})
+        if fold_frame is None:
+            logger.info("Using last feature as fold frame")
+            fold_frame = self.features[-1]
+        assert type(fold_frame) == FoldFrame, "Please specify a FoldFrame"
+        fold = FoldEvent(fold_frame,name='Fold_{}'.format(fold_frame_data))
+        fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
+        gy_fold_interpolator = self.get_interpolator("DFI", fold=fold, **kwargs)
+
+        frame_interpolator = self.get_interpolator(**kwargs)
+        interpolators = [fold_interpolator, gy_fold_interpolator,
+                         frame_interpolator.copy()]
+        fold_frame_builder = StructuralFrameBuilder(
+            interpolators=interpolators, name=fold_frame_data, **kwargs)
+        fold_frame_builder.add_data_from_data_frame(
+            self.data[self.data['feature_name'] == fold_frame_data])
+
+        ## add the data to the interpolator for the main foliation
+        fold_frame_builder[0].add_data_to_interpolator(True)
+
+        if "fold_axis" in kwargs:
+            logger.info("Using cylindrical fold axis")
+            fold.fold_axis = kwargs['fold_axis']
+        if "av_fold_axis" in kwargs:
+            logger.info("Using average intersection lineation for \n"
+            "fold axis")
+            _calculate_average_intersection(fold_frame_builder[0], fold_frame,
+                                            fold)
+
+        if fold.fold_axis is None:
+            logger.info("Fitting fold axis rotation angle")
+            far, fad = fold_frame.calculate_fold_axis_rotation(
+                fold_frame_builder[0])
+            fold_axis_rotation = FoldRotationAngle(far, fad)
+            a_wl = kwargs.get("axis_wl", None)
+            if 'axis_function' in kwargs:
+                # allow predefined function to be used
+                fold_axis_rotation.set_function(kwargs['axis_function'])
+            else:
+                fold_axis_rotation.fit_fourier_series(wl=a_wl)
+            fold.fold_axis_rotation = fold_axis_rotation
+        # give option of passing own fold limb rotation function
+        flr, fld = fold_frame.calculate_fold_limb_rotation(
+            fold_frame_builder[0])
+        fold_limb_rotation = FoldRotationAngle(flr, fld)
+        l_wl = kwargs.get("limb_wl", None)
+        if 'limb_function' in kwargs:
+            # allow for predefined functions to be used
+            fold_limb_rotation.set_function(kwargs['limb_function'])
+        else:
+            fold_limb_rotation.fit_fourier_series(wl=l_wl)
+        fold.fold_limb_rotation = fold_limb_rotation
+        # fold_limb_fitter = kwargs.get("fold_limb_function",
+        # _interpolate_fold_limb_rotation_angle)
+        # fold_limb_fitter(series_builder, fold_frame, fold, result, **kwargs)
+        kwargs['fold_weights'] = kwargs.get('fold_weights', {})
+
+        for i in range(3):
+            self._add_faults(fold_frame_builder[i])
+        # build feature
+        kwargs['fold'] = fold
+        self._add_faults(fold_frame_builder[0])
+        self._add_faults(fold_frame_builder[1])
+        self._add_faults(fold_frame_builder[2])
+        fold_frame = fold_frame_builder.build(**kwargs, frame=FoldFrame)
+        fold_frame.type = 'structuralframe'
+        # see if any unconformities are above this feature if so add region
+        # for i in range(3):
+        #     self._add_unconformity_above(fold_frame[i])
+
+        self._add_feature(fold_frame)
+       
+
+        return fold_frame
+
+    def _add_faults(self, feature_builder, features=None):
+        """Adds all existing faults to a geological feature builder 
+        
+        Parameters
+        ----------
+        feature_builder : GeologicalFeatureInterpolator/StructuralFrameBuilder
+            The feature buider to add the faults to
+        features : list, optional
+            A specific list of features rather than all features in the model
+        Returns
+        -------
+
+        """
+        if features is None:
+            features = self.features
+        for f in reversed(features):
+            if f.type == 'fault':
+                feature_builder.add_fault(f)
+            # if f.type == 'unconformity':
+            #     break
+    def _add_domain_fault_above(self, feature):
+        """
+        Looks through the feature list and adds any domain faults to the feature. The domain fault masks everything
+        where the fault scalar field is < 0 as being active when added to feature.
+
+        Parameters
+        ----------
+        feature : GeologicalFeatureInterpolator
+            the feature being added to the model where domain faults should be added
+
+        Returns
+        -------
+
+        """
+        for f in reversed(self.features):
+            if f.name == feature.name:
+                continue
+            if f.type == 'domain_fault':
+                feature.add_region(lambda pos: f.evaluate_value(pos) < 0)
+                break
+
+    def _add_domain_fault_below(self, domain_fault):
+        """
+        Looks through the feature list and adds any the domain_fault to the features that already exist in the stack
+        until an unconformity is reached. domain faults to the feature. The domain fault masks everything
+        where the fault scalar field is < 0 as being active when added to feature.
+
+        Parameters
+        ----------
+        feature : GeologicalFeatureInterpolator
+            the feature being added to the model where domain faults should be added
+
+        Returns
+        -------
+
+        """
+        for f in reversed(self.features):
+            if f.name == domain_fault.name:
+                continue
+            f.add_region(lambda pos: domain_fault.evaluate_value(pos) > 0)
+            if f.type == 'unconformity':
+                break
+
+    def _add_unconformity_above(self, feature):
+        """
+
+        Adds a region to the feature to prevent the value from being
+        interpolated where the unconformities exists above e.g.
+        if there is another feature above and the unconformity is at 0
+        then the features added below (after) will only be visible where the
+        uncomformity is <0
+
+        Parameters
+        ----------
+        feature - GeologicalFeature
+
+        Returns
+        -------
+
+        """
+        for f in reversed(self.features):
+            if f.type == 'unconformity':
+                feature.add_region(lambda pos: f.evaluate(pos))
+                break
+
+    def _add_unconformity_below(self, feature):
+        """
+        Adds a region to the features that represents the
+        unconformity so it is not evaluated below the unconformity
+
+        Parameters
+        ----------
+        feature
+
+        Returns
+        -------
+
+        """
+        for f in self.features:
+            if f.type == 'series' and feature.feature.name != f.name:
+                f.add_region(lambda pos: ~feature.evaluate(pos))
+        # for f in reversed(self.features):
+        #     if f.type == 'unconformity':
+        #         feature.add_region(lambda pos: f.evaluate(pos))
+        #         break
+        # feature.add_region(lambda pos: ~uc.evaluate(pos))
+
+    def create_and_add_unconformity(self, unconformity_surface_data, **kwargs):
+        """
+        Parameters
+        ----------
+        unconformity_surface_data : string
+            name of the unconformity data in the data frame
+
+        Returns
+        -------
+        """
+        if not self.check_initialisation():
+            return False
+        # self.parameters['features'].append({'feature_type':'unconformity','feature_name':unconformity_surface_data,**kwargs})
+        interpolator = self.get_interpolator(**kwargs)
+        unconformity_feature_builder = GeologicalFeatureInterpolator(
+            interpolator, name=unconformity_surface_data)
+        # add data
+        unconformity_data = self.data[
+            self.data['feature_name'] == unconformity_surface_data]
+
+        unconformity_feature_builder.add_data_from_data_frame(
+            unconformity_data)
+        # look through existing features if there is a fault before an
+        # unconformity
+        # then add to the feature, once we get to an unconformity stop
+        self._add_faults(unconformity_feature_builder)
+
+        # build feature
+        # uc_feature_base = unconformity_feature_builder.build(**kwargs)
+        uc_feature_base = unconformity_feature_builder.feature
+        unconformity_feature_builder.build_arguments = kwargs
+        uc_feature_base.type = 'unconformity_base'
+        # uc_feature = UnconformityFeature(uc_feature_base,0)
+        # iterate over existing features and add the unconformity as a
+        # region so the feature is only
+        # evaluated where the unconformity is positive
+        return self.add_unconformity(uc_feature_base, 0)
+
+    def add_unconformity(self, feature, value):
+        """
+        Use an existing feature to add an unconformity to the model.
+
+        Parameters
+        ----------
+        feature : GeologicalFeature
+            existing geological feature
+        value : float
+            scalar value of isosurface that represents
+
+        Returns
+        -------
+        unconformity : GeologicalFeature
+            unconformity feature  
+
+        """
+        self.parameters['features'].append({'feature_type': 'unconformity', 'feature': feature, 'value': value})
+        uc_feature = UnconformityFeature(feature, value)
+
+        # for f in self.features:
+        #     f.add_region(lambda pos: uc_feature.evaluate(pos))
+
+        # see if any unconformities are above this feature if so add region
+        # self._add_unconformity_above(uc_feature)
+        # self._add_unconformity_below(feature)#, uc_feature)
+        self._add_feature(uc_feature)
+
+        
+        return uc_feature
+
+    def add_onlap_unconformity(self, feature, value):
+        """
+        Use an existing feature to add an unconformity to the model.
+
+        Parameters
+        ----------
+        feature : GeologicalFeature
+            existing geological feature
+        value : float
+            scalar value of isosurface that represents
+
+        Returns
+        -------
+        unconformity_feature : GeologicalFeature
+            the created unconformity
+
+        """
+        self.parameters['features'].append({'feature_type': 'onlap', 'feature': feature, 'value': value})
+
+        uc_feature = UnconformityFeature(feature, value)
+
+        # for f in self.features:
+        #     f.add_region(lambda pos: uc_feature.evaluate(pos))
+
+        # see if any unconformities are above this feature if so add region
+        # self._add_unconformity_above(uc_feature)
+        self._add_unconformity_below(uc_feature)  # , uc_feature)
+        self._add_feature(uc_feature)
+
+
+        return uc_feature
+
+    def create_and_add_domain_fault(self, fault_surface_data, **kwargs):
+        """
+        Parameters
+        ----------
+        fault_surface_data : string
+            name of the domain fault data in the data frame
+
+        Returns
+        -------
+        domain_Fault : GeologicalFeature
+            the created domain fault
+
+        """
+        # self.parameters['features'].append({'feature_type':'unconformity','feature_name':unconformity_surface_data,**kwargs})
+        interpolator = self.get_interpolator(**kwargs)
+        domain_fault_feature_builder = GeologicalFeatureInterpolator(
+            interpolator, name=fault_surface_data)
+        # add data
+        unconformity_data = self.data[
+            self.data['feature_name'] == fault_surface_data]
+
+        domain_fault_feature_builder.add_data_from_data_frame(
+            unconformity_data)
+        # look through existing features if there is a fault before an
+        # unconformity
+        # then add to the feature, once we get to an unconformity stop
+        self._add_faults(domain_fault_feature_builder)
+
+        # build feature
+        # domain_fault = domain_fault_feature_builder.build(**kwargs)
+        domain_fault = domain_fault_feature_builder.feature
+        domain_fault_feature_builder.build_arguments = kwargs
+        domain_fault.type = 'domain_fault'
+        self._add_feature(domain_fault)
+        self._add_domain_fault_below(domain_fault)
+
+        domain_fault_uc = UnconformityFeature(domain_fault,0)
+        # iterate over existing features and add the unconformity as a
+        # region so the feature is only
+        # evaluated where the unconformity is positive
+        return domain_fault_uc
+
+    def create_and_add_fault(self, 
+                            fault_surface_data, 
+                            displacement, 
+                            fault_slip_vector=None,
+                            fault_center = None, 
+                            fault_extent = None, 
+                            fault_influence = None, 
+                            fault_vectical_radius = None,
+                            faultfunction=None, 
+                            **kwargs):
+        """
+        Parameters
+        ----------
+        fault_surface_data : string
+            name of the fault surface data in the dataframe
+        displacement : displacement magnitude
+        fault_extent : [type], optional
+            [description], by default None
+        fault_influence : [type], optional
+            [description], by default None
+        fault_vectical_radius : [type], optional
+            [description], by default None
+        kwargs : additional kwargs for Fault and interpolators
+
+        Returns
+        -------
+        fault : FaultSegment
+            created fault
+        """
+        self.parameters['features'].append(
+            {'feature_type': 'fault', 'feature_name': fault_surface_data, 'displacement': displacement, **kwargs})
+        if 'data_region' in kwargs:
+            kwargs.pop('data_region')
+            logger.error("kwarg data_region currently not supported, disabling")
+        displacement_scaled = displacement / self.scale_factor
+        # create fault frame
+        interpolator = self.get_interpolator(**kwargs)
+        fault_frame_builder = FaultBuilder(interpolator,
+                                                     name=fault_surface_data,
+                                                     model=self,
+                                                     **kwargs)
+        # add data
+        fault_frame_data = self.data[ self.data['feature_name'] == fault_surface_data].copy()
+        mask = np.logical_and(fault_frame_data['coord']==0,~np.isnan(fault_frame_data['gz']))
+        fault_normal_vector = fault_frame_data.loc[mask,['gx','gy','gz']].mean(axis=0).to_numpy()
+        mask = np.logical_and(fault_frame_data['coord']==1,~np.isnan(fault_frame_data['gz']))
+        if fault_slip_vector is None:
+            fault_slip_vector = fault_frame_data.loc[mask,['gx','gy','gz']].mean(axis=0).to_numpy()
+        if fault_center is not None:
+            fault_center = self.scale(fault_center,inplace=False)
+        if fault_center is None:
+            # if we haven't defined a fault centre take the center of mass for lines assocaited with
+            # the fault trace
+            mask = np.logical_and(fault_frame_data['coord']==0,fault_frame_data['val']==0)
+            fault_center = fault_frame_data.loc[mask,['X','Y','Z']].mean(axis=0).to_numpy()
+        if fault_influence:
+            fault_influence=fault_influence/self.scale_factor
+        if fault_extent:
+            fault_extent=fault_extent/self.scale_factor
+        if fault_vectical_radius:
+            fault_vectical_radius=fault_vectical_radius/self.scale_factor
+        fault_frame_builder.create_data_from_geometry(fault_frame_data,
+                                                      fault_center,
+                                                      fault_normal_vector,
+                                                      fault_slip_vector,
+                                                      influence_distance=fault_influence,
+                                                      horizontal_radius=fault_extent,
+                                                      vertical_radius=fault_vectical_radius
+                                                      )
+        if fault_influence == None or fault_extent == None or fault_vectical_radius == None:
+            fault_frame_builder.origin = self.bounding_box[0,:]
+            fault_frame_builder.maximum = self.bounding_box[1,:]
+        fault_frame_builder.set_mesh_geometry(kwargs.get('fault_buffer',0.1))
+        # fault_frame_builder.add_data_from_data_frame(fault_frame_data)
+        # check if this fault overprint any existing faults exist in the stack
+        overprinted = kwargs.get('overprints', [])
+        overprinted_faults = []
+        for o in overprinted:
+            try:
+                overprinted_faults.append(self.features[self.feature_name_index[o]])
+            except KeyError:
+                logger.warning("{} could not be added to overprint {} \
+                because it does not exist".format(o,fault_surface_data))
+        self._add_faults(fault_frame_builder[0],overprinted_faults)
+        self._add_faults(fault_frame_builder[1],overprinted_faults)
+        self._add_faults(fault_frame_builder[2],overprinted_faults)
+
+        fault_frame = fault_frame_builder.build(**kwargs)
+        if 'abut' in kwargs:
+            fault_frame[0].add_region(lambda pos: kwargs['abut'].evaluate(pos))
+
+        fault = FaultSegment(fault_frame, displacement=displacement_scaled,
+                             faultfunction=faultfunction,
+                             **kwargs)
+        fault.builder=fault_frame_builder
+        for f in reversed(self.features):
+            if f.type == 'unconformity':
+                fault.add_region(lambda pos: f.evaluate_value(pos) <= 0)
+                break
+        if displacement == 0:
+            fault.type = 'fault_inactive'
+        self._add_feature(fault)
+        
+
+        return fault
+
+    def rescale(self, points, inplace=True):
+        """
+        Convert from model scale to real world scale - in the future this
+        should also do transformations?
+
+        Parameters
+        ----------
+        points : np.array((N,3),dtype=double)
+        inplace : boolean
+            whether to return a modified copy or modify the original array
+
+        Returns
+        -------
+        points : np.array((N,3),dtype=double)
+
+        """
+        if inplace == False:
+            points = points.copy()
+        points *= self.scale_factor
+        points += self.origin
+        return points
+
+    def scale(self, points, inplace=True):
+        """ Take points in UTM coordinates and reproject
+        into scaled model space
+
+        Parameters
+        ----------
+        points : np.array((N,3),dtype=float)
+            points to 
+        inplace : bool, optional default = True
+            whether to copy the points array or update the passed array
+        Returns
+        -------
+        points : np.array((N,3),dtype=double)
+
+        """
+        points = np.array(points).astype(float)
+        if inplace==False:
+            points = points.copy()
+        # if len(points.shape) == 1:
+        #     points = points[None,:]
+        # if len(points.shape) != 2:
+        #     logger.error("cannot scale array of dimensions".format(len(points.shape)))
+        points -= self.origin
+        points /= self.scale_factor
+        return points
+
+
+    def regular_grid(self, nsteps=None, shuffle = True, rescale=False):
+        """
+        Return a regular grid within the model bounding box
+
+        Parameters
+        ----------
+        nsteps : tuple
+            number of cells in x,y,z
+
+        Returns
+        -------
+        xyz : np.array((N,3),dtype=float)
+            locations of points in regular grid
+        """
+        if nsteps is None:
+            nsteps = self.nsteps
+        x = np.linspace(self.bounding_box[0, 0], self.bounding_box[1, 0],
+                        nsteps[0])
+        y = np.linspace(self.bounding_box[0, 1], self.bounding_box[1, 1],
+                        nsteps[1])
+        z = np.linspace(self.bounding_box[1, 2], self.bounding_box[0, 2],
+                        nsteps[2])
+        xx, yy, zz = np.meshgrid(x, y, z, indexing='ij')
+        locs = np.array([xx.flatten(), yy.flatten(), zz.flatten()]).T
+        if shuffle:
+            logger.info("Shuffling points")
+            np.random.shuffle(locs)
+        if rescale:
+            locs = self.rescale(locs)
+        return locs
+
+    def evaluate_model(self, xyz, scale=True):
+        """Evaluate the stratigraphic id at each location
+        
+
+        Parameters
+        ----------
+        xyz : np.array((N,3),dtype=float)
+            locations
+        scale : bool
+            whether to rescale the xyz before evaluating model
+
+        Returns
+        -------
+        stratigraphic_id : np.array(N,dtype=int)
+            the stratigraphic index for locations
+        
+        Examples
+        --------
+        Evaluate on a voxet
+
+        >>> x = np.linspace(model.bounding_box[0, 0], model.bounding_box[1, 0],
+                        nsteps[0])
+        >>> y = np.linspace(model.bounding_box[0, 1], model.bounding_box[1, 1],
+                        nsteps[1])
+        >>> z = np.linspace(model.bounding_box[1, 2], model.bounding_box[0, 2],
+                        nsteps[2])
+        >>> xx, yy, zz = np.meshgrid(x, y, z, indexing='ij')
+        >>> xyz = np.array([xx.flatten(), yy.flatten(), zz.flatten()]).T
+        >>> model.evaluate_model(xyz)
+
+        Evaluate on points defined by regular grid function
+    
+        >>> model.evaluate_model(model.regular_grid())
+
+
+        Evaluate on a map
+        
+        >>> x = np.linspace(self.bounding_box[0, 0], self.bounding_box[1, 0],
+                        nsteps[0])
+        >>> y = np.linspace(self.bounding_box[0, 1], self.bounding_box[1, 1],
+                        nsteps[1])
+        >>> xx, yy = np.meshgrid(x, y, indexing='ij')
+        >>> zz = np.zeros_like(yy)
+        >>> xyz = np.array([xx.flatten(), yy.flatten(), zz.flatten()]).T
+        >>> model.evaluate_model(xyz)
+        
+        """
+        xyz = np.array(xyz)
+        if scale:
+            xyz = self.scale(xyz,inplace=False)
+        strat_id = np.zeros(xyz.shape[0],dtype=int)
+        for group in self.stratigraphic_column.keys():
+            if group == 'faults':
+                continue
+            feature_id = self.feature_name_index.get(group, -1)
+            if feature_id >= 0:
+                feature = self.features[feature_id]
+                vals = feature.evaluate_value(xyz)
+                for series in self.stratigraphic_column[group].values():
+                    strat_id[np.logical_and(vals < series.get('max',feature.max()), vals > series.get('min',feature.min()))] = series['id']
+            if feature_id == -1:
+                logger.error('Model does not contain {}'.format(group))
+        return strat_id
+
+    def evaluate_fault_displacements(self,points,scale=True):
+        """Evaluate the fault displacement magnitude at each location
+        
+
+        Parameters
+        ----------
+        xyz : np.array((N,3),dtype=float)
+            locations
+        scale : bool
+            whether to rescale the xyz before evaluating model
+
+        Returns
+        -------
+        fault_displacement : np.array(N,dtype=float)
+            the fault displacement magnitude
+        """
+        if scale:
+            points = self.scale(points,inplace=False)
+        vals = np.zeros(points.shape[0])
+        for f in self.features:
+            if f.type == 'fault':
+                disp = f.displacementfeature.evaluate_value(points)
+                vals[~np.isnan(disp)] += disp[~np.isnan(disp)]
+        return vals*-self.scale_factor # convert from restoration magnutude to displacement
+
+    def get_feature_by_name(self, feature_name):
+        """Returns a feature from the mode given a name
+
+
+        Parameters
+        ----------
+        feature_name : string
+            the name of the feature
+
+        Returns
+        -------
+        feature : GeologicalFeature
+            the geological feature with the specified name, or none if no feature
+
+        
+
+        """
+        feature_index = self.feature_name_index.get(feature_name,-1)
+        if feature_index > -1:
+            return self.features[feature_index]
+        else:
+            logger.error("{} does not exist!".format(feature_name))
+            return None
+
+    def evaluate_feature_value(self, feature_name, xyz, scale=True):
+        """Evaluate the scalar value of the geological feature given the name at locations
+        xyz
+
+        Parameters
+        ----------
+        feature_name : string
+            name of the feature
+        xyz : np.array((N,3))
+            locations to evaluate
+        scale : bool, optional
+            whether to scale real world points into model scale, by default True
+
+        Returns
+        -------
+        np.array((N))
+            vector of scalar values
+
+        Examples
+        --------
+        Evaluate on a voxet using model boundaries
+
+        >>> x = np.linspace(model.bounding_box[0, 0], model.bounding_box[1, 0],
+                        nsteps[0])
+        >>> y = np.linspace(model.bounding_box[0, 1], model.bounding_box[1, 1],
+                        nsteps[1])
+        >>> z = np.linspace(model.bounding_box[1, 2], model.bounding_box[0, 2],
+                        nsteps[2])
+        >>> xx, yy, zz = np.meshgrid(x, y, z, indexing='ij')
+        >>> xyz = np.array([xx.flatten(), yy.flatten(), zz.flatten()]).T
+        >>> model.evaluate_feature_vaue('feature',xyz,scale=False)
+
+        Evaluate on points in UTM coordinates 
+    
+        >>> model.evaluate_feature_vaue('feature',utm_xyz)
+        
+        """
+        feature  = self.get_feature_by_name(feature_name)
+        if feature:
+            scaled_xyz = xyz
+            if scale:
+                scaled_xyz = self.scale(xyz,inplace=False)
+            return feature.evaluate_value(scaled_xyz)
+        else:
+            return np.zeros(xyz.shape[0])
+
+    def evaluate_feature_gradient(self, feature_name, xyz, scale=True):
+        """Evaluate the gradient of the geological feature at a location
+
+        Parameters
+        ----------
+        feature_name : string
+            name of the geological feature 
+        xyz : np.array((N,3))
+            locations to evaluate
+        scale : bool, optional
+            whether to scale real world points into model scale, by default True
+
+        Returns
+        -------
+        results : np.array((N,3))
+            gradient of the scalar field at the locations specified
+        """
+        feature  = self.get_feature_by_name(feature_name)
+        if feature:
+            scaled_xyz = xyz
+            if scale:
+                scaled_xyz = self.scale(xyz, inplace = False)
+            return feature.evaluate_gradient(scaled_xyz)
+        else:
+            return np.zeros(xyz.shape[0])
+
+    def update(self,verbose=False,progressbar=True):
+        total_dof = 0
+        nfeatures = 0
+        for f in self.features:
+            if f.type=='fault':
+                nfeatures+=3
+                total_dof+=f[0].interpolator.nx*3
+            if f.type == 'series':
+                nfeatures+=1
+                total_dof+=f.interpolator.nx
+        if verbose==True:
+            print('Updating geological model. There are: \n'
+            '{} geological features that need to be interpolated\n'.format(nfeatures)
+            )
+        
+        from tqdm.auto import tqdm
+        import time
+        start = time.time()
+        sizecounter = 0
+        
+        # Load tqdm with size counter instead of file counter
+        with tqdm(total=nfeatures) as pbar:
+            buf=0
+            for f in self.features:
+                pbar.set_description('Interpolating {}'.format(f.name))
+                if f.type == 'fault':
+                    for i in range(3):
+                        buf+=1
+                        f[i].builder.update()
+                        pbar.update()
+                if f.type == 'series':
+                    f.builder.update()
+                    pbar.update()
+
+            
+        if verbose:
+            print("Model update took: {} seconds".format(time.time()-start))
+