From bb2ae5c90d2aeb7af2f53eef52adefc5b6c95595 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 Jun 2020 17:01:27 +0200
Subject: [PATCH] GIT: remove merge/rebase artifacts

---
 .../derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index dca3c7b8d0..0826e3ef91 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -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)),