Water terminating

[jmalles]

My code for inverting and running water-/marine-terminating glaciers.

[pep8speaks]

Hello @jmalles! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

• In the file oggm/core/climate.py:

Line 1483:23: E261 at least two spaces before inline comment
Line 1484:57: E231 missing whitespace after ','
Line 1496:18: E127 continuation line over-indented for visual indent
Line 1500:30: E231 missing whitespace after ','
Line 1514:13: E125 continuation line with same indent as next logical line
Line 1515:51: E225 missing whitespace around operator
Line 1517:62: W291 trailing whitespace
Line 1525:64: E231 missing whitespace after ','
Line 1548:74: E231 missing whitespace after ','
Line 1552:79: E231 missing whitespace after ','
Line 1651:57: E231 missing whitespace after ','

• In the file oggm/core/flowline.py:

Line 209:1: W293 blank line contains whitespace
Line 245:41: W291 trailing whitespace
Line 246:1: W293 blank line contains whitespace
Line 695:53: E261 at least two spaces before inline comment
Line 707:38: E261 at least two spaces before inline comment
Line 708:40: E261 at least two spaces before inline comment
Line 824:41: W291 trailing whitespace
Line 825:1: W293 blank line contains whitespace
Line 1181:59: W291 trailing whitespace
Line 1182:1: W293 blank line contains whitespace
Line 1299:62: W291 trailing whitespace
Line 1310:62: W291 trailing whitespace
Line 1393:78: W291 trailing whitespace
Line 1402:74: W291 trailing whitespace
Line 1403:37: E127 continuation line over-indented for visual indent
Line 1403:57: W291 trailing whitespace
Line 1404:37: E127 continuation line over-indented for visual indent
Line 1436:70: W291 trailing whitespace
Line 1726:12: E111 indentation is not a multiple of four
Line 1836:37: E231 missing whitespace after ','
Line 1916:66: W291 trailing whitespace
Line 1918:1: W293 blank line contains whitespace
Line 1920:68: E502 the backslash is redundant between brackets
Line 1921:33: E128 continuation line under-indented for visual indent
Line 1925:71: E502 the backslash is redundant between brackets
Line 1928:69: E203 whitespace before ':'
Line 1928:69: E502 the backslash is redundant between brackets
Line 1932:71: E502 the backslash is redundant between brackets
Line 1944:41: E231 missing whitespace after ','
Line 1945:42: E127 continuation line over-indented for visual indent
Line 1952:49: E231 missing whitespace after ','
Line 1970:53: E231 missing whitespace after ','
Line 1970:71: E225 missing whitespace around operator
Line 1971:55: E127 continuation line over-indented for visual indent
Line 1978:76: E211 whitespace before '['
Line 1978:76: E502 the backslash is redundant between brackets
Line 1979:83: E502 the backslash is redundant between brackets
Line 1997:72: E261 at least two spaces before inline comment
Line 1997:100: E501 line too long (104 > 99 characters)
Line 2001:75: W291 trailing whitespace
Line 2020:31: E127 continuation line over-indented for visual indent
Line 2022:31: E127 continuation line over-indented for visual indent
Line 2022:41: E261 at least two spaces before inline comment
Line 2099:54: W291 trailing whitespace
Line 2105:57: E127 continuation line over-indented for visual indent
Line 2116:1: W293 blank line contains whitespace
Line 2126:50: E231 missing whitespace after ','
Line 2133:84: W291 trailing whitespace
Line 2134:52: E127 continuation line over-indented for visual indent
Line 2134:82: W291 trailing whitespace
Line 2138:67: W291 trailing whitespace
Line 2140:82: W291 trailing whitespace
Line 2144:70: W291 trailing whitespace
Line 2176:37: E231 missing whitespace after ','
Line 2178:28: E128 continuation line under-indented for visual indent
Line 2179:28: E128 continuation line under-indented for visual indent
Line 2180:70: E221 multiple spaces before operator
Line 2184:66: W291 trailing whitespace
Line 2209:45: E231 missing whitespace after ','
Line 2229:50: E127 continuation line over-indented for visual indent
Line 2235:23: E127 continuation line over-indented for visual indent
Line 2236:17: E115 expected an indented block (comment)
Line 2243:1: W293 blank line contains whitespace
Line 2253:22: E127 continuation line over-indented for visual indent
Line 2256:45: W291 trailing whitespace
Line 2257:33: E128 continuation line under-indented for visual indent
Line 2257:65: W291 trailing whitespace
Line 2262:62: W291 trailing whitespace
Line 2270:68: W291 trailing whitespace

