Skip to content

Commit a60199c

Browse files
slice pre-revenue years based on construction years (instead of hardcoding to 1). note this doesn't have any effect until SAM-EM supports multiple construction years (NREL#406)
1 parent b23a6fe commit a60199c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/geophires_x/Economics.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,11 +3356,14 @@ def _calculate_sam_economics(self, model: Model) -> None:
33563356

33573357

33583358
if self.royalty_rate.Provided:
3359-
average_annual_royalties = np.average( # TODO unit conversion
3360-
self.sam_economics_calculations.royalties_opex.value[1:] # ignore pre-revenue year(s) (Year 0)
3359+
# ignore pre-revenue year(s) (e.g. Year 0)
3360+
pre_revenue_years_slice_index = model.surfaceplant.construction_years.value
3361+
3362+
average_annual_royalties = np.average(
3363+
self.sam_economics_calculations.royalties_opex.value[pre_revenue_years_slice_index:]
33613364
)
33623365

3363-
self.royalties_average_annual_cost.value = average_annual_royalties
3366+
self.royalties_average_annual_cost.value = average_annual_royalties # TODO unit conversion
33643367
self.Coam.value += self.royalties_average_annual_cost.quantity().to(self.Coam.CurrentUnits.value).magnitude
33653368

33663369
self.royalty_holder_npv.value = calculate_npv(
@@ -3370,7 +3373,7 @@ def _calculate_sam_economics(self, model: Model) -> None:
33703373
)
33713374
self.royalty_holder_annual_revenue.value = self.royalties_average_annual_cost.value
33723375
self.royalty_holder_total_revenue.value = np.sum( # TODO unit conversion
3373-
self.sam_economics_calculations.royalties_opex.value[1:] # ignore pre-revenue year(s) (Year 0)
3376+
self.sam_economics_calculations.royalties_opex.value[pre_revenue_years_slice_index:]
33743377
)
33753378

33763379

0 commit comments

Comments
 (0)