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.

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

Feature/dei 229 depth average select z or sigma from inputfile #121

Merged
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1c5e15b
add file for depth averaging with sigma layers
mKlapwijk Aug 1, 2024
bc77fee
working version for sigma layers. DOES not work for z
mKlapwijk Aug 1, 2024
dd98962
add test 18, correct paths for test 17
mKlapwijk Aug 2, 2024
782479c
rename test 17 reference file
mKlapwijk Aug 2, 2024
1e58076
flake problems
mKlapwijk Aug 2, 2024
1401087
more flake problems
mKlapwijk Aug 2, 2024
2dcd52a
and more flake8
mKlapwijk Aug 2, 2024
66886c2
adding print statements in an attempt to get both to work
mKlapwijk Aug 2, 2024
e1d0e44
Merge branch 'feature/DEI-229-depth-averaged-rules-sigma-models' into…
mKlapwijk Aug 2, 2024
831f072
Go for the much simpler approach. Let the user specify the layer type
mKlapwijk Aug 2, 2024
6f3005e
Update tests to specify layer type
mKlapwijk Aug 2, 2024
199c43d
add reference file for test 18
mKlapwijk Aug 2, 2024
5d285f7
add test for parser error
mKlapwijk Aug 2, 2024
56c1382
restore accidentally committed file
mKlapwijk Aug 2, 2024
f1659c7
line too long
mKlapwijk Aug 2, 2024
8c0e655
remove import
mKlapwijk Aug 2, 2024
a357e09
update documentation
mKlapwijk Aug 2, 2024
e36e15e
fix unit tests
mKlapwijk Aug 2, 2024
ca9f8f0
add layer type to depth average rule data
mKlapwijk Aug 5, 2024
c3c04b7
remove check layer function from depth average rule. Use layer type v…
mKlapwijk Aug 5, 2024
4b4fec8
fix unit tests
mKlapwijk Aug 5, 2024
c748e01
typo
mKlapwijk Aug 5, 2024
6371010
move functions out of class
mKlapwijk Aug 5, 2024
72240b2
add layer type to creation
mKlapwijk Aug 5, 2024
fb84852
remove import
mKlapwijk Aug 5, 2024
ac30794
remove unnecessary if's
mKlapwijk Aug 5, 2024
e01fe92
remove imports. move function out of class
mKlapwijk Aug 5, 2024
3e67a26
fix flake
mKlapwijk Aug 5, 2024
bde07c8
lsit -> List
mKlapwijk Aug 5, 2024
d5a47e3
final flake
mKlapwijk Aug 5, 2024
7b21ffb
fix the error when a variable name is remapped
mKlapwijk Aug 6, 2024
5ce35eb
add check on illegal suffixes in remapping
mKlapwijk Aug 6, 2024
537d0a5
fix test
mKlapwijk Aug 6, 2024
931dc71
remove unneeded imports
mKlapwijk Aug 6, 2024
2c877ab
disable pylint warning
mKlapwijk Aug 6, 2024
2116bfd
extend error message
mKlapwijk Aug 6, 2024
11fa65d
Merge branch 'main' into feature/DEI-229-depth-average-select-z-or-si…
mKlapwijk Aug 6, 2024
20ac68d
disable pylint warning
mKlapwijk Aug 6, 2024
2ff39d8
Revert "disable pylint warning"
mKlapwijk Aug 6, 2024
755967f
remove comment
mKlapwijk Aug 6, 2024
8b78847
add return of unknown suffix
mKlapwijk Aug 6, 2024
b1dad4f
disable pylint warnings
mKlapwijk Aug 6, 2024
be1f265
correct ignore message
mKlapwijk Aug 6, 2024
118fe49
Merge branch 'main' into feature/DEI-229-depth-average-select-z-or-si…
mKlapwijk Aug 7, 2024
bb947dc
update depth average rule documentation
mKlapwijk Aug 7, 2024
d4fc2ad
add note on remapping several variables
mKlapwijk Aug 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
extend error message
mKlapwijk committed Aug 6, 2024
commit 2116bfd1651e9dc47b7639569637ba5e923c8147
5 changes: 3 additions & 2 deletions decoimpact/business/entities/rules/depth_average_rule.py
Original file line number Diff line number Diff line change
@@ -151,5 +151,6 @@ def _get_layer_suffix(
return INTERFACES_SIGMA_SUFFIX
if layer_type.lower() == "z":
return INTERFACES_Z_SUFFIX
logger.log_error(f"Layer type {layer_type} unknown. Interface "
f"variable could not be determined.")
logger.log_error(f"Layer type {layer_type} unknown. Allowed layer "
"type: z or sigma. Interface "
"variable could not be determined.")