From 2cdadae9924116cfb73a4853798bad5ceeb69002 Mon Sep 17 00:00:00 2001 From: "Per.Andreas.Brodtkorb" Date: Tue, 24 May 2011 14:41:50 +0000 Subject: [PATCH] Small bugfixes --- pywafo/src/Wafo.egg-info/SOURCES.txt | 19 ++++++++++++++++-- pywafo/src/wafo/cov2mod.pyd | Bin 129694 -> 129694 bytes pywafo/src/wafo/objects.py | 4 ++-- .../src/wafo/source/mreg/cov2mmpdfreg_intfc.f | 6 +++--- pywafo/src/wafo/source/mreg/intfcmod.f | 12 +++++------ pywafo/src/wafo/spectrum/core.py | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/pywafo/src/Wafo.egg-info/SOURCES.txt b/pywafo/src/Wafo.egg-info/SOURCES.txt index 140c245..ff9e872 100644 --- a/pywafo/src/Wafo.egg-info/SOURCES.txt +++ b/pywafo/src/Wafo.egg-info/SOURCES.txt @@ -14,11 +14,15 @@ src/wafo/SpecData1D.mm src/wafo/__init__.py src/wafo/bitwise.py src/wafo/c_library.pyd +src/wafo/c_library.so +src/wafo/cov2mod.pyd src/wafo/dctpack.py src/wafo/definitions.py src/wafo/definitions.~py src/wafo/demo_sg.py +src/wafo/demos.py src/wafo/gaussian.py +src/wafo/graphutil.py src/wafo/info.py src/wafo/integrate.py src/wafo/interpolate.py @@ -26,13 +30,16 @@ src/wafo/kdetools.py src/wafo/meshgrid.py src/wafo/misc.py src/wafo/mvn.pyd +src/wafo/mvn.so src/wafo/mvnprdmod.pyd +src/wafo/mvnprdmod.so src/wafo/namedtuple.py src/wafo/objects.py src/wafo/plotbackend.py src/wafo/polynomial.py src/wafo/polynomial_old.py src/wafo/rindmod.pyd +src/wafo/rindmod.so src/wafo/sg_filter.py src/wafo/version.py src/wafo/wafodata.py @@ -58,8 +65,6 @@ src/wafo/data/wafoLogoNewWithoutBorder.svg src/wafo/data/wafologoWithBorder.png src/wafo/data/yura87.dat src/wafo/doc/__init__.py -src/wafo/doc/test_pyreport.py -src/wafo/doc/tutorial_scripts/__init__.py src/wafo/doc/tutorial_scripts/chapter1.py src/wafo/doc/tutorial_scripts/chapter2.py src/wafo/doc/tutorial_scripts/chapter3.py @@ -67,8 +72,10 @@ src/wafo/doc/tutorial_scripts/chapter4.py src/wafo/doc/tutorial_scripts/chapter5.py src/wafo/source/c_codes/build_all.py src/wafo/source/c_codes/c_functions.c +src/wafo/source/c_codes/c_library rf3 rf5 license.txt src/wafo/source/c_codes/c_library.pyd src/wafo/source/c_codes/c_library.pyf +src/wafo/source/c_codes/setup.py src/wafo/source/c_codes/old/build_all_.py src/wafo/source/c_codes/old/diffsumfunq.pyd src/wafo/source/c_codes/old/diffsumfunq.pyf @@ -99,6 +106,7 @@ src/wafo/source/mreg/dsvdc.f src/wafo/source/mreg/epsmod.mod src/wafo/source/mreg/expaccmod.mod src/wafo/source/mreg/infcmod.mod +src/wafo/source/mreg/intfcmod.f src/wafo/source/mreg/mregmod.mod src/wafo/source/mreg/mregmodule.f src/wafo/source/mreg/quadrmod.mod @@ -124,6 +132,7 @@ src/wafo/source/mvnprd/mvnprdmod.pyd src/wafo/source/mvnprd/mvnprodcorrprb.f src/wafo/source/mvnprd/mvnprodcorrprb_interface.f src/wafo/source/mvnprd/mvnprodcorrprbmod.mod +src/wafo/source/mvnprd/setup.py src/wafo/source/mvnprd/old/mvnprodcorrprb/adaptivegausskronrod.mod src/wafo/source/mvnprd/old/mvnprodcorrprb/build_all.py src/wafo/source/mvnprd/old/mvnprodcorrprb/erfcoremod.mod @@ -268,17 +277,23 @@ src/wafo/spectrum/__init__.py src/wafo/spectrum/core.py src/wafo/spectrum/dispersion_relation.py src/wafo/spectrum/models.py +src/wafo/spectrum/test/test_dispersion_relation.py +src/wafo/spectrum/test/test_models.py +src/wafo/spectrum/test/test_specdata1d.py src/wafo/stats/__init__.py src/wafo/stats/core.py src/wafo/stats/distributions.py +src/wafo/stats/distributions_juli2010.py src/wafo/stats/estimation.py src/wafo/stats/misc.py +src/wafo/stats/twolumps.py src/wafo/stats/tests/test_distributions.py src/wafo/stats/tests/test_estimation.py src/wafo/test/__init__.py src/wafo/test/test_gaussian.py src/wafo/test/test_kdetools.py src/wafo/test/test_misc.py +src/wafo/test/test_objects.py src/wafo/transform/__init__.py src/wafo/transform/core.py src/wafo/transform/models.py diff --git a/pywafo/src/wafo/cov2mod.pyd b/pywafo/src/wafo/cov2mod.pyd index 2bc06399102e08e647a2707ca49c74cd240898a4..edd44c316ba38748f8824350eb7ff1ef83af5360 100644 GIT binary patch delta 8972 zcmZu$34Bb~_n-SRAtIF^L?R-Xs3ptHo40QhO9&EMQTtBCUJ?|MkOX54;YFW@5K668 zj5KINC?ZPjBpBOI{i4*;)>2jZpF1-lexLvN%)95FbMCq4e$R5>$hzk>*FCS9y_hf; ztyt3CtKc8B;`(Od2B|JU-BFI?JW3#lA53afeKcV+sXg@ZL0wEpSK_V9PE69lr$leS zLxrgB(u+h!wE9pl_d01rx~$@_u}<>H5-it!9RQOJ_ogK#Wfdm}TIU*kN;(?!1W2ru zq4HeDBfpAWZIQ0xK@`$eNs(Jx@jOcX!n-Lk+^FVy8-kXA@!nu$3^q`Icw&-OZ>UH$ zs+YYZqdR+KZLo~>$OK?!Jo14hwZL1$u*9UwbEQA+U)@fPsnIy-Z4A=&0$BuJ(#^Bv zS&TZOMk6A-onuao5w(%Q;jH_kH!&s5u_mY=K|E=!{u%rY@o8gqO-K`>e`EDvNCNUz zYc{qL=^^UM#wUpV!Ro-!9>izC>WY$0 zMP&J__Lc{TQ*|8iAF~9p!cU#w`Z=L;%fj=gP@y@HVz>bvoye+xEDp7_~WStT{9$ocY zschP;#QM+6i`KlU>T+`{eTtv8K>fj-n3fo6O)v!5hP1K{Hu!-RYe$2Ry}(!r>yiz6 z`>J?M1sW>4{-x8|hJ-r3Y>7r&-L6jk#qv_;om;nG9Ed)V3 zR(|JZsndJbl*FWK4?HT~bzyzqNE?~;!hacp%rITIC+1r_77WMUrZlqYZ`%6Y)LY{g zTl+38$qI*UgCV<0vRVO!6UkP9&t)x$gn3Dpp^6(9Zp~6pQ!Ua80$l>XDnZ{+>nfd# zrH3c}z(E7;ap`cv0DA!z!3q8Bs~Tad51bmdh7rw1;E?q)GugRS=m9%a~;OD)IZA??Ao$$1YVx|%1tyos;;0L z1arX4y6(U1HXP8F7YH+ZatN{(#H)wt2A!-$;lQz_2HHBld}ZtN@{Khv+uAp$BlRM&c(U}PyDgRK@0$v#B`hn z_985W@&#BbFy(?J+XYLa(duWYNO%G+r>5KbW?FxI9=jM+a-MgD0Rxfp&6 zhPy$c$)0G#Ozjo%~;5oCfs&iGW8o-CAJ*)|` zBUsi5Bhc4i3$f-!0*Q0rJ{;B_n&y=^6&TjMN042`t#) zwlfbO-qtt3o_x*6THuE#cC2Pg39u*p0_YyLt#Yj&OdxycO?$@>0onB@tXciB(T=l` zT{>Yc@_~u5!|>+`(z! z2~O5z2##c^D0!w*lEL=~i1Bp8Gj*gy1rPck?Od!4(05b6lOk%xVP%*_s7{Fvxdlav z!(L_iJFE*~Kl@aTlnuV6AjZ>ePt}1kg+{5%Thx`|EySkln z&z@JGs0PL0dmhAi(>+hr-U<~w;eWIrdv+b9u2&*z^~K7tDXpGS=#VFmKeX%xoe}SQ z>#-VYG5D5)7*7v8R=Zj#G+j-z1c9HLC8E|4EP_pC^|*x&dHMT?cA~Hy*yX>!tAViw z-#Z}2(<8sD?PICnIUenX9>m*wcAcOukBz7`1}np+acWU4tyDg8TMqW<_Q$%g?-LIn z*C;Nj)4fK#<74?%kU#ibHMSF@7J5`a_NY=GKxP0Rdxb~1zo9THE2gQd+p(y*dahjq z-;5$$3p)R0BUGV%QUJ~`FIPr8^{1S9@v5W!@p_n9cIxH>XXxedwBAY1tax=vhr@N= zu?P5I)~6je_`hQXyHm4f+zgjV*XjX2Zl*mh!LMIsRsdLiFcO-F`fEEfI-m{r~rG=J>z~& zr{2YO=3(}J+}`ZNe8em)_RkE%J?@2nX0DpvNvnZ*$#d24&NEP~s&zKOv$S(8JbmLg z!*h51MtFYGr3E}^c4-UGue*rwywyd3XGqsx@SNB+p(Zxt9Q;ac)~#i5hm2w$G0(kO z4s2$%IXz z1qJ~w_B`E7Xdn>PH@8%xdvo8Xx7 zt@e1w*iX+P*qyF0OB0y$J7Z#aq8_aMiF-$>dnmN z>Swbf{PP{K+f#Vy^TBUHlhrk|oBB_~ys|1@tfO@HXhgi+qsGh~NvL~Z>Bs89x#9l3 z_f%gRu0ELCG{As)@0R|t-_a;FSC6Ktj`?GW+B;pl$_paoQ#-0JT@Cx$vcmB#dDL3Q zA59K-T@r2%c(oR5zcV`Cv3@~0B6e<5XJ?LtBRezWm73eC+q=9Q+k5)&|JrkLz+U;* z>h`wmc8toJOh6yIuxKptXtOFTHU}KuT-~7kTQzlYnEwjQeCNk7b^GEONUt`tjw13m zsSB-U|LL2muWF~Bv^MpR!@PHk>Z>oTQN*u191%;d>WNqD)VIq*L+`GGgw86)X#n2c zfLT>>m#uR!%ex2gQTMi9|jL{!ni~6V= z4mWA6OvW3{!hr%uIha*#L^;Y2w<;jzB(^4{+Ftx;NTYZRN713eL67tK7!yYx9e-c-*%^E^@*TvhYx1L-V})Y~I{ z^MSNINZ(tMu&xIh4rp6kfK8Y2N*mAy(fn=@Sd7%J9E z+Mo!Oul?Qzb%4Rt7UjTjqAhCY9ca_ZrP}(|C|HY#M9tGa#_!>JyP(@ zbwzx*`J-LNFnS?c}c@qD@UY~lT|Gy`_JktN) zlg1!@?@0r!>p`k6(6%_hB&%3Uk3y8?p!=XcVV(mI{lJM$z)gS;_??lt9~g=Hz=-QY@_5q%B=e8$1fN{5uv&67iq(pv(br*H!9qnoylQ4V(!+1} z>?>-Lf97lVHu?f>ehdmC&P^-Kje)Qe71OjMMpS`x+IAC?+UHD9Op3yfj8`>Fyz^lx zY@nNWE#p<~A254fE1QhRtjd%y8@(D+FH!<+AFahyX^QU;`C2OywM02u4-yG}UNf(8i3+h|-3dQ9{R)?P0@zDwCtKt|!;GQ+aqkHoLN6#$$cP zLzMCYB2cV=CExRJD>IG-3>rG*C;JTe-T08O{$%ffY=K!P+ZR4IqZF^kfB*8f64a%7 z2}u=`&b+NG{V6*;8^3AnY_H8@(E>HxYxnmY3isES!6s^5uN&XTqges1pGGGpy=|MA z)HO0O=}Y+Dg>Q6JV$y8*o`7#XkPn6LmckAF!Ew!JAo@kSFc7sTh6{xa2cgFVST@4{ zy%g3Mir#+YGh9ea3WsmukwNG$^!;R%sZYxWD2Ewis0q|r>N>@+7B-Q!vKpJmma^Vl zeJ+@bkl0xf(lqzPHV9^rT49|4I`Vv;yh zOcl3@zlwi~e~S^)2x*FxB5jbI(sL<9?kCTa56aV(FO)2$I8C{u{HD~mG`F;~fG0h5 zIthk3rb1IQk|V9=9J9lG%)FRC#rG2Y#O~rg@wrG#8PWwQT)rrWDC3kDN=M5Dymq)w z7Y;+XahLIpak1%&X*9W)9AKViUSiHRgCJd}^Mm1#01r5I01P*{w4wY~;hvz&cMFZ; zL{Ya}r#lD2{pMoxO6n^0oO#3aV*9f;_ItL7ZNatShH=TuvAzj>=O>A3B|$* z;U>7?FE$XHi><^Mkr79V;c zSN16TmBY#j;<(X2~5@dc|5xWwyXDjPqovar}a}&6YfJ;k0n&fSLwlsbpe;A^BnZM0HI6&`KwzyRtypq&!sKDnXV{EQ2hgEE6m^Znxp2UdGzSdd6nPR>tp)-line zKGQMN1CyCtNZvF*HOtg8>OK`tr_g`XX|0$TCZDOnMzRTPZ`RHlxSre)ZX`E{%i-2? z4((dmGw%1Wrk&~Q5?wUPFIFpQi89ztMj{PSj#T zndVG6Fj;hkBj6;ZW5>GjnF09^Mm+gr~{Qh%SQ_Rgb_lnup4kWER+i8g)+e@ z{70xr191Kjyv5pLLork|h|!`fb`ZOWJ;cw%N#bg8ow!N-R@^I|5YLD&p_N2RU8J5; zKWUk?N;)lFfrj$08bQrhAUH)naUC+Tj>nwrCJ_itmd4 z%!N9*Zk%RXXG+^)+HEQ|-8KDYLZnRQlE=uiq>nkw+|nFnX3Z9JCv!J*FTiGydANDH z`3rLJ%Ck_`7)qYgYu*5QH`l^ilRhn45d=JR3UYUI!3*ryl8>$NROf? z(9`J!^jZ25J(F3$Y-J8HCzxLtXBzV>^NM-P6tMT$hwNbPC|AMx@OAhuP!E1Wun;D& zLQkPTB-IYVMaSNsFgN+?23WkuoWdmp_-&wnCzvm&@fl@>5w>1}eWQPnCw2NDF0= zEZv~6##$x4j z5Z#WRLeHR8I+xC;%jjElLnfTDFrAqm%ur?rbCUUl9m;01x$H)EJ9~gV!d_ypvCFt3 z?ife&YxpDl9sa+3bK!vSE9BNoAwX;`n#6c96ELbRHI#ZtW28xd%RFhJlxCM!N~@(j zX}9#fbVMqV&PwG{h4fhZOL{HUlN-q$_2odaxcQ4gqR)GO*=NF^V-G2M)gq)As& zeL@eQhtXr`R62v+Mem~z(1++_^cngBeV_iF4r1b%1SW}@%FJMPF$K&cXxI(dCTs*t zvGdt=Y-^6<26AarxmjE~++`ZKo!iZghHA~_Yr~DM357zD@Jd)N{ve)&;=3RDel zfNjM_vjf;+>=<@3yMkTA9%PTQr`U3~B^S#jaDBMJoSoD0A<*sO;eCh}E(zsunR|)# z#QxCfE1)1nshzY)vP0>WOHHBlCP3L0%0+OI)lzz-DSeeS$_C{gyahF~ghA24vEeUD z#W486Je{bXR5>vl(*#81pmJf^E-sVZUGt*o*8l*33--7j|&>x#s*3{wsLl zxW?agy>7gQ*9~8|kY)<$!dAf{92L$9w}lGmxUYpusEQEiw`l{!QE(?M5;ZXo+Q~`r zg7{GMm;RQ5;6f7Rj&g5#pgbC)J5ydKZ-zc`PktiThu4m8l@f^GZRNG%YiR;*_qU9; zSS@QT-&k&0bg@V`4i50Kku=K2UdBPj>BiMYhq1_b*I2_8Y-(j1Xqsr6W=b=ylufy& zji#G$cRe<}FujGcs6#d+!^oCoG|7+(*@^5<_9KUqVJ{tceTJ9Cl#_e{adbM;q_`|5nZHOLx zB7ifz&6gVLgaWkA8m!q`=+KZ25x3iFv0tI)^^K9$^(TXVfR^$VfC37+U!n1}E9${% zTqoM@K1QotWFU&8weGoy3Va$}g}|_3!zPVLnyl*?qkWl+nq!TFxoDZ!)EJj{!CJsN zr2(I&4!%ZT(C?JbO6=^&k-j+$sY*CK(#t>ZoBJRq3;0cRj^!r?FMZk;O3!B$uv z*vvL*yYc`f7(>>rf$!($-@tUBn;y6c=ukIZhG~P= zY%@wlk#5$d&A{@|y}tpPa`Vq&T5{9fw*cMIO`qO^vQdIIWGlMr9>#0yx1mWuyF6;Y z9aQ_c>0(R|cGJoZphvsuA2B`AO$$4LPIlA#F+JB!Gv5N8>8AGqtx@@i(a2pu?Zwn? zOc^%-75yDhyD+u$JCvC z2l}P~kxXjepG3{!KQhWsA{vnMFGT|aN0U|Y#tFT;woZ46)aI5V3P)>iDd_uYmrGG9 z4s)MVs1q)twRnV3-8%(|xRfmP`5E~k9RG%=QU5@lr$pRMHOOD5%Otf0r@`VxQrmwT zY9&FdJPjoP31m2f^1-3wXP}+*A+_1Rpeqo@UT4t+Vlb&4I*a;4c!JJ>yE$4S47ijt z&p|StB(=cv;00vS;PWUyQ2*{2!-kERIC09T5#Ub11#sU-GhYDrp|t~ce5MxQTnRg5!lIj=U@s0j4AzguwE+a8n2d@He176C0 zS9g1h1l3mk-CORN3L>`L%~&R7cmd|?HU|Q-F=$F+vMo0y$Uf8HThP(qO#sJE8!C$C zmHU?sjzYS!H8Dt6#YL6evaK=dw?55?K$E)G$IwUst=Ys* z7@Mfeo17uOZmjkX`+{iHSp7aM8WpS8!$uJ4p{ml9C%T5ZQk#;9s1f4Y6`qEO^k6kc z--_rTtoGHnB)SHxY5HiwD_Gs5k3>&gH}oM0olyVVoF{BSYIKW#qrm_XIp z@&{r@fGhrUjv(6AQRlRNNp$sBQzMt7Lu&0d3y7H7AQJA{-zLS2SYFfBs;!@Qz`pr9 zUFo1Z&bX&IYMa$qDvWwVAf02D(Gh2G=o|rdXWuRr6^^7<4$^*bD1i37*OyQJ*{pe< zJ#!MEuP@s(zg8VoEAK>qyHm}f60K9C>?wvIM_em=M?)Ya&)+e~U>|7kbvlg|us^}z z?OYj;p&&!qm=`*oV`^Aw4M(G{rQX-B7na_=edkqvTtNCGFP-kz!|Qh)gY>1|mrFjo ze)m>ksZZ*}#N-Fq1k0{SznEy&IAuVPFMvmeyCN#5|p zFYqSFnUrSlWe9ZIFbjP4cODGEPzt!5v=CU{cFACOmVnP?xliHLxHQMqbbET~q^Tfv zpfm**M`E@kX^VYvsctUNR+M_f(%~~P)9s0SYk;i|D0SFy4qg|nak!Jw{JFZ6X=pV9 z&2}?j$rJF-;S2)IIj|P8XYv4@a67uvO$@sVPU{>=L5_~k-#8MUzq7|>*b`S2*q*+x z3e6jUs)yzs;03l9Ra6|BGB>Flp7>Q@D^^>x^#|DQyU8V0l8Iq*PQ zqr-;%b0qpYy-zxvI4)i0-K|+UUkYNqv8zY0E2vmpiMavk(SX_t1Jbk9KiHN2Rn!F_ zqi*EBQg?F!E#{r_{UC4q7CY!ZMLdXOoHDl4!_{gF-e^6Z_73s{cD{cJ1=Z2ui^m=w z8D-;P0s;Lo(5u!t`7?8Lx&ecS6y`x!frmj3XqE&+pd%>|-1c{74ux~vEpqT{45dJe z9G`?C&{Xyadenv`N_~d*PE0Oc`6gcdg|F8r%U7qno_qamX{H`*E4ASbr7L@=6};YB zQ4@G4F)svoj;RKRVm}@QpsgZc$y*4+SlcAPyu55*!(z9ULvcD*Vv@s&DbBEE_RKOM zUe7K5Z)s*ckl?60rS6h)%nEd-6!_W?`n%<^m}6?7GvT7|ShorvN6c}zl7WqoGwfES zUS~%@ywBL(E$8gm2RVbz*jM_32KzPju(>~asWuSWpm^0H1jDnp(56`|FiUF`zbvU+ z@~JurL=>ANtDI03VV;-E^>Y2*Obm%?kd|W71CgyvNy`;{SBmB+-7oWOI-77PV zNB>Rsy64c|Pt^+0+ye{4sm7;jv_gkIf>x=n`7xG;gKwxalnB2oz{S`Bb-Th46P~EI zm0)7<6ZN%XsMQzq;8gyJ8eySBpFjRoQ3woMe9k>}vL(W=1h^PGre<51#?$^L8;xb* zn9+~bCl*7kp;#Eu*vD$qSUU9We=0Qxd-BsBOT)pB)G@IUe)oZkv3zxPEJMuxkNQ(= zaLWmvEx35cg`f!9=yPX*A;}QMbBT9P$@Upzp2)x2o5A9J=_Dr49 zjtkz1DUginJAPlQPK_f!>-RU7KPY?n1#F$??jK#il3?{*yW~LJ5?)SR`=#FJN;6~C z4((6Z$Hd}uw;q;;UDaE^OfI#>s*OARSoZ_DpD!l;)?s772U2KdEo&X8xmCJ%_w%hJ zHjPWDRlC9#2wEQwf2W>^!<}(8u0!yO+Hl$BI;GRO*Sq6$hj@ z$CK_=KzgP+pp)i@4@7+e!|t9I4rjc2t!sB^#)xhm;2E6|Qo}ig zupf+77gQs7VZuX9a78CL5n7@iO>9b}-cfHPwx~7kPGz!s-Er0Ee$*?p@{G|BA@Vj1 zR}R02p)b@4y;`Z0l4iNAUmo_ZiCK1MtV`)rgy7_WetOVu?AMqeVs5$;25j;}i_|A0 ze?Yme9i!?7p_A(2Z$}V=4ya9Mbe6*oz>!bk!=5kx^z-T{zEaZQva+AD7n@I|=wTvz zJ1Z%`f9wM3;wtI0u8lKBB4WyZwdTy>M8JMf*g|#Aj0m{6ue#Fh>dBeS0<$sg!`2x; zxSq~j>x~|(jya==1-oGD=W64*`oK=Rs&CaFP`l0z4+z1;4||`xrq8{Oh*mq*FVlw; z`8(Xl7NfD9XP@4M3!VyH+R&}tQ3V5=my1GI&+ukhTB&L1Xv`)Qf zk0!?Na{Xoh#al?(P}zuWJ*~SP27}X<`x*>@;|2rwBi0wodfK?x23Oss-2+j%I%q@F zCfAl!mn#CSO76UCeURU|El%Q(8nMiahM{ogMB0?GJj+0TGgS#|+nM_d>rtWYyVA<;S!GpiXf z^OIxxdAR@Eh<|vv|J#VB!2M`MBP{C)PXmA*aUl-)X00Vfqx#y@DAdAotkO~6aF4^w zKd}V5x0<$WEaTC(9$;`u>luysE^(Lv?o=t+`-u|Vsvk{qXVs%50yuN>cY$H<&$<~I zT2VBL^#|&QmlhaRc@zWr zCqkxZ^^B+t8MU`YB(=|n-wdMhW8RyZ1wPrZ70%PmzA^7j?W34HyOl%6tF2;cxPv*1 zp;uFb9CglPsBmhnqeUA09?=rzYa2{R@Lvt&viH!gbNqm|nojf6V!dLo~$-^d089j0G_+cr@6DQ~=j@FMHmNHDQ=ozCaNl^791xBRCBi+cP$oPUYKZ)uooAOwxZK-DowU{jyOK-~% z%VA4_rNW}i)#=K?nHt9B#tp`^##csPlfgupL{kS-H&cemnrYf>I&S*IbbvfT7Lb3D zKGZJi02M*ErxoUFW)hRitYBKR99zi#%$BgfvCrARSYNII7tXO-RsUA6i+)dV?L+DZTA-XOT z&tx*qS!)lr4||r4;d*f?+zjp@m%yj;HhvMmnLozo^EdfM<`k&+9p-!HH;~DiLOmf= z&+S5yc4o~QobVJke4aBN`b;#vMl+Q`<6!* z-5ux*n3563W5zP$OXFK(15=cVhCD7X-8a=GL&-16ugOW|baD=9Co{;EYq54|SV*KzY%%=s-H2{(_!Q zXV81-9QsH4BHe`HnLOqq^Ma|x)@K{DtyvS>k?qPN&d71xcCIc@^S$`~{7OCwdSH}! zjCr1UJ#@iQ^J{Z2VYXlwP6@>jmEVMC!XJW8^bu=|fnr0e*jS7fDNzwSiV0$Gag;b# z{6?HEE)`dbx#Ah|ym(c-AwCvgip``%sh9MPlq$`Z4oSzQ7t(vFsT?6k%aUxDx5*|& zQidz3N}94z(Uc9!e&w(-5n{I$*TqwvPJ+k<8)q6f8BakUc$wCk&X_Knti`5hrdniu zvNbu1JVln1uSp}-iRw-zQA4P&s0q{*>RX7-JZd4ej@k&lv7b6ZkzA7slOmv zF*HpJbO(soKzao2q>s|4=-c!In5G7%4Kth>$2b_3S;y>TUNb@L26iV~#6Dmjv#(em zu8x({b1k`2&Yy3(+6kS6AwsH<1|@Y_FpB*lI$7cY@tBw=UVyli zhaO>D5I3QN*zmxMX~g<477~2Oo7H)Vp)O1r$ajUJzdw$IKw!{ z_}tjnG~1MA+G4tGnnrFS_mBt33s6{(VRp2mvZ%8V9e=t79Z8#L5#rJnDk+KXPmiak z(6i}udNI9<-b#N@?}N(v$x2_PbxaMWHWSDMGtC$Sl$nJ|W;7;?Im(=3&N4c-CabXV z>{skWb~-zsz05vkzvJd}yWomC$6ey?au2z89Kj#rf91>hLFPR3L$jX{08`|yPzS23 znaGPh#eU)>aTi31k`!sWp(cw=)@4^to0SyK$zi%cPBkO!?~0+kA_w}{#dcU?Z*c8%y1 zI*Z;x-=p6^WNI??m{3N~L_jGSnGQ@BrWe!ST~yyObC?B;liA9A&s<|ln7hmarkr`n zyk+XL4Ot62o=stwv8&lE_8MEt2Eo9Vxi~J78_4b8&Tu{Xf&5&4HE+%4x5G{LBY%l6 z<`+Y^o-$Ly8sSIbw(zT<7jwk_6Q4r!)s;S%+De_IxzcUPPY!|-8Uc}+EYF0Y<&ZPv zRq{GHTiz-kmQToq@=x+F@?H6<{7QZYv1+X7m2OH;rH?WcYV2ER(49)La$9+)cv<|c zmUfnSi`8PcY`5%n-&s06(!GO{3o@Eu&J`H{1HD??)WFoj6ls#-)_QO9Asdk#nF!%a zBUh2@p#-;+d&$Fafn6tWlY6ME)Jy75ilr~mf6%zH42;agF$0;^5S?ahBs+y&#b&bm z*(2;p)_R6L4>#L=_7VGpeZf}Xp5z)qOGa@d$8$Zn-rO8+0q5jaaX)Z*+&%6Q_nbp~ zcm8WWg`Wv6dysEsZV%ILlDVlcNO&h8xXRmzf|v$#J`fsmgp@4pkq$!ZA-OZeO@+3* zE&mD^nMs+h%(5zZN}=L!sc(t3bb_YCeRdeUH^SK1%{*d!*_P~Z$YD8ay~@`!w>2l47n<|U6=o5xq1nQGVF}!xS;979w-73RE*izY;s|jv z7?mNe7Bj`2;vSf;=fo?b)lX^wLxXdVjFB*0=Su6OAEg~~f&2hIqrHIq)l!0#aOHEQ zyON~Xl@%~r^OV+>L6+&3bW4V1r{##{f~DM|i$%H=Fx=M|WHcMQ8G9R-!sUAp(uW{@ zpPAxKBTVB>%T0$&g{ESdxM5@qvMt$OCcDC|wFL5*MQ(%p`4D9B4BS=M$Xo7_@``*< z)}ZQA!BjZal8T{NN^y_p-f(5jq_n76XfP2(S zay}kjdL4X4gx429dHxAy7*O&SR>{Pqj7r5$4AoBCkc$XeRH_N`be1%l)U5BDeHkUI=4E- z1(ZD}t5ePbW#8%Qlv_Z#qy4ZDZ6ums)CStoezZ&rScF`tLd(O;cx}1^mYZ6e#jteJ zZsTR2raB=2VSZZt645*Fa3Ro9MYK!o?B2s&W*Y%Ow@Reu`+M-=p ziN>N`nt2sk>XjQ=X?I9{Kllt8S!olb4_*;K32d`UL!D5r)>(r+#W^kwIS`Q%rNyp6 zEgIZ`Ke%z;D&;4De6BWi4MYV5)~-QgYKJrccib-R)X*9fs z)_N<7)`r8c)aXFv#yi#E!JC18tdd@W;rvRt{}zDHSHi^@zJlRdsHBo~Wh;<8@R!>F zzF$c%!f<&d-2I;bzo>-I{}W}Pci4wtDwi?Zh8<`;z;0LC?}RGzrnJ2q5v}E7#NUG` z-vbilL5^W0%!3HK05N!w!x)M3And;Yp(!oxUuY&Fd5Gk0Aa?X1dohyWL1Oj*(#wPF z+JiEPft04~Mc42;csta+bsswDHIQ;=-BT05>c1cDCuUMPbzNv%Lu|>Rv#15c@A_H9 zz!Ff1`UM41)k|SD{P~bhX)_BEO{^fb{e>WZOuJf$X5oDII)^&pZd#AmU8HvZ98{!4 z<@o*^`6FBi!RJxmpe>$WsT{A30(3g?bnbc37)EJ_&qLF^(<;tGFF++3E}(3%a@DBFZEhkgxTn*Lpej=-E$C;kVm+x1{265j9U!aR z7&2toxN#Fl3+J!4H4;Pc# zq^r<@TR!N+4WAg|4$I-Ipdf+DDY=Tm5fs#)*HAw^O?v+Vseow`Qw&Z*21nvGmdsgO m401T>N3MgZkU-)FnhEY&Z-6I34YWfypl?cYn%_jTn*Bfcg-JjF diff --git a/pywafo/src/wafo/objects.py b/pywafo/src/wafo/objects.py index 6a5a36b..73ca5d9 100644 --- a/pywafo/src/wafo/objects.py +++ b/pywafo/src/wafo/objects.py @@ -2516,7 +2516,7 @@ class TransferFunction(object): X_p=self._x_p, x_p=self._x_p, Y_p=self._y_p, y_p=self._y_p, Z_p=self._z_p, z_p=self._z_p) - __call__ = tran + def tran(self, w, theta=0, kw=None): ''' Return transfer functions based on linear wave theory @@ -2572,7 +2572,7 @@ class TransferFunction(object): # Changing igam by 2 should affect the directional result in the same way that changing eta by -eta! Gwt = -Gwt return Hw, Gwt - + __call__ = tran #---Private member methods def _get_ee_cthxy(self, theta, kw): # convert from angle in degrees to radians diff --git a/pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f b/pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f index 83a5192..94b7e8b 100644 --- a/pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f +++ b/pywafo/src/wafo/source/mreg/cov2mmpdfreg_intfc.f @@ -119,7 +119,7 @@ c OBS. we are using the variables R,R1,R2 R3 as a temporary storage C for transformation g of the process. c - CALL INITLEVELS(T,HHT,Nt,NG,NU,Nv) + CALL INITLEVELS(T,HHT,Nt,NU,Nv) C CALL INITLEVELS(Ulev,NU,Vlev,NV,T,HHT,Nt,R1,R2,NG) IF( Tg(1) .gt. Tg(ng)) then print *,'Error Tg must be strictly increasing' @@ -272,10 +272,10 @@ C R contains Cov(X'(T(I1)),X'(T(I2))|X'(0),X''(0),X(0),X(I)) 41 CONTINUE END IF -C Here the covariance of the problem would be innitiated +C Here the covariance of the problem would be initiated INF=0 - Print *,' Laps to go:',N-I+1 + Print *,' Laps to go:',Nt-I+1 DO IV=1,Nv V=VT(IV) ! IF (ABS(V).GT.5.0D0) GO TO 80 diff --git a/pywafo/src/wafo/source/mreg/intfcmod.f b/pywafo/src/wafo/source/mreg/intfcmod.f index c2e3120..bf90003 100644 --- a/pywafo/src/wafo/source/mreg/intfcmod.f +++ b/pywafo/src/wafo/source/mreg/intfcmod.f @@ -3,7 +3,7 @@ PUBLIC :: INITLEVELS, TRANSF, COVG CONTAINS - SUBROUTINE INITLEVELS(T,HT,N,NG,NU,Nv) + SUBROUTINE INITLEVELS(T,HT,N,NU,Nv) USE TBRMOD USE SIZEMOD IMPLICIT NONE @@ -11,16 +11,16 @@ C INTEGER, PARAMETER:: NMAX = 101, RDIM = 10201 C DIMENSION ULEVELS(1),Vlevels(1),T(1),HT(1),TG(1),XG(1),HH(101) REAL*8, DIMENSION(:), intent(in) :: T REAL*8, DIMENSION(:), intent(out) :: HT - INTEGER, intent(in) :: NG +C INTEGER, intent(in) :: NG REAL*8 :: UMIN,UMAX,VMIN,VMAX, HU,HV integer :: N, I, NU, NV C REAL*8, DIMENSION(NMAX) :: HH C COMMON/TBR/HH - IF (NG.GT.501) THEN - PRINT *,'Vector defining transformation of data > 501, stop' - STOP - END IF +C IF (NG.GT.501) THEN +C PRINT *,'Vector defining transformation of data > 501, stop' +C STOP +C END IF IF(N.ge.NMAX) then diff --git a/pywafo/src/wafo/spectrum/core.py b/pywafo/src/wafo/spectrum/core.py index c1b6a1a..38ba7af 100644 --- a/pywafo/src/wafo/spectrum/core.py +++ b/pywafo/src/wafo/spectrum/core.py @@ -646,7 +646,7 @@ class SpecData1D(WafoData): >>> Sj = sm.Jonswap(Hm0=3) >>> w = np.linspace(0,4,256) >>> S1 = Sj.tospecdata(w) #Make spectrum object from numerical values - >>> S = SpecData1D(Sj(w),w) # Alternatively do it manually + >>> S = sm.SpecData1D(Sj(w),w) # Alternatively do it manually See also --------