OGGM / oggm / 1093

84%

push

travis-ci

Lateral drag / Shape factors (#429)

* Added option for shape factors to account for lateral drag in mass-conservation inversion.
Shape factors are used as given in Adhikari 2012.
A new cfg-param "use_shape_factor" is introduced.
Needs further tests and eventually adaption in forward model.

* Changed default value for param "use_shape_factor" from True to False.
Changed one comment/TODO in inversion routine.

* Implemented suggested changes from pull request.

* Fixed mistake where width instead of half-width was used for computation of Nye-shape factor.

* Fixed mistake where width instead of half-width was used for computation of Nye-shape factor.

Updated test to match change in shape factor calculation

* Added cfg-Param 'use_shape_factor_for_fluxbasedmodel' and introduced shape factor in FluxbasedModel.step

Currently, the shape factor methods of the inversion module are used for the calculation of shape factors.

* Added correction of NaN-shape factors in shape_factor_adhikari. Now the shape factors for sections with height = 0 are no longer np.nan but are set to 1. (so shape factor is actually not influencing this section)

* Changed shape factors from centered to staggered grid to match the variables used for calculation of velocity

* Changed formulation in comment of cfg

* Fixed bug for sf_func call in flowline, when sf_func was not set.

Introduced use_sf in flowline and inversion to shorten lines and avoid multiple calls to cfg.PARAMS[use_shape_...']

* Moved shape factor calculation to utils.

Using a proxy variable `use_sf` instead of `cfg.PARAMS['use_shape_...']`. This variable is set to None, if the acquired key is not found in PARAMS.

* Updated reference for shape_factor_adhikari in utils for testing

* Updated whats-new

* Fixed a bug with shape factors for tributaries. Added sf_stag to class. Moved shape factor function choice to init of class. Added tests with shape factors for inversion and... (continued)

74 of 74 new or added lines in 4 files covered. (100.0%)

5395 of 5919 relevant lines covered (91.15%)

4.63 hits per line