elasticipy 2.9.0__tar.gz → 4.0.0__tar.gz

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Elasticipy_vs_pymatgen.py

@@ -1,7 +1,5 @@
-from docutils.utils.math.latex2mathml import layout_styles
-
-from Elasticipy.StressStrainTensors import StrainTensor
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.stress_strain import StrainTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 from matplotlib import pyplot as plt
 import matplotlib as mpl
 mpl.use('Qt5Agg')   # Ensure interactive plot

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Elate_vs_Elasticipy.py

@@ -1,9 +1,9 @@
 import numpy as np
 from elastic import Elastic
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 import matplotlib as mpl
 mpl.use('Qt5Agg')   # Ensure interactive plot
-from Elasticipy.SphericalFunction import sph2cart, _plot3D
+from Elasticipy.spherical_function import sph2cart, _plot3D
 import time
 import matplotlib.pyplot as plt
 

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Example_Stiffness_tensor.py

@@ -1,4 +1,4 @@
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 from scipy.spatial.transform import Rotation
 import matplotlib as mpl
 mpl.use('Qt5Agg')   # Ensure interactive plot

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Example_StressStrain_arrays.py

@@ -2,7 +2,7 @@
 # Imports and simple example of stress
 # ======================================================
 import numpy as np
-from Elasticipy.StressStrainTensors import StressTensor, StrainTensor
+from Elasticipy.tensors.stress_strain import StressTensor, StrainTensor
 
 
 stress = StressTensor([[0, 1, 0],
@@ -23,7 +23,7 @@ print(strain.volumetric_strain())
 # ======================================================
 # Linear elasticity
 # ======================================================
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 
 C = StiffnessTensor.fromCrystalSymmetry(symmetry='cubic', phase_name='ferrite',
                                         C11=274, C12=175, C44=89)

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Example_WaveVelocity.py

@@ -1,7 +1,6 @@
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 import matplotlib as mpl
 mpl.use('Qt5Agg')   # Ensure interactive plot
-from matplotlib import pyplot as plt
 
 C = StiffnessTensor.fromCrystalSymmetry(symmetry='orthorombic', phase_name='forsterite',
                                         C11=320, C12=68.2, C13=71.6,

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/Multiple_phases.py

@@ -1,4 +1,4 @@
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 import numpy as np
 from matplotlib import pyplot as plt
 

elasticipy-4.0.0/Examples/SelfConsistent.py

@@ -0,0 +1,89 @@
+import numpy as np
+from Elasticipy.tensors.fourth_order import FourthOrderTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
+from scipy.integrate import trapezoid
+from scipy.spatial.transform import Rotation
+
+I = FourthOrderTensor.identity()
+
+def gamma(C_macro_local, phi, theta, a1, a2, a3):
+    s1 = np.sin(theta)*np.cos(phi) / a1
+    s2 = np.sin(theta)*np.sin(phi) / a2
+    s3 = np.cos(theta) / a3
+    s = np.array([s1, s2, s3])
+    D = np.einsum('lmnp,pqr,lqr->qrmn', C_macro_local.full_tensor(), s, s)
+    Dinv = np.linalg.inv(D)
+    return np.einsum('qrjk,iqr,lqr->qrijkl', Dinv, s, s) # The symmetrization is made afterward (see below)
+
+def polarization_tensor(C_macro_local, a1, a2, a3, n_phi, n_theta):
+    theta = np.linspace(0, np.pi, n_theta)
+    phi = np.linspace(0, 2 * np.pi, n_phi)
+    phi_grid, theta_grid = np.meshgrid(phi, theta, indexing='ij')
+    g = gamma(C_macro_local, phi_grid, theta_grid, a1, a2, a3)
+    gsin = (g.T*np.sin(theta_grid.T)).T
+    a = trapezoid(gsin, phi, axis=0)
+    b= trapezoid(a, theta, axis=0)/(4*np.pi)
+    return FourthOrderTensor(b, force_minor_symmetry=True) # Symmetrization here (see above)
+
+def localization_tensor(C_macro_local, C_incl, n_phi, n_theta, a1, a2, a3):
+    E = polarization_tensor(C_macro_local, a1, a2, a3, n_phi, n_theta)
+    delta = FourthOrderTensor(C_incl.matrix - C_macro_local.matrix)
+    Ainv = E.ddot(delta) + I
+    return Ainv.inv()
+
+def Kroner_Eshelby(Ci, g, method='strain', max_iter=5, atol=1e-3, rtol=1e-3, display=False, n_phi=100, n_theta=100, particle_size=None):
+    Ci_rotated = (Ci * g)
+    C_macro = Ci_rotated.Hill_average()
+    eigen_stiff = C_macro.eig_stiffnesses
+    keep_on = True
+    k = 0
+    message = 'Maximum number of iterations is reached'
+    m = len(g)
+    A_local = FourthOrderTensor.zeros(m)
+    if particle_size is None:
+        a1 = a2 = a3 = 1
+    else:
+        a1, a2, a3 = particle_size
+    while keep_on:
+        eigen_stiff_old = eigen_stiff
+        C_macro_local = C_macro * (g.inv())
+        for i in range(m):
+            A_local[i] = localization_tensor(C_macro_local[i], Ci, n_phi, n_theta, a1, a2, a3)
+        A = A_local * g
+        Q = Ci_rotated.ddot(A)
+        if method=='stress':
+            CiAi_mean = Q.mean()
+            C_macro = StiffnessTensor.from_Kelvin(CiAi_mean.matrix, force_symmetries=True)
+            err = A.mean() - FourthOrderTensor.identity()
+        else:
+            B = Q.ddot(C_macro.inv())
+            R = Ci_rotated.inv().ddot(B)
+            R_mean = R.mean()
+            C_macro = StiffnessTensor.from_Kelvin(R_mean.inv().matrix, force_symmetries=True)
+            err = B.mean() - FourthOrderTensor.identity()
+
+        # Stopping criteria
+        eigen_stiff = C_macro.eig_stiffnesses
+        abs_change = np.abs(eigen_stiff - eigen_stiff_old)
+        rel_change = np.max(abs_change / eigen_stiff_old)
+        max_abs_change = np.max(abs_change)
+        k += 1
+        if  max_abs_change < atol:
+            keep_on = False
+            message = 'Absolute change is below threshold value'
+        if rel_change < rtol:
+            keep_on = False
+            message = 'Relative change is below threshold value'
+        if k == max_iter:
+            keep_on = False
+        if display:
+            err = np.max(np.abs(err.matrix))
+            print('Iter #{}: abs. change={:0.5f}; rel. change={:0.5f}; error={:0.5f}'.format(k, max_abs_change, rel_change,err))
+    return C_macro, message
+
+Cstrip = StiffnessTensor.transverse_isotropic(Ex= 10.2, Ez=146.8, nu_zx=0.274, nu_yx=0.355, Gxz=7)
+Cstrip = Cstrip * Rotation.from_euler('Y', 90, degrees=True)
+#orientations = Rotation.from_euler('Z', np.linspace(0, 180, 10, endpoint=False), degrees=True)
+orientations = Rotation.random(100, random_state=1234)
+Cstrip = StiffnessTensor.cubic(C11=186, C12=134, C44=77)
+C_stress, reason = Kroner_Eshelby(Cstrip, orientations, display=True, method='strain')

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/essai_plasticity.py

@@ -1,6 +1,6 @@
-from Elasticipy.Plasticity import JohnsonCook
-from Elasticipy.StressStrainTensors import StressTensor, StrainTensor
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.plasticity import JohnsonCook
+from Elasticipy.tensors.stress_strain import StressTensor, StrainTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 import numpy as np
 from matplotlib import pyplot as plt
 import matplotlib as mpl

{elasticipy-2.9.0 → elasticipy-4.0.0}/Examples/example_readwrite.py

@@ -1,4 +1,4 @@
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+from Elasticipy.tensors.elasticity import StiffnessTensor
 
 C = StiffnessTensor.from_MP("mp-1048")
 C.save_to_txt("TiNi.txt")

{elasticipy-2.9.0 → elasticipy-4.0.0}/JOSS/paper.bib

@@ -6,6 +6,7 @@ pages = {314-319},
 year = {2013},
 issn = {0927-0256},
 url = {https://doi.org/10.1016/j.commatsci.2012.10.028},
+doi = {10.1016/j.commatsci.2012.10.028},
 author = {Shyue Ping Ong and William Davidson Richards and Anubhav Jain and Geoffroy Hautier and Michael Kocher and Shreyas Cholia and Dan Gunter and Vincent L. Chevrier and Kristin A. Persson and Gerbrand Ceder},
 keywords = {Materials, Project, Design, Thermodynamics, High-throughput},
 }
@@ -33,7 +34,8 @@ journal = {Journal of Physics: Condensed Matter},
   pages={175--192},
   year={2011},
   publisher={The Geological Society of London London},
-  url={http://dx.doi.org/10.1144/SP360.10}
+  url={http://dx.doi.org/10.1144/SP360.10},
+  doi={10.1144/SP360.10}
 }
 
 @book{nye,
@@ -124,4 +126,4 @@ DOI = {10.5194/se-11-259-2020}
  doi           = {10.1038/s41586-020-2649-2},
  publisher     = {Springer Science and Business Media {LLC}},
  url           = {https://doi.org/10.1038/s41586-020-2649-2}
-}
+}

{elasticipy-2.9.0 → elasticipy-4.0.0}/JOSS/paper.md

@@ -142,7 +142,9 @@ with ease. It already implements thermal expansion.
 \autoref{fig:Young}.a) and b) were rendered with the following syntax:
 
 ````python
-from Elasticipy.FourthOrderTensor import StiffnessTensor
+
+from Elasticipy.tensors.elasticity import StiffnessTensor
+
 C = StiffnessTensor.cubic(C11=186, C12=134, C44=77)
 E = C.Young_modulus
 E.plot3D(n_phi=500, n_theta=500)
@@ -181,10 +183,11 @@ Efforts have been made to provide out-of-the-box simple syntaxes for common oper
 will create a tensor array corresponding to evenly-spaced strain along $[1,0,0]$ axis:
 
 ````python
-from Elasticipy.StressStrainTensors import StrainTensor
-m = 1000                     # length of tensor array
-mag = np.linspace(0, 0.1, m) # Strain magnitude
-strain = StrainTensor.tensile([1,0,0], mag)
+from Elasticipy.tensors.stress_strain import StrainTensor
+
+m = 1000  # length of tensor array
+mag = np.linspace(0, 0.1, m)  # Strain magnitude
+strain = StrainTensor.tensile([1, 0, 0], mag)
 ````
 
 Given the stiffness tensor ``C`` (see above), one can compute the corresponding stress array with:

{elasticipy-2.9.0/src/elasticipy.egg-info → elasticipy-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: elasticipy
-Version: 2.9.0
+Version: 4.0.0
 Summary: A Python library for elasticity tensor computations
 Author-email: Dorian Depriester <dorian.dep@gmail.com>
 License: MIT
@@ -27,8 +27,8 @@ Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pymatgen; extra == "dev"
 Requires-Dist: orix; extra == "dev"
 Requires-Dist: mp_api; extra == "dev"
+Dynamic: license-file
 
-# Elasticipy 
 [![PyPI - Version](https://img.shields.io/pypi/v/Elasticipy?link=https%3A%2F%2Fpypi.org%2Fproject%2FElasticipy%2F)](https://pypi.org/project/elasticipy/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/Elasticipy?link=https%3A%2F%2Fpypi.org%2Fproject%2FElasticipy%2F)](https://pypistats.org/packages/elasticipy)
 [![PyPI - License](https://img.shields.io/pypi/l/Elasticipy)](https://github.com/DorianDepriester/Elasticipy/blob/main/LICENSE)
@@ -36,10 +36,11 @@ Requires-Dist: mp_api; extra == "dev"
 [![DOI](https://zenodo.org/badge/876162900.svg)](https://doi.org/10.5281/zenodo.14501849)
 [![codecov](https://codecov.io/gh/DorianDepriester/Elasticipy/graph/badge.svg?token=VUZPEUPBH1)](https://codecov.io/gh/DorianDepriester/Elasticipy)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/Elasticipy)
+[![status](https://joss.theoj.org/papers/8cce91b782f17f52e9ee30916cd86ad5/status.svg)](https://joss.theoj.org/papers/8cce91b782f17f52e9ee30916cd86ad5)
 
+# ![Elasticipy](docs/source/logo/logo_text.svg)
 
-
-A python toolkit to manipulate strain and strain tensors, and other linear elasticity-related tensors (e.g. stiffness). 
+A python toolkit to manipulate stress and strain tensors, and other linear elasticity-related tensors (e.g. stiffness). 
 This package also provides a collection of easy-to-use and very fast tools to work on stress and strain tensors.
 
 ## Main features

{elasticipy-2.9.0 → elasticipy-4.0.0}/README.md

@@ -1,4 +1,3 @@
-# Elasticipy 
 [![PyPI - Version](https://img.shields.io/pypi/v/Elasticipy?link=https%3A%2F%2Fpypi.org%2Fproject%2FElasticipy%2F)](https://pypi.org/project/elasticipy/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/Elasticipy?link=https%3A%2F%2Fpypi.org%2Fproject%2FElasticipy%2F)](https://pypistats.org/packages/elasticipy)
 [![PyPI - License](https://img.shields.io/pypi/l/Elasticipy)](https://github.com/DorianDepriester/Elasticipy/blob/main/LICENSE)
@@ -6,10 +5,11 @@
 [![DOI](https://zenodo.org/badge/876162900.svg)](https://doi.org/10.5281/zenodo.14501849)
 [![codecov](https://codecov.io/gh/DorianDepriester/Elasticipy/graph/badge.svg?token=VUZPEUPBH1)](https://codecov.io/gh/DorianDepriester/Elasticipy)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/Elasticipy)
+[![status](https://joss.theoj.org/papers/8cce91b782f17f52e9ee30916cd86ad5/status.svg)](https://joss.theoj.org/papers/8cce91b782f17f52e9ee30916cd86ad5)
 
+# ![Elasticipy](docs/source/logo/logo_text.svg)
 
-
-A python toolkit to manipulate strain and strain tensors, and other linear elasticity-related tensors (e.g. stiffness). 
+A python toolkit to manipulate stress and strain tensors, and other linear elasticity-related tensors (e.g. stiffness). 
 This package also provides a collection of easy-to-use and very fast tools to work on stress and strain tensors.
 
 ## Main features

elasticipy-4.0.0/docs/source/Elasticipy.plasticity.rst

@@ -0,0 +1,7 @@
+Elasticipy.plasticity module
+============================
+
+.. automodule:: Elasticipy.plasticity
+   :members:
+   :undoc-members:
+   :show-inheritance:

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Elasticipy.rst

@@ -7,11 +7,13 @@ Submodules
 .. toctree::
    :maxdepth: 4
 
-   Elasticipy.FourthOrderTensor
-   Elasticipy.SecondOrderTensor
-   Elasticipy.SphericalFunction
-   Elasticipy.StressStrainTensors
-   Elasticipy.Plasticity
+   Elasticipy.tensors.fourth_order
+   Elasticipy.tensors.elasticity
+   Elasticipy.tensors.second_order
+   Elasticipy.tensors.stress_strain
+   Elasticipy.spherical_function
+   Elasticipy.plasticity
+
 
 Module contents
 ---------------

elasticipy-4.0.0/docs/source/Elasticipy.spherical_function.rst

@@ -0,0 +1,7 @@
+Elasticipy.spherical_function module
+====================================
+
+.. automodule:: Elasticipy.spherical_function
+   :members:
+   :undoc-members:
+   :show-inheritance:

elasticipy-4.0.0/docs/source/Elasticipy.tensors.elasticity.rst

@@ -0,0 +1,7 @@
+Elasticipy.tensors.elasticity module
+====================================
+
+.. automodule:: Elasticipy.tensors.elasticity
+   :members:
+   :undoc-members:
+   :show-inheritance:

elasticipy-4.0.0/docs/source/Elasticipy.tensors.fourth_order.rst

@@ -0,0 +1,7 @@
+Elasticipy.tensors.fourth_order module
+======================================
+
+.. automodule:: Elasticipy.tensors.fourth_order
+   :members:
+   :undoc-members:
+   :show-inheritance:

elasticipy-4.0.0/docs/source/Elasticipy.tensors.second_order.rst

@@ -0,0 +1,7 @@
+Elasticipy.tensors.second_order module
+======================================
+
+.. automodule:: Elasticipy.tensors.second_order
+   :members:
+   :undoc-members:
+   :show-inheritance:

elasticipy-4.0.0/docs/source/Elasticipy.tensors.stress_strain.rst

@@ -0,0 +1,7 @@
+Elasticipy.tensors.stress_strain module
+=======================================
+
+.. automodule:: Elasticipy.tensors.stress_strain
+   :members:
+   :undoc-members:
+   :show-inheritance:

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Tutorials/Plasticity.rst

@@ -39,17 +39,17 @@ First, let us create the model:
 
 .. doctest::
 
-    >>> from Elasticipy.Plasticity import JohnsonCook
+    >>> from Elasticipy.plasticity import JohnsonCook
     >>> JC = JohnsonCook(A=363, B=792.7122, n=0.5756)
 
 The parameters are taken from [1]_. As we will also take elastic behaviour into account, we also need:
 
-    >>> from Elasticipy.FourthOrderTensor import StiffnessTensor
+    >>> from Elasticipy.tensors.elasticity import StiffnessTensor
     >>> C = StiffnessTensor.isotropic(E=210000, nu=0.27)
 
 Now, let say that we want to investigate the material's response for the tensile stress ranging from 0 to 725 MPa:
 
-    >>> from Elasticipy.StressStrainTensors import StressTensor, StrainTensor
+    >>> from Elasticipy.tensors.stress_strain import StressTensor, StrainTensor
     >>> import numpy as np
     >>> n_step = 100
     >>> stress_mag = np.linspace(0, 725, n_step)
@@ -63,17 +63,44 @@ So now, the plastic strain can be computed using an iterative approach:
 
     >>> plastic_strain = StrainTensor.zeros(n_step)
     >>> for i in range(1, n_step):
-            strain_increment = JC.compute_strain_increment(stress[i])
-            plastic_strain[i] = plastic_strain[i-1] + strain_increment
+    ...       strain_increment = JC.compute_strain_increment(stress[i])
+    ...       plastic_strain[i] = plastic_strain[i-1] + strain_increment
 
 That's all. Finally, let us plot the applied stress as a function of the overall elongation:
 
     >>> from matplotlib import pyplot as plt
     >>> elong = elastic_strain.C[0,0]+plastic_strain.C[0,0]
     >>> fig, ax = plt.subplots()
-    >>> ax.plot(elong, stress_mag, label='Stress-controlled')
-    >>> ax.set_xlabel(r'$\varepsilon_{xx}$')
-    >>> ax.set_ylabel('Tensile stress (MPa)')
+    >>> ax.plot(elong, stress_mag, label='Stress-controlled') # doctest: +SKIP
+    >>> ax.set_xlabel(r'$\varepsilon_{xx}$') # doctest: +SKIP
+    >>> ax.set_ylabel('Tensile stress (MPa)') # doctest: +SKIP
+
+Now, let say that we want to investigate the material's response for the tensile stress ranging from 0 to 725 MPa:
+
+    >>> import numpy as np
+    >>> n_step = 100
+    >>> stress_mag = np.linspace(0, 725, n_step)
+    >>> stress = StressTensor.tensile([1,0,0], stress_mag)
+
+At least, we can directly compute the elastic strain for each step:
+
+    >>> elastic_strain = C.inv() * stress
+
+So now, the plastic strain can be computed using an iterative approach:
+
+    >>> plastic_strain = StrainTensor.zeros(n_step)
+    >>> for i in range(1, n_step):
+    ...       strain_increment = JC.compute_strain_increment(stress[i])
+    ...       plastic_strain[i] = plastic_strain[i-1] + strain_increment
+
+That's all. Finally, let us plot the applied stress as a function of the overall elongation:
+
+    >>> from matplotlib import pyplot as plt
+    >>> elong = elastic_strain.C[0,0]+plastic_strain.C[0,0]
+    >>> fig, ax = plt.subplots()
+    >>> ax.plot(elong, stress_mag, label='Stress-controlled') # doctest: +SKIP
+    >>> ax.set_xlabel(r'$\varepsilon_{xx}$') # doctest: +SKIP
+    >>> ax.set_ylabel('Tensile stress (MPa)') # doctest: +SKIP
 
 .. image:: images/Stress-controlled.png
 
@@ -90,22 +117,22 @@ to add a subroutine (optimization loop) to find the tensile stress so that the a
     >>> plastic_strain = StrainTensor.zeros(n_step)
     >>> JC.reset_strain()
     >>> for i in range(1, n_step):
-            def fun(tensile_stress):
-                trial_stress = StressTensor.tensile([1,0,0], tensile_stress)
-                trial_elastic_strain = C.inv() * trial_stress
-                trial_strain_increment = JC.compute_strain_increment(trial_stress, apply_strain=False)
-                trial_plastic_strain = plastic_strain[i - 1] + trial_strain_increment
-                trial_elongation =  trial_plastic_strain.C[0,0] +  trial_elastic_strain.C[0,0]
-                return (trial_elongation - elong[i])**2
-            s = minimize_scalar(fun)
-            stress.C[0,0][i] = s.x
-            strain_increment = JC.compute_strain_increment(stress[i])
-            plastic_strain[i] = plastic_strain[i-1] + strain_increment
+    ...        def fun(tensile_stress):
+    ...            trial_stress = StressTensor.tensile([1,0,0], tensile_stress)
+    ...            trial_elastic_strain = C.inv() * trial_stress
+    ...            trial_strain_increment = JC.compute_strain_increment(trial_stress, apply_strain=False)
+    ...            trial_plastic_strain = plastic_strain[i - 1] + trial_strain_increment
+    ...            trial_elongation =  trial_plastic_strain.C[0,0] +  trial_elastic_strain.C[0,0]
+    ...            return (trial_elongation - elong[i])**2
+    ...        s = minimize_scalar(fun)
+    ...        stress.C[0,0][i] = s.x
+    ...        strain_increment = JC.compute_strain_increment(stress[i])
+    ...        plastic_strain[i] = plastic_strain[i-1] + strain_increment
 
 Finally, let's plot the corresponding tensile curve ontop of that of the stress-controlled tensile test:
 
-    >>> ax.plot(elong, stress.C[0,0], label='Strain-controlled', linestyle='dotted')
-    >>> ax.legend()
+    >>> ax.plot(elong, stress.C[0,0], label='Strain-controlled', linestyle='dotted') # doctest: +SKIP
+    >>> ax.legend() # doctest: +SKIP
 
 .. image:: images/StressStrain-controlled.png
 
@@ -115,10 +142,10 @@ Incremental loading
 Here, we have only considered monotonic loading, but we can also consider different loading path, such as incremental:
 
     >>> load_path = [np.linspace(0,0.1),
-                     np.linspace(0.1,0.099),
-                     np.linspace(0.099,0.2),
-                     np.linspace(0.2,0.199),
-                     np.linspace(0.199,0.3)]
+    ...              np.linspace(0.1,0.099),
+    ...              np.linspace(0.099,0.2),
+    ...              np.linspace(0.2,0.199),
+    ...              np.linspace(0.199,0.3)]
     >>> elong = np.concatenate(load_path)
     >>> n_step = len(elong)
 
@@ -128,9 +155,9 @@ or cyclic:
 
 
     >>> load_path = [np.linspace(0,0.1),
-                     np.linspace(0.1,-0.2),
-                     np.linspace(-0.2,0.3),
-                     np.linspace(0.3,-0.4)]
+    ...              np.linspace(0.1,-0.2),
+    ...              np.linspace(-0.2,0.3),
+    ...              np.linspace(0.3,-0.4)]
     >>> elong = np.concatenate(load_path)
     >>> n_step = len(elong)
 
@@ -166,15 +193,15 @@ For instance, one can highlight the difference between the J2 and Tresca plastic
     >>> elastic_strain = C.inv() * stress
     >>> fig, ax = plt.subplots()
     >>> for j, model in enumerate(models):
-            plastic_strain = StrainTensor.zeros(n_step)
-            for i in range(1, n_step):
-                strain_increment = model.compute_strain_increment(stress[i])
-                plastic_strain[i] = plastic_strain[i-1] + strain_increment
-            eps_xy = elastic_strain.C[0,1]+plastic_strain.C[0,1]
-            ax.plot(eps_xy, stress_mag, label=labels[j])
-    >>> ax.set_xlabel(r'$\varepsilon_{xy}$')
-    >>> ax.set_ylabel('Shear stress (MPa)')
-    >>> ax.legend()
+        ... plastic_strain = StrainTensor.zeros(n_step)
+        ... for i in range(1, n_step):
+        ...     strain_increment = model.compute_strain_increment(stress[i])
+        ...     plastic_strain[i] = plastic_strain[i-1] + strain_increment
+        ... eps_xy = elastic_strain.C[0,1]+plastic_strain.C[0,1]
+        ... ax.plot(eps_xy, stress_mag, label=labels[j])
+    >>> ax.set_xlabel(r'$\varepsilon_{xy}$') # doctest: +SKIP
+    >>> ax.set_ylabel('Shear stress (MPa)') # doctest: +SKIP
+    >>> ax.legend() # doctest: +SKIP
 
 
 .. image:: images/Shear.png

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Tutorials/Tutorial_AveragingMethods.rst

@@ -17,7 +17,7 @@ As an example, let's consider the stiffness tensor for monoclinic TiNi:
 
 .. doctest::
 
-    >>> from Elasticipy.FourthOrderTensor import StiffnessTensor
+    >>> from Elasticipy.tensors.elasticity import StiffnessTensor
     >>> C = StiffnessTensor.monoclinic(phase_name='TiNi',
     ...                                C11=231, C12=127, C13=104,
     ...                                C22=240, C23=131, C33=175,
@@ -36,7 +36,7 @@ behaviour. In this case, the aforementioned averages can be estimated as follows
     Let's see how ``C_Hill`` looks like:
 
     >>> print(C_Hill)
-    Stiffness tensor (in Voigt notation):
+    Stiffness tensor (in Voigt mapping):
     [[200.92610744 119.59583533 119.59583533   0.           0.
         0.        ]
      [119.59583533 200.92610744 119.59583533   0.           0.

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Tutorials/Tutorial_MultiplePhases.rst

@@ -42,7 +42,7 @@ Let's start by creating the two stiffness tensors in Python:
 
 .. doctest::
 
-    >>> from Elasticipy.FourthOrderTensor import StiffnessTensor
+    >>> from Elasticipy.tensors.elasticity import StiffnessTensor
     >>> C_austenite = StiffnessTensor.cubic(C11=204, C12=137, C44=126)
     >>> C_ferrite = StiffnessTensor.cubic(C11=242, C12=146, C44=116)
 

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Tutorials/Tutorial_ReadWriteFiles.rst

@@ -12,7 +12,7 @@ To save a given stiffness tensor to a plain text file, just use the ``save_to_tx
 
 .. doctest::
 
-    >>> from Elasticipy.FourthOrderTensor import StiffnessTensor
+    >>> from Elasticipy.tensors.elasticity import StiffnessTensor
     >>> C = StiffnessTensor.cubic(C11=186, C12=134, C44=77, phase_name='Cu')
     >>> C.save_to_txt('Stiffness_Cu.txt')
 
@@ -25,13 +25,14 @@ To read entries from an existing text file, just run ``StiffnessTensor.from_txt_
 Using the example above:
 
     >>> StiffnessTensor.from_txt_file('Stiffness_Cu.txt')
-    Stiffness tensor (in Voigt notation) for Cu:
+    Stiffness tensor (in Voigt mapping):
     [[186. 134. 134.   0.   0.   0.]
      [134. 186. 134.   0.   0.   0.]
      [134. 134. 186.   0.   0.   0.]
      [  0.   0.   0.  77.   0.   0.]
      [  0.   0.   0.   0.  77.   0.]
      [  0.   0.   0.   0.   0.  77.]]
+    Phase: Cu
     Symmetry: cubic
 
 

{elasticipy-2.9.0 → elasticipy-4.0.0}/docs/source/Tutorials/Tutorial_StiffnessTensor.rst

@@ -12,7 +12,7 @@ First, create a stiffness tensor with a given symmetry (let say, monoclinic):
 
 .. doctest::
 
-    >>> from Elasticipy.FourthOrderTensor import StiffnessTensor
+    >>> from Elasticipy.tensors.elasticity import StiffnessTensor
     >>> C = StiffnessTensor.monoclinic(phase_name='TiNi',
     ...                                C11=231, C12=127, C13=104,
     ...                                C22=240, C23=131, C33=175,
@@ -55,7 +55,7 @@ deviation of the Young modulus:
 Another way to evidence anisotropy is to use the universal anisotropy factor [1]_:
 
     >>> C.universal_anisotropy
-    5.14100955164141
+    5.1410095516414085
 
 Shear moduli and Poisson ratios
 -------------------------------