Resolve conflict with main

Author: alexhyunminlee

.gitignore

@@ -6,7 +6,7 @@ __pycache__/
 .DS_Store
 
 # Local data and outputs
-data/
+# data/
 rate_design/ny/hp_rates/data/buildstock_raw/
 rate_design/ny/hp_rates/data/buildstock_processed/
 rate_design/ny/hp_rates/data/cairo_cases/

pyproject.toml

@@ -44,4 +44,4 @@ include = ["rate_design*", "utils*"]
 ]
 
 [tool.uv.sources]
-cairo = { git = "https://github.com/switchbox-data/CAIRO", rev = "sz/gas_billing" }
+cairo = { git = "https://github.com/NatLabRockies/CAIRO", rev = "main" }

rate_design/ny/hp_rates/run_scenario.py

@@ -53,6 +53,7 @@
 test_solar_pv_compensation = "net_metering"
 run_name = "tests_precalc"
 target_customer_count = 3650  # Target customer count for utility territory
+gas_tariff_map_name = "dummy_gas"  # Gas tariff map name for gas bill calculation
 
 process_workers = 20
 
@@ -119,15 +120,13 @@
 # and return 8760 profiles for each. Prototype ids and tariff. Make sure nice mathematical
 # properties. Maybe constants_tests.py has data needed for this.
 raw_load_elec = _return_load(
-    raw_load_passed=None,
     load_type="electricity",
     target_year=test_year_run,
     building_stock_sample=prototype_ids,
     load_filepath_key=bldg_id_to_load_filepath,
     force_tz="EST",
 )
 raw_load_gas = _return_load(
-    raw_load_passed=None,
     load_type="gas",
     target_year=test_year_run,
     building_stock_sample=prototype_ids,
@@ -175,6 +174,7 @@
     customer_metadata=customer_metadata,
     customer_electricity_load=raw_load_elec,
     customer_gas_load=raw_load_gas,
+    gas_tariff_map=gas_tariff_map_name,
     load_cols="total_fuel_electricity",
     marginal_system_prices=marginal_system_prices,
     costs_by_type=costs_by_type,