Skip to content

Reporting to include EV in load to reduce discrepancy #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mw2b merged 3 commits into from
Aug 7, 2025
Merged

Reporting to include EV in load to reduce discrepancy #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0097cee
Include EV load in the total load. EV is on a separate feeder
mw2b Aug 7, 2025
478e6cc
Include load energy breakdown in reporting CSV
mw2b Aug 7, 2025
bb2997f
Fix reporting integration tests
mw2b Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/skypro/commands/report/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ def file_path_resolver_func(file: str) -> str:
if do_plots:
plot_load_and_solar(result.df)

# This dataframe determines how the load is broken down in the output file - here we configure three different sub-components
# of load, so we will get CSV columns for load.feeder1, load.feeder2, and load.ev.
load_energy_breakdown_df = result.df[["plot_load_feeder1", "plot_load_feeder2", "ev_load"]].rename(columns={
"plot_load_feeder1": "feeder1",
"plot_load_feeder2": "feeder2",
"ev_load": "ev"
})

if output_file_path: # The main output file has half-hour granularity
generate_output_df(
df=result.df,
Expand All @@ -125,7 +133,7 @@ def file_path_resolver_func(file: str) -> str:
mkt_fixed_costs_dfs=result.mkt_fixed_cost_dfs,
customer_fixed_cost_dfs=result.customer_fixed_cost_dfs,
customer_vol_rates_dfs=result.customer_vol_rates_dfs,
load_energy_breakdown_df=None,
load_energy_breakdown_df=load_energy_breakdown_df,
aggregate_timebase="30min",
rate_detail=None,
config_entries=[],
Expand All @@ -135,6 +143,7 @@ def file_path_resolver_func(file: str) -> str:
)

if summary_output_file_path: # The summary output file has a single row to summarise the entire report

generate_output_df(
df=result.df,
int_final_vol_rates_dfs=result.int_vol_rates_dfs,
Expand All @@ -144,7 +153,7 @@ def file_path_resolver_func(file: str) -> str:
mkt_fixed_costs_dfs=result.mkt_fixed_cost_dfs,
customer_fixed_cost_dfs=result.customer_fixed_cost_dfs,
customer_vol_rates_dfs=result.customer_vol_rates_dfs,
load_energy_breakdown_df=None,
load_energy_breakdown_df=load_energy_breakdown_df,
aggregate_timebase="all",
rate_detail=None,
config_entries=[],
Expand Down
3 changes: 2 additions & 1 deletion src/skypro/commands/report/microgrid_flow_calcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def calc_flows(
df["bess_net"] = df["bess_charge"] - df["bess_discharge"]

# Taking the net of the EV circuit is probably overkill as the EVs shouldn't be exporting
df["ev_load"] = readings.ev_meter["energy_imported_active_delta"]
df["ev_net"] = readings.ev_meter["energy_imported_active_delta"] - readings.ev_meter["energy_exported_active_delta"]

df["feeder1_net"] = readings.feeder1_meter["energy_imported_active_delta"] - readings.feeder1_meter["energy_exported_active_delta"]
Expand Down Expand Up @@ -101,7 +102,7 @@ def calc_flows(
notices.extend(new_notices)

df["solar"] = df[["solar_feeder1", "solar_feeder2"]].sum(axis=1)
df["load"] = df[["plot_load_feeder1", "plot_load_feeder2"]].sum(axis=1)
df["load"] = df[["plot_load_feeder1", "plot_load_feeder2", "ev_load"]].sum(axis=1)
df["solar_to_load"] = np.minimum(df["solar"], df["load"]) # requires emlite data

# These columns are required for the output CSV, and could be calculated, but there's not currently a need for it
Expand Down
11 changes: 7 additions & 4 deletions src/tests/integration/test_integration_reporting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,23 @@ class SubTest:
msg="report202408",
month="2024-08",
expected_summary_df=pd.DataFrame.from_dict({
"agd:load": [9290.688],
"agd:load": [9755.188],
"agd:solar": [21969.16780],
"m:upImport": [31385.62743],
"m:upExport": [38970.21875],
"m:battCharge": [30922.89062],
"m:battDischarge": [26568.10938],
"c:solarToGrid": [12384.01863],
"c:gridToLoad": [4571.26804],
"c:solarToLoad": [4860.90924],
"c:solarToLoad": [5002.03904],
"c:battToLoad": [456.48816],
"c:battToGrid": [26111.62122],
"c:solarToBatt": [4583.11013],
"c:gridToBatt": [26339.78050],
"other:osam.ncsp": [0.96923],
"agd:load.feeder1": [3446.75500],
"agd:load.feeder2": [5843.93300],
"agd:load.ev": [464.50000],
"mfCost:import": [48050.00000],
"mfCost:export": [0.00000],
"cfCost:all": [-62000.00000],
Expand All @@ -50,7 +53,7 @@ class SubTest:
"ivRate:gridToLoad.final": [0.00000],
"ivRate:solarToBatt.final": [3.88745],
"ivRate:battToLoad.final": [-19.21144],
"ivRate:solarToLoad.final": [-10.17220],
"ivRate:solarToLoad.final": [-10.17701],
"mvRate:solarToBatt.final": [0.00000],
"mvRate:gridToBatt.final": [6.00367],
"mvRate:battToLoad.final": [0.00000],
Expand Down Expand Up @@ -88,7 +91,7 @@ class SubTest:

columns_to_compare = sub.expected_summary_df.columns
df = df[columns_to_compare]

error = (df - sub.expected_summary_df).abs()
tolerance = 0.01

Expand Down
Loading