Skip to content

Commit

Permalink
Merge branch 'fastsim-2' into f2/feature/log-level-input-checking
Browse files Browse the repository at this point in the history
  • Loading branch information
calbaker committed May 14, 2024
2 parents e8ea78c + cecb74e commit 4b0431d
Show file tree
Hide file tree
Showing 13 changed files with 2,201 additions and 103 deletions.
3 changes: 3 additions & 0 deletions python/fastsim/resources/FASTSim_py_veh_db.csv
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@ selection,Scenario name,veh_year,veh_pt_type,drag_coef,frontal_area_m2,glider_kg
62,2022 Renault Megane E-Tech,2022,BEV,0.305,2.21,0,0.53,0.61,2.685,0,1706,0,1.1,0,0,0,,SI,6.1,0,0,,164.05397184,4.8,FALSE,0.833,21.6,1000,60,8.9,75,0.97,110.8,-0.6811,0.815,4,0.0101,0.37225,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,1,0.86,0.25,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,7.5,,,,,30.3,0,
63,2022 Toyota RAV4 Hybrid LE,2022,HEV,0.3701779179094492,2.6822,0,-0.53,0.61,2.68986,0,1814.369,1000,1.1,488.65,0,131.2431775,,Atkinson,6.1,0,0,,128,4.8,TRUE,0,0,1000,1.6,0,0,0.97,110.8,-0.6811,0.815,4,0.006827953261826666,0.36215,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,0.9,0.86,0.5,FALSE,114.9,0.97,1.4,0.005,0.98,,,,,,,,,,,,,,,,,,,30.3,0,
64,2024 Volkswagen Polo 1.0 MPI,2024,Conv,0.306,2.318,0,0.53,0.61,2.552,0,1202,2000,1.1,436.23,0,59,,SI,6.1,0,0,,0,4.8,FALSE,0,0,0,0,0,0,1,110.8,-0.6811,0.815,4,0.015,0.31075,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,1,0.86,0.8,FALSE,114.9,0.95,1.4,0.005,0.98,,,,,,,,,,,,,,13.8,,,,,30.3,0,
65,2024 BYD Dolphin Active,2024,BEV,0.301,2.50101,0,0.53,0.61,2.7,0,1405,0,1.1,0,0,0,,SI,6.1,0,0,,70,4.8,FALSE,0.833,21.6,1000,44.9,8.9,75,0.97,110.8,-0.6811,0.815,4,0.009,0.3202,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,1,0.86,0.2,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,13.8,,,,,30.3,0,
66,2024 VinFast VF e34,2024,BEV,0.32,2.424,0,0.58,0.61,2.6108,0,1606,0,1.1,0,0,0,,SI,6.1,0,0,,110,4.8,FALSE,0.833,21.6,1000,41.9,8.9,75,0.97,110.8,-0.6811,0.815,4,0.0101,0.32535,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,1,0.86,0.25,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,,,,,,30.3,0,
67,2024 Toyota Vios 1.5 G,2024,Conv,0.28,2.1689875,0,0.53,0.61,2.620,0,1105,2000,1.1,353.356487,0,78.6984,,SI,6.1,0,0,,0,4.8,FALSE,0,0,0,0,0,0,1,110.8,-0.6811,0.815,4,0.0101,0.3007,0.8,0,1,0.3,0.3,60.3,0.2,0.8,55.8,100.8,1,0.86,0.7,FALSE,114.9,0.95,1.4,0.005,0.98,,,,,,,,,,,,,,,,,,,30.3,0,
Loading

0 comments on commit 4b0431d

Please sign in to comment.