diff --git a/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileCommercial.json b/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileCommercial.json index 9e09f2db9..fa4e2a7bb 100644 --- a/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileCommercial.json +++ b/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileCommercial.json @@ -179,7 +179,7 @@ "gen": [0] }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "LCOS": { "batt_salvage_percentage": 0 diff --git a/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileResidential.json b/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileResidential.json index ccd29cb6a..7d1144383 100644 --- a/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileResidential.json +++ b/api/api_autogen/library/defaults/Cashloan_CustomGenerationProfileResidential.json @@ -175,7 +175,7 @@ "gen": [0] }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "LCOS": { "batt_salvage_percentage": 0 diff --git a/api/api_autogen/library/defaults/Cashloan_WindPowerCommercial.json b/api/api_autogen/library/defaults/Cashloan_WindPowerCommercial.json index b6310b9ce..f3a72520f 100644 --- a/api/api_autogen/library/defaults/Cashloan_WindPowerCommercial.json +++ b/api/api_autogen/library/defaults/Cashloan_WindPowerCommercial.json @@ -175,7 +175,7 @@ "gen": [0] }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "LCOS": { "batt_salvage_percentage": 0 diff --git a/api/api_autogen/library/defaults/Cashloan_WindPowerResidential.json b/api/api_autogen/library/defaults/Cashloan_WindPowerResidential.json index de17d0acf..eec6e9e5b 100644 --- a/api/api_autogen/library/defaults/Cashloan_WindPowerResidential.json +++ b/api/api_autogen/library/defaults/Cashloan_WindPowerResidential.json @@ -171,7 +171,7 @@ "gen": [0] }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "LCOS": { "batt_salvage_percentage": 0 diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryAllEquityPartnershipFlip.json index fb4335e8d..bec9d95a7 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryAllEquityPartnershipFlip.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 20000, "user_capacity_factor": 43.6 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryCommercial.json index b76ebb802..660e55a41 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryCommercial.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryCommercial.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 215, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryHostDeveloper.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryHostDeveloper.json index b76ebb802..660e55a41 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryHostDeveloper.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryHostDeveloper.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 215, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryLeveragedPartnershipFlip.json index fb4335e8d..bec9d95a7 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryLeveragedPartnershipFlip.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 20000, "user_capacity_factor": 43.6 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryMerchantPlant.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryMerchantPlant.json index b79dfb3ee..16aa4f253 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryMerchantPlant.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryMerchantPlant.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 20000, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryResidential.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryResidential.json index 531044425..0fffd3e3b 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryResidential.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryResidential.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 8, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySaleLeaseback.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySaleLeaseback.json index fb4335e8d..bec9d95a7 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySaleLeaseback.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySaleLeaseback.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 20000, "user_capacity_factor": 43.6 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySingleOwner.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySingleOwner.json index b79dfb3ee..16aa4f253 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySingleOwner.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatterySingleOwner.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 20000, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryThirdParty.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryThirdParty.json index 84b588ab8..4ebf374d9 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryThirdParty.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationBatteryThirdParty.json @@ -4,14 +4,15 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 4, "user_capacity_factor": 20 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileAllEquityPartnershipFlip.json index f08fb0039..42d23ef8f 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileAllEquityPartnershipFlip.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileCommercial.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileCommercial.json index 9531b54fe..9add15218 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileCommercial.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileCommercial.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 9707.12, "user_capacity_factor": 43.6 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileHostDeveloper.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileHostDeveloper.json index 3674b6a2e..cc2d1e00b 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileHostDeveloper.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileHostDeveloper.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 9707.12, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLCOECalculator.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLCOECalculator.json index a78d0c5fd..48ebab323 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLCOECalculator.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLCOECalculator.json @@ -4,6 +4,7 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLeveragedPartnershipFlip.json index 9cb3653a0..ba465e6a0 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileLeveragedPartnershipFlip.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, "user_capacity_factor": 100 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileMerchantPlant.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileMerchantPlant.json index f08fb0039..42d23ef8f 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileMerchantPlant.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileMerchantPlant.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileNone.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileNone.json index a78d0c5fd..48ebab323 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileNone.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileNone.json @@ -4,6 +4,7 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileResidential.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileResidential.json index f2d940ac5..599a5a851 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileResidential.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileResidential.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 8, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSaleLeaseback.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSaleLeaseback.json index f08fb0039..42d23ef8f 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSaleLeaseback.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSaleLeaseback.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSingleOwner.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSingleOwner.json index f08fb0039..42d23ef8f 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSingleOwner.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileSingleOwner.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 100000, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileThirdParty.json b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileThirdParty.json index 4ac646a9e..e2d3fd5ca 100644 --- a/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileThirdParty.json +++ b/api/api_autogen/library/defaults/CustomGeneration_CustomGenerationProfileThirdParty.json @@ -4,14 +4,16 @@ "conv_eff": 34.118, "derate": 4, "energy_output_array": [0.000000], + "energy_output_array_lifetime": [0.000000], "heat_rate": 10, "spec_mode": 0, "system_capacity": 4, "user_capacity_factor": 90 }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "AdjustmentFactors": { "adjust_constant": 0, diff --git a/api/api_autogen/library/defaults/Equpartflip_CustomGenerationProfileAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Equpartflip_CustomGenerationProfileAllEquityPartnershipFlip.json index 62fcab1cb..5f93bc098 100644 --- a/api/api_autogen/library/defaults/Equpartflip_CustomGenerationProfileAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Equpartflip_CustomGenerationProfileAllEquityPartnershipFlip.json @@ -239,7 +239,7 @@ "Recapitalization": { }, "TimeOfDelivery": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "UtilityBill": { }, diff --git a/api/api_autogen/library/defaults/Equpartflip_WindPowerAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Equpartflip_WindPowerAllEquityPartnershipFlip.json index 4e241215f..bcb2df725 100644 --- a/api/api_autogen/library/defaults/Equpartflip_WindPowerAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Equpartflip_WindPowerAllEquityPartnershipFlip.json @@ -237,7 +237,7 @@ "Recapitalization": { }, "TimeOfDelivery": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "UtilityBill": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileAllEquityPartnershipFlip.json index ed411063f..d10f0e6ad 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileAllEquityPartnershipFlip.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileCommercial.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileCommercial.json index 610ff0ee1..f21e44438 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileCommercial.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileCommercial.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileHostDeveloper.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileHostDeveloper.json index 610ff0ee1..f21e44438 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileHostDeveloper.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileHostDeveloper.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileLeveragedPartnershipFlip.json index ed411063f..d10f0e6ad 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileLeveragedPartnershipFlip.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileMerchantPlant.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileMerchantPlant.json index ed411063f..d10f0e6ad 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileMerchantPlant.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileMerchantPlant.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileResidential.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileResidential.json index 6f8b747f3..a9c634337 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileResidential.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileResidential.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSaleLeaseback.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSaleLeaseback.json index ed411063f..d10f0e6ad 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSaleLeaseback.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSingleOwner.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSingleOwner.json index ed411063f..d10f0e6ad 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSingleOwner.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileSingleOwner.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileThirdParty.json b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileThirdParty.json index 6f8b747f3..a9c634337 100644 --- a/api/api_autogen/library/defaults/Grid_CustomGenerationProfileThirdParty.json +++ b/api/api_autogen/library/defaults/Grid_CustomGenerationProfileThirdParty.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Grid_WindPowerAllEquityPartnershipFlip.json index 68472cc21..903c8fbc7 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerAllEquityPartnershipFlip.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerCommercial.json b/api/api_autogen/library/defaults/Grid_WindPowerCommercial.json index 610ff0ee1..f21e44438 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerCommercial.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerCommercial.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Grid_WindPowerLeveragedPartnershipFlip.json index 68472cc21..903c8fbc7 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerLeveragedPartnershipFlip.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerMerchantPlant.json b/api/api_autogen/library/defaults/Grid_WindPowerMerchantPlant.json index 68472cc21..903c8fbc7 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerMerchantPlant.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerMerchantPlant.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerResidential.json b/api/api_autogen/library/defaults/Grid_WindPowerResidential.json index 6f8b747f3..a9c634337 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerResidential.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerResidential.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerSaleLeaseback.json b/api/api_autogen/library/defaults/Grid_WindPowerSaleLeaseback.json index 68472cc21..903c8fbc7 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerSaleLeaseback.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/Grid_WindPowerSingleOwner.json b/api/api_autogen/library/defaults/Grid_WindPowerSingleOwner.json index 68472cc21..903c8fbc7 100644 --- a/api/api_autogen/library/defaults/Grid_WindPowerSingleOwner.json +++ b/api/api_autogen/library/defaults/Grid_WindPowerSingleOwner.json @@ -2,7 +2,7 @@ "defaults": { "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "SystemOutput": { }, diff --git a/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json index 644dae9f0..66c2446ec 100644 --- a/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json +++ b/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json @@ -278,7 +278,7 @@ "Recapitalization": { }, "TimeOfDelivery": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ConstructionFinancing": { "construction_financing_cost": 0 diff --git a/api/api_autogen/library/defaults/Levpartflip_CustomGenerationProfileLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Levpartflip_CustomGenerationProfileLeveragedPartnershipFlip.json index ff5b410bd..d9ebf6357 100644 --- a/api/api_autogen/library/defaults/Levpartflip_CustomGenerationProfileLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Levpartflip_CustomGenerationProfileLeveragedPartnershipFlip.json @@ -262,7 +262,7 @@ "Recapitalization": { }, "TimeOfDelivery": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "UtilityBill": { }, diff --git a/api/api_autogen/library/defaults/Levpartflip_WindPowerLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Levpartflip_WindPowerLeveragedPartnershipFlip.json index 62d2c7498..f6404e2a7 100644 --- a/api/api_autogen/library/defaults/Levpartflip_WindPowerLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Levpartflip_WindPowerLeveragedPartnershipFlip.json @@ -260,7 +260,7 @@ "Recapitalization": { }, "TimeOfDelivery": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "UtilityBill": { }, diff --git a/api/api_autogen/library/defaults/Merchantplant_CustomGenerationProfileMerchantPlant.json b/api/api_autogen/library/defaults/Merchantplant_CustomGenerationProfileMerchantPlant.json index a6125a708..7a506a1e6 100644 --- a/api/api_autogen/library/defaults/Merchantplant_CustomGenerationProfileMerchantPlant.json +++ b/api/api_autogen/library/defaults/Merchantplant_CustomGenerationProfileMerchantPlant.json @@ -219272,7 +219272,7 @@ "UtilityBill": { }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "FuelCell": { }, diff --git a/api/api_autogen/library/defaults/Merchantplant_WindPowerMerchantPlant.json b/api/api_autogen/library/defaults/Merchantplant_WindPowerMerchantPlant.json index 810d78c64..8129a3cec 100644 --- a/api/api_autogen/library/defaults/Merchantplant_WindPowerMerchantPlant.json +++ b/api/api_autogen/library/defaults/Merchantplant_WindPowerMerchantPlant.json @@ -219268,7 +219268,7 @@ "UtilityBill": { }, "Lifetime": { - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "FuelCell": { }, diff --git a/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json index 76e812063..af1437dc3 100644 --- a/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json +++ b/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json @@ -43,8 +43,8 @@ "year": [2010.000000] }, "Lifetime": { + "ac_degradation": [0.000000], "analysis_period": 20, - "generic_degradation": [0.000000], "system_use_lifetime_output": 1 }, "AdjustmentFactors": { diff --git a/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json index fe288e310..4a60de578 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 2, diff --git a/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json index 74b6ef39c..19c133b30 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 2, diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridHostDeveloper.json index 9f8408922..b3c620de9 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridHostDeveloper.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 1, diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridSingleOwner.json index 74b6ef39c..19c133b30 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindBatteryHybridSingleOwner.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 2, diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridHostDeveloper.json index 9f8408922..b3c620de9 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridHostDeveloper.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 1, diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridSingleOwner.json index ba7682bb4..674864dc8 100644 --- a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsWindFuelCellBatteryHybridSingleOwner.json @@ -6,7 +6,8 @@ }, "Lifetime": { "analysis_period": 25, - "system_use_lifetime_output": 0 + "dc_degradation": [0.500000], + "system_use_lifetime_output": 1 }, "SystemDesign": { "array_type": 2, diff --git a/api/api_autogen/library/defaults/Saleleaseback_CustomGenerationProfileSaleLeaseback.json b/api/api_autogen/library/defaults/Saleleaseback_CustomGenerationProfileSaleLeaseback.json index d823307ab..adeeba1e0 100644 --- a/api/api_autogen/library/defaults/Saleleaseback_CustomGenerationProfileSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Saleleaseback_CustomGenerationProfileSaleLeaseback.json @@ -243,7 +243,7 @@ "salvage_percentage": 0, "sponsor_operating_margin": 20, "sponsor_operating_margin_escalation": 2, - "system_use_lifetime_output": 0, + "system_use_lifetime_output": 1, "tax_investor_required_lease_reserve": 6, "total_installed_cost": 1.092e+08 }, diff --git a/api/api_autogen/library/defaults/Saleleaseback_WindPowerSaleLeaseback.json b/api/api_autogen/library/defaults/Saleleaseback_WindPowerSaleLeaseback.json index 008c3e254..c4307ae4f 100644 --- a/api/api_autogen/library/defaults/Saleleaseback_WindPowerSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Saleleaseback_WindPowerSaleLeaseback.json @@ -241,7 +241,7 @@ "salvage_percentage": 0, "sponsor_operating_margin": 20, "sponsor_operating_margin_escalation": 2, - "system_use_lifetime_output": 0, + "system_use_lifetime_output": 1, "tax_investor_required_lease_reserve": 6, "total_installed_cost": 3.1748e+08 }, diff --git a/api/api_autogen/library/defaults/Singleowner_CustomGenerationProfileSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_CustomGenerationProfileSingleOwner.json index ef4a0093d..fd7903894 100644 --- a/api/api_autogen/library/defaults/Singleowner_CustomGenerationProfileSingleOwner.json +++ b/api/api_autogen/library/defaults/Singleowner_CustomGenerationProfileSingleOwner.json @@ -377,7 +377,7 @@ }, "Lifetime": { "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "FuelCell": { }, diff --git a/api/api_autogen/library/defaults/Singleowner_WindPowerSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_WindPowerSingleOwner.json index 2080bab9f..53420d03d 100644 --- a/api/api_autogen/library/defaults/Singleowner_WindPowerSingleOwner.json +++ b/api/api_autogen/library/defaults/Singleowner_WindPowerSingleOwner.json @@ -373,7 +373,7 @@ }, "Lifetime": { "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "FuelCell": { }, diff --git a/api/api_autogen/library/defaults/Thirdpartyownership_CustomGenerationProfileThirdParty.json b/api/api_autogen/library/defaults/Thirdpartyownership_CustomGenerationProfileThirdParty.json index ebdb36fb7..79fdff7b0 100644 --- a/api/api_autogen/library/defaults/Thirdpartyownership_CustomGenerationProfileThirdParty.json +++ b/api/api_autogen/library/defaults/Thirdpartyownership_CustomGenerationProfileThirdParty.json @@ -16,7 +16,7 @@ }, "AnnualOutput": { "degradation": [0.000000], - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "CashFlow": { "lease_escalation": 1, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileAllEquityPartnershipFlip.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileAllEquityPartnershipFlip.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileCommercial.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileCommercial.json index 9ce35f75b..105a7c7de 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileCommercial.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileCommercial.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileHostDeveloper.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileHostDeveloper.json index 24732544b..209bfbcf6 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileHostDeveloper.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileHostDeveloper.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileLeveragedPartnershipFlip.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileLeveragedPartnershipFlip.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileMerchantPlant.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileMerchantPlant.json index ac1a71cf2..fe9e76d52 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileMerchantPlant.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileMerchantPlant.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileResidential.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileResidential.json index 3f503a1af..da46e1b9b 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileResidential.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileResidential.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSaleLeaseback.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSaleLeaseback.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSaleLeaseback.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSingleOwner.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSingleOwner.json index 082ec409a..cc7fc5523 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSingleOwner.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileSingleOwner.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileThirdParty.json b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileThirdParty.json index cdc5e55ff..8606521f5 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileThirdParty.json +++ b/api/api_autogen/library/defaults/Utilityrate5_CustomGenerationProfileThirdParty.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerAllEquityPartnershipFlip.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerAllEquityPartnershipFlip.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerCommercial.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerCommercial.json index d5e88a68c..d50bae13e 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerCommercial.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerCommercial.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerLeveragedPartnershipFlip.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerLeveragedPartnershipFlip.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerMerchantPlant.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerMerchantPlant.json index 1bace8f5c..8f483d62a 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerMerchantPlant.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerMerchantPlant.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerResidential.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerResidential.json index 721fc5192..df1725e72 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerResidential.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerResidential.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "rate_escalation": [0.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerSaleLeaseback.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerSaleLeaseback.json index 5707055e0..3dd734119 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerSaleLeaseback.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Utilityrate5_WindPowerSingleOwner.json b/api/api_autogen/library/defaults/Utilityrate5_WindPowerSingleOwner.json index 1bace8f5c..8f483d62a 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_WindPowerSingleOwner.json +++ b/api/api_autogen/library/defaults/Utilityrate5_WindPowerSingleOwner.json @@ -3,7 +3,7 @@ "Lifetime": { "analysis_period": 25, "inflation_rate": 2.5, - "system_use_lifetime_output": 0 + "system_use_lifetime_output": 1 }, "ElectricityRates": { "en_electricity_rates": 0, diff --git a/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json index 728ea8f8b..59f575abd 100644 --- a/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [39.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json index f330f86fb..bfb325328 100644 --- a/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Windpower_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [40.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridHostDeveloper.json index 728ea8f8b..59f575abd 100644 --- a/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridHostDeveloper.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [39.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridSingleOwner.json index f330f86fb..bfb325328 100644 --- a/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Windpower_PVWattsWindBatteryHybridSingleOwner.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [40.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridHostDeveloper.json index 728ea8f8b..59f575abd 100644 --- a/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridHostDeveloper.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [39.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridSingleOwner.json index f330f86fb..bfb325328 100644 --- a/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Windpower_PVWattsWindFuelCellBatteryHybridSingleOwner.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [40.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridHostDeveloper.json index 9a820aa5d..3b64928be 100644 --- a/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridHostDeveloper.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [39.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridSingleOwner.json index f330f86fb..bfb325328 100644 --- a/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridSingleOwner.json +++ b/api/api_autogen/library/defaults/Windpower_PhotovoltaicWindBatteryHybridSingleOwner.json @@ -46,6 +46,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, @@ -58,7 +63,7 @@ "Uncertainty": { }, "HybridCosts": { - "degradation": [0.000000], + "degradation": [0.640000], "om_capacity": [40.000000], "om_capacity_escal": 0, "om_fixed": [0.000000], diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Windpower_WindPowerAllEquityPartnershipFlip.json index b66f2a409..b215e44dc 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerAllEquityPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerAllEquityPartnershipFlip.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerCommercial.json b/api/api_autogen/library/defaults/Windpower_WindPowerCommercial.json index 9650a28bc..5f1aa19d0 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerCommercial.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerCommercial.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerLCOECalculator.json b/api/api_autogen/library/defaults/Windpower_WindPowerLCOECalculator.json index b66f2a409..e9ce035ea 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerLCOECalculator.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerLCOECalculator.json @@ -61,6 +61,8 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Windpower_WindPowerLeveragedPartnershipFlip.json index b66f2a409..b215e44dc 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerLeveragedPartnershipFlip.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerLeveragedPartnershipFlip.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerMerchantPlant.json b/api/api_autogen/library/defaults/Windpower_WindPowerMerchantPlant.json index 85f85bb3e..96f9934de 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerMerchantPlant.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerMerchantPlant.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerNone.json b/api/api_autogen/library/defaults/Windpower_WindPowerNone.json index b6f81e2a1..a3409c466 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerNone.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerNone.json @@ -61,6 +61,8 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerResidential.json b/api/api_autogen/library/defaults/Windpower_WindPowerResidential.json index 8ca66a73f..bc2b9b585 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerResidential.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerResidential.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerSaleLeaseback.json b/api/api_autogen/library/defaults/Windpower_WindPowerSaleLeaseback.json index b66f2a409..b215e44dc 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerSaleLeaseback.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerSaleLeaseback.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerSingleOwner.json b/api/api_autogen/library/defaults/Windpower_WindPowerSingleOwner.json index b66f2a409..b215e44dc 100644 --- a/api/api_autogen/library/defaults/Windpower_WindPowerSingleOwner.json +++ b/api/api_autogen/library/defaults/Windpower_WindPowerSingleOwner.json @@ -61,6 +61,11 @@ "wake_future_loss": 0, "wake_int_loss": 0 }, + "Lifetime": { + "ac_degradation": [0.640000], + "analysis_period": 25, + "system_use_lifetime_output": 1 + }, "AdjustmentFactors": { "adjust_constant": 0, "adjust_en_periods": 0, diff --git a/api/include/SAM_CustomGeneration.h b/api/include/SAM_CustomGeneration.h index f5302d697..36989573f 100644 --- a/api/include/SAM_CustomGeneration.h +++ b/api/include/SAM_CustomGeneration.h @@ -55,6 +55,14 @@ extern "C" */ SAM_EXPORT void SAM_CustomGeneration_Plant_energy_output_array_aset(SAM_table ptr, double* arr, int length, SAM_error *err); + /** + * Set energy_output_array_lifetime: Array of Energy Output Profile [kW] + * options: None + * constraints: None + * required if: spec_mode=2 + */ + SAM_EXPORT void SAM_CustomGeneration_Plant_energy_output_array_lifetime_aset(SAM_table ptr, double* arr, int length, SAM_error *err); + /** * Set heat_rate: Heat Rate [MMBTUs/MWhe] * options: None @@ -64,7 +72,7 @@ extern "C" SAM_EXPORT void SAM_CustomGeneration_Plant_heat_rate_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set spec_mode: Spec mode: 0=constant CF,1=profile + * Set spec_mode: Spec mode: 0=constant CF,1=profile,2=lifetime profile * options: None * constraints: None * required if: * @@ -93,20 +101,20 @@ extern "C" // /** - * Set analysis_period: Lifetime analysis period [years] + * Set ac_degradation: Annual AC degradation [%/year] * options: None * constraints: None * required if: system_use_lifetime_output=1 */ - SAM_EXPORT void SAM_CustomGeneration_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_CustomGeneration_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err); /** - * Set generic_degradation: Annual AC degradation [%/year] + * Set analysis_period: Lifetime analysis period [years] * options: None * constraints: None * required if: system_use_lifetime_output=1 */ - SAM_EXPORT void SAM_CustomGeneration_Lifetime_generic_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err); + SAM_EXPORT void SAM_CustomGeneration_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err); /** * Set system_use_lifetime_output: Custom generation profile lifetime simulation [0/1] @@ -289,6 +297,8 @@ extern "C" SAM_EXPORT double* SAM_CustomGeneration_Plant_energy_output_array_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double* SAM_CustomGeneration_Plant_energy_output_array_lifetime_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double SAM_CustomGeneration_Plant_heat_rate_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_CustomGeneration_Plant_spec_mode_nget(SAM_table ptr, SAM_error *err); @@ -302,9 +312,9 @@ extern "C" * Lifetime Getters */ - SAM_EXPORT double SAM_CustomGeneration_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_CustomGeneration_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err); - SAM_EXPORT double* SAM_CustomGeneration_Lifetime_generic_degradation_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double SAM_CustomGeneration_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_CustomGeneration_Lifetime_system_use_lifetime_output_nget(SAM_table ptr, SAM_error *err); diff --git a/api/include/SAM_MhkWave.h b/api/include/SAM_MhkWave.h index 8a352af86..1f2c9198a 100644 --- a/api/include/SAM_MhkWave.h +++ b/api/include/SAM_MhkWave.h @@ -245,20 +245,20 @@ extern "C" // /** - * Set analysis_period: Lifetime analysis period [years] + * Set ac_degradation: Annual AC degradation [%/year] * options: None * constraints: None * required if: system_use_lifetime_output=1 */ - SAM_EXPORT void SAM_MhkWave_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_MhkWave_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err); /** - * Set generic_degradation: Annual AC degradation [%/year] + * Set analysis_period: Lifetime analysis period [years] * options: None * constraints: None * required if: system_use_lifetime_output=1 */ - SAM_EXPORT void SAM_MhkWave_Lifetime_generic_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err); + SAM_EXPORT void SAM_MhkWave_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err); /** * Set system_use_lifetime_output: Generic lifetime simulation [0/1] @@ -375,9 +375,9 @@ extern "C" * Lifetime Getters */ - SAM_EXPORT double SAM_MhkWave_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_MhkWave_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err); - SAM_EXPORT double* SAM_MhkWave_Lifetime_generic_degradation_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double SAM_MhkWave_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_MhkWave_Lifetime_system_use_lifetime_output_nget(SAM_table ptr, SAM_error *err); diff --git a/api/include/SAM_Windpower.h b/api/include/SAM_Windpower.h index ec093f400..9d1758d6a 100644 --- a/api/include/SAM_Windpower.h +++ b/api/include/SAM_Windpower.h @@ -431,6 +431,35 @@ extern "C" SAM_EXPORT void SAM_Windpower_Losses_wake_int_loss_nset(SAM_table ptr, double number, SAM_error *err); + // + // Lifetime parameters + // + + /** + * Set ac_degradation: Annual AC degradation for lifetime simulations [%/year] + * options: None + * constraints: None + * required if: system_use_lifetime_output=1 + */ + SAM_EXPORT void SAM_Windpower_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err); + + /** + * Set analysis_period: Analysis period [years] + * options: None + * constraints: None + * required if: system_use_lifetime_output=1 + */ + SAM_EXPORT void SAM_Windpower_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err); + + /** + * Set system_use_lifetime_output: Run lifetime simulation [0/1] + * options: None + * constraints: None + * required if: ?=0 + */ + SAM_EXPORT void SAM_Windpower_Lifetime_system_use_lifetime_output_nset(SAM_table ptr, double number, SAM_error *err); + + // // AdjustmentFactors parameters // @@ -698,6 +727,17 @@ extern "C" SAM_EXPORT double SAM_Windpower_Losses_wake_int_loss_nget(SAM_table ptr, SAM_error *err); + /** + * Lifetime Getters + */ + + SAM_EXPORT double* SAM_Windpower_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err); + + SAM_EXPORT double SAM_Windpower_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err); + + SAM_EXPORT double SAM_Windpower_Lifetime_system_use_lifetime_output_nget(SAM_table ptr, SAM_error *err); + + /** * AdjustmentFactors Getters */ diff --git a/api/modules/SAM_CustomGeneration.cpp b/api/modules/SAM_CustomGeneration.cpp index 8a7f623a4..02dd4cf2c 100644 --- a/api/modules/SAM_CustomGeneration.cpp +++ b/api/modules/SAM_CustomGeneration.cpp @@ -32,6 +32,12 @@ SAM_EXPORT void SAM_CustomGeneration_Plant_energy_output_array_aset(SAM_table pt }); } +SAM_EXPORT void SAM_CustomGeneration_Plant_energy_output_array_lifetime_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_array(ptr, "energy_output_array_lifetime", arr, length); + }); +} + SAM_EXPORT void SAM_CustomGeneration_Plant_heat_rate_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_number(ptr, "heat_rate", number); @@ -56,15 +62,15 @@ SAM_EXPORT void SAM_CustomGeneration_Plant_user_capacity_factor_nset(SAM_table p }); } -SAM_EXPORT void SAM_CustomGeneration_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_CustomGeneration_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "analysis_period", number); + ssc_data_set_array(ptr, "ac_degradation", arr, length); }); } -SAM_EXPORT void SAM_CustomGeneration_Lifetime_generic_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ +SAM_EXPORT void SAM_CustomGeneration_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_array(ptr, "generic_degradation", arr, length); + ssc_data_set_number(ptr, "analysis_period", number); }); } @@ -216,6 +222,16 @@ SAM_EXPORT double* SAM_CustomGeneration_Plant_energy_output_array_aget(SAM_table return result; } +SAM_EXPORT double* SAM_CustomGeneration_Plant_energy_output_array_lifetime_aget(SAM_table ptr, int* length, SAM_error *err){ + double* result = nullptr; + translateExceptions(err, [&]{ + result = ssc_data_get_array(ptr, "energy_output_array_lifetime", length); + if (!result) + make_access_error("SAM_CustomGeneration", "energy_output_array_lifetime"); + }); + return result; +} + SAM_EXPORT double SAM_CustomGeneration_Plant_heat_rate_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ @@ -252,21 +268,21 @@ SAM_EXPORT double SAM_CustomGeneration_Plant_user_capacity_factor_nget(SAM_table return result; } -SAM_EXPORT double SAM_CustomGeneration_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err){ - double result; +SAM_EXPORT double* SAM_CustomGeneration_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err){ + double* result = nullptr; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "analysis_period", &result)) - make_access_error("SAM_CustomGeneration", "analysis_period"); + result = ssc_data_get_array(ptr, "ac_degradation", length); + if (!result) + make_access_error("SAM_CustomGeneration", "ac_degradation"); }); return result; } -SAM_EXPORT double* SAM_CustomGeneration_Lifetime_generic_degradation_aget(SAM_table ptr, int* length, SAM_error *err){ - double* result = nullptr; +SAM_EXPORT double SAM_CustomGeneration_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err){ + double result; translateExceptions(err, [&]{ - result = ssc_data_get_array(ptr, "generic_degradation", length); - if (!result) - make_access_error("SAM_CustomGeneration", "generic_degradation"); + if (!ssc_data_get_number(ptr, "analysis_period", &result)) + make_access_error("SAM_CustomGeneration", "analysis_period"); }); return result; } diff --git a/api/modules/SAM_MhkWave.cpp b/api/modules/SAM_MhkWave.cpp index 77a255027..ed81e23ae 100644 --- a/api/modules/SAM_MhkWave.cpp +++ b/api/modules/SAM_MhkWave.cpp @@ -170,15 +170,15 @@ SAM_EXPORT void SAM_MhkWave_MHKWave_year_aset(SAM_table ptr, double* arr, int le }); } -SAM_EXPORT void SAM_MhkWave_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_MhkWave_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "analysis_period", number); + ssc_data_set_array(ptr, "ac_degradation", arr, length); }); } -SAM_EXPORT void SAM_MhkWave_Lifetime_generic_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ +SAM_EXPORT void SAM_MhkWave_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_array(ptr, "generic_degradation", arr, length); + ssc_data_set_number(ptr, "analysis_period", number); }); } @@ -462,21 +462,21 @@ SAM_EXPORT double* SAM_MhkWave_MHKWave_year_aget(SAM_table ptr, int* length, SAM return result; } -SAM_EXPORT double SAM_MhkWave_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err){ - double result; +SAM_EXPORT double* SAM_MhkWave_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err){ + double* result = nullptr; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "analysis_period", &result)) - make_access_error("SAM_MhkWave", "analysis_period"); + result = ssc_data_get_array(ptr, "ac_degradation", length); + if (!result) + make_access_error("SAM_MhkWave", "ac_degradation"); }); return result; } -SAM_EXPORT double* SAM_MhkWave_Lifetime_generic_degradation_aget(SAM_table ptr, int* length, SAM_error *err){ - double* result = nullptr; +SAM_EXPORT double SAM_MhkWave_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err){ + double result; translateExceptions(err, [&]{ - result = ssc_data_get_array(ptr, "generic_degradation", length); - if (!result) - make_access_error("SAM_MhkWave", "generic_degradation"); + if (!ssc_data_get_number(ptr, "analysis_period", &result)) + make_access_error("SAM_MhkWave", "analysis_period"); }); return result; } diff --git a/api/modules/SAM_Windpower.cpp b/api/modules/SAM_Windpower.cpp index 13c3c17a7..8cabea9f5 100644 --- a/api/modules/SAM_Windpower.cpp +++ b/api/modules/SAM_Windpower.cpp @@ -302,6 +302,24 @@ SAM_EXPORT void SAM_Windpower_Losses_wake_int_loss_nset(SAM_table ptr, double nu }); } +SAM_EXPORT void SAM_Windpower_Lifetime_ac_degradation_aset(SAM_table ptr, double* arr, int length, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_array(ptr, "ac_degradation", arr, length); + }); +} + +SAM_EXPORT void SAM_Windpower_Lifetime_analysis_period_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "analysis_period", number); + }); +} + +SAM_EXPORT void SAM_Windpower_Lifetime_system_use_lifetime_output_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "system_use_lifetime_output", number); + }); +} + SAM_EXPORT void SAM_Windpower_AdjustmentFactors_adjust_constant_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_number(ptr, "adjust_constant", number); @@ -844,6 +862,34 @@ SAM_EXPORT double SAM_Windpower_Losses_wake_int_loss_nget(SAM_table ptr, SAM_err return result; } +SAM_EXPORT double* SAM_Windpower_Lifetime_ac_degradation_aget(SAM_table ptr, int* length, SAM_error *err){ + double* result = nullptr; + translateExceptions(err, [&]{ + result = ssc_data_get_array(ptr, "ac_degradation", length); + if (!result) + make_access_error("SAM_Windpower", "ac_degradation"); + }); + return result; +} + +SAM_EXPORT double SAM_Windpower_Lifetime_analysis_period_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "analysis_period", &result)) + make_access_error("SAM_Windpower", "analysis_period"); + }); + return result; +} + +SAM_EXPORT double SAM_Windpower_Lifetime_system_use_lifetime_output_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "system_use_lifetime_output", &result)) + make_access_error("SAM_Windpower", "system_use_lifetime_output"); + }); + return result; +} + SAM_EXPORT double SAM_Windpower_AdjustmentFactors_adjust_constant_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ diff --git a/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json index 8d74abcec..3c3ac11fb 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json +++ b/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json @@ -20176,6 +20176,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -20192,7 +20195,7 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Commercial.json b/deploy/runtime/defaults/Custom Generation Battery_Commercial.json index dc17df1ae..297f00e79 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Commercial.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Commercial.json @@ -37018,6 +37018,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -37033,7 +37036,7 @@ "first_year_output": 361612.8, "first_year_output_peak": 206.4, "fixed_plant_input": 0.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json b/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json index 23c72f3f2..2f4224a50 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json @@ -46505,6 +46505,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -46530,7 +46533,7 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json index 4395abd94..98bd20c80 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json @@ -20184,6 +20184,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -20200,7 +20203,7 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json b/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json index b05608bd7..f0c2c804d 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json @@ -10791,6 +10791,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -10806,7 +10809,7 @@ "first_year_output_peak": 19200.0, "fixed_plant_input": 0.0, "forecast_price_signal_model": 1.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Residential.json b/deploy/runtime/defaults/Custom Generation Battery_Residential.json index 63e2a6c5d..41f08e225 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Residential.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Residential.json @@ -8857,9 +8857,9 @@ "batt_computed_stacks_series": 1.0, "batt_computed_strings": 107.0, "batt_computed_voltage": 51.74, - "batt_current_charge_max": 96.30000000000001, + "batt_current_charge_max": 96.3, "batt_current_choice": 1.0, - "batt_current_discharge_max": 96.30000000000001, + "batt_current_discharge_max": 96.3, "batt_custom_dispatch": [ 0.0 ], @@ -9825,7 +9825,7 @@ 0.0, 0.0 ], - "batt_mass": 177.94864285714287, + "batt_mass": 177.9486428571429, "batt_maximum_SOC": 95.0, "batt_meter_position": 0.0, "batt_minimum_SOC": 30.0, @@ -9890,7 +9890,7 @@ "batt_size_choice": 0.0, "batt_specific_energy_per_mass": 70.0, "batt_specific_energy_per_volume": 82.0, - "batt_surface_area": 1.7081938826471875, + "batt_surface_area": 1.7081938826471877, "batt_target_choice": 0.0, "batt_target_power": [ 1.0, @@ -18695,7 +18695,7 @@ "battery_power": 4.982562000000001, "battery_thermal_shown": 0.0, "battery_total": 7404.087132000001, - "battery_total_cost_lcos": 9231.464459635201, + "battery_total_cost_lcos": 9231.464459635199, "battery_voltage_shown": 0.0, "cap_vs_temp": [ [ @@ -37008,6 +37008,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -37020,10 +37023,10 @@ "federal_tax_rate": [ 15.0 ], - "first_year_output": 13455.359999999999, + "first_year_output": 13455.36, "first_year_output_peak": 7.68, "fixed_plant_input": 0.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ @@ -63423,7 +63426,7 @@ 1.87435 ], "nameplate_capacity": 8.0, - "nominal_discount_rate": 9.060000000000003, + "nominal_discount_rate": 9.060000000000004, "normalize_to_utility_bill": 0.0, "om_batt_capacity_cost": [ 15.0 @@ -63558,7 +63561,7 @@ "system_capacity": 8.0, "system_capacity_combined": 0.0, "system_use_lifetime_output": 1.0, - "total_battery_indirect_cost": 1827.3773276352002, + "total_battery_indirect_cost": 1827.3773276352, "total_direct_cost": 16174.2914886, "total_indirect_cost": 9136.886638176, "total_installed_cost": 26119.892701206, diff --git a/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json b/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json index da4e6fffc..7d53e24be 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json @@ -20171,6 +20171,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -20187,7 +20190,7 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json b/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json index 9478e26ce..17d46f803 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json @@ -20185,6 +20185,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 15.0, "equip2_reserve_cost": 0.0, @@ -20201,7 +20204,7 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Battery_Third Party.json b/deploy/runtime/defaults/Custom Generation Battery_Third Party.json index 8959708ab..ed0882629 100644 --- a/deploy/runtime/defaults/Custom Generation Battery_Third Party.json +++ b/deploy/runtime/defaults/Custom Generation Battery_Third Party.json @@ -36954,6 +36954,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -36965,7 +36968,7 @@ ], "first_year_output": 6727.679999999999, "first_year_output_peak": 3.84, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Profile_All Equity Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Profile_All Equity Partnership Flip.json index 80ca1abe9..c3c1f291b 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_All Equity Partnership Flip.json +++ b/deploy/runtime/defaults/Custom Generation Profile_All Equity Partnership Flip.json @@ -9578,6 +9578,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 12.0, "equip2_reserve_cost": 0.0, @@ -9594,6 +9597,9 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -19169,7 +19175,7 @@ ], "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_equity_percent": 98.0, "tax_investor_postflip_cash_percent": 10.0, "tax_investor_postflip_tax_percent": 10.0, diff --git a/deploy/runtime/defaults/Custom Generation Profile_Commercial.json b/deploy/runtime/defaults/Custom Generation Profile_Commercial.json index d7a8bf614..8c974b9db 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Commercial.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Commercial.json @@ -115,6 +115,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -130,6 +133,9 @@ "first_year_output": 35591986.409472, "first_year_output_peak": 9318.8352, "fixed_plant_input": 0.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -26608,7 +26614,7 @@ ], "system_capacity": 9707.12, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_direct_cost": 10192476.0, "total_indirect_cost": 1375984.26, "total_installed_cost": 11976159.3, diff --git a/deploy/runtime/defaults/Custom Generation Profile_Host Developer.json b/deploy/runtime/defaults/Custom Generation Profile_Host Developer.json index 887a7ef6e..f2b8097fb 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Host Developer.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Host Developer.json @@ -9602,6 +9602,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 0.0, "equip2_reserve_cost": 0.0, @@ -9627,6 +9630,9 @@ "fixed_plant_input": 0.0, "flip_target_percent": 10.0, "flip_target_year": 10.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -36763,7 +36769,7 @@ ], "system_capacity": 9707.12, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "term_int_rate": 7.0, "term_tenor": 0.0, "tod_library": "Uniform Dispatch", diff --git a/deploy/runtime/defaults/Custom Generation Profile_LCOE Calculator.json b/deploy/runtime/defaults/Custom Generation Profile_LCOE Calculator.json index e0cdeb042..9bb7e171c 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_LCOE Calculator.json +++ b/deploy/runtime/defaults/Custom Generation Profile_LCOE Calculator.json @@ -50,9 +50,12 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "first_year_output": 756864000.0, "first_year_output_peak": 96000.0, - "fixed_charge_rate": 0.09243041098233787, + "fixed_charge_rate": 0.09243041098233788, "fixed_operating_cost": 2500000.0, "grid_curtailment": [ 1e38, @@ -8824,12 +8827,12 @@ "system_capacity_combined": 0.0, "ui_capital_cost_capacity": 1000.0, "ui_capital_cost_fixed": 27405000.0, - "ui_cfin": 1.0202725306040699, + "ui_cfin": 1.02027253060407, "ui_cost_input_option": 1.0, "ui_crf": 0.08426619052849123, "ui_fcr_input_option": 1.0, "ui_fixed_charge_rate": 0.098, - "ui_ireal": 0.043902439024390508, + "ui_ireal": 0.04390243902439051, "ui_lbl_cff_msg": "", "ui_operating_cost_capacity": 25.0, "ui_operating_cost_fixed": 765000.0, @@ -8837,7 +8840,7 @@ "ui_step_minutes": 60.0, "ui_system_capacity": 100000.0, "ui_variable_operating_cost": 0.0, - "ui_wacc": 0.055843902439024487, + "ui_wacc": 0.05584390243902449, "user_capacity_factor": 90.0, "variable_operating_cost": 0.0 } \ No newline at end of file diff --git a/deploy/runtime/defaults/Custom Generation Profile_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Profile_Leveraged Partnership Flip.json index 9f3e532fa..f369a299b 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Leveraged Partnership Flip.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Leveraged Partnership Flip.json @@ -9586,6 +9586,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 12.0, "equip2_reserve_cost": 0.0, @@ -9602,6 +9605,9 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -19178,7 +19184,7 @@ ], "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_equity_percent": 98.0, "tax_investor_postflip_cash_percent": 10.0, "tax_investor_postflip_tax_percent": 10.0, diff --git a/deploy/runtime/defaults/Custom Generation Profile_Merchant Plant.json b/deploy/runtime/defaults/Custom Generation Profile_Merchant Plant.json index c0fafb2a7..3045a7007 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Merchant Plant.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Merchant Plant.json @@ -193,6 +193,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 12.0, "equip2_reserve_cost": 0.0, @@ -208,6 +211,9 @@ "first_year_output_peak": 96000.0, "fixed_plant_input": 0.0, "forecast_price_signal_model": 1.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -666264,7 +666270,7 @@ ], "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "term_int_rate": 7.0, "term_tenor": 18.0, "total_direct_cost": 105000000.0, diff --git a/deploy/runtime/defaults/Custom Generation Profile_None.json b/deploy/runtime/defaults/Custom Generation Profile_None.json index 04d16ade5..16f3eac55 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_None.json +++ b/deploy/runtime/defaults/Custom Generation Profile_None.json @@ -28,6 +28,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "first_year_output": 756864000.0, "first_year_output_peak": 96000.0, "grid_curtailment": [ diff --git a/deploy/runtime/defaults/Custom Generation Profile_Residential.json b/deploy/runtime/defaults/Custom Generation Profile_Residential.json index 02166d327..bbd042238 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Residential.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Residential.json @@ -105,6 +105,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -120,6 +123,9 @@ "first_year_output": 60549.119999999995, "first_year_output_peak": 7.68, "fixed_plant_input": 0.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -26601,7 +26607,7 @@ ], "system_capacity": 8.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_direct_cost": 8400.0, "total_indirect_cost": 0.0, "total_installed_cost": 8736.0, diff --git a/deploy/runtime/defaults/Custom Generation Profile_Sale Leaseback.json b/deploy/runtime/defaults/Custom Generation Profile_Sale Leaseback.json index 5c71a2319..3c6c51b7f 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Sale Leaseback.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Sale Leaseback.json @@ -9573,6 +9573,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 12.0, "equip2_reserve_cost": 0.0, @@ -9589,6 +9592,9 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -19166,7 +19172,7 @@ ], "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_required_lease_reserve": 6.0, "tod_library": "Uniform Dispatch", "total_direct_cost": 105000000.0, diff --git a/deploy/runtime/defaults/Custom Generation Profile_Single Owner.json b/deploy/runtime/defaults/Custom Generation Profile_Single Owner.json index af6244711..152d5e240 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Single Owner.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Single Owner.json @@ -9587,6 +9587,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "equip1_reserve_cost": 0.0, "equip1_reserve_freq": 12.0, "equip2_reserve_cost": 0.0, @@ -9603,6 +9606,9 @@ "fixed_plant_input": 0.0, "flip_target_percent": 11.0, "flip_target_year": 20.0, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -19186,7 +19192,7 @@ ], "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", diff --git a/deploy/runtime/defaults/Custom Generation Profile_Third Party.json b/deploy/runtime/defaults/Custom Generation Profile_Third Party.json index b6e734950..0506e3bcb 100644 --- a/deploy/runtime/defaults/Custom Generation Profile_Third Party.json +++ b/deploy/runtime/defaults/Custom Generation Profile_Third Party.json @@ -59,6 +59,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "escal_belpe": [ 0.0 ], @@ -70,6 +73,9 @@ ], "first_year_output": 30274.56, "first_year_output_peak": 3.84, + "ac_degradation": [ + 0.0 + ], "grid_curtailment": [ 1e38, 1e38, @@ -26409,7 +26415,7 @@ "start_day_of_year_load_ui": 3.335046e-317, "system_capacity": 4.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "ui_annual_load": 0.0, "ui_step_minutes": 60.0, "ur_annual_min_charge": 0.0, diff --git a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json index d0436c43d..28923bd34 100644 --- a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json @@ -1,5 +1,8 @@ { "CustomGeneration": { + "ac_degradation": [ + 0.0 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -41,6 +44,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "first_year_output": 756864000.0, "first_year_output_peak": 96000.0, "fixed_plant_input": 0.0, @@ -68,7 +74,7 @@ "spec_mode": 0.0, "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_direct_cost": 108400000.0, "total_indirect_cost": 21138000.0, "total_installed_cost": 133874000.0, @@ -106,7 +112,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -127,9 +133,12 @@ "contingency_percent": 4.0, "country": "-", "dc_ac_ratio": 1.15, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -165,7 +174,7 @@ "inverter_total": 23478.26086956522, "inverterarray_power": 469.5652173913044, "is_advanced": 0.0, - "land_area_value": 2.340996281197352, + "land_area_value": 2.3409962811973519, "land_fixed": 0.0, "land_per_acre": 0.0, "land_per_watt": 0.0, @@ -198,7 +207,7 @@ "module_power": 540.0, "module_total": 232200.0, "module_type": 0.0, - "modulearray_area": 2842.105263157895, + "modulearray_area": 2842.1052631578947, "modulearray_power": 540.0, "om_capacity": [ 22.0 @@ -274,24 +283,24 @@ "step": 3600.0, "subtotal_direct": 676878.2608695652, "system_capacity": 540.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 0.0, "total_direct_cost": 703953.3913043478, "total_indirect_cost": 205200.0, - "total_installed_cost": 937311.5269565216, - "total_land_area": 2.340996281197352, - "total_module_area": 2842.105263157895, + "total_installed_cost": 937311.5269565217, + "total_land_area": 2.3409962811973519, + "total_module_area": 2842.1052631578947, "tz": -7.0, - "ui_ac_capacity": 0.4695652173913044, - "ui_array_land_area_acres": 2.340996281197352, - "ui_array_land_area_ha": 0.9473690460319912, + "ui_ac_capacity": 0.46956521739130438, + "ui_array_land_area_acres": 2.3409962811973519, + "ui_array_land_area_ha": 0.9473690460319911, "ui_array_land_area_multiplier": 1.0, "ui_land_area_additional": 0.0, "ui_land_area_additional_units": 0.0, "ui_land_area_per_mw": 0.0, "ui_step_minutes": 60.0, - "ui_total_land_area_ha": 0.9473690460319912, - "ui_total_module_area": 2842.105263157895, + "ui_total_land_area_ha": 0.9473690460319911, + "ui_total_module_area": 2842.1052631578947, "ui_total_module_area_acres": 0.7022988843592055, "ui_total_module_area_ha": 0.28421052631578949, "ui_use_acre_per_mw": 0.0, @@ -304,6 +313,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -333,7 +345,7 @@ ], "desired_farm_size": 0.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -370,12 +382,12 @@ "specify_label": 0.0, "step": 3600.0, "system_capacity": 100.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 605500.0, "total_installed_cost_per_kw": 6055.0, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -27791,7 +27803,7 @@ "batt_cell_power_charge_max": 2.0, "batt_cell_power_discharge_max": 2.0, "batt_chem": 1.0, - "batt_computed_bank_capacity": 1200.54312, + "batt_computed_bank_capacity": 1200.5431199999999, "batt_computed_series": 126.0, "batt_computed_stacks_series": 0.0, "batt_computed_strings": 1064.0, @@ -28771,9 +28783,9 @@ "batt_minimum_modetime": 10.0, "batt_num_cells": 134064.0, "batt_power_charge_max_kwac": 312.64143749999996, - "batt_power_charge_max_kwdc": 300.13578, + "batt_power_charge_max_kwdc": 300.13577999999998, "batt_power_discharge_max_kwac": 288.1303487999999, - "batt_power_discharge_max_kwdc": 300.13578, + "batt_power_discharge_max_kwdc": 300.13577999999998, "batt_pv_ac_forecast": [ 0.0 ], @@ -28816,7 +28828,7 @@ "batt_ui_bank_voltage": 501.48, "batt_ui_cell_voltage": 3.98, "batt_ui_inverter_eff": 96.0, - "batt_ui_nominal_bank_power": 300.13578, + "batt_ui_nominal_bank_power": 300.13577999999998, "batt_unit_capacity": 400.0, "batt_unit_surface_area": 30.0, "batt_user_specified_weather_file_peak_shaving": "", @@ -28848,13 +28860,13 @@ 0.5 ] ], - "batt_volume": 14.64076975609756, - "battery_energy": 1200.54312, + "batt_volume": 14.640769756097559, + "battery_energy": 1200.5431199999999, "battery_indirect_cost_percent": 0.0, "battery_losses_shown": 0.0, "battery_per_kW": 667.0, "battery_per_kWh": 184.0, - "battery_power": 300.13578, + "battery_power": 300.13577999999998, "battery_thermal_shown": 0.0, "battery_total": 421090.49934, "battery_total_cost_lcos": 421090.49934, @@ -30209,7 +30221,7 @@ 65637.4, 62524.4, 75159.3, - 66769.6, + 66769.59999999999, 78419.4, 69738.1, 79130.4, @@ -30222,17 +30234,17 @@ 23783.9, 21382.1, 20961.0, - 26337.8, + 26337.800000000003, 42498.8, 44231.9, 50858.2, 50575.2, - 57217.4, + 57217.399999999994, 54770.0, 62565.5, 62546.6, 69027.3, - 64461.7, + 64461.69999999999, 71898.1, 68317.3, 74500.8, @@ -30250,7 +30262,7 @@ 155912.0, 130833.0, 132272.0, - 128764.0, + 128764.00000000002, 130137.0, 41616.6, 38936.2, @@ -30361,12 +30373,12 @@ 99832.0, 90010.5, 85697.8, - 85382.9, - 82611.6, + 85382.90000000001, + 82611.59999999999, 75291.2, - 50191.9, - 50711.4, - 57557.9, + 50191.899999999994, + 50711.399999999994, + 57557.899999999994, 74038.1, 33575.4, 33575.4, @@ -30405,7 +30417,7 @@ 38936.2, 41616.6, 157675.0, - 130223.0, + 130223.00000000002, 152852.0, 132786.0, 126285.0, @@ -30431,7 +30443,7 @@ 134520.0, 115363.0, 149152.0, - 129205.0, + 129205.00000000002, 121570.0, 121960.0, 125404.0, @@ -30490,7 +30502,7 @@ 124638.0, 94637.1, 97234.7, - 88933.1, + 88933.09999999999, 91846.3, 41616.6, 38936.2, @@ -30529,13 +30541,13 @@ 96210.0, 89250.9, 85544.6, - 85889.8, + 85889.79999999999, 84167.2, - 78445.4, + 78445.40000000001, 52949.5, 51678.4, 55887.7, - 71313.9, + 71313.90000000001, 33575.4, 33575.4, 33575.4, @@ -30698,7 +30710,7 @@ 98505.7, 91924.9, 91046.2, - 85477.9, + 85477.90000000001, 79458.4, 56576.4, 55824.3, @@ -30739,7 +30751,7 @@ 41792.1, 43477.7, 45228.7, - 47500.1, + 47500.100000000006, 172999.0, 141927.0, 162336.0, @@ -30778,7 +30790,7 @@ 122099.0, 90814.5, 93228.2, - 85575.6, + 85575.59999999999, 87925.9, 41616.6, 38936.2, @@ -30802,7 +30814,7 @@ 122218.0, 91146.9, 93502.0, - 86483.1, + 86483.09999999999, 89450.1, 41616.6, 38936.2, @@ -30851,7 +30863,7 @@ 90298.6, 92199.6, 83898.4, - 86446.7, + 86446.70000000001, 41616.6, 38936.2, 33575.4, @@ -30864,13 +30876,13 @@ 84471.8, 94076.0, 88073.8, - 80752.8, + 80752.79999999999, 83212.7, 82307.2, 77449.4, 52473.2, 52681.8, - 51462.9, + 51462.899999999994, 66957.9, 33575.4, 33575.4, @@ -30922,8 +30934,8 @@ 121954.0, 86707.6, 88599.8, - 79362.8, - 82089.3, + 79362.79999999999, + 82089.29999999999, 41616.6, 38936.2, 38936.2, @@ -31017,7 +31029,7 @@ 126843.0, 124682.0, 88513.2, - 86986.9, + 86986.90000000001, 77743.9, 81084.8, 41616.6, @@ -31033,11 +31045,11 @@ 92927.8, 91589.7, 87678.4, - 87836.2, - 85348.3, + 87836.20000000001, + 85348.29999999999, 82296.0, - 64172.3, - 66613.2, + 64172.30000000001, + 66613.20000000001, 68223.9, 80777.2, 33575.4, @@ -31079,7 +31091,7 @@ 149261.0, 123809.0, 147564.0, - 128823.0, + 128823.00000000002, 122579.0, 125586.0, 128886.0, @@ -31090,7 +31102,7 @@ 121551.0, 90239.1, 90854.0, - 82031.4, + 82031.40000000001, 85227.3, 41616.6, 38936.2, @@ -31111,11 +31123,11 @@ 134567.0, 133442.0, 133533.0, - 128937.0, + 128937.00000000002, 90182.6, 88579.6, 76377.0, - 76546.1, + 76546.09999999999, 41616.6, 38936.2, 38936.2, @@ -31125,7 +31137,7 @@ 38936.2, 41616.6, 68105.8, - 68996.8, + 68996.79999999999, 130897.0, 125398.0, 125853.0, @@ -31137,7 +31149,7 @@ 129218.0, 127428.0, 89081.7, - 85006.2, + 85006.20000000001, 70622.5, 70793.3, 41616.6, @@ -31148,7 +31160,7 @@ 38936.2, 38936.2, 41616.6, - 72207.4, + 72207.40000000001, 69731.5, 126489.0, 119797.0, @@ -31161,7 +31173,7 @@ 122950.0, 117617.0, 84562.9, - 86619.2, + 86619.20000000001, 78609.7, 81926.4, 41616.6, @@ -31186,7 +31198,7 @@ 118809.0, 91306.7, 93633.5, - 85924.4, + 85924.40000000001, 88787.8, 41616.6, 38936.2, @@ -31201,10 +31213,10 @@ 104526.0, 94995.2, 85698.6, - 85528.6, + 85528.59999999999, 82014.1, 75615.5, - 49681.4, + 49681.399999999994, 49085.0, 50838.1, 69418.3, @@ -31218,10 +31230,10 @@ 33575.4, 33575.4, 38437.1, - 41040.1, + 41040.100000000006, 40948.3, 38129.5, - 23750.8, + 23750.800000000003, 20299.9, 18771.4, 18771.4, @@ -31292,7 +31304,7 @@ 38936.2, 38936.2, 41616.6, - 81207.4, + 81207.40000000001, 82448.8, 130369.0, 117397.0, @@ -31317,7 +31329,7 @@ 38936.2, 41616.6, 73283.2, - 77828.9, + 77828.90000000001, 131034.0, 119115.0, 120381.0, @@ -31329,7 +31341,7 @@ 126347.0, 122171.0, 87738.4, - 85747.3, + 85747.29999999999, 72230.3, 73031.2, 41616.6, @@ -31342,7 +31354,7 @@ 41616.6, 64181.1, 69357.1, - 129610.0, + 129610.00000000002, 123291.0, 125708.0, 135655.0, @@ -31366,14 +31378,14 @@ 33575.4, 68789.0, 62839.1, - 76509.2, + 76509.20000000001, 70842.1, - 72522.6, + 72522.59999999999, 80693.9, 89368.4, 89959.5, 58670.3, - 56307.9, + 56307.899999999994, 54234.1, 53970.6, 33575.4, @@ -31436,7 +31448,7 @@ 38936.2, 38936.2, 41616.6, - 85007.4, + 85007.40000000001, 81872.4, 128434.0, 119469.0, @@ -31451,7 +31463,7 @@ 84647.7, 85979.1, 76781.9, - 79581.9, + 79581.90000000001, 41616.6, 38936.2, 38936.2, @@ -31473,9 +31485,9 @@ 125737.0, 117521.0, 83519.5, - 83692.1, + 83692.09999999999, 74930.5, - 78331.4, + 78331.40000000001, 41616.6, 38936.2, 38936.2, @@ -31497,7 +31509,7 @@ 134676.0, 124996.0, 88148.3, - 82967.3, + 82967.29999999999, 69692.2, 72431.0, 41616.6, @@ -31536,10 +31548,10 @@ 50813.6, 70463.9, 75675.1, - 77855.9, + 77855.90000000001, 83533.3, 83345.5, - 79895.7, + 79895.70000000001, 50416.0, 47680.4, 45312.1, @@ -31580,9 +31592,9 @@ 38936.2, 38936.2, 41616.6, - 80966.1, - 78420.9, - 128068.0, + 80966.09999999999, + 78420.90000000001, + 128068.00000000002, 120228.0, 122232.0, 128351.0, @@ -31595,7 +31607,7 @@ 89708.0, 85696.8, 69935.2, - 69268.9, + 69268.90000000001, 41616.6, 38936.2, 38936.2, @@ -31606,7 +31618,7 @@ 41616.6, 65827.9, 68543.0, - 128276.0, + 128276.00000000002, 123124.0, 127450.0, 137010.0, @@ -31642,7 +31654,7 @@ 113931.0, 83557.8, 83293.8, - 71968.9, + 71968.90000000001, 74350.5, 41616.6, 38936.2, @@ -31653,7 +31665,7 @@ 38936.2, 41616.6, 80305.0, - 78678.7, + 78678.70000000001, 128767.0, 117487.0, 119011.0, @@ -31667,7 +31679,7 @@ 82913.2, 82535.5, 72246.3, - 75340.9, + 75340.90000000001, 41616.6, 38936.2, 38936.2, @@ -31676,7 +31688,7 @@ 38936.2, 38936.2, 41616.6, - 78056.7, + 78056.70000000001, 86869.0, 135769.0, 121407.0, @@ -31688,10 +31700,10 @@ 116419.0, 119312.0, 117314.0, - 89349.6, + 89349.59999999999, 88804.8, 78584.5, - 80379.9, + 80379.90000000001, 41616.6, 38936.2, 33575.4, @@ -31700,7 +31712,7 @@ 33575.4, 33575.4, 33575.4, - 80900.4, + 80900.40000000001, 68196.1, 77020.3, 78022.5, @@ -31761,7 +31773,7 @@ 123318.0, 114867.0, 86130.6, - 84017.8, + 84017.79999999999, 73462.2, 76872.0, 41616.6, @@ -31778,13 +31790,13 @@ 119550.0, 120943.0, 126516.0, - 129961.0, + 129961.00000000002, 135918.0, 133583.0, 133788.0, 132953.0, 120288.0, - 88324.3, + 88324.29999999999, 84177.7, 69665.5, 70773.4, @@ -31809,7 +31821,7 @@ 142052.0, 131520.0, 95680.0, - 88797.8, + 88797.79999999999, 71628.4, 70003.8, 41616.6, @@ -31822,7 +31834,7 @@ 41616.6, 54033.8, 66737.7, - 129097.0, + 129097.00000000002, 127287.0, 130950.0, 142693.0, @@ -31873,9 +31885,9 @@ 73337.1, 76981.3, 78842.1, - 85494.3, + 85494.29999999999, 87396.5, - 84744.2, + 84744.20000000001, 53898.6, 49861.0, 47676.8, @@ -31915,8 +31927,8 @@ 38936.2, 38936.2, 41616.6, - 77928.3, - 79855.1, + 77928.29999999999, + 79855.09999999999, 134102.0, 121489.0, 117108.0, @@ -31963,8 +31975,8 @@ 38936.2, 38936.2, 41616.6, - 87767.7, - 82336.2, + 87767.70000000001, + 82336.20000000001, 131651.0, 118206.0, 118501.0, @@ -31975,7 +31987,7 @@ 132713.0, 136447.0, 124041.0, - 87194.4, + 87194.40000000001, 91228.2, 73028.7, 71596.2, @@ -32002,7 +32014,7 @@ 93519.2, 94332.6, 73132.3, - 68822.9, + 68822.90000000001, 41616.6, 38936.2, 38936.2, @@ -32046,7 +32058,7 @@ 66098.4, 65012.5, 64738.7, - 55307.9, + 55307.899999999994, 26732.3, 33575.4, 33575.4, @@ -32070,7 +32082,7 @@ 42070.1, 38140.7, 44411.5, - 39742.6, + 39742.600000000006, 34316.8, 33575.4, 33575.4, @@ -32084,7 +32096,7 @@ 38936.2, 41616.6, 56429.1, - 62952.4, + 62952.399999999994, 130125.0, 128084.0, 132488.0, @@ -32135,7 +32147,7 @@ 63819.0, 135209.0, 128197.0, - 128413.0, + 128413.00000000002, 134494.0, 134603.0, 144112.0, @@ -32181,7 +32193,7 @@ 41616.6, 79893.7, 77574.4, - 130240.0, + 130240.00000000002, 116980.0, 114939.0, 119615.0, @@ -32203,14 +32215,14 @@ 33575.4, 33575.4, 33575.4, - 61883.9, + 61883.899999999994, 54359.7, 70912.3, 72644.2, 74528.9, 78955.8, - 79704.1, - 80250.2, + 79704.09999999999, + 80250.20000000001, 52361.0, 52024.2, 51074.0, @@ -32238,7 +32250,7 @@ 22390.6, 23276.5, 30670.5, - 32223.2, + 32223.199999999997, 23425.1, 33575.4, 33575.4, @@ -32251,8 +32263,8 @@ 38936.2, 38936.2, 41616.6, - 74337.9, - 76769.6, + 74337.90000000001, + 76769.59999999999, 128834.0, 122656.0, 124814.0, @@ -32262,8 +32274,8 @@ 140479.0, 141374.0, 143878.0, - 129222.0, - 86564.1, + 129222.00000000002, + 86564.09999999999, 91830.2, 73820.3, 72207.9, @@ -32299,7 +32311,7 @@ 38936.2, 38936.2, 41616.6, - 73440.7, + 73440.70000000001, 75499.7, 128957.0, 116648.0, @@ -32313,8 +32325,8 @@ 118756.0, 75932.2, 85961.9, - 68411.9, - 68475.1, + 68411.90000000001, + 68475.09999999999, 41616.6, 38936.2, 38936.2, @@ -32347,8 +32359,8 @@ 38936.2, 38936.2, 41616.6, - 57523.9, - 64206.5, + 57523.899999999994, + 64206.50000000001, 126383.0, 121758.0, 125553.0, @@ -32361,8 +32373,8 @@ 148948.0, 99181.9, 102062.0, - 77883.7, - 74635.1, + 77883.70000000001, + 74635.09999999999, 41616.6, 38936.2, 38936.2, @@ -32374,12 +32386,12 @@ 48477.3, 46403.8, 73858.7, - 81944.9, + 81944.90000000001, 86709.1, 93995.1, 97826.7, 99695.9, - 71279.7, + 71279.70000000001, 70894.8, 73226.4, 62713.4, @@ -32406,7 +32418,7 @@ 40220.0, 45099.1, 44128.4, - 45590.9, + 45590.899999999994, 37870.0, 38250.7, 33575.4, @@ -32587,7 +32599,7 @@ 38936.2, 38936.2, 41616.6, - 48182.9, + 48182.899999999994, 63271.3, 134211.0, 130156.0, @@ -32602,7 +32614,7 @@ 99254.0, 102567.0, 82472.9, - 77422.7, + 77422.70000000001, 41616.6, 38936.2, 38936.2, @@ -32612,7 +32624,7 @@ 38936.2, 41616.6, 42152.8, - 61638.4, + 61638.399999999994, 136060.0, 132857.0, 134569.0, @@ -32636,7 +32648,7 @@ 38936.2, 41616.6, 48038.9, - 64836.6, + 64836.600000000006, 141346.0, 139321.0, 144299.0, @@ -32713,10 +32725,10 @@ 72362.4, 75532.1, 80053.6, - 78729.2, + 78729.20000000001, 77216.7, 48656.7, - 46940.4, + 46940.399999999994, 45868.0, 36265.5, 22222.6, @@ -32740,7 +32752,7 @@ 18771.4, 18771.4, 18771.4, - 26540.2, + 26540.199999999997, 37443.3, 32916.9, 30493.1, @@ -32768,9 +32780,9 @@ 127929.0, 113915.0, 71349.5, - 78919.8, - 65729.2, - 67915.4, + 78919.79999999999, + 65729.20000000001, + 67915.40000000001, 41616.6, 38936.2, 38936.2, @@ -32791,9 +32803,9 @@ 125623.0, 126897.0, 112548.0, - 70758.8, - 77766.6, - 66619.2, + 70758.79999999999, + 77766.59999999999, + 66619.20000000001, 69453.2, 41616.6, 38936.2, @@ -32815,9 +32827,9 @@ 120914.0, 123746.0, 113029.0, - 73983.4, + 73983.40000000001, 81908.2, - 67370.4, + 67370.40000000001, 67723.5, 41616.6, 38936.2, @@ -32828,7 +32840,7 @@ 38936.2, 41616.6, 61363.8, - 70260.4, + 70260.40000000001, 126562.0, 118576.0, 118586.0, @@ -32839,7 +32851,7 @@ 134266.0, 140869.0, 128786.0, - 84772.9, + 84772.90000000001, 89890.0, 73765.1, 71064.6, @@ -32864,7 +32876,7 @@ 155382.0, 141624.0, 91461.4, - 88460.1, + 88460.09999999999, 70417.8, 69379.7, 41616.6, @@ -32876,10 +32888,10 @@ 33575.4, 33575.4, 46084.2, - 46087.9, + 46087.899999999994, 74048.7, - 82755.8, - 84313.9, + 82755.79999999999, + 84313.90000000001, 91813.5, 95159.1, 94153.9, @@ -32902,7 +32914,7 @@ 21238.7, 19076.5, 27158.3, - 32991.7, + 32991.700000000004, 34303.2, 28756.3, 20489.6, @@ -32937,7 +32949,7 @@ 122496.0, 83395.1, 89185.1, - 76196.7, + 76196.70000000001, 75572.5, 41616.6, 38936.2, @@ -32977,15 +32989,15 @@ 122621.0, 123305.0, 126911.0, - 128550.0, + 128550.00000000002, 134286.0, 130593.0, - 130716.0, + 130716.00000000002, 132876.0, 117576.0, - 74465.9, + 74465.90000000001, 78680.8, - 66881.2, + 66881.20000000001, 65934.4, 41616.6, 38936.2, @@ -33003,11 +33015,11 @@ 124942.0, 127830.0, 132310.0, - 129663.0, + 129663.00000000002, 131354.0, 136478.0, 122485.0, - 77710.1, + 77710.09999999999, 81027.6, 67482.4, 66054.7, @@ -33019,7 +33031,7 @@ 38936.2, 38936.2, 41616.6, - 48342.4, + 48342.399999999994, 64475.3, 124595.0, 117906.0, @@ -33045,9 +33057,9 @@ 33575.4, 37573.6, 43893.9, - 71650.6, + 71650.59999999999, 76011.0, - 79239.1, + 79239.09999999999, 85990.4, 88189.2, 89512.3, @@ -33127,7 +33139,7 @@ 152682.0, 152739.0, 133288.0, - 82212.6, + 82212.59999999999, 83780.3, 70744.6, 68483.7, @@ -33145,9 +33157,9 @@ 121924.0, 121913.0, 126770.0, - 128229.0, + 128229.00000000002, 132896.0, - 130550.0, + 130550.00000000002, 131374.0, 136072.0, 122141.0, @@ -33164,7 +33176,7 @@ 38936.2, 39149.3, 39534.0, - 60008.9, + 60008.899999999994, 126871.0, 119838.0, 120580.0, @@ -33175,7 +33187,7 @@ 145869.0, 152216.0, 136241.0, - 86606.1, + 86606.09999999999, 87590.8, 72214.9, 68907.6, @@ -33189,9 +33201,9 @@ 39149.3, 39618.0, 60232.8, - 128616.0, + 128616.00000000002, 125855.0, - 130205.0, + 130205.00000000002, 137279.0, 140820.0, 149723.0, @@ -33213,7 +33225,7 @@ 31108.0, 37688.2, 46979.3, - 77070.1, + 77070.09999999999, 86471.3, 90744.4, 95654.7, @@ -33222,7 +33234,7 @@ 71222.0, 73943.5, 75770.2, - 66958.3, + 66958.29999999999, 43009.2, 44450.2, 38503.8, @@ -33244,8 +33256,8 @@ 32731.1, 34304.7, 39460.2, - 44742.6, - 46791.6, + 44742.600000000006, + 46791.600000000006, 45380.3, 44936.8, 46322.8, @@ -33274,7 +33286,7 @@ 98019.6, 93566.5, 79386.6, - 74912.4, + 74912.40000000001, 41616.6, 38936.2, 38936.2, @@ -33310,7 +33322,7 @@ 34530.2, 58115.8, 131084.0, - 128300.0, + 128300.00000000002, 131648.0, 140337.0, 145856.0, @@ -33321,7 +33333,7 @@ 154733.0, 103853.0, 102152.0, - 86488.3, + 86488.29999999999, 81043.0, 41616.6, 38936.2, @@ -33370,7 +33382,7 @@ 120186.0, 112160.0, 91387.8, - 87032.7, + 87032.70000000001, 41616.6, 38936.2, 38936.2, @@ -33381,7 +33393,7 @@ 31108.0, 47217.2, 55420.5, - 88153.1, + 88153.09999999999, 94347.3, 96629.4, 103090.0, @@ -33406,7 +33418,7 @@ 18771.4, 22803.1, 29556.7, - 30029.7, + 30029.699999999997, 33116.9, 26219.7, 22010.4, @@ -33432,7 +33444,7 @@ 127954.0, 122102.0, 123479.0, - 128871.0, + 128871.00000000002, 131774.0, 140554.0, 140774.0, @@ -33442,7 +33454,7 @@ 97325.8, 92128.9, 75185.3, - 70433.6, + 70433.59999999999, 41616.6, 38936.2, 38936.2, @@ -33514,7 +33526,7 @@ 118414.0, 107539.0, 90920.5, - 86126.4, + 86126.40000000001, 41616.6, 38936.2, 38936.2, @@ -33537,7 +33549,7 @@ 164107.0, 111132.0, 105028.0, - 88013.6, + 88013.59999999999, 81831.0, 41616.6, 38936.2, @@ -33549,13 +33561,13 @@ 28640.7, 38011.3, 47846.0, - 77663.8, + 77663.79999999999, 82810.1, 85402.4, 90629.2, 92601.3, 94070.8, - 67945.4, + 67945.40000000001, 71132.3, 73141.2, 62817.7, @@ -33574,12 +33586,12 @@ 18771.4, 22482.0, 28505.1, - 32017.0, + 32017.000000000004, 31577.5, 26977.6, 24338.8, 27726.0, - 33136.2, + 33136.200000000004, 41692.0, 44982.4, 43355.0, @@ -33595,7 +33607,7 @@ 38936.2, 38936.2, 36681.9, - 37747.1, + 37747.100000000006, 62486.4, 136434.0, 132212.0, @@ -33610,7 +33622,7 @@ 108200.0, 101263.0, 88660.0, - 83253.9, + 83253.90000000001, 41616.6, 38936.2, 38936.2, @@ -33619,7 +33631,7 @@ 38936.2, 38936.2, 36681.9, - 46442.1, + 46442.100000000006, 71100.7, 148301.0, 145521.0, @@ -33709,7 +33721,7 @@ 94016.1, 41616.6, 44328.0, - 40665.1, + 40665.100000000006, 36988.3, 33575.4, 33575.4, @@ -33723,7 +33735,7 @@ 114725.0, 116985.0, 115622.0, - 83123.4, + 83123.40000000001, 77478.4, 73861.7, 62045.7, @@ -33749,14 +33761,14 @@ 46699.6, 45949.1, 48887.7, - 42877.9, + 42877.899999999994, 48719.2, 42504.2, - 46727.6, + 46727.600000000006, 46611.5, 44262.0, 39282.8, - 38958.4, + 38958.399999999994, 33575.4, 38273.0, 33575.4, @@ -33765,7 +33777,7 @@ 28640.7, 26312.2, 37418.2, - 38562.4, + 38562.399999999994, 41961.6, 40753.7, 41376.0, @@ -33773,7 +33785,7 @@ 38344.8, 39328.5, 46325.4, - 44223.1, + 44223.100000000006, 46008.6, 41747.6, 45371.6, @@ -33802,7 +33814,7 @@ 108565.0, 103181.0, 85172.4, - 78542.6, + 78542.59999999999, 41616.6, 38936.2, 38936.2, @@ -33811,8 +33823,8 @@ 38936.2, 38936.2, 34214.6, - 34460.8, - 60619.1, + 34460.799999999996, + 60619.100000000006, 135035.0, 131593.0, 135807.0, @@ -33860,7 +33872,7 @@ 38936.2, 34214.6, 52846.9, - 76131.2, + 76131.20000000001, 164442.0, 167055.0, 174091.0, @@ -33876,7 +33888,7 @@ 104333.0, 97921.7, 47352.2, - 40672.6, + 40672.600000000006, 42298.3, 33575.4, 33575.4, @@ -34064,7 +34076,7 @@ 94669.3, 80863.5, 45540.0, - 44528.4, + 44528.399999999994, 46600.9, 40463.1, 37338.8, @@ -34119,7 +34131,7 @@ 44343.7, 42232.5, 40548.6, - 43307.9, + 43307.899999999994, 38936.2, 38936.2, 35495.5, @@ -34148,7 +34160,7 @@ 38936.2, 34214.6, 50256.9, - 76275.4, + 76275.40000000001, 165894.0, 166405.0, 171050.0, @@ -34230,7 +34242,7 @@ 81989.8, 83597.4, 85755.5, - 74900.4, + 74900.40000000001, 43926.7, 42903.2, 44372.4, @@ -34244,10 +34256,10 @@ 33575.4, 26173.4, 22874.7, - 34911.2, + 34911.200000000004, 38552.9, 41798.1, - 41873.4, + 41873.399999999994, 43231.3, 38973.3, 43670.1, @@ -34260,7 +34272,7 @@ 48593.0, 40982.7, 33575.4, - 37872.1, + 37872.100000000006, 33575.4, 42366.0, 38936.2, @@ -34292,7 +34304,7 @@ 38936.2, 34214.6, 53292.6, - 76192.1, + 76192.09999999999, 162199.0, 159538.0, 162493.0, @@ -34394,7 +34406,7 @@ 114540.0, 122832.0, 127042.0, - 128877.0, + 128877.00000000002, 99644.0, 102101.0, 104116.0, @@ -34431,11 +34443,11 @@ 44917.1, 40510.0, 44860.3, - 43790.1, + 43790.100000000006, 42228.2, 42091.8, 37953.2, - 59860.1, + 59860.100000000006, 83822.3, 173585.0, 174439.0, @@ -34452,10 +34464,10 @@ 121690.0, 107725.0, 50713.2, - 49004.4, + 49004.399999999994, 43215.3, 43317.3, - 41622.1, + 41622.100000000006, 40257.1, 42665.7, 34214.6, @@ -34477,7 +34489,7 @@ 103002.0, 47127.3, 48580.0, - 43778.4, + 43778.399999999994, 44595.0, 44043.5, 38936.2, @@ -34508,7 +34520,7 @@ 38936.2, 36681.9, 49589.2, - 76295.9, + 76295.90000000001, 166449.0, 164986.0, 168561.0, @@ -34563,10 +34575,10 @@ 102142.0, 106066.0, 110269.0, - 83596.4, + 83596.40000000001, 88216.5, 92157.7, - 83665.4, + 83665.40000000001, 48435.6, 47031.0, 59429.7, @@ -34580,15 +34592,15 @@ 33575.4, 28640.7, 24512.3, - 35366.1, + 35366.100000000006, 37297.5, 40195.4, 39590.6, 42690.3, 40911.6, - 41474.6, + 41474.600000000006, 46934.8, - 50197.9, + 50197.899999999994, 53283.5, 54897.5, 55734.0, @@ -34624,7 +34636,7 @@ 43548.4, 36595.9, 35072.6, - 35009.7, + 35009.700000000004, 36412.8, 28640.7, 31902.5, @@ -34636,9 +34648,9 @@ 48860.8, 54553.3, 55134.6, - 60052.1, + 60052.100000000006, 55005.2, - 58535.6, + 58535.600000000006, 57210.7, 58006.2, 62301.8, @@ -34652,7 +34664,7 @@ 43984.7, 41371.4, 61914.0, - 86946.7, + 86946.70000000001, 181086.0, 181449.0, 187562.0, @@ -34665,7 +34677,7 @@ 237092.0, 178633.0, 160063.0, - 129085.0, + 129085.00000000002, 120251.0, 55381.7, 56595.0, @@ -34676,7 +34688,7 @@ 43377.8, 39454.5, 59372.3, - 84690.7, + 84690.70000000001, 180423.0, 180836.0, 186225.0, @@ -34695,12 +34707,12 @@ 57505.3, 50634.3, 49176.8, - 44499.9, + 44499.899999999994, 44399.9, 44392.7, 42877.8, 61413.9, - 86759.9, + 86759.90000000001, 186891.0, 190837.0, 198747.0, @@ -34728,7 +34740,7 @@ 99375.9, 111364.0, 120912.0, - 129247.0, + 129247.00000000002, 133878.0, 135635.0, 106555.0, @@ -34737,8 +34749,8 @@ 104461.0, 50562.2, 47998.5, - 60851.1, - 54662.1, + 60851.100000000006, + 54662.100000000006, 49830.8, 46546.6, 46981.0, @@ -34747,20 +34759,20 @@ 39051.2, 37072.2, 31226.5, - 33383.9, + 33383.899999999994, 38638.2, 43888.9, 43707.1, 48372.9, 47561.9, - 51602.6, + 51602.600000000006, 50188.4, 54905.1, 53373.5, 58458.6, 53827.7, 54709.8, - 50053.6, + 50053.600000000006, 59649.0, 48638.9, 48627.8, @@ -34835,7 +34847,7 @@ 133809.0, 111991.0, 101711.0, - 46342.4, + 46342.399999999994, 47284.9, 43470.6, 43822.5, @@ -34909,10 +34921,10 @@ 48392.7, 42806.0, 43741.9, - 37187.6, + 37187.600000000006, 35326.6, - 37129.6, - 35290.8, + 37129.600000000006, + 35290.799999999996, 33575.4, 28640.7, 27544.1, @@ -34964,7 +34976,7 @@ 40224.8, 39149.3, 53128.0, - 77252.8, + 77252.79999999999, 169719.0, 169251.0, 173099.0, @@ -35035,7 +35047,7 @@ 48440.3, 44376.0, 40901.1, - 65242.1, + 65242.09999999999, 91892.5, 189946.0, 191572.0, @@ -35058,21 +35070,21 @@ 39916.4, 38909.8, 33575.4, - 32777.8, + 32777.799999999996, 61648.2, 65035.8, 99909.1, 111456.0, 120101.0, - 130216.0, + 130216.00000000002, 135280.0, 140580.0, 104011.0, - 88509.2, + 88509.20000000001, 83248.7, 73550.1, 42034.8, - 43465.9, + 43465.899999999994, 48809.9, 45493.5, 40366.0, @@ -35098,8 +35110,8 @@ 56008.7, 53986.7, 59768.4, - 55493.9, - 48264.9, + 55493.899999999994, + 48264.899999999994, 47056.5, 45929.0, 50834.8, @@ -35108,7 +35120,7 @@ 43418.0, 44603.2, 62498.2, - 85644.9, + 85644.90000000001, 179676.0, 180858.0, 186870.0, @@ -35128,7 +35140,7 @@ 45932.2, 45891.8, 42474.2, - 44111.6, + 44111.600000000006, 43868.6, 39149.3, 60422.3, @@ -35174,7 +35186,7 @@ 53145.4, 54322.6, 43603.0, - 44558.1, + 44558.100000000006, 43922.4, 43618.3, 40385.5, @@ -35204,7 +35216,7 @@ 38936.2, 43561.4, 58310.4, - 80007.4, + 80007.40000000001, 174458.0, 177339.0, 184796.0, @@ -35221,13 +35233,13 @@ 107272.0, 51331.5, 44657.0, - 42924.1, + 42924.100000000006, 39202.9, 33575.4, 38063.3, 33575.4, 31108.0, - 57211.4, + 57211.399999999994, 63663.9, 100045.0, 111288.0, @@ -35276,7 +35288,7 @@ 43547.0, 43416.7, 53673.9, - 75867.4, + 75867.40000000001, 166477.0, 166347.0, 170960.0, @@ -35294,7 +35306,7 @@ 46362.4, 47451.7, 44383.5, - 42501.4, + 42501.399999999994, 40660.3, 44090.5, 42343.2, @@ -35346,7 +35358,7 @@ 43597.6, 47871.6, 44311.4, - 45185.9, + 45185.899999999994, 64047.9, 86061.8, 180445.0, @@ -35387,15 +35399,15 @@ 146778.0, 124682.0, 116646.0, - 52686.1, - 55529.9, + 52686.100000000006, + 55529.899999999994, 48904.2, 44359.0, 40135.0, 37903.9, 37768.2, 35929.6, - 69891.1, + 69891.09999999999, 77826.3, 113315.0, 123156.0, @@ -35417,16 +35429,16 @@ 43673.2, 38606.5, 39515.3, - 35610.8, + 35610.799999999996, 37450.1, 35742.7, 44472.3, 43706.4, 47995.7, - 47916.6, + 47916.600000000006, 51403.0, 50586.1, - 54815.4, + 54815.399999999994, 54425.0, 59484.9, 60564.7, @@ -35443,7 +35455,7 @@ 52832.7, 44723.4, 51764.7, - 66318.7, + 66318.70000000001, 91784.8, 187270.0, 189457.0, @@ -35460,10 +35472,10 @@ 132854.0, 123499.0, 56457.1, - 64713.5, - 52546.1, + 64713.49999999999, + 52546.100000000006, 56647.2, - 51627.9, + 51627.899999999994, 51692.4, 49196.2, 55236.3, @@ -35485,7 +35497,7 @@ 122342.0, 58681.5, 61426.3, - 52145.9, + 52145.899999999994, 54116.3, 50622.7, 53012.3, @@ -35508,7 +35520,7 @@ 107001.0, 101285.0, 41616.6, - 45441.9, + 45441.899999999994, 45293.6, 38936.2, 44786.9, @@ -35539,7 +35551,7 @@ 44927.8, 41068.9, 45628.2, - 65379.5, + 65379.49999999999, 86717.4, 181402.0, 182158.0, @@ -35581,8 +35593,8 @@ 43441.7, 41687.7, 40651.1, - 37064.1, - 35259.7, + 37064.100000000006, + 35259.700000000004, 33575.4, 33575.4, 33575.4, @@ -35598,7 +35610,7 @@ 47784.2, 45923.4, 49392.8, - 46647.4, + 46647.399999999994, 46892.6, 48706.5, 50299.7, @@ -35636,7 +35648,7 @@ 38936.2, 41616.6, 58282.9, - 76042.9, + 76042.90000000001, 162779.0, 160460.0, 163822.0, @@ -35732,20 +35744,20 @@ 33575.4, 33575.4, 51680.4, - 53574.4, - 84900.6, + 53574.399999999994, + 84900.59999999999, 93693.5, 98711.1, 106331.0, 109715.0, 112617.0, - 84147.6, - 87781.6, + 84147.59999999999, + 87781.59999999999, 92687.6, 81194.1, 45728.0, 51917.1, - 48440.6, + 48440.600000000006, 40570.4, 37308.5, 35370.1, @@ -35764,7 +35776,7 @@ 45626.8, 45728.9, 49975.0, - 48790.1, + 48790.100000000006, 54003.9, 50786.4, 50820.7, @@ -35842,7 +35854,7 @@ 120526.0, 117332.0, 96596.3, - 89857.2, + 89857.20000000001, 41616.6, 38936.2, 38936.2, @@ -35851,7 +35863,7 @@ 38936.2, 38936.2, 41616.6, - 43185.9, + 43185.899999999994, 62798.7, 144703.0, 145544.0, @@ -35910,7 +35922,7 @@ 76168.9, 78559.1, 82778.5, - 71874.8, + 71874.79999999999, 43348.0, 47668.0, 38005.7, @@ -35990,7 +36002,7 @@ 53135.8, 47151.0, 47532.1, - 44434.4, + 44434.399999999994, 42279.7, 40617.2, 42072.0, @@ -36020,7 +36032,7 @@ 38936.2, 41616.6, 59920.8, - 75272.9, + 75272.90000000001, 163059.0, 162456.0, 167895.0, @@ -36109,15 +36121,15 @@ 46636.4, 45719.4, 45766.8, - 38480.6, + 38480.600000000006, 39246.5, 35552.6, - 37513.4, + 37513.399999999994, 33575.4, 39400.6, 24662.7, 40622.3, - 33067.8, + 33067.799999999996, 40980.3, 41290.2, 48213.7, @@ -36129,7 +36141,7 @@ 51769.6, 41390.1, 58478.0, - 47386.9, + 47386.899999999994, 47397.7, 44467.9, 39991.0, @@ -36188,7 +36200,7 @@ 38936.2, 41616.6, 51125.9, - 66294.8, + 66294.79999999999, 142839.0, 137140.0, 137998.0, @@ -36202,7 +36214,7 @@ 98179.8, 101503.0, 80446.1, - 77108.9, + 77108.90000000001, 41616.6, 38936.2, 38936.2, @@ -36226,7 +36238,7 @@ 106734.0, 111191.0, 89160.1, - 84260.6, + 84260.59999999999, 41616.6, 38936.2, 38936.2, @@ -36239,16 +36251,16 @@ 52167.2, 81718.0, 87139.9, - 88532.7, + 88532.70000000001, 93817.3, 97294.4, 100286.0, 72962.3, 74814.3, - 78235.3, + 78235.29999999999, 66702.7, 38557.5, - 44391.4, + 44391.399999999994, 33575.4, 33575.4, 33575.4, @@ -36322,7 +36334,7 @@ 107204.0, 108056.0, 87231.4, - 85036.9, + 85036.90000000001, 41616.6, 38936.2, 38936.2, @@ -36356,7 +36368,7 @@ 38936.2, 41616.6, 58535.3, - 70519.6, + 70519.59999999999, 147227.0, 142922.0, 146641.0, @@ -36404,7 +36416,7 @@ 33575.4, 33575.4, 50016.7, - 48881.1, + 48881.100000000006, 79475.0, 87099.5, 91237.1, @@ -36413,7 +36425,7 @@ 99896.1, 70930.9, 71389.6, - 73192.4, + 73192.40000000001, 62919.5, 41602.3, 41555.5, @@ -36433,7 +36445,7 @@ 36988.9, 42314.7, 36809.8, - 43401.9, + 43401.899999999994, 38870.7, 44157.5, 38892.5, @@ -36476,7 +36488,7 @@ 38936.2, 41616.6, 44353.3, - 59370.4, + 59370.399999999994, 131800.0, 126771.0, 129179.0, @@ -36490,7 +36502,7 @@ 89496.0, 91208.2, 71608.8, - 68237.1, + 68237.09999999999, 41616.6, 38936.2, 38936.2, @@ -36561,7 +36573,7 @@ 165890.0, 111399.0, 110720.0, - 88585.1, + 88585.09999999999, 83127.0, 41616.6, 38936.2, @@ -36679,7 +36691,7 @@ 207821.0, 212641.0, 188503.0, - 129776.0, + 129776.00000000002, 123196.0, 99019.0, 94695.6, @@ -36713,7 +36725,7 @@ 42205.3, 38936.2, 38936.2, - 43373.4, + 43373.399999999994, 41616.6, 65206.7, 73657.3, @@ -36755,7 +36767,7 @@ 47543.6, 40322.7, 39640.0, - 37433.1, + 37433.100000000006, 33575.4, 33575.4, 33575.4, @@ -36771,7 +36783,7 @@ 38786.8, 37496.1, 44248.2, - 39803.6, + 39803.600000000006, 45559.3, 40309.7, 45334.4, @@ -36835,8 +36847,8 @@ 38936.2, 38936.2, 41616.6, - 53441.9, - 64330.7, + 53441.899999999994, + 64330.69999999999, 141258.0, 139920.0, 148044.0, @@ -36935,12 +36947,12 @@ 18771.4, 19707.6, 31681.0, - 32204.7, + 32204.700000000004, 38485.0, - 33066.2, + 33066.200000000004, 42186.7, 38238.7, - 43480.6, + 43480.600000000006, 38776.8, 36790.3, 38519.8, @@ -36966,7 +36978,7 @@ 41921.2, 40987.3, 43190.2, - 41236.6, + 41236.600000000006, 44393.9, 33575.4, 33575.4, @@ -37006,7 +37018,7 @@ 49647.5, 57984.8, 130439.0, - 130532.0, + 130532.00000000002, 139786.0, 151225.0, 155046.0, @@ -37030,7 +37042,7 @@ 48785.2, 57546.3, 129876.0, - 129889.0, + 129889.00000000002, 139373.0, 150596.0, 152793.0, @@ -37042,7 +37054,7 @@ 109037.0, 101341.0, 78849.5, - 72975.1, + 72975.09999999999, 41616.6, 38936.2, 38936.2, @@ -37078,7 +37090,7 @@ 50737.6, 42685.7, 70633.9, - 78982.3, + 78982.29999999999, 85316.8, 94362.1, 98935.8, @@ -37112,7 +37124,7 @@ 46738.8, 43405.6, 39671.7, - 37087.9, + 37087.899999999994, 33575.4, 33575.4, 33575.4, @@ -37125,7 +37137,7 @@ 41616.6, 49465.7, 58090.3, - 130288.0, + 130288.00000000002, 131094.0, 141773.0, 153251.0, @@ -37138,7 +37150,7 @@ 113493.0, 105281.0, 83841.0, - 78894.4, + 78894.40000000001, 41616.6, 38936.2, 38936.2, @@ -37196,7 +37208,7 @@ 38936.2, 41616.6, 51165.8, - 59872.1, + 59872.100000000006, 133158.0, 132570.0, 140109.0, @@ -37220,7 +37232,7 @@ 38936.2, 41616.6, 52263.9, - 57544.6, + 57544.600000000006, 126422.0, 124585.0, 129688.0, @@ -37234,7 +37246,7 @@ 103331.0, 98223.5, 80166.9, - 77308.6, + 77308.59999999999, 41616.6, 38936.2, 38936.2, @@ -37278,7 +37290,7 @@ 37252.7, 38920.3, 36720.7, - 32225.5, + 32225.499999999996, 33575.4, 33575.4, 33575.4, @@ -37339,8 +37351,8 @@ 38936.2, 38936.2, 41616.6, - 53455.4, - 58057.9, + 53455.399999999994, + 58057.899999999994, 128346.0, 126164.0, 132655.0, @@ -37389,7 +37401,7 @@ 41616.6, 52056.9, 58486.5, - 128073.0, + 128073.00000000002, 122333.0, 124240.0, 132600.0, @@ -37418,10 +37430,10 @@ 66225.2, 70535.1, 72190.0, - 71877.7, + 71877.70000000001, 44880.2, 44910.3, - 46794.6, + 46794.600000000006, 43770.3, 33575.4, 33575.4, @@ -37483,7 +37495,7 @@ 38936.2, 38936.2, 41616.6, - 67010.1, + 67010.09999999999, 74731.8, 127005.0, 116056.0, @@ -37518,7 +37530,7 @@ 138742.0, 140214.0, 144989.0, - 129032.0, + 129032.00000000002, 93989.9, 86920.2, 69142.9, @@ -37532,7 +37544,7 @@ 38936.2, 41616.6, 68174.5, - 72268.9, + 72268.90000000001, 125993.0, 119515.0, 122365.0, @@ -37544,7 +37556,7 @@ 152423.0, 136822.0, 97038.8, - 89089.3, + 89089.29999999999, 70572.0, 68668.5, 41616.6, @@ -37555,12 +37567,12 @@ 38936.2, 38936.2, 41616.6, - 66238.3, + 66238.29999999999, 71469.9, 125446.0, 118764.0, 122007.0, - 130454.0, + 130454.00000000002, 136884.0, 146980.0, 147343.0, @@ -37570,7 +37582,7 @@ 100288.0, 90647.3, 71618.6, - 69267.8, + 69267.79999999999, 41616.6, 38936.2, 38936.2, @@ -37583,10 +37595,10 @@ 52492.4, 67725.6, 73481.9, - 78870.1, + 78870.09999999999, 86788.9, - 88872.2, - 89352.4, + 88872.20000000001, + 89352.40000000001, 60313.7, 57995.5, 58132.2, @@ -37628,7 +37640,7 @@ 38936.2, 38936.2, 41616.6, - 72309.7, + 72309.70000000001, 76839.1, 127519.0, 117105.0, @@ -37652,8 +37664,8 @@ 38936.2, 38936.2, 41616.6, - 71191.6, - 72631.2, + 71191.59999999999, + 72631.20000000001, 127732.0, 119847.0, 120590.0, @@ -37664,7 +37676,7 @@ 129346.0, 133731.0, 128183.0, - 87297.7, + 87297.70000000001, 85286.1, 71830.5, 72339.7, @@ -37689,7 +37701,7 @@ 132177.0, 125930.0, 84578.2, - 82387.9, + 82387.90000000001, 70589.1, 73020.4, 41616.6, @@ -37702,7 +37714,7 @@ 41616.6, 78002.1, 76391.3, - 129366.0, + 129366.00000000002, 118233.0, 116262.0, 120445.0, @@ -37726,7 +37738,7 @@ 41616.6, 91059.7, 82484.2, - 130491.0, + 130491.00000000002, 118391.0, 116901.0, 121006.0, @@ -37739,7 +37751,7 @@ 88246.6, 86774.6, 76974.8, - 79388.4, + 79388.40000000001, 41616.6, 38936.2, 33575.4, @@ -37779,7 +37791,7 @@ 18771.4, 25547.7, 31082.3, - 32282.8, + 32282.800000000003, 32955.3, 22672.6, 23706.0, @@ -37810,7 +37822,7 @@ 130147.0, 92365.1, 88647.5, - 76427.6, + 76427.59999999999, 79706.2, 41616.6, 38936.2, @@ -37832,7 +37844,7 @@ 135191.0, 140948.0, 131720.0, - 89718.4, + 89718.40000000001, 86822.2, 72405.3, 72256.5, @@ -37844,7 +37856,7 @@ 38936.2, 38936.2, 41616.6, - 66448.1, + 66448.09999999999, 72459.2, 126736.0, 119181.0, @@ -37859,7 +37871,7 @@ 88163.2, 83969.4, 69513.0, - 70733.1, + 70733.09999999999, 41616.6, 38936.2, 38936.2, @@ -37883,7 +37895,7 @@ 89198.7, 83686.9, 68872.5, - 68938.9, + 68938.90000000001, 41616.6, 38936.2, 38936.2, @@ -37945,7 +37957,7 @@ 18771.4, 18771.4, 19428.9, - 21009.7, + 21009.699999999997, 24421.5, 22519.2, 19741.5, @@ -38000,7 +38012,7 @@ 118838.0, 127342.0, 122209.0, - 89827.2, + 89827.20000000001, 90540.0, 81046.3, 82603.7, @@ -38026,7 +38038,7 @@ 134495.0, 97366.5, 93661.4, - 78890.9, + 78890.90000000001, 77829.5, 41616.6, 38936.2, @@ -38066,14 +38078,14 @@ 119266.0, 119426.0, 125485.0, - 130360.0, + 130360.00000000002, 135432.0, 133502.0, 135116.0, 139853.0, 129065.0, 87419.1, - 84551.9, + 84551.90000000001, 72868.5, 75598.8, 41616.6, @@ -38087,14 +38099,14 @@ 83190.0, 61562.3, 73689.5, - 74933.6, + 74933.59999999999, 77329.7, 84530.3, - 87644.6, + 87644.59999999999, 86123.7, 58597.4, 56650.8, - 61802.1, + 61802.100000000006, 61218.9, 33575.4, 33575.4, @@ -38113,7 +38125,7 @@ 18771.4, 18771.4, 24712.6, - 33485.7, + 33485.700000000004, 36927.8, 36282.3, 37830.0, @@ -38157,7 +38169,7 @@ 38936.2, 41616.6, 70202.5, - 73477.4, + 73477.40000000001, 126911.0, 119793.0, 122315.0, @@ -38171,7 +38183,7 @@ 86658.3, 83496.2, 70084.1, - 72325.6, + 72325.59999999999, 41616.6, 38936.2, 38936.2, @@ -38180,7 +38192,7 @@ 38936.2, 38936.2, 41616.6, - 77681.7, + 77681.70000000001, 73769.3, 128025.0, 117855.0, @@ -38255,7 +38267,7 @@ 126462.0, 96049.2, 93885.6, - 88225.1, + 88225.09999999999, 84725.4, 84528.9, 80815.4, @@ -38276,7 +38288,7 @@ 33575.4, 34767.8, 39739.2, - 34045.2, + 34045.200000000004, 22739.4, 18771.4, 18771.4, @@ -38425,8 +38437,8 @@ 81126.3, 78662.7, 76533.2, - 80147.9, - 78534.6, + 80147.90000000001, + 78534.59999999999, 73135.7, 50027.3, 48809.7, @@ -38482,7 +38494,7 @@ 123959.0, 90021.8, 91303.8, - 82288.8, + 82288.79999999999, 84619.1, 41616.6, 38936.2, @@ -38505,9 +38517,9 @@ 131187.0, 122747.0, 86237.9, - 87087.9, + 87087.90000000001, 77886.6, - 80611.9, + 80611.90000000001, 41616.6, 38936.2, 38936.2, @@ -38530,8 +38542,8 @@ 122206.0, 85141.3, 85429.4, - 75537.6, - 78245.1, + 75537.59999999999, + 78245.09999999999, 41616.6, 38936.2, 38936.2, @@ -38541,7 +38553,7 @@ 38936.2, 41616.6, 90687.4, - 81240.1, + 81240.09999999999, 129486.0, 118235.0, 118087.0, @@ -38552,7 +38564,7 @@ 127440.0, 131252.0, 122608.0, - 85210.4, + 85210.40000000001, 85610.5, 75216.4, 78282.2, @@ -38571,14 +38583,14 @@ 117865.0, 124541.0, 127485.0, - 130294.0, + 130294.00000000002, 126595.0, 124660.0, 128393.0, 119990.0, 86449.5, 87462.7, - 77464.3, + 77464.29999999999, 80062.0, 41616.6, 38936.2, @@ -38595,11 +38607,11 @@ 77732.8, 80911.4, 79811.6, - 74811.1, + 74811.09999999999, 47912.8, 49054.5, - 58614.6, - 65977.4, + 58614.600000000006, + 65977.40000000001, 33575.4, 33575.4, 33575.4, @@ -38646,7 +38658,7 @@ 129249.0, 125114.0, 124165.0, - 130740.0, + 130740.00000000002, 125235.0, 94260.5, 97233.0, @@ -38674,7 +38686,7 @@ 123003.0, 92340.2, 93315.7, - 85147.1, + 85147.09999999999, 88102.8, 41616.6, 38936.2, @@ -38694,10 +38706,10 @@ 127790.0, 125056.0, 123622.0, - 128198.0, + 128198.00000000002, 121315.0, 87611.7, - 87813.9, + 87813.90000000001, 78008.4, 80928.9, 41616.6, @@ -38709,8 +38721,8 @@ 38936.2, 41616.6, 91359.1, - 83843.9, - 129812.0, + 83843.90000000001, + 129812.00000000002, 120692.0, 122240.0, 126446.0, @@ -38733,8 +38745,8 @@ 38936.2, 41616.6, 90528.4, - 84346.4, - 130461.0, + 84346.40000000001, + 130461.00000000002, 118571.0, 115153.0, 116781.0, @@ -38855,14 +38867,14 @@ 139677.0, 124682.0, 152342.0, - 129812.0, + 129812.00000000002, 123939.0, 126263.0, 128578.0, 124587.0, 119881.0, 118743.0, - 128723.0, + 128723.00000000002, 128170.0, 96893.7, 96691.1, @@ -38928,14 +38940,14 @@ 86242.8, 87018.4, 83278.0, - 81057.6, + 81057.59999999999, 82418.9, 78413.3, 71216.9, 51699.0, - 52479.1, - 64601.6, - 75829.1, + 52479.100000000006, + 64601.600000000006, + 75829.09999999999, 33575.4, 33575.4, 33575.4, @@ -38982,7 +38994,7 @@ "om_batt_fixed_cost": [ 0.0 ], - "om_batt_nameplate": 1200.54312, + "om_batt_nameplate": 1200.5431199999999, "om_batt_replacement_cost": [ 280.0 ], @@ -39054,7 +39066,7 @@ "ui_step_minutes": 60.0 }, "Hybrid": { - "ac_nameplate": 469.565, + "ac_nameplate": 469.5652173913044, "analysis_period": 25.0, "analysis_period_warning": "", "annual_crit": 0.0, @@ -39090,7 +39102,7 @@ "cbi_uti_tax_fed": 1.0, "cbi_uti_tax_sta": 1.0, "chk_update_peaks": 0.0, - "const_per_interest1": 2208730.901314276, + "const_per_interest1": 2208730.9079273187, "const_per_interest2": 0.0, "const_per_interest3": 0.0, "const_per_interest4": 0.0, @@ -39100,7 +39112,7 @@ "const_per_interest_rate3": 0.0, "const_per_interest_rate4": 0.0, "const_per_interest_rate5": 0.0, - "const_per_interest_total": 2208730.901314276, + "const_per_interest_total": 2208730.9079273187, "const_per_months1": 6.0, "const_per_months2": 0.0, "const_per_months3": 0.0, @@ -39117,13 +39129,13 @@ "const_per_percent4": 0.0, "const_per_percent5": 0.0, "const_per_percent_total": 100.0, - "const_per_principal1": 135921901.61934, + "const_per_principal1": 135921902.02629654, "const_per_principal2": 0.0, "const_per_principal3": 0.0, "const_per_principal4": 0.0, "const_per_principal5": 0.0, - "const_per_principal_total": 135921901.61934, - "const_per_total1": 3567949.9175076757, + "const_per_principal_total": 135921902.02629654, + "const_per_total1": 3567949.9281902837, "const_per_total2": 0.0, "const_per_total3": 0.0, "const_per_total4": 0.0, @@ -39133,7 +39145,7 @@ "const_per_upfront_rate3": 0.0, "const_per_upfront_rate4": 0.0, "const_per_upfront_rate5": 0.0, - "construction_financing_cost": 3567949.9175076757, + "construction_financing_cost": 3567949.9281902837, "cost_debt_closing": 0.0, "cost_debt_fee": 2.75, "cost_other_financing": 0.0, @@ -56769,7 +56781,7 @@ "energy_2": 48557315.39999997, "energy_3": 55750082.00000006, "energy_4": 53014929.70000005, - "energy_5": 60460745.50000008, + "energy_5": 60460745.500000078, "energy_6": 70152338.50000005, "energy_7": 77708464.10000009, "energy_8": 77555051.10000016, @@ -65564,7 +65576,7 @@ "grid_outage": [ 0.0 ], - "host_nominal_discount_rate": 9.060000000000004, + "host_nominal_discount_rate": 9.060000000000003, "host_real_discount_rate": 6.4, "hybrid_capital_cost": 0.0, "ibi_fed_amount": 0.0, @@ -66291,14 +66303,14 @@ 37133.5, 28375.1, 27445.8, - 23783.9, - 21382.1, + 23783.899999999998, + 21382.100000000002, 20961.0, 26337.800000000003, 42498.8, 44231.9, 50858.2, - 50575.2, + 50575.200000000004, 57217.399999999994, 54770.0, 62565.5, @@ -66371,7 +66383,7 @@ 102110.0, 102849.0, 94759.5, - 97478.1, + 97478.09999999999, 41616.6, 38936.2, 38936.2, @@ -66394,7 +66406,7 @@ 134513.0, 105677.0, 104267.0, - 94631.9, + 94631.90000000001, 95954.7, 41616.6, 38936.2, @@ -66488,9 +66500,9 @@ 120048.0, 124656.0, 126200.0, - 96456.6, + 96456.59999999999, 98345.6, - 91510.9, + 91510.90000000001, 95960.0, 41616.6, 38936.2, @@ -66525,7 +66537,7 @@ 38936.2, 41616.6, 106737.0, - 94745.9, + 94745.90000000001, 132714.0, 123344.0, 123674.0, @@ -66537,7 +66549,7 @@ 122133.0, 122241.0, 90891.2, - 92178.3, + 92178.29999999999, 84163.9, 86747.6, 41616.6, @@ -66606,7 +66618,7 @@ 78445.40000000001, 52949.5, 51678.4, - 55887.7, + 55887.700000000004, 71313.90000000001, 33575.4, 33575.4, @@ -66706,8 +66718,8 @@ 129775.0, 101286.0, 103536.0, - 96574.3, - 99830.3, + 96574.29999999999, + 99830.29999999999, 41616.6, 38936.2, 38936.2, @@ -66729,8 +66741,8 @@ 120735.0, 126890.0, 97389.4, - 99745.4, - 92501.9, + 99745.40000000001, + 92501.90000000001, 96116.4, 41616.6, 38936.2, @@ -66741,7 +66753,7 @@ 38936.2, 41616.6, 144450.0, - 129516.0, + 129515.99999999999, 151284.0, 131085.0, 126278.0, @@ -66767,7 +66779,7 @@ 145870.0, 117274.0, 109549.0, - 98505.7, + 98505.70000000001, 91924.9, 91046.2, 85477.90000000001, @@ -66810,7 +66822,7 @@ 38936.2, 41792.1, 43477.7, - 45228.7, + 45228.700000000004, 47500.100000000006, 172999.0, 141927.0, @@ -66826,7 +66838,7 @@ 127575.0, 98183.5, 101311.0, - 94981.1, + 94981.09999999999, 98503.8, 41616.6, 38936.2, @@ -66872,7 +66884,7 @@ 119739.0, 119921.0, 122218.0, - 91146.9, + 91146.90000000001, 93502.0, 86483.09999999999, 89450.1, @@ -66897,7 +66909,7 @@ 120365.0, 121677.0, 89101.9, - 90398.8, + 90398.79999999999, 82472.6, 85608.7, 41616.6, @@ -66920,7 +66932,7 @@ 118020.0, 118961.0, 123149.0, - 90298.6, + 90298.59999999999, 92199.6, 83898.4, 86446.70000000001, @@ -67004,7 +67016,7 @@ 38936.2, 38936.2, 41616.6, - 99430.4, + 99430.40000000001, 94066.3, 140365.0, 121417.0, @@ -67041,7 +67053,7 @@ 119457.0, 119407.0, 88740.0, - 90196.7, + 90196.70000000001, 81925.6, 84228.6, 41616.6, @@ -67077,12 +67089,12 @@ 38936.2, 41616.6, 101853.0, - 92126.1, + 92126.09999999999, 133285.0, 120232.0, 117332.0, 123502.0, - 128510.0, + 128509.99999999999, 132090.0, 128274.0, 126301.0, @@ -67160,7 +67172,7 @@ 119962.0, 121280.0, 121551.0, - 90239.1, + 90239.09999999999, 90854.0, 82031.40000000001, 85227.3, @@ -67173,7 +67185,7 @@ 38936.2, 41616.6, 102751.0, - 92188.9, + 92188.90000000001, 131301.0, 121325.0, 124155.0, @@ -67184,7 +67196,7 @@ 133442.0, 133533.0, 128937.00000000002, - 90182.6, + 90182.59999999999, 88579.6, 76377.0, 76546.09999999999, @@ -67198,7 +67210,7 @@ 41616.6, 68105.8, 68996.79999999999, - 130897.0, + 130896.99999999999, 125398.0, 125853.0, 129808.0, @@ -67206,7 +67218,7 @@ 137547.0, 131545.0, 129309.0, - 129218.0, + 129217.99999999999, 127428.0, 89081.7, 85006.20000000001, @@ -67226,7 +67238,7 @@ 119797.0, 123214.0, 129632.0, - 130027.0, + 130026.99999999999, 128089.0, 121849.0, 121219.0, @@ -67256,7 +67268,7 @@ 112110.0, 115220.0, 118809.0, - 91306.7, + 91306.70000000001, 93633.5, 85924.40000000001, 88787.8, @@ -67269,7 +67281,7 @@ 33575.4, 33575.4, 120459.0, - 99685.9, + 99685.90000000001, 104526.0, 94995.2, 85698.6, @@ -67312,7 +67324,7 @@ 33575.4, 38936.2, 38936.2, - 44270.3, + 44270.299999999996, 43794.2, 46177.6, 47963.2, @@ -67331,7 +67343,7 @@ 93790.5, 96991.4, 90142.9, - 94050.3, + 94050.29999999999, 41616.6, 38936.2, 38936.2, @@ -67390,7 +67402,7 @@ 41616.6, 73283.2, 77828.90000000001, - 131034.0, + 131033.99999999999, 119115.0, 120381.0, 123198.0, @@ -67444,7 +67456,7 @@ 80693.9, 89368.4, 89959.5, - 58670.3, + 58670.299999999996, 56307.899999999994, 54234.1, 53970.6, @@ -67466,9 +67478,9 @@ 18771.4, 18771.4, 18771.4, - 21582.9, + 21582.899999999998, 29476.9, - 29431.1, + 29431.100000000002, 25239.0, 28127.1, 29535.5, @@ -67558,7 +67570,7 @@ 41616.6, 88325.5, 83861.3, - 130367.0, + 130366.99999999999, 118412.0, 118386.0, 124314.0, @@ -67582,10 +67594,10 @@ 41616.6, 80686.5, 78797.2, - 128897.0, + 128896.99999999999, 119916.0, 123694.0, - 130920.0, + 130919.99999999999, 132223.0, 138328.0, 134880.0, @@ -67634,7 +67646,7 @@ 18771.4, 18771.4, 18771.4, - 20895.4, + 20895.399999999998, 20492.6, 21116.1, 20731.7, @@ -67689,7 +67701,7 @@ 155723.0, 142307.0, 101580.0, - 94363.2, + 94363.20000000001, 77483.0, 74463.7, 41616.6, @@ -67822,7 +67834,7 @@ 41616.6, 90183.8, 84903.3, - 130385.0, + 130384.99999999999, 119919.0, 119306.0, 123454.0, @@ -67846,7 +67858,7 @@ 41616.6, 77391.5, 82324.0, - 128165.0, + 128164.99999999999, 119550.0, 120943.0, 126516.0, @@ -67896,7 +67908,7 @@ 66737.7, 129097.00000000002, 127287.0, - 130950.0, + 130949.99999999999, 142693.0, 144605.0, 149310.0, @@ -67905,7 +67917,7 @@ 146327.0, 134154.0, 100622.0, - 93409.1, + 93409.09999999999, 73763.5, 74493.6, 41616.6, @@ -67927,8 +67939,8 @@ 146380.0, 146500.0, 145575.0, - 130295.0, - 94435.9, + 130294.99999999999, + 94435.90000000001, 89422.2, 73182.2, 71643.8, @@ -68064,7 +68076,7 @@ 126346.0, 121111.0, 123364.0, - 129271.0, + 129270.99999999999, 135667.0, 143393.0, 144880.0, @@ -68083,7 +68095,7 @@ 38936.2, 38936.2, 41616.6, - 62712.2, + 62712.200000000004, 66785.5, 125881.0, 121267.0, @@ -68107,7 +68119,7 @@ 33575.4, 33575.4, 33575.4, - 54316.2, + 54316.200000000004, 45031.3, 69980.0, 77857.9, @@ -68140,7 +68152,7 @@ 32729.5, 37659.9, 42070.1, - 38140.7, + 38140.700000000004, 44411.5, 39742.600000000006, 34316.8, @@ -68227,7 +68239,7 @@ 38936.2, 38936.2, 41616.6, - 64556.7, + 64556.700000000004, 68310.3, 126165.0, 115742.0, @@ -68260,7 +68272,7 @@ 122490.0, 128465.0, 127970.0, - 129468.0, + 129467.99999999999, 134053.0, 122069.0, 81164.3, @@ -68311,7 +68323,7 @@ 23276.5, 30670.5, 32223.199999999997, - 23425.1, + 23425.100000000002, 33575.4, 33575.4, 33575.4, @@ -68336,7 +68348,7 @@ 143878.0, 129222.00000000002, 86564.09999999999, - 91830.2, + 91830.20000000001, 73820.3, 72207.9, 41616.6, @@ -68352,12 +68364,12 @@ 131372.0, 124827.0, 125691.0, - 130759.0, + 130758.99999999999, 132752.0, 135725.0, 130679.0, 130025.0, - 131039.0, + 131038.99999999999, 117887.0, 76734.6, 86124.4, @@ -68444,11 +68456,11 @@ 33575.4, 33575.4, 48477.3, - 46403.8, + 46403.799999999996, 73858.7, 81944.90000000001, 86709.1, - 93995.1, + 93995.09999999999, 97826.7, 99695.9, 71279.70000000001, @@ -68469,8 +68481,8 @@ 33575.4, 26173.4, 18771.4, - 21421.4, - 27109.1, + 21421.399999999998, + 27109.100000000002, 29073.8, 28741.0, 34676.6, @@ -68480,7 +68492,7 @@ 44128.4, 45590.899999999994, 37870.0, - 38250.7, + 38250.700000000004, 33575.4, 33575.4, 33575.4, @@ -68491,7 +68503,7 @@ 38936.2, 38936.2, 41616.6, - 47853.2, + 47853.200000000004, 61386.4, 133685.0, 132233.0, @@ -68515,7 +68527,7 @@ 38936.2, 38936.2, 41616.6, - 44040.7, + 44040.700000000004, 59052.2, 131243.0, 128370.0, @@ -68539,7 +68551,7 @@ 38936.2, 38936.2, 41616.6, - 44011.3, + 44011.299999999996, 58628.4, 128191.0, 121964.0, @@ -68620,10 +68632,10 @@ 86226.9, 88066.2, 60981.6, - 61698.7, + 61698.700000000004, 64599.8, 56766.7, - 23940.1, + 23940.100000000002, 33575.4, 33575.4, 33575.4, @@ -68645,7 +68657,7 @@ 33045.0, 31874.7, 41191.6, - 41774.8, + 41774.799999999996, 31414.6, 20804.7, 33575.4, @@ -68660,7 +68672,7 @@ 38936.2, 41616.6, 48182.899999999994, - 63271.3, + 63271.299999999996, 134211.0, 130156.0, 136589.0, @@ -68683,7 +68695,7 @@ 38936.2, 38936.2, 41616.6, - 42152.8, + 42152.799999999996, 61638.399999999994, 136060.0, 132857.0, @@ -68731,7 +68743,7 @@ 38936.2, 38936.2, 41616.6, - 44996.3, + 44996.299999999996, 64093.0, 140857.0, 139350.0, @@ -68816,7 +68828,7 @@ 37443.3, 32916.9, 30493.1, - 31969.1, + 31969.100000000002, 33575.4, 33575.4, 33575.4, @@ -68899,7 +68911,7 @@ 38936.2, 38936.2, 41616.6, - 61363.8, + 61363.799999999996, 70260.40000000001, 126562.0, 118576.0, @@ -68947,13 +68959,13 @@ 33575.4, 33575.4, 33575.4, - 46084.2, + 46084.200000000004, 46087.899999999994, 74048.7, 82755.79999999999, 84313.90000000001, 91813.5, - 95159.1, + 95159.09999999999, 94153.9, 66030.8, 66663.2, @@ -68983,8 +68995,8 @@ 41958.5, 46153.5, 44058.4, - 38650.8, - 37494.7, + 38650.799999999996, + 37494.700000000004, 33575.4, 33575.4, 33575.4, @@ -69004,7 +69016,7 @@ 131761.0, 136860.0, 132215.0, - 130117.0, + 130116.99999999999, 132756.0, 122496.0, 83395.1, @@ -69043,7 +69055,7 @@ 38936.2, 38936.2, 41616.6, - 39213.7, + 39213.700000000004, 60504.9, 128769.0, 122621.0, @@ -69051,7 +69063,7 @@ 126911.0, 128550.00000000002, 134286.0, - 130593.0, + 130592.99999999999, 130716.00000000002, 132876.0, 117576.0, @@ -69067,8 +69079,8 @@ 38936.2, 38936.2, 41616.6, - 44168.8, - 62674.8, + 44168.799999999996, + 62674.799999999996, 125124.0, 119281.0, 120392.0, @@ -69126,7 +69138,7 @@ 60998.7, 57952.7, 57368.5, - 47350.7, + 47350.700000000004, 24851.7, 28640.7, 33575.4, @@ -69171,7 +69183,7 @@ 126185.0, 127953.0, 131208.0, - 129658.0, + 129657.99999999999, 134934.0, 143569.0, 133209.0, @@ -69190,7 +69202,7 @@ 41769.0, 64910.3, 137224.0, - 130992.0, + 130991.99999999999, 131823.0, 139611.0, 142618.0, @@ -69210,7 +69222,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 41062.3, 64038.0, 127931.0, @@ -69234,7 +69246,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 39534.0, 60008.899999999994, 126871.0, @@ -69258,9 +69270,9 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 39618.0, - 60232.8, + 60232.799999999996, 128616.00000000002, 125855.0, 130205.00000000002, @@ -69283,21 +69295,21 @@ 33575.4, 33575.4, 31108.0, - 37688.2, + 37688.200000000004, 46979.3, 77070.09999999999, 86471.3, 90744.4, - 95654.7, + 95654.70000000001, 97336.5, - 97943.3, + 97943.29999999999, 71222.0, 73943.5, 75770.2, 66958.29999999999, 43009.2, - 44450.2, - 38503.8, + 44450.200000000004, + 38503.799999999996, 33575.4, 33575.4, 33575.4, @@ -69309,7 +69321,7 @@ 31108.0, 19273.1, 31205.4, - 36228.7, + 36228.700000000004, 38889.0, 38172.0, 35370.1, @@ -69318,8 +69330,8 @@ 39460.2, 44742.600000000006, 46791.600000000006, - 45380.3, - 44936.8, + 45380.299999999996, + 44936.799999999996, 46322.8, 38194.8, 33575.4, @@ -69330,7 +69342,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 41858.9, 65568.4, 144535.0, @@ -69343,7 +69355,7 @@ 164595.0, 168628.0, 150286.0, - 98019.6, + 98019.59999999999, 93566.5, 79386.6, 74912.40000000001, @@ -69354,7 +69366,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 39402.2, 62638.3, 135175.0, @@ -69378,7 +69390,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 34530.2, 58115.8, 131084.0, @@ -69402,7 +69414,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 37648.7, 62003.0, 139446.0, @@ -69426,7 +69438,7 @@ 38936.2, 38936.2, 38936.2, - 39149.3, + 39149.299999999996, 42885.1, 68844.3, 150728.0, @@ -69455,7 +69467,7 @@ 55420.5, 88153.09999999999, 94347.3, - 96629.4, + 96629.40000000001, 103090.0, 105696.0, 104775.0, @@ -69476,13 +69488,13 @@ 33575.4, 28640.7, 18771.4, - 22803.1, + 22803.100000000002, 29556.7, 30029.699999999997, 33116.9, 26219.7, 22010.4, - 29899.1, + 29899.100000000002, 29805.0, 43473.2, 43262.0, @@ -69512,7 +69524,7 @@ 159505.0, 146714.0, 97325.8, - 92128.9, + 92128.90000000001, 75185.3, 70433.59999999999, 41616.6, @@ -69524,7 +69536,7 @@ 38936.2, 36681.9, 35220.5, - 58676.3, + 58676.299999999996, 131154.0, 127893.0, 132550.0, @@ -69619,19 +69631,19 @@ 33575.4, 33575.4, 28640.7, - 38011.3, + 38011.299999999996, 47846.0, 77663.79999999999, 82810.1, 85402.4, 90629.2, - 92601.3, + 92601.29999999999, 94070.8, 67945.40000000001, 71132.3, 73141.2, - 62817.7, - 39792.3, + 62817.700000000004, + 39792.299999999996, 40468.3, 33575.4, 33575.4, @@ -69655,9 +69667,9 @@ 41692.0, 44982.4, 43355.0, - 45278.8, + 45278.799999999996, 43555.3, - 40487.2, + 40487.200000000004, 35037.2, 33575.4, 33575.4, @@ -69715,7 +69727,7 @@ 38936.2, 38936.2, 36681.9, - 43936.8, + 43936.799999999996, 67672.2, 147521.0, 144574.0, @@ -69727,7 +69739,7 @@ 156628.0, 155792.0, 139086.0, - 95245.1, + 95245.09999999999, 94772.0, 84714.5, 81302.3, @@ -69777,8 +69789,8 @@ 174797.0, 120109.0, 113761.0, - 98632.4, - 94016.1, + 98632.40000000001, + 94016.09999999999, 41616.6, 44328.0, 40665.100000000006, @@ -69799,8 +69811,8 @@ 77478.4, 73861.7, 62045.7, - 32017.9, - 39819.2, + 32017.899999999998, + 39819.200000000004, 39614.1, 33575.4, 38998.9, @@ -69813,14 +69825,14 @@ 28640.7, 27993.7, 40551.9, - 40189.8, + 40189.799999999996, 43152.6, 42575.8, 44281.2, - 40634.7, + 40634.700000000004, 46699.6, 45949.1, - 48887.7, + 48887.700000000004, 42877.899999999994, 48719.2, 42504.2, @@ -69839,7 +69851,7 @@ 37418.2, 38562.399999999994, 41961.6, - 40753.7, + 40753.700000000004, 41376.0, 34673.0, 38344.8, @@ -69850,7 +69862,7 @@ 41747.6, 45371.6, 40165.0, - 37470.8, + 37470.799999999996, 35976.2, 34737.9, 33575.4, @@ -69897,7 +69909,7 @@ 164111.0, 112446.0, 107492.0, - 92410.8, + 92410.79999999999, 87642.9, 41616.6, 38936.2, @@ -69926,7 +69938,7 @@ 41616.6, 44330.9, 40507.1, - 42012.7, + 42012.700000000004, 38936.2, 38936.2, 38936.2, @@ -69947,9 +69959,9 @@ 126957.0, 104333.0, 97921.7, - 47352.2, + 47352.200000000004, 40672.600000000006, - 42298.3, + 42298.299999999996, 33575.4, 33575.4, 33575.4, @@ -69964,12 +69976,12 @@ 122749.0, 127635.0, 96672.9, - 97501.4, + 97501.40000000001, 100490.0, 91963.8, - 49725.3, + 49725.299999999996, 47090.7, - 53813.2, + 53813.200000000004, 48154.0, 41006.0, 39345.6, @@ -69982,15 +69994,15 @@ 27789.7, 37429.4, 39397.3, - 43990.2, + 43990.200000000004, 44732.6, 49070.6, 46918.0, 50241.3, - 46758.3, + 46758.299999999996, 54228.4, 50168.6, - 50671.7, + 50671.700000000004, 47588.5, 51393.0, 50310.0, @@ -70020,13 +70032,13 @@ 96843.2, 93137.7, 41616.6, - 44036.2, + 44036.200000000004, 40590.5, 42201.0, 40441.6, 41922.4, 38936.2, - 38752.3, + 38752.299999999996, 56842.5, 77001.5, 162326.0, @@ -70115,8 +70127,8 @@ 123836.0, 104565.0, 95450.0, - 47194.2, - 40530.3, + 47194.200000000004, + 40530.299999999996, 42129.5, 33575.4, 33575.4, @@ -70139,7 +70151,7 @@ 44528.399999999994, 46600.9, 40463.1, - 37338.8, + 37338.799999999996, 35392.7, 33575.4, 33575.4, @@ -70148,7 +70160,7 @@ 33575.4, 26173.4, 23893.0, - 31596.4, + 31596.399999999998, 39891.6, 37922.3, 44867.3, @@ -70195,7 +70207,7 @@ 38936.2, 38936.2, 35495.5, - 56009.7, + 56009.700000000004, 80966.3, 170519.0, 171558.0, @@ -70210,7 +70222,7 @@ 150935.0, 130769.0, 106225.0, - 98320.1, + 98320.09999999999, 47337.1, 42531.7, 40703.6, @@ -70244,7 +70256,7 @@ 38936.2, 34214.6, 40625.5, - 64500.3, + 64500.299999999996, 143482.0, 140560.0, 146776.0, @@ -70282,7 +70294,7 @@ 123447.0, 114691.0, 97827.9, - 90862.8, + 90862.79999999999, 41616.6, 38936.2, 38936.2, @@ -70320,17 +70332,17 @@ 38552.9, 41798.1, 41873.399999999994, - 43231.3, + 43231.299999999996, 38973.3, 43670.1, - 43871.2, + 43871.200000000004, 47019.9, 50714.3, 47563.8, 48218.8, 44683.2, 48593.0, - 40982.7, + 40982.700000000004, 33575.4, 37872.100000000006, 33575.4, @@ -70339,7 +70351,7 @@ 38936.2, 38936.2, 34214.6, - 46348.7, + 46348.700000000004, 71832.8, 157981.0, 157303.0, @@ -70356,7 +70368,7 @@ 97283.8, 91373.0, 41616.6, - 42095.7, + 42095.700000000004, 40490.4, 38936.2, 38936.2, @@ -70401,7 +70413,7 @@ 176356.0, 120142.0, 110104.0, - 93437.3, + 93437.29999999999, 86837.3, 41616.6, 38936.2, @@ -70453,7 +70465,7 @@ 104751.0, 51149.0, 45937.5, - 44302.8, + 44302.799999999996, 33575.4, 38153.5, 33575.4, @@ -70497,16 +70509,16 @@ 53273.4, 58579.4, 50474.1, - 62283.3, + 62283.299999999996, 47644.5, 47747.6, 44917.1, 40510.0, 44860.3, 43790.100000000006, - 42228.2, - 42091.8, - 37953.2, + 42228.200000000004, + 42091.799999999996, + 37953.200000000004, 59860.100000000006, 83822.3, 173585.0, @@ -70525,11 +70537,11 @@ 107725.0, 50713.2, 49004.399999999994, - 43215.3, + 43215.299999999996, 43317.3, 41622.100000000006, 40257.1, - 42665.7, + 42665.700000000004, 34214.6, 57431.5, 82722.7, @@ -70547,13 +70559,13 @@ 133903.0, 111424.0, 103002.0, - 47127.3, + 47127.299999999996, 48580.0, 43778.399999999994, 44595.0, 44043.5, 38936.2, - 43503.8, + 43503.799999999996, 36681.9, 57821.9, 80378.1, @@ -70572,7 +70584,7 @@ 105676.0, 100010.0, 47668.6, - 48725.2, + 48725.200000000004, 38936.2, 43553.5, 38936.2, @@ -70600,7 +70612,7 @@ 42612.6, 44114.1, 38936.2, - 42649.7, + 42649.700000000004, 38936.2, 36681.9, 47825.6, @@ -70618,7 +70630,7 @@ 139746.0, 122483.0, 101139.0, - 95117.9, + 95117.90000000001, 43398.1, 42426.0, 43643.5, @@ -70628,7 +70640,7 @@ 33575.4, 28640.7, 48455.5, - 55640.8, + 55640.799999999996, 86933.7, 92244.0, 95148.5, @@ -70637,7 +70649,7 @@ 110269.0, 83596.40000000001, 88216.5, - 92157.7, + 92157.70000000001, 83665.40000000001, 48435.6, 47031.0, @@ -70692,12 +70704,12 @@ 122516.0, 109776.0, 50769.0, - 49146.8, + 49146.799999999996, 43548.4, 36595.9, 35072.6, 35009.700000000004, - 36412.8, + 36412.799999999996, 28640.7, 31902.5, 39977.3, @@ -70705,20 +70717,20 @@ 44537.9, 44436.6, 48360.3, - 48860.8, + 48860.799999999996, 54553.3, 55134.6, 60052.100000000006, - 55005.2, + 55005.200000000004, 58535.600000000006, - 57210.7, + 57210.700000000004, 58006.2, 62301.8, - 57601.8, + 57601.799999999996, 52813.7, 48570.5, 45674.0, - 47015.8, + 47015.799999999996, 48880.0, 43467.1, 43984.7, @@ -70739,7 +70751,7 @@ 160063.0, 129085.00000000002, 120251.0, - 55381.7, + 55381.700000000004, 56595.0, 48127.8, 49989.8, @@ -70764,7 +70776,7 @@ 134803.0, 121631.0, 56120.7, - 57505.3, + 57505.299999999996, 50634.3, 49176.8, 44499.899999999994, @@ -70794,7 +70806,7 @@ 42560.4, 39877.5, 38849.3, - 38272.8, + 38272.799999999996, 62295.8, 66938.5, 99375.9, @@ -70816,8 +70828,8 @@ 46981.0, 41977.8, 42780.5, - 39051.2, - 37072.2, + 39051.200000000004, + 37072.200000000004, 31226.5, 33383.899999999994, 38638.2, @@ -70836,12 +70848,12 @@ 59649.0, 48638.9, 48627.8, - 45533.7, + 45533.700000000004, 44628.3, 44757.6, 44036.5, 43657.1, - 43291.2, + 43291.200000000004, 40766.2, 53358.3, 77484.2, @@ -70867,7 +70879,7 @@ 43265.1, 38936.2, 41025.7, - 56396.7, + 56396.700000000004, 77228.7, 163718.0, 162252.0, @@ -70891,7 +70903,7 @@ 38936.2, 38936.2, 36681.9, - 58161.3, + 58161.299999999996, 81486.8, 169651.0, 166546.0, @@ -70991,7 +71003,7 @@ 39430.0, 38267.5, 45279.8, - 41517.3, + 41517.299999999996, 48849.7, 43617.0, 51419.3, @@ -71006,11 +71018,11 @@ 44248.9, 40487.6, 36806.5, - 43572.2, - 41896.3, - 43058.8, + 43572.200000000004, + 41896.299999999996, + 43058.799999999996, 42857.5, - 39149.3, + 39149.299999999996, 53822.5, 77231.2, 167766.0, @@ -71030,11 +71042,11 @@ 51800.5, 45154.4, 42580.7, - 43659.8, - 43308.8, + 43659.799999999996, + 43308.799999999996, 41569.6, 40224.8, - 39149.3, + 39149.299999999996, 53128.0, 77252.79999999999, 169719.0, @@ -71053,13 +71065,13 @@ 117956.0, 55607.2, 54344.2, - 50475.2, + 50475.200000000004, 50856.4, 43314.0, - 44146.8, + 44146.799999999996, 40597.5, 42454.5, - 61823.7, + 61823.700000000004, 83881.4, 179564.0, 181856.0, @@ -71076,14 +71088,14 @@ 143882.0, 124935.0, 56049.0, - 63942.8, + 63942.799999999996, 52326.9, 54095.5, - 48768.8, + 48768.799999999996, 45985.3, 48460.4, 45139.6, - 62872.7, + 62872.700000000004, 88399.1, 185270.0, 192319.0, @@ -71128,12 +71140,12 @@ 50945.9, 44822.7, 39916.4, - 38909.8, + 38909.799999999996, 33575.4, 32777.799999999996, - 61648.2, - 65035.8, - 99909.1, + 61648.200000000004, + 65035.799999999996, + 99909.09999999999, 111456.0, 120101.0, 130216.00000000002, @@ -71143,13 +71155,13 @@ 88509.20000000001, 83248.7, 73550.1, - 42034.8, + 42034.799999999996, 43465.899999999994, 48809.9, 45493.5, 40366.0, 46684.3, - 40185.2, + 40185.200000000004, 39087.5, 33575.4, 33575.4, @@ -71166,7 +71178,7 @@ 53842.0, 56983.3, 58969.5, - 58624.3, + 58624.299999999996, 56008.7, 53986.7, 59768.4, @@ -71178,7 +71190,7 @@ 50739.4, 46112.1, 43418.0, - 44603.2, + 44603.200000000004, 62498.2, 85644.90000000001, 179676.0, @@ -71195,14 +71207,14 @@ 141169.0, 115999.0, 105249.0, - 51887.8, + 51887.799999999996, 52817.6, - 45932.2, + 45932.200000000004, 45891.8, - 42474.2, + 42474.200000000004, 44111.600000000006, 43868.6, - 39149.3, + 39149.299999999996, 60422.3, 81987.4, 176350.0, @@ -71221,8 +71233,8 @@ 110824.0, 53526.1, 54269.3, - 48394.8, - 48017.2, + 48394.799999999996, + 48017.200000000004, 42282.9, 42103.8, 43492.7, @@ -71248,7 +71260,7 @@ 43603.0, 44558.100000000006, 43922.4, - 43618.3, + 43618.299999999996, 40385.5, 46078.6, 59973.5, @@ -71296,7 +71308,7 @@ 42924.100000000006, 39202.9, 33575.4, - 38063.3, + 38063.299999999996, 33575.4, 31108.0, 57211.399999999994, @@ -71311,7 +71323,7 @@ 112752.0, 118337.0, 107472.0, - 54566.3, + 54566.299999999996, 53781.9, 63570.4, 51501.7, @@ -71320,11 +71332,11 @@ 44843.7, 39448.1, 33575.4, - 38508.2, + 38508.200000000004, 33575.4, 31108.0, 26632.4, - 38076.7, + 38076.700000000004, 41375.9, 46793.4, 45987.7, @@ -71336,15 +71348,15 @@ 59700.0, 65137.0, 58063.5, - 62022.8, + 62022.799999999996, 63622.9, 52098.5, 48760.9, - 48521.8, + 48521.799999999996, 40181.0, - 44406.8, + 44406.799999999996, 44392.0, - 49771.7, + 49771.700000000004, 43547.0, 43416.7, 53673.9, @@ -71364,12 +71376,12 @@ 108779.0, 98155.1, 46362.4, - 47451.7, + 47451.700000000004, 44383.5, 42501.399999999994, 40660.3, 44090.5, - 42343.2, + 42343.200000000004, 43277.1, 64189.3, 87476.5, @@ -71389,11 +71401,11 @@ 111364.0, 53699.7, 53765.2, - 46908.2, + 46908.200000000004, 46131.4, 44269.1, 44143.3, - 42349.2, + 42349.200000000004, 43268.0, 62763.9, 82667.1, @@ -71440,7 +71452,7 @@ 48652.1, 49629.7, 51881.0, - 47424.8, + 47424.799999999996, 46937.9, 53678.3, 67119.6, @@ -71461,7 +71473,7 @@ 116646.0, 52686.100000000006, 55529.899999999994, - 48904.2, + 48904.200000000004, 44359.0, 40135.0, 37903.9, @@ -71471,7 +71483,7 @@ 77826.3, 113315.0, 123156.0, - 128296.0, + 128295.99999999999, 135746.0, 140246.0, 144860.0, @@ -71486,13 +71498,13 @@ 50572.7, 46704.0, 46131.9, - 43673.2, + 43673.200000000004, 38606.5, 39515.3, 35610.799999999996, 37450.1, 35742.7, - 44472.3, + 44472.299999999996, 43706.4, 47995.7, 47916.600000000006, @@ -71501,18 +71513,18 @@ 54815.399999999994, 54425.0, 59484.9, - 60564.7, + 60564.700000000004, 62653.2, 54531.7, 58414.0, 58518.6, 61568.2, - 47979.8, + 47979.799999999996, 50198.2, - 47706.3, - 53901.3, + 47706.299999999996, + 53901.299999999996, 50401.8, - 52832.7, + 52832.700000000004, 44723.4, 51764.7, 66318.70000000001, @@ -71556,10 +71568,10 @@ 131819.0, 122342.0, 58681.5, - 61426.3, + 61426.299999999996, 52145.899999999994, 54116.3, - 50622.7, + 50622.700000000004, 53012.3, 46527.4, 52148.8, @@ -71586,7 +71598,7 @@ 44786.9, 38936.2, 42718.3, - 43526.3, + 43526.299999999996, 64935.7, 86660.1, 180328.0, @@ -71608,7 +71620,7 @@ 43986.7, 44962.5, 38936.2, - 44927.8, + 44927.799999999996, 41068.9, 45628.2, 65379.49999999999, @@ -71631,7 +71643,7 @@ 48551.5, 48487.1, 37432.1, - 39210.3, + 39210.299999999996, 33575.4, 33575.4, 38619.3, @@ -71673,12 +71685,12 @@ 46647.399999999994, 46892.6, 48706.5, - 50299.7, + 50299.700000000004, 41253.4, 38029.0, 38477.0, 36648.4, - 40464.8, + 40464.799999999996, 43360.2, 38936.2, 38936.2, @@ -71699,7 +71711,7 @@ 118157.0, 99189.2, 93670.8, - 43398.3, + 43398.299999999996, 42413.5, 43930.0, 38936.2, @@ -71723,13 +71735,13 @@ 126756.0, 106829.0, 100013.0, - 45590.2, + 45590.200000000004, 40851.3, 44688.5, 38936.2, 44580.5, 38936.2, - 44384.7, + 44384.700000000004, 41616.6, 67231.8, 87140.5, @@ -71774,7 +71786,7 @@ 41616.6, 38936.2, 41491.9, - 40188.2, + 40188.200000000004, 38936.2, 38936.2, 38936.2, @@ -71794,9 +71806,9 @@ 125989.0, 122513.0, 101243.0, - 95688.9, + 95688.90000000001, 41616.6, - 44198.8, + 44198.799999999996, 38936.2, 33575.4, 33575.4, @@ -71830,7 +71842,7 @@ 24214.1, 34569.0, 39121.6, - 39923.2, + 39923.200000000004, 43393.3, 42762.0, 45626.8, @@ -71839,16 +71851,16 @@ 48790.100000000006, 54003.9, 50786.4, - 50820.7, + 50820.700000000004, 53793.3, 49299.4, - 46467.8, + 46467.799999999996, 46681.1, - 40055.7, + 40055.700000000004, 38849.1, 42261.4, - 40576.7, - 43541.2, + 40576.700000000004, + 43541.200000000004, 38936.2, 45798.0, 58418.6, @@ -71889,7 +71901,7 @@ 179880.0, 118921.0, 117475.0, - 97227.4, + 97227.40000000001, 90396.0, 41616.6, 38936.2, @@ -71974,9 +71986,9 @@ 50416.4, 54322.0, 84872.1, - 90693.7, + 90693.70000000001, 92711.9, - 98647.1, + 98647.09999999999, 101689.0, 104714.0, 76168.9, @@ -71996,23 +72008,23 @@ 33575.4, 33575.4, 21238.7, - 28605.4, + 28605.399999999998, 35641.6, 37624.1, - 40392.3, + 40392.299999999996, 38489.8, 40794.2, 42630.6, 46493.5, 46035.8, 50719.8, - 48962.2, - 49270.2, + 48962.200000000004, + 49270.200000000004, 54880.1, 54036.1, 40398.8, 38561.6, - 38980.2, + 38980.200000000004, 33575.4, 43184.5, 38936.2, @@ -72080,7 +72092,7 @@ 226848.0, 198025.0, 132781.0, - 129177.0, + 129176.99999999999, 104439.0, 98310.5, 45421.4, @@ -72107,7 +72119,7 @@ 133754.0, 108153.0, 100868.0, - 45636.2, + 45636.200000000004, 40867.0, 44554.6, 42217.5, @@ -72130,7 +72142,7 @@ 134310.0, 131547.0, 106280.0, - 99002.7, + 99002.70000000001, 47167.1, 42522.1, 40658.5, @@ -72141,7 +72153,7 @@ 33575.4, 61187.2, 59829.6, - 93730.4, + 93730.40000000001, 103044.0, 110072.0, 118312.0, @@ -72149,7 +72161,7 @@ 124789.0, 94902.1, 93870.0, - 97831.9, + 97831.90000000001, 86196.4, 46829.6, 54956.4, @@ -72192,7 +72204,7 @@ 33067.799999999996, 40980.3, 41290.2, - 48213.7, + 48213.700000000004, 43728.1, 51678.8, 45943.0, @@ -72210,7 +72222,7 @@ 44828.0, 44628.2, 38936.2, - 47082.7, + 47082.700000000004, 68353.6, 81022.8, 170196.0, @@ -72308,7 +72320,7 @@ 33575.4, 33575.4, 51490.1, - 52167.2, + 52167.200000000004, 81718.0, 87139.9, 88532.70000000001, @@ -72338,13 +72350,13 @@ 35012.1, 37323.9, 39649.4, - 42362.2, - 40472.2, - 41970.8, + 42362.200000000004, + 40472.200000000004, + 41970.799999999996, 40438.0, 42187.1, 40241.9, - 37769.8, + 37769.799999999996, 33575.4, 33575.4, 33575.4, @@ -72479,8 +72491,8 @@ 48881.100000000006, 79475.0, 87099.5, - 91237.1, - 97456.6, + 91237.09999999999, + 97456.59999999999, 99244.0, 99896.1, 70930.9, @@ -72500,10 +72512,10 @@ 33575.4, 33575.4, 26173.4, - 25968.4, + 25968.399999999998, 38654.5, 36988.9, - 42314.7, + 42314.700000000004, 36809.8, 43401.899999999994, 38870.7, @@ -72525,7 +72537,7 @@ 41616.6, 41875.4, 55698.4, - 128385.0, + 128384.99999999999, 124736.0, 128600.0, 136345.0, @@ -72547,7 +72559,7 @@ 38936.2, 38936.2, 41616.6, - 44353.3, + 44353.299999999996, 59370.399999999994, 131800.0, 126771.0, @@ -72560,7 +72572,7 @@ 155952.0, 137874.0, 89496.0, - 91208.2, + 91208.20000000001, 71608.8, 68237.09999999999, 41616.6, @@ -72572,7 +72584,7 @@ 38936.2, 41616.6, 44514.5, - 59816.2, + 59816.200000000004, 132202.0, 128148.0, 131643.0, @@ -72619,7 +72631,7 @@ 38936.2, 38936.2, 41616.6, - 42515.7, + 42515.700000000004, 57006.5, 130553.0, 130625.0, @@ -72647,7 +72659,7 @@ 46551.0, 77767.3, 88577.6, - 95428.3, + 95428.29999999999, 103711.0, 107776.0, 110921.0, @@ -72669,7 +72681,7 @@ 33575.4, 28640.7, 26091.0, - 37398.3, + 37398.299999999996, 38547.8, 42387.6, 42293.5, @@ -72682,16 +72694,16 @@ 55449.8, 48664.6, 42501.0, - 41121.2, + 41121.200000000004, 33575.4, - 38286.2, + 38286.200000000004, 33575.4, 38936.2, 38936.2, 38936.2, 38936.2, 41616.6, - 59079.7, + 59079.700000000004, 69419.3, 154601.0, 158198.0, @@ -72715,7 +72727,7 @@ 38936.2, 38936.2, 41616.6, - 60030.3, + 60030.299999999996, 69773.9, 156544.0, 160504.0, @@ -72762,7 +72774,7 @@ 38936.2, 38936.2, 38936.2, - 45838.3, + 45838.299999999996, 64596.0, 74810.3, 164623.0, @@ -72780,7 +72792,7 @@ 100244.0, 94901.0, 41616.6, - 44214.8, + 44214.799999999996, 40609.7, 42205.3, 38936.2, @@ -72812,14 +72824,14 @@ 33575.4, 33575.4, 62744.0, - 55040.7, + 55040.700000000004, 86955.8, 97589.6, 105833.0, 115434.0, 120585.0, 125116.0, - 95950.9, + 95950.90000000001, 96741.7, 97423.3, 81634.6, @@ -72837,7 +72849,7 @@ 33575.4, 28640.7, 20171.9, - 25627.6, + 25627.600000000002, 31969.3, 31582.2, 38786.8, @@ -72932,7 +72944,7 @@ 38936.2, 41616.6, 53746.0, - 63902.7, + 63902.700000000004, 140090.0, 140719.0, 150380.0, @@ -72990,7 +73002,7 @@ 62229.0, 61007.3, 59427.4, - 49198.8, + 49198.799999999996, 28640.7, 33575.4, 33575.4, @@ -73010,12 +73022,12 @@ 32204.700000000004, 38485.0, 33066.200000000004, - 42186.7, - 38238.7, + 42186.700000000004, + 38238.700000000004, 43480.600000000006, 38776.8, 36790.3, - 38519.8, + 38519.799999999996, 33575.4, 33575.4, 33575.4, @@ -73031,12 +73043,12 @@ 18771.4, 25350.8, 30767.3, - 32730.6, + 32730.600000000002, 37465.0, 39899.2, - 39539.2, + 39539.200000000004, 41921.2, - 40987.3, + 40987.299999999996, 43190.2, 41236.600000000006, 44393.9, @@ -73099,7 +73111,7 @@ 38936.2, 38936.2, 41616.6, - 48785.2, + 48785.200000000004, 57546.3, 129876.0, 129889.00000000002, @@ -73123,10 +73135,10 @@ 38936.2, 38936.2, 41616.6, - 49473.7, + 49473.700000000004, 57688.7, 129707.0, - 129516.0, + 129515.99999999999, 139048.0, 151044.0, 155496.0, @@ -73152,7 +73164,7 @@ 70633.9, 78982.29999999999, 85316.8, - 94362.1, + 94362.09999999999, 98935.8, 102210.0, 75076.5, @@ -73181,9 +73193,9 @@ 43527.1, 46853.1, 44637.3, - 46738.8, + 46738.799999999996, 43405.6, - 39671.7, + 39671.700000000004, 37087.899999999994, 33575.4, 33575.4, @@ -73196,7 +73208,7 @@ 38936.2, 41616.6, 49465.7, - 58090.3, + 58090.299999999996, 130288.00000000002, 131094.0, 141773.0, @@ -73267,7 +73279,7 @@ 38936.2, 38936.2, 41616.6, - 51165.8, + 51165.799999999996, 59872.100000000006, 133158.0, 132570.0, @@ -73278,9 +73290,9 @@ 148048.0, 144695.0, 145241.0, - 129063.0, + 129062.99999999999, 98806.5, - 92961.2, + 92961.20000000001, 74791.9, 72436.7, 41616.6, @@ -73295,7 +73307,7 @@ 57544.600000000006, 126422.0, 124585.0, - 129688.0, + 129687.99999999999, 137296.0, 139939.0, 147115.0, @@ -73343,13 +73355,13 @@ 18771.4, 18771.4, 18771.4, - 22199.9, + 22199.899999999998, 34536.9, 35703.4, 38084.0, 37252.7, - 38920.3, - 36720.7, + 38920.299999999996, + 36720.700000000004, 32225.499999999996, 33575.4, 33575.4, @@ -73364,8 +73376,8 @@ 38936.2, 41616.6, 55261.0, - 59728.3, - 128766.0, + 59728.299999999996, + 128765.99999999999, 125528.0, 129904.0, 139063.0, @@ -73400,7 +73412,7 @@ 166638.0, 148998.0, 106662.0, - 97903.6, + 97903.59999999999, 76929.7, 72683.2, 41616.6, @@ -73424,7 +73436,7 @@ 168312.0, 150523.0, 107713.0, - 98284.1, + 98284.09999999999, 76948.2, 72654.0, 41616.6, @@ -73471,7 +73483,7 @@ 140216.0, 144094.0, 130291.0, - 98019.4, + 98019.40000000001, 92683.5, 73590.2, 70013.5, @@ -73491,10 +73503,10 @@ 70535.1, 72190.0, 71877.70000000001, - 44880.2, + 44880.200000000004, 44910.3, 46794.600000000006, - 43770.3, + 43770.299999999996, 33575.4, 33575.4, 33575.4, @@ -73591,7 +73603,7 @@ 140214.0, 144989.0, 129032.00000000002, - 93989.9, + 93989.90000000001, 86920.2, 69142.9, 67890.1, @@ -73608,14 +73620,14 @@ 125993.0, 119515.0, 122365.0, - 130581.0, + 130580.99999999999, 136978.0, 147005.0, 146223.0, 147983.0, 152423.0, 136822.0, - 97038.8, + 97038.79999999999, 89089.29999999999, 70572.0, 68668.5, @@ -73757,7 +73769,7 @@ 130442.0, 134389.0, 129566.0, - 128909.0, + 128908.99999999999, 132177.0, 125930.0, 84578.2, @@ -73796,7 +73808,7 @@ 38936.2, 38936.2, 41616.6, - 91059.7, + 91059.70000000001, 82484.2, 130491.00000000002, 118391.0, @@ -73869,18 +73881,18 @@ 38936.2, 41616.6, 99553.5, - 95273.8, + 95273.79999999999, 133538.0, 120150.0, 119917.0, 124632.0, - 128682.0, + 128681.99999999999, 132156.0, 127853.0, 128219.0, 136580.0, - 130147.0, - 92365.1, + 130146.99999999999, + 92365.09999999999, 88647.5, 76427.59999999999, 79706.2, @@ -73894,7 +73906,7 @@ 41616.6, 83530.7, 79509.7, - 129444.0, + 129443.99999999999, 118909.0, 119739.0, 126674.0, @@ -73964,7 +73976,7 @@ 38936.2, 38936.2, 41616.6, - 58037.8, + 58037.799999999996, 63439.3, 127618.0, 121761.0, @@ -74016,7 +74028,7 @@ 18771.4, 18771.4, 18771.4, - 19428.9, + 19428.899999999998, 21009.699999999997, 24421.5, 22519.2, @@ -74049,9 +74061,9 @@ 124573.0, 125817.0, 96894.3, - 99766.4, + 99766.40000000001, 91389.1, - 93749.8, + 93749.79999999999, 41616.6, 38936.2, 38936.2, @@ -74090,10 +74102,10 @@ 121537.0, 121171.0, 125717.0, - 129551.0, + 129550.99999999999, 132837.0, - 128915.0, - 129117.0, + 128914.99999999999, + 129116.99999999999, 138826.0, 134495.0, 97366.5, @@ -74134,7 +74146,7 @@ 41616.6, 92813.3, 84254.5, - 130528.0, + 130527.99999999999, 119266.0, 119426.0, 125485.0, @@ -74165,7 +74177,7 @@ 87644.59999999999, 86123.7, 58597.4, - 56650.8, + 56650.799999999996, 61802.100000000006, 61218.9, 33575.4, @@ -74186,7 +74198,7 @@ 18771.4, 24712.6, 33485.700000000004, - 36927.8, + 36927.799999999996, 36282.3, 37830.0, 27158.7, @@ -74206,7 +74218,7 @@ 41616.6, 69608.8, 71152.7, - 130146.0, + 130145.99999999999, 123840.0, 124117.0, 128541.0, @@ -74233,7 +74245,7 @@ 126911.0, 119793.0, 122315.0, - 128879.0, + 128878.99999999999, 134000.0, 140083.0, 135930.0, @@ -74260,8 +74272,8 @@ 124472.0, 127666.0, 132636.0, - 129515.0, - 129878.0, + 129514.99999999999, + 129877.99999999999, 137304.0, 129340.0, 88128.8, @@ -74301,7 +74313,7 @@ 38936.2, 41616.6, 102044.0, - 94431.8, + 94431.79999999999, 135886.0, 121886.0, 118155.0, @@ -74326,7 +74338,7 @@ 33575.4, 126462.0, 96049.2, - 93885.6, + 93885.59999999999, 88225.09999999999, 84725.4, 84528.9, @@ -74397,7 +74409,7 @@ 38936.2, 41616.6, 142716.0, - 130147.0, + 130146.99999999999, 163640.0, 144764.0, 136399.0, @@ -74410,7 +74422,7 @@ 136796.0, 107765.0, 107344.0, - 98304.9, + 98304.90000000001, 100079.0, 41616.6, 38936.2, @@ -74469,7 +74481,7 @@ 38936.2, 41616.6, 107704.0, - 93085.4, + 93085.40000000001, 132757.0, 122881.0, 122966.0, @@ -74500,9 +74512,9 @@ 80147.90000000001, 78534.59999999999, 73135.7, - 50027.3, + 50027.299999999996, 48809.7, - 59842.8, + 59842.799999999996, 68167.0, 33575.4, 33575.4, @@ -74546,14 +74558,14 @@ 123677.0, 120589.0, 125521.0, - 128534.0, + 128533.99999999999, 128732.0, 125019.0, 124147.0, 131156.0, 123959.0, 90021.8, - 91303.8, + 91303.79999999999, 82288.79999999999, 84619.1, 41616.6, @@ -74565,13 +74577,13 @@ 38936.2, 41616.6, 101387.0, - 90134.9, + 90134.90000000001, 131867.0, 119908.0, 120330.0, 125113.0, 127775.0, - 130390.0, + 130389.99999999999, 126099.0, 124502.0, 131187.0, @@ -74590,7 +74602,7 @@ 41616.6, 95556.9, 86512.1, - 130962.0, + 130961.99999999999, 118795.0, 118531.0, 125894.0, @@ -74598,7 +74610,7 @@ 131609.0, 128061.0, 126200.0, - 130611.0, + 130610.99999999999, 122206.0, 85141.3, 85429.4, @@ -74614,12 +74626,12 @@ 41616.6, 90687.4, 81240.09999999999, - 129486.0, + 129485.99999999999, 118235.0, 118087.0, 122448.0, 125240.0, - 130742.0, + 130741.99999999999, 129072.0, 127440.0, 131252.0, @@ -74636,9 +74648,9 @@ 38936.2, 38936.2, 41616.6, - 92574.7, + 92574.70000000001, 83229.7, - 130295.0, + 130294.99999999999, 118614.0, 117865.0, 124541.0, @@ -74668,7 +74680,7 @@ 80911.4, 79811.6, 74811.09999999999, - 47912.8, + 47912.799999999996, 49054.5, 58614.600000000006, 65977.40000000001, @@ -74714,7 +74726,7 @@ 131070.0, 124398.0, 126319.0, - 131069.0, + 131068.99999999999, 129249.0, 125114.0, 124165.0, @@ -74723,7 +74735,7 @@ 94260.5, 97233.0, 89943.5, - 93367.6, + 93367.59999999999, 41616.6, 38936.2, 38936.2, @@ -74745,7 +74757,7 @@ 126607.0, 123003.0, 92340.2, - 93315.7, + 93315.70000000001, 85147.09999999999, 88102.8, 41616.6, @@ -74780,7 +74792,7 @@ 38936.2, 38936.2, 41616.6, - 91359.1, + 91359.09999999999, 83843.90000000001, 129812.00000000002, 120692.0, @@ -74804,7 +74816,7 @@ 38936.2, 38936.2, 41616.6, - 90528.4, + 90528.40000000001, 84346.40000000001, 130461.00000000002, 118571.0, @@ -74817,7 +74829,7 @@ 123218.0, 122469.0, 90855.2, - 93116.2, + 93116.20000000001, 85178.2, 87345.4, 41616.6, @@ -74873,7 +74885,7 @@ 36307.6, 39466.6, 39239.3, - 41398.2, + 41398.200000000004, 40382.3, 43400.3, 39404.5, @@ -74893,11 +74905,11 @@ 33575.4, 33575.4, 33575.4, - 36322.3, + 36322.299999999996, 41800.2, - 44445.8, + 44445.799999999996, 43941.0, - 46045.2, + 46045.200000000004, 45263.1, 50540.4, 184050.0, @@ -74935,7 +74947,7 @@ 119881.0, 118743.0, 128723.00000000002, - 128170.0, + 128169.99999999999, 96893.7, 96691.1, 88019.3, @@ -74949,7 +74961,7 @@ 38936.2, 41616.6, 95284.5, - 96373.1, + 96373.09999999999, 143728.0, 133032.0, 131387.0, @@ -83807,7 +83819,7 @@ 33.5754 ], "loan_moratorium": 0.0, - "mera_cost1": 10076956.5, + "mera_cost1": 10076956.521739133, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -83829,7 +83841,7 @@ 156200.0, 184050.0 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_thermal_bill": 0.0, "normalize_to_utility_bill": 0.0, "om_capacity": 0.0, @@ -83888,7 +83900,7 @@ "ppa_soln_mode": 0.0, "prop_tax_assessed_decline": 0.0, "prop_tax_cost_assessed_percent": 100.0, - "property_assessed_value": 135921901.61934, + "property_assessed_value": 135921902.02629654, "property_tax_rate": 0.0, "ptc_fed_amount": [ 0.0 @@ -83900,7 +83912,7 @@ ], "ptc_sta_escal": 0.0, "ptc_sta_term": 10.0, - "pv_total_installed_cost": 937311.12, + "pv_total_installed_cost": 937311.5269565217, "rate_escalation": [ 0.0 ], @@ -83922,14 +83934,14 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 100769.565, + "system_capacity": 100769.56521739131, "term_int_rate": 7.0, "term_tenor": 18.0, "thermal_1": 493720.8040000014, "thermal_10": 664864.1129999992, "thermal_11": 566944.4700000023, "thermal_12": 466793.0800000013, - "thermal_2": 485226.5400000012, + "thermal_2": 485226.54000000117, "thermal_3": 580314.9830000013, "thermal_4": 601906.9489999994, "thermal_5": 688796.4460000006, @@ -119033,7 +119045,7 @@ 0.0 ], "tod_library": "Uniform Dispatch", - "total_installed_cost": 135921901.61934, + "total_installed_cost": 135921902.02629654, "ui_annual_load": 0.0, "ui_battery_capacity": 288.1303487999999, "ui_battery_cost": 421090.49934, @@ -119041,8 +119053,8 @@ "ui_customgeneration_cost": 133874000.0, "ui_fuel_cell_capacity": 200.0, "ui_fuel_cell_cost": 84000.0, - "ui_hyb_pv_capacity": 469.565, - "ui_pv_cost": 937311.12, + "ui_hyb_pv_capacity": 469.5652173913044, + "ui_pv_cost": 937311.5269565217, "ui_wacc": 6.709740000000002, "ui_wind_cost": 605500.0, "ur_annual_min_charge": 0.0, diff --git a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json index 9ccf8ddb9..6e8b6992d 100644 --- a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json @@ -1,5 +1,8 @@ { "CustomGeneration": { + "ac_degradation": [ + 0.0 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -41,6 +44,9 @@ "energy_output_array": [ 0.0 ], + "energy_output_array_lifetime": [ + 0.0 + ], "first_year_output": 756864000.0, "first_year_output_peak": 96000.0, "fixed_plant_input": 0.0, @@ -68,7 +74,7 @@ "spec_mode": 0.0, "system_capacity": 100000.0, "system_capacity_combined": 0.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_direct_cost": 105000000.0, "total_indirect_cost": 3675000.0, "total_installed_cost": 112875000.0, @@ -106,7 +112,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -127,9 +133,12 @@ "contingency_percent": 3.0, "country": "-", "dc_ac_ratio": 1.3, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -279,7 +288,7 @@ "step": 3600.0, "subtotal_direct": 99000000.0, "system_capacity": 100000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 0.0, "total_direct_cost": 101970000.0, "total_indirect_cost": 5000000.0, @@ -303,7 +312,7 @@ "ui_step_minutes": 60.0, "ui_total_land_area_ha": 175.43871222814654, "ui_total_module_area": 526315.7894736842, - "ui_total_module_area_acres": 130.05534895540846, + "ui_total_module_area_acres": 130.05534895540843, "ui_total_module_area_ha": 52.63157894736842, "ui_use_acre_per_mw": 0.0, "use_specific_weather_file": 0.0, @@ -315,6 +324,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -344,7 +356,7 @@ ], "desired_farm_size": 100.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -381,12 +393,12 @@ "specify_label": 1.0, "step": 3600.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 317480100.0, "total_installed_cost_per_kw": 1587.4005, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 100.0, @@ -19687,7 +19699,7 @@ "batt_Qexp": 0.04000005, "batt_Qexp_percent": 1.77778, "batt_Qfull": 2.25, - "batt_Qfull_flow": 478584.0, + "batt_Qfull_flow": 478583.99999999997, "batt_Qnom": 2.0000002500000004, "batt_Qnom_percent": 88.8889, "batt_Vcut": 2.706, @@ -28551,7 +28563,7 @@ "batt_dispatch_pvs_ki": 1.8, "batt_dispatch_pvs_kp": 1.2, "batt_dispatch_pvs_max_ramp": 10.0, - "batt_dispatch_pvs_nameplate": 377123.1, + "batt_dispatch_pvs_nameplate": 377123.07692307696, "batt_dispatch_pvs_nameplate_ac": 20000.0, "batt_dispatch_pvs_ramp_interval": 180.0, "batt_dispatch_pvs_short_forecast_enable": 0.0, @@ -30911,7 +30923,7 @@ "en_standalone_batt": 0.0, "generic_ui_step_minutes": 60.0, "grid_interconnection_limit_kwac": 20000.0, - "hybrid_system_capacity": 377123.1, + "hybrid_system_capacity": 377123.07692307696, "inflation_rate": 2.5, "lbl_fom_dispatch_message": "", "om_batt_capacity_cost": [ @@ -30991,7 +31003,7 @@ "wind_ui_step_minutes": 60.0 }, "Hybrid": { - "ac_nameplate": 76923.1, + "ac_nameplate": 76923.07692307692, "analysis_period": 25.0, "analysis_period_warning": "", "batt_power_discharge_max_kwac": 57600.0730368, @@ -31080,7 +31092,7 @@ ], "cp_capacity_payment_esc": 0.0, "cp_capacity_payment_type": 0.0, - "cp_system_nameplate": 377.1231, + "cp_system_nameplate": 377.12307692307697, "customgeneration_system_capacity": 100000.0, "customgeneration_total_installed_cost": 112875000.0, "debt_message": "", @@ -49418,7 +49430,7 @@ ] ], "loan_moratorium": 0.0, - "mera_cost1": 37712310.0, + "mera_cost1": 37712307.692307699, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -49426,7 +49438,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": 0.0, "om_fixed": 0.0, "om_production": 0.0, @@ -49505,7 +49517,7 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 377123.1, + "system_capacity": 377123.07692307696, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", @@ -49517,7 +49529,7 @@ "ui_electricity_rate_option": 0.0, "ui_fuel_cell_capacity": 200.0, "ui_fuel_cell_cost": 2100000.0, - "ui_hyb_pv_capacity": 76923.1, + "ui_hyb_pv_capacity": 76923.07692307692, "ui_pv_cost": 112068500.0, "ui_system_nameplate_standalone": 0.0, "ui_wacc": 6.709740000000002, diff --git a/deploy/runtime/defaults/MEwave Battery_Single Owner.json b/deploy/runtime/defaults/MEwave Battery_Single Owner.json index 5045de8ae..738694531 100644 --- a/deploy/runtime/defaults/MEwave Battery_Single Owner.json +++ b/deploy/runtime/defaults/MEwave Battery_Single Owner.json @@ -22733,7 +22733,7 @@ "gearbox_cost_total_check": 0.0, "gears_cost": 0.0, "generation_planning_and_integration_cost": 0.0, - "generic_degradation": [ + "ac_degradation": [ 0.0 ], "geological_and_bathymetry_cost": 0.0, diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json index 68c51d3e3..c0af0996d 100644 --- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json @@ -30,7 +30,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -51,9 +51,12 @@ "contingency_percent": 4.0, "country": "-", "dc_ac_ratio": 1.15, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -89,7 +92,7 @@ "inverter_total": 27000.0, "inverterarray_power": 469.5652173913044, "is_advanced": 0.0, - "land_area_value": 2.340996281197352, + "land_area_value": 2.3409962811973519, "land_fixed": 0.0, "land_per_acre": 0.0, "land_per_watt": 0.0, @@ -122,7 +125,7 @@ "module_power": 540.0, "module_total": 232200.0, "module_type": 0.0, - "modulearray_area": 2842.105263157895, + "modulearray_area": 2842.1052631578947, "modulearray_power": 540.0, "om_capacity": [ 22.0 @@ -198,24 +201,24 @@ "step": 3600.0, "subtotal_direct": 680400.0, "system_capacity": 540.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 20.0, "total_direct_cost": 707616.0, "total_indirect_cost": 205200.0, "total_installed_cost": 948196.8, - "total_land_area": 2.340996281197352, - "total_module_area": 2842.105263157895, + "total_land_area": 2.3409962811973519, + "total_module_area": 2842.1052631578947, "tz": -7.0, - "ui_ac_capacity": 0.4695652173913044, - "ui_array_land_area_acres": 2.340996281197352, - "ui_array_land_area_ha": 0.9473690460319912, + "ui_ac_capacity": 0.46956521739130438, + "ui_array_land_area_acres": 2.3409962811973519, + "ui_array_land_area_ha": 0.9473690460319911, "ui_array_land_area_multiplier": 1.0, "ui_land_area_additional": 0.0, "ui_land_area_additional_units": 0.0, "ui_land_area_per_mw": 0.0, "ui_step_minutes": 60.0, - "ui_total_land_area_ha": 0.9473690460319912, - "ui_total_module_area": 2842.105263157895, + "ui_total_land_area_ha": 0.9473690460319911, + "ui_total_module_area": 2842.1052631578947, "ui_total_module_area_acres": 0.7022988843592055, "ui_total_module_area_ha": 0.28421052631578949, "ui_use_acre_per_mw": 0.0, @@ -228,6 +231,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -257,7 +263,7 @@ ], "desired_farm_size": 5.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -294,12 +300,12 @@ "specify_label": 0.0, "step": 3600.0, "system_capacity": 100.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 605500.0, "total_installed_cost_per_kw": 6055.0, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -9344,7 +9350,7 @@ "batt_cell_power_charge_max": 2.0, "batt_cell_power_discharge_max": 2.0, "batt_chem": 1.0, - "batt_computed_bank_capacity": 1200.54312, + "batt_computed_bank_capacity": 1200.5431199999999, "batt_computed_series": 126.0, "batt_computed_stacks_series": 0.0, "batt_computed_strings": 1064.0, @@ -10324,9 +10330,9 @@ "batt_minimum_modetime": 10.0, "batt_num_cells": 134064.0, "batt_power_charge_max_kwac": 312.64143749999996, - "batt_power_charge_max_kwdc": 300.13578, + "batt_power_charge_max_kwdc": 300.13577999999998, "batt_power_discharge_max_kwac": 288.1303487999999, - "batt_power_discharge_max_kwdc": 300.13578, + "batt_power_discharge_max_kwdc": 300.13577999999998, "batt_pv_ac_forecast": [ 0.0 ], @@ -10369,7 +10375,7 @@ "batt_ui_bank_voltage": 501.48, "batt_ui_cell_voltage": 3.98, "batt_ui_inverter_eff": 96.0, - "batt_ui_nominal_bank_power": 300.13578, + "batt_ui_nominal_bank_power": 300.13577999999998, "batt_unit_capacity": 400.0, "batt_unit_surface_area": 30.0, "batt_user_specified_weather_file_peak_shaving": "", @@ -10401,13 +10407,13 @@ 0.5 ] ], - "batt_volume": 14.64076975609756, - "battery_energy": 1200.54312, + "batt_volume": 14.640769756097559, + "battery_energy": 1200.5431199999999, "battery_indirect_cost_percent": 0.0, "battery_losses_shown": 0.0, "battery_per_kW": 667.0, "battery_per_kWh": 184.0, - "battery_power": 300.13578, + "battery_power": 300.13577999999998, "battery_thermal_shown": 0.0, "battery_total": 421090.49934, "battery_total_cost_lcos": 421090.49934, @@ -20535,7 +20541,7 @@ "om_batt_fixed_cost": [ 0.0 ], - "om_batt_nameplate": 1200.54312, + "om_batt_nameplate": 1200.5431199999999, "om_batt_replacement_cost": [ 280.0 ], @@ -20607,7 +20613,7 @@ "ui_step_minutes": 60.0 }, "Hybrid": { - "ac_nameplate": 469.565, + "ac_nameplate": 469.5652173913044, "analysis_period": 25.0, "analysis_period_warning": "", "annual_crit": 0.0, @@ -20677,7 +20683,7 @@ "const_per_principal4": 0.0, "const_per_principal5": 0.0, "const_per_principal_total": 1974787.29934, - "const_per_total1": 51838.16660767501, + "const_per_total1": 51838.166607675004, "const_per_total2": 0.0, "const_per_total3": 0.0, "const_per_total4": 0.0, @@ -20687,7 +20693,7 @@ "const_per_upfront_rate3": 0.0, "const_per_upfront_rate4": 0.0, "const_per_upfront_rate5": 0.0, - "construction_financing_cost": 51838.16660767501, + "construction_financing_cost": 51838.166607675004, "cost_debt_closing": 0.0, "cost_debt_fee": 2.75, "cost_other_financing": 0.0, @@ -47113,7 +47119,7 @@ "grid_outage": [ 0.0 ], - "host_nominal_discount_rate": 9.060000000000004, + "host_nominal_discount_rate": 9.060000000000003, "host_real_discount_rate": 6.4, "hybrid_capital_cost": 0.0, "ibi_fed_amount": 0.0, @@ -65356,7 +65362,7 @@ 33.5754 ], "loan_moratorium": 0.0, - "mera_cost1": 56956.50000000001, + "mera_cost1": 56956.52173913044, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -65378,7 +65384,7 @@ 156.2, 184.05 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_utility_bill": 0.0, "om_capacity": 0.0, "om_fixed": 0.0, @@ -65470,7 +65476,7 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 569.565, + "system_capacity": 569.5652173913044, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", @@ -65482,7 +65488,7 @@ "ui_customgeneration_cost": 0.0, "ui_fuel_cell_capacity": 0.0, "ui_fuel_cell_cost": 0.0, - "ui_hyb_pv_capacity": 469.565, + "ui_hyb_pv_capacity": 469.5652173913044, "ui_pv_cost": 948196.8, "ui_wacc": 6.709740000000002, "ui_wind_cost": 605500.0, diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json index 42464974c..fa1797d31 100644 --- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json @@ -30,7 +30,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -51,9 +51,12 @@ "contingency_percent": 3.0, "country": "-", "dc_ac_ratio": 1.3, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -203,7 +206,7 @@ "step": 3600.0, "subtotal_direct": 99000000.0, "system_capacity": 100000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 0.0, "total_direct_cost": 101970000.0, "total_indirect_cost": 5000000.0, @@ -227,7 +230,7 @@ "ui_step_minutes": 60.0, "ui_total_land_area_ha": 175.43871222814654, "ui_total_module_area": 526315.7894736842, - "ui_total_module_area_acres": 130.05534895540846, + "ui_total_module_area_acres": 130.05534895540843, "ui_total_module_area_ha": 52.63157894736842, "ui_use_acre_per_mw": 0.0, "use_specific_weather_file": 0.0, @@ -239,6 +242,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -268,7 +274,7 @@ ], "desired_farm_size": 10.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -305,12 +311,12 @@ "specify_label": 1.0, "step": 3600.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 317480000.0, "total_installed_cost_per_kw": 1587.4, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -1239,7 +1245,7 @@ "batt_Qexp": 0.04000005, "batt_Qexp_percent": 1.77778, "batt_Qfull": 2.25, - "batt_Qfull_flow": 478584.0, + "batt_Qfull_flow": 478583.99999999997, "batt_Qnom": 2.0000002500000004, "batt_Qnom_percent": 88.8889, "batt_Vcut": 2.706, @@ -10103,7 +10109,7 @@ "batt_dispatch_pvs_ki": 1.8, "batt_dispatch_pvs_kp": 1.2, "batt_dispatch_pvs_max_ramp": 10.0, - "batt_dispatch_pvs_nameplate": 276923.1, + "batt_dispatch_pvs_nameplate": 276923.07692307696, "batt_dispatch_pvs_nameplate_ac": 20000.0, "batt_dispatch_pvs_ramp_interval": 180.0, "batt_dispatch_pvs_short_forecast_enable": 0.0, @@ -12462,7 +12468,7 @@ ], "en_standalone_batt": 0.0, "grid_interconnection_limit_kwac": 20000.0, - "hybrid_system_capacity": 276923.1, + "hybrid_system_capacity": 276923.07692307696, "inflation_rate": 2.5, "lbl_fom_dispatch_message": "", "om_batt_capacity_cost": [ @@ -12542,7 +12548,7 @@ "wind_ui_step_minutes": 60.0 }, "Hybrid": { - "ac_nameplate": 76923.1, + "ac_nameplate": 76923.07692307692, "analysis_period": 25.0, "analysis_period_warning": "", "batt_power_discharge_max_kwac": 57600.0730368, @@ -12632,7 +12638,7 @@ ], "cp_capacity_payment_esc": 0.0, "cp_capacity_payment_type": 0.0, - "cp_system_nameplate": 276.9231, + "cp_system_nameplate": 276.92307692307699, "debt_message": "", "debt_option": 1.0, "debt_percent": 60.0, @@ -30966,7 +30972,7 @@ ] ], "loan_moratorium": 0.0, - "mera_cost1": 27692310.0, + "mera_cost1": 27692307.692307697, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -30974,7 +30980,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": 0.0, "om_fixed": 0.0, "om_production": 0.0, @@ -31053,7 +31059,7 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 276923.1, + "system_capacity": 276923.07692307696, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", @@ -31065,7 +31071,7 @@ "ui_electricity_rate_option": 0.0, "ui_fuel_cell_capacity": 0.0, "ui_fuel_cell_cost": 0.0, - "ui_hyb_pv_capacity": 76923.1, + "ui_hyb_pv_capacity": 76923.07692307692, "ui_pv_cost": 112068500.0, "ui_system_nameplate_standalone": 0.0, "ui_wacc": 6.709740000000002, diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json index f414b9819..d21e88a15 100644 --- a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json @@ -30,7 +30,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -51,9 +51,12 @@ "contingency_percent": 4.0, "country": "-", "dc_ac_ratio": 1.15, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -89,7 +92,7 @@ "inverter_total": 27000.0, "inverterarray_power": 469.5652173913044, "is_advanced": 0.0, - "land_area_value": 2.340996281197352, + "land_area_value": 2.3409962811973519, "land_fixed": 0.0, "land_per_acre": 0.0, "land_per_watt": 0.0, @@ -122,7 +125,7 @@ "module_power": 540.0, "module_total": 232200.0, "module_type": 0.0, - "modulearray_area": 2842.105263157895, + "modulearray_area": 2842.1052631578947, "modulearray_power": 540.0, "om_capacity": [ 22.0 @@ -198,24 +201,24 @@ "step": 3600.0, "subtotal_direct": 680400.0, "system_capacity": 540.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 20.0, "total_direct_cost": 707616.0, "total_indirect_cost": 205200.0, "total_installed_cost": 948196.8, - "total_land_area": 2.340996281197352, - "total_module_area": 2842.105263157895, + "total_land_area": 2.3409962811973519, + "total_module_area": 2842.1052631578947, "tz": -7.0, - "ui_ac_capacity": 0.4695652173913044, - "ui_array_land_area_acres": 2.340996281197352, - "ui_array_land_area_ha": 0.9473690460319912, + "ui_ac_capacity": 0.46956521739130438, + "ui_array_land_area_acres": 2.3409962811973519, + "ui_array_land_area_ha": 0.9473690460319911, "ui_array_land_area_multiplier": 1.0, "ui_land_area_additional": 0.0, "ui_land_area_additional_units": 0.0, "ui_land_area_per_mw": 0.0, "ui_step_minutes": 60.0, - "ui_total_land_area_ha": 0.9473690460319912, - "ui_total_module_area": 2842.105263157895, + "ui_total_land_area_ha": 0.9473690460319911, + "ui_total_module_area": 2842.1052631578947, "ui_total_module_area_acres": 0.7022988843592055, "ui_total_module_area_ha": 0.28421052631578949, "ui_use_acre_per_mw": 0.0, @@ -228,6 +231,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -257,7 +263,7 @@ ], "desired_farm_size": 5.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -294,12 +300,12 @@ "specify_label": 0.0, "step": 3600.0, "system_capacity": 100.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 605500.0, "total_installed_cost_per_kw": 6055.0, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -27715,7 +27721,7 @@ "batt_cell_power_charge_max": 2.0, "batt_cell_power_discharge_max": 2.0, "batt_chem": 1.0, - "batt_computed_bank_capacity": 1200.54312, + "batt_computed_bank_capacity": 1200.5431199999999, "batt_computed_series": 126.0, "batt_computed_stacks_series": 0.0, "batt_computed_strings": 1064.0, @@ -37453,9 +37459,9 @@ "batt_minimum_SOC": 15.0, "batt_minimum_modetime": 10.0, "batt_num_cells": 134064.0, - "batt_power_charge_max_kwac": 300.13578, + "batt_power_charge_max_kwac": 300.13577999999998, "batt_power_charge_max_kwdc": 288.1303487999999, - "batt_power_discharge_max_kwac": 300.13578, + "batt_power_discharge_max_kwac": 300.13577999999998, "batt_power_discharge_max_kwdc": 312.64143749999996, "batt_pv_ac_forecast": [ 0.0 @@ -46290,8 +46296,8 @@ 0.5 ] ], - "batt_volume": 14.64076975609756, - "battery_energy": 1200.54312, + "batt_volume": 14.640769756097559, + "battery_energy": 1200.5431199999999, "battery_indirect_cost_percent": 0.0, "battery_losses_shown": 0.0, "battery_per_kW": 667.0, @@ -56423,7 +56429,7 @@ "om_batt_fixed_cost": [ 0.0 ], - "om_batt_nameplate": 1200.54312, + "om_batt_nameplate": 1200.5431199999999, "om_batt_replacement_cost": [ 280.0 ], @@ -56472,7 +56478,7 @@ "standalonebatt.cost.epc.nonfixed": 0.0, "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, - "standalonebatt.cost.installed_per_capacity": 1.430791666666667, + "standalonebatt.cost.installed_per_capacity": 1.4307916666666667, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, @@ -56480,7 +56486,7 @@ "standalonebatt.cost.sales_tax.percent": 0.0, "standalonebatt.cost.sales_tax.total": 0.0, "standalonebatt.cost.sales_tax.value": 5.0, - "system_capacity": 300.13578, + "system_capacity": 300.13577999999998, "total_direct_cost": 429431.7728924999, "total_indirect_cost": 0.0, "total_installed_cost": 429431.7728924999, @@ -56493,17 +56499,17 @@ "ui_copy_batt_discharge_percent_6": 25.0 }, "Hybrid": { - "ac_nameplate": 469.565, + "ac_nameplate": 469.5652173913044, "analysis_period": 25.0, "analysis_period_warning": "", "annual_crit": 0.0, "annual_peak": 274.231, "batt_minimum_outage_SOC": 10.0, - "batt_power_discharge_max_kwac": 300.13578, + "batt_power_discharge_max_kwac": 300.13577999999998, "batt_replacement_option": 1.0, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, - "battery_system_capacity": 300.13578, + "battery_system_capacity": 300.13577999999998, "battery_total_installed_cost": 429431.7728924999, "cbi_fed_amount": 0.0, "cbi_fed_deprbas_fed": 0.0, @@ -56563,7 +56569,7 @@ "const_per_principal4": 0.0, "const_per_principal5": 0.0, "const_per_principal_total": 4512560.345785, - "const_per_total1": 118454.70907685628, + "const_per_total1": 118454.70907685627, "const_per_total2": 0.0, "const_per_total3": 0.0, "const_per_total4": 0.0, @@ -56573,7 +56579,7 @@ "const_per_upfront_rate3": 0.0, "const_per_upfront_rate4": 0.0, "const_per_upfront_rate5": 0.0, - "construction_financing_cost": 118454.70907685628, + "construction_financing_cost": 118454.70907685627, "cost_debt_closing": 0.0, "cost_debt_fee": 2.75, "cost_other_financing": 0.0, @@ -101133,7 +101139,7 @@ 0.0, 0.0 ], - "host_nominal_discount_rate": 9.060000000000004, + "host_nominal_discount_rate": 9.060000000000003, "host_real_discount_rate": 6.4, "hybrid_capital_cost": 0.0, "ibi_fed_amount": 0.0, @@ -119376,7 +119382,7 @@ 33.5754 ], "loan_moratorium": 0.0, - "mera_cost1": 76956.5, + "mera_cost1": 76956.52173913043, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -119398,7 +119404,7 @@ 156.2, 184.05 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_thermal_bill": 0.0, "normalize_to_utility_bill": 0.0, "om_capacity": 0.0, @@ -119492,14 +119498,14 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 769.565, + "system_capacity": 769.5652173913044, "term_int_rate": 7.0, "term_tenor": 18.0, "thermal_1": 493720.8040000014, "thermal_10": 664864.1129999992, "thermal_11": 566944.4700000023, "thermal_12": 466793.0800000013, - "thermal_2": 485226.5400000012, + "thermal_2": 485226.54000000117, "thermal_3": 580314.9830000013, "thermal_4": 601906.9489999994, "thermal_5": 688796.4460000006, @@ -154605,13 +154611,13 @@ "tod_library": "Uniform Dispatch", "total_installed_cost": 4512560.345785, "ui_annual_load": 0.0, - "ui_battery_capacity": 300.13578, + "ui_battery_capacity": 300.13577999999998, "ui_battery_cost": 429431.7728924999, "ui_customgeneration_capacity": 0.0, "ui_customgeneration_cost": 0.0, "ui_fuel_cell_capacity": 200.0, "ui_fuel_cell_cost": 2100000.0, - "ui_hyb_pv_capacity": 469.565, + "ui_hyb_pv_capacity": 469.5652173913044, "ui_pv_cost": 948196.8, "ui_wacc": 6.709740000000002, "ui_wind_cost": 605500.0, diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json index e7d51fc64..56e3bfa1b 100644 --- a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json @@ -30,7 +30,7 @@ 0.2 ], "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -51,9 +51,12 @@ "contingency_percent": 3.0, "country": "-", "dc_ac_ratio": 1.4, - "degradation": [ + "dc_degradation": [ 0.5 ], + "degradation": [ + 0.0 + ], "elev": 358.0, "en_snowloss": 0.0, "en_user_spec_losses": 0.0, @@ -203,7 +206,7 @@ "step": 3600.0, "subtotal_direct": 99000000.0, "system_capacity": 100000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tilt": 0.0, "total_direct_cost": 101970000.0, "total_indirect_cost": 5000000.0, @@ -227,7 +230,7 @@ "ui_step_minutes": 60.0, "ui_total_land_area_ha": 175.43871222814654, "ui_total_module_area": 526315.7894736842, - "ui_total_module_area_acres": 130.05534895540846, + "ui_total_module_area_acres": 130.05534895540843, "ui_total_module_area_ha": 52.63157894736842, "ui_use_acre_per_mw": 0.0, "use_specific_weather_file": 0.0, @@ -239,6 +242,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -268,7 +274,7 @@ ], "desired_farm_size": 10.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -305,12 +311,12 @@ "specify_label": 1.0, "step": 3600.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 317480000.0, "total_installed_cost_per_kw": 1587.4, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -19612,7 +19618,7 @@ "batt_Qexp": 0.04000005, "batt_Qexp_percent": 1.77778, "batt_Qfull": 2.25, - "batt_Qfull_flow": 478584.0, + "batt_Qfull_flow": 478583.99999999997, "batt_Qnom": 2.0000002500000004, "batt_Qnom_percent": 88.8889, "batt_Vcut": 2.706, @@ -28476,7 +28482,7 @@ "batt_dispatch_pvs_ki": 1.8, "batt_dispatch_pvs_kp": 1.2, "batt_dispatch_pvs_max_ramp": 10.0, - "batt_dispatch_pvs_nameplate": 271628.6, + "batt_dispatch_pvs_nameplate": 271628.5714285714, "batt_dispatch_pvs_nameplate_ac": 20000.0, "batt_dispatch_pvs_ramp_interval": 180.0, "batt_dispatch_pvs_short_forecast_enable": 0.0, @@ -30835,7 +30841,7 @@ ], "en_standalone_batt": 0.0, "grid_interconnection_limit_kwac": 20000.0, - "hybrid_system_capacity": 271628.6, + "hybrid_system_capacity": 271628.5714285714, "inflation_rate": 2.5, "lbl_fom_dispatch_message": "", "om_batt_capacity_cost": [ @@ -30915,7 +30921,7 @@ "wind_ui_step_minutes": 60.0 }, "Hybrid": { - "ac_nameplate": 71428.6, + "ac_nameplate": 71428.57142857144, "analysis_period": 25.0, "analysis_period_warning": "", "batt_power_discharge_max_kwac": 57600.0730368, @@ -31005,7 +31011,7 @@ ], "cp_capacity_payment_esc": 0.0, "cp_capacity_payment_type": 0.0, - "cp_system_nameplate": 271.62859999999997, + "cp_system_nameplate": 271.62857142857146, "debt_message": "", "debt_option": 1.0, "debt_percent": 60.0, @@ -49342,7 +49348,7 @@ ] ], "loan_moratorium": 0.0, - "mera_cost1": 27162860.0, + "mera_cost1": 27162857.142857147, "mera_cost2": 0.0, "mera_cost3": 0.0, "mera_name1": "Replacement Reserve 1", @@ -49350,7 +49356,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": 0.0, "om_fixed": 0.0, "om_production": 0.0, @@ -49429,7 +49435,7 @@ "state_tax_rate": [ 7.0 ], - "system_capacity": 271628.6, + "system_capacity": 271628.5714285714, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", @@ -49441,7 +49447,7 @@ "ui_electricity_rate_option": 0.0, "ui_fuel_cell_capacity": 200.0, "ui_fuel_cell_cost": 2100000.0, - "ui_hyb_pv_capacity": 71428.6, + "ui_hyb_pv_capacity": 71428.57142857144, "ui_pv_cost": 112068500.0, "ui_system_nameplate_standalone": 0.0, "ui_wacc": 6.709740000000002, diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json index d342da7af..24d1b8f9d 100644 --- a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json @@ -17,9 +17,9 @@ "6par_imp": 12.82, "6par_is_bifacial": 1.0, "6par_isc": 13.71, - "6par_module_length": 2.277235165721802, + "6par_module_length": 2.2772351657218015, "6par_module_name": "Aptos Solar Technology LLC DNA-144-BF10-530W (from CEC database)", - "6par_module_width": 1.1329528187670657, + "6par_module_width": 1.1329528187670655, "6par_mounting": 0.0, "6par_mpeff": 20.571627906976745, "6par_nser": 72.0, @@ -366,9 +366,9 @@ 5.0 ] ], - "alpha_sc_calc": 0.04, + "alpha_sc_calc": 0.039999999999999997, "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -456,7 +456,7 @@ "engr_fixed": 0.0, "engr_per_watt": 0.3, "engr_percent": 0.0, - "engr_total": 167185.62000000006, + "engr_total": 167185.62000000003, "file_name": "phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv", "gamma_pmp_calc": -1.7886207600000004, "gcr_option": 1.0, @@ -701,8 +701,8 @@ "inv_cec_cg_c1": -0.000051, "inv_cec_cg_c2": 0.000984, "inv_cec_cg_c3": -0.001508, - "inv_cec_cg_eff_cec": 96.60945631544225, - "inv_cec_cg_eff_euro": 96.18210492215684, + "inv_cec_cg_eff_cec": 96.60945631544223, + "inv_cec_cg_eff_euro": 96.18210492215683, "inv_cec_cg_filename": "", "inv_cec_cg_idcmax": 18.0, "inv_cec_cg_mppt_hi": 480.0, @@ -2577,7 +2577,7 @@ "inv_snl_c2": -0.000791432, "inv_snl_c3": -0.000320828, "inv_snl_eff_cec": 98.69094035671238, - "inv_snl_eff_euro": 98.57668151849669, + "inv_snl_eff_euro": 98.57668151849667, "inv_snl_idcmax": 213.33, "inv_snl_mppt_hi": 1300.0, "inv_snl_mppt_low": 860.0, @@ -2701,7 +2701,7 @@ "sd11par_AMa4": -0.000091, "sd11par_Egref": 1.08583, "sd11par_Il": 5.90905, - "sd11par_Imp0": 5.506004749133028, + "sd11par_Imp0": 5.5060047491330279, "sd11par_Io": 3.63865e-12, "sd11par_Isc0": 5.90285, "sd11par_Pmp0": 322.305, @@ -2763,7 +2763,7 @@ "snl_c7": -0.093, "snl_dtc": 3.0, "snl_fd": 1.0, - "snl_imp_temp_1": -0.0021202945926680658, + "snl_imp_temp_1": -0.0021202945926680654, "snl_impo": 5.58, "snl_isco": 5.96, "snl_ixo": 5.9, @@ -2774,7 +2774,7 @@ "snl_module_length": 1.665142636532979, "snl_module_name": "SunPower SPR-305-WHT [2007 (E)]", "snl_module_structure": 0.0, - "snl_module_width": 0.9794956685488112, + "snl_module_width": 0.9794956685488111, "snl_n": 1.131, "snl_n_cells": 96.0, "snl_parallel_cells": 1.0, @@ -2786,14 +2786,14 @@ "snl_ref_imp": 5.579722612284382, "snl_ref_imp_temp_0": -0.038, "snl_ref_isc": 5.959701031499999, - "snl_ref_isc_temp_0": 0.05900000000000001, + "snl_ref_isc_temp_0": 0.059000000000000007, "snl_ref_isc_temp_1": 0.0035162236085849996, "snl_ref_pmp": 305.2105300228098, "snl_ref_pmp_temp_0": -0.37803722005446979, "snl_ref_pmp_temp_1": -1.153809403011743, "snl_ref_vmp": 54.69994679499923, "snl_ref_vmp_temp_0": -0.34003722005446976, - "snl_ref_vmp_temp_1": -0.1860001784529894, + "snl_ref_vmp_temp_1": -0.18600017845298939, "snl_ref_voc": 64.19986006248614, "snl_ref_voc_temp_0": -0.2757022666099982, "snl_sandia_notes": "Source: Sandia National Laboratories Updated 9/25/2012 Module Database", @@ -2829,9 +2829,9 @@ "spe_eff4": 20.5, "spe_fd": 1.0, "spe_is_bifacial": 1.0, - "spe_module_length": 2.277235165721802, + "spe_module_length": 2.2772351657218015, "spe_module_structure": 1.0, - "spe_module_width": 1.1329528187670657, + "spe_module_width": 1.1329528187670655, "spe_power": 528.9, "spe_rad0": 200.0, "spe_rad1": 400.0, @@ -2929,7 +2929,7 @@ "subarray1_tilt_eq_lat": 0.0, "subarray1_track_mode": 0.0, "subarray1_tracking_loss": 0.0, - "subarray1_ui_length_side": 4.188555837039779, + "subarray1_ui_length_side": 2.0942779185198896, "subarray1_ui_nmodules": 1050.0, "subarray1_ui_nrows": 42.0, "subarray1_ui_row_spacing": 13.961852790132597, @@ -3015,7 +3015,7 @@ "subarray2_tilt_eq_lat": 0.0, "subarray2_track_mode": 0.0, "subarray2_tracking_loss": 0.0, - "subarray2_ui_length_side": 1.2319281873646409, + "subarray2_ui_length_side": 2.0942779185198896, "subarray2_ui_nmodules": 0.0, "subarray2_ui_nrows": 0.0, "subarray2_ui_row_spacing": 4.10642729121547, @@ -3194,7 +3194,7 @@ "subtotal_direct": 702179.604, "system_capacity": 557.2854, "total_direct_cost": 730266.78816, - "total_indirect_cost": 211768.45200000009, + "total_indirect_cost": 211768.45200000006, "total_installed_cost": 978548.579568, "total_inverter_capacity": 453.994, "total_land_area": 2.231359622027943, @@ -3206,7 +3206,7 @@ "tz": -7.0, "ui_ac_capacity": 0.453994, "ui_array_land_area_acres": 2.231359622027943, - "ui_array_land_area_ha": 0.9030005957094932, + "ui_array_land_area_ha": 0.9030005957094931, "ui_array_land_area_multiplier": 1.0, "ui_aspect_ratio": 1.7, "ui_chkbox_nmodx_eq_mod_per_string": 1.0, @@ -3214,7 +3214,7 @@ "ui_land_area_additional_units": 0.0, "ui_land_area_per_mw": 0.0, "ui_step_minutes": 60.0, - "ui_total_land_area_ha": 0.9030005957094932, + "ui_total_land_area_ha": 0.9030005957094931, "ui_total_module_area": 2709.0, "ui_total_module_area_acres": 0.6694078866083828, "ui_total_module_area_ha": 0.2709, @@ -3230,6 +3230,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -3259,7 +3262,7 @@ ], "desired_farm_size": 100.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -3296,12 +3299,12 @@ "specify_label": 0.0, "step": 3600.0, "system_capacity": 100.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 635775.0, "total_installed_cost_per_kw": 6357.75, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -12346,7 +12349,7 @@ "batt_cell_power_charge_max": 2.0, "batt_cell_power_discharge_max": 2.0, "batt_chem": 1.0, - "batt_computed_bank_capacity": 1200.54312, + "batt_computed_bank_capacity": 1200.5431199999999, "batt_computed_series": 126.0, "batt_computed_stacks_series": 0.0, "batt_computed_strings": 1064.0, @@ -13326,9 +13329,9 @@ "batt_minimum_modetime": 10.0, "batt_num_cells": 134064.0, "batt_power_charge_max_kwac": 312.64143749999996, - "batt_power_charge_max_kwdc": 300.13578, + "batt_power_charge_max_kwdc": 300.13577999999998, "batt_power_discharge_max_kwac": 288.1303487999999, - "batt_power_discharge_max_kwdc": 300.13578, + "batt_power_discharge_max_kwdc": 300.13577999999998, "batt_pv_ac_forecast": [ 0.0 ], @@ -13371,7 +13374,7 @@ "batt_ui_bank_voltage": 501.48, "batt_ui_cell_voltage": 3.98, "batt_ui_inverter_eff": 96.0, - "batt_ui_nominal_bank_power": 300.13578, + "batt_ui_nominal_bank_power": 300.13577999999998, "batt_unit_capacity": 400.0, "batt_unit_surface_area": 30.0, "batt_user_specified_weather_file_peak_shaving": "", @@ -13403,13 +13406,13 @@ 0.5 ] ], - "batt_volume": 14.64076975609756, - "battery_energy": 1200.54312, + "batt_volume": 14.640769756097559, + "battery_energy": 1200.5431199999999, "battery_indirect_cost_percent": 0.0, "battery_losses_shown": 0.0, "battery_per_kW": 667.0, "battery_per_kWh": 184.0, - "battery_power": 300.13578, + "battery_power": 300.13577999999998, "battery_thermal_shown": 0.0, "battery_total": 421090.49934, "battery_total_cost_lcos": 421090.49934, @@ -23536,7 +23539,7 @@ "om_batt_fixed_cost": [ 0.0 ], - "om_batt_nameplate": 1200.54312, + "om_batt_nameplate": 1200.5431199999999, "om_batt_replacement_cost": [ 280.0 ], @@ -23669,12 +23672,12 @@ "const_per_percent4": 0.0, "const_per_percent5": 0.0, "const_per_percent_total": 100.0, - "const_per_principal1": 2035414.078908, + "const_per_principal1": 2035414.0789080002, "const_per_principal2": 0.0, "const_per_principal3": 0.0, "const_per_principal4": 0.0, "const_per_principal5": 0.0, - "const_per_principal_total": 2035414.078908, + "const_per_principal_total": 2035414.0789080002, "const_per_total1": 53429.619571335, "const_per_total2": 0.0, "const_per_total3": 0.0, @@ -50111,7 +50114,7 @@ "grid_outage": [ 0.0 ], - "host_nominal_discount_rate": 9.060000000000004, + "host_nominal_discount_rate": 9.060000000000003, "host_real_discount_rate": 6.4, "hybrid_capital_cost": 0.0, "ibi_fed_amount": 0.0, @@ -68376,7 +68379,7 @@ 156.2, 184.05 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_utility_bill": 0.0, "om_capacity": 0.0, "om_fixed": 0.0, @@ -68434,7 +68437,7 @@ "ppa_soln_mode": 1.0, "prop_tax_assessed_decline": 0.0, "prop_tax_cost_assessed_percent": 100.0, - "property_assessed_value": 2035414.078908, + "property_assessed_value": 2035414.0789080002, "property_tax_rate": 0.0, "ptc_fed_amount": [ 0.0 @@ -68473,7 +68476,7 @@ "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", - "total_installed_cost": 2035414.078908, + "total_installed_cost": 2035414.0789080002, "total_inverter_capacity": 453.994, "ui_annual_load": 0.0, "ui_battery_capacity": 288.1303487999999, diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json index 01ff2a443..fc2a42798 100644 --- a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json @@ -17,9 +17,9 @@ "6par_imp": 12.82, "6par_is_bifacial": 1.0, "6par_isc": 13.71, - "6par_module_length": 2.277235165721802, + "6par_module_length": 2.2772351657218015, "6par_module_name": "Aptos Solar Technology LLC DNA-144-BF10-530W (from CEC database)", - "6par_module_width": 1.1329528187670657, + "6par_module_width": 1.1329528187670655, "6par_mounting": 0.0, "6par_mpeff": 20.571627906976745, "6par_nser": 72.0, @@ -366,9 +366,9 @@ 5.0 ] ], - "alpha_sc_calc": 0.04, + "alpha_sc_calc": 0.039999999999999997, "analysis_period": 25.0, - "annual_albedo": 0.1839506853933204, + "annual_albedo": 0.18395068539332039, "annual_beam": 7.335643835616439, "annual_diffuse": 1.3484328767123289, "annual_global": 5.794761643835617, @@ -381,7 +381,7 @@ "bos_equip_fixed": 0.0, "bos_equip_perarea": 0.0, "bos_equip_perwatt": 0.32, - "bos_equip_total": 31999773.49632001, + "bos_equip_total": 31999773.496320007, "calculate_bifacial_electrical_mismatch": 1.0, "calculate_rack_shading": 0.0, "calculated_dcac_ratio": 1.329498131855772, @@ -408,8 +408,8 @@ "cec_i_sc_ref": 13.71, "cec_is_bifacial": 1.0, "cec_material": "Mono-c-Si", - "cec_module_length": 2.277235165721802, - "cec_module_width": 1.1329528187670657, + "cec_module_length": 2.2772351657218015, + "cec_module_width": 1.1329528187670655, "cec_mounting_config": 0.0, "cec_mounting_orientation": 0.0, "cec_n_s": 72.0, @@ -1340,8 +1340,8 @@ "inv_cec_cg_c1": -0.000051, "inv_cec_cg_c2": 0.000984, "inv_cec_cg_c3": -0.001508, - "inv_cec_cg_eff_cec": 96.60945631544225, - "inv_cec_cg_eff_euro": 96.18210492215684, + "inv_cec_cg_eff_cec": 96.60945631544223, + "inv_cec_cg_eff_euro": 96.18210492215683, "inv_cec_cg_filename": "", "inv_cec_cg_idcmax": 18.0, "inv_cec_cg_mppt_hi": 480.0, @@ -3267,7 +3267,7 @@ "inverter_model": 0.0, "inverter_num_units": 30.0, "inverter_power": 2507.194, - "inverter_total": 2999978.765280001, + "inverter_total": 2999978.7652800006, "inverterarray_power": 75215.81999999999, "irrad_mode": 0.0, "is_advanced": 0.0, @@ -3296,13 +3296,13 @@ "module_area": 2.58, "module_aspect_ratio": 2.01, "module_costunits": 0.0, - "module_length": 2.277235165721802, + "module_length": 2.2772351657218015, "module_model": 1.0, "module_name": "Aptos Solar Technology LLC DNA-144-BF10-530W", "module_num_units": 188412.0, "module_power": 0.5307480000000001, "module_total": 33999759.33984001, - "module_width": 1.1329528187670657, + "module_width": 1.1329528187670655, "modulearray_area": 486102.96, "modulearray_power": 99999.29217600002, "mppt_hi_inverter": 1500.0, @@ -3350,7 +3350,7 @@ "sd11par_AMa4": -0.000091, "sd11par_Egref": 1.08583, "sd11par_Il": 5.90905, - "sd11par_Imp0": 5.506004749133028, + "sd11par_Imp0": 5.5060047491330279, "sd11par_Io": 3.63865e-12, "sd11par_Isc0": 5.90285, "sd11par_Pmp0": 322.305, @@ -3412,7 +3412,7 @@ "snl_c7": -0.093, "snl_dtc": 3.0, "snl_fd": 1.0, - "snl_imp_temp_1": -0.0021202945926680658, + "snl_imp_temp_1": -0.0021202945926680654, "snl_impo": 5.58, "snl_isco": 5.96, "snl_ixo": 5.9, @@ -3423,7 +3423,7 @@ "snl_module_length": 1.665142636532979, "snl_module_name": "SunPower SPR-305-WHT [2007 (E)]", "snl_module_structure": 0.0, - "snl_module_width": 0.9794956685488112, + "snl_module_width": 0.9794956685488111, "snl_n": 1.131, "snl_n_cells": 96.0, "snl_parallel_cells": 1.0, @@ -3435,14 +3435,14 @@ "snl_ref_imp": 5.579722612284382, "snl_ref_imp_temp_0": -0.038, "snl_ref_isc": 5.959701031499999, - "snl_ref_isc_temp_0": 0.05900000000000001, + "snl_ref_isc_temp_0": 0.059000000000000007, "snl_ref_isc_temp_1": 0.0035162236085849996, "snl_ref_pmp": 305.2105300228098, "snl_ref_pmp_temp_0": -0.37803722005446979, "snl_ref_pmp_temp_1": -1.153809403011743, "snl_ref_vmp": 54.69994679499923, "snl_ref_vmp_temp_0": -0.34003722005446976, - "snl_ref_vmp_temp_1": -0.1860001784529894, + "snl_ref_vmp_temp_1": -0.18600017845298939, "snl_ref_voc": 64.19986006248614, "snl_ref_voc_temp_0": -0.2757022666099982, "snl_sandia_notes": "Source: Sandia National Laboratories Updated 9/25/2012 Module Database", @@ -3478,9 +3478,9 @@ "spe_eff4": 20.5, "spe_fd": 1.0, "spe_is_bifacial": 1.0, - "spe_module_length": 2.277235165721802, + "spe_module_length": 2.2772351657218015, "spe_module_structure": 1.0, - "spe_module_width": 1.1329528187670657, + "spe_module_width": 1.1329528187670655, "spe_power": 528.9, "spe_rad0": 200.0, "spe_rad1": 400.0, @@ -3504,7 +3504,7 @@ "subarray1_diodeconn_loss": 0.5, "subarray1_electrical_mismatch": 0.0, "subarray1_gcr": 0.3, - "subarray1_land_area": 1620343.2000000005, + "subarray1_land_area": 1620343.2000000003, "subarray1_mismatch_loss": 2.0, "subarray1_mod_orient": 0.0, "subarray1_modules_per_string": 28.0, @@ -3578,7 +3578,7 @@ "subarray1_tilt_eq_lat": 0.0, "subarray1_track_mode": 1.0, "subarray1_tracking_loss": 0.0, - "subarray1_ui_length_side": 4.554470331443603, + "subarray1_ui_length_side": 2.2772351657218015, "subarray1_ui_nmodules": 188412.0, "subarray1_ui_nrows": 6729.0, "subarray1_ui_row_spacing": 15.181567771478676, @@ -3664,7 +3664,7 @@ "subarray2_tilt_eq_lat": 0.0, "subarray2_track_mode": 1.0, "subarray2_tracking_loss": 0.0, - "subarray2_ui_length_side": 2.277235165721802, + "subarray2_ui_length_side": 2.2772351657218015, "subarray2_ui_nmodules": 0.0, "subarray2_ui_nrows": 0.0, "subarray2_ui_row_spacing": 7.590783885739338, @@ -3750,7 +3750,7 @@ "subarray3_tilt_eq_lat": 0.0, "subarray3_track_mode": 1.0, "subarray3_tracking_loss": 0.0, - "subarray3_ui_length_side": 2.277235165721802, + "subarray3_ui_length_side": 2.2772351657218015, "subarray3_ui_nmodules": 0.0, "subarray3_ui_nrows": 0.0, "subarray3_ui_row_spacing": 7.590783885739338, @@ -3836,13 +3836,13 @@ "subarray4_tilt_eq_lat": 0.0, "subarray4_track_mode": 1.0, "subarray4_tracking_loss": 0.0, - "subarray4_ui_length_side": 2.277235165721802, + "subarray4_ui_length_side": 2.2772351657218015, "subarray4_ui_nmodules": 0.0, "subarray4_ui_nrows": 0.0, "subarray4_ui_row_spacing": 7.590783885739338, "subtotal_direct": 98999299.25424, "system_capacity": 99999.29217600002, - "total_direct_cost": 101969278.2318672, + "total_direct_cost": 101969278.23186721, "total_indirect_cost": 4999964.6088000009, "total_installed_cost": 112067706.75226057, "total_inverter_capacity": 75215.82, @@ -3885,6 +3885,9 @@ "Wind": { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -3914,7 +3917,7 @@ ], "desired_farm_size": 10.0, "elec_eff_loss": 1.91, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "env_degrad_loss": 1.8, "env_env_loss": 0.4, @@ -3951,12 +3954,12 @@ "specify_label": 1.0, "step": 3600.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_installed_cost": 317480000.0, "total_installed_cost_per_kw": 1587.4, "turb_generic_loss": 1.7, "turb_hysteresis_loss": 0.4, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turbine_cost_fixed": 0.0, @@ -4885,7 +4888,7 @@ "batt_Qexp": 0.04000005, "batt_Qexp_percent": 1.77778, "batt_Qfull": 2.25, - "batt_Qfull_flow": 478584.0, + "batt_Qfull_flow": 478583.99999999997, "batt_Qnom": 2.0000002500000004, "batt_Qnom_percent": 88.8889, "batt_Vcut": 2.706, @@ -16254,7 +16257,7 @@ "const_per_principal4": 0.0, "const_per_principal5": 0.0, "const_per_principal_total": 504007801.16754057, - "const_per_total1": 13230204.78064794, + "const_per_total1": 13230204.780647941, "const_per_total2": 0.0, "const_per_total3": 0.0, "const_per_total4": 0.0, @@ -16264,7 +16267,7 @@ "const_per_upfront_rate3": 0.0, "const_per_upfront_rate4": 0.0, "const_per_upfront_rate5": 0.0, - "construction_financing_cost": 13230204.78064794, + "construction_financing_cost": 13230204.780647941, "cost_debt_closing": 0.0, "cost_debt_fee": 2.75, "cost_other_financing": 0.0, @@ -34619,7 +34622,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": 0.0, "om_fixed": 0.0, "om_production": 0.0, diff --git a/deploy/runtime/defaults/Wind Power_All Equity Partnership Flip.json b/deploy/runtime/defaults/Wind Power_All Equity Partnership Flip.json index 19bfe0246..a79432479 100644 --- a/deploy/runtime/defaults/Wind Power_All Equity Partnership Flip.json +++ b/deploy/runtime/defaults/Wind Power_All Equity Partnership Flip.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -30,7 +33,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -11170,7 +11173,7 @@ "dscr_reserve_months": 6.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -20693,7 +20696,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mera_cost1": 0.0, "mera_cost2": 0.0, "mera_cost3": 0.0, @@ -20702,7 +20705,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": [ 40.0 ], @@ -20724,7 +20727,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "pbi_fed_amount": [ 0.0 ], @@ -20814,7 +20817,7 @@ ], "step": 0.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_equity_percent": 60.0, "tax_investor_postflip_cash_percent": 10.0, "tax_investor_postflip_tax_percent": 10.0, @@ -20830,7 +20833,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/defaults/Wind Power_Commercial.json b/deploy/runtime/defaults/Wind Power_Commercial.json index 88b1ff731..1981e2367 100644 --- a/deploy/runtime/defaults/Wind Power_Commercial.json +++ b/deploy/runtime/defaults/Wind Power_Commercial.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -32,7 +35,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -1696,7 +1699,7 @@ "desired_farm_size": 5.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -28123,7 +28126,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mpeak": [ 234.676, 173.422, @@ -28138,7 +28141,7 @@ 156.2, 184.05 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_utility_bill": 0.0, "om_capacity": [ 39.0 @@ -28161,7 +28164,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "pbi_fed_amount": [ 0.0 ], @@ -28253,7 +28256,7 @@ ], "step": 0.0, "system_capacity": 100.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_10yr_uncert": 12.0852, "total_20yr_uncert": 12.0852, "total_installed_cost": 605500.0, @@ -28263,7 +28266,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/defaults/Wind Power_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Wind Power_Leveraged Partnership Flip.json index f5373eaa8..2ad3c3ded 100644 --- a/deploy/runtime/defaults/Wind Power_Leveraged Partnership Flip.json +++ b/deploy/runtime/defaults/Wind Power_Leveraged Partnership Flip.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -30,7 +33,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -11178,7 +11181,7 @@ "dscr_reserve_months": 6.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -20702,7 +20705,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mera_cost1": 0.0, "mera_cost2": 0.0, "mera_cost3": 0.0, @@ -20711,7 +20714,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": [ 40.0 ], @@ -20733,7 +20736,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "payment_option": 0.0, "pbi_fed_amount": [ 0.0 @@ -20823,7 +20826,7 @@ ], "step": 0.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_equity_percent": 98.0, "tax_investor_postflip_cash_percent": 10.0, "tax_investor_postflip_tax_percent": 10.0, @@ -20841,7 +20844,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/defaults/Wind Power_Merchant Plant.json b/deploy/runtime/defaults/Wind Power_Merchant Plant.json index d1b824300..a34debe72 100644 --- a/deploy/runtime/defaults/Wind Power_Merchant Plant.json +++ b/deploy/runtime/defaults/Wind Power_Merchant Plant.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -30,7 +33,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -1785,7 +1788,7 @@ "dscr_reserve_months": 6.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -10671,7 +10674,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mera_cost1": 0.0, "mera_cost2": 0.0, "mera_cost3": 0.0, @@ -667803,7 +667806,7 @@ ], "mp_error_msg": "", "mp_market_percent_gen": 100.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": [ 40.0 ], @@ -667825,7 +667828,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "payment_option": 0.0, "pbi_fed_amount": [ 0.0 @@ -667909,7 +667912,7 @@ ], "step": 0.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "term_int_rate": 7.0, "term_tenor": 18.0, "total_10yr_uncert": 12.0852, @@ -667921,7 +667924,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/defaults/Wind Power_Residential.json b/deploy/runtime/defaults/Wind Power_Residential.json index a312049ec..560e1c47f 100644 --- a/deploy/runtime/defaults/Wind Power_Residential.json +++ b/deploy/runtime/defaults/Wind Power_Residential.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -32,7 +35,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -1686,7 +1689,7 @@ "desired_farm_size": 5.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -28115,7 +28118,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mortgage": 1.0, "mpeak": [ 1.85407, @@ -28131,7 +28134,7 @@ 1.71415, 1.87435 ], - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "normalize_to_utility_bill": 0.0, "om_capacity": [ 39.0 @@ -28154,7 +28157,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "pbi_fed_amount": [ 0.0 ], @@ -28246,7 +28249,7 @@ ], "step": 0.0, "system_capacity": 20.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "total_10yr_uncert": 12.0852, "total_20yr_uncert": 12.0852, "total_installed_cost": 161260.0, @@ -28256,7 +28259,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, @@ -28269,7 +28272,7 @@ "ui_annual_load": 0.0, "ui_net_capital_cost": 161260.0, "ui_step_minutes": 60.0, - "ui_wacc": 6.2388, + "ui_wacc": 6.2387999999999999, "ur_annual_min_charge": 0.0, "ur_billing_demand_is_shown": 0.0, "ur_billing_demand_lookback_percentages": [ diff --git a/deploy/runtime/defaults/Wind Power_Sale Leaseback.json b/deploy/runtime/defaults/Wind Power_Sale Leaseback.json index f6657f9d7..b95d0dd88 100644 --- a/deploy/runtime/defaults/Wind Power_Sale Leaseback.json +++ b/deploy/runtime/defaults/Wind Power_Sale Leaseback.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -30,7 +33,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -11165,7 +11168,7 @@ "dscr_reserve_months": 6.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -20688,7 +20691,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mera_cost1": 0.0, "mera_cost2": 0.0, "mera_cost3": 0.0, @@ -20697,7 +20700,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": [ 40.0 ], @@ -20719,7 +20722,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "pbi_fed_amount": [ 0.0 ], @@ -20811,7 +20814,7 @@ ], "step": 0.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "tax_investor_required_lease_reserve": 6.0, "tod_library": "Uniform Dispatch", "total_10yr_uncert": 12.0852, @@ -20823,7 +20826,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/defaults/Wind Power_Single Owner.json b/deploy/runtime/defaults/Wind Power_Single Owner.json index f2cbdaabb..2f9d95f84 100644 --- a/deploy/runtime/defaults/Wind Power_Single Owner.json +++ b/deploy/runtime/defaults/Wind Power_Single Owner.json @@ -1,6 +1,9 @@ { "a_error_test_number": 17.345, "a_error_test_string": "\"default err msg\"", + "ac_degradation": [ + 0.64 + ], "adjust": 0.0, "adjust_constant": 0.0, "adjust_en_periods": 0.0, @@ -30,7 +33,7 @@ "avail_loss_total": 5.501168499999998, "avail_turb_loss": 3.58, "avail_turb_uncert": 2.3, - "avail_uncert_total": 2.502718521927706, + "avail_uncert_total": 2.5027185219277059, "batt_salvage_percentage": 0.0, "batt_salvage_value": 0.0, "bos_cost_fixed": 0.0, @@ -11179,7 +11182,7 @@ "dscr_reserve_months": 6.0, "elec_eff_loss": 1.91, "elec_eff_uncert": 1.0, - "elec_loss_total": 2.008089999999996, + "elec_loss_total": 2.0080899999999959, "elec_parasitic_loss": 0.1, "elec_parasitic_uncert": 0.05, "elec_uncert_total": 1.0012492197250394, @@ -20707,7 +20710,7 @@ "meas_data_uncert": 0.3, "meas_dir_uncert": 0.0, "meas_speed_uncert": 2.0, - "meas_uncert_total": 2.044504830026088, + "meas_uncert_total": 2.0445048300260875, "mera_cost1": 0.0, "mera_cost2": 0.0, "mera_cost3": 0.0, @@ -20716,7 +20719,7 @@ "mera_name3": "Replacement Reserve 3", "months_receivables_reserve": 0.0, "months_working_reserve": 6.0, - "nominal_discount_rate": 9.060000000000004, + "nominal_discount_rate": 9.060000000000003, "om_capacity": [ 40.0 ], @@ -20738,7 +20741,7 @@ "ops_loss_total": 2.803467160000006, "ops_strategies_loss": 0.0, "ops_strategies_uncert": 0.0, - "ops_uncert_total": 2.503197954617254, + "ops_uncert_total": 2.5031979546172535, "payment_option": 0.0, "pbi_fed_amount": [ 0.0 @@ -20831,7 +20834,7 @@ ], "step": 0.0, "system_capacity": 200000.0, - "system_use_lifetime_output": 0.0, + "system_use_lifetime_output": 1.0, "term_int_rate": 7.0, "term_tenor": 18.0, "tod_library": "Uniform Dispatch", @@ -20844,7 +20847,7 @@ "turb_generic_uncert": 3.72, "turb_hysteresis_loss": 0.4, "turb_hysteresis_uncert": 1.0, - "turb_loss_total": 3.954496384119999, + "turb_loss_total": 3.9544963841199989, "turb_perf_loss": 1.1, "turb_specific_loss": 0.81, "turb_specific_uncert": 1.2, diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk index 142c6b44d..11c0110ff 100644 --- a/deploy/runtime/startup.lk +++ b/deploy/runtime/startup.lk @@ -121,7 +121,7 @@ configopt( 'Community Solar', { 'long_name'='Community Solar', 'short_name'='Com configopt( 'None', { 'long_name'='No Financial Model', 'short_name'='No financial', 'description'='Run the performance model with no financial model' } ); enum { LOAD_SIMPLE, LOAD_BELPE, NO_LOAD }; -enum { DEGRADATION_AC_SINGLE_YEAR, DEGRADATION_DC_LIFETIME, DEGRADATION_AC_LIFETIME, DEGRADATION_PVSAM }; +enum { DEGRADATION_AC_SINGLE_YEAR, DEGRADATION_DC_LIFETIME, DEGRADATION_AC_LIFETIME, DEGRADATION_PVSAM, DEGRADATION_AC_LIFETIME_LINEAR }; function setup_elec_load_page( mode ) //i is 1 for technologies that HAVE the building load calculator (for now just PV, CSP, Biopower, and Generic Solar- MUST HAVE SOLAR RESOURCE DATA), 2 for techs without ANY load pages (SWH), and 0 for technologies that don't { @@ -327,11 +327,17 @@ function setup_lifetime_page( degradation_mode ) { addpage( [ [ 'Degradation DC Lifetime' ] ], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc' } ); } - // annual AC degradation over analysis period, 'generic_degradation' requires 'system_use_lifetime = 1' + // annual AC degradation over analysis period, 'ac_degradation' requires 'system_use_lifetime = 1' // Generic Battery elseif ( degradation_mode == DEGRADATION_AC_LIFETIME ) { addpage( [ [ 'Degradation AC Lifetime'] ], { 'sidebar'='AC Degradation','help'='degradation/degradation_ac' } ); + } + // annual AC degradation over analysis period, 'ac_degradation' requires 'system_use_lifetime = 1' + // Generic Battery + elseif ( degradation_mode == DEGRADATION_AC_LIFETIME_LINEAR ) + { + addpage( [ [ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='AC Degradation','help'='degradation/degradation_ac' } ); } // annual DC degradation over analysis period with daily AC / DC losses over lifetime // 'dc_degradation' requires 'system_use_lifetime = 1' @@ -1321,7 +1327,7 @@ setup_thirdparty_pages( LOAD_BELPE); //includes building load calculator by defa setconfig( 'Wind Power', 'Residential' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'cashloan']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1331,7 +1337,7 @@ setup_residential_pages( LOAD_SIMPLE ); //does not include building load calcula setconfig( 'Wind Power', 'Commercial' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'cashloan']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1342,7 +1348,7 @@ setup_commercial_pages( LOAD_SIMPLE ); //does not include building load calculat setconfig( 'Wind Power', 'Leveraged Partnership Flip' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'levpartflip']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1353,7 +1359,7 @@ setup_electricity_purchases(); setconfig( 'Wind Power', 'All Equity Partnership Flip' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'equpartflip']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1364,7 +1370,7 @@ setup_electricity_purchases(); setconfig( 'Wind Power', 'Sale Leaseback' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'saleleaseback']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1375,7 +1381,7 @@ setup_electricity_purchases(); setconfig( 'Wind Power', 'Single Owner' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'singleowner']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1385,7 +1391,7 @@ setup_electricity_purchases(); setconfig( 'Wind Power', 'Merchant Plant' ); setmodules( ['windpower', 'grid', 'utilityrate5', 'merchantplant']); setup_windpower_pages(); -setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); +setup_lifetime_page(DEGRADATION_AC_LIFETIME_LINEAR); addpage( [['Wind Farm Costs']], { 'sidebar'='Installation Costs', 'help'='installation-costs/cc_wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); @@ -1584,7 +1590,7 @@ function setup_custom_generation_pages() setconfig( 'Custom Generation Profile', 'Residential' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'cashloan']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_residential_pages( LOAD_SIMPLE ); //does not include building load calculator @@ -1593,14 +1599,14 @@ setup_residential_pages( LOAD_SIMPLE ); //does not include building load calcula setconfig( 'Custom Generation Profile', 'Third Party' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'thirdpartyownership']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); setup_thirdparty_pages( LOAD_SIMPLE ); //----------------------------------------------------- setconfig( 'Custom Generation Profile', 'Commercial' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'cashloan']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_commercial_pages(LOAD_SIMPLE); //does not include building load calculator @@ -1609,7 +1615,7 @@ setup_commercial_pages(LOAD_SIMPLE); //does not include building load calculator setconfig( 'Custom Generation Profile', 'Leveraged Partnership Flip' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'levpartflip']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_leveraged_partnership_flip_pages(); @@ -1619,7 +1625,7 @@ setup_electricity_purchases(); setconfig( 'Custom Generation Profile', 'All Equity Partnership Flip' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'equpartflip']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_all_equity_partnership_flip_pages(); @@ -1629,7 +1635,7 @@ setup_electricity_purchases(); setconfig( 'Custom Generation Profile', 'Sale Leaseback' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'saleleaseback']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_sale_leaseback_pages(); @@ -1639,7 +1645,7 @@ setup_electricity_purchases(); setconfig( 'Custom Generation Profile', 'Single Owner' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'singleowner']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_single_owner_pages(); @@ -1648,7 +1654,7 @@ setup_electricity_purchases(); setconfig( 'Custom Generation Profile', 'Merchant Plant' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'merchantplant']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_merchant_plant_pages(); @@ -1657,7 +1663,7 @@ setup_electricity_purchases(); setconfig( 'Custom Generation Profile', 'Host Developer' ); setmodules( ['custom_generation', 'grid', 'utilityrate5', 'host_developer']); setup_custom_generation_pages(); -setup_lifetime_page( DEGRADATION_AC_SINGLE_YEAR ); +setup_lifetime_page( DEGRADATION_AC_LIFETIME ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Installation Costs', 'help'='installation-costs/cc_custom_generation' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Operating Costs', 'help'='operating-costs/oc_operating'} ); setup_host_developer_pages( LOAD_SIMPLE ); //includes building load calculator by default in this function @@ -2935,7 +2941,7 @@ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/ // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs', 'Operating Costs Land Lease' ]], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -2943,7 +2949,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); // battery @@ -2995,7 +3001,7 @@ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/ // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs']], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -3003,7 +3009,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); // battery @@ -3060,7 +3066,7 @@ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/ // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs', 'Operating Costs Land Lease' ]], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -3068,7 +3074,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); //fuel cell @@ -3133,7 +3139,7 @@ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/ // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs']], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -3141,7 +3147,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); //fuel cell @@ -3225,7 +3231,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); // battery @@ -3281,7 +3287,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); // battery @@ -3341,13 +3347,13 @@ sethybridvariabledependencies([ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/hybrid_system', 'top_page'=true}); //generic addpage( [[ 'Custom Generation Plant' ]], { 'sidebar'='Custom Generation Profile' , 'help'='custom-generation/custom_generation_profile', 'bin_name'='CustomGeneration' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='Custom Generation AC Degradation','help'='degradation/degradation_ac', 'bin_name'='CustomGeneration' } ); +addpage( [[ 'Degradation AC Lifetime'], ], { 'sidebar'='Custom Generation AC Degradation','help'='degradation/degradation_ac', 'bin_name'='CustomGeneration' } ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Custom Generation Installation Costs', 'help'='installation-costs/cc_custom_generation', 'bin_name'='CustomGeneration' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Custom Generation Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='CustomGeneration'} ); // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs', 'Operating Costs Land Lease' ]], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -3355,7 +3361,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); //fuel cell @@ -3425,13 +3431,13 @@ sethybridvariabledependencies([ addpage([['Hybrid System']], {'sidebar'='Hybrid System', 'help'='hybrid-systems/hybrid_system', 'top_page'=true}); //generic addpage( [[ 'Custom Generation Plant' ]], { 'sidebar'='Custom Generation Profile' , 'help'='custom-generation/custom_generation_profile', 'bin_name'='CustomGeneration' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='Generic AC Degradation','help'='degradation/degradation_ac', 'bin_name'='CustomGeneration' } ); +addpage( [[ 'Degradation AC Lifetime'], ], { 'sidebar'='Generic AC Degradation','help'='degradation/degradation_ac', 'bin_name'='CustomGeneration' } ); addpage( [[ 'Custom Generation Costs']],{ 'sidebar'='Custom Generation Installation Costs', 'help'='installation-costs/cc_custom_generation', 'bin_name'='CustomGeneration' } ); addpage( [[ 'Operating Costs Fuel' ]], {'sidebar' = 'Custom Generation Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='CustomGeneration'} ); // pvwatts addpage( [[ 'Solar Resource Download', 'Solar Resource Library', 'Solar Resource Information' ]], { 'sidebar'='PV Location and Resource', 'help'='pvwatts/pvwatts_location_and_resource', 'bin_name'='PVWatts' } ); addpage( [[ 'PVWatts', {'name'='PV Land Area', 'caption' = 'Land Area', 'collapsible'=true, 'collapsible_var'='pv_land_area_is_shown'}, {'name'='PVWatts Advanced Inputs', 'caption' = 'Advanced Inputs', 'collapsible'=true, 'collapsible_var'='pvwatts.advanced.is_shown'} ]], { 'sidebar'='PV System Design', 'help'='pvwatts/pvwatts_system_design', 'bin_name'='PVWatts' } ); -addpage( [[ 'Degradation AC Single Year'], ], { 'sidebar'='PV AC Degradation','help'='degradation/degradation_ac', 'bin_name'='PVWatts' } ); +addpage( [[ 'Degradation DC Lifetime' ]], { 'sidebar'='DC Degradation','help'='degradation/degradation_dc', 'bin_name'='PVWatts' } ); addpage( [[ 'PV Capital Costs' ]], { 'sidebar'='PV Installation Costs', 'help'='installation-costs/cc_pv', 'bin_name'='PVWatts'} ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'PV Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='PVWatts'} ); // wind @@ -3439,7 +3445,7 @@ addpage( [[ 'Wind Resource File'], [ 'Wind Speed Weibull Distribution'], [ 'Wind addpage( [[ 'Wind Turbine Design' ]], { 'sidebar'='Wind Turbine', 'help'='wind-power/wind_turbine', 'bin_name'='Wind' } ); addpage( [[ 'Wind Farm Specifications' ]], { 'sidebar'='Wind Farm', 'help'='wind-power/wind_farm', 'bin_name'='Wind' } ); addpage( [[ 'Wind Losses' ]], { 'sidebar'='Wind Losses', 'help'='wind-power/wind_losses', 'bin_name'='Wind'} ); -addpage( [[ 'Degradation AC Single Year'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); +addpage( [[ 'Degradation AC Lifetime Linear'] ], { 'sidebar'='Wind AC Degradation','help'='degradation/degradation_ac', 'bin_name'='Wind'} ); addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='installation-costs/cc_wind', 'bin_name'='Wind' } ); addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='operating-costs/oc_operating', 'bin_name'='Wind'} ); //fuel cell diff --git a/deploy/runtime/ui/Custom Generation Plant.json b/deploy/runtime/ui/Custom Generation Plant.json index 40d1eb656..f45ced382 100644 --- a/deploy/runtime/ui/Custom Generation Plant.json +++ b/deploy/runtime/ui/Custom Generation Plant.json @@ -1,7 +1,7 @@ { "Name": "Custom Generation Plant", - "Width": 788.0, - "Height": 581.0, + "Width": 792.0, + "Height": 617.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 440.0 + "Integer": 478.0 }, "Tool Tip": { "Type": 5.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 441.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 132.0 + "Integer": 126.0 }, "Tool Tip": { "Type": 5.0, @@ -123,11 +123,11 @@ }, "X": { "Type": 3.0, - "Integer": 357.0 + "Integer": 33.0 }, "Y": { "Type": 3.0, - "Integer": 471.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -184,15 +184,15 @@ }, "X": { "Type": 3.0, - "Integer": 252.0 + "Integer": 219.0 }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 183.0 }, "Width": { "Type": 3.0, - "Integer": 143.0 + "Integer": 140.0 }, "Height": { "Type": 3.0, @@ -221,11 +221,11 @@ }, "X": { "Type": 3.0, - "Integer": 432.0 + "Integer": 423.0 }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 387.0 }, "Width": { "Type": 3.0, @@ -304,11 +304,11 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 444.0 }, "Y": { "Type": 3.0, - "Integer": 414.0 + "Integer": 450.0 }, "Width": { "Type": 3.0, @@ -387,11 +387,11 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 444.0 }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 291.0 }, "Width": { "Type": 3.0, @@ -470,15 +470,15 @@ }, "X": { "Type": 3.0, - "Integer": 252.0 + "Integer": 219.0 }, "Y": { "Type": 3.0, - "Integer": 111.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, - "Integer": 143.0 + "Integer": 140.0 }, "Height": { "Type": 3.0, @@ -493,16 +493,81 @@ "Integer": 1.0 }, "Label": { + "Type": 5.0, + "String": "kW" + }, + "Description": { "Type": 5.0, "String": "" }, + "TabOrder": { + "Type": 3.0, + "Integer": -1.0 + } + } + }, + "DataLifetimeArray": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "energy_output_array_lifetime" + }, + "X": { + "Type": 3.0, + "Integer": 219.0 + }, + "Y": { + "Type": 3.0, + "Integer": 153.0 + }, + "Width": { + "Type": 3.0, + "Integer": 140.0 + }, + "Height": { + "Type": 3.0, + "Integer": 28.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Mode": { + "Type": 3.0, + "Integer": 3.0 + }, + "Label": { + "Type": 5.0, + "String": "" + }, + "ColumnLabel": { + "Type": 5.0, + "String": "kW" + }, "Description": { "Type": 5.0, "String": "" }, "TabOrder": { "Type": 3.0, - "Integer": 4.0 + "Integer": -1.0 + }, + "AnalysisPeriod": { + "Type": 3.0, + "Integer": 25.0 + }, + "AnnualEnabled": { + "Type": 2.0, + "Boolean": 1.0 + }, + "WeeklyEnabled": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ShowMode": { + "Type": 2.0, + "Boolean": 1.0 } } }, @@ -515,11 +580,11 @@ }, "X": { "Type": 3.0, - "Integer": 432.0 + "Integer": 423.0 }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 333.0 }, "Width": { "Type": 3.0, @@ -598,11 +663,11 @@ }, "X": { "Type": 3.0, - "Integer": 432.0 + "Integer": 423.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -681,11 +746,11 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 444.0 }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 423.0 }, "Width": { "Type": 3.0, @@ -764,11 +829,11 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 183.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -826,15 +891,15 @@ }, "X": { "Type": 3.0, - "Integer": 48.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 369.0 + "Integer": 405.0 }, "Width": { "Type": 3.0, - "Integer": 600.0 + "Integer": 750.0 }, "Height": { "Type": 3.0, @@ -876,15 +941,15 @@ }, "X": { "Type": 3.0, - "Integer": 48.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, - "Integer": 600.0 + "Integer": 750.0 }, "Height": { "Type": 3.0, @@ -926,15 +991,15 @@ }, "X": { "Type": 3.0, - "Integer": 48.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 237.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, - "Integer": 600.0 + "Integer": 750.0 }, "Height": { "Type": 3.0, @@ -976,19 +1041,19 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 471.0 + "Integer": 510.0 }, "Width": { "Type": 3.0, - "Integer": 243.0 + "Integer": 768.0 }, "Height": { "Type": 3.0, - "Integer": 84.0 + "Integer": 27.0 }, "Tool Tip": { "Type": 5.0, @@ -1038,7 +1103,7 @@ }, "X": { "Type": 3.0, - "Integer": 48.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, @@ -1046,11 +1111,11 @@ }, "Width": { "Type": 3.0, - "Integer": 689.0 + "Integer": 662.0 }, "Height": { "Type": 3.0, - "Integer": 71.0 + "Integer": 90.0 }, "Tool Tip": { "Type": 5.0, @@ -1062,7 +1127,7 @@ }, "Items": { "Type": 6.0, - "StringList": "Constant generation profile from nameplate capacity and capacity factor|Import hourly or subhourly generation profile from file|Calculate generation profiles and nameplate capacity from open cases" + "StringList": "Constant generation profile from nameplate capacity and capacity factor|Import single-year hourly or subhourly generation profile from file|Import lifetime hourly or subhourly generation profile from file|Calculate generation profiles and nameplate capacity from open cases" }, "ShowCaptions": { "Type": 2.0, @@ -1074,7 +1139,7 @@ }, "TabOrder": { "Type": 3.0, - "Integer": 1.0 + "Integer": -1.0 } } }, @@ -1087,11 +1152,11 @@ }, "X": { "Type": 3.0, - "Integer": 600.0 + "Integer": 597.0 }, "Y": { "Type": 3.0, - "Integer": 111.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -1170,11 +1235,11 @@ }, "X": { "Type": 3.0, - "Integer": 600.0 + "Integer": 597.0 }, "Y": { "Type": 3.0, - "Integer": 159.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -1253,11 +1318,11 @@ }, "X": { "Type": 3.0, - "Integer": 600.0 + "Integer": 597.0 }, "Y": { "Type": 3.0, - "Integer": 135.0 + "Integer": 147.0 }, "Width": { "Type": 3.0, @@ -1455,7 +1520,22 @@ "energy_output_array": { "Version": 4.0, "Type": 2.0, - "Label": "Hourly or subhourly generation profile", + "Label": "Single-year generation profile", + "Units": "kWac", + "Group": "Custom Generation Profile", + "IndexLabels": "", + "Flags": 0.0, + "DefaultValue": [ + 0.0 + ], + "UIObject": "DataLifetimeArray", + "sscVariableName": "", + "sscVariableValue": "" + }, + "energy_output_array_lifetime": { + "Version": 4.0, + "Type": 2.0, + "Label": "Lifetime generation profile", "Units": "kWac", "Group": "Custom Generation Profile", "IndexLabels": "", @@ -1463,7 +1543,7 @@ "DefaultValue": [ 0.0 ], - "UIObject": "DataArray", + "UIObject": "DataLifetimeArray", "sscVariableName": "", "sscVariableValue": "" }, @@ -1525,7 +1605,7 @@ "Label": "Generic system plant output specification mode", "Units": " ", "Group": "Custom Generation Profile", - "IndexLabels": "Constant generation profile from nameplate capacity and capacity factor|Import hourly or subhourly generation profile from file|Calculate generation profiles and nameplate capacity from open cases", + "IndexLabels": "Constant generation profile from nameplate capacity and capacity factor|Import single-year hourly or subhourly generation profile from file|Import lifetime hourly or subhourly generation profile from file|Calculate generation profiles and nameplate capacity from open cases", "Flags": 1.0, "DefaultValue": 0.0, "UIObject": "RadioChoice", @@ -1593,8 +1673,7 @@ "\t\t", "\t// 1MMBTU = 0.2931 MWh www.convert-measurement-units.com/conversion-calculator.php?type=energy", "\treturn 100.0/(${heat_rate} * 0.2931);", - "};", - "", + "};\r", "", "equations{ 'first_year_output' } = define() {", "\toutput = 0.0;", @@ -1606,6 +1685,23 @@ "\t\t\t* ${user_capacity_factor}/100", "\t\t\t* derate;", "\t}", + "\telseif(${spec_mode} == 2) {\r", + "\t\tgen = ${energy_output_array_lifetime};\r", + "\t\tif (#gen > 1) {\r", + "\t\t\tsteps_per_year = #(gen) / ${analysis_period};\r", + "\t\t\thours_per_step = 8760.0 / steps_per_year;\r", + "\t\t\t\r", + "\t\t\tstep_per_hr = 1.0 / hours_per_step;\r", + "\t\t\toutput = 0;\r", + "\t\t\tfor (i = 0; i < 8760 * step_per_hr; i++) {\r", + "\t\t\t\toutput += gen[i]*derate;\r", + "\t\t\t}\r", + "\t\t\toutput *= hours_per_step;\r", + "\t\t}\r", + "\t\telse {\r", + "\t\t\toutput = gen[0] * 8760 *derate;\r", + "\t\t}\r", + "\t}\r", "\telse", "\t{", "\t\toutput = sum(${energy_output_array})*(8760/#(${energy_output_array}))*derate;", @@ -1621,10 +1717,23 @@ "\t\toutput = ${system_capacity}", "\t\t\t* derate;", "\t}", - "\telse", + "\telse if (${spec_mode} == 1 || ${spec_mode} == 3)", "\t{", "\t\toutput = max(${energy_output_array});", - "\t}", + "\t}\r", + "\telse if (${spec_mode} == 2) {\r", + "\t\tgen = ${energy_output_array_lifetime};\r", + "\t\tsteps_per_year = #(gen) / ${analysis_period};\r", + "\t\thours_per_step = 8760.0 / steps_per_year;\r", + "\t\tstep_per_hr = 1.0 / hours_per_step;\r", + "\t\toutput = 0;\r", + "\t\tfor (i = 0; i < 8760 * step_per_hr; i++) {\r", + "\t\t\tif (gen[i] > output) output = gen[i];\r", + "\t\t}\r", + "\t\t\t\r", + "\t\t\r", + "\t}\r", + "\t", "\treturn output;", "};", "", @@ -1638,7 +1747,8 @@ "\t{", "\t\tif ( ${first_year_output_peak} != 0 )", "\t\t\toutput = ${first_year_output}/${system_capacity}/8760*100;", - "\t}", + "\t}\r", + "\t\t", "\treturn output;", "};", "", @@ -1670,7 +1780,7 @@ "};", "", "on_change{'btn_selectcases'} = define() {", - "\tif ( value('spec_mode') == 2 ) {", + "\tif ( value('spec_mode') == 3 ) {", "\t\tcombine_cases();", " }", "};", @@ -1691,21 +1801,27 @@ "}", "", "function check_inputs() {", - "\tmode = value('spec_mode');", + "\tmode = value('spec_mode');\r", + "\tsingle_year_tech = financing() == \"LCOE Calculator\" || financing() == \"None\";", "\tenable('system_capacity',", - "\t\tmode == 0 || mode == 1);", + "\t\tmode != 3);", "\tenable('user_capacity_factor', ", "\t\tmode == 0 );", "\tenable('energy_output_array',", - "\t\tmode == 1 || mode == 2);", + "\t\tmode == 1 || mode == 3);\r", + "\tenable('energy_output_array_lifetime',\r", + "\t\tmode == 2);\t", "\tenable('btn_selectcases',", - "\t\tmode == 2);", + "\t\tmode == 3);", "\tenable('system_capacity_combined',", - "\t\tmode == 2);", - "\tcolor = 'black';\t", - "\tif ( mode == 1 )", - "\t\ttxt = 'Click \"Edit array...\" to import generation data from a file. After importing the data, type a value for the nameplate capacity, which SAM uses to calculate the capacity factor and dollar amounts from any costs or incentives expressed $/W. Use the calculated values below to help you choose a nameplate capacity value. See Help for details.';", - "\telseif ( mode == 2 )", + "\t\tmode == 3);", + "\tcolor = 'black';\r", + "\t// single_year_tech\r", + "\tif ( mode == 1 )\r", + " txt = 'Click \"Edit array...\" to import generation data from a file. After importing the data, type a value for the nameplate capacity, which SAM uses to calculate the capacity factor and dollar amounts from any costs or incentives expressed $/W. Use the calculated values below to help you choose a nameplate capacity value. See Help for details.';\t", + "\telseif ( mode == 2 )\r", + "\t\ttxt = 'Click \"Edit lifetime array...\" to import generation data from a file. After importing the data, type a value for the nameplate capacity, which SAM uses to calculate the capacity factor and dollar amounts from any costs or incentives expressed $/W. Use the calculated values below to help you choose a nameplate capacity value. See Help for details.';\r", + "\telseif ( mode == 3 )", "\t\ttxt = 'Click \"Select cases...\" to select open cases, simulate those cases and combine their generation profiles into a single profile to be used with this generic case. Click \"Edit array...\" to view or edit the combined simulated productions.';", "\telse", "\t\ttxt = '';", @@ -1713,7 +1829,13 @@ "\t\t\ttxt += ' Nameplate capacity exceeds 110% of peak generation.';", "\t\t\tcolor = 'red';", "\t\t}\t", - "*/\t\t", + "*/\t\r", + "\t// Overwrite text with error message\r", + "\tif (mode == 2 && single_year_tech) {\r", + "\t\tcolor = 'red';\r", + "\t\ttxt = 'This financial model only runs single year data. To avoid the model interpreting lifetime data as subhourly, please choose an option besides importing lifetime data.';\r", + "\t}\r", + "", "\tproperty('import_message','caption',txt);", "\tproperty('import_message','TextColour',color);", "}", @@ -1731,7 +1853,6 @@ "\telse {", "\t\tproperty('adjust', 'AnalysisPeriod', 1);", "\t}", - "}", - "" + "}" ] } \ No newline at end of file diff --git a/deploy/runtime/ui/Degradation AC Lifetime Linear.json b/deploy/runtime/ui/Degradation AC Lifetime Linear.json new file mode 100644 index 000000000..0f6e97aa1 --- /dev/null +++ b/deploy/runtime/ui/Degradation AC Lifetime Linear.json @@ -0,0 +1,365 @@ +{ + "Name": "Degradation AC Lifetime Linear", + "Width": 794.0, + "Height": 134.0, + "FormObjects": { + "GroupBox": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "GroupBox11" + }, + "X": { + "Type": 3.0, + "Integer": 6.0 + }, + "Y": { + "Type": 3.0, + "Integer": 3.0 + }, + "Width": { + "Type": 3.0, + "Integer": 780.0 + }, + "Height": { + "Type": 3.0, + "Integer": 128.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "Annual Degradation for Multi-year Simulation" + }, + "Bold": { + "Type": 2.0, + "Boolean": 1.0 + } + } + }, + "SchedNumeric": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "ac_degradation" + }, + "X": { + "Type": 3.0, + "Integer": 207.0 + }, + "Y": { + "Type": 3.0, + "Integer": 33.0 + }, + "Width": { + "Type": 3.0, + "Integer": 112.0 + }, + "Height": { + "Type": 3.0, + "Integer": 21.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Label": { + "Type": 5.0, + "String": "AC Degradation (%/yr)" + }, + "UseSchedule": { + "Type": 2.0, + "Boolean": 0.0 + }, + "ScheduleOnly": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FixedLength": { + "Type": 3.0, + "Integer": -1.0 + }, + "Description": { + "Type": 5.0, + "String": "Type a degradation rate (%) for each year. Each year's rate applies to the Year 1 annual output value. SAM ignores the degradation rate in Year 1 (Row 1 in the table)." + }, + "TabOrder": { + "Type": 3.0, + "Integer": 1.0 + } + } + }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "deg_mode" + }, + "X": { + "Type": 3.0, + "Integer": 438.0 + }, + "Y": { + "Type": 3.0, + "Integer": 15.0 + }, + "Width": { + "Type": 3.0, + "Integer": 345.0 + }, + "Height": { + "Type": 3.0, + "Integer": 78.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "In Value mode, the degradation rate is applied linearly starting in Year 2. In Schedule mode, each year's rate applies to the Year 1 value. See Help for details." + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 + } + } + }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "degrad_sched_warning" + }, + "X": { + "Type": 3.0, + "Integer": 21.0 + }, + "Y": { + "Type": 3.0, + "Integer": 99.0 + }, + "Width": { + "Type": 3.0, + "Integer": 762.0 + }, + "Height": { + "Type": 3.0, + "Integer": 27.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "There is a non-zero degradation value for Year 1. SAM only applies degradation to the system output in Years 2 and later." + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 + } + } + }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "object 75" + }, + "X": { + "Type": 3.0, + "Integer": 21.0 + }, + "Y": { + "Type": 3.0, + "Integer": 66.0 + }, + "Width": { + "Type": 3.0, + "Integer": 387.0 + }, + "Height": { + "Type": 3.0, + "Integer": 24.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "Applies to the system's AC output in each time step." + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 + } + } + } + }, + "VarDatabase": { + "ac_degradation": { + "Version": 4.0, + "Type": 2.0, + "Label": "Annual AC degradation rate", + "Units": "%/year", + "Group": "Degradation and Lifetime", + "IndexLabels": "", + "Flags": 2.0, + "DefaultValue": [ + 0.0 + ], + "UIObject": "SchedNumeric", + "sscVariableName": "", + "sscVariableValue": "" + }, + "degradation": { + "Version": 4.0, + "Type": 2.0, + "Label": " Degradation financial", + "Units": " ", + "Group": "Degradation and Lifetime", + "IndexLabels": "", + "Flags": 4.0, + "DefaultValue": [ + 0.0 + ], + "UIObject": "Default", + "sscVariableName": "", + "sscVariableValue": "" + }, + "system_use_lifetime_output": { + "Version": 4.0, + "Type": 1.0, + "Label": " ", + "Units": " ", + "Group": "Degradation and Lifetime", + "IndexLabels": "", + "Flags": 0.0, + "DefaultValue": 1.0, + "UIObject": "Default", + "sscVariableName": "", + "sscVariableValue": "" + } + }, + "Equations": [ + "equations {'system_use_lifetime_output'} = define() {", + "\treturn 1;", + "};\t", + "", + "// `degradation` is required for all financial models", + "// but not used if system_use_lifetime_output = 1", + "// so provide dummy value here", + "equations {'degradation'} = define() {", + "\treturn [0];", + "};" + ], + "Callbacks": [ + "function display_warning()", + "{", + "\tdisplayflag = false;", + "\tdcd = value('ac_degradation');", + "\tif (#dcd > 1 && dcd[0] != 0)", + "\t{", + "\t\tdisplayflag = true;", + "\t}\t", + "\tshow('degrad_sched_warning', displayflag);", + "\trefresh();", + "}", + "", + "on_load{'Degradation AC Lifetime Linear'} = define()", + "{", + "\tproperty('ac_degradation','FixedLength',value('analysis_period'));", + "\tdisplay_warning();\r", + "\t", + "};", + "", + "on_change{'ac_degradation'} = define()", + "{", + "\tdisplay_warning();", + "};" + ] +} \ No newline at end of file diff --git a/deploy/runtime/ui/Degradation AC Lifetime.json b/deploy/runtime/ui/Degradation AC Lifetime.json index 4277f93b2..ba1eae9da 100644 --- a/deploy/runtime/ui/Degradation AC Lifetime.json +++ b/deploy/runtime/ui/Degradation AC Lifetime.json @@ -40,118 +40,118 @@ } } }, - "Label": { + "SchedNumeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "degrad_sched_warning" + "String": "ac_degradation" }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 207.0 }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 33.0 }, "Width": { "Type": 3.0, - "Integer": 762.0 + "Integer": 112.0 }, "Height": { "Type": 3.0, - "Integer": 27.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Caption": { + "Label": { "Type": 5.0, - "String": "There is a non-zero degradation value for Year 1. SAM only applies degradation to the system output in Years 2 and later." + "String": "AC Degradation (%/yr)" }, - "TextColour": { - "Type": 4.0, - "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, - "Alpha": 255.0 - } + "UseSchedule": { + "Type": 2.0, + "Boolean": 0.0 }, - "Bold": { + "ScheduleOnly": { "Type": 2.0, "Boolean": 0.0 }, - "FontSize": { + "FixedLength": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 1.0 + "Integer": -1.0 }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 + "Description": { + "Type": 5.0, + "String": "Type a degradation rate (%) for each year. Each year's rate applies to the Year 1 annual output value. SAM ignores the degradation rate in Year 1 (Row 1 in the table)." }, - "AlignTop": { - "Type": 2.0, - "Boolean": 1.0 + "TabOrder": { + "Type": 3.0, + "Integer": 1.0 } } }, - "SchedNumeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "generic_degradation" + "String": "deg_mode" }, "X": { "Type": 3.0, - "Integer": 207.0 + "Integer": 438.0 }, "Y": { "Type": 3.0, - "Integer": 33.0 + "Integer": 15.0 }, "Width": { "Type": 3.0, - "Integer": 112.0 + "Integer": 345.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 78.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Label": { + "Caption": { "Type": 5.0, - "String": "AC Degreadation (%/yr)" + "String": "In Value mode, the degradation rate is compounded annually starting in Year 2. In Schedule mode, each year's rate applies to the Year 1 value. See Help for details." }, - "UseSchedule": { - "Type": 2.0, - "Boolean": 0.0 + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } }, - "ScheduleOnly": { + "Bold": { "Type": 2.0, "Boolean": 0.0 }, - "FixedLength": { + "FontSize": { "Type": 3.0, - "Integer": -1.0 + "Integer": 0.0 }, - "Description": { - "Type": 5.0, - "String": "Type a degradation rate (%) for each year. Each year's rate applies to the Year 1 annual output value. SAM ignores the degradation rate in Year 1 (Row 1 in the table)." + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 }, - "TabOrder": { - "Type": 3.0, - "Integer": 1.0 + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 } } }, @@ -160,23 +160,23 @@ "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 7" + "String": "degrad_sched_warning" }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 21.0 }, "Y": { "Type": 3.0, - "Integer": 15.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, - "Integer": 345.0 + "Integer": 762.0 }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 27.0 }, "Tool Tip": { "Type": 5.0, @@ -184,7 +184,7 @@ }, "Caption": { "Type": 5.0, - "String": "In Value mode, the degradation rate is compounded annually starting in Year 2. In Schedule mode, each year's rate applies to the Year 1 value. See Help for details." + "String": "There is a non-zero degradation value for Year 1. SAM only applies degradation to the system output in Years 2 and later." }, "TextColour": { "Type": 4.0, @@ -281,33 +281,33 @@ } }, "VarDatabase": { - "degradation": { + "ac_degradation": { "Version": 4.0, "Type": 2.0, - "Label": " Degradation financial", - "Units": " ", + "Label": "Annual AC degradation rate", + "Units": "%/year", "Group": "Degradation and Lifetime", "IndexLabels": "", - "Flags": 4.0, + "Flags": 2.0, "DefaultValue": [ 0.0 ], - "UIObject": "Default", + "UIObject": "SchedNumeric", "sscVariableName": "", "sscVariableValue": "" }, - "generic_degradation": { + "degradation": { "Version": 4.0, "Type": 2.0, - "Label": "Annual AC degradation rate", - "Units": "%/year", + "Label": " Degradation financial", + "Units": " ", "Group": "Degradation and Lifetime", "IndexLabels": "", - "Flags": 2.0, + "Flags": 4.0, "DefaultValue": [ 0.0 ], - "UIObject": "SchedNumeric", + "UIObject": "Default", "sscVariableName": "", "sscVariableValue": "" }, @@ -341,7 +341,7 @@ "function display_warning()", "{", "\tdisplayflag = false;", - "\tdcd = value('generic_degradation');", + "\tdcd = value('ac_degradation');", "\tif (#dcd > 1 && dcd[0] != 0)", "\t{", "\t\tdisplayflag = true;", @@ -352,11 +352,12 @@ "", "on_load{'Degradation AC Lifetime'} = define()", "{", - "\tproperty('generic_degradation','FixedLength',value('analysis_period'));", - "\tdisplay_warning();", + "\tproperty('ac_degradation','FixedLength',value('analysis_period'));", + "\tdisplay_warning();\r", + "\t", "};", "", - "on_change{'generic_degradation'} = define()", + "on_change{'ac_degradation'} = define()", "{", "\tdisplay_warning();", "};" diff --git a/deploy/runtime/ui/Wind Farm Specifications.json b/deploy/runtime/ui/Wind Farm Specifications.json index 5131e7a87..0cacc75aa 100644 --- a/deploy/runtime/ui/Wind Farm Specifications.json +++ b/deploy/runtime/ui/Wind Farm Specifications.json @@ -2343,7 +2343,9 @@ "\t", "\tconstant_loss = (${wind_farm_wake_model} != 3);", "\tenable( \"wind_resource_turbulence_coeff\", constant_loss);", - "\tenable( \"wake_loss\", !constant_loss);", + "\tenable( \"wake_loss\", !constant_loss);\r", + "\t\r", + "\tloss_adjustment_set();", "};", "", "on_change{\"windfarm.layout.file_or_controls\"} = define()", @@ -2400,6 +2402,21 @@ "\tconstant_loss = (${wind_farm_wake_model} != 3);", "\tenable( \"wind_resource_turbulence_coeff\", constant_loss);", "\tenable( \"wake_loss\", !constant_loss);", - "};" + "};\r", + "\r", + "function loss_adjustment_set() \r", + "{\r", + "\tif (financing() != \"LCOE Calculator\" && financing() != \"None\") {\r", + "\t\tif (value('system_use_lifetime_output') == 1) {\r", + "\t\t\tproperty('adjust', 'AnalysisPeriod', value('analysis_period'));\r", + "\t\t}\r", + "\t\telse {\r", + "\t\t\tproperty('adjust', 'AnalysisPeriod', 1);\r", + "\t\t}\r", + "\t}\r", + "\telse {\r", + "\t\tproperty('adjust', 'AnalysisPeriod', 1);\r", + "\t}\r", + "}" ] } \ No newline at end of file diff --git a/deploy/runtime/versions.lk b/deploy/runtime/versions.lk index 05afe28e3..299d83247 100644 --- a/deploy/runtime/versions.lk +++ b/deploy/runtime/versions.lk @@ -72,11 +72,12 @@ version_upgrade{'2026.2.19'} = define() { variable_name_change('project_contingency_budget_cost_rvalue', 'project_contingency_cost_rvalue'); variable_name_change('insurance_during_construction_method', 'insurance_during_construction_cost_method'); variable_name_change('insurance_during_construction_modeled', 'insurance_during_construction_cost_modeled'); + variable_name_change("generic_degradation", "ac_degradation"); } if(cfg.tech == 'PVWatts' || cfg.tech == 'PVWatts Battery') { message('PVWatts now runs in lifetime mode so that time series outputs are over the analysis period instead of one year.', 'warning'); - message('PVWatts degradation is now modeled as DC degradation instead of AC degradation. DC degradation is an annual reduction in the DC output of the array instead of AC output of the system.', 'warning'); + message('PVWatts degradation is now modeled as DC degradation instead of AC degradation. DC degradation is an annual reduction in the DC output of the array instead of AC output of the system. DC degradation is applied linearly.', 'warning'); old_degradation = oldvalue('degradation'); value('dc_degradation', old_degradation, 'New DC degradation on DC Degradation page set to old AC degradation value from AC Degradation page.'); @@ -199,9 +200,48 @@ version_upgrade{'2026.2.19'} = define() { } - if (cfg.tech == 'Wind Power' || strpos(cfg.tech, "Hybrid") > -1) { + if (cfg.tech == 'Wind Power') { message('Wind balance of system cost estimators have been removed. Total capital costs remain the same in this version. Please uses SAM 2025.4.16 or older if you need access to the balance of system cost estimators within SAM.', 'warning'); + + wind_degradation = oldvalue('degradation'); + value('ac_degradation', wind_degradation, 'Wind has been updated to run in lifetime mode, the name of the degradation input has changed to "ac_degrdation". For Wind Power, lifetime mode applies degradation linearly.'); + } + + if (cfg.tech == 'Custom Generation Profile' ) { + ac_degradation = oldvalue('degradation'); + value('ac_degradation', ac_degradation, 'Custom generation profile has been updated to run in lifetime mode, the name of the degradation input has changed to "ac_degrdation".'); + + } + + + if (strpos(cfg.tech, "Hybrid") > -1) { + // Detailed PV already used lifetime, no changes there + if (cfg.tech != 'Photovoltaic Wind Battery Hybrid') { + message('PVWatts now runs in lifetime mode so that time series outputs are over the analysis period instead of one year.', 'warning'); + message('PVWatts degradation is now modeled as DC degradation instead of AC degradation. DC degradation is an annual reduction in the DC output of the array instead of AC output of the system. DC degradation is applied linearly.', 'warning'); + old_degradation = oldvalue('pvwatts_degradation'); + + value('pvwatts_dc_degradation', old_degradation, 'New DC degradation on DC Degradation page set to old AC degradation value from AC Degradation page.'); + } + + message('Wind balance of system cost estimators have been removed. Total capital costs remain the same in this version. Please uses SAM 2025.4.16 or older if you need access to the balance of system cost estimators within SAM.', 'warning'); + + wind_degradation = oldvalue('wind_degradation'); + value('wind_ac_degradation', wind_degradation, 'Wind has been updated to run in lifetime mode, the name of the degradation input has changed to "ac_degrdation". For Wind Power, lifetime mode applies degradation linearly.'); } + + if (cfg.tech == 'CustomGeneration PVWatts Wind FuelCell Battery Hybrid') { + spec_mode = oldvalue('spec_mode'); + if (spec_mode == 2) { + value('spec_mode', 3, "Additional options have been added to custom generation profile, combined cases is now spec_mode 3"); + } + + ac_degradation = oldvalue('customgeneration_degradation'); + value('customgeneration_ac_degradation', ac_degradation, 'Custom generation profile has been updated to run in lifetime mode, the name of the degradation input has changed to "ac_degrdation".'); + + } + + }; version_upgrade{'2024.12.12'} = define() { diff --git a/doc/sam-help-revision-log.md b/doc/sam-help-revision-log.md index f528d2092..0a459bc74 100644 --- a/doc/sam-help-revision-log.md +++ b/doc/sam-help-revision-log.md @@ -22,6 +22,8 @@ DSCR debt sizing note, see Brian email 10/31/2025 "Addtional thoughts on debt si ## Complete +Custom generation lifetime data per https://github.com/NatLabRockies/SAM/pull/2166. 4/7/2026 + New topic for snow download window. 2/3/2026 New revised topics for PV UI redesign. 2/3/2026 diff --git a/doc/source/custom-generation/custom_generation_profile.rst b/doc/source/custom-generation/custom_generation_profile.rst index 63e84fede..31c582a74 100644 --- a/doc/source/custom-generation/custom_generation_profile.rst +++ b/doc/source/custom-generation/custom_generation_profile.rst @@ -3,9 +3,6 @@ Generation Profile The Custom Generation Profile model allows you to represent a power plant using a simple model based on capacity factor and nameplate capacity, or to import hourly or subhourly electric generation data from another simulation model or measured from an operating system. -Custom Generation Profile Model -............................... - You can use the Custom Generation profile model for the following applications: * Model a thermal power plant as a baseline case for comparison with renewable alternatives. @@ -14,13 +11,10 @@ You can use the Custom Generation profile model for the following applications: * Use measured data from an installed plant with SAM's financial models. -Custom Generation Profile - Battery Model -......................................... - -The Custom Generation Profile - Battery model combines the Custom Generation Profile model with the battery storage model from the PV battery model. You can use the Custom Generation Profile - Battery model for a battery system that responds to an hourly or subhourly generation profile from another model or from data measured from a real system. +The Custom Generation Profile - Battery model combines the Custom Generation Profile model with the battery storage model. You can use the Custom Generation Profile - Battery model for a battery system that responds to an hourly or subhourly generation profile from another model or from data measured from a real system. Combine Cases -............. +~~~~~~~~~~~~~ Versions of SAM before SAM 2021.12.02 came with the "Combine Cases" macro that you could use to automatically calculate the generation profile by adding up generation data from other cases in the SAM file. This macro has been replaced by the **Generate production profiles and nameplate capacity from open cases** option described below. @@ -29,74 +23,85 @@ After running a simulation, you can see the hourly energy values in the :doc:`Ta Custom Generation Profile ~~~~~~~~~~~~~~~~~~~~~~~~~ -The custom generic profile model provides two options for describing the system's performance. You can either specify a nameplate capacity and capacity factor to model a constant generation profile, or you can import hourly or subhourly generation data from a file. +The custom generation profile model provides two overall options for describing the system's performance: + +* Specify a nameplate capacity and capacity factor to model a constant generation profile. + +* Import hourly or subhourly generation data from a file. **Constant generation profile from nameplate capacity and capacity factor** - Choose this option to model a generation profile that remains constant throughout the day and year. For this option, you provide the nameplate capacity, capacity factor, and loss values as inputs, and SAM calculates a constant generation profile to match. + Model a generation profile that remains constant throughout the day and year. For this option, you provide the nameplate capacity, capacity factor, and loss values as inputs, and SAM calculates a constant generation profile to match. -**Import hourly or subhourly generation profile from file** - Choose this option when you have data describing the system's generation profile to import into SAM. +**Import single-year hourly or subhourly generation profile from file** + Import hourly or subhourly generation data over one year into SAM. SAM will use the same generation profile for each year in the analysis period. + +.. note:: The analysis period is specified on the Financial Parameters page. + +**Import lifetime hourly or subhourly generation profile from file** + Import hourly or subhourly generation data over the analysis period. **Calculate generation profiles and nameplate capacity from open cases** - Choose this option to combine the generation profiles from other cases in the file to use as input for this case. + Combine the generation profiles from other cases in the file to use as input for this case. This option only works for cases that run hourly simulations. For cases that run a simulation over the analysis period (lifetime simulation), SAM only uses the Year 1 data to generate the combined generation profile. .. note:: As of SAM 2023, hybrid system configurations are available that combine the output of PV, wind, custom generation profile and fuel cell models as an alternative to this Calculate Generation Profiles option. -**Nameplate Capacity, kWe** +**Nameplate capacity, kWac** The system's nameplate electrical capacity in electric kilowatts. - If your analysis involves a financial model, SAM uses the nameplate capacity to calculate any capacity-based costs that you specify in $/W on the :doc:`Installation costs <../installation-costs/cc_custom_generation>` and :doc:`Operating costs <../operating-costs/oc_operating>` pages and any capacity-based incentives on the :doc:`Incentives <../incentives-and-depreciation/incentives>` page. + If your analysis involves a financial model, SAM uses the nameplate capacity to calculate any capacity-based costs that you specify in $/W on the :doc:`Installation costs <../installation-costs/cc_custom_generation>` and :doc:`Operating costs <../operating-costs/oc_operating>` pages and any capacity-based incentives on the :doc:`Incentives <../incentives-and-depreciation/incentives>` page. It also uses the nameplate capacity to calculate the capacity factor when you import power generation data as input. - This input is disabled for the Generate production profiles and nameplate capacity from open cases option because SAM automatically calculates the nameplate capacity from the values in the cases being combined. + This input is disabled for **Calculate generation profiles and nameplate capacity from open cases** because SAM automatically calculates the nameplate capacity from the values in the cases being combined. -**Nominal capacity factor** +**Nominal capacity factor, %** The nominal capacity factor is the plant capacity factor, not including plant losses or reduction in output due to system availability. - The nominal capacity factor is only available with the **Constant generation profile** option. SAM uses the value to calculate the total annual generation value as described below. + The nominal capacity factor is only available with the **Constant generation profile from nameplate capacity and capacity factor** option. SAM uses the value to calculate the total annual generation value as described below. When you import or generate power generation data, this input is disabled because for these options, SAM does not use the capacity factor to calculate the generation profile. .. note:: SAM reports a separate :doc:`capacity factor <../performance-metrics/mtp_capacity_factor>` in the results after you run a simulation that reflects plant losses and any reduction in output due to system availability. -**Combined nameplate capacity, kWe** - When you use the **Generate production profiles and nameplate capacity** from open cases option, SAM automatically calculates the nameplate capacity as the sum of nameplate capacities of each case. You can edit this value if you want to use a different value than the calculated value. +**Combined nameplate capacity, kWac** + When you choose **Calculate generation profiles and nameplate capacity from open cases**, SAM automatically calculates the nameplate capacity as the sum of nameplate capacities of each case. You can edit this value if you want to use a different value than the calculated value. -To import generation profile data: +**To import generation profile data:** -#. Choose **Import hourly or subhourly generation profile from file**. +#. If you have generation data for a single year, choose **Import single-year hourly or subhourly generation profile from file**. If you have generation data over the analysis period, choose **Import lifetime hourly or subhourly generation profile from file**. -#. Click **Edit data** to open a window for importing data from a text file for pasting the data from your computer's clipboard. +#. Click **Edit data** or single-year data, or **Edit lifetime data** for lifetime data to open a window for importing data. -#. If you are importing subhourly data, click **Change time step** and enter the time step in minutes. For hourly data, the time step should be 60 minutes. +#. If you are importing subhourly data for a single year, click **Change time step** and enter the time step in minutes. For hourly data, the time step should be 60 minutes. If you are importing lifetime data, choose the appropriate **Mode** (for the **Subhourly** mode, choose **Time step in minutes**). #. Click **Import** to import the data from a text file. -The data must be in a single column with one row for each time step. Each row should contain a value in kW of electricity generated per time step. For example, an hourly data set should contain 8,760 rows of kW values. A 15-minute data set would contain 35,040 rows of kW values. +The data must be in a single column with one row for each time step. Each row should contain a value in kW of electricity generated per time step. For example, an hourly data set for a single year should contain 8,760 rows of kW values. A 15-minute data set for one year would contain 35,040 rows of kW values. Lifetime data sets should contain data over the same number of years as the analysis period on the Financial Parameters page. -The first row is reserved for a header, so do not include any electricity generation data in the first row. SAM checks the number of data rows in the file to ensure it is consistent with the time step you specify. For example, for a 60-minute time step, the text file should contain 8761 rows: One row at the top of the file for the header followed by 8760 data rows. A 15-minute data set would contain a total of 35,041 rows. +The first row is reserved for a header, so do not include any electricity generation data in the first row. SAM checks the number of data rows in the file to ensure it is consistent with the time step you specify. For example, for a 60-minute time step over a single year, the text file should contain 8761 rows: One row at the top of the file for the header followed by 8760 data rows. A 15-minute data set would contain a total of 35,041 rows. -To paste the data from a text editor, spreadsheet, or other software, copy the data to your clipboard, and then click Paste. +To paste the data from a text editor, spreadsheet, or other software, copy the data to your clipboard, and then click **Paste**. #. Click **OK** to return to the Power Plant page. #. Type a value for **Nameplate capacity**. This number might be the same as the peak annual generation, or a different value. -To generate generation profiles from other cases: +**To generate generation profiles from other cases:** -#. Click **Add** to create a case for each system's output that you want to include in the generation profile. +#. Click **Add** in the menu bar at the top of the window to create a case for each system's output that you want to include in the generation profile. -#. Choose **Generate generation profiles and nameplate capacity from open cases**. +#. Choose **Calculate generation profiles and nameplate capacity from open cases**. #. Click **Select cases** to choose the cases you want to use to calculate the production profile. +#. Click **OK** to start the process: SAM automatically runs a simulation for each case you selected and generates the combined generation profile. + #. Verify that the value in **Nameplate capacity** is the value you want to use for your analysis and change it if necessary. #. Click **Edit array** to verify the time series production data. Losses -...... +------ The power plant loss accounts for output reductions caused by inefficiencies in the system, such as from wiring losses or other factors. @@ -104,7 +109,7 @@ The power plant loss accounts for output reductions caused by inefficiencies i A percentage applied to the system's output in each time step for both the constant generation and imported data options. For example, a value of 5% would reduce the system output in each time step by 5%. Set the loss percentage to zero if all losses are accounted for in the nameplate capacity, capacity factor, or imported generation data. Calculated Values Based on Input Assumptions -............................................ +-------------------------------------------- The calculated values are equivalent to the metrics shown on the Results page after a simulation. Use these values to verify that the nameplate capacity and capacity factor are correct, or that data you imported from a file and nameplate capacity are correct. @@ -130,7 +135,7 @@ The calculated values are equivalent to the metrics shown on the Results page af For the import generation from file option: *Capacity Factor After Plant Loss (%) = Total Annual Generation (kWh) ÷ Peak Annual Generation (kW) ÷ 8760 hours/year × 100%* Heat Rate for Fuel Cost Calculation -................................... +------------------------------------ You only need to specify a heat rate if you are using the custom generation profile model for a thermal power plant that consumes a fuel. diff --git a/doc/source/degradation/degradation_ac.rst b/doc/source/degradation/degradation_ac.rst index ac0b43eb8..5fce6d9cc 100644 --- a/doc/source/degradation/degradation_ac.rst +++ b/doc/source/degradation/degradation_ac.rst @@ -24,6 +24,12 @@ For most situations where you want to model an annual reduction in the system's An AC degradation rate of 1% for a system with a net annual AC output of 100,000 kWh in Year one results in annual output values of 100,000 kWh in year 1, 99,000 kWh in year 2, 98,010 kWh in year 3, 97,029.9 kWh in year 4, etc. +This example uses "compounding" degradation, where 1% is applied to the previous year's output. Wind Power uses AC linear degradation, where the degradation is always applied to the year 1 nameplate value: + +.. topic:: Linear Value Mode Example + + An AC degradation rate of 1% for a system with a net annual AC output of 100,000 kWh in Year one results in annual output values of 100,000 kWh in year 1, 99,000 kWh in year 2, 98,000 kWh in year 3, 97,000 kWh in year 4, etc. + In some situations, you may want to assign a different degradation rate to different years of the project cash flow. To do that, you use the "schedule mode" to specify a table of degradation rate values. In Schedule mode, SAM applies the degradation rate for a given year to the annual output in Year one to calculate the annual output for that year. .. topic:: Schedule Mode Example diff --git a/src/combinecases.cpp b/src/combinecases.cpp index 6dd742821..cb329ee92 100644 --- a/src/combinecases.cpp +++ b/src/combinecases.cpp @@ -63,14 +63,14 @@ CombineCasesDialog::CombineCasesDialog(wxWindow* parent, const wxString& title, m_custom_generation_case = SamApp::Window()->GetCurrentCase(); m_custom_generation_case_name = SamApp::Window()->Project().GetCaseName(m_custom_generation_case); m_custom_generation_case_window = SamApp::Window()->GetCaseWindow(m_custom_generation_case); - if (m_custom_generation_case->Values(0).Get("generic_degradation")) { - m_generic_degradation = m_custom_generation_case->Values(0).Get("generic_degradation")->Array(); // name in generic-battery cases + if (m_custom_generation_case->Values(0).Get("ac_degradation")) { + m_ac_degradation = m_custom_generation_case->Values(0).Get("ac_degradation")->Array(); // name in generic-battery cases } else if (m_custom_generation_case->Values(0).Get("degradation")) { - m_generic_degradation = m_custom_generation_case->Values(0).Get("degradation")->Array(); // name in other cases, if defined + m_ac_degradation = m_custom_generation_case->Values(0).Get("degradation")->Array(); // name in other cases, if defined } else { - m_generic_degradation.push_back(0.); // no value defined for LCOE and None financial models, set to zero + m_ac_degradation.push_back(0.); // no value defined for LCOE and None financial models, set to zero } // Text at top of window @@ -94,13 +94,13 @@ CombineCasesDialog::CombineCasesDialog(wxWindow* parent, const wxString& title, // Due to complexity of AC and DC degradation and lifetime and single year simulations, require user to provide an // AC degradation rate for the combined project and ignore degradation rate inputs of individual system cases. m_schnDegradation = new AFSchedNumeric(this, ID_spndDegradation, wxDefaultPosition, wxSize(64, 22)); - if (m_generic_degradation.size() == 1) { + if (m_ac_degradation.size() == 1) { m_schnDegradation->UseSchedule(false); - m_schnDegradation->SetValue(m_generic_degradation[0]); + m_schnDegradation->SetValue(m_ac_degradation[0]); } else { m_schnDegradation->UseSchedule(true); - m_schnDegradation->SetSchedule(m_generic_degradation); + m_schnDegradation->SetSchedule(m_ac_degradation); } wxString degradation_label = "%/year Annual AC degradation rate for all cases"; wxBoxSizer* szdegradation = new wxBoxSizer(wxHORIZONTAL); @@ -411,7 +411,7 @@ void CombineCasesDialog::OnEvt(wxCommandEvent& e) // sets the hidden 'Nameplate capacity' widget value m_custom_generation_case->Values(0).Get("system_capacity")->Set(nameplate); // the actual used system_capacity, which corresponds to the // 'Nameplate capacity' widget that is hidden when combining cases - m_custom_generation_case->Values(0).Get("spec_mode")->Set(2); // specify the third radio button + m_custom_generation_case->Values(0).Get("spec_mode")->Set(3); // specify the third radio button m_custom_generation_case->Values(0).Get("derate")->Set(0); // no additional losses- losses were computed in the individual models m_custom_generation_case->Values(0).Get("heat_rate")->Set(0); // no fuel costs- accounted for in O&M fuel costs from subsystem cash flows m_custom_generation_case->Values(0).Get("energy_output_array")->Set(hourly_energy.data(), hourly_energy.ncells()); diff --git a/src/combinecases.h b/src/combinecases.h index 9632666ee..c774209f5 100644 --- a/src/combinecases.h +++ b/src/combinecases.h @@ -77,7 +77,7 @@ class CombineCasesDialog : public wxDialog Case* m_custom_generation_case; wxString m_custom_generation_case_name; CaseWindow* m_custom_generation_case_window; - std::vector m_generic_degradation; + std::vector m_ac_degradation; std::vector m_cases; wxCheckListBox* m_chlCases; wxCheckBox* m_chkOverwriteCapital; diff --git a/src/project.cpp b/src/project.cpp index 18abf88d7..7658a4b1e 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -408,18 +408,16 @@ static void fcall_vuc_case_name( lk::invoke_t &cxt ) static void fcall_vuc_config_update_with_old_values(lk::invoke_t& cxt) { LK_DOC("config_update_with_old_values", "Update current case with old values", "(none):table"); - if (VersionUpgrade* vuc = static_cast(cxt.user_data())) - { - VarTable& vt_old = vuc->GetCase()->OldValues(0); + if (VersionUpgrade* vuc = static_cast(cxt.user_data())) { cxt.result().empty_hash(); - for (VarTable::iterator it = vt_old.begin(); it != vt_old.end(); ++it) - { - if (VarValue* vv = vuc->GetCase()->Values(0).Get(it->first)) - { - if (vv->Type() == (it->second)->Type()) // only update if old variable is of same type - { - cxt.result().hash_item(it->first).assign(vv->AsString() + "=" + it->second->AsString() + "\n"); - vv->Copy(*(it->second)); + for (size_t ndxHybrid = 0; ndxHybrid < vuc->GetCase()->GetConfiguration()->Technology.size(); ndxHybrid++) { + VarTable& vt_old = vuc->GetCase()->OldValues(ndxHybrid); + for (VarTable::iterator it = vt_old.begin(); it != vt_old.end(); ++it) { + if (VarValue* vv = vuc->GetCase()->Values(ndxHybrid).Get(it->first)) { + if (vv->Type() == (it->second)->Type()) { // only update if old variable is of same type + cxt.result().hash_item(it->first).assign(vv->AsString() + "=" + it->second->AsString() + "\n"); + vv->Copy(*(it->second)); + } } } } @@ -457,13 +455,34 @@ static void fcall_vuc_config( lk::invoke_t &cxt ) } +static bool UpdateVarNameNdxHybrid(Case* c, const wxString& input_name, wxString* var_name, size_t* ndx_hybrid) +{ + if (!c) return false; + *ndx_hybrid = c->GetConfiguration()->Technology.size() - 1; // size always >=1 + *var_name = input_name; + wxArrayString as = wxSplit(input_name, '_'); + if (as.size() > 1) { + for (size_t j = 0; j < c->GetConfiguration()->Technology.size(); j++) { + if (c->GetConfiguration()->Technology[j].Lower() == as[0]) { + *ndx_hybrid = j; + *var_name = input_name.Right(input_name.length() - (as[0].length() + 1)); + } + } + } + return true; +} + + static void fcall_vuc_value( lk::invoke_t &cxt ) { LK_DOC("value", "Set or get a variable's value. New variables may be created.", "(string:name, [variant:value], [string:reason]):variant"); if ( VersionUpgrade *vuc = static_cast(cxt.user_data()) ) { - wxString name( cxt.arg(0).as_string() ); - VarTable &vt = vuc->GetCase()->Values(0); + wxString name; + size_t ndx_hybrid = 0; + UpdateVarNameNdxHybrid(vuc->GetCase(), cxt.arg(0).as_string(), &name, &ndx_hybrid); + VarTable& vt = vuc->GetCase()->Values(ndx_hybrid); + if ( cxt.arg_count() == 1 ) { if ( VarValue *vv = vt.Get( name ) ) @@ -486,8 +505,8 @@ static void fcall_vuc_value( lk::invoke_t &cxt ) if ( cxt.arg_count() > 2 ) reason = cxt.arg(2).as_string(); wxString label( name ); - if ( 0 != vuc->GetCase()->Variables(0).Lookup( name ) ) - label = vuc->GetCase()->Variables(0).Label(name); + if ( 0 != vuc->GetCase()->Variables(ndx_hybrid).Lookup( name ) ) + label = vuc->GetCase()->Variables(ndx_hybrid).Label(name); wxString valstr( vv->AsString( ',', '|' ) ); if ( valstr.Len() > 100 ) @@ -519,9 +538,12 @@ static void fcall_vuc_oldvalue( lk::invoke_t &cxt ) LK_DOC( "oldvalue", "Retrieve a variable value from the project file that is no longer valid in the current case configuration, either due to wrong type or name change.", "(string:name):variant" ); if ( VersionUpgrade *vuc = static_cast(cxt.user_data()) ) { - VarTable &vt = vuc->GetCase()->OldValues(0); - if ( VarValue *vv = vt.Get( cxt.arg(0).as_string() ) ) - vv->Write( cxt.result() ); + wxString var_name; + size_t ndx_hybrid = 0; + UpdateVarNameNdxHybrid(vuc->GetCase(), cxt.arg(0).as_string(), &var_name, &ndx_hybrid); + VarTable& vt = vuc->GetCase()->OldValues(ndx_hybrid); + if (VarValue* vv = vt.Get(var_name)) + vv->Write(cxt.result()); } } diff --git a/test_results_win64.csv b/test_results_win64.csv index 71f5c6aa0..de17ee27a 100644 --- a/test_results_win64.csv +++ b/test_results_win64.csv @@ -130,13 +130,13 @@ MEwave,None,594343,NA,NA,; MEwave Battery,Single Owner,65027312,83.252,59.0537,; Warning: NPV is $-1.5293e+08. A negative NPV indicates project costs are higher than revenues. MEtidal,LCOE Calculator,2.16152e+06,NA,NA,; MEtidal,None,2.16152e+06,NA,NA,; -Wind Power,Residential,48358.4,19.1809,NA,; -Wind Power,Commercial,327922,6.76668,NA,; -Wind Power,Single Owner,818888256,2.59611,3.2492,; -Wind Power,Merchant Plant,818888256,2.62632,NA,; -Wind Power,Leveraged Partnership Flip,818888256,2.69456,3.2492,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. -Wind Power,All Equity Partnership Flip,818888256,2.98516,3.2492,; Warning: NPV is $-9.05533e+06. A negative NPV indicates project costs are higher than revenues. -Wind Power,Sale Leaseback,818888256,3.35372,3.2492,; Warning: IRR at end of analysis period is 185.757%. A high IRR may indicate a project with unrealistically high returns. Warning: NPV is $-9.19397e+06. A negative NPV indicates project costs are higher than revenues. +Wind Power,Residential,48358.4,20.1899,NA,; +Wind Power,Commercial,327922,7.12264,NA,; +Wind Power,Single Owner,818888256,2.77801,3.2399,; +Wind Power,Merchant Plant,818888256,2.8103,NA,; +Wind Power,Leveraged Partnership Flip,818888256,2.88163,3.2399,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. +Wind Power,All Equity Partnership Flip,818888256,3.15267,3.2399,; Warning: NPV is $-1.80559e+07. A negative NPV indicates project costs are higher than revenues. +Wind Power,Sale Leaseback,818888256,3.54061,3.2399,; Warning: IRR at end of analysis period is 185.757%. A high IRR may indicate a project with unrealistically high returns. Warning: NPV is $-2.36952e+07. A negative NPV indicates project costs are higher than revenues. Wind Power,LCOE Calculator,818888256,NA,NA,; Wind Power,None,201595968,NA,NA,; Fuel Cell,Commercial,1934877,10.1411,NA,; @@ -170,12 +170,12 @@ Custom Generation Profile,All Equity Partnership Flip,756864000,18.1665,25.9936, Custom Generation Profile,Sale Leaseback,756864000,17.8213,25.9936,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-5.31498e+07. A negative NPV indicates project costs are higher than revenues. Custom Generation Profile,LCOE Calculator,756864000,NA,NA,; Custom Generation Profile,None,756864000,NA,NA,; -PVWatts Wind Battery Hybrid,Single Owner,571509504,9.05417,6.19689,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -PVWatts Wind Battery Hybrid,Host Developer,1119067,15.2982,16.5422,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -PVWatts Wind FuelCell Battery Hybrid,Single Owner,574976896,9.01877,6.10819,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -PVWatts Wind FuelCell Battery Hybrid,Host Developer,2.68756e+06,39.3376,40.0341,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -Photovoltaic Wind Battery Hybrid,Single Owner,601657408,8.48431,5.92762,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower. -Photovoltaic Wind Battery Hybrid,Host Developer,1.30379e+06,12.694,16.5711,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower. -CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Single Owner,1332349312,11.5544,5.88111,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Host Developer,759754816,14.566,14.6375,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +PVWatts Wind Battery Hybrid,Single Owner,571509504,9.35022,6.19288,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +PVWatts Wind Battery Hybrid,Host Developer,1119067,15.4458,16.5322,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +PVWatts Wind FuelCell Battery Hybrid,Single Owner,574976896,9.30437,6.10072,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +PVWatts Wind FuelCell Battery Hybrid,Host Developer,2.68756e+06,39.6621,40.3146,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +Photovoltaic Wind Battery Hybrid,Single Owner,601657408,8.73964,5.92081,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower. +Photovoltaic Wind Battery Hybrid,Host Developer,1.30379e+06,12.7811,16.5645,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower. +CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Single Owner,1332349312,11.714,5.87734,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. +CustomGeneration PVWatts Wind FuelCell Battery Hybrid,Host Developer,759754816,14.5662,14.6377,; Notice: Simulation time step is 60 minutes for custom_generation. Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. final_configuration_eof,none,NA,NA,NA,