Merge pull request #25 from NREL/ndr/v1.1.0-new-models

update default models

nrel/routee/powertrain/resources/default_models/external_model_links.json

@@ -1,46 +1,78 @@
 {
-    "2012_Ford_Focus": "https://app.box.com/shared/static/oll9h6vyji52ikf3nf9avq3lyr1wzirz.json",
-    "2012_Ford_Fusion": "https://app.box.com/shared/static/v2ygkxzinjlvjjz4qu41arnvtkjuyfpp.json",
-    "2016_AUDI_A3_4cyl_2WD": "https://app.box.com/shared/static/idhvv08yc7emssvcjdcct77d8n2sxcoz.json",
-    "2016_BMW_328d_4cyl_2WD": "https://app.box.com/shared/static/avod5ul1zugk45iqdcb7di7qhpksrywe.json",
-    "2016_BMW_i3_REx_PHEV_Charge_Depleting": "https://app.box.com/shared/static/fxhwtxpb5qj8rvcyp1ukgf39k1qhucwx.json",
-    "2016_BMW_i3_REx_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/htbt6ncjl3awsd7t6gmgwd9s26qg7pf0.json",
-    "2016_CHEVROLET_Malibu_4cyl_2WD": "https://app.box.com/shared/static/mqqmzaozq5pibry2izk3yqvyrvylihmb.json",
-    "2016_CHEVROLET_Spark_EV": "https://app.box.com/shared/static/1rbf6nokk4jimfmuisp83p81ypjh5b4a.json",
-    "2016_CHEVROLET_Volt_Charge_Depleting": "https://app.box.com/shared/static/lsa2bwzmiy3ds708azblwsoqgymnx40y.json",
-    "2016_CHEVROLET_Volt_Charge_Sustaining": "https://app.box.com/shared/static/cqj992k5mgvkap55foted4qgfh8arlxu.json",
-    "2016_FORD_C-MAX_(PHEV)_Charge_Depleting": "https://app.box.com/shared/static/t3cs34skjrteq4ni1zy833esk8133eie.json",
-    "2016_FORD_C-MAX_(PHEV)_Charge_Sustaining": "https://app.box.com/shared/static/szpoq88x93l1ooi1mpt0ugbzdd2ascxt.json",
-    "2016_FORD_C-MAX_HEV": "https://app.box.com/shared/static/2ns0j4b2qqve3yqb288f4kdmwk1t1axf.json",
-    "2016_FORD_Escape_4cyl_2WD": "https://app.box.com/shared/static/3yzzfxjbrrsi9yvampu0t6b8y3ti75na.json",
-    "2016_FORD_Explorer_4cyl_2WD": "https://app.box.com/shared/static/jskb2udgddoc2q47ogifsd45coe1y8lx.json",
-    "2016_HYUNDAI_Elantra_4cyl_2WD": "https://app.box.com/shared/static/dwnsovrw0dniouch3q4ebmguv6bke7dj.json",
-    "2016_HYUNDAI_Sonata_PHEV_Charge_Depleting": "https://app.box.com/shared/static/0vemdkxit575b4g8modsllek4s1aw979.json",
-    "2016_HYUNDAI_Sonata_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/qbvz2uh789evovmc44d1vglm3l8s196q.json",
-    "2016_KIA_Optima_Hybrid": "https://app.box.com/shared/static/uvveezcbk1xxgsrtll2dsfu396wgnxkn.json",
-    "2016_Leaf_24_kWh": "https://app.box.com/shared/static/5613bpep10crxnolx19ytpo3c3umf69g.json",
-    "2016_MITSUBISHI_i-MiEV": "https://app.box.com/shared/static/5wz4jmcdv9a2d3ksmt5bosg7du54rolu.json",
-    "2016_Nissan_Leaf_30_kWh": "https://app.box.com/shared/static/16n9www7a6fdqmk7t3mo8q9lf61g6x7g.json",
-    "2016_TESLA_Model_S60_2WD": "https://app.box.com/shared/static/nc0arjulee1vugzaisb24o8g5800nmc7.json",
-    "2016_TOYOTA_Camry_4cyl_2WD": "https://app.box.com/shared/static/egajl8ffapflmh4hjtzxs9nzf7sz4u9c.json",
-    "2016_TOYOTA_Corolla_4cyl_2WD": "https://app.box.com/shared/static/10x44ninyl0l9lfetvrndu8gs0iaw9wz.json",
-    "2016_TOYOTA_Highlander_Hybrid": "https://app.box.com/shared/static/cvdlr89225frf6kb1wws8e37itdxddc9.json",
-    "2016_Toyota_Prius_Two_FWD": "https://app.box.com/shared/static/nicahg28ick7p2ubq5ne6zzqi0xmfjsm.json",
-    "2017_CHEVROLET_Bolt": "https://app.box.com/shared/static/i53nrlhquw6h1lp2pvto5ud9ydi2egei.json",
-    "2017_Maruti_Dzire_VDI": "https://app.box.com/shared/static/jgrim7jczwjgg3p473sc5m3h3apzv8yh.json",
-    "2017_Prius_Prime_Charge_Depleting": "https://app.box.com/shared/static/w14m2woa4w4nh1koyafejor3ik0na5bs.json",
-    "2017_Prius_Prime_Charge_Sustaining": "https://app.box.com/shared/static/66yg9uhtcw6aq3yke7gzpc850tadwps2.json",
-    "2017_Toyota_Highlander_3": "https://app.box.com/shared/static/5qvm0vv9mkf6q2tgpbobw7mrix30rvaj.json",
-    "2020_Chevrolet_Colorado_2WD_Diesel": "https://app.box.com/shared/static/dmmi0aywcu75ndxd9uu64bfdijnszpew.json",
-    "2020_VW_Golf_1": "https://app.box.com/shared/static/acqz48ijvghdqdmi6gcmdrbp7fi5ebdz.json",
-    "2020_VW_Golf_2": "https://app.box.com/shared/static/cb9nmha1gtuq81skzasylhudu7zql4sv.json",
-    "2021_Fiat_Panda_Mild_Hybrid": "https://app.box.com/shared/static/0jt98j6a8zm35gdrpcn5lzlq89lu0pyw.json",
-    "2021_Peugot_3008": "https://app.box.com/shared/static/uf7xpa100zs74kyhh3mabj4owj0pago1.json",
-    "2022_Ford_F-150_Lightning_4WD": "https://app.box.com/shared/static/bws0l7gfy2ujdrm6uattw8rxt1q83g83.json",
-    "2022_Renault_Zoe_ZE50_R135": "https://app.box.com/shared/static/avbolew1q450ayr2bhfde3haw1xy9nx2.json",
-    "2022_Tesla_Model_3_RWD": "https://app.box.com/shared/static/p5w7jg550jxd8esx39570m163dmplgvc.json",
-    "2022_Tesla_Model_Y_RWD": "https://app.box.com/shared/static/tjrjl8vt9ckqzjs6fog8ayahqflhia57.json",
-    "2022_Toyota_Yaris_Hybrid_Mid": "https://app.box.com/shared/static/ysqn9px3ivogpg7xlvh5txdczxkx5t7k.json",
-    "2022_Volvo_XC40_Recharge_twin": "https://app.box.com/shared/static/uvh1mal9gqkgyiq5lbkato2xsdbv6ge0.json",
-    "2023_Mitsubishi_Pajero_Sport": "https://app.box.com/shared/static/jvlhjedjvw89ijhvh25wij5diyfcyxup.json"
+    "2010_Mazda_3_i-Stop": "https://app.box.com/shared/static/g8bthprpgea8cd7u1pdwozb0wm2jueht.json",
+    "2012_Ford_Focus": "https://app.box.com/shared/static/t4nqstxhgfg02n63qxieb928damk60t2.json",
+    "2012_Ford_Fusion": "https://app.box.com/shared/static/h1v5zpu5n3udoc7gxna4booa9nsozi0e.json",
+    "2016_AUDI_A3_4cyl_2WD": "https://app.box.com/shared/static/2owfh8idr4g7cqghrgwdp0qra0807j4j.json",
+    "2016_BMW_328d_4cyl_2WD": "https://app.box.com/shared/static/3g3px2x2i4ekx6gwzowq80ptcpvzripg.json",
+    "2016_BMW_i3_REx_PHEV_Charge_Depleting": "https://app.box.com/shared/static/iffw00fh4i8if2h5n0mvs4k42guedxp0.json",
+    "2016_BMW_i3_REx_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/t4rum6d7317ktqly9z96xlu45a3t8fmo.json",
+    "2016_CHEVROLET_Malibu_4cyl_2WD": "https://app.box.com/shared/static/0bethpcmav714f5qe4zthybgjrbdjvau.json",
+    "2016_CHEVROLET_Spark_EV": "https://app.box.com/shared/static/i5xz475aple3dwffwsvqgd83r3i22pk0.json",
+    "2016_CHEVROLET_Volt_Charge_Depleting": "https://app.box.com/shared/static/x01g62yoqrwmgg2lmuwo2x993cnkketr.json",
+    "2016_CHEVROLET_Volt_Charge_Sustaining": "https://app.box.com/shared/static/vh4dxj8jd0vklle331byl9emxt702956.json",
+    "2016_FORD_C-MAX_(PHEV)_Charge_Depleting": "https://app.box.com/shared/static/zvw6ikkgl4nhdph033ixzfdzr6415dal.json",
+    "2016_FORD_C-MAX_(PHEV)_Charge_Sustaining": "https://app.box.com/shared/static/4hzwq3lvwcljnn5exywd07jjzz7xim8r.json",
+    "2016_FORD_C-MAX_HEV": "https://app.box.com/shared/static/oosu0duvli49oncty4a2teffvn9k9jag.json",
+    "2016_FORD_Escape_4cyl_2WD": "https://app.box.com/shared/static/787cwh80nqpz1ysv639nads54lausow8.json",
+    "2016_FORD_Explorer_4cyl_2WD": "https://app.box.com/shared/static/yyxwk2tvkg8qz4cn4by1iir62k6lixo0.json",
+    "2016_HYUNDAI_Elantra_4cyl_2WD": "https://app.box.com/shared/static/yisg5ithccz2mbw62v3qqv1yzv7mzirk.json",
+    "2016_HYUNDAI_Sonata_PHEV_Charge_Depleting": "https://app.box.com/shared/static/wv8btma40nt0y7van38y97l5qyflsz6p.json",
+    "2016_HYUNDAI_Sonata_PHEV_Charge_Sustaining": "https://app.box.com/shared/static/eo2mnbw7aeii77li9k44m714yqa0um4h.json",
+    "2016_Hyundai_Tucson_Fuel_Cell": "https://app.box.com/shared/static/o4kzgz636kxas2nhpxo8lr0gstol9fdz.json",
+    "2016_KIA_Optima_Hybrid": "https://app.box.com/shared/static/atf61hz9m2sp0joqmh9mqbm2b6hxqb7w.json",
+    "2016_Leaf_24_kWh": "https://app.box.com/shared/static/3to0bzze0g70vv2eze0y0cl9ojx977s7.json",
+    "2016_MITSUBISHI_i-MiEV": "https://app.box.com/shared/static/2d1ew96wyxo38o9v83hzdre1y0vzljbw.json",
+    "2016_Nissan_Leaf_30_kWh": "https://app.box.com/shared/static/kbd3zp2ht0hddyes23wnpwnij8gp7mnv.json",
+    "2016_TESLA_Model_S60_2WD": "https://app.box.com/shared/static/0q97hoipdnlhglckaa8mwpct7wk1kl4r.json",
+    "2016_TOYOTA_Camry_4cyl_2WD": "https://app.box.com/shared/static/bs4r5o8gqunjho0kgyj66y88xbco7rrq.json",
+    "2016_TOYOTA_Corolla_4cyl_2WD": "https://app.box.com/shared/static/ouh5uaji0ydy8nhqb75j1yaybtvx7qgi.json",
+    "2016_TOYOTA_Highlander_Hybrid": "https://app.box.com/shared/static/xzkm71vuu14iiykznnm6qqx9e6qf4jhx.json",
+    "2016_Toyota_Prius_Two_FWD": "https://app.box.com/shared/static/sg6fkro8v5vozhcy6a1c2wr4f9fosu6q.json",
+    "2017_CHEVROLET_Bolt": "https://app.box.com/shared/static/5nfvv0rgw6cndt8rcmy9b1mfpsa0wyjn.json",
+    "2017_Maruti_Dzire_VDI": "https://app.box.com/shared/static/9wchsaurmzsjqnlsklog790s20b2ecer.json",
+    "2017_Prius_Prime_Charge_Depleting": "https://app.box.com/shared/static/0bvdo7xlzdxhddr1zgz9uoq814yzwd6s.json",
+    "2017_Prius_Prime_Charge_Sustaining": "https://app.box.com/shared/static/ttc74lnykm6xnf9afjrsp2ojqje9r88v.json",
+    "2017_Toyota_Highlander_3": "https://app.box.com/shared/static/il5z1n851k5fe9vxuduh6qj64s9r106t.json",
+    "2020_Chevrolet_Colorado_2WD_Diesel": "https://app.box.com/shared/static/r7fycsvmsue3qrs3w1l6wk40ouvdwrc7.json",
+    "2020_VW_Golf_1": "https://app.box.com/shared/static/9rbbizx616rv4jxkka513gihn46njhyz.json",
+    "2020_VW_Golf_2": "https://app.box.com/shared/static/h3rn1zc0cspvlplt4ut272zjiu02gjll.json",
+    "2021_BMW_iX_xDrive40": "https://app.box.com/shared/static/7g4vlzsijqeh75qavbanl38hqqu51vr2.json",
+    "2021_Cupra_Born": "https://app.box.com/shared/static/20wfjx3sxckj49jas7drgffp2pi099kn.json",
+    "2021_Fiat_Panda_Mild_Hybrid": "https://app.box.com/shared/static/25oqn71i3ef8jiwxn03ll12draj3mqe0.json",
+    "2021_Honda_N-Box_G": "https://app.box.com/shared/static/rhd38y5qu6ex322k2klrt5nrukhx4af2.json",
+    "2021_Peugot_3008": "https://app.box.com/shared/static/r2yqa2itruj3ksatirknuppegjbh2miu.json",
+    "2022_Ford_F-150_Lightning_4WD": "https://app.box.com/shared/static/vi8soi9iakz4q2j10ud6byey4mwvn67c.json",
+    "2022_MINI_Cooper_SE_Hardtop_2_door": "https://app.box.com/shared/static/o1a5634su13qk62tu1662axnn7sykoxx.json",
+    "2022_Renault_Megane_E-Tech": "https://app.box.com/shared/static/ztwf2t9qf4eru92apsdvo44ainmgnsib.json",
+    "2022_Renault_Zoe_ZE50_R135": "https://app.box.com/shared/static/6i74ant0a5jnefvgy2mz6cz6i5t48co6.json",
+    "2022_Tesla_Model_3_RWD": "https://app.box.com/shared/static/7ynrpa2p1c0p96kiwhgchlteu29xih7o.json",
+    "2022_Tesla_Model_Y_RWD": "https://app.box.com/shared/static/qj9tyzvzu400iuky2mxre5u6tcrh86s3.json",
+    "2022_Toyota_Avanza_E_J_MT": "https://app.box.com/shared/static/aw9ttcwv8shnl1ru7h2s3o48v5wiot4h.json",
+    "2022_Toyota_RAV4_Hybrid_LE": "https://app.box.com/shared/static/nbl8c89szvnvy2sqxf72nx6wbc3w4e3t.json",
+    "2022_Toyota_Yaris_Hybrid_Mid": "https://app.box.com/shared/static/hh1pohulo251kgbfgeavg15je92j3xsp.json",
+    "2022_Volvo_XC40_Recharge_twin": "https://app.box.com/shared/static/a3q1yy1o9zg1ezv7t9txlf5gq5ox0lmh.json",
+    "2023_Mitsubishi_Pajero_Sport": "https://app.box.com/shared/static/u4z3alf92s79u8s439zfo8xgi0xck96y.json",
+    "2023_Polestar_2_Long_range_Dual_motor": "https://app.box.com/shared/static/4met62d0nwmczv7ism8evdlvbegpqvrd.json",
+    "2023_Volvo_C40_Recharge": "https://app.box.com/shared/static/h9qkwrtd98dww7a6uusqv02bw4il9hm4.json",
+    "2024_BYD_Dolphin_Active": "https://app.box.com/shared/static/4zeteotf9d9ofr2raa70ns6dgmum6vh3.json",
+    "2024_Toyota_Vios_1": "https://app.box.com/shared/static/uvyubvbf9dvwvavbvlh0rj8mzo4985um.json",
+    "2024_VinFast_VF_e34": "https://app.box.com/shared/static/se3r92kzu80cwybqtad4d4flwlfwp16h.json",
+    "2024_Volkswagen_Polo_1": "https://app.box.com/shared/static/gj96qntvjw3luetd4rj17lzc8ns7e29w.json",
+    "BYD_ATTO_3": "https://app.box.com/shared/static/39pm4t1koxw49lpnfalhn7l93w27gism.json",
+    "Daycab_new_300kW": "https://app.box.com/shared/static/izpdy8sspjrr7ce8n8xkejzfjvqujs67.json",
+    "Daycab_new_400kW": "https://app.box.com/shared/static/5lf4ytm1erihjja6uqq4kk556i3zgrh3.json",
+    "Daycab_old_300kW": "https://app.box.com/shared/static/e73lh94vk7mnbzxvhpsdqzwa6pj88fc8.json",
+    "Daycab_old_400kW": "https://app.box.com/shared/static/q3q6ejzy9v83nqvhxjmq9uyu3asxls7r.json",
+    "Maruti_Swift_4cyl_2WD": "https://app.box.com/shared/static/fy3d39n8c0u2zvqwd6tlcvif80s2jlj8.json",
+    "Nissan_Navara": "https://app.box.com/shared/static/0zk9uu807mv7vpgtshrd5xoyi2wsxhsb.json",
+    "Renault_Clio_IV_diesel": "https://app.box.com/shared/static/vjv4s5jwlr696tz2uk0dnb2141zgll3z.json",
+    "Renault_Megane_1": "https://app.box.com/shared/static/cn6btvl1loh8uprk5bi3mrqbcot995np.json",
+    "Sleeper_new_300kW": "https://app.box.com/shared/static/smkqu0d9far41xtiyaj27m4u4zp76qxk.json",
+    "Sleeper_new_400kW": "https://app.box.com/shared/static/693v4je9kilkjuwg3zdmlkur0dgw855w.json",
+    "Sleeper_old_300kW": "https://app.box.com/shared/static/18r1pb6df1ibl5yrdhl6611x0n0243pk.json",
+    "Sleeper_old_400kW": "https://app.box.com/shared/static/lx3o0oxcultsgjqr6dhh4janwpijt1kd.json",
+    "Toyota_Corolla_Cross_Hybrid": "https://app.box.com/shared/static/xvdob2kohjc2bbsoox1bn5if417wdlti.json",
+    "Toyota_Etios_Liva_diesel": "https://app.box.com/shared/static/ezdmbwynzd1yy5x6hhu1o4qmapy3vxga.json",
+    "Toyota_Hilux_Double_Cab_4WD": "https://app.box.com/shared/static/5al46uufheijslly9tcx9by485dtwuzq.json",
+    "Toyota_Mirai": "https://app.box.com/shared/static/dzw9ryarivgwj84g98qsnjybdfp7dm1y.json"
 }

pyproject.toml

@@ -26,6 +26,7 @@ plot = ["matplotlib"]
 dev = [
     "nrel.routee.powertrain[scikit]",
     "nrel.routee.powertrain[plot]",
+    "tqdm",
     "pytest",
     "black",
     "mypy",

tests/test_model_library.py

@@ -0,0 +1,23 @@
+import logging as log
+from pathlib import Path
+from unittest import TestCase, skip
+
+from tqdm import tqdm
+
+
+import nrel.routee.powertrain as pt
+
+this_dir = Path(__file__).parent
+
+log.basicConfig(level=log.INFO)
+
+
+class TestModelLibrary(TestCase):
+    @skip(
+        "This test is slow and not necessary for every build. "
+        "Just test when the model library is updated."
+    )
+    def test_model_library(self):
+        for mname in tqdm(pt.list_available_models()):
+            model = pt.load_model(mname)
+            self.assertIsNotNone(model)