Small bugfixes

master
Per.Andreas.Brodtkorb 14 years ago
parent 65c5f22b7b
commit 2cdadae992

@ -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

Binary file not shown.

@ -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

@ -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

@ -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

@ -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
--------

Loading…
Cancel
Save