Skip to content

Commit 2f8198e

Browse files
remove cash flow line item for heat/cooling - same removal logic applies as for electricity to grid and electricity purchase line items
1 parent 7ddf23b commit 2f8198e

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

docs/SAM-EM_End-Uses-and-Surface-Applications.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ typically require parasitic pumping power purchased from the grid. The cost of t
3030
and fully accounted for within GEOPHIRES' baseline OPEX calculations prior to executing the SAM financial engine.
3131

3232
Because these costs are injected directly into the fixed O&M parameters passed to SAM, SAM's native grid-purchase
33-
mechanisms are bypassed. Consequently, the specific cash flow line items for `Electricity from grid (kWh)`
34-
and `Electricity purchase ($)` are intentionally removed from the final SAM cash flow profile report.
33+
mechanisms are bypassed. Consequently, the specific cash flow line items for `Electricity from grid (kWh)`,
34+
`Electricity to grid net (kWh)`, and `Electricity purchase ($)` are intentionally removed from the final SAM cash flow profile report.
3535
This prevents the display of default zero values, which could otherwise mislead analysts into assuming parasitic power
3636
costs were omitted.
3737

src/geophires_x/EconomicsSamCalculations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ def _remove_line_item(row_name_: str) -> None:
630630

631631
ret.pop(idx)
632632

633-
for line_item in ['Electricity from grid (kWh)', 'Electricity purchase ($)']:
633+
for line_item in ['Electricity from grid (kWh)', 'Electricity to grid net (kWh)', 'Electricity purchase ($)']:
634634
_remove_line_item(line_item)
635635

636636
return ret

tests/examples/example_SAM-single-owner-PPA-8_heat.out

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.12.1
8-
Simulation Date: 2026-04-08
9-
Simulation Time: 08:15
10-
Calculation Time: 1.785 sec
7+
GEOPHIRES Version: 3.13.0
8+
Simulation Date: 2026-04-14
9+
Simulation Time: 10:07
10+
Calculation Time: 1.867 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -236,7 +236,6 @@ After-tax net cash flow [construction] ($) -17,035,483 -36,740,426 -28,7
236236

237237
ENERGY
238238
Electricity to grid (kWh) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
239-
Electricity to grid net (kWh) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
240239

241240
Heat provided (kWh) 0 2,596,723,692 2,604,861,601 2,607,339,534 2,608,804,668 2,609,828,178 2,610,525,059 2,609,821,916 2,600,140,574 2,591,908,499 2,603,877,334 2,606,856,182 2,608,491,513 2,609,601,068 2,610,396,012 2,610,333,538 2,604,400,594 2,589,770,971 2,602,567,841 2,606,300,154 2,608,147,427 2,609,356,200 2,610,229,374 2,610,551,931 2,607,151,425 2,590,281,491 2,600,607,493 2,605,647,753 2,607,766,188 2,609,091,668 2,610,006,197
242241

tests/examples/example_SAM-single-owner-PPA-9_cooling.out

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.12.1
8-
Simulation Date: 2026-04-05
9-
Simulation Time: 07:56
10-
Calculation Time: 1.823 sec
7+
GEOPHIRES Version: 3.13.0
8+
Simulation Date: 2026-04-14
9+
Simulation Time: 10:07
10+
Calculation Time: 1.885 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -245,7 +245,6 @@ After-tax net cash flow [construction] ($) -17,323,556 -37,361,714 -29,2
245245

246246
ENERGY
247247
Electricity to grid (kWh) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
248-
Electricity to grid net (kWh) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
249248

250249
Cooling provided (kWh) 0 1,869,641,058 1,875,500,352 1,877,284,464 1,878,339,361 1,879,076,288 1,879,578,043 1,879,071,780 1,872,101,213 1,866,174,120 1,874,791,681 1,876,936,451 1,878,113,889 1,878,912,769 1,879,485,128 1,879,440,147 1,875,168,427 1,864,635,099 1,873,848,846 1,876,536,111 1,877,866,147 1,878,736,464 1,879,365,149 1,879,597,391 1,877,149,026 1,865,002,674 1,872,437,395 1,876,066,382 1,877,591,655 1,878,546,001 1,879,204,462
251250

0 commit comments

Comments
 (0)