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

OTW bug fix

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-01 21:49:43 +01:00
parent 0fdb48694b
commit b2f4ce7ba0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/dataprepnodjango.py
View File

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