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.

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

Improvements in preprocessing #236

Merged
merged 11 commits into from
Jun 9, 2017
Merged

Improvements in preprocessing #236

merged 11 commits into from
Jun 9, 2017

Conversation

fmaussion
Copy link
Member

This PR implies several major improvements on several preprocessing steps. I'll make more detailed comments before merging, this is still a WIP.

@fmaussion fmaussion changed the title WIP: major improvements in preprocessing Improvements in preprocessing Jun 5, 2017
@fmaussion
Copy link
Member Author

fmaussion commented Jun 5, 2017

Here a non-comprehensive list of the changes involved:

  • the downstream lines and their integration with glacier divides is now completely different. (this is the major change of this PR). This was necessary to be able to cope with very complex divide geometries like ice caps. Now the downstream lines can go in all directions, in which case they meet their tributary outside of the domain (see plot below)
  • the parabolic bedshape computed from the real topography is now included to the model chain (finally). Again in the example below, one can see that the glacier width adapts to the surrounding topography
  • the initialize_flowline task now filters for small and negative slopes. This was introduced by Small slopes filtering now happens at the flowline determination #232 but is now used and tested by default
  • The inversion takes rectangular beds into account. this happens when the flowline grid point normals touch a: (i) a neighbor glacier (ii) a neighbor divide (iii) a neighbor flowline catchment
  • The init_present_time tasks now takes all this into account (this was the major bunch of work - quite boring but necessary). The default is now to produce a MixedFlowline in all cases, which is a mix of parabolic, rectangular and trapezoidal shapes.
  • Tidewater glaciers have rectangular beds at the tongue
  • The flowline model can now cope with tidewater glaciers and compute the calving flux (very basic)
  • The model flowlines are better tested. Their constructors and documentation are still quite bad though
  • I added some examples of random glacier evolution in the getting started notebook

I will do a little bit of cleaning a a few tests before merging.

test_chhota_shigri

@fmaussion fmaussion merged commit d0c0b62 into OGGM:master Jun 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant