Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

ENH: Contour-based meshing with shapefiles #338

Merged
merged 2 commits into from
Oct 14, 2024
Merged

ENH: Contour-based meshing with shapefiles #338

merged 2 commits into from
Oct 14, 2024

Conversation

inoelloc
Copy link
Contributor

@inoelloc inoelloc commented Oct 8, 2024

  • It is now possible to use catchment contour to constrain the allocation of the catchment outlet instead of the catchment area only. The contours are pass from a shapefile with at least a code field
  • Add geopandas as a new dependency to work with shapefiles

@inoelloc
ENH: Contour-based meshing with shapefiles
0f1ce8d 
- It is now possible to use catchment contour to constrain the allocation of the catchment outlet
instead of the catchment area only. The contours are pass from a shapefile with at least a `code` field
- Add geopandas as a new dependency to work with shapefiles
@inoelloc inoelloc added the enhancement New feature or request label Oct 8, 2024
@inoelloc inoelloc added this to the Release v1.1.0 milestone Oct 8, 2024
@inoelloc inoelloc requested review from pag13 and nghi-truyen October 8, 2024 14:31
@inoelloc inoelloc linked an issue Oct 8, 2024 that may be closed by this pull request
ENH: Add shapefile constraints to mesh generation #182
Closed
@inoelloc
Copy link
Contributor Author

@pag13, je te laisse jeter un oeil avant de merge

pag13
pag13 approved these changes Oct 13, 2024
View reviewed changes
Copy link
Collaborator

@pag13 pag13 left a comment

Choose a reason for hiding this comment

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

Très bien d'avoir ajouté cette fonctionnalité ; quelques commentaires a minima pourraient éventuellement être ajoutés pour une compréhension plus rapide des routines - pas obligatoire du tout.
Merci,
PAG

smash/factory/mesh/_tools.py Show resolved Hide resolved
smash/factory/mesh/mesh.py Show resolved Hide resolved
smash/factory/mesh/mesh.py Show resolved Hide resolved
smash/factory/mesh/mw_mesh.f90 Show resolved Hide resolved
smash/factory/mesh/mw_mesh.f90 Show resolved Hide resolved
@pag13
Copy link
Collaborator

pag13 commented Oct 13, 2024

NB. Ok pour la dépendance supplémentaire à Geopandas, ça parait raisonnable ;)

@inoelloc inoelloc merged commit 99e8730 into DassHydro:main Oct 14, 2024
22 checks passed
@inoelloc inoelloc deleted the enh-mesh-shp branch October 14, 2024 08:43
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@nghi-truyen nghi-truyen nghi-truyen approved these changes

@pag13 pag13 pag13 approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
Release v1.1.0
Development

Successfully merging this pull request may close these issues.

ENH: Add shapefile constraints to mesh generation
3 participants
@inoelloc @pag13 @nghi-truyen