Merge branch 'master' of github.com:Loop3D/LoopStructural

Author: lachlangrose

LoopStructural/__init__.py

@@ -30,4 +30,4 @@
 #     # temp_file = tempfile.tempdir+Path('/default-loop-structural-logfile.log')
 #     log_to_file(temp_file)
 log_to_console()
-__version__ = '1.0.5-dev'
+__version__ = '1.0.5'

LoopStructural/interpolators/structured_tetra.py

@@ -130,7 +130,7 @@ def evaluate_gradient(self, pos, prop):
         vertices, element_gradients, tetras, inside = self.get_tetra_gradient_for_location(pos)
         vertex_vals = self.properties[prop][tetras]
         #grads = np.zeros(tetras.shape)
-        values[inside,:] = (element_gradients[inside,:,:]*vertex_vals[inside, None, :]).sum(2)
+        values[inside,:] = (element_gradients[inside,:,:]*self.properties[prop][tetras[inside,:]]).sum(2)
         length = np.sum(values[inside,:],axis=1)
         # values[inside,:] /= length[:,None]
         return values

LoopStructural/modelling/fold/fold.py

@@ -61,7 +61,7 @@ def get_fold_axis_orientation(self, points):
 
     def get_deformed_orientation(self, points):
         """
-        Calculate the normal to the folded foliation at locations
+        Calculate the direction vectors of the fold
 
         Parameters
         ----------
@@ -70,6 +70,13 @@ def get_deformed_orientation(self, points):
 
         Returns
         -------
+        fold_direction : np.array
+            a vector parallel to the fold
+        fold axis : np.array
+            the fold axis
+        dgz : np.array
+            the X direction of the finite strain ellipsoid, perpendicular to both
+            fold axis and fold direction
 
         """
         fold_axis = self.get_fold_axis_orientation(points)