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

Hypsometry attrs for RGI7 #1590

Merged
merged 30 commits into from
Aug 14, 2023
Merged

Hypsometry attrs for RGI7 #1590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0a019f9
Hypsometry attrs for RGI7
fmaussion May 26, 2023
5ba5ea6
Fix test and do not round area
fmaussion May 26, 2023
8222f2b
Did not delete properly
fmaussion May 26, 2023
4453656
No need to return
fmaussion May 26, 2023
92c7e10
add rgi id to index
fmaussion May 26, 2023
4217682
More robust even
fmaussion May 26, 2023
ff6a1eb
And more
fmaussion May 26, 2023
b356fee
aaaaa
fmaussion May 26, 2023
aaffc20
this is annoying
fmaussion May 27, 2023
a8af8ca
More meaningful changes - need to rethink part of rgitopo
fmaussion May 27, 2023
19409ee
Try to revert
fmaussion May 27, 2023
3ae120c
Try to buffer instead
fmaussion May 27, 2023
87b0012
Dont change a winning team
fmaussion May 27, 2023
665a747
correct parse of name
fmaussion May 30, 2023
3c8dd15
silence some warnings
fmaussion May 30, 2023
5c6de7c
fix?
fmaussion May 30, 2023
23b648e
Add more of these robusts tasks
fmaussion May 30, 2023
71f4f62
small change
fmaussion May 30, 2023
7501b4e
more more
fmaussion May 31, 2023
94a4611
term loc with more than one minimum
fmaussion Jun 4, 2023
27e750b
add tasks
fmaussion Jun 4, 2023
5dfa83c
avoid overwrite
fmaussion Jun 4, 2023
3297c6f
add dx
fmaussion Jun 4, 2023
c6b0513
update source
fmaussion Jun 10, 2023
e8ec148
Allow for dem_source to be picked from RGI
fmaussion Jun 12, 2023
e73afe8
do not clip to zero
fmaussion Jun 12, 2023
5fc7ab6
Files better organized
fmaussion Jun 12, 2023
669318c
Add option to simpliify centerlines after corner cutting
fmaussion Jul 24, 2023
e61d7f6
Merge branch 'master' into dev
fmaussion Jul 24, 2023
3a85315
Polishing
fmaussion Jul 31, 2023
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
Fix test and do not round area
  • Loading branch information
@fmaussion
fmaussion committed May 26, 2023
commit 5ba5ea6a85e13d0a659bf7ead5f64487deef5e24
4 changes: 3 additions & 1 deletion oggm/tests/test_shop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ def test_from_dem(self, class_case_dir, monkeypatch):
'emen.de/~oggm/test_gdirs/dem'
's_v1/default/')

gd = rgitopo.init_glacier_directories_from_rgitopo(['RGI60-09.01004'])
gd = rgitopo.init_glacier_directories_from_rgitopo(['RGI60-09.01004'],
dem_source='COPDEM')
gd = gd[0]

assert gd.has_file('dem')
Expand All @@ -237,6 +238,7 @@ def test_qc(self, class_case_dir, monkeypatch):
's_v1/default/')

gd = rgitopo.init_glacier_directories_from_rgitopo(['RGI60-09.01004'],
dem_source='COPDEM',
keep_dem_folders=True)
out = rgitopo.dem_quality_check(gd[0])
assert len(out) > 5
Expand Down
2 changes: 1 addition & 1 deletion oggm/utils/_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2935,7 +2935,7 @@ def rgi_area_km2(self):
except KeyError:
# RGI V7
_area = self.read_shapefile('outlines')['area_km2']
return np.round(float(_area.iloc[0]), decimals=3)
return float(_area.iloc[0])

@lazy_property
def intersects_ids(self):
Expand Down