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

feat(adapters): add user provided netcdf forcing #621

Closed
wants to merge 187 commits into from
Closed

feat(adapters): add user provided netcdf forcing #621

wants to merge 187 commits into from

Conversation

LuukBlom
Copy link
Contributor

@LuukBlom LuukBlom commented Jan 6, 2025

No description provided.

LuukBlom added 30 commits June 17, 2024 18:26
@LuukBlom
refactor: implement IHazardAdapter
11aa91c 
move sfincs specific code from hazard.py to SfincsAdapter.
implement IForcing + child classes
@LuukBlom
cleanup of sfincsadapter, make distinction between public and private…
0656943 
… functions clearer
@LuukBlom
rename private member variables to start with '_'
e9a587c
@LuukBlom
Implement timeseries class
bed4ac1
@LuukBlom
feat: work on timeseries class + tests
a019ede 
create interfaces for the adapters
create interface for mediator (the one im not sure of, but we need some kind of management class to handle the adapters)
create HazardOutput enum, needs more work/thought
@LuukBlom
Merge branch 'main' into refactor/hazard-adapter-and-events
3ab045e
@LuukBlom
implement minor review comments
c1346b9
@LuukBlom
Merge branch 'main' of https://github.com/Deltares-research/FloodAdapt …
f00d548 
…into refactor/hazard-adapter-and-events
@LuukBlom
first implementation of historical events
6c6a879
@LuukBlom
work on historical event & forcing implementation
08d1c6c
@LuukBlom
Merge branch 'main' into refactor/hazard-adapter-and-events
d6d275e
@LuukBlom
implement historical event class
d02387c
@LuukBlom
Merge branch 'main' into refactor/hazard-adapter-and-events
877c560
@LuukBlom
Separate interfaces and concrete implementations
0d06b2f 
implement eventfactory and forcingfactory
@LuukBlom
fix timeseries tests and fix unitfulvalue conversion factors
2793500
@LuukBlom
added tests for unitfulvalue
8304c8d
@LuukBlom
add waterlevel synthetic forcing test
776220b
@LuukBlom
change importing of the database to stop circular imports
07deed7
@LuukBlom
implement waterlevelFromModel + 1 test
eac06b6
@LuukBlom
waterlevel forcings completed
06acb05
@LuukBlom
reworked the calculation/adding of synthetic timeseries
ea9d0a9
@LuukBlom
add tests for forcings and forcing factory, implement hurricane
5e1c5a9
@LuukBlom
cleanup tests
0586d32
@LuukBlom
Implement discharge tests
90cea4d 
start on sfincsadapter tests
@LuukBlom
add tests for sfincsAdapter::add_discharge_forcing
38bf63c
@LuukBlom
Implement FloodMap class. Refactor scenario.run() to use the new Sfin…
29394df 
…csAdapter. Refactor directImpacts to use the Floodmap class.
@LuukBlom
add accidentally removed functions back in sfincsadapter
94a0134
@LuukBlom
revert Unittypesintensity _ to /
9a6b16e
@LuukBlom
add abstract class IDatabaseUser to stop circular imports wrt the Dat…
88dcfb4 
…abase and give all child classes a reference to the database without having to import it everywhere.
@LuukBlom
fix tests so the IDatabaseUser-Children are green again
54892eb
@LuukBlom LuukBlom requested a review from savente93 January 6, 2025 10:37
@LuukBlom LuukBlom changed the title feat(adapter): add user provided netcdf forcing feat(adapters): add user provided netcdf forcing Jan 6, 2025
savente93
savente93 reviewed Jan 6, 2025
View reviewed changes
Copy link
Contributor

@savente93 savente93 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple small comments, will be happy to approve once those are resolved

flood_adapt/adapter/sfincs_adapter.py Outdated Show resolved Hide resolved
flood_adapt/adapter/sfincs_adapter.py Outdated Show resolved Hide resolved
flood_adapt/adapter/sfincs_adapter.py Outdated Show resolved Hide resolved
flood_adapt/adapter/sfincs_adapter.py Show resolved Hide resolved
flood_adapt/object_model/hazard/forcing/netcdf.py Outdated Show resolved Hide resolved
flood_adapt/object_model/hazard/forcing/rainfall.py Show resolved Hide resolved
flood_adapt/object_model/hazard/forcing/wind.py Show resolved Hide resolved
@LuukBlom LuukBlom linked an issue Jan 7, 2025 that may be closed by this pull request
Support for user-specified netcdf files for event forcing #430
Open
savente93
savente93 previously approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@savente93 savente93 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good now :)

Base automatically changed from refactor/hazard-adapter-and-events to main January 8, 2025 13:52
@LuukBlom LuukBlom dismissed savente93’s stale review January 8, 2025 13:52

The base branch was changed.

@LuukBlom
Copy link
Contributor Author

LuukBlom commented Jan 8, 2025

did not feel like dealing with the merge conflicts.

cherry picked the relevant commits to: #626 and closing this

@LuukBlom LuukBlom closed this Jan 8, 2025
@savente93 savente93 deleted the feat/430-user-provided-netcdf-forcing branch January 9, 2025 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@savente93 savente93 savente93 left review comments

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

Successfully merging this pull request may close these issues.

Support for user-specified netcdf files for event forcing
3 participants
@LuukBlom @savente93 @panosatha