fix: Added correct unit validation for FuelPrice.

NREL · Nov 19, 2024 · 0e5f68d · 0e5f68d
1 parent 03c5e05
commit 0e5f68d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/r2x/defaults/plexos_output.json b/src/r2x/defaults/plexos_output.json
@@ -6,6 +6,7 @@
     "Charge Efficiency": "%",
     "Fixed Load": "MW",
     "Forced Outage Rate": "%",
+    "Fuel Price": "$/MMbtu",
     "Heat Rate": "MMBtu/MWh",
     "Initial SoC": "%",
     "Initial Volume": "GWh",

diff --git a/src/r2x/models/generators.py b/src/r2x/models/generators.py
@@ -11,10 +11,10 @@
 from r2x.enums import PrimeMoversType
 from r2x.units import (
     ActivePower,
-    FuelPrice,
     Percentage,
     PowerRate,
     ApparentPower,
+    VOMPrice,
     ureg,
     Time,
     Energy,
@@ -59,7 +59,7 @@ class Generator(Device):
     must_run: Annotated[int | None, Field(description="If we need to force the dispatch of the device.")] = (
         None
     )
-    vom_price: Annotated[FuelPrice, Field(description="Variable operational price $/MWh.")] | None = None
+    vom_price: Annotated[VOMPrice, Field(description="Variable operational price $/MWh.")] | None = None
     prime_mover_type: (
         Annotated[PrimeMoversType, Field(description="Prime mover technology according to EIA 923.")] | None
     ) = None

diff --git a/src/r2x/units.py b/src/r2x/units.py
@@ -46,7 +46,11 @@ class HeatRate(BaseQuantity):
 
 
 class FuelPrice(BaseQuantity):
-    __base_unit__ = "usd/watthour"
+    __base_unit__ = "usd/Btu"
+
+
+class VOMPrice(BaseQuantity):
+    __base_unit__ = "usd/kWh"
 
 
 class Energy(BaseQuantity):