Skip to content

Resolve "[frictionlaws] Roughnessheight calculation in friction laws"

Make adding artificial water depth in friction laws optional:


  • adapt limitRoughH in frictionlaw.hh for zero roughnessHeight
  • make roughnessHeight optional parameter (default = 0.0) for Manning
  • make roughnessHeight optional parameter (default = 0.0) for Nikuradse
  • Improve documentation in friction laws

Add some tests

  • Add test Nikuradse

Notes for the reviewer

I added a new rough channel example with limited Nikuradse friction law to ensure that the changes will work. All previous tests and examples produce the same results since the water depth was always large enough or no friction law was applied.

Should these changes are mentioned somewhere?

Before you request a review from someone, make sure to revise the following points:

  • does the new code follow the style guide?
  • do the test pipelines pass? (see guide on how to run pipelines for a merge request)
  • is the code you changed and/or the new code you wrote covered in the test suite? (if not, extend the existing tests or write new ones)
  • does your change affect public interfaces or behavior, or, does it introduce a new feature? If so, document the change in
  • is the list of the header includes complete? ("include what you use")
  • all files have to end with a \n character. Make sure there is no \ No newline at end of file comment in "Changes" of this MR.

Closes #1216 (closed)

Edited by Timo Koch

Merge request reports