Skip to content

Commit

Permalink
Merge pull request #21 from NREL-Sienna/jd/fix_read_results_with_keys
Browse files Browse the repository at this point in the history 
use read_results_with_keys
  • Loading branch information
@jd-lara
jd-lara authored Feb 17, 2024
2 parents 1b02975 + 9bda646 commit eca7764
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PowerAnalytics"
uuid = "56ce1300-00bc-47e4-ba8c-b166ccc19f51"
authors = ["cbarrows <[email protected]>"]
version = "0.6.0"
version = "0.6.1"

[deps]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Expand All @@ -20,7 +20,7 @@ DataFrames = "1"
DataStructures = "0.18"
InfrastructureSystems = "1"
InteractiveUtils = "1"
PowerSimulations = "^0.27"
PowerSimulations = "^0.27.1"
PowerSystems = "3"
TimeSeries = "0.23"
YAML = "0.4"
Expand Down
14 changes: 7 additions & 7 deletions src/get_data.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,23 +320,23 @@ function get_generation_data(
aux_variable_keys =
get_generation_aux_variable_keys(results; aux_variable_keys = aux_variable_keys)

variables = PSI.read_variables_with_keys(
variables = PSI.read_results_with_keys(
results,
injection_keys;
start_time = initial_time,
len = len,
)
filter_results!(variables, filter_func, results)

parameters = PSI.read_parameters_with_keys(
parameters = PSI.read_results_with_keys(
results,
parameter_keys;
start_time = initial_time,
len = len,
)
filter_results!(parameters, filter_func, results)

aux_variables = PSI.read_aux_variables_with_keys(
aux_variables = PSI.read_results_with_keys(
results,
aux_variable_keys;
start_time = initial_time,
Expand Down Expand Up @@ -370,23 +370,23 @@ function get_load_data(
variable_keys = get_load_variable_keys(results; variable_keys = variable_keys)
parameter_keys = get_load_parameter_keys(results; parameter_keys = parameter_keys)

variables = PSI.read_variables_with_keys(
variables = PSI.read_results_with_keys(
results,
variable_keys;
start_time = initial_time,
len = len,
)
filter_results!(variables, filter_func, results)

parameters = PSI.read_parameters_with_keys(
parameters = PSI.read_results_with_keys(
results,
parameter_keys;
start_time = initial_time,
len = len,
)
filter_results!(parameters, filter_func, results)

aux_variables = PSI.read_aux_variables_with_keys(
aux_variables = PSI.read_results_with_keys(
results,
aux_variable_keys;
start_time = initial_time,
Expand Down Expand Up @@ -481,7 +481,7 @@ function get_service_data(

variable_keys = get_service_variable_keys(results; variable_keys = variable_keys)

variables = PSI.read_variables_with_keys(
variables = PSI.read_results_with_keys(
results,
variable_keys;
start_time = initial_time,
Expand Down

2 comments on commit eca7764

@jd-lara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/101062

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.1 -m "<description of version>" eca7764dbac16303b0b06efdb59ecc7f4186d5b3
git push origin v0.6.1

Please sign in to comment.