Squashed commit of the following:

commit 4478648
Merge: 1ce8e32 0200b23
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Wed Mar 15 08:41:27 2023 +1100

    Merge pull request #150 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.10

commit 0200b23
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Mar 14 03:09:12 2023 +0000

    chore(master): release 1.5.10

commit 1ce8e32
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Mar 14 13:57:52 2023 +1100

    fix: trying to use bash to recognise anaconda command

commit e53369a
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Mar 14 10:52:25 2023 +1100

    fix: updating tetmesh class for new indexing

commit 0a49817
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Mar 10 17:44:07 2023 +1100

    fix: major change for base grid

    return a single array instead of tuple of arrays. Associated changed to
    other classes to ensure compatibility

commit 438e699
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Mar 10 09:54:01 2023 +1100

    fix: adding 3D fault displacement function

commit c568e72
Merge: fb6fd03 1b2a4f8
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Mon Mar 6 13:14:23 2023 +1100

    Merge pull request #144 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.9

commit 1b2a4f8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Mar 6 00:57:59 2023 +0000

    chore(master): release 1.5.9

commit fb6fd03
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Mon Mar 6 11:44:03 2023 +1100

    Rename plot_fault_network.py to fault_network.py

commit 32637ec
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Sun Mar 5 09:52:15 2023 +1100

    fix: adding geopandas to dockerfile for docs

commit 0971e20
Merge: b36d0eb 26bfaa2
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Thu Mar 2 15:26:34 2023 +1100

    Merge pull request #146 from Loop3D/intrusions

    Intrusions

commit b36d0eb
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Feb 3 12:24:32 2023 +1100

    ci: adding anaconda client

commit 2a915ab
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Mon Jan 30 15:11:32 2023 +1100

    reordering conda in ci

commit 478a401
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Mon Jan 30 11:51:45 2023 +1100

    fix: updating ci action versions

commit a456095
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Mon Jan 30 10:55:33 2023 +1100

    ci: testing publish

commit 74941ab
Merge: a38f60d c8211c9
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 24 14:13:14 2023 +1100

    Merge pull request #143 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.8

commit c8211c9
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jan 24 02:24:46 2023 +0000

    chore(master): release 1.5.8

commit a38f60d
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 24 13:09:50 2023 +1100

    fix: force version bump again

commit dfa1c80
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 24 12:08:35 2023 +1100

    ci: missing requirement for upload

commit 6e584ba
Merge: c63f12f be532af
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 24 11:10:52 2023 +1100

    Merge pull request #142 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.7

commit be532af
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jan 23 23:28:48 2023 +0000

    chore(master): release 1.5.7

commit c63f12f
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 24 10:13:30 2023 +1100

    fix: triggering release

commit e7a2561
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Jan 20 14:17:41 2023 +1100

    ci: making artifact name represent object

commit d930c8b
Merge: b5cb2ad 9005b52
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Jan 20 10:21:16 2023 +1100

    Merge pull request #141 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.6

commit 9005b52
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jan 19 22:15:45 2023 +0000

    chore(master): release 1.5.6

commit b5cb2ad
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Fri Jan 20 08:58:41 2023 +1100

    fix: force bump version

commit 534361a
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Wed Jan 18 09:52:58 2023 +1100

    ci: remove macosx from conda

commit 081bd19
Merge: 0a312e7 2b6c377
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 17 16:26:41 2023 +1100

    Merge pull request #140 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.5

commit 0a312e7
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 17 15:06:30 2023 +1100

    ci: python not pip

commit 2b6c377
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jan 17 04:00:59 2023 +0000

    chore(master): release 1.5.5

commit c0dea0e
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Tue Jan 17 14:48:08 2023 +1100

    ci: setup.py sdist

commit c6ff2e1
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Mon Jan 16 13:35:44 2023 +1100

    fix: adding numpy and cython to sdist

commit 13e0796
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Mon Jan 16 13:10:45 2023 +1100

    fix: fix numpy to 1.21

commit 44d434f
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Mon Jan 16 12:13:22 2023 +1100

    fix: ci formatting

commit 4032b40
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Mon Jan 16 11:53:56 2023 +1100

    ci: fixing conda for py3.10

commit b012202
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Mon Jan 16 10:06:22 2023 +1100

    ci: testing artifacts

commit f518d10
Merge: a4201ac 06140e4
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Thu Jan 12 15:39:46 2023 +1100

    Merge pull request #137 from Loop3D/release-please--branches--master--components--LoopStructural

    chore(master): release 1.5.4 attempting to release python 3.10 versions to conda and pypi

