Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend calculations for having berm as part of input profile #181

Closed
ArdtK opened this issue Oct 21, 2024 · 2 comments · Fixed by #218
Closed

Extend calculations for having berm as part of input profile #181

ArdtK opened this issue Oct 21, 2024 · 2 comments · Fixed by #218
Assignees
@peterdgr
Labels
question Further information is requested
Milestone
Sprint 2024.4.5

Comments

@ArdtK
Copy link
Contributor

ArdtK commented Oct 21, 2024 •
edited by peterdgr
Loading

No description provided.

@ArdtK ArdtK added this to the Sprint 2024.4.2 milestone Oct 21, 2024
@ArdtK ArdtK changed the title Extend tests for having a berm Extend calculations for having a berm as part of input profile Oct 21, 2024
@ArdtK ArdtK changed the title Extend calculations for having a berm as part of input profile Extend calculations for having berm as part of input profile Oct 21, 2024
@ArdtK ArdtK mentioned this issue Oct 21, 2024
Closed
@peterdgr
Copy link
Collaborator

Within the different measures the innerslope, inner_berm_width and inner_berm_height are calculated based on the existing dike dimensions and the reinforcement scenario (dh, ds, dp). So far we didn't take the existing berm width into account in the calculations. When there is an existing berm, the question is whether this is meant for piping or macrostability. Depending on that the new dike dimensions should be determined.

New logic needs to be defined and implemented --> @peterdgr
Tests should be added, existing tests should not fail (profiles should still be the same)

@Carsopre Carsopre added the question Further information is requested label Oct 23, 2024
@ArdtK
Copy link
Contributor Author

ArdtK commented Nov 4, 2024

Agreed:

  • Keep branch open as research branch
  • If it works functionally, merge master to branch (Peter/GAP)
  • Then review/refactor branch and fix unittests (GAP)

@ArdtK ArdtK linked a pull request Nov 6, 2024 that will close this issue
Feat/181 extend calculations for having berm as part of input profile #218
Merged
6 tasks
@ArdtK ArdtK mentioned this issue Nov 6, 2024
Merged
6 tasks
@peterdgr peterdgr mentioned this issue Nov 7, 2024
Closed
2 tasks
@Carsopre Carsopre mentioned this issue Nov 8, 2024
Merged
6 tasks
This was referenced Dec 16, 2024
Open
Closed
@ArdtK ArdtK modified the milestones: Sprint 2024.4.2, 2024.4.5 Dec 16, 2024
peterdgr added a commit that referenced this issue Dec 16, 2024
@peterdgr
#181 test cases
5710c6f 
Added test cases to reproduce bugs #233 and #235
ArdtK added a commit that referenced this issue Dec 16, 2024
@ArdtK
test: copy test additions from #181
46db4fd
@ArdtK ArdtK mentioned this issue Dec 17, 2024
Merged
6 tasks
Carsopre added a commit that referenced this issue Dec 18, 2024
@Carsopre
Squashed commit of the following:
177edaa 
commit d8529ac
Author: Ardt Klapwijk <[email protected]>
Date:   Mon Dec 16 15:38:54 2024 +0100

    test: update reference data

commit da17886
Merge: 5710c6f 2d92a4c
Author: Ardt Klapwijk <[email protected]>
Date:   Mon Dec 16 15:34:50 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 5710c6f
Author: Peter de Grave <[email protected]>
Date:   Mon Dec 16 11:08:39 2024 +0100

    #181 test cases

    Added test cases to reproduce bugs #233 and #235

commit 5083940
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:35:27 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Enhancements for stability wall input profile

commit 044f4d9
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:34:56 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Use unbuild ground price for VPS

commit 78e5459
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:34:23 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Include dikesection names in export

commit 850914a
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:33:19 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Prevent error at export of shapefile

commit f393ff4
Merge: e60ed60 3ab9c75
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 13 11:36:15 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit e60ed60
Merge: 356764e 5450a2c
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 13 10:56:49 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 356764e
Merge: fbbe933 d942e77
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Mon Nov 11 11:44:57 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit fbbe933
Merge: 93e31c3 b05ad5e
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Mon Nov 11 09:22:17 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 93e31c3
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Fri Nov 8 12:48:03 2024 +0100

    fix: 220 last row error in strategy buffering and clustering

commit 2469306
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 15:06:22 2024 +0100

    chore: fix cofferdam bug

commit 68991a7
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 14:57:28 2024 +0100

    chore: fix vps bug

commit c367b7e
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 14:49:02 2024 +0100

    chore: fix bugs

commit 36c3e42
Merge: 56816c8 b672c7b
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 12:25:29 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 56816c8
Author: peterdgr <[email protected]>
Date:   Wed Nov 6 11:11:28 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Update scenario cases and base profiles

commit 16b8dda
Author: peterdgr <[email protected]>
Date:   Fri Nov 1 09:49:47 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Extend calculations for having berm as part of input profile. Added stability Wall and CofferDam.

