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

Dei 185 depth average rule #114

Merged
merged 75 commits into from
Jul 8, 2024
Merged

Dei 185 depth average rule #114

merged 75 commits into from
Jul 8, 2024

Conversation

CindyvdVries
Copy link
Collaborator

No description provided.

wschoonveld and others added 30 commits June 19, 2024 10:59
@wschoonveld
feat[DEI-185]: create depth average rule
d5e9cf6
@CindyvdVries
add todo and parser
5a23242
@CindyvdVries
add data
67bec0a
@CindyvdVries
Update template_input.yaml
fc9051d
@CindyvdVries
add to modelbuilder
8061706
@wschoonveld
DEI-185: depth_average_rule: calculate layer heights
c8521fb
@wschoonveld
feat[DEI-185]: depth_average_rule: calculate depth average
74709fc
@wschoonveld
feat[DEI-185]: correct layer data and parser and fix flake issues
6de8cc4
@wschoonveld
feat[DEI-185]: use enumerate (fix flake8)
69ff442
@wschoonveld
feat[DEI-185]: clean up comments
bd9a9a9
@wschoonveld
feat[DEI-185]: flake8
24bdabb
@wschoonveld
feat[DEI-185]: pylint warning
22f82c7
@CindyvdVries
Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta…
b3381e3 
…res/D-EcoImpact into DEI-185-depth-average-rule
@wschoonveld
feat[DEI-185]: rename depth_average_layer_data to depth_average_rule_…
6868a9f 
…data
@wschoonveld
feat[DEI-185]: rule type implementation
4aee6cd
@CindyvdVries
Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta…
c7297ff 
…res/D-EcoImpact into DEI-185-depth-average-rule
@CindyvdVries
Complete workflow for depth averaged rule
6620a89
@CindyvdVries
first implementation depth averaged rule
5292e7c
@CindyvdVries
correct calculation + clean up
ec78db9
@mKlapwijk
fix typo
5f2fa1e
@mKlapwijk
typo. Add test for depth averaged rule
86f340c
@mKlapwijk
correct validation test of depth average rule
aad71cd
@mKlapwijk
remove trailing spaces
dd59628
@mKlapwijk
typo
22cac02
@mKlapwijk
add test
7f57b9b
@wschoonveld
feat[DEI-185]: changes in depth average rule
fb5e0bc
@wschoonveld
Merge branch 'DEI-185-depth-average-rule' of https://github.com/Delta…
cfed894 
…res/D-EcoImpact into DEI-185-depth-average-rule
@wschoonveld
feat[DEI-185]: changes in the depth average rule
e7a5b7b
@wschoonveld
feat[DEI-185]: clean up print statements
1f7baab
@wschoonveld
feat[DEI-185]: enable error again to check on dummy variable
e480591
mKlapwijk
mKlapwijk requested changes Jul 1, 2024
View reviewed changes
decoimpact/business/entities/rules/depth_average_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/depth_average_rule.py Show resolved Hide resolved
decoimpact/business/entities/rules/depth_average_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/depth_average_rule.py Outdated Show resolved Hide resolved
decoimpact/business/entities/rules/depth_average_rule.py Show resolved Hide resolved
template_input.yaml Show resolved Hide resolved
tests/data/parsers/test_parser_depth_average_rule.py Outdated Show resolved Hide resolved
tests/business/entities/rules/test_depth_average_rule.py Outdated Show resolved Hide resolved
tests/business/entities/rules/test_depth_average_rule.py Outdated Show resolved Hide resolved
tests/business/entities/rules/test_depth_average_rule.py Outdated Show resolved Hide resolved
mKlapwijk
mKlapwijk approved these changes Jul 3, 2024
View reviewed changes
decoimpact/business/workflow/model_builder.py Show resolved Hide resolved
docs/manual/input.md Outdated Show resolved Hide resolved
docs/manual/input.md Outdated Show resolved Hide resolved
mKlapwijk and others added 7 commits July 3, 2024 10:20
@mKlapwijk
add space
a22e324
@mKlapwijk
remove pandoc test
8515b69
@CindyvdVries
update manual and make latex code visible
f44f615
@CindyvdVries
Update 3_depth_average.png
43f3555
@CindyvdVries
update test cases for complex situations
665f4e1
@CindyvdVries @wschoonveld
Dei 217 depth average test case (#115)
e8b62d7 
* add script to create simplified netcdf

* add acceptance test

* feat[DEI-217]: extend example with extra variation in data

* Update depth_average_rule.py

* update acceptance test

* Update test17_depth_average_rule.nc

---------

Co-authored-by: Wouter <wouter.schoonveld@deltares.nl>
@CindyvdVries
include coords
a423fe3
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 5, 2024

Quality Gate Passed Quality Gate passed

Issues
6 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@mKlapwijk mKlapwijk merged commit 7334cdb into main Jul 8, 2024
9 checks passed
@mKlapwijk mKlapwijk deleted the DEI-185-depth-average-rule branch July 8, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mKlapwijk mKlapwijk mKlapwijk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CindyvdVries @mKlapwijk @wschoonveld