Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,14 @@
"Monthly": {
},
"NonEnergyRevenue": {
"energy_expenses_ret": [100.000000],
"energy_revenue_ret": [100.000000],
"non_energy_expenses": [0.000000],
"non_energy_expenses_escal": 0,
"non_energy_expenses_ret": [0.000000],
"non_energy_revenue": [0.000000],
"non_energy_revenue_escal": 0,
"non_energy_revenue_ret": [0.000000]
},
"HybridCosts": {
"total_installed_cost": 6.18984e+08
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,14 @@
"Monthly": {
},
"NonEnergyRevenue": {
"energy_expenses_ret": [100.000000],
"energy_revenue_ret": [100.000000],
"non_energy_expenses": [0.000000],
"non_energy_expenses_escal": 0,
"non_energy_expenses_ret": [0.000000],
"non_energy_revenue": [0.000000],
"non_energy_revenue_escal": 0,
"non_energy_revenue_ret": [0.000000]
},
"HybridCosts": {
"total_installed_cost": 5.04009e+08
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,14 @@
"Monthly": {
},
"NonEnergyRevenue": {
"energy_expenses_ret": [100.000000],
"energy_revenue_ret": [100.000000],
"non_energy_expenses": [0.000000],
"non_energy_expenses_escal": 0,
"non_energy_expenses_ret": [0.000000],
"non_energy_revenue": [0.000000],
"non_energy_revenue_escal": 0,
"non_energy_revenue_ret": [0.000000]
},
"HybridCosts": {
"total_installed_cost": 5.80569e+08
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,14 @@
"Monthly": {
},
"NonEnergyRevenue": {
"energy_expenses_ret": [100.000000],
"energy_revenue_ret": [100.000000],
"non_energy_expenses": [0.000000],
"non_energy_expenses_escal": 0,
"non_energy_expenses_ret": [0.000000],
"non_energy_revenue": [0.000000],
"non_energy_revenue_escal": 0,
"non_energy_revenue_ret": [0.000000]
},
"HybridCosts": {
"total_installed_cost": 5.04008e+08
Expand Down
13 changes: 10 additions & 3 deletions deploy/runtime/cashflow.lk
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ function cf_revenue()

if ( fin == 'Single Owner' && !is_iph_tech()) // As of May 2026, only single supports non-energy revenue
{
cfline('cf_non_energy_revenue',0);
if (value('non_energy_revenue_ds')==1) cfline('cf_non_energy_revenue',0);
}

cfline( 'cf_total_revenue', 0);
Expand Down Expand Up @@ -402,7 +402,7 @@ function cf_operating_expenses()
cfline('cf_total_energy_expenses',0);
cfline('cf_energy_expenses_paid_percent', 0);
cfline('cf_energy_expenses_paid',0);
cfline('cf_non_energy_expenses',0);
if(value('non_energy_expenses_ds')==1) cfline('cf_non_energy_expenses',0);
}

cfline( 'cf_operating_expenses', 0);
Expand Down Expand Up @@ -560,6 +560,11 @@ function cf_operating_activities() // all PPA models except Sale Leaseback
}
cfline('cf_debt_payment_interest', 0,-1);
}
if ( fin == 'Single Owner' && !is_iph_tech()) // As of May 2026, only single supports non-energy revenue
{
if(value('non_energy_revenue_ds')==0) cfline('cf_non_energy_revenue',0);
if(value('non_energy_expenses_ds')==0) cfline('cf_non_energy_expenses',0, -1);
}
cfline('cf_project_operating_activities', 0);
cfline('');
}
Expand Down Expand Up @@ -1588,6 +1593,7 @@ function set_om(xl)
{
xl_set_output( xl, 'cf_energy_expenses_paid_percent' );
xl_set_output( xl, 'cf_non_energy_expenses' );
xl_set_value_yesno( xl, 'non_energy_expenses_ds');
}
}

Expand Down Expand Up @@ -1815,7 +1821,8 @@ function set_annual_values( xl )
xl_set_output( xl, 'cf_capacity_payment'); // capacity payments
xl_set_output( xl, 'cf_curtailment_value'); // curtailment payments
xl_set_output( xl,'cf_energy_revenue_retained_percent');
xl_set_output( xl,'cf_non_energy_revenue');
xl_set_output( xl,'cf_non_energy_revenue');
xl_set_value_yesno( xl, 'non_energy_revenue_ds');
}
}
// tech-dependent
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Biopower_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -19473,13 +19473,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29707,13 +29707,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19108,13 +19108,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49448,13 +49448,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/DSLF_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -20597,13 +20597,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/ETES_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -10431,13 +10431,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Empirical Trough_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -19539,13 +19539,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Flat Plate PV_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -40068,13 +40068,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Fuel Cell_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -48266,13 +48266,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Generic CSP System_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -19692,13 +19692,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Geothermal Power_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -19284,13 +19284,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28245,13 +28245,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/MEwave Battery_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -32873,13 +32873,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/MEwave_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -22235,13 +22235,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/MSLF_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -28571,13 +28571,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/MSPT_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -56756,13 +56756,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/PTES_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -10415,13 +10415,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/PV Battery_Single Owner.json
Original file line number Diff line number Diff line change
Expand Up @@ -50715,13 +50715,15 @@
"non_energy_expenses": [
0.0
],
"non_energy_expenses_ds": 1.0,
"non_energy_expenses_escal": 0.0,
"non_energy_expenses_ret": [
0.0
],
"non_energy_revenue": [
0.0
],
"non_energy_revenue_ds": 1.0,
"non_energy_revenue_escal": 0.0,
"non_energy_revenue_is_shown": 0.0,
"non_energy_revenue_ret": [
Expand Down
Loading
Loading