feat: update logic for general EI translation approach

conftest.py

@@ -1,8 +1,6 @@
 """Root conftest for R2X workspace.
 
-Handles two concerns:
-1. Loading fixture modules as pytest plugins for proper discovery.
-2. Getter registry cleanup to avoid collisions between packages.
+Handles getter registry cleanup to avoid collisions between packages.
 
 r2x_core uses a global GETTER_REGISTRY dict. Multiple workspace packages
 register getters with identical names (e.g., 'is_slack_bus', 'get_availability').
@@ -20,9 +18,7 @@
 # ---------------------------------------------------------------------------
 # Fixture plugins
 # ---------------------------------------------------------------------------
-# Fixture modules declared here are loaded as local pytest plugins, giving
-# clean discovery without sys.path hacks or star imports in conftest files.
-# The modules must be importable via pythonpath entries in pyproject.toml.
+# Pytest 8.4+ requires pytest_plugins to be declared only in the root conftest.
 pytest_plugins = [
     "fixtures.configs",
     "fixtures.context",

packages/r2x-sienna-to-plexos/src/r2x_sienna_to_plexos/__init__.py

@@ -26,6 +26,8 @@
     ensure_generator_node_memberships,
     ensure_head_storage_generator_membership,
     ensure_interface_line_memberships,
+    ensure_pumped_hydro_storages_created,
+    ensure_reference_node_memberships,
     ensure_region_node_memberships,
     ensure_reserve_battery_memberships,
     ensure_reserve_generator_memberships,
@@ -50,6 +52,7 @@
     "sienna_to_plexos",
     "REEDS_COMPONENT_SUBSTRINGS",
     "ensure_region_node_memberships",
+    "ensure_reference_node_memberships",
     "ensure_interface_line_memberships",
     "ensure_generator_node_memberships",
     "ensure_battery_node_memberships",
@@ -59,6 +62,7 @@
     "ensure_transformer_node_memberships",
     "ensure_head_storage_generator_membership",
     "ensure_tail_storage_generator_membership",
+    "ensure_pumped_hydro_storages_created",
     "membership_region_parent_node",
     "membership_region_child_node",
     "membership_reserve_child_generator",

packages/r2x-sienna-to-plexos/src/r2x_sienna_to_plexos/config/defaults.json

@@ -56,28 +56,74 @@
   "prime_mover_types": {
     "BA": "battery",
     "BT": "geothermal",
-    "CA": "gas-cc",
-    "CC": "gas-cc",
     "CE": "caes",
     "CP": "csp",
-    "CS": "gas-cc",
-    "CT": "gas-cc",
     "ES": "other",
     "FC": "smr",
     "FW": "other",
-    "GT": "gas-ct",
-    "HA": "hydnd",
-    "HB": "hydnd",
-    "HK": "hydnd",
-    "HY": "hyded",
-    "IC": "lfill-gas",
+    "HA": "hydro",
+    "HB": "hydro",
+    "HK": "hydro",
+    "HY": "hydro",
     "PS": "pumped-hydro",
     "OT": "other",
-    "ST": "coal",
     "PVe": "upv",
     "WT": "wind-ons",
     "WS": "wind-ofs"
   },
+  "reeds_thermal_mapping": {
+    "coal": [
+      "ANTHRACITE_COAL",
+      "BITUMINOUS_COAL",
+      "SUBBITUMINOUS_COAL",
+      "LIGNITE_COAL",
+      "COAL",
+      "REFINED_COAL",
+      "WASTE_COAL",
+      "SYNTHESIS_GAS_COAL"
+    ],
+    "natural-gas": [
+      "NATURAL_GAS"
+    ],
+    "o-g-s": [
+      "DISTILLATE_FUEL_OIL",
+      "RESIDUAL_FUEL_OIL",
+      "PETROLEUM_COKE",
+      "JET_FUEL",
+      "KEROSENE",
+      "PROPANE",
+      "WASTE_OIL",
+      "SYNTHESIS_GAS_PETROLEUM_COKE",
+      "OTHER_GAS",
+      "BLAST_FURNACE_GAS"
+    ],
+    "biopower": [
+      "AG_BIOPRODUCT",
+      "AG_BYPRODUCT",
+      "MUNICIPAL_WASTE",
+      "OTHER_BIOMASS_SOLIDS",
+      "WOOD_WASTE_SOLIDS",
+      "OTHER_BIOMASS_LIQUIDS",
+      "SLUDGE_WASTE",
+      "BLACK_LIQUOR",
+      "WOOD_WASTE_LIQUIDS",
+      "TIREDERIVED_FUEL",
+      "WASTE_HEAT"
+    ],
+    "lfill-gas": [
+      "LANDFILL_GAS",
+      "OTHER_BIOMASS_GAS"
+    ],
+    "nuclear": [
+      "NUCLEAR"
+    ],
+    "egs": [
+      "GEOTHERMAL"
+    ],
+    "other": [
+      "OTHER"
+    ]
+  },
   "reeds_defaults": {
     "syn-cond": {
       "capacity_MW": 320.0,
@@ -173,6 +219,20 @@
       "min_up_time": 7.0,
       "start_cost_per_MW": 5.3
     },
+    "coal": {
+      "capacity_MW": 302.0,
+      "forced_outage_rate": 0.0429,
+      "maintenance_rate": 0.12,
+      "max_capacity_MW": 856.0,
+      "max_ramp_up_percentage": 0.2,
+      "mean_time_to_repair": 55.0,
+      "min_capacity_MW": 50.0,
+      "min_down_time": 12.0,
+      "min_stable_level_percentage": 0.4,
+      "min_up_time": 24.0,
+      "start_cost_per_MW": 129.0,
+      "vom_cost": 4.5
+    },
     "coal-ccs": {
       "capacity_MW": 302.0,
       "forced_outage_rate": 0.0429,
@@ -484,6 +544,20 @@
       "min_up_time": 16.0,
       "start_cost_per_MW": 0.0
     },
+    "natural-gas": {
+      "capacity_MW": 320.0,
+      "forced_outage_rate": 0.0328,
+      "maintenance_rate": 0.06,
+      "max_capacity_MW": 944.0,
+      "max_ramp_up_percentage": 0.05,
+      "mean_time_to_repair": 48.0,
+      "min_capacity_MW": 10.0,
+      "min_down_time": 8.0,
+      "min_stable_level_percentage": 0.5,
+      "min_up_time": 6.0,
+      "start_cost_per_MW": 79.0,
+      "vom_cost": 4.2
+    },
     "gas-cc": {
       "capacity_MW": 320.0,
       "forced_outage_rate": 0.0328,
@@ -742,168 +816,19 @@
       "ramp_rate_down": 30.0,
       "ramp_rate_up": 30.0
     },
-    "hydd": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": null,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hyded": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": null,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydend": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": 1.0,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydnd": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": 1.0,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydnpd": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": null,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydnpnd": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": 1.0,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydsd": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": null,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydsn": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": 1.0,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
-    "hydud": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": null,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
     "hydro": {
+      "capacity_MW": 150.0,
       "average_capacity_MW": 50.0,
       "forced_outage_rate": 0.02,
       "maintenance_rate": 0.01,
       "mean_time_to_repair": 48,
+      "max_ramp_up_percentage": 0.8,
       "min_energy": 0.0,
       "min_power": 0.0,
       "ramp_rate_down": 100.0,
       "ramp_rate_up": 100.0,
       "vom_cost": 3.2
     },
-    "hydtrb": {
-      "average_capacity_MW": 50.0,
-      "forced_outage_rate": 0.02,
-      "maintenance_rate": 0.01,
-      "mean_time_to_repair": 48,
-      "min_energy": 0.0,
-      "min_power": 0.0,
-      "ramp_rate_down": 100.0,
-      "ramp_rate_up": 100.0,
-      "vom_cost": 3.2
-    },
-    "hydund": {
-      "capacity_MW": null,
-      "forced_outage_rate": null,
-      "maintenance_rate": null,
-      "max_capacity_MW": null,
-      "max_ramp_up_percentage": 0.05,
-      "mean_time_to_repair": 24.0,
-      "min_capacity_MW": null,
-      "min_down_time": null,
-      "min_stable_level_percentage": 1.0,
-      "min_up_time": null,
-      "start_cost_per_MW": null,
-      "vom_cost": 3.2
-    },
     "lfill-gas": {
       "capacity_MW": 20.0,
       "forced_outage_rate": 0.0309,
@@ -1012,10 +937,12 @@
       "start_cost_per_MW": 69.0
     },
     "pumped-hydro": {
+      "capacity_MW": 150.0,
       "average_capacity_MW": 100.0,
       "forced_outage_rate": 0.020,
       "maintenance_rate": 0.01,
       "mean_time_to_repair": 48,
+      "max_ramp_up_percentage": 0.8,
       "min_energy": 0.0,
       "min_power": 0.0,
       "ramp_rate_down": 100.0,
@@ -1027,31 +954,26 @@
       "maintenance_rate": 0.020,
       "mean_time_to_repair": 24,
       "min_energy": 0.0,
-      "min_power": 0.0,
-      "ramp_rate_down": 100.0,
-      "ramp_rate_up": 100.0
+      "min_power": 0.0
     },
     "wind-ofs": {
       "average_capacity_MW": 5.0,
       "forced_outage_rate": 0.03,
       "maintenance_rate": 0.02,
       "mean_time_to_repair": 48,
       "min_energy": 0.0,
-      "min_power": 0.0,
-      "ramp_rate_down": 100.0,
-      "ramp_rate_up": 100.0
+      "min_power": 0.0
     },
     "wind-ons": {
       "average_capacity_MW": 2.5,
       "forced_outage_rate": 0.02,
       "maintenance_rate": 0.01,
       "mean_time_to_repair": 24,
       "min_energy": 0.0,
-      "min_power": 0.0,
-      "ramp_rate_down": 100.0,
-      "ramp_rate_up": 100.0
+      "min_power": 0.0
     },
     "other": {
+      "capacity_MW": 100.0,
       "forced_outage_rate": 0.0328,
       "maintenance_rate": 0.06,
       "max_ramp_up_percentage": 0.05,