waves: Moved mean velocity specification back into the wave models

With the inclusion of boundary layer modelling in the gas, the
separation of wave perturbation from and mean flow became less useful,
and potentially prevents further extension to support similar boundary
layer modelling in the liquid.

The mean velocity entry, UMean, is now needed in the
constant/waveProperties file rather than in the waveVelocity boundary
condition.

tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig

@@ -15,11 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-UMean 1.668;
+#include        "$FOAM_CASE/constant/waveProperties";
 
 dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform (#neg $UMean 0 0);
+internalField   uniform ($UxMean 0 0);
 
 boundaryField
 {
@@ -29,14 +29,13 @@ boundaryField
     inlet
     {
         type            waveVelocity;
-        UMean           (#neg $UMean 0 0);
     }
 
     outlet
     {
         type            outletPhaseMeanVelocity;
         alpha           alpha.water;
-        UnMean          $UMean;
+        UnMean          #neg $UxMean;
         value           $internalField;
     }
 

tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/waveProperties

@@ -30,6 +30,10 @@ waves
     }
 );
 
+UxMean          -1.668;
+
+UMean           ($UxMean 0 0);
+
 scale           table ((4 1) (12 0));
 
 

tutorials/multiphase/interFoam/RAS/DTCHullWave/system/setWavesDict

@@ -14,14 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-U.orig
-{
-    #include "$FOAM_CASE/0/U.orig";
-}
-
 alpha   alpha.water;
 
-UMean   $U.orig.boundaryField.inlet.UMean;
-
 
 // ************************************************************************* //