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
13 changes: 5 additions & 8 deletions .github/actions/before-script/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,20 @@ runs:
poetry install
cd "$GITHUB_WORKSPACE"

git clone https://gitlab.sintef.no/harald.svendsen/timeseries.git
cd "$GITHUB_WORKSPACE/timeseries"
cd "$GITHUB_WORKSPACE/submodules/wind_power_timeseries"
poetry install
cd "$GITHUB_WORKSPACE"

git clone https://github.com/iDesignRES/Tecnalia.git
cd "$GITHUB_WORKSPACE/Tecnalia/examples/pv_power_plants"
cd "$GITHUB_WORKSPACE/submodules/Tecnalia/examples/pv_power_plants"
poetry install
cd "$GITHUB_WORKSPACE/Tecnalia/examples/building_energy_process"
cd "$GITHUB_WORKSPACE/submodules/Tecnalia/examples/building_energy_process"
poetry install
cd "$GITHUB_WORKSPACE"

git clone https://github.com/iDesignRES/CHP_modelling.git
cd "$GITHUB_WORKSPACE/CHP_modelling"
cd "$GITHUB_WORKSPACE/submodules/CHP_modelling"
mkdir build
cd build
cmake ..
make
cd "$GITHUB_WORKSPACE"
shell: bash
shell: bash
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
arch: x64
steps:
- uses: actions/checkout@v4
with:
submodules: true # Fetch the submodules
- uses: ./.github/actions/before-script
- uses: julia-actions/setup-julia@v2
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true # Fetch the submodules
- uses: ./.github/actions/before-script
- uses: julia-actions/setup-julia@latest
with:
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "submodules/Tecnalia"]
path = submodules/Tecnalia
url = https://github.com/iDesignRES/Tecnalia.git
[submodule "submodules/wind_power_timeseries"]
path = submodules/wind_power_timeseries
url = https://gitlab.sintef.no/harald.svendsen/wind_power_timeseries.git
[submodule "submodules/CHP_modelling"]
path = submodules/CHP_modelling
url = https://github.com/iDesignRES/CHP_modelling.git
1 change: 1 addition & 0 deletions submodules/CHP_modelling
Submodule CHP_modelling added at 6b0f0f
1 change: 1 addition & 0 deletions submodules/Tecnalia
Submodule Tecnalia added at 331933
1 change: 1 addition & 0 deletions submodules/wind_power_timeseries
Submodule wind_power_timeseries added at 6511ab
7 changes: 2 additions & 5 deletions test/test_CSPandPV.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ using Dates
T = TwoLevel(sp_duration, operational_periods; op_per_strat = 8760.0)

# Load paths to default Buildings process and authentication files
project_path = joinpath(@__DIR__, "..", "Tecnalia")
if !isdir(project_path)
project_path = joinpath(@__DIR__, "..", "..", "Tecnalia")
end
project_path = joinpath(project_path, "examples", "pv_power_plants")
project_path =
joinpath(@__DIR__, "..", "submodules", "Tecnalia", "examples", "pv_power_plants")
path_to_auth_file_csp_pv = joinpath(project_path, "auth.json")
auth_pay_load_csp_pv = JSON.parsefile(path_to_auth_file_csp_pv)

Expand Down
14 changes: 9 additions & 5 deletions test/test_bioCHP.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,15 @@ using EnergyModelsHeat
BioBirchStem => 0.3,
BioSpruceTB => 0.4,
)
libpath = joinpath(@__DIR__, "..", "CHP_modelling")
if !isdir(libpath)
libpath = joinpath(@__DIR__, "..", "..", "CHP_modelling")
end
libpath = joinpath(libpath, "build", "lib", "libbioCHP_wrapper.so")
libpath = joinpath(
@__DIR__,
"..",
"submodules",
"CHP_modelling",
"build",
"lib",
"libbioCHP_wrapper.so",
)

bio_chp = BioCHP(
"Bio CHP plant",
Expand Down
13 changes: 8 additions & 5 deletions test/test_buildings.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ using Dates
T = TwoLevel(sp_duration, operational_periods; op_per_strat = 8760.0)

# Load paths to default Buildings process and authentication files
project_path = joinpath(@__DIR__, "..", "Tecnalia")
if !isdir(project_path)
project_path = joinpath(@__DIR__, "..", "..", "Tecnalia")
end
project_path = joinpath(project_path, "examples", "building_energy_process")
project_path = joinpath(
@__DIR__,
"..",
"submodules",
"Tecnalia",
"examples",
"building_energy_process",
)
path_to_auth_file_buildings = joinpath(project_path, "auth.json")
auth_pay_load_buildings = JSON.parsefile(path_to_auth_file_buildings)

Expand Down