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

Update upstream #6

Merged
merged 61 commits into from
Mar 27, 2021
Merged

Update upstream #6

merged 61 commits into from
Mar 27, 2021

Conversation

rhugonnet
Copy link
Owner

No description provided.

erikmannerfelt and others added 30 commits March 10, 2021 12:29
@erikmannerfelt
Added hypsometry binning function
5e23674
@erikmannerfelt
Added bin size (in georeferenced units or percent) as an argument and…
786b385 
… added documentation
@erikmannerfelt
Added NMAD calculation. Updated documentation. Added masked array che…
5853875 
…ck to handle nans appropriately
@erikmannerfelt
Added hypsometric bin interpolation and updated tests
115fdf6
@erikmannerfelt
Improved documentation, masked_array compatibility, and added test fo…
b7ee471 
…r masked_arrays
@erikmannerfelt
Changed the hypsometry aggregation functions to be any callable; now …
80d9bae 
…it only gives one per default
@erikmannerfelt
Added representative hypsometry area function.
efd4e21
@erikmannerfelt
Removed duplicated test
9bd3317
@erikmannerfelt
Added timeframe argument to calculate_hypsometry_area()
c98858e
@erikmannerfelt
Created tDEM and dDEM objects
7bc96fb
@erikmannerfelt
Changed default tDEM behaviour to take DEM classes instead of Raster
4538bee
@erikmannerfelt
Added support for .datetime reading for tDEM instantiation
df80f81
@erikmannerfelt
Added warning for a dH series from dDEMs that contains NaNs
4a72060
@erikmannerfelt
Added dDEM interpolation functionality
65b6982
@erikmannerfelt
Merge branch 'main' into local_hypsometric
02754e1
@erikmannerfelt
Changed from scipy.interpolate to rasterio.fill for linear interpolation
1c4ada6
@erikmannerfelt
Merge branch 'main' into ddem_class
bd7e16f
@erikmannerfelt
Merge branch 'main' of https://github.com/GlacioHack/xdem into local_…
5ba2410 
…hypsometric
@erikmannerfelt
Merge branch 'local_hypsometric' of github.com:erikmannerfelt/xdem in…
ecdfdea 
…to local_hypsometric
@erikmannerfelt
Revised binning kind arguments. Added 'equal area' binning and 'custo…
3b33d4b 
…m' bin options
@erikmannerfelt
Changed binning kind 'equal_count' to 'fixed_count'
14a4217
@erikmannerfelt
Removed temporary warning suppression
60a466f
@erikmannerfelt
Changed hypsometric method names
5646dca
@erikmannerfelt
Create CONTRIBUTING.md
d5a3f7e
@erikmannerfelt
Changed binning and area behaviour to use only the reference DEM as t…
4f1339e 
…he surface
@erikmannerfelt
Update CONTRIBUTING.md
15b77bf 
Modified relevant parts from rasterio's contribution section.
@rhugonnet
change input name + fix tests and copy
ef78331
@erikmannerfelt
Update CONTRIBUTING.md
a390749 
Fixed conda environment name typo
@rhugonnet
Merge pull request #57 from rhugonnet/input_name
fd41804 
Update Class input name + fix tests and copy signature
@erikmannerfelt
Added temporally changing (glacier) outline support. Added volume cha…
58cebf8 
…nge calculations. Added 2010 glacier outlines to example data.
erikmannerfelt and others added 29 commits March 19, 2021 13:46
@erikmannerfelt
Renamed tDEM to DEMCollection
51e1e64
@erikmannerfelt
Moved DEMCollection and dDEM to xdem/dem.py
4f6bd0e
@erikmannerfelt
Merge branch 'main' of https://github.com/GlacioHack/xdem into ddem_c…
16adfc8 
…lass
@erikmannerfelt
Merge pull request #36 from erikmannerfelt/local_hypsometric
a5c7960 
Local hypsometric interpolation
@erikmannerfelt
Added barebones documentation
7c91a16
@erikmannerfelt
Added dev-requirements.txt (to compile documentation with ReadTheDocs)
da702ca
@erikmannerfelt
Removed Makefile modification and added apidoc running in conf.py
f1da3c2
@erikmannerfelt
Changed things that might make ReadTheDocs happy
a2dd8f5
@erikmannerfelt
Changed things that might make ReadTheDocs happy 2
ddf9f16
@erikmannerfelt
Changed things that might make ReadTheDocs happy 3
fa5b31b
@erikmannerfelt
Changed things that might make ReadTheDocs happy 4
94c1391
@erikmannerfelt
Changed things that might make ReadTheDocs happy 5
09d00eb
@erikmannerfelt
Changed things that might make ReadTheDocs happy 6
4ebebf4
@erikmannerfelt
Updated dev-requirements.txt and changed syntax to work with python=3.7
7a87150
@erikmannerfelt
Possibly fixed relative paths and removed accidentally committed files
7ba4ac4
@erikmannerfelt
Merge branch 'main' into ddem_class
c0eefc8
@erikmannerfelt
Added lots of documentation text
5354bab
@erikmannerfelt
Merge pull request #63 from erikmannerfelt/documentation
18aaea4 
Added documentation
@erikmannerfelt
Added query filtering for DEMCollection outlines
0154255
@erikmannerfelt
Merge branch 'main' of https://github.com/GlacioHack/xdem into ddem_c…
f819c19 
…lass
@erikmannerfelt
Fixed invalid query syntax in documentation
c4fab8f
@erikmannerfelt
Fixed issue with incorrect signs and copy issue
930d4a1
@erikmannerfelt
Forgot to switch reference to first on DEM subtraction
9d358f4
@erikmannerfelt
Update README.md
bddcbab
@erikmannerfelt
Update README.md
a62805f
@erikmannerfelt
Moved dDEM and DEMCollection to separate modules
17d2e6f
@erikmannerfelt
Merge branch 'main' of https://github.com/GlacioHack/xdem into ddem_c…
d71707c 
…lass
@erikmannerfelt
Reverted DEM module and tests after dDEM and DEMCollection move
125bf99
@erikmannerfelt
Merge pull request #42 from erikmannerfelt/ddem_class
ec4ad3f 
DEMCollection and dDEM classes
@rhugonnet rhugonnet merged commit f7f6108 into rhugonnet:main Mar 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rhugonnet @erikmannerfelt