OGGM / oggm / 1093 / 7
84%
master: 84%

DEFAULT BRANCH: master
Ran
Files 13
Run time 0s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
coverage: 67.174% (-0.6%) from 67.742%
OGGM_TEST_ENV=graphics MPL=--mpl

push

travis-ci

fmaussion 
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)

3976 of 5919 relevant lines covered (67.17%)

0.67 hits per line

Source Files on job 1093.7 (OGGM_TEST_ENV=graphics MPL=--mpl)