From 859d6ba668e44f7ee76e31305b27f1a10a28cf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Vegard=20Ven=C3=A5s?= Date: Mon, 15 Dec 2025 15:18:26 +0100 Subject: [PATCH] Enable usage of the ERA5 data set in the wind_power_timeseries module --- .github/actions/before-script/action.yml | 2 -- src/datastructures.jl | 4 ++++ submodules/wind_power_timeseries | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/before-script/action.yml b/.github/actions/before-script/action.yml index eaa0fd6..3be9c2b 100644 --- a/.github/actions/before-script/action.yml +++ b/.github/actions/before-script/action.yml @@ -14,9 +14,7 @@ runs: bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/miniconda echo "$HOME/miniconda/bin" >> $GITHUB_PATH source "$HOME/miniconda/etc/profile.d/conda.sh" - conda init bash - source "$HOME/miniconda/etc/profile.d/conda.sh" conda create --name testenv python=3.11 -y conda activate testenv conda install -c conda-forge poetry -y diff --git a/src/datastructures.jl b/src/datastructures.jl index b7aee2e..3b07b01 100644 --- a/src/datastructures.jl +++ b/src/datastructures.jl @@ -84,6 +84,8 @@ a Python function. The default value is "Ninja". - **`data_path`** is an optional file path for already downloaded data. The default value is an empty datapath. +- **`source`** is the data source for wind data. The user can choose between the strings + "NORA3" and "ERA5". The default value is "NORA3". """ function WindPower( id::Any, @@ -97,6 +99,7 @@ function WindPower( data::Vector{Data} = Data[], method::String = "Ninja", data_path::String = "", + source::String = "NORA3", ) power = call_python_function( "wind_power_timeseries", @@ -106,6 +109,7 @@ function WindPower( time_end = time_end, method = method, data_path = data_path, + source = source, ) profile = OperationalProfile(power) diff --git a/submodules/wind_power_timeseries b/submodules/wind_power_timeseries index e612aeb..5151758 160000 --- a/submodules/wind_power_timeseries +++ b/submodules/wind_power_timeseries @@ -1 +1 @@ -Subproject commit e612aebd295aecb7e47a298df7d4901316a99b36 +Subproject commit 51517589464ab0ab034785d47e481b8caf369682