Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Add load following heuristic dispatch test
* Consolidated utilities, renamed MHKConfig to MHKWaveConfig
* Updated solar resource download to use GOES Aggregated PSM v4 download
* Deprecate support for HybridBOSSE.
* Fix a bug caused by arrays with shape (N, 1) being passed to a `c_double` array with shape (N,)

## Version 3.3.0, April 30, 2025
Expand Down
8 changes: 4 additions & 4 deletions examples/legacy/analysis/main_usa_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def run_hopp_calc(Site, scenario_description, bos_details, total_hybrid_plant_ca
save_outputs contains a dictionary of all results for the hopp calculation.

:param scenario_description: Project scenario - 'greenfield' or 'solar addition'.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param total_hybrid_plant_capacity_mw: capacity in MW of hybrid plant.
:param solar_size_mw: capacity in MW of solar component of plant.
:param wind_size_mw: capacity in MW of wind component of plant.
Expand Down Expand Up @@ -210,7 +210,7 @@ def run_hybrid_calc(site_num, scenario_descriptions, results_dir, load_resource_
:param solar_size: capacity in MW of solar component of plant.
:param hybrid_size: capacity in MW of hybrid plant.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw,
json lookup, HybridBOSSE).
json lookup).
:param ppa_price: PPA price in USD($).
:param solar_tracking_mode: solar tracking mode (e.g. fixed, single-axis, two-axis).
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -477,7 +477,7 @@ def run_all_hybrid_calcs(site_details, scenario_descriptions, results_dir, load_
:param wind_size: capacity in MW of wind plant.
:param solar_size: capacity in MW of solar plant.
:param hybrid_size: capacity in MW of hybrid plant.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param ppa_price: ppa price in $(USD)
:param solar_tracking_mode: solar tracking mode
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -558,7 +558,7 @@ def run_all_hybrid_calcs(site_details, scenario_descriptions, results_dir, load_
scenario_descriptions = ['Wind Only', 'Solar Only', 'Hybrid - Wind & Solar', 'Solar Addition', 'Wind Overbuild',
'Solar Overbuild', 'Hybrid Vs. Wind + Solar Greenfield']
bos_details = dict()
bos_details['BOSSource'] = 'JSONLookup' # Cost/MW, JSONLookup, HybridBOSSE, HybridBOSSE_manual
bos_details['BOSSource'] = 'JSONLookup' # Cost/MW, JSONLookup
bos_details['BOSFile'] = 'UPDATED_BOS_Summary_Results.json'
bos_details['BOSScenario'] = 'TBD in analysis' # Will be set to Wind Only, Solar Only,
# Variable Ratio Wind and Solar Greenfield, or Solar Addition
Expand Down
8 changes: 4 additions & 4 deletions examples/legacy/analysis/multi_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def run_hopp_calc(Site, scenario_description, bos_details, total_hybrid_plant_ca
save_outputs contains a dictionary of all results for the hopp calculation.
:param scenario_description: Project scenario - 'greenfield' or 'solar addition'.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param total_hybrid_plant_capacity_mw: capacity in MW of hybrid plant.
:param solar_size_mw: capacity in MW of solar component of plant.
:param wind_size_mw: capacity in MW of wind component of plant.
Expand Down Expand Up @@ -242,7 +242,7 @@ def run_hybrid_calc(year, site_num, scenario_descriptions, results_dir, load_res
:param hybrid_size: capacity in MW of hybrid plant.
:param interconnection_size: capacity in MW of interconnection.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw,
json lookup, HybridBOSSE).
json lookup).
:param ppa_price: PPA price in USD($).
:param solar_tracking_mode: solar tracking mode (e.g. fixed, single-axis, two-axis).
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -479,7 +479,7 @@ def run_all_hybrid_calcs(site_details, scenario_descriptions, results_dir, load_
:param wind_size: capacity in MW of wind plant.
:param solar_size: capacity in MW of solar plant.
:param hybrid_size: capacity in MW of hybrid plant.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param ppa_price: ppa price in $(USD)
:param solar_tracking_mode: solar tracking mode
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -539,7 +539,7 @@ def eprint(*args):

# Establish Project Scenarios and Parameter Ranges:
bos_details = dict()
bos_details['BOSSource'] = 'costpermw' # costpermw, BOSLookup, HybridBOSSE, HybridBOSSE_manual
bos_details['BOSSource'] = 'costpermw' # costpermw, BOSLookup
bos_details['BOSFile'] = 'UPDATED_BOS_Summary_Results.json'
bos_details['BOSScenario'] = 'TBD in analysis' # Will be set to Wind Only, Solar Only,
# Variable Ratio Wind and Solar Greenfield, or Solar Addition
Expand Down
8 changes: 4 additions & 4 deletions examples/legacy/analysis/single_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def run_hopp_calc(Site, scenario_description, bos_details, total_hybrid_plant_ca
save_outputs contains a dictionary of all results for the hopp calculation.

:param scenario_description: Project scenario - 'greenfield' or 'solar addition'.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param total_hybrid_plant_capacity_mw: capacity in MW of hybrid plant.
:param solar_size_mw: capacity in MW of solar component of plant.
:param wind_size_mw: capacity in MW of wind component of plant.
Expand Down Expand Up @@ -218,7 +218,7 @@ def run_hybrid_calc(year, site_num, scenario_descriptions, results_dir, load_res
:param hybrid_size: capacity in MW of hybrid plant.
:param interconnection_size: capacity in MW of interconnection.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw,
json lookup, HybridBOSSE).
json lookup).
:param ppa_price: PPA price in USD($).
:param solar_tracking_mode: solar tracking mode (e.g. fixed, single-axis, two-axis).
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -437,7 +437,7 @@ def run_all_hybrid_calcs(site_details, scenario_descriptions, results_dir, load_
:param wind_size: capacity in MW of wind plant.
:param solar_size: capacity in MW of solar plant.
:param hybrid_size: capacity in MW of hybrid plant.
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup, HybridBOSSE).
:param bos_details: contains bos details including type of analysis to conduct (cost/mw, json lookup).
:param ppa_price: ppa price in $(USD)
:param solar_tracking_mode: solar tracking mode
:param hub_height: hub height in meters.
Expand Down Expand Up @@ -477,7 +477,7 @@ def run_all_hybrid_calcs(site_details, scenario_descriptions, results_dir, load_

# Establish Project Scenarios and Parameter Ranges:
bos_details = dict()
bos_details['BOSSource'] = 'BOSLookup' # Cost/MW, BOSLookup, HybridBOSSE, HybridBOSSE_manual
bos_details['BOSSource'] = 'BOSLookup' # Cost/MW, BOSLookup
bos_details['BOSFile'] = 'UPDATED_BOS_Summary_Results.json'
bos_details['BOSScenario'] = 'TBD in analysis' # Will be set to Wind Only, Solar Only,
# Variable Ratio Wind and Solar Greenfield, or Solar Addition
Expand Down
4 changes: 1 addition & 3 deletions hopp/tools/analysis/bos/cost_calculator.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from .bos_model import BOSCostPerMW, BOSCalculator
from .bos_lookup import BOSLookup
# from .hybrid_bosse import HybridBOSSE
from hopp.utilities.log import bos_logger as logger
import numpy as np

Expand All @@ -25,8 +24,7 @@ def __init__(self,
cost_reductions=[]):

"""
:param bos_cost_source: Defines the type of bos analysis used. Options are 'JSONLookup', 'Cost/MW',
'HybridBOSSE', 'HybridBOSSE manual'
:param bos_cost_source: Defines the type of bos analysis used. Options are 'JSONLookup' or 'Cost/MW'
:param scenario: 'greenfield' or 'solar addition'
:param interconnection_size: Size (MW) of interconnection
:param wind_installed_cost_mw: $USD cost/mw for installed wind
Expand Down
87 changes: 0 additions & 87 deletions hopp/tools/analysis/bos/hybrid_bosse.py

This file was deleted.

52 changes: 0 additions & 52 deletions hopp/tools/analysis/bos/hybridbosse_client.py

This file was deleted.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dependencies = [
"floris==4.3",
"future",
"global_land_mask",
"hybridbosse",
"lcoe",
"lxml",
"matplotlib",
Expand Down
Loading