sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/bugfixx'

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-01 22:13:24 +01:00
parent 9b2a980ebc 7c40ad3df1
commit 2c3212bbc3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprepnodjango.py
View File

@@ -359,12 +359,12 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
except KeyError:
equivergpower = 0*p+50.
nowindpace = nowindpace.apply(lambda x: timedeltaconv(x))
nowindpace2 = nowindpace.apply(lambda x: timedeltaconv(x))
ergvelo = (equivergpower/2.8)**(1./3.)
ergpace = 500./ergvelo
ergpace[ergpace == np.inf] = 240.
ergpace = ergpace.apply(lambda x: timedeltaconv(x))
ergpace2 = ergpace.apply(lambda x: timedeltaconv(x))
data['ergpace'] = ergpace*1e3
data['nowindpace'] = nowindpace*1e3