Skip to content

Commit 8b459dc

Browse files
sjanzousjanzou
authored
Merge pull request #2024 from NREL/iph-dispatch
TOD factors for cmod_single_owner_heat
2 parents 3c42510 + 6040650 commit 8b459dc

File tree

103 files changed

+41825
-2937
lines changed

Some content is hidden

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

103 files changed

+41825
-2937
lines changed

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
1313
"batt_computed_bank_capacity": 240000,
14-
"batt_computed_series": 139,
15-
"batt_computed_strings": 213163,
16-
"batt_current_charge_max": 119904,
14+
"batt_computed_series": 126,
15+
"batt_computed_strings": 212704,
16+
"batt_current_charge_max": 119646,
1717
"batt_current_choice": 0,
18-
"batt_current_discharge_max": 119904,
18+
"batt_current_discharge_max": 119646,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,7 +24,7 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 3.42857e+06,
27+
"batt_mass": 3.42858e+06,
2828
"batt_meter_position": 1,
2929
"batt_power_charge_max_kwac": 62500.1,
3030
"batt_power_charge_max_kwdc": 60000.1,
@@ -43,21 +43,21 @@
4343
"Load": {
4444
},
4545
"BatteryCell": {
46-
"LeadAcid_q10_computed": 446044,
47-
"LeadAcid_q20_computed": 479617,
48-
"LeadAcid_qn_computed": 287770,
46+
"LeadAcid_q10_computed": 445083,
47+
"LeadAcid_q20_computed": 478584,
48+
"LeadAcid_qn_computed": 287150,
4949
"LeadAcid_tn": 1,
5050
"batt_C_rate": 0.2,
5151
"batt_Cp": 1500,
5252
"batt_Qexp": 0.0400001,
5353
"batt_Qfull": 2.25,
54-
"batt_Qfull_flow": 479617,
54+
"batt_Qfull_flow": 478584,
5555
"batt_Qnom": 2,
5656
"batt_Vcut": 2.706,
5757
"batt_Vexp": 4.05,
5858
"batt_Vfull": 4.1,
5959
"batt_Vnom": 3.4,
60-
"batt_Vnom_default": 3.6,
60+
"batt_Vnom_default": 3.98,
6161
"batt_calendar_a": 0.00266,
6262
"batt_calendar_b": -7280,
6363
"batt_calendar_c": 939,

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"BatterySystem": {
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
13-
"batt_computed_bank_capacity": 1200.21,
14-
"batt_computed_series": 139,
15-
"batt_computed_strings": 1066,
16-
"batt_current_charge_max": 259.837,
13+
"batt_computed_bank_capacity": 1200.54,
14+
"batt_computed_series": 126,
15+
"batt_computed_strings": 1064,
16+
"batt_current_charge_max": 259.35,
1717
"batt_current_choice": 1,
18-
"batt_current_discharge_max": 259.837,
18+
"batt_current_discharge_max": 259.35,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,16 +24,16 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 17145.8,
27+
"batt_mass": 17150.6,
2828
"batt_meter_position": 0,
29-
"batt_power_charge_max_kwac": 135.44,
30-
"batt_power_charge_max_kwdc": 130.023,
31-
"batt_power_discharge_max_kwac": 124.822,
32-
"batt_power_discharge_max_kwdc": 130.023,
29+
"batt_power_charge_max_kwac": 135.478,
30+
"batt_power_charge_max_kwdc": 130.059,
31+
"batt_power_discharge_max_kwac": 124.856,
32+
"batt_power_discharge_max_kwdc": 130.059,
3333
"batt_replacement_capacity": 70,
3434
"batt_replacement_option": 1,
3535
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
36-
"batt_surface_area": 90.0157,
36+
"batt_surface_area": 90.0407,
3737
"en_batt": 1,
3838
"en_standalone_batt": 0,
3939
"en_wave_batt": 0
@@ -49,21 +49,21 @@
4949
"run_resiliency_calcs": 0
5050
},
5151
"BatteryCell": {
52-
"LeadAcid_q10_computed": 2230.6,
53-
"LeadAcid_q20_computed": 2398.5,
54-
"LeadAcid_qn_computed": 1439.1,
52+
"LeadAcid_q10_computed": 2226.42,
53+
"LeadAcid_q20_computed": 2394,
54+
"LeadAcid_qn_computed": 1436.4,
5555
"LeadAcid_tn": 1,
5656
"batt_C_rate": 0.2,
5757
"batt_Cp": 1500,
5858
"batt_Qexp": 0.0400001,
5959
"batt_Qfull": 2.25,
60-
"batt_Qfull_flow": 2398.5,
60+
"batt_Qfull_flow": 2394,
6161
"batt_Qnom": 2,
6262
"batt_Vcut": 2.706,
6363
"batt_Vexp": 4.05,
6464
"batt_Vfull": 4.1,
6565
"batt_Vnom": 3.4,
66-
"batt_Vnom_default": 3.6,
66+
"batt_Vnom_default": 3.98,
6767
"batt_calendar_a": 0.00266,
6868
"batt_calendar_b": -7280,
6969
"batt_calendar_c": 939,

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"BatterySystem": {
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
13-
"batt_computed_bank_capacity": 1200.21,
14-
"batt_computed_series": 139,
15-
"batt_computed_strings": 1066,
16-
"batt_current_charge_max": 259.837,
13+
"batt_computed_bank_capacity": 1200.54,
14+
"batt_computed_series": 126,
15+
"batt_computed_strings": 1064,
16+
"batt_current_charge_max": 259.35,
1717
"batt_current_choice": 1,
18-
"batt_current_discharge_max": 259.837,
18+
"batt_current_discharge_max": 259.35,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,16 +24,16 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 17145.8,
27+
"batt_mass": 17150.6,
2828
"batt_meter_position": 0,
29-
"batt_power_charge_max_kwac": 135.44,
30-
"batt_power_charge_max_kwdc": 130.023,
31-
"batt_power_discharge_max_kwac": 124.822,
32-
"batt_power_discharge_max_kwdc": 130.023,
29+
"batt_power_charge_max_kwac": 135.478,
30+
"batt_power_charge_max_kwdc": 130.059,
31+
"batt_power_discharge_max_kwac": 124.856,
32+
"batt_power_discharge_max_kwdc": 130.059,
3333
"batt_replacement_capacity": 70,
3434
"batt_replacement_option": 1,
3535
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
36-
"batt_surface_area": 90.0157,
36+
"batt_surface_area": 90.0407,
3737
"en_batt": 1,
3838
"en_standalone_batt": 0,
3939
"en_wave_batt": 0
@@ -49,21 +49,21 @@
4949
"run_resiliency_calcs": 0
5050
},
5151
"BatteryCell": {
52-
"LeadAcid_q10_computed": 2230.6,
53-
"LeadAcid_q20_computed": 2398.5,
54-
"LeadAcid_qn_computed": 1439.1,
52+
"LeadAcid_q10_computed": 2226.42,
53+
"LeadAcid_q20_computed": 2394,
54+
"LeadAcid_qn_computed": 1436.4,
5555
"LeadAcid_tn": 1,
5656
"batt_C_rate": 0.2,
5757
"batt_Cp": 1500,
5858
"batt_Qexp": 0.0400001,
5959
"batt_Qfull": 2.25,
60-
"batt_Qfull_flow": 2398.5,
60+
"batt_Qfull_flow": 2394,
6161
"batt_Qnom": 2,
6262
"batt_Vcut": 2.706,
6363
"batt_Vexp": 4.05,
6464
"batt_Vfull": 4.1,
6565
"batt_Vnom": 3.4,
66-
"batt_Vnom_default": 3.6,
66+
"batt_Vnom_default": 3.98,
6767
"batt_calendar_a": 0.00266,
6868
"batt_calendar_b": -7280,
6969
"batt_calendar_c": 939,

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
1313
"batt_computed_bank_capacity": 240000,
14-
"batt_computed_series": 139,
15-
"batt_computed_strings": 213163,
16-
"batt_current_charge_max": 119904,
14+
"batt_computed_series": 126,
15+
"batt_computed_strings": 212704,
16+
"batt_current_charge_max": 119646,
1717
"batt_current_choice": 0,
18-
"batt_current_discharge_max": 119904,
18+
"batt_current_discharge_max": 119646,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,7 +24,7 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 3.42857e+06,
27+
"batt_mass": 3.42858e+06,
2828
"batt_meter_position": 1,
2929
"batt_power_charge_max_kwac": 62500.1,
3030
"batt_power_charge_max_kwdc": 60000.1,
@@ -43,21 +43,21 @@
4343
"Load": {
4444
},
4545
"BatteryCell": {
46-
"LeadAcid_q10_computed": 446044,
47-
"LeadAcid_q20_computed": 479617,
48-
"LeadAcid_qn_computed": 287770,
46+
"LeadAcid_q10_computed": 445083,
47+
"LeadAcid_q20_computed": 478584,
48+
"LeadAcid_qn_computed": 287150,
4949
"LeadAcid_tn": 1,
5050
"batt_C_rate": 0.2,
5151
"batt_Cp": 1500,
5252
"batt_Qexp": 0.0400001,
5353
"batt_Qfull": 2.25,
54-
"batt_Qfull_flow": 479617,
54+
"batt_Qfull_flow": 478584,
5555
"batt_Qnom": 2,
5656
"batt_Vcut": 2.706,
5757
"batt_Vexp": 4.05,
5858
"batt_Vfull": 4.1,
5959
"batt_Vnom": 3.4,
60-
"batt_Vnom_default": 3.6,
60+
"batt_Vnom_default": 3.98,
6161
"batt_calendar_a": 0.00266,
6262
"batt_calendar_b": -7280,
6363
"batt_calendar_c": 939,

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
1313
"batt_computed_bank_capacity": 240000,
14-
"batt_computed_series": 139,
15-
"batt_computed_strings": 213163,
16-
"batt_current_charge_max": 119904,
14+
"batt_computed_series": 126,
15+
"batt_computed_strings": 212704,
16+
"batt_current_charge_max": 119646,
1717
"batt_current_choice": 0,
18-
"batt_current_discharge_max": 119904,
18+
"batt_current_discharge_max": 119646,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,7 +24,7 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 3.42857e+06,
27+
"batt_mass": 3.42858e+06,
2828
"batt_meter_position": 1,
2929
"batt_power_charge_max_kwac": 62500.1,
3030
"batt_power_charge_max_kwdc": 60000.1,
@@ -43,21 +43,21 @@
4343
"Load": {
4444
},
4545
"BatteryCell": {
46-
"LeadAcid_q10_computed": 446044,
47-
"LeadAcid_q20_computed": 479617,
48-
"LeadAcid_qn_computed": 287770,
46+
"LeadAcid_q10_computed": 445083,
47+
"LeadAcid_q20_computed": 478584,
48+
"LeadAcid_qn_computed": 287150,
4949
"LeadAcid_tn": 1,
5050
"batt_C_rate": 0.2,
5151
"batt_Cp": 1500,
5252
"batt_Qexp": 0.0400001,
5353
"batt_Qfull": 2.25,
54-
"batt_Qfull_flow": 479617,
54+
"batt_Qfull_flow": 478584,
5555
"batt_Qnom": 2,
5656
"batt_Vcut": 2.706,
5757
"batt_Vexp": 4.05,
5858
"batt_Vfull": 4.1,
5959
"batt_Vnom": 3.4,
60-
"batt_Vnom_default": 3.6,
60+
"batt_Vnom_default": 3.98,
6161
"batt_calendar_a": 0.00266,
6262
"batt_calendar_b": -7280,
6363
"batt_calendar_c": 939,

‎api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"BatterySystem": {
1111
"batt_ac_dc_efficiency": 96,
1212
"batt_ac_or_dc": 1,
13-
"batt_computed_bank_capacity": 12.474,
14-
"batt_computed_series": 14,
15-
"batt_computed_strings": 110,
16-
"batt_current_charge_max": 99,
13+
"batt_computed_bank_capacity": 12.4564,
14+
"batt_computed_series": 13,
15+
"batt_computed_strings": 107,
16+
"batt_current_charge_max": 96.3,
1717
"batt_current_choice": 1,
18-
"batt_current_discharge_max": 99,
18+
"batt_current_discharge_max": 96.3,
1919
"batt_dc_ac_efficiency": 96,
2020
"batt_dc_dc_efficiency": 99,
2121
"batt_inverter_efficiency_cutoff": 90,
@@ -24,16 +24,16 @@
2424
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2525
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
2626
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
27-
"batt_mass": 178.2,
27+
"batt_mass": 177.949,
2828
"batt_meter_position": 0,
29-
"batt_power_charge_max_kwac": 5.1975,
30-
"batt_power_charge_max_kwdc": 4.9896,
31-
"batt_power_discharge_max_kwac": 4.79002,
32-
"batt_power_discharge_max_kwdc": 4.9896,
29+
"batt_power_charge_max_kwac": 5.19017,
30+
"batt_power_charge_max_kwdc": 4.98256,
31+
"batt_power_discharge_max_kwac": 4.78326,
32+
"batt_power_discharge_max_kwdc": 4.98256,
3333
"batt_replacement_capacity": 70,
3434
"batt_replacement_option": 1,
3535
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
36-
"batt_surface_area": 1.7098,
36+
"batt_surface_area": 1.70819,
3737
"en_batt": 1,
3838
"en_standalone_batt": 0,
3939
"en_wave_batt": 0
@@ -49,21 +49,21 @@
4949
"run_resiliency_calcs": 0
5050
},
5151
"BatteryCell": {
52-
"LeadAcid_q10_computed": 230.175,
53-
"LeadAcid_q20_computed": 247.5,
54-
"LeadAcid_qn_computed": 148.5,
52+
"LeadAcid_q10_computed": 223.898,
53+
"LeadAcid_q20_computed": 240.75,
54+
"LeadAcid_qn_computed": 144.45,
5555
"LeadAcid_tn": 1,
5656
"batt_C_rate": 0.2,
5757
"batt_Cp": 1500,
5858
"batt_Qexp": 0.0400001,
5959
"batt_Qfull": 2.25,
60-
"batt_Qfull_flow": 247.5,
60+
"batt_Qfull_flow": 240.75,
6161
"batt_Qnom": 2,
6262
"batt_Vcut": 2.706,
6363
"batt_Vexp": 4.05,
6464
"batt_Vfull": 4.1,
6565
"batt_Vnom": 3.4,
66-
"batt_Vnom_default": 3.6,
66+
"batt_Vnom_default": 3.98,
6767
"batt_calendar_a": 0.00266,
6868
"batt_calendar_b": -7280,
6969
"batt_calendar_c": 939,

0 commit comments

Comments
 (0)