Merging main #1
Merged
Merging main #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* minor clean-ups to floris.py (#419) * removed writing wind data to file in floris.py and added verbose as attr * minor clean up to applying losses in floris execute function * added floris clean-up to RELEASE.md * patch for readthedocs build using sphinx * fixed typo in config filepath from previous commit * fixed typo in config filepath from previous commit again * feature: option to load wind and solar resource data from HPC (#414) * added ability to grab wind and solar resource data off the HPC and updated upstream functions * updated doc strings and comments for wtk_data and nsrdb_data scripts * added comments to site_info for added options, fixed bug of resource year being set to 2012 * updated formatting and docstrings for previous commit * updated RELEASE.md with recent changes * changed input variable name in HPCWindData to align with WindResource and updated doc strings * added high level test for hpc resource data * added sphinx config path in readthedocs to fix build * updated doc strings and minor updates to hpc resource functions * updated docstrings and added valid year check and tests for hpc resource data * changed site_info api doc file to markdown * added doc files for wind and solar resource * minor updates to doc strings in hpc resource classes * updated string formatting * added tests for wtk and nsrdb resource if filepath is provided * split long comments into multiple lines * Bugfix: Load following heuristic method for variable load signals only using the beginning of the load signal (#421) * Fixing bug in heuristic method that affects variable load following * Updating release notes * Updated test for varied heuristics --------- Co-authored-by: John Jasa <[email protected]> * feature: option to initialize site_info with resource data (#415) * added ability to grab wind and solar resource data off the HPC and updated upstream functions * updated doc strings and comments for wtk_data and nsrdb_data scripts * added comments to site_info for added options, fixed bug of resource year being set to 2012 * updated formatting and docstrings for previous commit * updated RELEASE.md with recent changes * changed input variable name in HPCWindData to align with WindResource and updated doc strings * added high level test for hpc resource data * added ability to supply preloaded and formatted resource data to site_info and updated doc strings * added tests for using preloaded resource data and updated RELEASE.md * tried to improve the site_info documentation but it aint much better * added elevation as site_info attribute and updated with solar resource elevation if called * added sphinx config path in readthedocs to fix build * updated doc strings and minor updates to hpc resource functions * split out tests for initializing site_info with resource data * updated docstrings and added valid year check and tests for hpc resource data * added sphinx config path in readthedocs to fix build * updated doc strings and minor updates to hpc resource functions * updated docstrings and added valid year check and tests for hpc resource data * changed site_info api doc file to markdown * added doc files for wind and solar resource * minor updates to doc strings in hpc resource classes * resolved merge conflict in doc string of wind_resource.py * updated some formatting in resource files for readthedocs build * updated string formatting * added tests for wtk and nsrdb resource if filepath is provided * split long comments into multiple lines * minor clean ups to wind and solar resource functions * now passing tests --------- Co-authored-by: John Jasa <[email protected]> * Feature add: alternative to define site boundaries (#426) - Added different ways to define site boundaries; square, circle, etc - Expanded docs and tests accordingly --------- Co-authored-by: bayc <[email protected]> * Remove Wave Resource Deprecated Methods (#430) * update deprecated methods * H to h * update RELEASE.md * update wave resource docstring * fix docstring spacing * wave resource doc * fix doc build * PySAM 6.0.1 (#425) * update pysam to 6.0.0 * update grid default json to CustomGenerationProfile json * update wave plant loading resource file to handle 1hr timesteps by default * Updated for pysam 6.0.0 * wave cost model updates. update test values add additional test for costs. * Update regression test values based on updates to wind and solar pysam default jsons and updates to singleowner model. * Reopt test: update default json and financial value for wind * update test values in test_capacity_credit. changes due to json defaults and impact on battery optimization * CSP update. Update lcoe value because of changes to SingleOwner financial model * WIP; updating test values for detailed PV * Bringing tests back for detailed PV * update regression test results * update RELEASE.md * update example default fin config * remove outdated comments * update docstrings to google format * update RELEASE.md with PR number. Force update for NREL-PySAM dependency * remove commented code * update detailed pv attribute for pysam 6.0.1 * update release notes --------- Co-authored-by: John Jasa <[email protected]> * Feature add: option to adjust air density for site elevation (#427) * added site shape tools script * updated site_info for new option of site boundary definition * updated doc strings for site info and site shape tool functions * added tests for site shape tools functions * added site shape tools to documentation * added another optional input for site_details if using circle as shape * removed checking vertices so tests pass * added function to rotate site * added site boundary buffer for verts back in * added site polygon buffer as optional input to site info * added wind resource tools script * added test for air density adjustment for elevation calc * integrated adjusting for elevation in wind models * added weighted parser, updated tests, updated wind_resource.py * minor docstring updates to wind resource tools * minor fix to wind_plant and made regression test for elevation adjustment option * removed unnecessary lines and comments * integrated weighted parse resource data method into wind plant --------- Co-authored-by: John Jasa <[email protected]> * Intermediate: update to wind layout and floris functions (1/2) (#429) * added site shape tools script * updated site_info for new option of site boundary definition * updated doc strings for site info and site shape tool functions * added tests for site shape tools functions * added site shape tools to documentation * added another optional input for site_details if using circle as shape * updated RELEASE.md with new feature * removed checking vertices so tests pass * added function to rotate site * added site boundary buffer for verts back in * added site polygon buffer as optional input to site info * added wind resource tools script * added test for air density adjustment for elevation calc * integrated adjusting for elevation in wind models * updated doc strings for recent changes * updated release file * fixed bug in make_grid_lines * fixed input to create_grid to be in degrees instead of radians * added new wind layout tools and fixed doc strings related to bug fix * updated call to wind layout tools and fixed inputs for test_custom_financial * adding in option for basicgrid layout option * renamed test_layout test * added weighted parser, updated tests, updated wind_resource.py * added plot function to site_shape_tools * added new wind layout tools function and cleaned up wind_layout a bit * added more functionality to floris.py and added some optional parameters to windconfig * added layout test for basicgrid layout * added doc strings to wind layout files and wind plant files * added warning if user inputs incorrect turbine rating with floris * updated tests that were failing because of floris update * minor fix to wind_plant and made regression test for elevation adjustment option * added in integrated of weighted average resource data from v3/elevated_wind --------- Co-authored-by: John Jasa <[email protected]> * Feature add: integrated wind layout methods when using Floris (2/2) (#431) * added site shape tools script * updated site_info for new option of site boundary definition * updated doc strings for site info and site shape tool functions * added tests for site shape tools functions * added site shape tools to documentation * added another optional input for site_details if using circle as shape * updated RELEASE.md with new feature * removed checking vertices so tests pass * added function to rotate site * added site boundary buffer for verts back in * added site polygon buffer as optional input to site info * added wind resource tools script * added test for air density adjustment for elevation calc * integrated adjusting for elevation in wind models * updated doc strings for recent changes * updated release file * fixed bug in make_grid_lines * fixed input to create_grid to be in degrees instead of radians * added new wind layout tools and fixed doc strings related to bug fix * updated call to wind layout tools and fixed inputs for test_custom_financial * adding in option for basicgrid layout option * renamed test_layout test * added weighted parser, updated tests, updated wind_resource.py * added plot function to site_shape_tools * added new wind layout tools function and cleaned up wind_layout a bit * added more functionality to floris.py and added some optional parameters to windconfig * updated example 05 input file so it wont cause a warning * added layout test for basicgrid layout * added comments to tests that will fail because of floris update * updated tests that were failing because of floris update * minor fix to wind_plant and made regression test for elevation adjustment option * adjusted basic grid to center layout on site center and integrated layout with floris * integrated wind layout with floris and updated wind layout mode in floris test in test_hybrid * updated tests for floris because of recent feature-adds * added in integrated of weighted average resource data from v3/elevated_wind --------- Co-authored-by: John Jasa <[email protected]> Co-authored-by: bayc <[email protected]> * Wind Layout Clean-up (#433) * added site shape tools script * updated site_info for new option of site boundary definition * updated doc strings for site info and site shape tool functions * added tests for site shape tools functions * added site shape tools to documentation * added another optional input for site_details if using circle as shape * updated RELEASE.md with new feature * removed checking vertices so tests pass * added function to rotate site * added site boundary buffer for verts back in * added site polygon buffer as optional input to site info * added wind resource tools script * added test for air density adjustment for elevation calc * integrated adjusting for elevation in wind models * updated doc strings for recent changes * updated release file * fixed bug in make_grid_lines * fixed input to create_grid to be in degrees instead of radians * added new wind layout tools and fixed doc strings related to bug fix * updated call to wind layout tools and fixed inputs for test_custom_financial * adding in option for basicgrid layout option * renamed test_layout test * added weighted parser, updated tests, updated wind_resource.py * added plot function to site_shape_tools * added new wind layout tools function and cleaned up wind_layout a bit * added more functionality to floris.py and added some optional parameters to windconfig * updated example 05 input file so it wont cause a warning * added layout test for basicgrid layout * added test that shows how floris breaks - other floris tests will fail * added comments to tests that will fail because of floris update * added doc strings to wind layout files and wind plant files * added minor comment to floris.py * updated README with recent changes * added warning if user inputs incorrect turbine rating with floris * updated tests that were failing because of floris update * added some extra asserts to floris test in test_hybrid * minor docstring updates to wind resource tools * minor fix to wind_plant and made regression test for elevation adjustment option * removed unnecessary lines and comments * added some property and setters to floris * bug fix in test_hybrid for floris run * fixed failing test in test_hybrid * adjusted basic grid to center layout on site center and integrated layout with floris * fixed typo in floris.py * integrated wind layout with floris and updated wind layout mode in floris test in test_hybrid * updated tests for floris because of recent feature-adds * updated RELEASE.md with feature-add description * minor clean ups to scripts * cleaned up wind layout script * added function to modify layout params in wind_plant * minor update to wind_layout.py set_layout_params function * bug fix for failing tests * added in integrated of weighted average resource data from v3/elevated_wind * updated RELEASE.md * updated release.md * made changes based on review feedback * updated release file and removed unnecessary comments in some scripts * further workflow and comment clean-up from feedback * updated doc string and comments in make_grid_lines() * updated some doc strings in floris.py * updated handling if layout_params is None for wind * Minor docstring update * Fixed merge bug * Modifications based on Rob's PR * Fixed validators call * Updated spacing calls --------- Co-authored-by: John Jasa <[email protected]> * Missed load (#432) * update print/save statements to not multiply missed load by 100 since it is already a percentage and not a decimal * correct setting and printing of 'schedule_curtailed_percentage' with removing extra 100 multiples at print and including brackets for clarification * add clarifying parentheses * update RELEASE.md * MHK Tidal Plant (#444) * update pysam to 6.0.0 * update grid default json to CustomGenerationProfile json * update wave plant loading resource file to handle 1hr timesteps by default * Updated for pysam 6.0.0 * wave cost model updates. update test values add additional test for costs. * Update regression test values based on updates to wind and solar pysam default jsons and updates to singleowner model. * Reopt test: update default json and financial value for wind * update test values in test_capacity_credit. changes due to json defaults and impact on battery optimization * CSP update. Update lcoe value because of changes to SingleOwner financial model * WIP; updating test values for detailed PV * Bringing tests back for detailed PV * update regression test results * update RELEASE.md * update example default fin config * remove outdated comments * update docstrings to google format * update deprecated methods * H to h * update RELEASE.md * initial tidal model * update RELEASE.md with PR number. Force update for NREL-PySAM dependency * update tidal model with tests * add ability to interpolate resource data * add validators back * update documentation * Converted tabs to spaces * change resource import * update docstrings and documentation * update description of tidal resource * reduce attrs logic Co-authored-by: John Jasa <[email protected]> * reduce logic Co-authored-by: John Jasa <[email protected]> * check identity with is not None * update path handling * fixing docs * fix description * clean up readthedoc warnings * fix typo --------- Co-authored-by: John Jasa <[email protected]> * Integrate Tidal into Hybrid Simulation (#446) * integrate mhk_tidal into HybridSimulation * update tidal and wave docs * add tidal test to test_hybrid.py * add robust_approx method Co-authored-by: John Jasa <[email protected]> * Add Tidal Dispatch (#448) * add tidal dispatch * add tidal battery example --------- Co-authored-by: John Jasa <[email protected]> * Feature add: integration with turbine-models library for wind simulations (#435) * Added initial functionality for integrating turbine-models library * Integrated with turbine-models library and FLORIS and made integration test * Integrated turbine-models library with PySAM simulation and made integration test * Replaced UserWarning about wind turbine hub-height and site info discrepancy with ability to redownload wind resource data * Added initialize_pysam_turbine() function * Made turbine_rating_kw an optional input to WindConfig * Updated README.md, RELEASE.md, and pyproject.toml * Updated wind resource parsing methods to work if more than 2 resource heights are input * Changed UserWarnings to ValueErrors in wind_plant.py and floris.py * Added turbine_group as optional input to check_turbine_library_for_turbine function in turbine_library_tools.py * Updated Ct function in power_curve_tools.py to not fail if multiple roots --------- Co-authored-by: Gen Starke and John Jasa <[email protected]> * Distributed wind-hybrid examples (#452) * updated examples for battery is actually used * updated RELEASE.md for new examples * Minor typographical edits * updated example 9 and minor update to plot_generation_profile function * updated tick labelsize in plot_generation_profile for bottom subplot * updated example 9 with feedback from kbrunik --------- Co-authored-by: John Jasa <[email protected]> * Update README.md * Version bump for 3.2.0 release (#453) * Version bump for release * Update RELEASE.md --------- Co-authored-by: elenya-grant <[email protected]> Co-authored-by: genevievestarke <[email protected]> Co-authored-by: bayc <[email protected]> Co-authored-by: kbrunik <[email protected]> Co-authored-by: Jared Thomas <[email protected]>
See release notes for more details
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.