Skip to content

Commit

Permalink
Merge branch 'main' into jg/profile
Browse files Browse the repository at this point in the history
  • Loading branch information
joaquimg authored Dec 9, 2024
2 parents ca565c2 + 16c642f commit bb9c55e
Show file tree
Hide file tree
Showing 17 changed files with 851 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ jobs:
case: '1_EU_investment_simple-24'
file: 'main.jl'
os: ubuntu-latest
- framework: 'UnitCommitment'
case: 'matpower/case14/2017-01-01' # small non-default case
file: 'main.jl'
os: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
Expand Down
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ help:
@echo " sienna write all Sienna instances"
@echo " spineopt write all SpineOpt instances"
@echo " tulipaenergymodel write all TulipaEnergyModel instances"
@echo " unitcommitment write all UnitCommitment instances"
@echo " [HIGHS=X.Y.Z] benchmark run a new set of benchmarks, optionally with a version of HiGHS"
@echo " analyze print analysis of output"
@echo " all re-run all commands"
Expand All @@ -31,6 +32,9 @@ spineopt:
tulipaenergymodel:
julia --project=TulipaEnergyModel TulipaEnergyModel/main.jl --all --run --write

unitcommitment:
julia --project=UnitCommitment UnitCommitment/main.jl --all --run --write

benchmark:
@if [ ${HIGHS} ]; then\
echo ${HIGHS};\
Expand All @@ -42,6 +46,6 @@ benchmark:
analyze:
julia --project=benchmark benchmark/main.jl --analyze

all: genx powermodels sienna spineopt tulipaenergymodel
all: genx powermodels sienna spineopt tulipaenergymodel unitcommitment

.PHONY: default help genx powermodels sienna spineopt tulipaenergymodel benchmark analyze
.PHONY: default help genx powermodels sienna spineopt tulipaenergymodel unitcommitment benchmark analyze
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,20 @@ julia --project=TulipaEnergyModel TulipaEnergyModel/main.jl --case=1_EU_investme
```

See the `TulipaEnergyModel/main.jl` driver script for more details.

### UnitCommitment

For now, we can rebuild all of the UnitCommitment examples with (from the
root of this directory):

```sh
make unitcommitment
```

To run a particular case, do:

```sh
julia --project=UnitCommitment UnitCommitment/main.jl --case=matpower/case1888rte/2017-01-01 --run [--write]
```

See the `UnitCommitment/main.jl` driver script for more details.
Loading

0 comments on commit bb9c55e

Please sign in to comment.