Skip to content

Commit

Permalink
Merge branch 'develop' into SAM_1618
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Dec 6, 2023
2 parents ada42e3 + 6bab5dc commit 8b8f789
Show file tree
Hide file tree
Showing 14 changed files with 110 additions and 107 deletions.
2 changes: 1 addition & 1 deletion deploy/runtime/autographs.lk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ autographs { 'Photovoltaic Wind Battery Hybrid|Single Owner' } = define () {

autographs { 'Photovoltaic Wind Battery Hybrid|Host Developer' } = define () {
// monthly energy
agraph( 'generic_monthly_energy,photovoltaic_monthly_energy,wind_monthly_energy', 'Monthly AC Energy in Year 1', '', 'kWh' , -1, false, true, 'bottom', 1 );
agraph( 'photovoltaic_monthly_energy,wind_monthly_energy', 'Monthly AC Energy in Year 1', '', 'kWh' , -1, false, true, 'bottom', 1 );

// after-tax cash flow and host indifference point
agraph( 'cf_project_return_aftertax', 'Developer After-tax Cash Flow', 'Year', '$', -1, true, false, 'bottom' );
Expand Down
16 changes: 8 additions & 8 deletions deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 2.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -387,7 +387,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 100.0,
"reference_number_turbines": 1.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -454,24 +454,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down
20 changes: 10 additions & 10 deletions deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 2.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -381,7 +381,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 200000.0,
"reference_number_turbines": 80.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -606,24 +606,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down Expand Up @@ -30247,7 +30247,7 @@
"batt_salvage_percentage": 0.0,
"batt_salvage_value": 0.0,
"battery_system_capacity": 57600.0,
"battery_total_installed_cost": 99151800.0,
"battery_total_installed_cost": 99151900.0,
"cbi_fed_amount": 0.0,
"cbi_fed_deprbas_fed": 0.0,
"cbi_fed_deprbas_sta": 0.0,
Expand Down Expand Up @@ -48758,7 +48758,7 @@
"tod_library": "Uniform Dispatch",
"total_installed_cost": 1638430000.0,
"ui_battery_capacity": 57600.0,
"ui_battery_cost": 99151800.0,
"ui_battery_cost": 99151900.0,
"ui_electricity_rate_option": 0.0,
"ui_fuel_cell_capacity": 200.0,
"ui_fuel_cell_cost": 2100000.0,
Expand Down
20 changes: 10 additions & 10 deletions deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 1.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -294,7 +294,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 100.0,
"reference_number_turbines": 1.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -361,24 +361,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down Expand Up @@ -19926,7 +19926,7 @@
"const_per_principal4": 0.0,
"const_per_principal5": 0.0,
"const_per_principal_total": 1804130.0,
"const_per_total1": 47358.4,
"const_per_total1": 47358.3,
"const_per_total2": 0.0,
"const_per_total3": 0.0,
"const_per_total4": 0.0,
Expand All @@ -19936,7 +19936,7 @@
"const_per_upfront_rate3": 0.0,
"const_per_upfront_rate4": 0.0,
"const_per_upfront_rate5": 0.0,
"construction_financing_cost": 47358.4,
"construction_financing_cost": 47358.3,
"cost_debt_closing": 0.0,
"cost_debt_fee": 2.75,
"cost_other_financing": 0.0,
Expand Down
14 changes: 7 additions & 7 deletions deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 200000.0,
"reference_number_turbines": 80.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -530,24 +530,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down
24 changes: 12 additions & 12 deletions deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 1.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -294,7 +294,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 100.0,
"reference_number_turbines": 1.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -361,24 +361,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down Expand Up @@ -55753,7 +55753,7 @@
"batt_salvage_percentage": 0.0,
"batt_salvage_value": 0.0,
"battery_system_capacity": 299.84,
"battery_total_installed_cost": 890229.0,
"battery_total_installed_cost": 890230.0,
"cbi_fed_amount": 0.0,
"cbi_fed_deprbas_fed": 0.0,
"cbi_fed_deprbas_sta": 0.0,
Expand All @@ -55779,7 +55779,7 @@
"cbi_uti_tax_fed": 1.0,
"cbi_uti_tax_sta": 1.0,
"chk_update_peaks": 0.0,
"const_per_interest1": 86012.1,
"const_per_interest1": 86012.2,
"const_per_interest2": 0.0,
"const_per_interest3": 0.0,
"const_per_interest4": 0.0,
Expand All @@ -55789,7 +55789,7 @@
"const_per_interest_rate3": 0.0,
"const_per_interest_rate4": 0.0,
"const_per_interest_rate5": 0.0,
"const_per_interest_total": 86012.1,
"const_per_interest_total": 86012.2,
"const_per_months1": 6.0,
"const_per_months2": 0.0,
"const_per_months3": 0.0,
Expand Down Expand Up @@ -118744,7 +118744,7 @@
"total_installed_cost": 5293060.0,
"ui_annual_load": 0.0,
"ui_battery_capacity": 299.84,
"ui_battery_cost": 890229.0,
"ui_battery_cost": 890230.0,
"ui_fuel_cell_capacity": 200.0,
"ui_fuel_cell_cost": 2100000.0,
"ui_generic_capacity": 0.0,
Expand Down
16 changes: 8 additions & 8 deletions deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 2.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -305,7 +305,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 200000.0,
"reference_number_turbines": 80.0,
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_resource_file": "AZ Eastern-Rolling Hills.srw",
"reference_sales_tax_percent": 5.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -530,24 +530,24 @@
"wind_resource.closest_dir_meas_ht": 80.0,
"wind_resource.closest_speed_meas_ht": 80.0,
"wind_resource.country": "USA",
"wind_resource.description": "Southern WY - flat lands (NREL AWS Truepower representative file)",
"wind_resource.elev": 2088.0,
"wind_resource.file": "WY Southern-Flat Lands.srw",
"wind_resource.description": "Eastern AZ - rolling hills (NREL AWS Truepower representative file)",
"wind_resource.elev": 1829.0,
"wind_resource.file": "AZ Eastern-Rolling Hills.srw",
"wind_resource.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Southern-Flat Lands",
"wind_resource.location": "AZ Eastern-Rolling Hills",
"wind_resource.location_id": "loc_id",
"wind_resource.lon": 0.0,
"wind_resource.lon_requested": 0.0,
"wind_resource.requested_ht": 80.0,
"wind_resource.state": "WY",
"wind_resource.state": "AZ",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_filename": "AZ Eastern-Rolling Hills.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down
Loading

0 comments on commit 8b8f789

Please sign in to comment.