diff --git a/wind/__init__.py b/wind/__init__.py index 0992aa2b..bbba04b2 100644 --- a/wind/__init__.py +++ b/wind/__init__.py @@ -157,10 +157,10 @@ class WindfieldAroundTrack(object): :param margin: :type resolution: float - :param resolution: + :param resolution: Grid resolution (in degrees) :type gustFactor: float - :param gustFactor: + :param gustFactor: Conversion from 1-min mean to 0.2-sec gust wind speed. :type gridLimit: :class:`dict` :param gridLimit: the domain where the tracks will be generated. @@ -173,8 +173,8 @@ class WindfieldAroundTrack(object): """ def __init__(self, track, profileType='powell', windFieldType='kepert', - beta=1.5, beta1=1.5, beta2=1.4, thetaMax=70.0, - margin=2.0, resolution=0.05, gustFactor=1.23, + beta=1.3, beta1=1.5, beta2=1.4, thetaMax=70.0, + margin=2.0, resolution=0.05, gustFactor=1.188, gridLimit=None, domain='bounded'): self.track = track self.profileType = profileType @@ -494,7 +494,7 @@ def calculateExtremesFromTrack(self, track, callback=None): margin=self.margin, resolution=self.resolution, gridLimit=self.gridLimit, - gustFactor=0.9009, + gustFactor=0.9355, domain=self.domain) return track, wt.regionalExtremes(self.gridLimit, callback) diff --git a/wind/windmodels.py b/wind/windmodels.py index 9fc667de..dcb1e9b1 100644 --- a/wind/windmodels.py +++ b/wind/windmodels.py @@ -20,6 +20,10 @@ to storm forward motion, and the effects of (uniform) surface roughness. +Wind speeds are assumed to represent a 1-minute mean wind +speed. Conversion to other averaging periods is performed by +application of gust factors in the calling classes. + :Note: Not all models are fully implemented - some cannot be fully implemented, as the mathematical formulation results in discontinuous profiles (e.g. Rankine vortex), for which a @@ -28,7 +32,7 @@ :class:`windmodels.KepertWindFieldModel`. Users should carefully select the combinations of wind profiles and wind fields to ensure sensible results. - + """ import numpy as np