Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/hybrids' into hybrids
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Aug 23, 2023
2 parents 01fc111 + e616473 commit 854e596
Show file tree
Hide file tree
Showing 13 changed files with 75,747 additions and 56,699 deletions.
38 changes: 19 additions & 19 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 @@ -376,7 +376,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 1.0,
"reference_number_turbines": 1.0,
"reference_resource_file": "",
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_sales_tax_percent": 0.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -437,28 +437,28 @@
"wind_farm_yCoordinates": [
0.0
],
"wind_resource.city": "",
"wind_resource.closest_dir_meas_ht": 0.0,
"wind_resource.closest_speed_meas_ht": 0.0,
"wind_resource.country": "",
"wind_resource.description": "",
"wind_resource.elev": 0.0,
"wind_resource.file": "",
"wind_resource.city": "city??",
"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.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Cheyenne_2006",
"wind_resource.location_id": "",
"wind_resource.location": "WY Southern-Flat Lands",
"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": "",
"wind_resource.year": 0.0,
"wind_resource.state": "WY",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "",
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down Expand Up @@ -1375,14 +1375,14 @@
],
"fuelcell_efficiency_choice": 0.0,
"fuelcell_fixed_pct": 95.0,
"fuelcell_fuel_available": 1000.0,
"fuelcell_fuel_available_in": 1000.0,
"fuelcell_fuel_available": 10000000000.0,
"fuelcell_fuel_available_in": 10000000000.0,
"fuelcell_fuel_available_units": 3.0,
"fuelcell_fuel_limited": 0.0,
"fuelcell_fuel_type": 0.0,
"fuelcell_is_started": 0.0,
"fuelcell_lhv": 20267.0,
"fuelcell_lhv_in": 20267.0,
"fuelcell_lhv": 983.0,
"fuelcell_lhv_in": 983.0,
"fuelcell_lhv_units": 2.0,
"fuelcell_number_of_units": 1.0,
"fuelcell_operation_options": 1.0,
Expand Down Expand Up @@ -21744,15 +21744,15 @@
"state_tax_rate": [
0.0
],
"system_capacity": 4.0,
"system_capacity": 3.63636,
"term_int_rate": 0.0,
"term_tenor": 0.0,
"tod_library": "Uniform Dispatch",
"total_installed_cost": 0.0,
"ui_annual_load": 0.0,
"ui_battery_capacity": 0.0,
"ui_battery_cost": 0.0,
"ui_pv_capacity": 3.63636,
"ui_hyb_pv_capacity": 3.63636,
"ui_pv_cost": 0.0,
"ui_wacc": 4.06875,
"ui_wind_capacity": 0.0,
Expand Down
42 changes: 21 additions & 21 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 @@ -376,7 +376,7 @@
"ops_strategies_loss": 0.0,
"reference_capacity": 1.0,
"reference_number_turbines": 1.0,
"reference_resource_file": "",
"reference_resource_file": "WY Southern-Flat Lands.srw",
"reference_sales_tax_percent": 0.0,
"resource_definition_type": 0.0,
"rows": 1.0,
Expand Down Expand Up @@ -437,28 +437,28 @@
"wind_farm_yCoordinates": [
0.0
],
"wind_resource.city": "",
"wind_resource.closest_dir_meas_ht": 0.0,
"wind_resource.closest_speed_meas_ht": 0.0,
"wind_resource.country": "",
"wind_resource.description": "",
"wind_resource.elev": 0.0,
"wind_resource.file": "",
"wind_resource.city": "city??",
"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.lat": 0.0,
"wind_resource.lat_requested": 0.0,
"wind_resource.location": "WY Cheyenne_2006",
"wind_resource.location_id": "",
"wind_resource.location": "WY Southern-Flat Lands",
"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": "",
"wind_resource.year": 0.0,
"wind_resource.state": "WY",
"wind_resource.year": 1900.0,
"wind_resource_distribution": [
[
0.0
]
],
"wind_resource_filename": "",
"wind_resource_filename": "WY Southern-Flat Lands.srw",
"wind_resource_model_choice": 0.0,
"wind_resource_shear": 0.14,
"wind_resource_turbulence_coeff": 0.1,
Expand Down Expand Up @@ -1375,14 +1375,14 @@
],
"fuelcell_efficiency_choice": 0.0,
"fuelcell_fixed_pct": 95.0,
"fuelcell_fuel_available": 1000.0,
"fuelcell_fuel_available_in": 1000.0,
"fuelcell_fuel_available": 10000000000.0,
"fuelcell_fuel_available_in": 10000000000.0,
"fuelcell_fuel_available_units": 3.0,
"fuelcell_fuel_limited": 0.0,
"fuelcell_fuel_type": 0.0,
"fuelcell_is_started": 0.0,
"fuelcell_lhv": 20267.0,
"fuelcell_lhv_in": 20267.0,
"fuelcell_lhv": 983.0,
"fuelcell_lhv_in": 983.0,
"fuelcell_lhv_units": 2.0,
"fuelcell_number_of_units": 1.0,
"fuelcell_operation_options": 1.0,
Expand Down Expand Up @@ -1639,7 +1639,7 @@
],
"batt_mass": 0.0,
"batt_maximum_SOC": 95.0,
"batt_meter_position": 0.0,
"batt_meter_position": 1.0,
"batt_minimum_SOC": 30.0,
"batt_minimum_modetime": 10.0,
"batt_num_cells": 0.0,
Expand Down Expand Up @@ -3221,7 +3221,7 @@
],
"cp_capacity_payment_esc": 0.0,
"cp_capacity_payment_type": 0.0,
"cp_system_nameplate": 0.004,
"cp_system_nameplate": 0.00363636,
"dc_ac_ratio": 1.1,
"debt_message": "",
"debt_option": 1.0,
Expand Down Expand Up @@ -12885,15 +12885,15 @@
"state_tax_rate": [
0.0
],
"system_capacity": 4.0,
"system_capacity": 3.63636,
"term_int_rate": 0.0,
"term_tenor": 0.0,
"tod_library": "Uniform Dispatch",
"total_installed_cost": 0.0,
"ui_battery_capacity": 0.0,
"ui_battery_cost": 0.0,
"ui_electricity_rate_option": 0.0,
"ui_pv_capacity": 3.63636,
"ui_hyb_pv_capacity": 3.63636,
"ui_pv_cost": 0.0,
"ui_system_nameplate_standalone": 0.0,
"ui_wacc": 4.06875,
Expand Down
Loading

0 comments on commit 854e596

Please sign in to comment.