Commit aeb273eb authored by Charleux Ludovic's avatar Charleux Ludovic 💬
Browse files

Add Sphinx Napoleon extension and import pyplot in processing module

parent b7011960
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ extensions = [
    "sphinxcontrib.bibtex",
    "matplotlib.sphinxext.plot_directive",
    "sphinx.ext.todo",
    "sphinx.ext.napoleon",
]

templates_path = ["_templates"]
+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ import numpy as np
from scipy.optimize import leastsq
import pandas as pd
from scipy import integrate, optimize
import pyplot as plt


def step_fit(step, out=None):
@@ -214,10 +215,11 @@ def GIAN99(hm, hf, S, C, nu=0.3, E_ind=np.inf, nu_ind=0.1, *args, **kwargs):
    -------
    dict
        Dictionary containing the following outputs:
        - 'dsigma': Plastic displacement.

        - 'dsigma': ...
        - 'Eeq': Equivalent elastic modulus.
        - 'Ac': Contact area.
        - 'k0': Reduced elastic modulus.
        - 'k0': ...
        - 'sy': Yield strength.
        - 'n': Work-hardening exponent.