Merge branch 'master' of https://github.com/wafo-project/pywafo.git

Conflicts: wafo/spectrum/core.py
9 years ago · 8ba9e7e1a2
parent 55d0930a4e 89b37b64dd
commit 8ba9e7e1a2
2 changed files with 613 additions and 609 deletions
--- a/wafo/spectrum/core.py
+++ b/wafo/spectrum/core.py
@ -1429,6 +1429,10 @@ class SpecData1D(PlotData):
        >>> f = S.to_t_pdf(pdef='Tc', paramt=(0, 10, 51), speed=7)
        >>> S = sm.Jonswap(4*pi/Tp, Hm0=7, Tp=11)
        >>> Hm0 = 7
        >>> Tp = 11
        >>> S = sm.Jonswap(4*pi/Tp,[Hm0, Tp])
        Sk = spec2spec(S,'k1d')
        L0 = spec2mom(S,1)
        paramu = [sqrt(L0)*[-4 4] 41]
--- a/wafo/stats/_distn_infrastructure.py
+++ b/wafo/stats/_distn_infrastructure.py