Skip to content

Allocation renewal - #2266

Merged
SouthEndMusic merged 46 commits into
mainfrom
allocation_from_scratch
Jun 18, 2025
Merged

SouthEndMusic merged 46 commits into
mainfrom
allocation_from_scratch

Conversation

@SouthEndMusic

@SouthEndMusic SouthEndMusic commented Apr 29, 2025 •

Copy link
Copy Markdown
Collaborator

Fixes #2255
Fixes #2149
Fixes #2147

@SouthEndMusic
SouthEndMusic marked this pull request as draft April 29, 2025 11:47
@SouthEndMusic SouthEndMusic changed the title First draft Allocation renewal Apr 29, 2025

@jarsarasty jarsarasty left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hi @SouthEndMusic,

I see good progress with the new implementation. For now, I only have minor comments about the way the bounds are handled in the model.

Comment thread core/src/allocation_init.jl Outdated
Comment thread core/src/allocation_init.jl Outdated
Comment thread core/src/allocation_init.jl Outdated
Comment thread core/src/allocation_init.jl Outdated
Comment thread core/src/allocation_init.jl
Comment thread core/src/allocation_init.jl
Comment thread core/src/allocation_init.jl
Comment thread core/src/allocation_init.jl
Comment thread core/src/allocation_init.jl
Comment thread core/src/allocation_init.jl Outdated
@SouthEndMusic

SouthEndMusic commented Jun 2, 2025 •

Copy link
Copy Markdown
Collaborator Author

Here's a status update for the new allocation implementation:

@SouthEndMusic
SouthEndMusic requested a review from visr June 12, 2025 13:33
@SouthEndMusic
SouthEndMusic marked this pull request as ready for review June 12, 2025 13:33
@SouthEndMusic

Copy link
Copy Markdown
Collaborator Author

@jarsarasty here are some updates

Because I have done quite some refactoring for Ribasim NL issues this branch accumulated quite some merge conflicts. I therefore decided to bring this branch up to date and merge it soon. I marked the remaining tests that are not green yet as broken, and allocation will be categorized as a experimental feature. This is technically breaking, but allocation is hardly used by modelers.

I'm also in conversation about my migration to the wflow team, I will have a meeting about that next Tuesday. It probably means that I have to hand over the allocation developments to @simulutions (Lex) in the coming weeks

@jarsarasty

Copy link
Copy Markdown
Collaborator

Thanks for the updates, @SouthEndMusic! I'll review the changes next week.

visr added a commit that referenced this pull request Jun 16, 2025
Not yet the release branch, just want to get this out of the way already. Note that this already mentions #2266, we could take that out if needed.
@visr visr mentioned this pull request Jun 16, 2025
visr added a commit that referenced this pull request Jun 16, 2025
Not yet the release branch, just want to get this out of the way
already. Note that this already mentions #2266, we could take that out
if needed.
@SouthEndMusic
SouthEndMusic merged commit eae958a into main Jun 18, 2025
@SouthEndMusic
SouthEndMusic deleted the allocation_from_scratch branch June 18, 2025 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants