elasticipy 2.8.9__py3-none-any.whl → 2.9.0__py3-none-any.whl

Elasticipy/Plasticity.py

@@ -1,9 +1,74 @@
 import numpy as np
+from Elasticipy.StressStrainTensors import StrainTensor, StressTensor
 
+class IsotropicHardening:
+    """
+    Template class for isotropic hardening plasticity models
+    """
+    def __init__(self, criterion='von Mises'):
+        """
+        Create an instance of a plastic model, assuming isotropic hardening
+
+        Parameters
+        ----------
+        criterion : str, optional
+            Plasticity criterion to use. Can be 'von Mises', 'Tresca' or 'J2'. J2 is the same as von Mises.
+        """
+        criterion = criterion.lower()
+        if criterion in ('von mises', 'mises', 'vonmises', 'j2'):
+            criterion = 'j2'
+        elif criterion != 'tresca':
+            raise ValueError('The criterion can be "Tresca", "von Mises" or "J2".')
+        self.criterion = criterion.lower()
+        self.plastic_strain = 0.0
 
+    def flow_stress(self, strain, **kwargs):
+        pass
 
-class JohnsonCook:
-    def __init__(self, A, B, n, C=None, eps_dot_ref=1.0, m=None, T0=25, Tm=None):
+    def apply_strain(self, strain, **kwargs):
+        """
+        Apply strain to the current JC model.
+
+        This function updates the internal variable to store hardening state.
+
+        Parameters
+        ----------
+        strain : float or StrainTensor
+        kwargs : dict
+            Keyword arguments passed to flow_stress()
+
+        Returns
+        -------
+        float
+            Associated flow stress (positive)
+
+        See Also
+        --------
+        flow_stress : compute the flow stress, given a cumulative equivalent strain
+        """
+        if isinstance(strain, float):
+            self.plastic_strain += np.abs(strain)
+        elif isinstance(strain, StrainTensor):
+            self.plastic_strain += strain.eq_strain()
+        else:
+            raise ValueError('The applied strain must be float of StrainTensor')
+        return self.flow_stress(self.plastic_strain, **kwargs)
+
+    def compute_strain_increment(self, stress, **kwargs):
+        pass
+
+    def reset_strain(self):
+        self.plastic_strain = 0.0
+
+    def eq_stress(self, stress):
+        if self.criterion == 'j2':
+            return stress.vonMises()
+        else:
+            return stress.Tresca()
+
+
+class JohnsonCook(IsotropicHardening):
+    def __init__(self, A, B, n, C=None, eps_dot_ref=1.0, m=None, T0=25, Tm=None, criterion='von Mises'):
         """
         Constructor for a Jonhson-Cook (JC) model.
 
@@ -28,6 +93,8 @@ class JohnsonCook:
             Reference temperature
         Tm : float, optional
             Melting temperature (at which the flow stress is zero)
+        criterion : str, optional
+            Plasticity criterion to use. It can be 'von Mises' or 'Tresca'.
 
         Notes
         -----
@@ -50,6 +117,7 @@ class JohnsonCook:
                             1                      & \\text{otherwise}
                             \\end{cases}
         """
+        super().__init__(criterion=criterion)
         self.A = A
         self.B = B
         self.C = C
@@ -74,7 +142,7 @@ class JohnsonCook:
             Temperature. If float, the temperature is supposed to be homogeneous for every value of eps_p.
         Returns
         -------
-        numpy.ndarray
+        float or numpy.ndarray
             Flow stress
         """
         eps_p = np.asarray(eps_p)
@@ -97,29 +165,118 @@ class JohnsonCook:
         return stress
 
 
-    def compute_strain(self, stress, T=None):
+
+    def compute_strain_increment(self, stress, T=None, apply_strain=True, criterion='von Mises'):
         """
-        Given the equivalent stress, compute the strain
+        Given the equivalent stress, compute the strain increment with respect to the normality rule.
 
         Parameters
         ----------
-        stress : float or numpy.ndarray
-            Equivalent stress tom compute the stress from
-        T : float or list or tuple or numpy.ndarray
+        stress : float or StressTensor
+            Equivalent stress to compute the stress from, or full stress tensor.
+        T : float
             Temperature
+        apply_strain : bool, optional
+            If true, the JC model will be updated to account for the applied strain (hardening)
+        criterion : str, optional
+            Plasticity criterion to consider to compute the equivalent stress and apply the normality rule.
+            It can be 'von Mises', 'Tresca' or 'J2'. 'J2' is equivalent to 'von Mises'.
 
         Returns
         -------
-        numpy.ndarray
-            Equivalent strain
+        StrainTensor or float
+            Increment of plastic strain. If the input stress is float, only the magnitude of the increment will be
+            returned (float value). If the stress is of type StressTensor, the returned value will be a full
+            StrainTensor.
+
+        See Also
+        --------
+        apply_strain : apply strain to the JC model and updates its hardening value
         """
-        stress = np.asarray(stress)
+        if isinstance(stress, StressTensor):
+            eq_stress = self.eq_stress(stress)
+        else:
+            eq_stress = stress
         if T is None:
-            theta_m=0.0
+            if eq_stress > self.A:
+                k = eq_stress  - self.A
+                total_strain = (1 / self.B * k) ** (1 / self.n)
+                strain_increment = np.max((total_strain - self.plastic_strain, 0))
+            else:
+                strain_increment = 0.0
         else:
             if self.T0 is None or self.Tm is None or self.m is None:
                 raise ValueError('T0, Tm and m must be defined for using a temperature-dependent model')
             else:
-                theta = (T - self.T0) / (self.Tm - self.T0)
-                theta_m = np.clip(theta**self.m, None, 1.0)
-        return (1/self.B * ( stress / (1 - theta_m) - self.A))**(1/self.n)
+                if T >= self.Tm:
+                    strain_increment = np.inf
+                else:
+                    theta = (T - self.T0) / (self.Tm - self.T0)
+                    theta_m = theta**self.m
+                    k = (eq_stress / (1 - theta_m) - self.A)
+                    if k<0:
+                        strain_increment = 0.0
+                    else:
+                        total_strain = (1/self.B * k)**(1/self.n)
+                        strain_increment = np.max((total_strain - self.plastic_strain, 0))
+        if apply_strain:
+            self.apply_strain(strain_increment)
+
+        if isinstance(stress, StressTensor):
+            n = normality_rule(stress, criterion=criterion)
+            return n * strain_increment
+        else:
+            return strain_increment
+
+    def reset_strain(self):
+        """
+        Reinitialize the plastic strain to 0
+        """
+        self.plastic_strain = 0.0
+
+
+def normality_rule(stress, criterion='von Mises'):
+    """
+    Apply the normality rule for plastic flow, given a yield criterion.
+
+    The stress can be a single tensor, or an array of tensors.
+
+    Parameters
+    ----------
+    stress : StressTensor
+        Stress tensor to apply the normality rule from
+    criterion : str, optional
+        Name of the criterion to use. Can be either 'von Mises' or 'Tresca'
+
+    Returns
+    -------
+    StrainTensor
+        If a single stress tensor is passed, the returned array will be of shape
+
+    Notes
+    -----
+    The singular points for the Tresca criterion are treated as the von Mises criterion, which is equivalent to the
+    average of the two adjacent normals of the domain.
+    """
+    if criterion.lower()=='von mises':
+        eq_stress = stress.vonMises()
+        dev_stress= stress.deviatoric_part()
+        gradient_tensor = dev_stress / eq_stress
+        return StrainTensor(3/2 * gradient_tensor.matrix)
+    elif criterion.lower()=='tresca':
+        vals, dirs = stress.eig()
+        u1 = dirs[...,0]
+        u3 = dirs[...,2]
+        s1 = vals[...,0]
+        s2 = vals[..., 1]
+        s3 = vals[...,2]
+        A = np.einsum('...i,...j->...ij',u1, u1)
+        B = np.einsum('...i,...j->...ij',u3, u3)
+        normal = A - B
+        singular_points = np.logical_or(s2==s1, s2==s3)
+        normal[singular_points] = normality_rule(stress[singular_points], criterion='von Mises').matrix
+        normal[np.logical_and(s2==s1, s2==s3)] = 0.0
+        strain = StrainTensor(normal)
+        return strain / strain.eq_strain()
+    else:
+        raise NotImplementedError('The normality rule is only implemented for von Mises (J2) and Tresca criteria.')

Elasticipy/SecondOrderTensor.py

@@ -290,7 +290,7 @@ class SecondOrderTensor:
     @property
     def J2(self):
         """
-        Second invariant of the deviatoric part of the stress tensor.
+        Second invariant of the deviatoric part of the tensor.
 
         Returns
         -------
@@ -302,7 +302,7 @@ class SecondOrderTensor:
     @property
     def J3(self):
         """
-        Third invariant of the deviatoric part of the stress tensor.
+        Third invariant of the deviatoric part of the tensor.
 
         Returns
         -------
@@ -311,6 +311,48 @@ class SecondOrderTensor:
         """
         return self.deviatoric_part().I3
 
