Skip to content

Change flowline signature for inspirations #1913

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

Open
fmaussion wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change flowline signature for inspirations #1913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions oggm/core/flowline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class Flowline(Centerline):

def __init__(self, line=None, dx=1, map_dx=None,
surface_h=None, bed_h=None, rgi_id=None,
water_level=None, gdir=None):
water_level=None, gdir=None, grid=None):
""" Initialize a Flowline

Parameters
Expand All @@ -71,6 +71,10 @@ def __init__(self, line=None, dx=1, map_dx=None,
The glacier's RGI identifier
water_level : float
The water level (to compute volume below sea-level)
gdir : GlacierDirectory
Deprecated
grid : salem.Grid
The Grid in which the flowlines are defined
"""

# This is do add flexibility for testing
Expand All @@ -79,6 +83,9 @@ def __init__(self, line=None, dx=1, map_dx=None,
if line is None:
coords = np.arange(len(surface_h)) * dx
line = shpg.LineString(np.vstack([coords, coords * 0.]).T)
if gdir is not None:
grid = gdir.grid
# Some deprec warning here

super(Flowline, self).__init__(line, dx, surface_h)

Expand All @@ -91,8 +98,8 @@ def __init__(self, line=None, dx=1, map_dx=None,
self._point_lons = None
self._point_lats = None
self.map_trafo = None
if gdir is not None:
self.map_trafo = partial(gdir.grid.ij_to_crs, crs=salem.wgs84)
if grid is not None:
self.map_trafo = partial(grid.ij_to_crs, crs=salem.wgs84)
# volume not yet removed from the flowline
self.calving_bucket_m3 = 0

Expand Down