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

all forces now in newton

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-26 11:26:04 +02:00
parent c2264857b5
commit a6cb3d5140
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprepnodjango.py
View File

@@ -16,6 +16,8 @@ import sqlalchemy as sa
from rowsandall_app.settings import DATABASES
from utils import lbstoN
user = DATABASES['default']['USER']
password = DATABASES['default']['PASSWORD']
database_name = DATABASES['default']['NAME']
@@ -595,7 +597,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
drivespeed = drivelength/rowdatadf[' DriveTime (ms)']*1.0e3
drivespeed = drivespeed.fillna(value=0)
driveenergy = drivelength*averageforce*4.44822
driveenergy = drivelength*averageforce*lbstoN
distance = rowdatadf.ix[:,'cum_dist']