commit accfc5b
Author: peterdgr <[email protected]>
Date:   Wed Oct 30 17:53:24 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Improve input profile calculations to accommodate dikes with existing berms at polderside
Carsopre added a commit that referenced this issue Dec 19, 2024
@ArdtK @peterdgr @Carsopre
feat: extend calculations for having berm as part of input profile (#218
baa433d 
)

* feat: 181 extend calculations for having berm as part of input profile

Improve input profile calculations to accommodate dikes with existing berms at polderside

* feat: 181 extend calculations for having berm as part of input profile

Extend calculations for having berm as part of input profile. Added stability Wall and CofferDam.

* feat: 181 extend calculations for having berm as part of input profile

Update scenario cases and base profiles

* chore: fix bugs

* chore: fix vps bug

* chore: fix cofferdam bug

* fix: 220 last row error in strategy buffering and clustering

* feat: 181 extend calculations for having berm as part of input profile

Prevent error at export of shapefile

* feat: 181 extend calculations for having berm as part of input profile

Include dikesection names in export

* feat: 181 extend calculations for having berm as part of input profile

Use unbuild ground price for VPS

* feat: 181 extend calculations for having berm as part of input profile

Enhancements for stability wall input profile

* #181 test cases

Added test cases to reproduce bugs #233 and #235

* test: update reference data

* chore: Modified layers wrapper builder to consider the exceptional case from these bugs

* test: Updated reference data

* chore: Removed logic as it's not yet accurate

* test updated reference data

* test: Removed wrongfully added test data

* chore: Removed file that should have not been committed

* test: Removed accidentally committed issue test case

* ci: Ignored `test_data/issues` from version control as they are only meant to be run locally

* ci: Modified release template to have a different label

* test: Updated scenario test cases

* Squashed commit of the following:

commit d8529ac
Author: Ardt Klapwijk <[email protected]>
Date:   Mon Dec 16 15:38:54 2024 +0100

    test: update reference data

commit da17886
Merge: 5710c6f 2d92a4c
Author: Ardt Klapwijk <[email protected]>
Date:   Mon Dec 16 15:34:50 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 5710c6f
Author: Peter de Grave <[email protected]>
Date:   Mon Dec 16 11:08:39 2024 +0100

    #181 test cases

    Added test cases to reproduce bugs #233 and #235

commit 5083940
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:35:27 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Enhancements for stability wall input profile

commit 044f4d9
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:34:56 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Use unbuild ground price for VPS

commit 78e5459
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:34:23 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Include dikesection names in export

commit 850914a
Author: peterdgr <[email protected]>
Date:   Mon Dec 9 15:33:19 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Prevent error at export of shapefile

commit f393ff4
Merge: e60ed60 3ab9c75
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 13 11:36:15 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit e60ed60
Merge: 356764e 5450a2c
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 13 10:56:49 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 356764e
Merge: fbbe933 d942e77
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Mon Nov 11 11:44:57 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit fbbe933
Merge: 93e31c3 b05ad5e
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Mon Nov 11 09:22:17 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 93e31c3
Author: Carles S. Soriano Pérez <[email protected]>
Date:   Fri Nov 8 12:48:03 2024 +0100

    fix: 220 last row error in strategy buffering and clustering

commit 2469306
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 15:06:22 2024 +0100

    chore: fix cofferdam bug

commit 68991a7
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 14:57:28 2024 +0100

    chore: fix vps bug

commit c367b7e
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 14:49:02 2024 +0100

    chore: fix bugs

commit 36c3e42
Merge: 56816c8 b672c7b
Author: Ardt Klapwijk <[email protected]>
Date:   Wed Nov 6 12:25:29 2024 +0100

    Merge branch 'master' into feat/181-extend-calculations-for-having-berm-as-part-of-input-profile

commit 56816c8
Author: peterdgr <[email protected]>
Date:   Wed Nov 6 11:11:28 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Update scenario cases and base profiles

commit 16b8dda
Author: peterdgr <[email protected]>
Date:   Fri Nov 1 09:49:47 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Extend calculations for having berm as part of input profile. Added stability Wall and CofferDam.

commit accfc5b
Author: peterdgr <[email protected]>
Date:   Wed Oct 30 17:53:24 2024 +0100

    feat: 181 extend calculations for having berm as part of input profile

    Improve input profile calculations to accommodate dikes with existing berms at polderside

* chore: Removed unnecessary file

* chore: Simplified (and improved) how to determine the added geometry

* test: Added new reference data

* chore: Processed review remarks

* feat: 181 fix unittest and improve code (sub) (#241)

---------

Co-authored-by: peterdgr <[email protected]>
Co-authored-by: Carles S. Soriano Pérez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@peterdgr peterdgr

Labels
question Further information is requested
Projects
None yet
Milestone
Sprint 2024.4.5
Development

Successfully merging a pull request may close this issue.

Feat/181 extend calculations for having berm as part of input profile Deltares/Koswat
3 participants
@Carsopre @ArdtK @peterdgr