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

Refactor rawdem #224

Merged
merged 39 commits into from
Jan 4, 2024
Merged

Refactor rawdem #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
cfc58a6
minor reformating docs and adding TODO on potential bug
jennan Dec 3, 2023
0937db5
fix issue with logging messages and missing placeholders
jennan Dec 3, 2023
76c9ef8
make save_dem also handle reloading and adding mask as options
jennan Dec 3, 2023
9a95d4b
remove one level of indentation to ensure coarse DEM is save everytime
jennan Dec 3, 2023
e1e9def
move saving to temporary from RawDem to RawLidarDemGenerator
jennan Dec 3, 2023
6a9b7e3
move the coarse DEM loop in RawLidarDemGenerator
jennan Dec 3, 2023
fbb27ba
remove the need to have a temp_folder parameter in RawDem
jennan Dec 3, 2023
1eef6ec
replace cached DEM file instead of removing and changing cached file …
jennan Dec 3, 2023
026a4c8
make logging messages a bit shorter to shorten a bit the function
jennan Dec 3, 2023
c46ac60
make chunk_size and buffer_cells instance parameters instead of method's
jennan Dec 3, 2023
522a01d
move coarse DEM checks in RawLidarDemGenerator
jennan Dec 3, 2023
e3b37bb
use safer removal of cached files instead of renaming
jennan Dec 3, 2023
81d8f53
consistent name no_values_mask everywhere + minor fix around it
jennan Dec 3, 2023
c83ab8e
reorder clipping operations in add_lidar and simplify mask
jennan Dec 3, 2023
474a277
try to replace rio.clip with masking
jennan Dec 3, 2023
55afbaf
try to ensure dem.z is computed first in the Dask graph
jennan Dec 3, 2023
fb54fee
simplify clip masking
jennan Dec 7, 2023
865c54f
add back chunking for clipping
jennan Dec 7, 2023
ad9f43e
try to not transfer the whole array when creating chunked mask
jennan Dec 11, 2023
49ba3b5
compute no_values_mask when needed, do not save it with dem
jennan Dec 11, 2023
0178fee
make add_coarse_dem clipping look more like add_lidar clipping
jennan Dec 11, 2023
b25f684
add variable to make code slightly more compact
jennan Dec 11, 2023
6ac16b2
replace rio.clip(..., drop=True) with clip_box and masking
jennan Dec 12, 2023
b4564da
increase timeout setting to avoid timeout in scheduler/worker connect…
jennan Dec 12, 2023
915abc3
fix issues found by flake8 (formating and wrong variable name)
jennan Dec 17, 2023
e823daa
fix wrong call to save_dem (thank you CI tests :-))
jennan Dec 17, 2023
3ea39f2
fix chunking the mask
jennan Dec 18, 2023
f361fef
add an assertion to crash if CRS is missing before saving DEM
jennan Dec 21, 2023
bf940fc
fix assertion formating
jennan Dec 21, 2023
7a6b7a0
Comment and re-add try/catch
rosepearson Dec 28, 2023
9c25d32
Adujust clip logic so that NaN not set to zero, and instead left to b…
rosepearson Dec 28, 2023
9e7dfe0
Updated benchmark for test with numerical changes deemed acceptable
rosepearson Dec 28, 2023
d66b82a
Update version
rosepearson Dec 28, 2023
a0dc431
Add back in accidentially deleted files in an overzealous cleanup
rosepearson Dec 29, 2023
d44de51
Merge pull request #228 from rosepearson/227-ensure-passing-tests-for…
jennan Jan 3, 2024
85b0bae
inverse logic in masking coarse dem to avoid change of behavior wrt. …
jennan Jan 3, 2024
de1fbbc
Merge branch 'main' into refactor_rawdem
rosepearson Jan 4, 2024
9e4e1e8
fixup: Format Python code with Black
invalid-email-address Jan 4, 2024
bd32c4e
update version
rosepearson Jan 4, 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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "geofabrics"
version = "1.1.5"
version = "1.1.6"
description = "A package for creating geofabrics for flood modelling."
readme = "README.md"
authors = [{ name = "Rose pearson", email = "rose.pearson@niwa.co.nz" }]
Expand Down
Loading
Loading