Commit bb2ae5c9 authored by Mark Olesen's avatar Mark Olesen
Browse files

GIT: remove merge/rebase artifacts

parent f6bd56dd
......@@ -74,8 +74,6 @@ atmBoundaryLayer::atmBoundaryLayer
patch_(pp),
flowDir_(TimeFunction1<vector>(time, "flowDir", dict)),
zDir_(TimeFunction1<vector>(time, "zDir", dict)),
kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
Cmu_(dict.getOrDefault<scalar>("Cmu", 0.09)),
Uref_(TimeFunction1<scalar>(time, "Uref", dict)),
Zref_(TimeFunction1<scalar>(time, "Zref", dict)),
z0_(PatchFunction1<scalar>::New(pp, "z0", dict)),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment