Skip to content

Commit ca0cdaf

Browse files
authored
Merge pull request #2109 from NREL/ssc_195_day_of_week_improvements
Ssc 195 day of week improvements
2 parents 20c39bb + 150f0f7 commit ca0cdaf

File tree

538 files changed

+2582
-627
lines changed

Some content is hidden

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

538 files changed

+2582
-627
lines changed

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000],
334334
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000]
335335
],
336-
"dispatch_manual_system_charge_first": 0
336+
"dispatch_manual_system_charge_first": 0,
337+
"start_day_of_year": 0
337338
},
338339
"SystemCosts": {
339340
"om_batt_replacement_cost": [252.000000],
@@ -392,6 +393,7 @@
392393
"ElectricityRates": {
393394
"en_electricity_rates": 0,
394395
"rate_escalation": [0.000000],
396+
"start_day_of_year": 0,
395397
"ur_annual_min_charge": 0,
396398
"ur_billing_demand_lookback_percentages": [
397399
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
334334
],
335-
"dispatch_manual_system_charge_first": 0
335+
"dispatch_manual_system_charge_first": 0,
336+
"start_day_of_year": 0
336337
},
337338
"SystemCosts": {
338339
"om_batt_replacement_cost": [280.000000],
@@ -357,6 +358,7 @@
357358
},
358359
"ElectricityRates": {
359360
"rate_escalation": [0.000000],
361+
"start_day_of_year": 0,
360362
"ur_annual_min_charge": 0,
361363
"ur_billing_demand_lookback_percentages": [
362364
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
334334
],
335-
"dispatch_manual_system_charge_first": 0
335+
"dispatch_manual_system_charge_first": 0,
336+
"start_day_of_year": 0
336337
},
337338
"SystemCosts": {
338339
"om_batt_replacement_cost": [280.000000],
@@ -390,6 +391,7 @@
390391
},
391392
"ElectricityRates": {
392393
"rate_escalation": [0.000000],
394+
"start_day_of_year": 0,
393395
"ur_annual_min_charge": 0,
394396
"ur_billing_demand_lookback_percentages": [
395397
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000],
334334
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000]
335335
],
336-
"dispatch_manual_system_charge_first": 0
336+
"dispatch_manual_system_charge_first": 0,
337+
"start_day_of_year": 0
337338
},
338339
"SystemCosts": {
339340
"om_batt_replacement_cost": [252.000000],
@@ -392,6 +393,7 @@
392393
"ElectricityRates": {
393394
"en_electricity_rates": 0,
394395
"rate_escalation": [0.000000],
396+
"start_day_of_year": 0,
395397
"ur_annual_min_charge": 0,
396398
"ur_billing_demand_lookback_percentages": [
397399
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000],
334334
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000]
335335
],
336-
"dispatch_manual_system_charge_first": 0
336+
"dispatch_manual_system_charge_first": 0,
337+
"start_day_of_year": 0
337338
},
338339
"SystemCosts": {
339340
"om_batt_replacement_cost": [252.000000],
@@ -219404,6 +219405,7 @@
219404219405
"ElectricityRates": {
219405219406
"en_electricity_rates": 0,
219406219407
"rate_escalation": [0.000000],
219408+
"start_day_of_year": 0,
219407219409
"ur_annual_min_charge": 0,
219408219410
"ur_billing_demand_lookback_percentages": [
219409219411
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
334334
],
335-
"dispatch_manual_system_charge_first": 0
335+
"dispatch_manual_system_charge_first": 0,
336+
"start_day_of_year": 0
336337
},
337338
"SystemCosts": {
338339
"om_batt_replacement_cost": [434.000000],
@@ -357,6 +358,7 @@
357358
},
358359
"ElectricityRates": {
359360
"rate_escalation": [0.000000],
361+
"start_day_of_year": 0,
360362
"ur_annual_min_charge": 0,
361363
"ur_billing_demand_lookback_percentages": [
362364
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000],
334334
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000]
335335
],
336-
"dispatch_manual_system_charge_first": 0
336+
"dispatch_manual_system_charge_first": 0,
337+
"start_day_of_year": 0
337338
},
338339
"SystemCosts": {
339340
"om_batt_replacement_cost": [252.000000],
@@ -392,6 +393,7 @@
392393
"ElectricityRates": {
393394
"en_electricity_rates": 0,
394395
"rate_escalation": [0.000000],
396+
"start_day_of_year": 0,
395397
"ur_annual_min_charge": 0,
396398
"ur_billing_demand_lookback_percentages": [
397399
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000],
334334
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000]
335335
],
336-
"dispatch_manual_system_charge_first": 0
336+
"dispatch_manual_system_charge_first": 0,
337+
"start_day_of_year": 0
337338
},
338339
"SystemCosts": {
339340
"om_batt_replacement_cost": [252.000000],
@@ -392,6 +393,7 @@
392393
"ElectricityRates": {
393394
"en_electricity_rates": 0,
394395
"rate_escalation": [0.000000],
396+
"start_day_of_year": 0,
395397
"ur_annual_min_charge": 0,
396398
"ur_billing_demand_lookback_percentages": [
397399
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
333333
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
334334
],
335-
"dispatch_manual_system_charge_first": 0
335+
"dispatch_manual_system_charge_first": 0,
336+
"start_day_of_year": 0
336337
},
337338
"SystemCosts": {
338339
},
@@ -354,6 +355,7 @@
354355
},
355356
"ElectricityRates": {
356357
"rate_escalation": [0.000000],
358+
"start_day_of_year": 0,
357359
"ur_annual_min_charge": 0,
358360
"ur_billing_demand_lookback_percentages": [
359361
[60.000000, 0.000000],

api/api_autogen/library/defaults/Battery_FuelCellCommercial.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@
329329
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
330330
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
331331
],
332-
"dispatch_manual_system_charge_first": 0
332+
"dispatch_manual_system_charge_first": 0,
333+
"start_day_of_year": 0
333334
},
334335
"SystemCosts": {
335336
"om_batt_replacement_cost": [184.000000],
@@ -354,6 +355,7 @@
354355
},
355356
"ElectricityRates": {
356357
"rate_escalation": [0.000000],
358+
"start_day_of_year": 0,
357359
"ur_annual_min_charge": 0,
358360
"ur_billing_demand_lookback_percentages": [
359361
[60.000000, 0.000000],

0 commit comments

Comments
 (0)