Skip to content

Commit 30a3ca6

Browse files
committed
Merge branch 'patch' into iph-dispatch
2 parents e8b96ce + b48026d commit 30a3ca6

File tree

94 files changed

+505
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+505
-1007
lines changed

.github/pull_request_template.md

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
# Pull Request Template
1+
## Pull Request Template
22

3-
## Description
3+
### Description
4+
[ description of the bug fix or new functionality ]
45

5-
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
6+
[ include directions for reviewers if necessary- what or how should they test or review ]
67

7-
Fixes # (issue)
8+
Fixes # (issue(s))
89

9-
## Type of change
10+
### Corresponding branches and PRs:
11+
[ which branches of wex, lk, and ssc should be built with this PR ]
1012

11-
Please delete options that are not relevant.
13+
[ link any corresponding PRs in other repos, i.e. NREL/ssc#x ]
1214

13-
- [ ] Bug fix (non-breaking change which fixes an issue)
14-
- [ ] New feature (non-breaking change which adds functionality)
15-
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
16-
- [ ] This change requires a documentation update
17-
- [ ] This change modifies variables in existing compute modules. Please see [Checking for PySAM Incompatible API Changes](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files).
18-
- [ ] This change requires updating the PySAM files via export_config. Please see [When do the PySAM files need to be regenerated?](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files#when-do-the-pysam-files-need-to-be-regenerated-via-export_config)
15+
### Unit Test Impact:
16+
[ new tests written? ]
1917

18+
[ expected changes in unit tests or speed of tests? ]
2019

21-
## Checklist:
20+
[ expected changes in test_results files? ]
2221

23-
If you have added a new compute module in a SSC pull request related to this one, be sure to check the [Process Requirements](https://github.com/NREL/SAM/wiki/Compute-modules-in-SAM).
22+
### Checklist
23+
- [ ] requires help revision and I added that label
24+
- [ ] adds, removes, modifies, or deletes variables in existing compute modules
25+
- [ ] adds a new compute module
26+
- [ ] changes defaults
27+
- [ ] I've tagged this PR to a milestone
2428

25-
- [ ] My code follows the style guidelines of this project
26-
- [ ] I have performed a self-review of my own code
27-
- [ ] I have commented my code, particularly in hard-to-understand areas
28-
- [ ] I have made corresponding changes to the documentation
29-
- [ ] My changes generate no new warnings
30-
- [ ] I have added tests that prove my fix is effective or that my feature works
31-
- [ ] New and existing unit tests pass locally with my changes
32-
- [ ] Any dependent changes have been merged and published in downstream modules
33-
- [ ] I have checked my code and corrected any misspellings
29+
### _Reminders- this section can be deleted_
30+
[Checking for PySAM Incompatible API Changes](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files).
31+
32+
[When do the PySAM files need to be regenerated?](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files#when-do-the-pysam-files-need-to-be-regenerated-via-export_config)

api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@
181181
"Lifetime": {
182182
"system_use_lifetime_output": 0
183183
},
184-
"ThirdPartyOwnership": {
185-
"elec_cost_with_system": [0],
186-
"elec_cost_without_system": [0]
187-
},
188184
"LCOS": {
189185
"batt_salvage_percentage": 0
190186
},

api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"om_fixed_escal": 0,
2424
"om_production_escal": 0,
2525
"om_production_heat": [2.000000],
26-
"total_installed_cost": 1.33794e+07
26+
"total_installed_cost": 1.36747e+07
2727
},
2828
"LandLease": {
2929
},
@@ -181,10 +181,6 @@
181181
"Lifetime": {
182182
"system_use_lifetime_output": 0
183183
},
184-
"ThirdPartyOwnership": {
185-
"elec_cost_with_system": [0],
186-
"elec_cost_without_system": [0]
187-
},
188184
"LCOS": {
189185
"batt_salvage_percentage": 0
190186
},

api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryCommercial.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@
193193
"Lifetime": {
194194
"system_use_lifetime_output": 1
195195
},
196-
"ThirdPartyOwnership": {
197-
"elec_cost_with_system": [0],
198-
"elec_cost_without_system": [0]
199-
},
200196
"LCOS": {
201197
"batt_salvage_percentage": 0,
202198
"battery_total_cost_lcos": 412308

api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryResidential.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,6 @@
189189
"Lifetime": {
190190
"system_use_lifetime_output": 1
191191
},
192-
"ThirdPartyOwnership": {
193-
"elec_cost_with_system": [0],
194-
"elec_cost_without_system": [0]
195-
},
196192
"LCOS": {
197193
"batt_salvage_percentage": 0,
198194
"battery_total_cost_lcos": 9242.27

api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileCommercial.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@
181181
"Lifetime": {
182182
"system_use_lifetime_output": 0
183183
},
184-
"ThirdPartyOwnership": {
185-
"elec_cost_with_system": [0],
186-
"elec_cost_without_system": [0]
187-
},
188184
"LCOS": {
189185
"batt_salvage_percentage": 0
190186
},

api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileResidential.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@
177177
"Lifetime": {
178178
"system_use_lifetime_output": 0
179179
},
180-
"ThirdPartyOwnership": {
181-
"elec_cost_with_system": [0],
182-
"elec_cost_without_system": [0]
183-
},
184180
"LCOS": {
185181
"batt_salvage_percentage": 0
186182
},

api/api_autogen/library/defaults/Cashloan_DSLFCommercial.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
"total_installed_cost": 3.76691e+08
2929
},
3030
"LandLease": {
31-
"land_area": 347.641,
32-
"om_land_lease": [0.000000],
33-
"om_land_lease_escal": 0
3431
},
3532
"Depreciation": {
3633
"depr_fed_custom": [0.000000],
@@ -182,10 +179,6 @@
182179
"Lifetime": {
183180
"system_use_lifetime_output": 0
184181
},
185-
"ThirdPartyOwnership": {
186-
"elec_cost_with_system": [0],
187-
"elec_cost_without_system": [0]
188-
},
189182
"LCOS": {
190183
"batt_salvage_percentage": 0
191184
},

api/api_autogen/library/defaults/Cashloan_EmpiricalTroughCommercial.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
"total_installed_cost": 5.28448e+08
2929
},
3030
"LandLease": {
31-
"land_area": 890.324,
32-
"om_land_lease": [0.000000],
33-
"om_land_lease_escal": 0
3431
},
3532
"Depreciation": {
3633
"depr_fed_custom": [0.000000],
@@ -182,10 +179,6 @@
182179
"Lifetime": {
183180
"system_use_lifetime_output": 0
184181
},
185-
"ThirdPartyOwnership": {
186-
"elec_cost_with_system": [0],
187-
"elec_cost_without_system": [0]
188-
},
189182
"LCOS": {
190183
"batt_salvage_percentage": 0
191184
},

api/api_autogen/library/defaults/Cashloan_FlatPlatePVCommercial.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@
179179
"Lifetime": {
180180
"system_use_lifetime_output": 1
181181
},
182-
"ThirdPartyOwnership": {
183-
"elec_cost_with_system": [0],
184-
"elec_cost_without_system": [0]
185-
},
186182
"LCOS": {
187183
"batt_salvage_percentage": 0
188184
},

0 commit comments

Comments
 (0)