Skip to content

Commit

Permalink
Merge pull request #1553 from NREL/SAM_1551
Browse files Browse the repository at this point in the history 
Remove lines resetting total_installed_cost for hybrids
  • Loading branch information
@sjanzou
sjanzou authored Nov 9, 2023
2 parents 5ebab64 + d887a85 commit 5233748
Showing 1 changed file with 8 additions and 38 deletions.
46 changes: 8 additions & 38 deletions deploy/runtime/startup.lk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2630,10 +2630,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'ppa_price_input', 'DependentVartableIndex' = 2,'DependentVariableName' = 'ppa_price_input'}, // battery dispatch
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// pvwatts
Expand Down Expand Up @@ -2690,10 +2687,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'ppa_price_input', 'DependentVartableIndex' = 2,'DependentVariableName' = 'ppa_price_input'}, // battery dispatch
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// pvwatts
Expand Down Expand Up @@ -2755,11 +2749,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 3,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// pvwatts
Expand Down Expand Up @@ -2828,11 +2818,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 3,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 4,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// pvwatts
Expand Down Expand Up @@ -2911,10 +2897,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'ppa_price_input', 'DependentVartableIndex' = 2,'DependentVariableName' = 'ppa_price_input'}, // battery dispatch
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// detailed pv
Expand Down Expand Up @@ -2974,10 +2957,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'ppa_price_input', 'DependentVartableIndex' = 2,'DependentVariableName' = 'ppa_price_input'}, // battery dispatch
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 0,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 3,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
// detailed pv
Expand Down Expand Up @@ -3046,12 +3026,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 3,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 4,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
//generic
Expand Down Expand Up @@ -3131,12 +3106,7 @@ sethybridvariabledependencies([
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 1,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 2,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 3,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'sales_tax_rate'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 0,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 1,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 2,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 3,'DependentVariableName' = 'total_installed_cost'},
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 4,'DependentVariableName' = 'total_installed_cost'}
{ 'IndependentVartableIndex' = 5,'IndependentVariableName' = 'sales_tax_rate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'sales_tax_rate'}
]);
addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid_system', 'top_page'=true});
//generic
Expand Down

0 comments on commit 5233748

Please sign in to comment.