diff --git a/data/ninjafoam/2.2.0/0/nut b/data/ninjafoam/2.2.0/0/nut
index bba776083..11a0ff93d 100644
--- a/data/ninjafoam/2.2.0/0/nut
+++ b/data/ninjafoam/2.2.0/0/nut
@@ -44,7 +44,7 @@ boundaryField
     minZ
     {
         type            nutkAtmRoughWallFunction;
-        z0              $z0$;
+        z0              uniform $z0$;
         value           uniform 0.1;    
     }
     maxZ
diff --git a/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.C b/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.C
index ed75d6ec8..0651a74ba 100644
--- a/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.C
+++ b/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.C
@@ -46,6 +46,7 @@ logProfileDissipationRateInletFvPatchScalarField::logProfileDissipationRateInlet
 :
     fixedValueFvPatchScalarField(p, iF),
     UfreeStream_(0.0),
+    uDirection_(0.0,0.0,0.0),
     inputWindHeight_Veg_(0),
     z0_(0),
     Rd_(0),
@@ -64,6 +65,7 @@ logProfileDissipationRateInletFvPatchScalarField::logProfileDissipationRateInlet
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     UfreeStream_(ptf.UfreeStream_),
+    uDirection_(ptf.uDirection_),
     inputWindHeight_Veg_(ptf.inputWindHeight_Veg_),
     z0_(ptf.z0_),
     Rd_(ptf.Rd_),
@@ -81,6 +83,7 @@ logProfileDissipationRateInletFvPatchScalarField::logProfileDissipationRateInlet
 :
     fixedValueFvPatchScalarField(p, iF),
     UfreeStream_(readScalar(dict.lookup("UfreeStream"))),
+    uDirection_(dict.lookup("uDirection")),
     inputWindHeight_Veg_(readScalar(dict.lookup("inputWindHeight_Veg"))),
     z0_(readScalar(dict.lookup("z0"))),
     Rd_(readScalar(dict.lookup("Rd"))),
@@ -174,6 +177,7 @@ logProfileDissipationRateInletFvPatchScalarField::logProfileDissipationRateInlet
 :
     fixedValueFvPatchScalarField(fcvpvf, iF),
     UfreeStream_(fcvpvf.UfreeStream_),
+    uDirection_(fcvpvf.uDirection_),
     inputWindHeight_Veg_(fcvpvf.inputWindHeight_Veg_),
     z0_(fcvpvf.z0_),
     Rd_(fcvpvf.Rd_),
@@ -210,6 +214,8 @@ void logProfileDissipationRateInletFvPatchScalarField::write(Ostream& os) const
     fvPatchScalarField::write(os);
     os.writeKeyword("UfreeStream")
         << UfreeStream_ << token::END_STATEMENT << nl;
+    os.writeKeyword("uDirection")
+        << uDirection_ << token::END_STATEMENT << nl;
     os.writeKeyword("inputWindHeight_Veg")
         << inputWindHeight_Veg_ << token::END_STATEMENT << nl;
     os.writeKeyword("z0")
diff --git a/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.H b/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.H
index 4bf0afe80..45ec75317 100644
--- a/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.H
+++ b/src/ninjafoam/2.2.0/inletBC/logProfileDissipationRateInlet/logProfileDissipationRateInletFvPatchScalarField.H
@@ -59,6 +59,7 @@ class logProfileDissipationRateInletFvPatchScalarField
         scalar maxValue_;	 //Scalar Vmax
 
 	scalar UfreeStream_; 	// Free Stream Velocity
+	vector uDirection_;
 	scalar inputWindHeight_Veg_; // Input wind Height on top of Vegetation
 	scalar z0_;    // Roughness Parameters
 	scalar Rd_; //Zero plane displacement height
diff --git a/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.C b/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.C
index bfec687c0..5dd97e913 100644
--- a/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.C
+++ b/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.C
@@ -46,6 +46,7 @@ logProfileTurbulentKineticEnergyInletFvPatchScalarField::logProfileTurbulentKine
 :
     fixedValueFvPatchScalarField(p, iF),
     UfreeStream_(0.0),
+    uDirection_(0.0,0.0,0.0),
     inputWindHeight_Veg_(0),
     z0_(0),
     Rd_(0),
@@ -64,6 +65,7 @@ logProfileTurbulentKineticEnergyInletFvPatchScalarField::logProfileTurbulentKine
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     UfreeStream_(ptf.UfreeStream_),
+    uDirection_(ptf.uDirection_),
     inputWindHeight_Veg_(ptf.inputWindHeight_Veg_),
     z0_(ptf.z0_),
     Rd_(ptf.Rd_),
@@ -81,6 +83,7 @@ logProfileTurbulentKineticEnergyInletFvPatchScalarField::logProfileTurbulentKine
 :
     fixedValueFvPatchScalarField(p, iF),
     UfreeStream_(readScalar(dict.lookup("UfreeStream"))),
+    uDirection_(dict.lookup("uDirection")),
     inputWindHeight_Veg_(readScalar(dict.lookup("inputWindHeight_Veg"))),
     z0_(readScalar(dict.lookup("z0"))),
     Rd_(readScalar(dict.lookup("Rd"))),
@@ -173,6 +176,7 @@ logProfileTurbulentKineticEnergyInletFvPatchScalarField::logProfileTurbulentKine
 :
     fixedValueFvPatchScalarField(fcvpvf, iF),
     UfreeStream_(fcvpvf.UfreeStream_),
+    uDirection_(fcvpvf.uDirection_),
     inputWindHeight_Veg_(fcvpvf.inputWindHeight_Veg_),
     z0_(fcvpvf.z0_),
     Rd_(fcvpvf.Rd_),
@@ -214,6 +218,8 @@ void logProfileTurbulentKineticEnergyInletFvPatchScalarField::write(Ostream& os)
     fvPatchScalarField::write(os);
     os.writeKeyword("UfreeStream")
         << UfreeStream_ << token::END_STATEMENT << nl;
+    os.writeKeyword("uDirection")
+        << uDirection_ << token::END_STATEMENT << nl;
     os.writeKeyword("inputWindHeight_Veg")
         << inputWindHeight_Veg_ << token::END_STATEMENT << nl;
     os.writeKeyword("z0")
diff --git a/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.H b/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.H
index 61fca3902..dd939d895 100644
--- a/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.H
+++ b/src/ninjafoam/2.2.0/inletBC/logProfileTurbulentKineticEnergyInlet/logProfileTurbulentKineticEnergyInletFvPatchScalarField.H
@@ -59,6 +59,7 @@ class logProfileTurbulentKineticEnergyInletFvPatchScalarField
         scalar maxValue_;	 //Scalar Vmax
 
         scalar UfreeStream_; 	// Free Stream Velocity
+        vector uDirection_;
         scalar inputWindHeight_Veg_; // Input wind Height on top of Vegetation
         scalar z0_;    // Roughness Parameters
         scalar Rd_; //Zero plane displacement height