Skip to content

Commit

Permalink
Merge pull request #1041 from NREL/SAM_994
Browse files Browse the repository at this point in the history 
Fixes SAM issue 994
  • Loading branch information
@sjanzou
sjanzou committed May 24, 2022
2 parents ba36ae0 + 747a4ab commit 643f1bb
Show file tree
Hide file tree
Showing 122 changed files with 2,357 additions and 991 deletions.
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions api/api_autogen/library/defaults/Battery_GenericBatteryMerchantPlant.json
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions api/api_autogen/library/defaults/Battery_GenericBatterySingleOwner.json
View file
Expand Up @@ -10,12 +10,12 @@
"BatterySystem": {
"batt_ac_dc_efficiency": 96,
"batt_ac_or_dc": 1,
"batt_computed_bank_capacity": 4000,
"batt_computed_bank_capacity": 20000,
"batt_computed_series": 139,
"batt_computed_strings": 2498,
"batt_current_charge_max": 1998.4,
"batt_computed_strings": 12490,
"batt_current_charge_max": 19984,
"batt_current_choice": 0,
"batt_current_discharge_max": 1998.4,
"batt_current_discharge_max": 19984,
"batt_dc_ac_efficiency": 96,
"batt_dc_dc_efficiency": 99,
"batt_inverter_efficiency_cutoff": 90,
Expand All @@ -24,16 +24,16 @@
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_mass": 39603.9,
"batt_mass": 198020,
"batt_meter_position": 1,
"batt_power_charge_max_kwac": 1041.67,
"batt_power_charge_max_kwdc": 999.999,
"batt_power_discharge_max_kwac": 959.999,
"batt_power_discharge_max_kwdc": 999.999,
"batt_power_charge_max_kwac": 10416.7,
"batt_power_charge_max_kwdc": 9999.99,
"batt_power_discharge_max_kwac": 9599.99,
"batt_power_discharge_max_kwdc": 9999.99,
"batt_replacement_capacity": 50,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_surface_area": 89.0141,
"batt_surface_area": 1500,
"en_batt": 1,
"en_standalone_batt": 0
},
Expand All @@ -42,15 +42,15 @@
"Load": {
},
"BatteryCell": {
"LeadAcid_q10_computed": 7434.05,
"LeadAcid_q20_computed": 7993.6,
"LeadAcid_qn_computed": 4796.16,
"LeadAcid_q10_computed": 37170.2,
"LeadAcid_q20_computed": 39968,
"LeadAcid_qn_computed": 23980.8,
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 2.584,
"batt_Qfull": 3.2,
"batt_Qfull_flow": 7993.6,
"batt_Qfull_flow": 39968,
"batt_Qnom": 3.126,
"batt_Vcut": 2.772,
"batt_Vexp": 3.53,
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_StandaloneBatteryMerchantPlant.json
View file
Expand Up @@ -33,7 +33,7 @@
"batt_replacement_capacity": 50,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_surface_area": 1364.25,
"batt_surface_area": 18000,
"en_batt": 1,
"en_standalone_batt": 1
},
Expand Down Expand Up @@ -219324,7 +219324,7 @@
"ur_nm_yearend_sell_rate": 0,
"ur_ts_buy_rate": [0.000000],
"ur_ts_sell_rate": [0.000000],
"ur_yearzero_usage_peaks": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
"ur_yearzero_usage_peaks": [234.676000, 173.422000, 172.007000, 191.434000, 198.295000, 236.469000, 274.231000, 260.336000, 226.751000, 185.123000, 156.200000, 184.050000]
},
"GridLimits": {
"enable_interconnection_limit": 0,
Expand Down
30 changes: 15 additions & 15 deletions api/api_autogen/library/defaults/Battery_StandaloneBatterySingleOwner.json
View file
Expand Up @@ -10,12 +10,12 @@
"BatterySystem": {
"batt_ac_dc_efficiency": 96,
"batt_ac_or_dc": 1,
"batt_computed_bank_capacity": 4000,
"batt_computed_bank_capacity": 240000,
"batt_computed_series": 139,
"batt_computed_strings": 2498,
"batt_current_charge_max": 1998.4,
"batt_computed_strings": 149880,
"batt_current_charge_max": 119904,
"batt_current_choice": 1,
"batt_current_discharge_max": 1998.4,
"batt_current_discharge_max": 119904,
"batt_dc_ac_efficiency": 96,
"batt_dc_dc_efficiency": 99,
"batt_inverter_efficiency_cutoff": 90,
Expand All @@ -24,16 +24,16 @@
"batt_losses_charging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_losses_discharging": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_losses_idle": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_mass": 39603.9,
"batt_mass": 2.37624e+06,
"batt_meter_position": 1,
"batt_power_charge_max_kwac": 1041.67,
"batt_power_charge_max_kwdc": 999.999,
"batt_power_discharge_max_kwac": 959.999,
"batt_power_discharge_max_kwdc": 999.999,
"batt_power_charge_max_kwac": 62500,
"batt_power_charge_max_kwdc": 60000,
"batt_power_discharge_max_kwac": 57600,
"batt_power_discharge_max_kwdc": 60000,
"batt_replacement_capacity": 50,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000],
"batt_surface_area": 89.0141,
"batt_surface_area": 18000,
"en_batt": 1,
"en_standalone_batt": 1
},
Expand All @@ -42,15 +42,15 @@
"Load": {
},
"BatteryCell": {
"LeadAcid_q10_computed": 7434.05,
"LeadAcid_q20_computed": 7993.6,
"LeadAcid_qn_computed": 4796.16,
"LeadAcid_q10_computed": 446043,
"LeadAcid_q20_computed": 479616,
"LeadAcid_qn_computed": 287770,
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 2.584,
"batt_Qfull": 3.2,
"batt_Qfull_flow": 7993.6,
"batt_Qfull_flow": 479616,
"batt_Qnom": 3.126,
"batt_Vcut": 2.772,
"batt_Vexp": 3.53,
Expand Down Expand Up @@ -322,7 +322,7 @@
"ur_nm_yearend_sell_rate": 0,
"ur_ts_buy_rate": [0.000000],
"ur_ts_sell_rate": [0.000000],
"ur_yearzero_usage_peaks": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
"ur_yearzero_usage_peaks": [234.676000, 173.422000, 172.007000, 191.434000, 198.295000, 236.469000, 274.231000, 260.336000, 226.751000, 185.123000, 156.200000, 184.050000]
},
"GridLimits": {
"enable_interconnection_limit": 0,
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Cashloan_FlatPlatePVCommercial.json
View file
Expand Up @@ -14,7 +14,7 @@
"real_discount_rate": 6.4,
"salvage_percentage": 0,
"state_tax_rate": [7.000000],
"system_capacity": 498.72
"system_capacity": 499.96
},
"SystemCosts": {
"om_capacity": [16.000000],
Expand All @@ -23,7 +23,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 857424
"total_installed_cost": 859557
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Cashloan_PVWattsResidential.json
View file
Expand Up @@ -25,7 +25,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 10886
"total_installed_cost": 17417.6
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/Communitysolar_PVWattsCommunitySolar.json
View file
Expand Up @@ -48,7 +48,7 @@
"total_installed_cost": 2.05529e+06
},
"LandLease": {
"land_area": 6.50277,
"land_area": 18.7859,
"om_land_lease": [0.000000],
"om_land_lease_escal": 0
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/GenericSystem_GenericBatteryMerchantPlant.json
View file
Expand Up @@ -7,7 +7,7 @@
"heat_rate": 10,
"spec_mode": 0,
"system_capacity": 20000,
"user_capacity_factor": 43.6
"user_capacity_factor": 20
},
"Lifetime": {
"analysis_period": 25,
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/GenericSystem_GenericBatterySingleOwner.json
View file
Expand Up @@ -7,7 +7,7 @@
"heat_rate": 10,
"spec_mode": 0,
"system_capacity": 20000,
"user_capacity_factor": 43.6
"user_capacity_factor": 20
},
"Lifetime": {
"analysis_period": 25,
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/GenericSystem_GenericSystemMerchantPlant.json
View file
Expand Up @@ -7,7 +7,7 @@
"heat_rate": 10,
"spec_mode": 0,
"system_capacity": 100000,
"user_capacity_factor": 100
"user_capacity_factor": 90
},
"Lifetime": {
"analysis_period": 25,
Expand Down
22 changes: 11 additions & 11 deletions api/api_autogen/library/defaults/Hcpv_HighXConcentratingPVMerchantPlant.json
View file
Expand Up @@ -26,16 +26,16 @@
"module_temp_coeff": -0.15
},
"InverterCECDatabase": {
"inv_snl_c0": -5.94331e-08,
"inv_snl_c1": 4.3e-05,
"inv_snl_c2": 0.001046,
"inv_snl_c3": 0.000357,
"inv_snl_paco": 333000,
"inv_snl_pdco": 342459,
"inv_snl_pnt": 99.9,
"inv_snl_pso": 1161.53,
"inv_snl_vdcmax": 960,
"inv_snl_vdco": 740
"inv_snl_c0": -1.40704e-08,
"inv_snl_c1": 6.34566e-06,
"inv_snl_c2": 0.00155414,
"inv_snl_c3": -0.000271668,
"inv_snl_paco": 753200,
"inv_snl_pdco": 777216,
"inv_snl_pnt": 122.55,
"inv_snl_pso": 3714.14,
"inv_snl_vdcmax": 820,
"inv_snl_vdco": 615
},
"HCPVArray": {
"array_ac_wiring_loss": 0.99,
Expand All @@ -45,7 +45,7 @@
"array_enable_azalt_sf": 0,
"array_modules_per_tracker": 150,
"array_monthly_soiling": [0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000],
"array_num_inverters": 4,
"array_num_inverters": 2,
"array_num_trackers": 20,
"array_rlim_az_max": 310,
"array_rlim_az_min": 50,
Expand Down
22 changes: 11 additions & 11 deletions api/api_autogen/library/defaults/Hcpv_HighXConcentratingPVSingleOwner.json
View file
Expand Up @@ -26,16 +26,16 @@
"module_temp_coeff": -0.15
},
"InverterCECDatabase": {
"inv_snl_c0": -5.94331e-08,
"inv_snl_c1": 4.3e-05,
"inv_snl_c2": 0.001046,
"inv_snl_c3": 0.000357,
"inv_snl_paco": 333000,
"inv_snl_pdco": 342459,
"inv_snl_pnt": 99.9,
"inv_snl_pso": 1161.53,
"inv_snl_vdcmax": 960,
"inv_snl_vdco": 740
"inv_snl_c0": -1.40704e-08,
"inv_snl_c1": 6.34566e-06,
"inv_snl_c2": 0.00155414,
"inv_snl_c3": -0.000271668,
"inv_snl_paco": 753200,
"inv_snl_pdco": 777216,
"inv_snl_pnt": 122.55,
"inv_snl_pso": 3714.14,
"inv_snl_vdcmax": 820,
"inv_snl_vdco": 615
},
"HCPVArray": {
"array_ac_wiring_loss": 0.99,
Expand All @@ -45,7 +45,7 @@
"array_enable_azalt_sf": 0,
"array_modules_per_tracker": 150,
"array_monthly_soiling": [0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000, 0.950000],
"array_num_inverters": 4,
"array_num_inverters": 2,
"array_num_trackers": 20,
"array_rlim_az_max": 310,
"array_rlim_az_min": 50,
Expand Down
8 changes: 4 additions & 4 deletions api/api_autogen/library/defaults/HostDeveloper_FlatPlatePVHostDeveloper.json
View file
Expand Up @@ -39,7 +39,7 @@
"reserves_interest": 1.25,
"salvage_percentage": 0,
"state_tax_rate": [7.000000],
"system_capacity": 498.72,
"system_capacity": 499.96,
"term_int_rate": 4,
"term_tenor": 18
},
Expand All @@ -50,7 +50,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 857424
"total_installed_cost": 859557
},
"LandLease": {
},
Expand Down Expand Up @@ -233,7 +233,7 @@
},
"SystemOutput": {
"degradation": [0.000000],
"system_capacity": 498.72
"system_capacity": 499.96
},
"Moratorium": {
"loan_moratorium": 0
Expand Down Expand Up @@ -283,7 +283,7 @@
"system_use_lifetime_output": 1
},
"ConstructionFinancing": {
"construction_financing_cost": 16076.7
"construction_financing_cost": 16116.7
},
"BatterySystem": {
"en_batt": 0
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/HostDeveloper_PVWattsHostDeveloper.json
View file
Expand Up @@ -283,7 +283,7 @@
"system_use_lifetime_output": 0
},
"ConstructionFinancing": {
"construction_financing_cost": 18567.9
"construction_financing_cost": 17407.4
},
"BatterySystem": {
},
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Merchantplant_BiopowerMerchantPlant.json
View file
Expand Up @@ -3,7 +3,7 @@
"FinancialParameters": {
"analysis_period": 25,
"batt_salvage_percentage": 0,
"construction_financing_cost": 3.6457e+06,
"construction_financing_cost": 3.75339e+06,
"cost_debt_closing": 450000,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -52,7 +52,7 @@
"om_opt_fuel_2_usage": 0,
"om_production": [4.000000],
"om_production_escal": 0,
"total_installed_cost": 1.82285e+08
"total_installed_cost": 2.00181e+08
},
"LandLease": {
},
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Merchantplant_DSLFMerchantPlant.json
View file
Expand Up @@ -3,7 +3,7 @@
"FinancialParameters": {
"analysis_period": 25,
"batt_salvage_percentage": 0,
"construction_financing_cost": 1.87263e+07,
"construction_financing_cost": 1.68537e+07,
"cost_debt_closing": 450000,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -52,7 +52,7 @@
},
"LandLease": {
"land_area": 347.641,
"om_land_lease": [100.000000],
"om_land_lease": [0.000000],
"om_land_lease_escal": 0
},
"TaxCreditIncentives": {
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Merchantplant_EmpiricalTroughMerchantPlant.json
View file
Expand Up @@ -3,7 +3,7 @@
"FinancialParameters": {
"analysis_period": 25,
"batt_salvage_percentage": 0,
"construction_financing_cost": 2.67044e+07,
"construction_financing_cost": 2.4034e+07,
"cost_debt_closing": 450000,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -52,7 +52,7 @@
},
"LandLease": {
"land_area": 910.358,
"om_land_lease": [100.000000],
"om_land_lease": [0.000000],
"om_land_lease_escal": 0
},
"TaxCreditIncentives": {
Expand Down

0 comments on commit 643f1bb

Please sign in to comment.