commit a4201ac
Author: Lachlan Grose <lachlan.grose@monash.edu>
Date:   Thu Jan 12 15:38:30 2023 +1100

    ci: adding upload of sdist to pypi

commit 06140e4
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jan 12 04:30:30 2023 +0000

    chore(master): release 1.5.4

commit 283cdfe
Author: Lachlan Grose <lachlan.grose@gmail.com>
Date:   Thu Jan 12 15:18:22 2023 +1100

    fix: fixing bug with fault network example

Author: FernsAlvanevs

LoopStructural/modelling/intrusions/intrusion_builder.py

@@ -320,7 +320,8 @@ def set_conceptual_models_parameters(self):
         grid_points_coord1 = self.evaluation_grid[2]
 
         modelcover, minP, maxP, minL, maxL = self.lateral_extent_model()
-        mean_c0 = self.vertical_extent_model()
+        mean_c0, vertex = self.vertical_extent_model()
+        print(mean_c0, vertex)
 
         if minL == None:
             minL = min(
@@ -365,15 +366,19 @@ def set_conceptual_models_parameters(self):
         else:
             mean_growth = mean_c0
 
-        maxG = self.vertical_contact_data[1]["coord0"].max()
-        coord_PL_for_maxG = (
-            self.vertical_contact_data[1][
+        if vertex == None:
+            maxG = self.vertical_contact_data[1]["coord0"].max()
+            coord_PL_for_maxG = (
+                self.vertical_contact_data[1][
                 self.vertical_contact_data[1].coord0
                 == self.vertical_contact_data[1].coord0.max()
-            ]
-            .loc[:, ["coord1", "coord2"]]
-            .to_numpy()
-        )
+                ]
+                .loc[:, ["coord1", "coord2"]]
+                .to_numpy()
+                )
+            vertex_final = [coord_PL_for_maxG[0][0], coord_PL_for_maxG[0][1], maxG]
+        else:
+            vertex_final = vertex
 
 
         self.conceptual_model_parameters["minP"] = minP
@@ -382,7 +387,7 @@ def set_conceptual_models_parameters(self):
         self.conceptual_model_parameters["maxL"] = maxL
         self.conceptual_model_parameters["model_cover"] = modelcover
         self.conceptual_model_parameters["mean_growth"] = mean_growth
-        self.conceptual_model_parameters["vertex"] =  [coord_PL_for_maxG[0][0], coord_PL_for_maxG[0][1], maxG]
+        self.conceptual_model_parameters["vertex"] =  vertex_final
 
     def set_data_for_lateral_thresholds(self):
         """

LoopStructural/modelling/intrusions/intrusion_frame_builder.py

@@ -509,6 +509,9 @@ def set_marginal_faults_parameters(self):
             elif block == "foot wall":
                 series_values = series_values_temp[faults_values_temp < 0]
 
+            elif block == "hanging and foot wall":
+                series_values = series_values_temp
+
             self.marginal_faults[fault_i]["series_mean"] = np.mean(series_values)
 
             series_std = np.std(series_values)
@@ -906,6 +909,18 @@ def create_constraints_for_c0(self, **kwargs):
                         )
                     ]
 
+                elif block == "hanging and foot wall":
+                    marginalfault_i_constraints_temp = grid_points[
+                        np.logical_and(
+                        If_sum == 0,
+                        np.logical_and(
+                        series_gridpoints_vals >= contact_min,
+                        series_gridpoints_vals <= contact_max,
+                        ),
+                        ),
+                        ]
+
+
                 region = self.marginal_faults[fault_i].get("region", None)
 
                 if region == None:
@@ -941,8 +956,13 @@ def create_constraints_for_c0(self, **kwargs):
         if self.intrusion_steps is None:  
             If_sum = np.zeros(len(grid_points_and_inflation_all)).T #mask for region without faults afecting the intrusion
 
-        If = self.indicator_function_faults(delta=100000) #to consider gradients outside area of faults.
-        If_sum = np.sum(If, axis = 1)    
+        if self.marginal_faults is not None:
+            If = self.indicator_function_faults(delta=1) 
+            If_sum = np.sum(If, axis = 1)
+
+        else:
+            If = self.indicator_function_faults(delta=100000) #to consider gradients outside area of faults.
+            If_sum = np.sum(If, axis = 1)    
 
         grid_points_and_inflation = grid_points_and_inflation_all[If_sum == 0] 
         self.frame_c0_gradients = grid_points_and_inflation