+    def Lode_angle(self, degrees=False):
+        """
+        Computes the Lode angle of the tensor.
+
+        The returned value is defined from the positive cosine (see Notes).
+
+        Parameters
+        ----------
+        degrees : bool, optional
+            Whether to return the angle in degrees or not
+
+        Returns
+        -------
+        float or numpy.ndarray
+
+        See Also
+        --------
+        J2 : Second invariant of the deviatoric part
+        J3 : Third invariant of the deviatoric part
+
+        Notes
+        -----
+        The Lode angle is defined such that:
+
+        .. math::
+
+            \\cos(3\\theta)= \\frac{J_3}{2}\\left(\\frac{3}{J_2}\\right)^{3/2}
+        """
+        J2 = np.atleast_1d(self.J2)
+        J3 = np.atleast_1d(self.J3)
+        non_hydro =  J2 !=0.
+        cosine = np.ones(shape=J3.shape) * np.nan
+        cosine[non_hydro] = J3[non_hydro] / 2 * (3 / J2[non_hydro] )**(3 / 2)
+        if degrees:
+            theta = np.arccos(cosine) * 60 / np.pi
+        else:
+            theta = np.arccos(cosine) / 3
+        if self.shape:
+            return theta
+        else:
+            return theta[0]
+
     def trace(self):
         """
         Return the traces of the tensor array
@@ -377,6 +419,18 @@ class SecondOrderTensor:
         else:
             raise NotImplementedError('Left multiplication is only implemented for scalar values.')
 
+    def __truediv__(self, other):
+        new_mat = np.zeros(self.matrix.shape)
+        non_zero = np.any(self.matrix, axis=(-1, -2))
+        if isinstance(other, (float, int)):
+            new_mat[non_zero] = self.matrix[non_zero] / other # Hack to force 0/0 = 0
+        elif isinstance(other, np.ndarray) and (self.shape == other.shape):
+            new_mat[non_zero] = np.einsum('pij,p->pij', self.matrix[non_zero], 1/other[non_zero])
+            return self.__class__(new_mat)
+        else:
+            raise NotImplementedError('Tensors can only be divided by scalar values or by arrays of the same shape.')
+        return self.__class__(new_mat)
+
     def __eq__(self, other) -> np.ndarray:
         """
         Check whether the tensors in the tensor array are equal
@@ -719,7 +773,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        SkewSymmetricSecondOrderTensor
             Skew-symmetric tensor
         """
         new_mat = 0.5 * (self.matrix - self._transposeTensor())
@@ -731,7 +785,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        self
             Spherical part
 
         See Also
@@ -748,7 +802,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        self
 
         See Also
         --------
@@ -769,7 +823,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        cls
             Array of identity tensors
 
         See Also
@@ -798,7 +852,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        cls
             Array of ones tensors
 
         See Also
@@ -826,7 +880,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        cls
             Array of ones tensors
 
         See Also
@@ -855,7 +909,7 @@ class SecondOrderTensor:
             will be of the same shape as magnitude.
         Returns
         -------
-        SecondOrderTensor
+        cls
             tensor or tensor array
         """
         mat = _tensor_from_direction_magnitude(u, u, magnitude)
@@ -875,7 +929,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        cls
             Tensor or tensor array of uniform random value
 
         See Also
@@ -930,7 +984,7 @@ class SecondOrderTensor:
 
         Returns
         -------
-        SecondOrderTensor
+        cls
             Tensor or tensor array of normal random value
         """
         if shape is None:
@@ -964,7 +1018,7 @@ class SecondOrderTensor:
             will be of the same shape as magnitude.
         Returns
         -------
-        SecondOrderTensor
+        cls
             tensor or tensor array
         """
         if np.abs(np.dot(u, v)) > 1e-5:
@@ -1281,10 +1335,39 @@ class SymmetricSecondOrderTensor(SecondOrderTensor):
             raise ValueError("array must be of shape (6,) or (...,6) with Voigt vector")
 
     def eig(self):
-        return np.linalg.eigh(self.matrix)
+        """
+        Compute the principal values (eigenvaleues) and principal direction (eigenvectors) of the tensor, sorted in
+        descending order of principal values
+
+        Returns
+        -------
+        numpy.ndarray
+            Principal values
+        numpy.ndarray
+            Principal directions
+
+        See Also
+        --------
+        eigvals : compute the principal values only
+        """
+        eigvals, eigdir = np.linalg.eigh(self.matrix)
+        return np.flip(eigvals,axis=-1), np.flip(eigdir,axis=-1)
 
     def eigvals(self):
-        return np.linalg.eigvalsh(self.matrix)
+        """
+        Compute the principal values (eigenvalues), sorted in descending order.
+
+        Returns
+        -------
+        numpy.ndarray
+            Principal values
+
+        See Also
+        --------
+        eig : return the principal values and principal directions
+        """
+        eigvals = np.linalg.eigvalsh(self.matrix)
+        return np.flip(eigvals,axis=-1)
 
 
 class SkewSymmetricSecondOrderTensor(SecondOrderTensor):
@@ -1352,7 +1435,8 @@ def rotation_to_matrix(rotation, return_transpose=False):
     if isinstance(rotation, Rotation):
         matrix = rotation.as_matrix()
     elif is_orix_rotation(rotation):
