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

Poc/dei 229 select z or sigma from inputfile #120

Closed
wants to merge 45 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
190768c
first attempt to obtain interface name from dataset
mKlapwijk Jul 29, 2024
4e51623
formatting
mKlapwijk Jul 30, 2024
8f8de49
remove print statement
mKlapwijk Jul 30, 2024
229ed76
cleanup
mKlapwijk Jul 30, 2024
3cab83f
add setter for input variable names
mKlapwijk Jul 30, 2024
511ebaf
add dummy variable to rule input vars
mKlapwijk Jul 30, 2024
96de5bd
remove unneeded import
mKlapwijk Jul 30, 2024
e27b6b1
Update decoimpact/business/entities/rules/rule_base.py
mKlapwijk Jul 31, 2024
7e081e7
remove unneeded import
mKlapwijk Jul 31, 2024
2ddb58e
restructure and move instances of when dummy variable name is prepended
mKlapwijk Jul 31, 2024
24d4b1c
rewrite function with list comprehension
mKlapwijk Jul 31, 2024
efa8bd6
remove printstatements
mKlapwijk Jul 31, 2024
c768b71
remove imports
mKlapwijk Aug 1, 2024
83422f4
working solution for depths from Cindy
mKlapwijk Aug 1, 2024
48e93d8
move into a function
mKlapwijk Aug 1, 2024
d81e6fe
cleanup and refactor method
mKlapwijk Aug 1, 2024
d0d64ef
remove redundant return
mKlapwijk Aug 1, 2024
a387bcd
fix unit test for get dummy var and dependent vars
mKlapwijk Aug 1, 2024
e166816
flake8 corrections
mKlapwijk Aug 1, 2024
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
8e9cc1f
make 2 functions, one for dummy and one for dependent var
mKlapwijk Aug 2, 2024
89b2ee4
Update decoimpact/business/entities/rules/rule_base.py
mKlapwijk Aug 2, 2024
2e4b602
minor review comments
mKlapwijk Aug 2, 2024
f659632
fix dummy unit test
mKlapwijk Aug 2, 2024
0138a05
Merge branch 'feature/DEI-229-depth-averaged-rules-sigma-models' of h…
mKlapwijk Aug 2, 2024
dc54348
fix depth average
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
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
move into a function
mKlapwijk committed Aug 1, 2024
commit 48e93d89c0f235ad64310a531368e96d7a33a1b5
10 changes: 9 additions & 1 deletion decoimpact/business/entities/rules/depth_average_rule.py
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ def execute(
# just used the first value.
variables = next(iter(value_arrays.values()))

depths_interfaces = [value_arrays[name] for name in value_arrays if INTERFACES_Z_SUFFIX in name][0]
depths_interfaces = self.extract_variable_based_on_suffix(value_arrays, INTERFACES_Z_SUFFIX)


dummy_var = "mesh2d"
@@ -112,3 +112,11 @@ def execute(
return relative_values.sum(dim=dim_layer_name) / layer_heights.sum(
dim=dim_layer_name
)

def extract_variable_based_on_suffix(
self,
value_arrays: Dict[str, _xr.DataArray],
suffix: str
):
variable = [value_arrays[name] for name in value_arrays if suffix in name][0]
return variable