• In the file oggm/core/inversion.py:

Line 190:35: E261 at least two spaces before inline comment
Line 415:60: W291 trailing whitespace
Line 486:36: E262 inline comment should start with '# '
Line 495:1: W293 blank line contains whitespace
Line 500:35: E225 missing whitespace around operator
Line 501:42: E231 missing whitespace after ','
Line 502:69: W291 trailing whitespace
Line 505:47: E231 missing whitespace after ','
Line 507:66: W291 trailing whitespace
Line 518:61: E231 missing whitespace after ','
Line 543:43: E127 continuation line over-indented for visual indent
Line 544:58: E261 at least two spaces before inline comment
Line 1155:1: W293 blank line contains whitespace
Line 1159:40: E261 at least two spaces before inline comment
Line 1216:67: W291 trailing whitespace
Line 1219:72: W291 trailing whitespace
Line 1226:53: E231 missing whitespace after ','
Line 1229:39: E231 missing whitespace after ','
Line 1292:1: W293 blank line contains whitespace
Line 1326:5: E722 do not use bare 'except'
Line 1342:69: W291 trailing whitespace
Line 1343:51: W291 trailing whitespace
Line 1344:69: W291 trailing whitespace
Line 1347:69: W291 trailing whitespace
Line 1378:1: W293 blank line contains whitespace
Line 1389:69: W291 trailing whitespace
Line 1397:18: E128 continuation line under-indented for visual indent
Line 1397:36: E231 missing whitespace after ','
Line 1457:40: E261 at least two spaces before inline comment
Line 1465:49: E231 missing whitespace after ','
Line 1465:63: E231 missing whitespace after ','
Line 1466:9: E265 block comment should start with '# '
Line 1505:53: E231 missing whitespace after ','
Line 1508:39: E231 missing whitespace after ','
Line 1555:1: W293 blank line contains whitespace
Line 1571:1: W293 blank line contains whitespace
Line 1605:5: E722 do not use bare 'except'
Line 1635:18: E128 continuation line under-indented for visual indent
Line 1635:36: E231 missing whitespace after ','

Comment last updated at 2022-08-14 13:23:21 UTC

[fmaussion]

Thanks @jmalles ! This looks like a great piece of work. I'll have a look next week.

[fmaussion]

OK so I had a quick look at all the changes - in my view this looks great, but of course there is still some work before merge ;-)

I think that something that would be very useful as a first step is to make sure that all the tests unrelated to calving pass. The calving tests will need to be adapted for sure, also including inversion.

Do you think you can manage to do that @jmalles ? If you need help, it's worth discussing if this could become a team effort with @anoukvlug as this is quite an important improvement to OGGM.

[anoukvlug]

I would be happy to contribute. So if there is anything I can help with, just send me a message :)

[jmalles]

I will definitely try, but am not quite sure yet when I will be able to finish that, since I will be in North America until end of June. I will get in contact with @anoukvlug soon though!

[fmaussion]

@jmalles is this the version of the code which was used for the paper? Is it worth that I and @pat-schmitt have a look at it over the christmas break or did you want to change things?

[jmalles]

Yes, I think this should be the version used for the paper and I was not planning to change things at the moment. Though I think the geodetic calibration function with using Will's data needs some more work, as it is kind of hardcoded right now... Other than that, I hope it is in a shape that is worth having a look at.

[fmaussion]

@jmalles I changed my mind with respect to what I said on Slack: please keep this PR unchanged and open two new, fresh PRs. Lets start with one only adding the parameterisation (not the calibration). It should be possible to add the parameterization and test it without the rest. Please remove bits of code which have become obsolete (e.g. the diagnostic variables you did not use) because we can retriev them later from this PR. Please add some inline comments where it might be necessary.

If we work together on smaller bits we can get there!

[fmaussion]

Leaving this open for documentation for a while - but fixing this will require a full set of new code to deal with the specifics of v1.6