-        matrix = rotation.to_matrix()
+        inv_rotation = ~rotation
+        matrix = inv_rotation.to_matrix()
     else:
         raise TypeError('The input argument must be of class scipy.transform.Rotation or '
                         'orix.quaternion.rotation.Rotation')

Elasticipy/StressStrainTensors.py

@@ -29,13 +29,14 @@ class StrainTensor(SymmetricSecondOrderTensor):
 
         Returns
         -------
-        np.array or float
+        numpy.ndarray or float
             Volumetric change
         """
         return self.I1
 
     def eq_strain(self):
-        return np.sqrt(3/2 * self.J2)
+        """von Mises equivalent strain"""
+        return np.sqrt(2/3 * self.ddot(self))
 
     def elastic_energy(self, stress):
         """
@@ -101,7 +102,7 @@ class StressTensor(SymmetricSecondOrderTensor):
         vonMises : von Mises equivalent stress
         """
         ps = self.principal_stresses()
-        return ps[...,-1] - ps[...,0]
+        return ps[...,0] - ps[...,-1]
 
     def hydrostaticPressure(self):
         """

{elasticipy-2.8.9.dist-info → elasticipy-2.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: elasticipy
-Version: 2.8.9
+Version: 2.9.0
 Summary: A Python library for elasticity tensor computations
 Author-email: Dorian Depriester <dorian.dep@gmail.com>
 License: MIT

{elasticipy-2.8.9.dist-info → elasticipy-2.9.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 Elasticipy/CrystalSymmetries.py,sha256=DAX-XPgYqI2nFvf6anCVvZ5fLM0CNSDJ7r2h15l3Hoc,3958
 Elasticipy/FourthOrderTensor.py,sha256=LuqLxcWeonumxgVCjTIvcIjCkAqMK4ZNBlpGLvXGPeA,54105
-Elasticipy/Plasticity.py,sha256=V-jSEf1lKhxKh4yeQs9msZThdT-m_O9KPKVreLk4AvY,4299
+Elasticipy/Plasticity.py,sha256=K6ml5Lfezt-9F2PJvuAUdxsQksZV3bkWYj9GdVTt9gw,10189
 Elasticipy/PoleFigure.py,sha256=G3Sz7ssX2KKY96g3XEvcaOYFmEat9JUCdb2A91XbA6w,3531
-Elasticipy/SecondOrderTensor.py,sha256=fT7WuHYmme5M9lc6rXn8yd81-1SBQ1RKXv2hhkjjG84,43760
+Elasticipy/SecondOrderTensor.py,sha256=0dTZZ6rw9E9ctnyto6cuRajsXk2LmxCcJUOB2YO-u-E,46288
 Elasticipy/SphericalFunction.py,sha256=X6hrjwCiZkLjiUQ8WO2W4vLNOlbQ4jLWsloOg33IlL4,41244
-Elasticipy/StressStrainTensors.py,sha256=nZO6kEePOApdt6Y5anGl47RUhrDkHYtX50jtfKmB0jc,2926
+Elasticipy/StressStrainTensors.py,sha256=WdElPvSl3kpPVF3MNfbQsHtkmm0edqi4Tb2DoE9dD7k,2981
 Elasticipy/ThermalExpansion.py,sha256=nfPTXuqI4fJe14YLzYn8zfSjpYaep8URRYawj8xzjfo,6012
 Elasticipy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Elasticipy/gui.py,sha256=zyVnvp6IIi3FDR5hWfIJrOP28Y7XkP4wc71XXMyGpeo,11247
-elasticipy-2.8.9.dist-info/LICENSE,sha256=qNthTMSjVkIDM1_BREgVFQHdn1wVNQi9pwWVfTIazMA,1074
-elasticipy-2.8.9.dist-info/METADATA,sha256=dK2QBLG5AhGDCfUUCad7p_-t5m4XAncRxwlYyOCqbGs,3810
-elasticipy-2.8.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-elasticipy-2.8.9.dist-info/top_level.txt,sha256=k4zSQzJR5P4vzlHlhWUaxNgvgloq4KIp8oca2X8gQOw,11
-elasticipy-2.8.9.dist-info/RECORD,,
+elasticipy-2.9.0.dist-info/LICENSE,sha256=qNthTMSjVkIDM1_BREgVFQHdn1wVNQi9pwWVfTIazMA,1074
+elasticipy-2.9.0.dist-info/METADATA,sha256=ydDKE8dp7qNcCiQhduU_HIrgIrgWE5YF3_1F7fpx6L0,3810
+elasticipy-2.9.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+elasticipy-2.9.0.dist-info/top_level.txt,sha256=k4zSQzJR5P4vzlHlhWUaxNgvgloq4KIp8oca2X8gQOw,11
+elasticipy-2.9.0.dist-info/RECORD,,