Skip to content

merge dev into main - #52

Merged
energyLS merged 235 commits into
mainfrom
dev
Jul 18, 2026
Merged

merge dev into main#52
energyLS merged 235 commits into
mainfrom
dev

Conversation

@JanTautorus

Copy link
Copy Markdown
Collaborator

I think all neccesary development is done for now -> should we merge dev into main?

…eck the following:\n-hbi buffer for initial demand\n-battery cycling conditions\n-before optimizing snaity check steel demand vs renewable potential
@energyLS

Copy link
Copy Markdown
Owner

I think all neccesary development is done for now -> should we merge dev into main?

Thank you @JanTautorus for bringing this up. Indeed, we are ready to bring in all the changes from dev into main. Before we do this, could you please have a look at #50 and merge it. Furthermore, should I review this PR and potentially clean some things if applicable?

@JanTautorus

Copy link
Copy Markdown
Collaborator Author

@energyLS I'm not sure how worth an indepth diff versus main is, as we treated dev as our core branch for quite a while. If you want to review I would concentrate on the config, readme and core module / snakemake files.

One thing that still has to be implemented is a workflow pulling all input data from zenodo (and configuring that zenodo folder)

@energyLS

Copy link
Copy Markdown
Owner

@energyLS I'm not sure how worth an indepth diff versus main is, as we treated dev as our core branch for quite a while. If you want to review I would concentrate on the config, readme and core module / snakemake files.

One thing that still has to be implemented is a workflow pulling all input data from zenodo (and configuring that zenodo folder)

@JanTautorus I have:

merging now 🚀

@energyLS
energyLS merged commit a505ac8 into main Jul 18, 2026
@philouhawi
philouhawi deleted the dev branch August 21, 2026 15:52
@philouhawi
philouhawi restored the dev branch August 21, 2026 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants