fix: Hydro budget units and output property name change for Plexos

NREL · Nov 5, 2024 · 19cf8c6 · 19cf8c6
1 parent a8c10ae
commit 19cf8c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/r2x/defaults/plexos_output.json b/src/r2x/defaults/plexos_output.json
@@ -88,7 +88,7 @@
     "forced_outage_rate": "Forced Outage Rate",
     "fuel_price": "Fuel Price",
     "heat_rate": "Heat Rate",
-    "hydro_budget": "Max Energy",
+    "hydro_budget": "Max Energy Day",
     "initial_energy": "Initial SoC",
     "initial_volume": "Initial Volume",
     "load_risk": "Load Risk",

diff --git a/src/r2x/defaults/reeds_input.json b/src/r2x/defaults/reeds_input.json
@@ -107,6 +107,7 @@
     "electrolyzer_saf": "InterruptiblePowerLoad",
     "gas-cc": "ThermalStandard",
     "gas-cc-ccs_mod": "ThermalStandard",
+    "gas-cc_gas-cc-ccs_mod": "ThermalStandard",
     "gas-cc_h2-ct": "ThermalStandard",
     "gas-ct": "ThermalStandard",
     "gas-ct_h2-ct": "ThermalStandard",
@@ -121,6 +122,7 @@
     "hydund": "HydroEnergyReservoir",
     "lfill-gas": "ThermalStandard",
     "nuclear": "ThermalStandard",
+    "nuclear-smr": "ThermalStandard",
     "o-g-s": "ThermalStandard",
     "pumped-hydro": "HydroPumpedStorage",
     "pvb": "RenewableDispatch",

diff --git a/src/r2x/parser/reeds.py b/src/r2x/parser/reeds.py
@@ -722,7 +722,7 @@ def _construct_hydro_budgets(self):
                     hourly_time_series[month_indices] = month_max_budget.magnitude
 
             ts = SingleTimeSeries.from_array(
-                Energy(hourly_time_series, "MWh"),
+                Energy(hourly_time_series / 1e3, "GWh"),
                 "hydro_budget",
                 initial_time=initial_time,
                 resolution=timedelta(days=1),