From 3d61983ed25f82a96f95e63f2b22463b46ba34f2 Mon Sep 17 00:00:00 2001 From: "Per.Andreas.Brodtkorb" Date: Wed, 25 May 2011 15:22:29 +0000 Subject: [PATCH] Fixed bugs in cov2mmpdfreg_intfc.f --- pywafo/src/wafo/cov2mod.pyd | Bin 129694 -> 131230 bytes .../src/wafo/source/mreg/cov2mmpdfreg_intfc.f | 42 ++++++------ pywafo/src/wafo/source/mreg/intfcmod.f | 61 ++++++++++-------- pywafo/src/wafo/spectrum/core.py | 48 +++++++------- 4 files changed, 81 insertions(+), 70 deletions(-) diff --git a/pywafo/src/wafo/cov2mod.pyd b/pywafo/src/wafo/cov2mod.pyd index edd44c316ba38748f8824350eb7ff1ef83af5360..d65754fb0b08f96514ceb9776a82906b8ea00600 100644 GIT binary patch delta 16778 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%0AEWH@mvtkg1NGduK7Jf0Lu$` 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 C1f=T# delta 15217 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 import numpy as np + >>> import wafo.spectrum.models as sm + >>> Sj = sm.Jonswap(Hm0=3) + >>> w = np.linspace(0,4,256) + >>> S1 = Sj.tospecdata(w) #Make spectrum object from numerical values + >>> S = sm.SpecData1D(Sj(w),w) # Alternatively do it manually + S.to_mm_pdf() ''' S = self.copy() @@ -1177,7 +1184,7 @@ class SpecData1D(WafoData): unused_t0, tn, Nt = paramt - t = linspace(0, tn/A, Nt) # normalized times + t = linspace(0, tn/A, Nt) # normalized times #Transform amplitudes to Gaussian levels: h = linspace(*paramu); @@ -1197,29 +1204,8 @@ class SpecData1D(WafoData): dh = h[1]-h[0] uvdens *= dh*dh - -# if (defnr==0) -# f.f =fliplr(mctp2rfc(fliplr(ftmp)));%* sqrt(-R(1,6)/R(1,4))/2/pi; -# f.title ='Joint density of maximum and rainflow minimum'; -# f.labx{1}='max [m]'; -# f.labx{2}='rainflow min [m]'; -# elseif (defnr==-1) -# %CC= normalizing constant= 1/ expected number of u-up-crossings of X -# %CC = 2*pi*sqrt(L0/L2)*exp(0.5D0*u*u/L0); -# % CC = normalizing constant = 1/ expected number of zero-up-crossings of X' -# %CC = 2*pi*sqrt(L2/L4); -# fact = sqrt(L0/L4); -# -# f.f = fliplr(mctp2tc(fliplr(ftmp*fact),utc,paramu)); -# index1 = find(f.x{1}>0); -# index2 = find(f.x{2}<0); -# f.f = flipud(f.f(index2,index1)); -# f.x{1} = f.x{1}(index1); -# f.x{2} = abs(flipud(f.x{2}(index2))); -# f.title ='Joint density of crest and trough'; -# f.labx{1}='Crest [m]'; -# f.labx{2}='Trough [m]'; -# else %(defnr==1) + uvdens = np.rot90(uvdens,-2) + mmpdf = WafoData(uvdens,args=(h,h), title='Joint density of maximum and minimum', xlab='max [m]',ylab='min [m]') return mmpdf @@ -3287,9 +3273,19 @@ def main(): pylab.close('all') print('done') +def test_mm_pdf(): + import numpy as np + import wafo.spectrum.models as sm + Sj = sm.Jonswap(Hm0=7, Tp=11) + w = np.linspace(0,4,256) + S1 = Sj.tospecdata(w) #Make spectrum object from numerical values + S = sm.SpecData1D(Sj(w),w) # Alternatively do it manually + mm = S.to_mm_pdf() + if __name__ == '__main__': - if True: #False : # + if False : #True: # import doctest doctest.testmod() else: - main() + test_mm_pdf() + #main()