From 95e9467e849b2afc0a9dacf4ed5fbd184ac2acbe Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 16 Nov 2016 14:02:14 +0000
Subject: [PATCH 01/18] INT: Integration of functionality produced by The
 Environmental Hydraulics Institute "IHCantabria"
 (http://www.ihcantabria.com/en/)

Capabilities include:
- Wave generation
  - Solitary wave using Boussinesq theory
  - Cnoidal wave theory
  - StokesI, StokesII, StokesV wave theory

- Active wave absorption at the inflow/outflow boundaries based on
  shallow water theory

Authors:
- Javier Lopez Lara (jav.lopez@unican.es)
- Gabriel Barajas (barajasg@unican.es)
- Inigo Losada (losadai@unican.es)
---
 integration/genAbs/allMake                    |  33 +
 .../calculatedLevelRegular.H                  |  88 ++
 .../calculatedLevelRegularNormal.H            |  76 ++
 .../calculatedLevelSolitary.H                 |  30 +
 .../common/checks/checkInputErrorsRegular.H   | 159 +++
 .../common/checks/checkInputErrorsSolitary.H  |  41 +
 integration/genAbs/common/memberFun.H         | 355 +++++++
 integration/genAbs/common/waveFun.C           | 980 ++++++++++++++++++
 integration/genAbs/common/waveFun.H           |  95 ++
 ...sorption_InletVelocityFvPatchVectorField.C | 339 ++++++
 ...sorption_InletVelocityFvPatchVectorField.H | 199 ++++
 integration/genAbs/waveAbsorption/Make/files  |   3 +
 .../genAbs/waveAbsorption/Make/options        |   7 +
 integration/genAbs/waveAbsorption/localMake   |  25 +
 .../IH_Waves_InletAlphaFvPatchScalarField.C   | 460 ++++++++
 .../IH_Waves_InletAlphaFvPatchScalarField.H   | 226 ++++
 ...IH_Waves_InletVelocityFvPatchVectorField.C | 495 +++++++++
 ...IH_Waves_InletVelocityFvPatchVectorField.H | 238 +++++
 .../velProfiles/profileBoussinesq.H           | 170 +++
 .../velProfiles/profileCnoidal.H              | 184 ++++
 .../velProfiles/profileGENAB.H                |  20 +
 .../velProfiles/profileStokesI.H              | 187 ++++
 .../velProfiles/profileStokesII.H             | 186 ++++
 .../velProfiles/profileStokesV.H              | 186 ++++
 .../velProfiles/velocityProfile.H             |  36 +
 integration/genAbs/waveGeneration/Make/files  |   5 +
 .../genAbs/waveGeneration/Make/options        |  16 +
 integration/genAbs/waveGeneration/localMake   |  25 +
 28 files changed, 4864 insertions(+)
 create mode 100755 integration/genAbs/allMake
 create mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
 create mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
 create mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
 create mode 100644 integration/genAbs/common/checks/checkInputErrorsRegular.H
 create mode 100644 integration/genAbs/common/checks/checkInputErrorsSolitary.H
 create mode 100644 integration/genAbs/common/memberFun.H
 create mode 100644 integration/genAbs/common/waveFun.C
 create mode 100644 integration/genAbs/common/waveFun.H
 create mode 100644 integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
 create mode 100644 integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
 create mode 100644 integration/genAbs/waveAbsorption/Make/files
 create mode 100644 integration/genAbs/waveAbsorption/Make/options
 create mode 100755 integration/genAbs/waveAbsorption/localMake
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
 create mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
 create mode 100644 integration/genAbs/waveGeneration/Make/files
 create mode 100644 integration/genAbs/waveGeneration/Make/options
 create mode 100755 integration/genAbs/waveGeneration/localMake

diff --git a/integration/genAbs/allMake b/integration/genAbs/allMake
new file mode 100755
index 0000000000..defec71d8c
--- /dev/null
+++ b/integration/genAbs/allMake
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [ $WM_PROJECT == "foam" ]; then
+    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
+else
+    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
+fi
+
+#IHC_dbg
+echo $ofversion
+#----
+
+export OF_VERSION=$ofversion
+
+wclean all > /dev/null
+
+wmake libso waveGeneration
+
+if (( $? )) ; then 
+    echo "\n\nWave generation boundary conditions (V2.0-ESI) compilation failed"
+    exit; else
+    echo -e "\n\nIH Wave generationV2.0 boundary conditions (V2.0-ESI) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
+fi
+
+wmake libso waveAbsorption
+
+if (( $? )) ; then 
+    echo "\n\nWave absorption boundary conditions (V2.0-ESI) compilation failed"
+    exit; else
+    echo -e "\n\nIH Wave absorption boundary conditions (V2.0-ESI) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
+fi
+
+wclean all > /dev/null
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
new file mode 100644
index 0000000000..3c4f92b7b9
--- /dev/null
+++ b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if ( waveTheory_ == "StokesI" )
+    {
+        forAll(calculatedLevel, itS1)
+        {
+            calculatedLevel[itS1] = RealwaterDepth_ 
+		+ timeMult * StokesIFun :: eta 
+		(
+    		    waveHeight_, 
+	            waveKx, 
+	            xGroup[itS1], 
+                    waveKy, 
+                    yGroup[itS1], 
+                    waveOmega, 
+                    currTime, 
+                    wavePhase_
+                );
+        }
+    }
+    else if ( waveTheory_ == "StokesII" )
+    {
+        forAll(calculatedLevel, itS2)
+        {
+            calculatedLevel[itS2] = RealwaterDepth_ 
+	        + timeMult * StokesIIFun :: eta 
+		(
+                    waveHeight_, 
+                    RealwaterDepth_,  
+                    waveKx, 
+                    xGroup[itS2], 
+                    waveKy, 
+                    yGroup[itS2], 
+                    waveOmega, 
+                    currTime, 
+                    wavePhase_
+                );
+        }
+    }
+    else  if ( waveTheory_ == "StokesV" )
+    {
+        forAll(calculatedLevel, it1)
+        {
+            calculatedLevel[it1] = RealwaterDepth_ 
+	        + timeMult * stokesVFun :: eta 
+		(
+                    RealwaterDepth_,  
+		    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+                    xGroup[it1], 
+                    yGroup[it1], 
+                    currTime, 
+                    wavePhase_
+                );
+        }
+    }
+    else if ( waveTheory_ == "Cnoidal" )
+    {
+        forAll(calculatedLevel, it3)
+        {
+            calculatedLevel[it3] = RealwaterDepth_ 
+	        + timeMult * cnoidalFun :: eta 
+	        (
+		    waveHeight_, 
+                    mCnoidal_, 
+                    waveKx, 
+                    waveKy, 
+                    wavePeriod_, 
+                    xGroup[it3], 
+                    yGroup[it3], 
+                    currTime
+                );
+        }
+    }
+    else 
+    {
+        FatalError << "Wave theory not supported, use:\n" 
+	    << "StokesI, StokesII, StokesV, Cnoidal, SolitaryBoussinesq" 
+	    << exit(FatalError);
+    }
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
new file mode 100644
index 0000000000..09fa19c5ed
--- /dev/null
+++ b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if ( waveTheory_ == "StokesI" )
+    {
+            calculatedLevel = RealwaterDepth_ 
+	        + timeMult * StokesIFun :: eta 
+		(
+		    waveHeight_, 
+                    waveKx, 
+                    xGroup[1],  
+                    waveKy, 
+                    yGroup[1],  
+                    waveOmega, 
+                    currTime, 
+                    wavePhase_
+                );
+    }
+    else if ( waveTheory_ == "StokesII" )
+    {
+            calculatedLevel = RealwaterDepth_ 
+	        + timeMult * StokesIIFun :: eta 
+	        (
+                    waveHeight_, 
+                    RealwaterDepth_,  
+                    waveKx, 
+                    xGroup[1],  
+                    waveKy, 
+                    yGroup[1],  
+                    waveOmega, 
+                    currTime, 
+                    wavePhase_
+                );
+    }
+    else  if ( waveTheory_ == "StokesV" )
+    {
+            calculatedLevel = RealwaterDepth_ 
+	        + timeMult * stokesVFun :: eta 
+		(
+                    RealwaterDepth_,  
+		    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+                    xGroup[1], 
+                    yGroup[1], 
+                    currTime, 
+                    wavePhase_
+                );
+    }
+    else if ( waveTheory_ == "Cnoidal" )
+    {
+            calculatedLevel = RealwaterDepth_ 
+	        + timeMult * cnoidalFun :: eta 
+	        (
+		    waveHeight_, 
+                    mCnoidal_, 
+                    waveKx, 
+                    waveKy, 
+                    wavePeriod_, 
+                    xGroup[1], 
+                    yGroup[1], 
+                    currTime
+                );
+    }
+    else 
+    {
+        FatalError << "Wave theory not supported, use:\n" 
+	    << "StokesI, StokesII, StokesV, Cnoidal, SolitaryBoussinesq." 
+	    << exit(FatalError);
+    }
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
new file mode 100644
index 0000000000..10ee599eb0
--- /dev/null
+++ b/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/ 
+
+   if ( waveTheory_ == "Boussinesq" )
+   {
+       forAll(calculatedLevel, it2)
+       {
+           calculatedLevel[it2] = RealwaterDepth_
+               + BoussinesqFun :: eta
+               (
+                   waveHeight_, 
+                   RealwaterDepth_,  
+                   xGroup[it2], 
+                   yGroup[it2], 
+                   waveAngle, 
+                   currTime, 
+                   X0
+               );
+        }
+   }
+   else 
+   {
+        FatalError << "Wave theory not supported, use:\n" 
+	    << "Boussinesq" << exit(FatalError);
+   }
diff --git a/integration/genAbs/common/checks/checkInputErrorsRegular.H b/integration/genAbs/common/checks/checkInputErrorsRegular.H
new file mode 100644
index 0000000000..293ad83116
--- /dev/null
+++ b/integration/genAbs/common/checks/checkInputErrorsRegular.H
@@ -0,0 +1,159 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+if (nPaddles_ < 1)
+{
+    FatalError << "Check nPaddles value." << exit(FatalError);
+}
+
+if ( nPaddles_ > 1 )
+{
+    nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
+    reduce(nPaddles_, minOp<label>());
+}
+
+if ( waveHeight_ < 0.0 )
+{
+    FatalError << "Check wave height value." << exit(FatalError);
+}
+
+if ( waveTheory_ == "aaa" ) 
+{
+    FatalError << "Wave theory not specified." << exit(FatalError);
+}
+else if ( waveTheory_ == "StokesI" || waveTheory_ == "StokesII" )
+{
+    if ( wavePeriod_ <= 0.0 )
+    {
+        FatalError << "Check wave period value." << exit(FatalError);
+    }
+
+    if ( waveLength_ <= 0.0 )
+    {
+        word generation = "a";
+
+        waveLength_ = StokesIFun::waveLength (RealwaterDepth_, wavePeriod_);
+
+        waveK = 2.0*PI()/waveLength_;
+
+        if ( waveK*RealwaterDepth_ > PI() )
+        {
+            generation = "Deep";
+        }
+        else if ( waveK*RealwaterDepth_ < PI()/10.0 )
+        {
+            generation = "Shallow";
+        }
+        else
+        {
+            generation = "Intermediate";
+        }
+
+        Info << "\nIH Wave Generation BC" << endl;
+        Info << "	Wave theory: " << waveTheory_ << endl;
+        Info << "	H: " << waveHeight_ << endl;
+        Info << "	T: " << wavePeriod_ << endl;
+        Info << "	h: " << RealwaterDepth_ << endl;
+        Info << "	waveLength: " << waveLength_ << endl;
+        Info << "	Direction: " << waveDir_ << "º" << endl;
+        Info << "	Generation in: " << generation << " waters." << endl;
+        Info << "	Relative depth (kh): " << waveK*RealwaterDepth_ 
+	     << "\n\n" << endl;
+    }
+}
+else if ( waveTheory_ == "StokesV" )
+{
+    if ( wavePeriod_ <= 0.0 )
+    {
+        FatalError << "Check wave period value." << exit(FatalError);
+    }
+
+    if ( lambdaStokesV_ <= 0.0 )
+    {
+        word generation = "a";
+
+        scalar f1;
+        scalar f2;
+
+        stokesVFun :: StokesVNR ( waveHeight_, 
+            RealwaterDepth_,  
+            wavePeriod_, 
+            &waveK, 
+            &lambdaStokesV_, 
+            &f1, 
+            &f2 
+            );
+
+        Info << "f1 residual " << f1 << endl;
+        Info << "f2 residual " << f2 << endl;
+
+        if ( f1 > 0.001 || f2 > 0.001 )
+        {
+	    FatalError << "No convergence for Stokes V wave theory.\n" 
+	        << exit(FatalError);
+        }
+
+        waveLength_ = 2.0*PI()/waveK;
+
+        if ( waveK*RealwaterDepth_ > PI() )
+        {
+            generation = "Deep";
+        }
+        else if ( waveK*RealwaterDepth_ < PI()/10.0 )
+        {
+            generation = "Shallow";
+        }
+        else
+        {
+            generation = "Intermediate";
+        }
+
+        Info << "\nIH Wave Generation BC" << endl;
+        Info << "	Wave theory: " << waveTheory_ << endl;
+        Info << "	H: " << waveHeight_ << endl;
+        Info << "	T: " << wavePeriod_ << endl;
+        Info << "	h: " << RealwaterDepth_ << endl;
+        Info << "	L: " << waveLength_ << endl;
+        Info << "	Lambda: " << lambdaStokesV_ << endl;
+        Info << "	Direction: " << waveDir_ << "º"  << endl;
+        Info << "	Generation in: " << generation << " waters." << endl;
+        Info << "	Relative depth (kh): " << waveK*RealwaterDepth_ 
+	     << "\n\n" << endl;
+    }
+}
+else if ( waveTheory_ == "Cnoidal" )
+{
+    if ( wavePeriod_ <= 0.0 )
+    {
+        FatalError << "Check wave period value." << exit(FatalError);
+    }
+
+    if ( mCnoidal_ <= 0.0 )
+    {
+        cnoidalFun :: calculations ( waveHeight_, 
+            RealwaterDepth_,  
+            wavePeriod_, 
+            &mCnoidal_, 
+            &waveLength_);
+
+        Info << "\nIH Wave Generation BC" << endl;
+        Info << "	Wave theory: " << waveTheory_ << endl;
+        Info << "	H: " << waveHeight_ << endl;
+        Info << "	T: " << wavePeriod_ << endl;
+        Info << "	h: " << RealwaterDepth_ << endl;
+        Info << "	L: " << waveLength_ << endl;
+        Info << "	m parameter: " << mCnoidal_ << endl;
+        Info << "	Direction: " << waveDir_ << "º" <<  "\n\n" << endl;
+    }
+}
+else
+{
+    FatalError << "Wave theory not supported, use:\n" 
+        << "StokesI, StokesII, StokesV, Cnoidal." << exit(FatalError);
+}
+
diff --git a/integration/genAbs/common/checks/checkInputErrorsSolitary.H b/integration/genAbs/common/checks/checkInputErrorsSolitary.H
new file mode 100644
index 0000000000..62061b6beb
--- /dev/null
+++ b/integration/genAbs/common/checks/checkInputErrorsSolitary.H
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (nPaddles_ < 1)
+    {
+        FatalError << "Check nPaddles value." << exit(FatalError);
+    }
+
+    if ( nPaddles_ > 1 )
+    {
+        nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
+        reduce(nPaddles_, minOp<label>());
+    }
+
+    if ( waveHeight_ < 0.0 )
+    {
+        FatalError << "Check wave height value." << exit(FatalError);
+    }
+
+    if ( waveTheory_ == "aaa" )
+    {
+        FatalError << "Wave theory not specified." << exit(FatalError);
+    }
+    else if ( waveTheory_ == "Boussinesq" )
+    {
+        Info << "\nIH Wave Generation BC" << endl;
+        Info << "Wave theory: " << waveTheory_ << endl;
+        Info << "H: " << waveHeight_ << endl;
+        Info << "h: " << RealwaterDepth_ << endl;
+        Info << "Direction: " << waveDir_ << "º" <<  "\n\n" << endl;
+    }
+    else
+    {
+        FatalError << "Wave theory not supported, use:\n" 
+	    << "Boussinesq" << exit(FatalError);
+    }
diff --git a/integration/genAbs/common/memberFun.H b/integration/genAbs/common/memberFun.H
new file mode 100644
index 0000000000..34486ba692
--- /dev/null
+++ b/integration/genAbs/common/memberFun.H
@@ -0,0 +1,355 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    //- Return Pi
+    scalar PI()
+    {
+        #if OFVERSION >= 200
+            const scalar PI = constant::mathematical::pi;
+        #else
+            const scalar PI = mathematicalConstant::pi;
+        #endif
+        return PI;
+    }
+
+    //- Return alphaName
+    word alphaName()
+    {
+        #if OFVERSION >= 230
+            const word an = "alpha.water";
+        #else
+            const word an = "alpha1";
+        #endif
+        return an;
+    }
+
+    //- Return prevalent direction - X or Y to sort groups of columns
+    scalarField patchDirection ( vector span, scalar* dMin, scalar* dSpan )
+    {
+        const pointField& points = patch().patch().localPoints();
+        if (span[0] >= span[1]) 
+        {
+            *dMin = gMin(points.component(0));
+            *dSpan = gMax(points.component(0)) - *dMin;
+            return patch().Cf().component(0); 
+        }
+        else
+        {
+            *dMin = gMin(points.component(1));
+            *dSpan = gMax(points.component(1)) - *dMin;
+            return patch().Cf().component(1);
+        }
+    }
+
+    //- Return Zmax and Zmin of the patch faces
+    void faceBoundsZ(scalarField* zSup, scalarField* zInf)
+    {
+        const label nF = patch().faceCells().size();
+        scalarField zMax = Foam::scalarField(nF, -9999.0);
+        scalarField zMin = Foam::scalarField(nF, 9999.0);
+            
+        const faceList& faces = this->patch().patch().localFaces();
+        const List<vector>& points = this->patch().patch().localPoints();
+
+        forAll( faces, faceI )
+        {
+            const face& f = faces[faceI];
+            forAll(f, point)
+            {
+                scalar auxiliar = points[f[point]].component(2);
+
+                zMax[faceI] = max(zMax[faceI], auxiliar);
+                zMin[faceI] = min(zMin[faceI], auxiliar);
+            }
+        }
+
+        *zSup = zMax;
+        *zInf = zMin;
+    }
+
+    //- Calculate water levels on each paddle (same zSpan)
+    scalarList calcWL 
+        ( 
+	    scalarField alphaCell, 
+	    labelList cellGroup, 
+	    scalar zSpan 
+	)
+    {
+        scalarList groupTotalArea (nPaddles_,0.0); 
+        scalarList groupWaterArea (nPaddles_,0.0); 
+        scalarList heights (nPaddles_,0.0);
+
+        const scalarField faceSurface = patch().magSf();
+
+        forAll( patch().faceCells(), index ) 
+        {
+            groupTotalArea[cellGroup[index]-1] 
+	        += faceSurface[index];
+            groupWaterArea[cellGroup[index]-1] 
+	        += faceSurface[index]*alphaCell[index];
+        } 
+
+        for (label i=0; i<=gMax(cellGroup)-1; i++)
+        {
+            reduce(groupTotalArea[i], sumOp<scalar>());
+            reduce(groupWaterArea[i], sumOp<scalar>());
+            heights[i] = groupWaterArea[i]/groupTotalArea[i]*zSpan;
+        }
+
+        return heights;
+    }
+
+    //- Calculate mean velocities on each paddle
+    void calcUV 
+        ( 
+	    scalarField alphaCell, 
+	    labelList cellGroup, 
+	    scalarField UxCell, 
+            scalarList* Ux, 
+	    scalarField UyCell, 
+	    scalarList* Uy 
+	)
+    {
+       scalarList groupWaterArea (nPaddles_,0.0);
+       scalarList groupUx (nPaddles_,0.0);
+       scalarList groupUy (nPaddles_,0.0);
+
+       const scalarField faceSurface = patch().magSf();
+
+       forAll( patch().faceCells(), index ) 
+       {
+           groupWaterArea[cellGroup[index]-1] += 
+               faceSurface[index]*alphaCell[index];
+
+           groupUx[cellGroup[index]-1] += 
+               UxCell[index]*alphaCell[index]*faceSurface[index];
+           groupUy[cellGroup[index]-1] += 
+               UyCell[index]*alphaCell[index]*faceSurface[index];
+       } 
+
+       for (label i=0; i<=nPaddles_-1; i++)
+       {
+           reduce(groupWaterArea[i], sumOp<scalar>());
+            reduce(groupUx[i], sumOp<scalar>());
+            reduce(groupUy[i], sumOp<scalar>());
+
+            groupUx[i] = groupUx[i]/groupWaterArea[i];
+            groupUy[i] = groupUy[i]/groupWaterArea[i];
+        }
+
+        *Ux = groupUx;
+        *Uy = groupUy;
+    }
+
+    //- Mean of a scalarList
+    scalar meanSL ( scalarList lst )
+    {
+        scalar aux = 0.0;
+            
+        forAll(lst,i)
+        {
+            aux += lst[i];
+        }
+            
+        return aux/scalar(lst.size());
+    }
+
+    //- Reduce number of paddles if too high (paddles without cells)
+    label decreaseNPaddles 
+        ( 
+	    label np, 
+	    scalarField patchD, 
+	    scalar dMin, 
+	    scalar dSpan 
+	)
+    {
+        scalarList dBreakPoints(np+1, 0.0); 
+
+        while(1)
+        {
+            scalarList usedGroup (np,0.0); 
+
+            for (label i=0; i<=np; i++)
+            {
+                dBreakPoints[i] = dMin + dSpan/(np)*i; 
+            }
+
+            forAll(patch().faceCells(), patchCells) 
+            {
+                for (label j=0; j<=np; j++) 
+                {
+                    if ( (patchD[patchCells]>=dBreakPoints[j]) && 
+                        (patchD[patchCells]<dBreakPoints[j+1]) )
+                    {
+                        usedGroup[j] = 1.0;
+                        continue;
+                    }
+                }      
+            }
+
+            reduce(usedGroup, maxOp<scalarList>());
+
+            if ( gMin(usedGroup) < 0.5 )
+            {
+                Info
+                    << "Reduced nPaddles from " << np
+                    << " to " << np-1 << endl;
+                np -= 1;
+            }
+            else
+            {
+                break;
+            }
+        }
+        return np;
+    }
+
+    //- Own convenient definition of atan
+    scalar arcTan ( scalar x, scalar y )
+    {
+        scalar A = 0.0;
+
+        if( x > 0.0 )
+        {
+            A = atan(y/x);
+        }
+        else if ( y >= 0.0 && x < 0.0 )
+        {
+            A = PI() + atan(y/x);
+        }
+        else if ( y < 0.0 && x < 0.0 )
+        {
+            A = -PI() + atan(y/x);
+        }
+        else if ( y > 0.0 && x == 0.0 )
+        {
+            A = PI()/2.0;
+        }        
+        else if ( y < 0.0 && x == 0.0 )
+        {
+            A = -PI()/2.0;
+        }
+        else if ( y == 0.0 && x == 0.0 )
+        {
+            A = 0;
+        }
+
+        return A;
+    }
+
+    //- Calculate mean horizontal angle for each paddle
+    scalarList meanPatchDirs ( labelList cellGroup )
+    {
+        const vectorField nVecCell = patch().nf();
+
+        scalarList numAngles (nPaddles_, 0.0);
+        scalarList meanAngle (nPaddles_, 0.0);
+
+        forAll(patch().faceCells(), patchCells) 
+        {
+            meanAngle[cellGroup[patchCells]-1]
+                += arcTan( nVecCell[patchCells].component(0), 
+                nVecCell[patchCells].component(1));
+            numAngles[cellGroup[patchCells]-1] += 1.0;
+        }
+
+        for (label i=0; i<=nPaddles_-1; i++)
+        {
+            reduce(meanAngle[i], sumOp<scalar>());
+            reduce(numAngles[i], sumOp<scalar>());
+            meanAngle[i] = meanAngle[i]/numAngles[i] + PI();
+        }
+        return meanAngle;
+    }
+
+    //- Calculate z-bounds for each paddle
+    scalarList zSpanList 
+        ( 
+	    labelList cellGroup, 
+	    scalarField zInf, 
+	    scalarField zSup 
+	)
+    {
+        scalarList zMaxL (nPaddles_, -9999.0);
+        scalarList zMinL (nPaddles_,  9999.0);
+
+        forAll(patch().faceCells(), patchCells) 
+        {
+            zMaxL[cellGroup[patchCells]-1] = 
+	        max(zMaxL[cellGroup[patchCells]-1], zSup[patchCells] );
+            zMinL[cellGroup[patchCells]-1] = 
+                min(zMinL[cellGroup[patchCells]-1], zInf[patchCells] );
+        }
+
+        for (label i=0; i<=nPaddles_-1; i++)
+        {
+            reduce(zMaxL[i], maxOp<scalar>());
+            reduce(zMinL[i], minOp<scalar>());
+        }
+        return zMaxL-zMinL;
+    }
+
+    //- In-line print for scalarLists
+    label inlinePrint ( std::string name, scalarList SL )
+    {
+        Info << name << " " << SL.size() << "( ";
+        forAll(SL, i)
+        {
+            Info << SL[i] << " ";
+        }
+        Info << ")\n" << endl;
+        return 0;
+    }
+
+    //- Simple linear interpolation
+    scalar interpolation 
+        (
+	    scalar x1, 
+	    scalar x2, 
+            scalar y1, 
+            scalar y2, 
+            scalar xInt 
+        )
+    {
+        scalar yInt = y1 + (y2-y1)/(x2-x1)*(xInt-x1);
+        return yInt;
+    }
+
+    //- Limit angle between -pi/2 and pi/2
+    scalar limAngle (scalar ang)
+    {
+        ang = abs(ang);
+
+        while (ang >= 2.0*PI())
+        {
+            ang -= 2.0*PI();
+        }
+
+        if ( ang >= PI()/2.0 && ang <= 3.0*PI()/2.0 )
+        {
+            return PI()/2.0;
+        }
+        else
+        {
+            return ang;
+        }
+    }
+
+    //- Interpolation BO style
+    scalar interpolatte 
+        ( 
+            scalar x1, 
+            scalar x2, 
+            scalar y1, 
+            scalar y2, 
+            scalar xInt 
+        )
+    {
+        scalar yInt = (y1 + y2)*0.5;
+        return yInt;
+    }
diff --git a/integration/genAbs/common/waveFun.C b/integration/genAbs/common/waveFun.C
new file mode 100644
index 0000000000..23be07e0a7
--- /dev/null
+++ b/integration/genAbs/common/waveFun.C
@@ -0,0 +1,980 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#include "waveFun.H"
+#include <math.h>
+#include <stdlib.h> 
+#include <stdio.h>
+
+namespace otherFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define grav 9.81
+
+    double interpolation (double x1, double x2, double y1, double y2, double xInt)
+    {
+
+        double yInt = y1 + (y2-y1)/(x2-x1)*(xInt-x1);
+
+        return yInt;
+    }
+}
+
+namespace StokesIFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define G 9.81
+
+    double waveLength (double h, double T)
+    {
+        double L0 = G*T*T/(2.0*PII);
+        double L = L0;
+
+        for(int i=1; i<=100; i++)
+        {
+            L = L0*tanh(2.0*PII*h/L);
+        }
+
+        return L;
+    }
+    
+    double eta (double H, double Kx, double x, double Ky, double y, double omega, double t, double phase)
+    {
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+        
+        double sup = H*0.5*cos(faseTot);
+        
+        return sup;
+    }
+
+    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
+    {
+        double k = sqrt(Kx*Kx + Ky*Ky);
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+
+        double velocity = H*0.5*omega*cos(faseTot)*cosh(k*z)/sinh(k*h);
+
+        return velocity;
+    }
+    
+    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
+    {
+        double k = sqrt(Kx*Kx + Ky*Ky);
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+
+        double velocity = H*0.5*omega*sin(faseTot)*sinh(k*z)/sinh(k*h);
+
+        return velocity;
+    }   
+}
+
+namespace StokesIIFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define G 9.81 
+    
+    double eta (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase)
+    {
+        double k = sqrt(Kx*Kx + Ky*Ky);
+        double sigma = tanh(k*h);
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+        
+        double sup = H*0.5*cos(faseTot) + k*H*H/4.0*(3.0-sigma*sigma)/(4.0*pow(sigma,3))*cos(2.0*faseTot);
+        
+        return sup;
+    }
+    
+    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
+    {
+        double k = sqrt(Kx*Kx + Ky*Ky);
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+
+        double velocity = H*0.5*omega*cos(faseTot)*cosh(k*z)/sinh(k*h) + 3.0/4.0*H*H/4.0*omega*k*cosh(2.0*k*z)/pow(sinh(k*h),4)*cos(2.0*faseTot);
+
+        return velocity;
+    }
+    
+    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
+    {
+        double k = sqrt(Kx*Kx + Ky*Ky);
+        double faseTot = Kx*x + Ky*y - omega*t + phase;
+
+        double velocity = H*0.5*omega*sin(faseTot)*sinh(k*z)/sinh(k*h) + 3.0/4.0*H*H/4.0*omega*k*sinh(2.0*k*z)/pow(sinh(k*h),4)*sin(2.0*faseTot);
+
+        return velocity;
+    }      
+}
+
+namespace Elliptic
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define ITER 25
+
+    void ellipticIntegralsKE (double m, double* K, double* E)
+    {
+        long double a,aOld,g,gOld,aux,sum;
+
+        if ( m == 0.0 ) 
+        {
+            *K = PII/2.;
+            *E = PII/2.;
+            return;
+        }
+
+        a = 1.0L;
+        g = sqrt(1.0L - m);
+        aux = 1.0L;
+        sum = 2.0L - m;
+
+        while (1) 
+        {
+            gOld = g;
+            aOld = a;
+            a = 0.5L * (gOld + aOld);
+            g = gOld * aOld;
+            aux += aux;
+            sum -= aux * (a * a - g);
+
+            if ( fabs(aOld - gOld) <= (aOld * 1.e-22) )
+            { 
+                break;
+            }
+
+            g = sqrt(g);
+        }
+
+        *K = (double) (PII/2. / a);
+        *E = (double) (PII/4. / a * sum);
+        return;
+    }
+
+    double JacobiAmp (double u, double m)
+    {
+        long double a[ITER+1], g[ITER+1], c[ITER+1];
+        long double aux, amp;
+        int n;
+
+        m = fabsl(m);
+
+        if ( m == 0.0 ) 
+        {
+            return u;
+        }
+        
+        if ( m == 1. ) 
+        {
+            return 2. * atan( exp(u) ) - PII/2.;
+        }
+
+        a[0] = 1.0L;
+        g[0] = sqrtl(1.0L - m);
+        c[0] = sqrtl(m);
+
+        aux = 1.0L;
+
+        for (n = 0; n < ITER; n++) 
+        {
+            if ( fabsl(a[n] - g[n]) < (a[n] * 1.e-22) ) 
+            {
+                break;
+            }
+
+            aux += aux;
+            a[n+1] = 0.5L * (a[n] + g[n]);
+            g[n+1] = sqrtl(a[n] * g[n]);
+            c[n+1] = 0.5L * (a[n] - g[n]);
+        }
+
+        amp = aux * a[n] * u;
+
+        for (; n > 0; n--) 
+        {
+            amp = 0.5L * ( amp + asinl( c[n] * sinl(amp) / a[n]) );
+        }
+
+        return (double) amp; 
+    }
+
+    void JacobiSnCnDn (double u, double m, double* Sn, double* Cn, double* Dn)
+    {
+        double amp = Elliptic::JacobiAmp( u, m );
+
+        *Sn = sin( amp );
+        *Cn = cos( amp );
+        *Dn = sqrt(1.0 - m * sin( amp ) * sin( amp ));
+        return;
+    }
+
+}
+
+namespace cnoidalFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define G 9.81
+
+    double eta (double H, double m, double kx, double ky, double T, double x, double y, double t)
+    {
+        double K, E;
+        Elliptic::ellipticIntegralsKE(m, &K, &E);
+
+        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
+
+        double sn, cn, dn;
+        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
+
+        double etaCnoidal = H*((1.0-E/K)/m - 1.0 + pow(cn,2));
+
+        return etaCnoidal;
+    }
+
+    double etaCnoidal1D (double H, double m, double t, double T)
+    {
+        double K, E;
+        Elliptic::ellipticIntegralsKE(m, &K, &E);
+
+        double uCnoidal = -2.0*K*(t/T);
+
+        double sn, cn, dn;
+        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
+
+        double etaCnoidal = H*((1.0-E/K)/m - 1.0 + pow(cn,2));
+
+        return etaCnoidal;
+    }
+
+    double etaMeanSq (double H, double m, double T)
+    {
+        double eta = 0;
+        double etaSumSq = 0;
+
+        for(int i=0; i<1000; i++)
+        {
+            eta = etaCnoidal1D(H, m, i*T/(1000.0), T);
+            etaSumSq += eta*eta;
+        }
+
+        etaSumSq /= 1000.0;
+        return etaSumSq;
+    }
+
+    double d1EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
+    {
+        double dudx = 0;
+        dudx = 2.0*K/L;
+
+        double sn, cn, dn;
+        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
+
+	double deriv = -2.0*H*cn*dn*sn*dudx;
+
+        return deriv;
+    }
+
+    double d2EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
+    {
+        double dudxx = 0;
+        dudxx = 4.0*K*K/L/L;
+
+        double sn, cn, dn;
+        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
+
+        double deriv = 2.0*H*(dn*dn*sn*sn - cn*cn*dn*dn + m*cn*cn*sn*sn)*dudxx;
+
+        return deriv;
+    }
+
+    double d3EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
+    {
+        double dudxxx = 0;
+        dudxxx = 8.0*K*K*K/L/L/L;
+
+        double sn, cn, dn;
+        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
+
+        double deriv = 8.0*H*( cn*sn*dn*dn*dn*(-4.0 -2.0*m) + 4.0*m*cn*sn*sn*sn*dn -2.0*m*cn*cn*cn*sn*dn )*dudxxx;
+
+        return deriv;
+    }
+
+    int calculations (double H, double d, double T, double* mOut, double* LOut)
+    {
+        double mTolerance = 0.0001;
+        double mElliptic = 0.5;
+        double LElliptic = 0;
+        double phaseSpeed = 0;
+
+        double mError = 0.0;
+        double mMinError = 999;
+
+        while (mElliptic < 1.0)
+        {
+            double KElliptic, EElliptic;
+            Elliptic::ellipticIntegralsKE(mElliptic, &KElliptic, &EElliptic);
+
+            LElliptic = KElliptic*sqrt(16.0*pow(d,3)*mElliptic/(3.0*H));        
+
+            phaseSpeed = sqrt(G*d)*(1.0 - H/d/2.0 + H/d/mElliptic*(1.0-3.0/2.0*EElliptic/KElliptic));
+
+            mError = fabs(T-LElliptic/phaseSpeed);
+
+            if (mError <= mMinError)
+            {
+                *mOut = mElliptic;
+                *LOut = LElliptic;
+                mMinError = mError;
+            }
+
+            mElliptic += mTolerance;
+        }
+
+        return 0;
+    }
+
+    double U (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z)
+    {
+        double K, E;
+        Elliptic::ellipticIntegralsKE(m, &K, &E);
+
+        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
+        double k = sqrt(kx*kx + ky*ky);
+        double L = 2.0*PII/k;
+        double c = L/T;
+
+        double etaCN = eta(H, m, kx, ky, T, x, y, t);
+        double etaXX = d2EtaDx(H, m, uCnoidal, L, K, E);
+        double etaMS = etaMeanSq(H, m, T);
+
+        double velocity = c*etaCN/h - c*(etaCN*etaCN/h/h + etaMS*etaMS/h/h) + 1.0/2.0*c*h*(1.0/3.0 - z*z/h/h)*etaXX;
+
+        return velocity;
+    }
+
+    double W (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z)
+    {
+        double K, E;
+        Elliptic::ellipticIntegralsKE(m, &K, &E);
+
+        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
+        double k = sqrt(kx*kx + ky*ky);
+        double L = 2.0*PII/k;
+        double c = L/T;
+
+        double etaCN = eta(H, m, kx, ky, T, x, y, t);
+        double etaX = d1EtaDx(H, m, uCnoidal, L, K, E);
+        double etaXXX = d3EtaDx(H, m, uCnoidal, L, K, E);
+
+
+        double velocity = -c*z*( etaX/h*(1.0-2.0*etaCN/h) + 1.0/6.0*h*(1.0-z*z/h/h)*etaXXX ) ;
+
+        return velocity;
+    }
+}
+
+namespace stokesVFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define G 9.81
+
+    double A11 (double h, double k)
+    {
+        double s = sinh(k*h);
+
+        double A = 1.0/s;
+
+        return A;
+    }
+
+    double A13 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            -pow(c,2)*(5.0*pow(c,2)+1.0)
+                /
+            (8.0*pow(s,5));
+
+        return A;
+    }
+ 
+    double A15 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            -(1184.0*pow(c,10)-1440.0*pow(c,8)-1992.0*pow(c,6)+2641.0*pow(c,4)-249.0*pow(c,2)+18)
+                /
+            (1536.0*pow(s,11));
+
+        return A;
+    }   
+
+    double A22 (double h, double k)
+    {
+        double s = sinh(k*h);
+
+        double A = 
+            3.0
+                /
+            (8.0*pow(s,4));
+
+        return A;
+    }
+
+    double A24 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            (192.0*pow(c,8)-424.0*pow(c,6)-312.0*pow(c,4)+480.0*pow(c,2)-17)
+                /
+            (768.0*pow(s,10));
+
+        return A;
+    }
+
+    double A33 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            (13.0-4.0*pow(c,2))
+                /
+            (64.0*pow(s,7));
+
+        return A;
+    }
+
+    double A35 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            (512.0*pow(c,12)+4224.0*pow(c,10)-6800.0*pow(c,8)-12808.0*pow(c,6)+16704.0*pow(c,4)-3154.0*pow(c,2)+107.0)
+                /
+            (4096.0*pow(s,13)*(6.0*pow(c,2)-1.0));
+
+        return A;
+    }
+
+    double A44 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            (80.0*pow(c,6)-816.0*pow(c,4)+1338.0*pow(c,2)-197.0)
+                /
+            (1536.0*pow(s,10)*(6.0*pow(c,2)-1.0));
+
+        return A;
+    }
+
+    double A55 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double A = 
+            -(2880.0*pow(c,10)-72480.0*pow(c,8)+324000.0*pow(c,6)-432000.0*pow(c,4)+163470.0*pow(c,2)-16245.0)
+                /
+            (61440.0*pow(s,11)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0));
+
+        return A;
+    }
+
+    double B22 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (2.0*pow(c,2)+1)*c
+                /
+            (4.0*pow(s,3));
+
+        return B;
+    }
+
+    double B24 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (272.0*pow(c,8)-504.0*pow(c,6)-192.0*pow(c,4)+322.0*pow(c,2)+21.0)*c
+                /
+            (384.0*pow(s,9));
+
+        return B;
+    }
+
+    double B33 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (8.0*pow(c,6)+1.0)*3.0
+                /
+            (64.0*pow(s,6));
+
+        return B;
+    }
+
+    double B33k (double h, double k) // d B33 / d k
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double sk = h*s;
+        double ck = h*c;
+
+        double B = 
+            9.0*pow(c,5)*ck/(4.0*pow(s,6))- 
+            (9.0*(8.0*pow(c,6)+1.0))/(32.0*pow(s,7))*sk;
+
+        return B;
+    }
+
+    double B35 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8)-21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81)
+                /
+            (12288.0*pow(s,12)*(6.0*pow(c,2)-1.0));
+
+        return B;
+    }
+
+    double B35k (double h, double k) // d B35 / d k
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double sk = h*s;
+        double ck = h*c;
+
+        double B = 
+            (14.0*88128.0*pow(c,13)*ck-12.0*208224.0*pow(c,11)*ck
+            +10.0*70848.0*pow(c,9)*ck+8.0*54000.0*pow(c,7)*ck
+            -6.0*21816.0*pow(c,5)*ck+4.0*6264.0*pow(c,3)*ck
+            -2.0*54.0*c*ck)
+            /(12288.0*pow(s,12)*(6.0*pow(c,2)-1.0))
+            -(88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8) 
+            -21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81.0)*12.0 
+            /(12288.0*pow(s,13)*(6.0*pow(c,2)-1.0))*sk 
+            -(88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8) 
+            -21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81.0)*12.0*c*ck 
+            /(12288.0*pow(s,12)*pow((6.0*pow(c,2)-1.0),2));
+
+        return B;
+    }
+
+    double B44 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (768.0*pow(c,10)-448.0*pow(c,8)-48.0*pow(c,6)+48.0*pow(c,4)+106.0*pow(c,2)-21.0)*c
+                /
+            (384.0*pow(s,9)*(6.0*pow(c,2)-1.0));
+
+        return B;
+    }
+
+    double B55 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double B = 
+            (192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10)-7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
+                /
+            (12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0));
+
+        return B;
+    }
+
+    double B55k (double h, double k) // d B55 / d k
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double sk = h*s;
+        double ck = h*c;
+
+        double B = 
+            (16.0*192000.0*pow(c,15)*ck-14.0*262720.0*pow(c,13)*ck
+            +12.0*83680.0*pow(c,11)*ck+10.0*20160.0*pow(c,9)*ck
+            -8.0*7280.0*pow(c,7)*ck+6.0*7160.0*pow(c,5)*ck
+            -4.0*1800.0*pow(c,3)*ck-2.0*1050.0*pow(c,1)*ck)
+            /(12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))
+            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
+            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)*10.0
+            /(12288.0*pow(s,11)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))*sk
+            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
+            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
+            *12.0*c*ck 
+            /(12288.0*pow(s,10)*pow((6.0*pow(c,2)-1.0),2)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))
+            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
+            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
+            *(32.0*pow(c,3)-22.0*c)*ck
+            /(12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*pow((8.0*pow(c,4)-11.0*pow(c,2)+3.0),2));
+
+        return B;
+    }
+
+    double C1 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double C = 
+            (8.0*pow(c,4)-8.0*pow(c,2)+9.0)
+                /
+            (8.0*pow(s,4));
+
+        return C;
+    }
+
+    double C1k (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double sk = h*s;
+        double ck = h*c;
+
+        double C = 
+            (4.0*8.0*pow(c,3)*ck-2.0*8.0*c*ck)/(8.0*pow(s,4))
+            -(8.0*pow(c,4)-8.0*pow(c,2)+9.0)*4.0*sk/(8.0*pow(s,5));
+
+        return C;
+    }
+
+    double C2 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double C = 
+            (3840.0*pow(c,12)-4096.0*pow(c,10) + 2592.0*pow(c,8)-1008.0*pow(c,6)+5944.0*pow(c,4)-1830.0*pow(c,2)+147.0) // - 2592
+                /
+            (512.0*pow(s,10)*(6.0*pow(c,2)-1.0));
+
+        return C;
+    }
+
+    double C2k (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double sk = h*s;
+        double ck = h*c;
+
+        double C = 
+            (12.0*3840.0*pow(c,11)*ck-10.0*4096.0*pow(c,9)*ck
+            +8.0*2592.0*pow(c,7)*ck-6.0*1008.0*pow(c,5)*ck+
+            4.0*5944.0*pow(c,3)*ck-2.0*1830.0*c*ck)
+            /(512.0*pow(s,10)*(6.0*pow(c,2)-1.0))
+            -(3840.0*pow(c,12)-4096.0*pow(c,10)+2592.0*pow(c,8)-1008.0*pow(c,6)+
+            5944.0*pow(c,4)-1830.0*pow(c,2)+147.0)*10.0*sk/
+            (512.0*pow(s,11)*(6.0*pow(c,2)-1.0))
+            -(3840.0*pow(c,12)-4096.0*pow(c,10)+2592.0*pow(c,8)-1008.0*pow(c,6)+
+            5944.0*pow(c,4)-1830.0*pow(c,2)+147.0)*12.0*c*ck
+            /(512.0*pow(s,10)*pow((6.0*pow(c,2)-1.0),2));
+
+        return C;
+    }
+
+    double C3 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double C = 
+            (-1.0)
+                /
+            (4.0*s*c);
+
+        return C;
+    }
+
+    double C4 (double h, double k)
+    {
+        double s = sinh(k*h);
+        double c = cosh(k*h);
+
+        double C = 
+            (12.0*pow(c,8)+36.0*pow(c,6)-162.0*pow(c,4)+141.0*pow(c,2)-27.0)
+                /
+            (192.0*c*pow(s,9));
+
+        return C;
+    }
+
+    int StokesVNR (double H, double d, double T, double* kOut, double* LambdaOut, double* f1Out, double* f2Out )
+    {
+        double f1 = 1;
+        double f2 = 1;
+
+        double k = 2.0*PII/(sqrt(G*d)*T);
+        double Lambda = H/2.0*k;
+
+        double Bmat11, Bmat12, Bmat21, Bmat22;
+        double b33, b35, b55, b33k, b35k, b55k;
+        double c1, c2, c1k, c2k;
+        double kPr, LambdaPr;
+
+        int n = 0;
+
+        while ( (fabs(f1)>1.0e-12 || fabs(f2)>1.0e-12) && n<10000 )
+        {
+            b33 = B33(d, k);
+            b35 = B35(d, k);
+            b55 = B55(d, k);
+            c1 = C1(d, k);
+            c2 = C2(d, k);
+
+            b33k = B33k(d, k);
+            b35k = B35k(d, k);
+            b55k = B55k(d, k);
+            c1k = C1k(d, k);
+            c2k = C2k(d, k);
+
+            Bmat11 = 2.0*PII/(pow(k,2)*d)*(Lambda+pow(Lambda,3)*b33+pow(Lambda,5)*(b35+b55))
+                    -2.0*PII/(k*d)*(pow(Lambda,3)*b33k+pow(Lambda,5)*(b35k+b55k));
+
+            Bmat12 = -2.0*PII/(k*d)*
+                     (1.0+3.0*pow(Lambda,2)*b33+5.0*pow(Lambda,4)*(b35+b55));
+
+            Bmat21 = -d/(2.0*PII)*tanh(k*d)*(1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2)
+                    -k*d/(2.0*PII)*(1.0-pow((tanh(k*d)),2))*d*
+                    (1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2)
+                    -k*d/(2.0*PII)*tanh(k*d)
+                    *(pow(Lambda,2)*c1k+pow(Lambda,4)*c2k);
+
+            Bmat22 = -k*d/(2.0*PII)*tanh(k*d)
+                     *(2.0*Lambda*c1+4.0*pow(Lambda,3)*c2);
+
+            f1 = PII*H/d-2.0*PII/(k*d)*(Lambda+pow(Lambda,3)*b33+pow(Lambda,5)*(b35+b55));
+
+            f2 = (2.0*PII*d)/(G*pow(T,2))-k*d/(2.0*PII)*tanh(k*d)
+                *(1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2);
+
+            LambdaPr = (f1*Bmat21-f2*Bmat11)/(Bmat11*Bmat22-Bmat12*Bmat21);
+            kPr = (f2*Bmat12-f1*Bmat22)/(Bmat11*Bmat22-Bmat12*Bmat21);
+
+            Lambda += LambdaPr;
+            k += kPr;
+
+            n++;
+        }
+
+        *kOut = k;
+        *LambdaOut = Lambda;
+
+        *f1Out = fabs(f1);
+        *f2Out = fabs(f2);
+
+        return 1;
+    }
+
+    double eta (double h, double kx, double ky, double lambda, double T, double x, double y, double t, double phase)
+    {
+        double k = sqrt(kx*kx + ky*ky);
+
+        double b22 = B22(h, k);
+        double b24 = B24(h, k);
+        double b33 = B33(h, k);
+        double b35 = B35(h, k);
+        double b44 = B44(h, k);
+        double b55 = B55(h, k);
+
+        double amp1 = lambda/k;
+        double amp2 = (b22*pow(lambda,2)+b24*pow(lambda,4))/k;
+        double amp3 = (b33*pow(lambda,3)+b35*pow(lambda,5))/k;
+        double amp4 = b44*pow(lambda,4)/k;
+        double amp5 = b55*pow(lambda,5)/k;
+
+        double theta = kx*x + ky*y - 2.0*PII/T*t + phase;
+
+        double C = amp1*cos(theta) 
+		 + amp2*cos(2*theta)
+                 + amp3*cos(3*theta) 
+		 + amp4*cos(4*theta)
+            	 + amp5*cos(5*theta);
+
+        return C;
+    }   
+
+    double U (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z)
+    {
+        double k = sqrt(kx*kx + ky*ky);
+
+        double a11 = A11(d, k);
+        double a13 = A13(d, k);
+        double a15 = A15(d, k);
+        double a22 = A22(d, k);
+        double a24 = A24(d, k);
+        double a33 = A33(d, k);
+        double a35 = A35(d, k);
+        double a44 = A44(d, k);
+        double a55 = A55(d, k);
+
+        double a1u=2.0*PII/T/k*(lambda*a11+pow(lambda,3)*a13+pow(lambda,5)*a15);
+        double a2u=2.0*2.0*PII/T/k*(pow(lambda,2)*a22+pow(lambda,4)*a24);
+        double a3u=3.0*2.0*PII/T/k*(pow(lambda,3)*a33+pow(lambda,5)*a35);
+        double a4u=4.0*2.0*PII/T/k*(pow(lambda,4)*a44);
+        double a5u=5.0*2.0*PII/T/k*(pow(lambda,5)*a55);
+
+        double velU = 0;
+
+        double theta = kx*x + ky*y - 2.0*PII/T*t + phase;
+
+        velU = a1u*cosh(k*z)*cos(theta)
+                 + a2u*cosh(2.0*k*z)*cos(2.0*(theta))
+                 + a3u*cosh(3.0*k*z)*cos(3.0*(theta))
+                 + a4u*cosh(4.0*k*z)*cos(4.0*(theta))
+                 + a5u*cosh(5.0*k*z)*cos(5.0*(theta));
+
+        return velU;
+    }
+
+    double W (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z)
+    {
+        double k = sqrt(kx*kx + ky*ky);
+
+        double a11 = A11(d, k);
+        double a13 = A13(d, k);
+        double a15 = A15(d, k);
+        double a22 = A22(d, k);
+        double a24 = A24(d, k);
+        double a33 = A33(d, k);
+        double a35 = A35(d, k);
+        double a44 = A44(d, k);
+        double a55 = A55(d, k);
+
+        double a1u=2.0*PII/T/k*(lambda*a11+pow(lambda,3)*a13+pow(lambda,5)*a15);
+        double a2u=2.0*2.0*PII/T/k*(pow(lambda,2)*a22+pow(lambda,4)*a24);
+        double a3u=3.0*2.0*PII/T/k*(pow(lambda,3)*a33+pow(lambda,5)*a35);
+        double a4u=4.0*2.0*PII/T/k*(pow(lambda,4)*a44);
+        double a5u=5.0*2.0*PII/T/k*(pow(lambda,5)*a55);
+
+        double velV = 0;
+
+        double theta = kx*x+ky*y-2.0*PII/T*t+phase;
+
+        velV = a1u*sinh(k*z)*sin(theta)
+                + a2u*sinh(2.0*k*z)*sin(2.0*(theta))
+                + a3u*sinh(3.0*k*z)*sin(3.0*(theta))
+                + a4u*sinh(4.0*k*z)*sin(4.0*(theta))
+                + a5u*sinh(5.0*k*z)*sin(5.0*(theta));
+
+        return velV;
+    }
+}
+
+namespace BoussinesqFun
+{
+    #define PII 3.1415926535897932384626433832795028
+    #define G 9.81 
+    
+    double eta (double H, double h, double x, double y, double theta, double t, double X0)
+    {
+        double C = sqrt(G*(H+h));
+        double ts = 3.5*h/sqrt(H/h);
+        double aux = sqrt(3.0*H/(4.0*h))/h;
+        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
+
+        double sup = H * 1.0/pow(cosh( aux * Xa ),2);
+
+        return sup;
+    }
+
+    double Deta1 (double H, double h, double x, double y, double theta, double t, double X0)
+    {
+        double C = sqrt(G*(H+h));
+        double ts = 3.5*h/sqrt(H/h);
+        double aux = sqrt(3.0*H/(4.0*h))/h;
+        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
+
+        double deta = 8.0*aux*h * exp(2.0*aux*Xa) * (1.0-exp(2.0*aux*Xa)) 
+                        / pow(1.0+exp(2.0*aux*Xa),3);
+
+        return deta;
+    }
+
+    double Deta2 (double H, double h, double x, double y, double theta, double t, double X0)
+    {
+        double C = sqrt(G*(H+h));
+        double ts = 3.5*h/sqrt(H/h);
+        double aux = sqrt(3.0*H/(4.0*h))/h;
+        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
+
+        double deta = 16.0*pow(aux,2)*h * exp(2.0*aux*Xa) * (exp(4.0*aux*Xa)
+                        - 4.0*exp(2.0*aux*Xa)+1.0) / pow(1.0+exp(2.0*aux*Xa),4);
+
+        return deta;
+    }
+
+    double Deta3 (double H, double h, double x, double y, double theta, double t, double X0)
+    {
+        double C = sqrt(G*(H+h));
+        double ts = 3.5*h/sqrt(H/h);
+        double aux = sqrt(3.0*H/(4.0*h))/h;
+        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
+
+        double deta = -32.0*pow(aux,3)*h * exp(2.0*aux*Xa) * (exp(6.0*aux*Xa)
+                        - 11.0*exp(4.0*aux*Xa) + 11.0*exp(2.0*aux*Xa)-1.0) / pow(1.0+exp(2.0*aux*Xa),5);
+
+        return deta;
+    }
+
+    double U (double H, double h, double x, double y, double theta, double t, double X0, double z)
+    {
+        double C = sqrt(G*(H+h));
+        double etaSolit = eta( H, h, x, y, theta, t, X0);
+        double Detas2 = Deta2( H, h, x, y, theta, t, X0);
+
+        double vel = C*etaSolit/h
+                *(1.0 - etaSolit/(4.0*h) +
+                pow(h,2)/(3.0*etaSolit)
+                *(1.0 - 3.0/2.0*pow(z/h,2))
+                *Detas2);
+
+        return vel;
+    }
+
+    double W (double H, double h, double x, double y, double theta, double t, double X0, double z)
+    {
+        double C = sqrt(G*(H+h));
+        double etaSolit = eta( H, h, x, y, theta, t, X0);
+        double Detas1 = Deta1( H, h, x, y, theta, t, X0);
+        double Detas3 = Deta3( H, h, x, y, theta, t, X0);
+
+        double vel = -C*z/h
+                *((1.0 - etaSolit/(2.0*h))*Detas1 +
+                pow(h,2)/3.0
+                *(1.0 - 1.0/2.0*pow(z/h,2))
+                *Detas3);
+
+        return vel;
+    }
+}
+
diff --git a/integration/genAbs/common/waveFun.H b/integration/genAbs/common/waveFun.H
new file mode 100644
index 0000000000..53406b64c5
--- /dev/null
+++ b/integration/genAbs/common/waveFun.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveFun_H
+#define waveFun_H
+
+namespace otherFun
+{
+    double interpolation (double x1, double x2, double y1, double y2, double xInt);
+}
+
+namespace StokesIFun
+{
+    double waveLength (double h, double T);
+    double eta (double H, double Kx, double x, double Ky, double y, double omega, double t, double phase);
+    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
+    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
+}
+
+namespace StokesIIFun
+{
+    double eta (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase);
+    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
+    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
+    double timeLag (double H, double h, double Kx, double x, double Ky, double y, double T, double phase);
+}
+
+namespace Elliptic
+{
+    void ellipticIntegralsKE (double m, double* K, double* E);
+    void JacobiSnCnDn (double u, double m, double* Sn, double* Cn, double* Dn);
+}
+
+namespace cnoidalFun
+{
+    double eta (double H, double m, double kx, double ky, double T, double x, double y, double t);
+    double etaCnoidal1D (double H, double m, double t, double T, double K, double E);
+    double etaMeanSq (double H, double m, double T);
+    double d1EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
+    double d2EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
+    double d3EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
+    int calculations (double H, double d, double T, double* mOut, double* LOut);
+    double U (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z);
+    double W (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z);
+}
+
+namespace stokesVFun
+{
+    double A11 (double h, double k);
+    double A13 (double h, double k);
+    double A15 (double h, double k);
+    double A22 (double h, double k);
+    double A24 (double h, double k);
+    double A33 (double h, double k);
+    double A35 (double h, double k);
+    double A44 (double h, double k);
+    double A55 (double h, double k);
+    double B22 (double h, double k);
+    double B24 (double h, double k);
+    double B33 (double h, double k);
+    double B33k (double h, double k);
+    double B35 (double h, double k);
+    double B35k (double h, double k);
+    double B44 (double h, double k);
+    double B55 (double h, double k);
+    double B55k (double h, double k);
+    double C1 (double h, double k);
+    double C1k (double h, double k);
+    double C2 (double h, double k);
+    double C2k (double h, double k);
+    double C3 (double h, double k);
+    double C4 (double h, double k);
+    int StokesVNR (double H, double d, double T, double* kOut, double* LambdaOut, double* f1Out, double* f2Out );
+    int StokesExtendedSolver (double H, double d, double T, double* kOut, double* LambdaOut, double* LambdaErrOut );
+    double eta (double h, double kx, double ky, double lambda, double T, double x, double y, double t, double phase);
+    double U (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z);
+    double W (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z);
+}
+
+namespace BoussinesqFun
+{
+    double eta (double H, double h, double x, double y, double theta, double t, double X0);
+    double Deta1 (double H, double h, double x, double y, double theta, double t, double X0);
+    double Deta2 (double H, double h, double x, double y, double theta, double t, double X0);
+    double Deta3 (double H, double h, double x, double y, double theta, double t, double X0);
+    double U (double H, double h, double x, double y, double theta, double t, double X0, double z);
+    double W (double H, double h, double x, double y, double theta, double t, double X0, double z);
+}
+
+#endif
diff --git a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..ee86b05170
--- /dev/null
+++ b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
@@ -0,0 +1,339 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#include "IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    nPaddles_(1),
+    leftORright_(-1),
+    waterDepth_(-1),
+    initialDepthABS_(-1),
+    RealwaterDepth_(-1),
+    allCheck_(true),
+    waveDictName_("IHWavesDict")
+{}
+
+
+Foam::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+(
+    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    nPaddles_(ptf.nPaddles_),
+    leftORright_(ptf.leftORright_),    
+    waterDepth_(ptf.waterDepth_),
+    initialDepthABS_(ptf.initialDepthABS_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    allCheck_(ptf.allCheck_),
+    waveDictName_(ptf.waveDictName_)
+{}
+
+
+Foam::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    nPaddles_(dict.lookupOrDefault<label>("nPaddles", 1)),
+    leftORright_(dict.lookupOrDefault<scalar>("leftORright",-1)),
+    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1 )),
+    initialDepthABS_(dict.lookupOrDefault<scalar>("initialDepthABS",-1)),
+    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1)),
+    allCheck_(dict.lookupOrDefault<bool>("allCheck", true )),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict"))
+{}
+
+
+Foam::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+(
+    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    nPaddles_(ptf.nPaddles_),
+    leftORright_(ptf.leftORright_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepthABS_(ptf.initialDepthABS_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    allCheck_(ptf.allCheck_),
+    waveDictName_(ptf.waveDictName_)
+{}
+
+
+Foam::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+(
+    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    nPaddles_(ptf.nPaddles_),
+    leftORright_(ptf.leftORright_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepthABS_(ptf.initialDepthABS_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    allCheck_(ptf.allCheck_),
+    waveDictName_(ptf.waveDictName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Variables & constants
+    const vector cMin = gMin(patch().patch().localPoints());
+    const vector cMax = gMax(patch().patch().localPoints());
+    const vector cSpan = cMax - cMin;
+    const scalar zSpan = cSpan[2];
+    scalar dMin = 0.0;
+    scalar dSpan = 0.0;
+    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
+    const volScalarField& alpha = 
+        db().lookupObject<volScalarField>(alphaName());
+    const volVectorField& U = db().lookupObject<volVectorField>("U");
+    const fvMesh& mesh = alpha.mesh();
+    const word& patchName = this->patch().name();
+    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
+    const label nF = patch().faceCells().size();
+    const scalarField alphaCell = 
+        alpha.boundaryField()[patchID].patchInternalField();
+    const vectorField UCell = U.boundaryField()[patchID].patchInternalField();
+    scalarField patchUc = Foam::scalarField(nF, 0.0);
+    scalarField patchVc = Foam::scalarField(nF, 0.0);
+    scalarField patchWc = Foam::scalarField(nF, 0.0);
+    const scalarField patchHeight = patch().Cf().component(2);
+    const scalar g = 9.81;
+
+    // Calculate Z bounds of the faces
+    scalarField zSup, zInf;
+    faceBoundsZ( &zSup, &zInf );
+
+    // Define dictionary
+    IOdictionary IHWavesDict
+    (
+        IOobject
+        (
+            waveDictName_,
+            this->db().time().constant(),
+            this->db(),
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        )
+    );
+
+    scalar currTime = this->db().time().value();
+
+    // Check for errors - Just the first time
+    if (allCheck_)
+    {
+        waterDepth_ = (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1.0));
+
+	initialDepthABS_ = 
+	    (IHWavesDict.lookupOrDefault<scalar>("initialDepthABS",-1.0));
+
+        // Check if the value of nPaddles is correct for the number of columns
+        if (nPaddles_ < 1)
+        {
+            FatalError << "Check nPaddles value." << exit(FatalError);
+        }
+
+        if ( nPaddles_ > 1 )
+        {
+            nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
+            reduce(nPaddles_, minOp<label>());
+        }
+    }
+
+    // Grouping part
+    labelList faceGroup = Foam::labelList(nF, 0);
+    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
+    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
+    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
+
+    for (label i=0; i<nPaddles_; i++)
+    {
+        // Breakpoints, X & Y centre of the paddles
+        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
+        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
+	    + cSpan[0]/(nPaddles_)*i;
+        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_) 
+	    + cSpan[1]/(nPaddles_)*i;
+    }
+
+    forAll(patchD, patchCells) 
+    {
+        for (label i=0; i<nPaddles_; i++)
+        {
+            if ( (patchD[patchCells]>=dBreakPoints[i])
+                && (patchD[patchCells]<dBreakPoints[i+1]) )
+            {
+                faceGroup[patchCells] = i+1;
+                continue;
+            }
+        }      
+    }
+
+    if (allCheck_)
+    {
+	if (RealwaterDepth_ == -1.0)
+	{
+	    if (waterDepth_ == -1.0)
+	    {
+	        RealwaterDepth_ = 
+		calcWL( alphaCell, faceGroup, zSpan )[0];
+
+		if (initialDepthABS_ !=-1.0)
+		{
+		    RealwaterDepth_ = RealwaterDepth_
+		        + initialDepthABS_;
+		}
+	    }
+	    else if ( waterDepth_ != -1.0 )
+	    {
+	        RealwaterDepth_ = waterDepth_;
+	    }
+	}
+
+        allCheck_ = false;
+    }
+
+    // Calculate water measured levels
+    scalarList measuredLevelsABS = calcWL( alphaCell, faceGroup, zSpan );
+
+    if (initialDepthABS_ !=-1.0)
+    {
+    	forAll(measuredLevelsABS, iterMin)
+    	{
+            measuredLevelsABS[iterMin] = measuredLevelsABS[iterMin] 
+	        + initialDepthABS_;
+    	}
+    }
+
+    forAll(patchHeight, cellIndex)    
+    {
+    	if ( zInf[cellIndex] >= measuredLevelsABS[faceGroup[cellIndex]-1] )
+	{
+	    patchUc[cellIndex] = 0.0;
+	    patchVc[cellIndex] = 0.0;
+             patchWc[cellIndex] = 0.0;
+	}
+	else 
+	{
+	    patchUc[cellIndex] = 
+	        ( -measuredLevelsABS[faceGroup[cellIndex]-1]
+		+ RealwaterDepth_ )
+		* sqrt(g/measuredLevelsABS[faceGroup[cellIndex]-1]);
+
+	    patchUc[cellIndex] = leftORright_ * patchUc[cellIndex];
+            patchVc[cellIndex] = 0.0;
+            patchWc[cellIndex] = 0.0;
+	}
+    }
+
+    const vectorField n1 = Foam::vectorField(nF, vector(1.0, 0.0, 0.0));
+    const vectorField n2 = Foam::vectorField(nF, vector(0.0, 1.0, 0.0));
+    const vectorField n3 = Foam::vectorField(nF, vector(0.0, 0.0, 1.0));
+
+    operator == (n1*patchUc + n2*patchVc + n3*patchWc);
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
+write(Ostream& os) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_ << 
+        token::END_STATEMENT << nl;
+
+    os.writeKeyword("leftORright") << leftORright_ << 
+        token::END_STATEMENT << nl;
+
+    os.writeKeyword("nPaddles") << nPaddles_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ << 
+        token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..6fea88efe7
--- /dev/null
+++ b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+
+Description
+    Wave absorption boundary condition based on shallow water theory and on a
+    3D approach. Works both in 2D and 3D and for waves out of the shallow water
+    regime.
+
+    Example of the boundary condition specification:
+    @verbatim
+    outlet
+    {
+        type            IH_3D_3DAbsorption_InletVelocityV2;
+        nPaddles        1;  
+        value           uniform (0 0 0);
+	leftORright	-1.0;
+    }
+    @endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type:    IH_3D_3DAbsorption_InletVelocityV2 | yes
+        nPaddles     | number of wavepaddles for absorption | yes | 1  
+	leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
+    \endtable
+
+Note
+    -
+
+SourceFiles
+    IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#ifndef IH_3D_3DAbsorption_InletVelocityFvPatchVectorField_H
+#define IH_3D_3DAbsorption_InletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+               Class IH_3D_3DAbsorption_InletVelocityFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Number of paddles
+        label nPaddles_;
+ 
+        //Aborption: Left(1) or Right(-1)
+	scalar leftORright_;
+
+        //- Theoretical Water depth (meters)
+        scalar waterDepth_;        
+
+        //- Numerical Water depth (meters)
+        scalar RealwaterDepth_;
+
+        //- BC check and read values just the first time
+        bool allCheck_;
+
+        //- Initial Depth on BC for absorption (meters)
+        scalar initialDepthABS_;
+
+        //- Dictionary name
+        word waveDictName_;
+
+public:
+
+   //- Runtime type information
+   TypeName("IH_3D_3DAbsorption_InletVelocityV2");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        //  onto a new patch
+        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        (
+            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        (
+            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new IH_3D_3DAbsorption_InletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+        (
+            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
+                    (*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+    // Other common member functions
+        #include "memberFun.H"
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveAbsorption/Make/files b/integration/genAbs/waveAbsorption/Make/files
new file mode 100644
index 0000000000..7f9bff3dfb
--- /dev/null
+++ b/integration/genAbs/waveAbsorption/Make/files
@@ -0,0 +1,3 @@
+IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
+
+LIB = $(FOAM_USER_LIBBIN)/libIHwaveAbsorptionV2esi
diff --git a/integration/genAbs/waveAbsorption/Make/options b/integration/genAbs/waveAbsorption/Make/options
new file mode 100644
index 0000000000..be8b934220
--- /dev/null
+++ b/integration/genAbs/waveAbsorption/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -DOFVERSION=$(OF_VERSION) \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I../common
+
+LIB_LIBS = \
+    -lfiniteVolume
diff --git a/integration/genAbs/waveAbsorption/localMake b/integration/genAbs/waveAbsorption/localMake
new file mode 100755
index 0000000000..aedb1c100c
--- /dev/null
+++ b/integration/genAbs/waveAbsorption/localMake
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ $WM_PROJECT == "foam" ]; then
+    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
+else
+    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
+fi
+
+#IHC_dbg
+echo $ofversion
+#----
+
+export OF_VERSION=$ofversion
+
+wclean
+
+wmake libso
+
+if (( $? )) ; then 
+    echo "\n\nIH Wave absorption boundary conditions (V2.0) compilation failed"
+    exit; else
+    echo -e "\n\nIH Wave absorption boundary conditions (V2.0) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
+fi
+
+wclean
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
new file mode 100644
index 0000000000..51052f0b79
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
@@ -0,0 +1,460 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#include "IH_Waves_InletAlphaFvPatchScalarField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "Random.H"
+
+#include "waveFun.H"
+
+//C++
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include "SquareMatrix.H"
+#include "vector.H"
+#include "Matrix.H"
+
+#include "mpi.h"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::
+IH_Waves_InletAlphaFvPatchScalarField::
+IH_Waves_InletAlphaFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF),
+    wavePeriod_(-1),
+    waveHeight_(-1),
+    waveLength_(-1),
+    waterDepth_(-1),
+    initialDepth_(-1),
+    wavePhase_(3.0*PI()/2.0),
+    lambdaStokesV_(-1),
+    mCnoidal_(-1),
+    nPaddles_(1),
+    tSmooth_(-1),
+    waveDictName_("IHWavesDict"),
+    waveType_("aaa"),
+    waveTheory_("aaa"),
+    allCheck_(true),
+    waveDir_(0),
+    RealwaterDepth_(-1)
+{}
+
+
+Foam::
+IH_Waves_InletAlphaFvPatchScalarField::
+IH_Waves_InletAlphaFvPatchScalarField
+(
+    const IH_Waves_InletAlphaFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_),
+    RealwaterDepth_(ptf.RealwaterDepth_)
+{}
+
+
+Foam::
+IH_Waves_InletAlphaFvPatchScalarField::
+IH_Waves_InletAlphaFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<scalar>(p,iF,dict),
+    wavePeriod_(dict.lookupOrDefault<scalar>("wavePeriod",-1)),
+    waveHeight_(dict.lookupOrDefault<scalar>("waveHeight",-1)),
+    waveLength_(dict.lookupOrDefault<scalar>("waveLength",-1)),
+    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1)),
+    initialDepth_(dict.lookupOrDefault<scalar>("initialDepth",-1)),
+    wavePhase_(dict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0)),
+    lambdaStokesV_(dict.lookupOrDefault<scalar>("lambdaStokesV",-1)),
+    mCnoidal_(dict.lookupOrDefault<scalar>("mCnoidal",-1)),
+    nPaddles_(dict.lookupOrDefault<label>("nPaddles",1)),
+    tSmooth_(dict.lookupOrDefault<scalar>("tSmooth",-1)),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict")),
+    waveType_(dict.lookupOrDefault<word>("waveType","aaa")),
+    waveTheory_(dict.lookupOrDefault<word>("waveTheory","aaa")),
+    allCheck_(dict.lookupOrDefault<bool>("allCheck",true)),
+    waveDir_(dict.lookupOrDefault<scalar>("waveDir",0)),
+    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1))
+{}
+
+
+Foam::
+IH_Waves_InletAlphaFvPatchScalarField::
+IH_Waves_InletAlphaFvPatchScalarField
+(
+    const IH_Waves_InletAlphaFvPatchScalarField& ptf
+)
+:
+    fixedValueFvPatchField<scalar>(ptf),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_),
+    RealwaterDepth_(ptf.RealwaterDepth_)
+{}
+
+
+Foam::
+IH_Waves_InletAlphaFvPatchScalarField::
+IH_Waves_InletAlphaFvPatchScalarField
+(
+    const IH_Waves_InletAlphaFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, iF),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_),
+    RealwaterDepth_(ptf.RealwaterDepth_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IH_Waves_InletAlphaFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Aux. values
+    scalar auxiliar = 0;
+    scalar auxiliarTotal = 0;
+    scalar X0 = 0;
+    scalarField patchXsolit;
+
+    const vector cMin = gMin(patch().patch().localPoints());
+    const vector cMax = gMax(patch().patch().localPoints());
+    const vector cSpan = cMax - cMin;
+    const scalar zSpan = cSpan[2];
+
+    scalar dMin = 0.0;
+    scalar dSpan = 0.0;
+    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
+
+    // Variables & constants
+    const volScalarField& alpha = 
+        db().lookupObject<volScalarField>(alphaName());
+    const volVectorField& U = db().lookupObject<volVectorField>("U");
+    const fvMesh& mesh = alpha.mesh();
+    const word& patchName = this->patch().name();
+    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
+    const label nF = patch().faceCells().size();
+    labelList cellGroup = Foam::labelList(nF, 1);
+    const scalarField alphaCell = 
+        alpha.boundaryField()[patchID].patchInternalField();
+    const vectorField UCell = U.boundaryField()[patchID].patchInternalField();
+    scalarField patchVOF = alphaCell; 
+    const labelList celdas = patch().faceCells();
+    const scalarField patchHeight = patch().Cf().component(2);
+
+    // Calculate Z bounds of the faces
+    scalarField zSup, zInf;
+    faceBoundsZ( &zSup, &zInf );
+
+    // Wave variables
+    scalar waveOmega;
+    scalarList waveOmegas;
+    scalar waveK;
+    scalarList waveKs;
+    scalar waveAngle;
+    scalar waveKx;
+    scalarList waveKxs;
+    scalar waveKy;
+
+    // Define dictionary
+    IOdictionary IHWavesDict
+    (
+        IOobject
+        (
+            waveDictName_,
+            this->db().time().constant(),
+            this->db(),
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        )
+    );
+
+    scalar currTime = this->db().time().value();
+
+    // Check for errors - Just the first time
+    if (allCheck_)
+    {
+        waveType_ = (IHWavesDict.lookupOrDefault<word>("waveType","aaa")); 
+        tSmooth_ = (IHWavesDict.lookupOrDefault<scalar>("tSmooth",-1.0));
+	waterDepth_ = 
+	    (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1.0));
+	initialDepth_ = 
+            (IHWavesDict.lookupOrDefault<scalar>("initialDepth",-1.0));
+    	nPaddles_ = (IHWavesDict.lookupOrDefault<label>("nPaddles",1));
+    } 
+
+    // Grouping part
+    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
+    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
+    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
+
+    for (label i=0; i<nPaddles_; i++)
+    {
+        // Breakpoints, X & Y centre of the paddles
+        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
+        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
+	    + cSpan[0]/(nPaddles_)*i;
+        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_)
+	    + cSpan[1]/(nPaddles_)*i;
+    }
+
+    forAll(patchD, patchCells) 
+    {
+        for (label i=0; i<nPaddles_; i++)
+        {
+            if ( (patchD[patchCells]>=dBreakPoints[i])
+	        && (patchD[patchCells]<dBreakPoints[i+1]) )
+            {
+                cellGroup[patchCells] = i+1;
+                continue;
+            }
+        }      
+    }
+
+    // Check for errors - Just the first time
+    if (allCheck_)
+    {
+	if (RealwaterDepth_ == -1.0)
+	{
+	    if (waterDepth_ == -1.0)
+	    {
+	        RealwaterDepth_ = 
+		    calcWL( alphaCell, cellGroup, zSpan )[0];
+		if (initialDepth_ !=-1.0)
+		{
+			RealwaterDepth_ = RealwaterDepth_
+			    + initialDepth_;
+		}
+	    }
+	    else if ( waterDepth_ != -1.0 )
+	    {
+		RealwaterDepth_ = waterDepth_;
+	    }
+	}
+    }
+
+    if (allCheck_)
+    {
+	waveTheory_ = (IHWavesDict.lookupOrDefault<word>("waveTheory","aaa"));
+    	waveHeight_ = (IHWavesDict.lookupOrDefault<scalar>("waveHeight",-1));
+    	wavePeriod_ = (IHWavesDict.lookupOrDefault<scalar>("wavePeriod",-1));
+    	waveDir_ = (IHWavesDict.lookupOrDefault<scalar>("waveDir",0));
+    	wavePhase_ = 
+	    (IHWavesDict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0));
+	
+	if ( waveType_ == "regular" )
+	{
+	   waveLength_ = StokesIFun::waveLength (RealwaterDepth_, wavePeriod_);
+	}
+    }
+
+    if ( waveType_ == "regular" )
+    {
+        waveOmega = (2.0*PI())/wavePeriod_;
+        waveK = 2.0*PI()/waveLength_;
+
+        waveAngle = waveDir_*PI()/180.0;
+        waveKx = waveK*cos(waveAngle);
+        waveKy = waveK*sin(waveAngle);
+    }
+    else if ( waveType_ == "solitary" )
+    {
+        waveAngle = waveDir_*PI()/180.0;
+        patchXsolit = patch().Cf().component(0)*cos(waveAngle) 
+	    + patch().Cf().component(1)*sin(waveAngle);
+        X0 = gMin(patchXsolit);
+    }
+
+    scalar timeMult = 1.0;
+
+    if ( tSmooth_ > 0 && currTime < tSmooth_ )
+    {
+	timeMult = currTime/tSmooth_;
+    }
+
+    if (allCheck_)
+    {
+        if ( waveType_ == "regular" )
+        {
+            #include "checkInputErrorsRegular.H"
+        }
+        else if ( waveType_ == "solitary" )
+        {
+            #include "checkInputErrorsSolitary.H"
+        }
+        else
+        {
+            FatalError << "Wave type not supported, use:\n" 
+	        << "regular, solitary" << exit(FatalError);
+        }
+	allCheck_ = false; 
+    }
+
+    scalarList calculatedLevel (nPaddles_,0.0);
+
+    if ( waveType_ == "regular" )
+    {
+	if (waveDir_ == 0)
+	{
+           #include "calculatedLevelRegularNormal.H"
+	}
+	else
+	{
+	   #include "calculatedLevelRegular.H"
+	}
+    }
+    else if ( waveType_ == "solitary" )
+    {
+        #include "calculatedLevelSolitary.H"
+    }
+
+    forAll(patchHeight, cellIndex)    
+    {
+	auxiliarTotal = 0;
+	auxiliar = 0;
+	
+	if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+	{
+	    patchVOF[cellIndex] = 1.0;
+	}
+	else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+	{
+	    patchVOF[cellIndex] = 0.0;
+	}
+	else 
+	{
+	    auxiliar = calculatedLevel[cellGroup[cellIndex]-1]
+	        - zInf[cellIndex];
+	    auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+	    auxiliarTotal = auxiliar/auxiliarTotal;
+	    patchVOF[cellIndex] = auxiliarTotal;
+	}
+    }
+
+    operator == (patchVOF);
+
+    fixedValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void Foam::IH_Waves_InletAlphaFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_ << 
+        token::END_STATEMENT << nl;
+
+    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ << 
+        token::END_STATEMENT << nl;
+
+    os.writeKeyword("initialDepth") << initialDepth_ << 
+        token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchScalarField,
+       IH_Waves_InletAlphaFvPatchScalarField
+   );
+
+}
+
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
new file mode 100644
index 0000000000..0e181a0fff
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::IH_Waves_InletAlphaFvPatchScalarField
+
+Description
+    Describes a volumetric/mass flow normal Scalar boundary condition by its
+    magnitude as an integral over its area.
+
+    The basis of the patch (volumetric or mass) is determined by the
+    dimensions of the flux, phi.
+    The current density is used to correct the Alpha when applying the
+    mass basis.
+
+    Example of the boundary condition specification:
+    @verbatim
+    inlet
+    {
+        type            IH_Waves_InletAlphaV2;
+        waveDict        IHWavesDict;
+    }
+    @endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type:    IH_Waves_InletAlphaV2 | yes
+        waveDict     | Dictionary where variables for generation/absorption are defined | yes | IHWavesDict  
+    \endtable
+
+Note
+    - 
+
+SourceFiles
+    IH_Waves_InletAlphaFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#ifndef IH_Waves_InletAlphaFvPatchScalarField_H
+#define IH_Waves_InletAlphaFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+               Class IH_Waves_InletAlphaFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class IH_Waves_InletAlphaFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Wave period (seconds)
+        scalar wavePeriod_;
+
+        //- Wave height (meters)
+        scalar waveHeight_;
+
+        //- Wave length (meters)
+        scalar waveLength_;
+
+        //- Water depth (meters)
+        scalar waterDepth_;
+
+        //- Wave phase (radians)
+        scalar wavePhase_;
+
+        //- Lambda StokesV parameter
+        scalar lambdaStokesV_;
+
+        //- m Cnoidal parameter
+        scalar mCnoidal_;
+
+        //- Number of different paddles (for absorption)
+        label nPaddles_;
+
+        //- Smoothing factor for the wave(s) (seconds)
+        scalar tSmooth_;
+
+        //- Dictionary name
+        word waveDictName_;
+
+        //- Regular or Irregular wave(s)
+        word waveType_;
+
+        //- Name of the theory
+        word waveTheory_;
+
+        //- BC check and read values just the first time
+        bool allCheck_;
+
+        //- Direction of propagation (degrees, from X axis)
+        scalar waveDir_;
+
+        //- Numerical Water depth (meters)
+	scalar RealwaterDepth_;
+
+        //- Initial Depth on BC for wave generation (meters)
+        scalar initialDepth_;
+
+public:
+
+   //- Runtime type information
+   TypeName("IH_Waves_InletAlphaV2");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        IH_Waves_InletAlphaFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        IH_Waves_InletAlphaFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  IH_Waves_InletAlphaFvPatchScalarField
+        //  onto a new patch
+        IH_Waves_InletAlphaFvPatchScalarField
+        (
+            const IH_Waves_InletAlphaFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        IH_Waves_InletAlphaFvPatchScalarField
+        (
+            const IH_Waves_InletAlphaFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new IH_Waves_InletAlphaFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        IH_Waves_InletAlphaFvPatchScalarField
+        (
+            const IH_Waves_InletAlphaFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new IH_Waves_InletAlphaFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+    // Other common member functions
+        #include "memberFun.H"
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..a25bf8c254
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
@@ -0,0 +1,495 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#include "IH_Waves_InletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+
+#include "waveFun.H"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include "SquareMatrix.H"
+#include "vector.H"
+#include "Matrix.H"
+
+#include "mpi.h"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::
+IH_Waves_InletVelocityFvPatchVectorField::
+IH_Waves_InletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    wavePeriod_(-1),
+    waveHeight_(-1),
+    waveLength_(-1),
+    waterDepth_(-1),
+    initialDepth_(-1),
+    RealwaterDepth_(-1),
+    wavePhase_(3.0*PI()/2.0),
+    lambdaStokesV_(-1),
+    mCnoidal_(-1),
+    genAbs_(false),
+    nPaddles_(1),
+    tSmooth_(-1),
+    leftORright_(-1),
+    waveDictName_("IHWavesDict"),
+    waveType_("aaa"),
+    waveTheory_("aaa"),
+    allCheck_(true),
+    waveDir_(0)
+{}
+
+
+Foam::
+IH_Waves_InletVelocityFvPatchVectorField::
+IH_Waves_InletVelocityFvPatchVectorField
+(
+    const IH_Waves_InletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    genAbs_(ptf.genAbs_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    leftORright_(ptf.leftORright_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_)
+{}
+
+
+Foam::
+IH_Waves_InletVelocityFvPatchVectorField::
+IH_Waves_InletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    wavePeriod_(dict.lookupOrDefault<scalar>("wavePeriod",-1)),
+    waveHeight_(dict.lookupOrDefault<scalar>("waveHeight",-1)),
+    waveLength_(dict.lookupOrDefault<scalar>("waveLength",-1)),
+    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1)),
+    initialDepth_(dict.lookupOrDefault<scalar>("initialDepth",-1)),
+    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1)),
+    wavePhase_(dict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0)),
+    lambdaStokesV_(dict.lookupOrDefault<scalar>("lambdaStokesV",-1)),
+    mCnoidal_(dict.lookupOrDefault<scalar>("mCnoidal",-1)),
+    genAbs_(dict.lookupOrDefault<bool>("genAbs",false)),
+    nPaddles_(dict.lookupOrDefault<label>("nPaddles",1)),
+    tSmooth_(dict.lookupOrDefault<scalar>("tSmooth",-1)),
+    leftORright_(dict.lookupOrDefault<scalar>("leftORright",-1)),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict")),
+    waveType_(dict.lookupOrDefault<word>("waveType","aaa")),
+    waveTheory_(dict.lookupOrDefault<word>("waveTheory","aaa")),
+    allCheck_(dict.lookupOrDefault<bool>("allCheck",true)),
+    waveDir_(dict.lookupOrDefault<scalar>("waveDir",0))
+{}
+
+
+Foam::
+IH_Waves_InletVelocityFvPatchVectorField::
+IH_Waves_InletVelocityFvPatchVectorField
+(
+    const IH_Waves_InletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    genAbs_(ptf.genAbs_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    leftORright_(ptf.leftORright_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_)
+{}
+
+
+Foam::
+IH_Waves_InletVelocityFvPatchVectorField::
+IH_Waves_InletVelocityFvPatchVectorField
+(
+    const IH_Waves_InletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    wavePeriod_(ptf.wavePeriod_),
+    waveHeight_(ptf.waveHeight_),
+    waveLength_(ptf.waveLength_),
+    waterDepth_(ptf.waterDepth_),
+    initialDepth_(ptf.initialDepth_),
+    RealwaterDepth_(ptf.RealwaterDepth_),
+    wavePhase_(ptf.wavePhase_),
+    lambdaStokesV_(ptf.lambdaStokesV_),
+    mCnoidal_(ptf.mCnoidal_),
+    genAbs_(ptf.genAbs_),
+    nPaddles_(ptf.nPaddles_),
+    tSmooth_(ptf.tSmooth_),
+    leftORright_(ptf.leftORright_),
+    waveDictName_(ptf.waveDictName_),
+    waveType_(ptf.waveType_),
+    waveTheory_(ptf.waveTheory_),
+    allCheck_(ptf.allCheck_),
+    waveDir_(ptf.waveDir_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IH_Waves_InletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    } 
+
+    // Auxiliar variables
+    scalar auxiliar = 0; 
+    scalar auxiliarTotal = 0;
+    scalar X0 = 0;
+    scalarField patchXsolit;
+
+    // Variables stream function
+    scalar celerity = 0;
+
+    // 3D Variables
+    const vector cMin = gMin(patch().patch().localPoints());
+    const vector cMax = gMax(patch().patch().localPoints());
+    const vector cSpan = cMax - cMin;
+    const scalar zSpan = cSpan[2];
+
+    scalar dMin = 0.0;
+    scalar dSpan = 0.0;
+    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
+
+    // Variables & constants
+    const volScalarField& alpha = 
+        db().lookupObject<volScalarField>(alphaName());
+    const fvMesh& mesh = alpha.mesh();
+    const word& patchName = this->patch().name();
+    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
+    const label nF = patch().faceCells().size();
+    labelList cellGroup = Foam::labelList(nF, 1);
+    const scalarField alphaCell = 
+        alpha.boundaryField()[patchID].patchInternalField();
+    scalarField patchU = Foam::scalarField(nF, 0.0);
+    scalarField patchUABS = Foam::scalarField(nF, 0.0);
+    scalarField patchV = Foam::scalarField(nF, 0.0);
+    scalarField patchVABS = Foam::scalarField(nF, 0.0);
+    scalarField patchW = Foam::scalarField(nF, 0.0);
+    const labelList celdas = patch().faceCells();
+    const scalarField patchHeight = patch().Cf().component(2);
+    const scalar g = 9.81;
+
+    // Calculate Z bounds of the faces
+    scalarField zSup, zInf;
+    faceBoundsZ( &zSup, &zInf );
+
+    // Waves variables
+    scalar waveOmega;
+    scalar waveK;
+    scalar waveAngle;
+    scalar waveKx;
+    scalar waveKy;
+
+    // Define dictionary
+    IOdictionary IHWavesDict
+    (
+        IOobject
+        (
+            waveDictName_,
+            this->db().time().constant(),
+            this->db(),
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        )
+    );
+
+    scalar currTime = this->db().time().value();
+
+    // Check for errors - Just the first time
+    if (allCheck_)
+    {
+        waveType_ = (IHWavesDict.lookupOrDefault<word>("waveType","aaa")); 
+        tSmooth_ = (IHWavesDict.lookupOrDefault<scalar>("tSmooth",-1.0));
+	genAbs_ = (IHWavesDict.lookupOrDefault<bool>("genAbs",false));
+	waterDepth_ = (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1));
+	initialDepth_ = 
+	    (IHWavesDict.lookupOrDefault<scalar>("initialDepth",-1));
+    	nPaddles_ = (IHWavesDict.lookupOrDefault<label>("nPaddles",1));
+    }
+
+    // Grouping part
+    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
+    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
+    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
+
+    for (label i=0; i<nPaddles_; i++)
+    {
+        // Breakpoints, X & Y centre of the paddles
+        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
+        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
+	    + cSpan[0]/(nPaddles_)*i;
+        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_) 
+	    + cSpan[1]/(nPaddles_)*i;
+    }
+
+    forAll(patchD, patchCells) 
+    {
+        for (label i=0; i<nPaddles_; i++)
+        {
+            if ( (patchD[patchCells]>=dBreakPoints[i]) 
+                && (patchD[patchCells]<dBreakPoints[i+1]) )
+            {
+                cellGroup[patchCells] = i+1; // Group of each face
+                continue;
+            }
+        }      
+    }
+
+    // Check for errors - Just the first time
+    if (allCheck_)
+    {
+	if (RealwaterDepth_ == -1.0)
+	{
+	    if (waterDepth_ == -1.0)
+	    {
+	        RealwaterDepth_ = 
+		    calcWL( alphaCell, cellGroup, zSpan )[0];
+		if (initialDepth_ !=-1.0)
+		    {
+		        RealwaterDepth_ = RealwaterDepth_ 
+			    + initialDepth_;
+		    }
+	    }
+	    else if ( waterDepth_ != -1.0 )
+	    {
+		RealwaterDepth_ = waterDepth_;	
+	    }
+	}
+    }
+
+    if (allCheck_)
+    {
+	waveTheory_ = (IHWavesDict.lookupOrDefault<word>("waveTheory","aaa"));
+    	waveHeight_ = (IHWavesDict.lookupOrDefault<scalar>("waveHeight",-1));
+    	wavePeriod_ = (IHWavesDict.lookupOrDefault<scalar>("wavePeriod",-1));
+    	waveDir_ = (IHWavesDict.lookupOrDefault<scalar>("waveDir",0));
+    	genAbs_ = (IHWavesDict.lookupOrDefault<bool>("genAbs",false));
+    	wavePhase_ = 
+	    (IHWavesDict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0));
+	
+	if ( waveType_ == "regular" )
+	{
+		waveLength_ = StokesIFun::waveLength (
+		    RealwaterDepth_, wavePeriod_ );
+	}
+    }
+
+    if ( waveType_ == "regular" )
+    {
+        waveOmega = (2.0*PI())/wavePeriod_;
+        waveK = 2.0*PI()/waveLength_;
+
+        celerity = waveLength_/wavePeriod_;
+
+        waveAngle = waveDir_*PI()/180.0;
+        waveKx = waveK*cos(waveAngle);
+        waveKy = waveK*sin(waveAngle);
+    }
+    else if ( waveType_ == "solitary" )
+    {
+        waveAngle = waveDir_*PI()/180.0;
+        patchXsolit = patch().Cf().component(0)*cos(waveAngle) 
+            	      + patch().Cf().component(1)*sin(waveAngle);
+        X0 = gMin(patchXsolit);
+    }
+
+    scalar timeMult = 1.0;
+
+    if ( tSmooth_ > 0 && currTime < tSmooth_ )
+    {
+	timeMult = currTime/tSmooth_;
+    }
+
+    if (allCheck_)
+    {
+        if ( waveType_ == "regular" )
+        {
+            #include "checkInputErrorsRegular.H"
+        }
+        else if ( waveType_ == "solitary" )
+        {
+            #include "checkInputErrorsSolitary.H"
+        }
+        else
+        {
+            FatalError << "Wave type not supported, use:\n" 
+	        << "regular, solitary."<< exit(FatalError);
+        }
+
+	allCheck_ = false; 
+    }
+
+    scalarList calculatedLevel (nPaddles_,0.0);  
+
+    if ( waveType_ == "regular" )
+    {
+	if (waveDir_ == 0)
+	{
+           #include "calculatedLevelRegularNormal.H"
+	}
+	else
+	{
+	   #include "calculatedLevelRegular.H"
+	}
+    }
+    else if ( waveType_ == "solitary" )
+    {
+        #include "calculatedLevelSolitary.H"
+    }
+
+    scalarList measuredLevels (nPaddles_,0.0);
+    forAll(measuredLevels, iterMin)
+    {
+        measuredLevels[iterMin] = RealwaterDepth_;
+    }
+
+    scalarList measuredLevelsGENAB = calcWL( alphaCell, cellGroup, zSpan );
+
+    if (initialDepth_ !=-1.0)
+    {
+    	forAll(measuredLevelsGENAB, iterMin)
+    	{
+            measuredLevelsGENAB[iterMin] = measuredLevelsGENAB[iterMin] 
+	        + initialDepth_;
+    	}
+    }
+
+    // Define heights as minimum of calculatedLevel and measuredLevels
+    scalarList heights (nPaddles_,0.0);
+    forAll(heights, iterMin)
+    {
+        heights[iterMin] = 
+	    min(calculatedLevel[iterMin],measuredLevels[iterMin]);
+    }
+    
+    forAll(patchHeight, cellIndex)    
+    {
+    	#include "velocityProfile.H"
+    
+    	patchU[cellIndex] = patchU[cellIndex]*alphaCell[cellIndex];
+    	patchV[cellIndex] = patchV[cellIndex]*alphaCell[cellIndex];
+    	patchW[cellIndex] = patchW[cellIndex]*alphaCell[cellIndex];
+    }
+
+    const vectorField n1 = Foam::vectorField(nF, vector(1.0, 0.0, 0.0));
+    const vectorField n2 = Foam::vectorField(nF, vector(0.0, 1.0, 0.0));
+    const vectorField n3 = Foam::vectorField(nF, vector(0.0, 0.0, 1.0));
+
+    operator == (n1*patchU + n2*patchV + n3*patchW);
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::IH_Waves_InletVelocityFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_ 
+        << token::END_STATEMENT << nl;
+
+    os.writeKeyword("leftORright") << leftORright_ 
+        << token::END_STATEMENT << nl;
+
+    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ 
+        << token::END_STATEMENT << nl;
+
+    os.writeKeyword("initialDepth") << initialDepth_ 
+        << token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       IH_Waves_InletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..d52984d738
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::IH_Waves_InletVelocityFvPatchVectorField
+
+Description
+    Describes a volumetric/mass flow normal vector boundary condition by its
+    magnitude as an integral over its area.
+
+    The basis of the patch (volumetric or mass) is determined by the
+    dimensions of the flux, phi.
+    The current density is used to correct the velocity when applying the
+    mass basis.
+
+    Example of the boundary condition specification:
+    @verbatim
+    inlet
+    {
+        type            IH_Waves_InletVelocityV2;
+        waveDict        IHWavesDict;
+        value           uniform (0 0 0);
+	leftORright	1.0;
+
+    }
+    @endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type:    IH_Waves_InletVelocityV2 | yes
+        waveDict     | Dictionary where variables for generation/absorption are defined | yes | IHWavesDict 
+	leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1 
+    \endtable
+
+Note
+    - The value is positive inwards
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
+
+SourceFiles
+    IH_Waves_InletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+#ifndef IH_Waves_InletVelocityFvPatchVectorField_H
+#define IH_Waves_InletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+               Class IH_Waves_InletVelocityFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class IH_Waves_InletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Wave period (seconds)
+        scalar wavePeriod_;
+
+        //- Wave height (meters)
+        scalar waveHeight_;
+
+        //- Wave length (meters)
+        scalar waveLength_;
+
+        //- Water depth (meters)
+        scalar waterDepth_;
+
+        //- Wave phase (radians)
+        scalar wavePhase_;
+
+        //- Lambda StokesV parameter
+        scalar lambdaStokesV_;
+
+        //- m Cnoidal parameter
+        scalar mCnoidal_;
+
+        //- Generation + Absorption at the same time in the boundary (on=1, off=0)
+        bool genAbs_;
+
+        //- Number of different paddles (for absorption)
+        label nPaddles_;
+
+        //- Smoothing factor for the wave(s) (seconds)
+        scalar tSmooth_;
+
+        //Aborption Left(1) or Right(-1)
+	scalar leftORright_;
+
+        //- Dictionary name
+        word waveDictName_;
+
+        //- Regular or Irregular
+        word waveType_;
+
+        //- Name of the theory
+        word waveTheory_;
+
+        //- BC check and read values just the first time
+        bool allCheck_;
+
+        //- Direction of propagation (degrees, from X axis)
+        scalar waveDir_;
+
+        //- Initial water depth (referece)
+	scalar RealwaterDepth_;
+
+        //- Water depth (meters)
+        scalar initialDepth_;
+
+public:
+
+   //- Runtime type information
+   TypeName("IH_Waves_InletVelocityV2");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        IH_Waves_InletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        IH_Waves_InletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  IH_Waves_InletVelocityFvPatchVectorField
+        //  onto a new patch
+        IH_Waves_InletVelocityFvPatchVectorField
+        (
+            const IH_Waves_InletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        IH_Waves_InletVelocityFvPatchVectorField
+        (
+            const IH_Waves_InletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new IH_Waves_InletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        IH_Waves_InletVelocityFvPatchVectorField
+        (
+            const IH_Waves_InletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new IH_Waves_InletVelocityFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+    // Other common member functions
+        #include "memberFun.H"
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
new file mode 100644
index 0000000000..fbbd38b91d
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = BoussinesqFun :: U 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                xGroup[cellGroup[cellIndex]-1], 
+                yGroup[cellGroup[cellIndex]-1], 
+                waveAngle, 
+                currTime, 
+                X0, 
+                patchHeight[cellIndex]
+             );
+
+        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
+        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
+
+        patchW[cellIndex] = BoussinesqFun :: W 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                xGroup[cellGroup[cellIndex]-1], 
+                yGroup[cellGroup[cellIndex]-1], 
+                waveAngle, 
+                currTime, 
+                X0, 
+                patchHeight[cellIndex]
+            );
+
+	patchW[cellIndex] = patchW[cellIndex] * timeMult;
+
+    }
+    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = 0.0;
+        patchV[cellIndex] = 0.0;
+        patchW[cellIndex] = 0.0;
+    } 
+    else 
+    {	
+        if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    < measuredLevels[cellGroup[cellIndex]-1] )
+        {
+	    if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
+	    {
+                auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		    - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = BoussinesqFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveAngle, 
+                    	currTime, 
+                    	X0, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle) * timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle) * timeMult;
+
+		patchW[cellIndex] = BoussinesqFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveAngle, 
+                    	currTime, 
+                    	X0, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
+		    * timeMult;	
+	    }
+	}	
+	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    > measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+	    {
+	        patchU[cellIndex] = BoussinesqFun :: U 
+		    (
+                        waveHeight_, 
+                        RealwaterDepth_, 
+                        xGroup[cellGroup[cellIndex]-1], 
+                        yGroup[cellGroup[cellIndex]-1], 
+                        waveAngle, 
+                        currTime, 
+                        X0, 
+                        measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
+		    * timeMult;
+		patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
+		    * timeMult;
+
+		patchW[cellIndex] = BoussinesqFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveAngle, 
+                    	currTime, 
+                    	X0, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
+	    }
+	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		     - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = BoussinesqFun :: U 
+		    (
+		        waveHeight_, 
+			RealwaterDepth_, 
+			xGroup[cellGroup[cellIndex]-1], 
+			yGroup[cellGroup[cellIndex]-1], 
+			waveAngle, 
+			currTime, 
+			X0, 
+			measuredLevels[cellGroup[cellIndex]-1]
+		    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle) * timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle) * timeMult;
+
+		patchW[cellIndex] = BoussinesqFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveAngle, 
+                    	currTime, 
+                    	X0, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                   );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+            }
+        }	
+    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
new file mode 100644
index 0000000000..132f388d42
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = cnoidalFun :: U 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                mCnoidal_, 
+                waveKx, 
+                waveKy, 
+                wavePeriod_, 
+                xGroup[cellGroup[cellIndex]-1], 
+                yGroup[cellGroup[cellIndex]-1], 
+                currTime, 
+                patchHeight[cellIndex]
+            );
+
+        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
+        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
+
+        patchW[cellIndex] = cnoidalFun :: W 
+	    (
+	        waveHeight_, 
+                RealwaterDepth_, 
+                mCnoidal_, 
+                waveKx, 
+                waveKy, 
+                wavePeriod_, 
+                xGroup[cellGroup[cellIndex]-1], 
+                yGroup[cellGroup[cellIndex]-1], 
+                currTime, 
+                patchHeight[cellIndex]
+            );
+
+	patchW[cellIndex] = patchW[cellIndex]*timeMult;
+
+    }
+    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = 0.0;
+        patchV[cellIndex] = 0.0;
+        patchW[cellIndex] = 0.0;
+    } 
+    else 
+    {	
+        if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    < measuredLevels[cellGroup[cellIndex]-1] )
+        {
+	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = cnoidalFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+                    	waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle)*timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle)*timeMult;
+
+		patchW[cellIndex] = cnoidalFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+			waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+	    }
+	}	
+	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    > measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+	    {
+	        patchU[cellIndex] = cnoidalFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+                    	waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
+		    * timeMult;
+		patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
+		    * timeMult;
+
+		patchW[cellIndex] = cnoidalFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+			waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
+	    }
+	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = cnoidalFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+                    	waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle) * timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle) * timeMult;
+
+		patchW[cellIndex] = cnoidalFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	mCnoidal_, 
+			waveKx, 
+                    	waveKy, 
+                    	wavePeriod_, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	currTime, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+	    }
+        }	
+    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
new file mode 100644
index 0000000000..56ba8c1ce5
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if ( genAbs_ )
+    {  
+	if ( zInf[cellIndex] >= measuredLevelsGENAB[cellGroup[cellIndex]-1] )
+	{
+	    patchUABS[cellIndex] = 0.0;
+	}
+	else 
+	{
+	    patchUABS[cellIndex] = ( calculatedLevel[cellGroup[cellIndex]-1] - measuredLevelsGENAB[cellGroup[cellIndex]-1] ) * sqrt(g/measuredLevelsGENAB[cellGroup[cellIndex]-1]);
+        }
+    }
+    patchU[cellIndex] = patchU[cellIndex] + leftORright_ * patchUABS[cellIndex];
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
new file mode 100644
index 0000000000..b578c69c86
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = StokesIFun :: U 
+	    (
+                 waveHeight_, 
+                 RealwaterDepth_, 
+                 waveKx, 
+                 xGroup[cellGroup[cellIndex]-1], 
+                 waveKy, 
+                 yGroup[cellGroup[cellIndex]-1], 
+                 waveOmega, 
+                 currTime, 
+                 wavePhase_, 
+                 patchHeight[cellIndex]
+            );
+
+        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
+        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
+
+        patchW[cellIndex] = StokesIFun :: W 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                waveKx, 
+                xGroup[cellGroup[cellIndex]-1], 
+                waveKy, 
+                yGroup[cellGroup[cellIndex]-1], 
+                waveOmega, 
+                currTime, 
+                wavePhase_, 
+                patchHeight[cellIndex]
+            );
+
+	patchW[cellIndex] = patchW[cellIndex]*timeMult;
+    }
+    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = 0.0;
+        patchV[cellIndex] = 0.0;
+        patchW[cellIndex] = 0.0;
+    } 
+    else 
+    {	
+        if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    < measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		     - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = StokesIFun :: U 
+		    (
+		        waveHeight_, 
+		        RealwaterDepth_, 
+		        waveKx, 
+		        xGroup[cellGroup[cellIndex]-1], 
+		        waveKy, 
+		        yGroup[cellGroup[cellIndex]-1], 
+		        waveOmega, 
+		        currTime, 
+		        wavePhase_, 
+		        patchHeight[cellIndex]
+		    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle)*timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle)*timeMult;
+
+		patchW[cellIndex] = StokesIFun :: W 
+		    (
+		        waveHeight_, 
+		        RealwaterDepth_, 
+		        waveKx, 
+		        xGroup[cellGroup[cellIndex]-1], 
+		        waveKy, 
+		        yGroup[cellGroup[cellIndex]-1], 
+		        waveOmega, 
+		        currTime, 
+		        wavePhase_, 
+		        patchHeight[cellIndex]
+		    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
+		    * timeMult;	
+		
+	    }
+	}
+	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    > measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+	    {
+	        patchU[cellIndex] = StokesIFun :: U 
+		    (
+		        waveHeight_, 
+			RealwaterDepth_, 
+			waveKx, 
+			xGroup[cellGroup[cellIndex]-1], 
+			waveKy, 
+			yGroup[cellGroup[cellIndex]-1], 
+			waveOmega, 
+			currTime, 
+			wavePhase_, 
+			measuredLevels[cellGroup[cellIndex]-1]
+		    );
+
+		patchV[cellIndex] = patchU[cellIndex] 
+		    * sin(waveAngle)*timeMult;
+		patchU[cellIndex] = patchU[cellIndex] 
+		    * cos(waveAngle)*timeMult;
+
+		patchW[cellIndex] = StokesIFun :: W 
+		    (
+		        waveHeight_, 
+			RealwaterDepth_, 
+			waveKx, 
+			xGroup[cellGroup[cellIndex]-1], 
+			waveKy, 
+			yGroup[cellGroup[cellIndex]-1], 
+			waveOmega, 
+			currTime, 
+			wavePhase_, 
+			measuredLevels[cellGroup[cellIndex]-1]
+		    );
+
+		patchW[cellIndex] = patchW[cellIndex]*timeMult;	
+		
+	    }
+	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		    - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = StokesIFun :: U 
+		    (
+		        waveHeight_, 
+		        RealwaterDepth_, 
+		        waveKx, 
+		        xGroup[cellGroup[cellIndex]-1], 
+		        waveKy, 
+		        yGroup[cellGroup[cellIndex]-1], 
+		        waveOmega, 
+		        currTime, 
+		        wavePhase_, 
+		        measuredLevels[cellGroup[cellIndex]-1]
+		    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle) * timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle) * timeMult;
+
+		patchW[cellIndex] = StokesIFun :: W 
+		    (
+		        waveHeight_, 
+			RealwaterDepth_, 
+			waveKx, 
+			xGroup[cellGroup[cellIndex]-1], 
+			waveKy, 
+			yGroup[cellGroup[cellIndex]-1], 
+			waveOmega, 
+			currTime, 
+			wavePhase_, 
+			measuredLevels[cellGroup[cellIndex]-1]
+		);
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
+		    * timeMult;	
+	    }
+        }	
+    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
new file mode 100644
index 0000000000..3313587706
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = StokesIIFun :: U 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                waveKx, 
+                xGroup[cellGroup[cellIndex]-1], 
+                waveKy, 
+                yGroup[cellGroup[cellIndex]-1], 
+                waveOmega, 
+                currTime, 
+                wavePhase_, 
+                patchHeight[cellIndex]
+            );
+
+        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
+        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
+
+        patchW[cellIndex] = StokesIIFun :: W 
+	    (
+                waveHeight_, 
+                RealwaterDepth_, 
+                waveKx, 
+                xGroup[cellGroup[cellIndex]-1], 
+                waveKy, 
+                yGroup[cellGroup[cellIndex]-1], 
+                waveOmega, 
+                currTime, 
+                wavePhase_, 
+                patchHeight[cellIndex]
+            );
+
+        patchW[cellIndex] = patchW[cellIndex]*timeMult;
+
+    }
+    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = 0.0;
+        patchV[cellIndex] = 0.0;
+        patchW[cellIndex] = 0.0;
+    } 
+    else 
+    {	
+	if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    < measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		    - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = StokesIIFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle)*timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle)*timeMult;
+
+		patchW[cellIndex] = StokesIIFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	patchHeight[cellIndex]
+                    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+	    }
+	}
+	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
+	    > measuredLevels[cellGroup[cellIndex]-1] )
+	{
+	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+	    {
+	        patchU[cellIndex] = StokesIIFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchV[cellIndex] = patchU[cellIndex] 
+		    * sin(waveAngle)*timeMult;
+		patchU[cellIndex] = patchU[cellIndex] 
+		    * cos(waveAngle)*timeMult;
+
+		patchW[cellIndex] = StokesIIFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                   );
+
+		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
+	    }
+	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+		    - zInf[cellIndex];
+		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+		auxiliarTotal = auxiliar/auxiliarTotal;
+
+		patchU[cellIndex] = StokesIIFun :: U 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * sin(waveAngle) * timeMult;
+		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+		    * cos(waveAngle) * timeMult;
+
+		patchW[cellIndex] = StokesIIFun :: W 
+		    (
+                        waveHeight_, 
+                    	RealwaterDepth_, 
+                    	waveKx, 
+                    	xGroup[cellGroup[cellIndex]-1], 
+                    	waveKy, 
+                    	yGroup[cellGroup[cellIndex]-1], 
+                    	waveOmega, 
+                    	currTime, 
+                    	wavePhase_, 
+                    	measuredLevels[cellGroup[cellIndex]-1]
+                    );
+
+		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+	    }
+        }		
+    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
new file mode 100644
index 0000000000..00e593aa12
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = stokesVFun :: U 
+	(
+            RealwaterDepth_, 
+            waveKx, 
+            waveKy, 
+            lambdaStokesV_, 
+            wavePeriod_, 
+            xGroup[cellGroup[cellIndex]-1], 
+            yGroup[cellGroup[cellIndex]-1], 
+            currTime, 
+            wavePhase_, 
+            patchHeight[cellIndex]
+        );
+
+        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
+        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
+
+        patchW[cellIndex] = stokesVFun :: W 
+	(
+            RealwaterDepth_, 
+            waveKx, 
+            waveKy, 
+            lambdaStokesV_, 
+            wavePeriod_, 
+            xGroup[cellGroup[cellIndex]-1], 
+            yGroup[cellGroup[cellIndex]-1], 
+            currTime, 
+            wavePhase_, 
+            patchHeight[cellIndex]
+        );
+
+        patchW[cellIndex] = patchW[cellIndex]*timeMult;
+
+    }
+    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
+    {
+        patchU[cellIndex] = 0.0;
+        patchV[cellIndex] = 0.0;
+        patchW[cellIndex] = 0.0;
+    } 
+    else 
+    {	
+        if ( calculatedLevel[cellGroup[cellIndex]-1] < 
+            measuredLevels[cellGroup[cellIndex]-1] )
+        {
+            if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+	            - zInf[cellIndex];
+	        auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+	        auxiliarTotal = auxiliar/auxiliarTotal;
+    
+	        patchU[cellIndex] = stokesVFun :: U 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+	            xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    patchHeight[cellIndex]
+                );
+
+	        patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+	            * sin(waveAngle)*timeMult;
+	        patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+	            * cos(waveAngle)*timeMult;
+
+	        patchW[cellIndex] = stokesVFun :: W 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+	    	    xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    patchHeight[cellIndex]
+                );
+
+		    patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		        * timeMult;	
+            }
+        }
+        else if ( calculatedLevel[cellGroup[cellIndex]-1] 
+            > measuredLevels[cellGroup[cellIndex]-1] )
+        {
+	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
+            {
+	        patchU[cellIndex] = stokesVFun :: U 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_,    
+                    wavePeriod_, 
+	            xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    measuredLevels[cellGroup[cellIndex]-1]
+                );
+
+       	        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
+		    * timeMult;
+                patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
+		    * timeMult;
+
+	        patchW[cellIndex] = stokesVFun :: W 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy,    
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+                    xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    measuredLevels[cellGroup[cellIndex]-1]
+                );
+
+	        patchW[cellIndex] = patchW[cellIndex]*timeMult;			
+	    }
+	    else if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
+	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
+	    {
+	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
+	            - zInf[cellIndex];
+	        auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
+	        auxiliarTotal = auxiliar/auxiliarTotal;
+
+	        patchU[cellIndex] = stokesVFun :: U 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+                    xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    measuredLevels[cellGroup[cellIndex]-1]
+                );
+    
+	        patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+	            * sin(waveAngle) * timeMult;
+	        patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
+	            * cos(waveAngle) * timeMult;
+
+	        patchW[cellIndex] = stokesVFun :: W 
+		(
+                    RealwaterDepth_, 
+                    waveKx, 
+                    waveKy, 
+                    lambdaStokesV_, 
+                    wavePeriod_, 
+                    xGroup[cellGroup[cellIndex]-1], 
+                    yGroup[cellGroup[cellIndex]-1], 
+                    currTime, 
+                    wavePhase_, 
+                    measuredLevels[cellGroup[cellIndex]-1]
+                );
+
+	        patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
+		    * timeMult;	
+	    }
+        }		
+    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
new file mode 100644
index 0000000000..1473aa8eb1
--- /dev/null
+++ b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
+   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
+
+   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
+               Gabriel Barajas   (barajasg@unican.es)
+\*---------------------------------------------------------------------------*/
+
+if ( waveType_ == "regular" )
+{
+    if ( waveTheory_ == "StokesI" )
+    {
+        #include "profileStokesI.H"
+        #include "profileGENAB.H"
+    }
+    else if ( waveTheory_ == "StokesII" )
+    {
+        #include "profileStokesII.H"
+        #include "profileGENAB.H"
+    }
+    else if ( waveTheory_ == "StokesV" )
+    {
+        #include "profileStokesV.H"
+        #include "profileGENAB.H"
+    }
+    else if ( waveTheory_ == "Cnoidal" )
+    {
+        #include "profileCnoidal.H"
+        #include "profileGENAB.H"
+    }
+}
+else if ( waveType_ == "solitary" )
+{
+    #include "profileBoussinesq.H"
+    #include "profileGENAB.H"
+}
diff --git a/integration/genAbs/waveGeneration/Make/files b/integration/genAbs/waveGeneration/Make/files
new file mode 100644
index 0000000000..0d13760da9
--- /dev/null
+++ b/integration/genAbs/waveGeneration/Make/files
@@ -0,0 +1,5 @@
+IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
+IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
+../common/waveFun.C
+
+LIB = $(FOAM_USER_LIBBIN)/libIHwaveGenerationV2esi
diff --git a/integration/genAbs/waveGeneration/Make/options b/integration/genAbs/waveGeneration/Make/options
new file mode 100644
index 0000000000..d09270c43b
--- /dev/null
+++ b/integration/genAbs/waveGeneration/Make/options
@@ -0,0 +1,16 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
+
+EXE_INC = \
+    -DOFVERSION=$(OF_VERSION) \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I./IH_Waves_InletVelocity/velProfiles \
+    -I./IH_Waves_InletVelocityWind/velProfilesWind \
+    -I../common \
+    -I../common/checks \
+    -I../common/calculateWaterLevel \
+     $(PFLAGS) $(PINC)
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    $(PLIBS)
diff --git a/integration/genAbs/waveGeneration/localMake b/integration/genAbs/waveGeneration/localMake
new file mode 100755
index 0000000000..1b24c72f88
--- /dev/null
+++ b/integration/genAbs/waveGeneration/localMake
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ $WM_PROJECT == "foam" ]; then
+    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
+else
+    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
+fi
+
+#IHC_dbg
+echo $ofversion
+#----
+
+export OF_VERSION=$ofversion
+
+wclean
+
+wmake libso
+
+if (( $? )) ; then 
+    echo "\n\nIH Wave generation boundary conditions (V2.0) compilation failed"
+    exit; else
+    echo -e "\n\nIH Wave generation boundary conditions (V2.0) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
+fi
+
+wclean

From b3b070420249d7f1cf82d2df7c4a3413280fd69d Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 16 Nov 2016 14:05:46 +0000
Subject: [PATCH 02/18] ENH: Initial integration of IHCantrabria wave
 functionality

- Wave models significantly restructured and refactored into a hierarchy of run-time selecatable models
- Gravity no longer hard-coded
- Ability to use any direction as the gravity direction
- Boundary conditions simplified and take reference to the wave model
  - removes a lot of code duplication and new code is ~30% faster
- Removed unused functions

Requires further testing
- Restart behaviour needs to be addressed
---
 integration/OpenCFD/code/Allwclean            |   5 +
 integration/OpenCFD/code/Allwmake             |   5 +
 integration/OpenCFD/code/waveBCs/Make/files   |   4 +
 integration/OpenCFD/code/waveBCs/Make/options |  11 +
 ...sorptionOutletVelocityFvPatchVectorField.C | 174 ++++
 ...sorptionOutletVelocityFvPatchVectorField.H | 174 ++++
 .../waveInletAlphaFvPatchScalarField.C        | 167 ++++
 .../waveInletAlphaFvPatchScalarField.H        | 174 ++++
 .../waveInletVelocityFvPatchVectorField.C     | 167 ++++
 .../waveInletVelocityFvPatchVectorField.H     | 173 ++++
 integration/OpenCFD/code/waveModel/Make/files |  18 +
 .../OpenCFD/code/waveModel/Make/options       |   6 +
 .../waveAbsorptionModel/waveAbsorptionModel.C |  80 ++
 .../waveAbsorptionModel/waveAbsorptionModel.H |  95 ++
 .../shallowWaterAbsorption.C                  | 114 +++
 .../shallowWaterAbsorption.H                  | 110 +++
 .../base/regularWaveModel/regularWaveModel.C  | 126 +++
 .../base/regularWaveModel/regularWaveModel.H  | 116 +++
 .../solitaryWaveModel/solitaryWaveModel.C     |  91 ++
 .../solitaryWaveModel/solitaryWaveModel.H     |  99 ++
 .../waveGenerationModel/waveGenerationModel.C | 107 +++
 .../waveGenerationModel/waveGenerationModel.H | 107 +++
 .../derived/Boussinesq/BoussinesqWaveModel.C  | 251 +++++
 .../derived/Boussinesq/BoussinesqWaveModel.H  | 145 +++
 .../derived/StokesI/StokesIWaveModel.C        | 238 +++++
 .../derived/StokesI/StokesIWaveModel.H        | 138 +++
 .../derived/StokesII/StokesIIWaveModel.C      | 181 ++++
 .../derived/StokesII/StokesIIWaveModel.H      | 128 +++
 .../derived/StokesV/StokesVWaveModel.C        | 895 ++++++++++++++++++
 .../derived/StokesV/StokesVWaveModel.H        | 227 +++++
 .../derived/cnoidal/Elliptic.H                | 152 +++
 .../derived/cnoidal/cnoidalWaveModel.C        | 367 +++++++
 .../derived/cnoidal/cnoidalWaveModel.H        | 174 ++++
 .../code/waveModel/waveModel/waveModel.C      | 427 +++++++++
 .../code/waveModel/waveModel/waveModel.H      | 256 +++++
 .../code/waveModel/waveModel/waveModelNew.C   | 103 ++
 36 files changed, 5805 insertions(+)
 create mode 100755 integration/OpenCFD/code/Allwclean
 create mode 100755 integration/OpenCFD/code/Allwmake
 create mode 100644 integration/OpenCFD/code/waveBCs/Make/files
 create mode 100644 integration/OpenCFD/code/waveBCs/Make/options
 create mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
 create mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
 create mode 100644 integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
 create mode 100644 integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
 create mode 100644 integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
 create mode 100644 integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
 create mode 100644 integration/OpenCFD/code/waveModel/Make/files
 create mode 100644 integration/OpenCFD/code/waveModel/Make/options
 create mode 100644 integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveModel/waveModel.C
 create mode 100644 integration/OpenCFD/code/waveModel/waveModel/waveModel.H
 create mode 100644 integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C

diff --git a/integration/OpenCFD/code/Allwclean b/integration/OpenCFD/code/Allwclean
new file mode 100755
index 0000000000..6ec5fd120d
--- /dev/null
+++ b/integration/OpenCFD/code/Allwclean
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+wclean libso waveModel
+wclean libso waveBCs
diff --git a/integration/OpenCFD/code/Allwmake b/integration/OpenCFD/code/Allwmake
new file mode 100755
index 0000000000..19e81851d1
--- /dev/null
+++ b/integration/OpenCFD/code/Allwmake
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+wmake libso waveModel
+wmake libso waveBCs
diff --git a/integration/OpenCFD/code/waveBCs/Make/files b/integration/OpenCFD/code/waveBCs/Make/files
new file mode 100644
index 0000000000..734e8d76a9
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/Make/files
@@ -0,0 +1,4 @@
+waveInletVelocity/waveInletVelocityFvPatchVectorField.C
+waveInletAlpha/waveInletAlphaFvPatchScalarField.C
+
+LIB = $(FOAM_USER_LIBBIN)/libwaveBCs
diff --git a/integration/OpenCFD/code/waveBCs/Make/options b/integration/OpenCFD/code/waveBCs/Make/options
new file mode 100644
index 0000000000..0490e0a2c6
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/Make/options
@@ -0,0 +1,11 @@
+DEV_PATH = ..
+
+EXE_INC = \
+    -DFULLDEBUG -g -O0 \
+    -I$(DEV_PATH)/waveModel/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -L$(FOAM_USER_LIBBIN) \
+        -lwaveModels \
+    -lfiniteVolume
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..e9c8107ff4
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveAbsorptionOutletVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+
+Foam::waveModel&
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::getWaveModel()
+{
+    // Return waveModel from database if present, or create
+
+    if (!waveModel_.valid())
+    {
+        waveModel_ =
+            waveModel::lookupOrCreate
+            (
+                patch().patch(),
+                internalField().mesh(),
+                waveDictName_
+            );
+    }
+
+    return waveModel_.ref();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
+waveAbsorptionOutletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    waveDictName_(waveModel::dictName),
+    waveModelPtr_()
+{}
+
+
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
+waveAbsorptionOutletVelocityFvPatchVectorField
+(
+    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    waveDictName_(ptf.waveDictName_),
+    waveModelPtr_()
+{}
+
+
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
+waveAbsorptionOutletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
+    waveModelPtr_()
+{}
+
+
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
+waveAbsorptionOutletVelocityFvPatchVectorField
+(
+    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    waveDictName_(ptf.waveDictName_),
+    waveModelPtr_()
+{}
+
+
+Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
+waveAbsorptionOutletVelocityFvPatchVectorField
+(
+    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    waveDictName_(ptf.waveDictName_),
+    waveModelPtr_()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    tmp<waveModel> tmodel
+    (
+        waveModel::lookupOrCreate
+        (
+            patch().patch(),
+            internalField().mesh(),
+            waveDictName_
+        )
+    );
+
+    waveModel& model = const_cast<waveModel&>(tmodel());
+
+    model.correct(db().time().value());
+
+    operator == (model.U());
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_
+        << token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       waveAbsorptionOutletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..1f050ce6f8
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveAbsorptionOutletVelocityFvPatchVectorField
+
+Description
+    Example of the boundary condition specification:
+    \verbatim
+    inlet
+    {
+        type            waveAbsorptionOutletVelocity;
+        waveDict        wavesDict;
+        value           uniform (0 0 0);
+	    leftORright	      1.0;
+    }
+    \endverbatim
+
+Usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type: waveAbsorptionOutletVelocity | yes         |
+        waveDict     | Dictionary where variables for generation/absorption are defined | yes | waveDict
+	    leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
+    \endtable
+
+Note
+    - The value is positive inwards
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
+
+SourceFiles
+    waveAbsorptionOutletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveAbsorptionOutletVelocityFvPatchVectorField_H
+#define waveAbsorptionOutletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "waveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+       Class waveAbsorptionOutletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveAbsorptionOutletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Dictionary name
+        word waveDictName_;
+
+        //- Pointer to the wave model
+        tmp<waveModel> waveModel_;
+
+        //- Help function to retrieve the wave model
+        waveModel& getWaveModel();
+
+
+public:
+
+   //- Runtime type information
+   TypeName("waveAbsorptionOutletVelocity");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        waveAbsorptionOutletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        waveAbsorptionOutletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  waveAbsorptionOutletVelocityFvPatchVectorField
+        //  onto a new patch
+        waveAbsorptionOutletVelocityFvPatchVectorField
+        (
+            const waveAbsorptionOutletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        waveAbsorptionOutletVelocityFvPatchVectorField
+        (
+            const waveAbsorptionOutletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new waveAbsorptionOutletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        waveAbsorptionOutletVelocityFvPatchVectorField
+        (
+            const waveAbsorptionOutletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new waveAbsorptionOutletVelocityFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
new file mode 100644
index 0000000000..b9d27cf73f
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveInletAlphaFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::waveModel& Foam::waveInletAlphaFvPatchScalarField::getWaveModel()
+{
+    // Return waveModel from database if present, or create
+
+    if (!waveModel_.valid())
+    {
+        waveModel_ =
+            waveModel::lookupOrCreate
+            (
+                patch().patch(),
+                internalField().mesh(),
+                waveDictName_
+            );
+    }
+
+    return waveModel_.ref();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF),
+    waveDictName_(waveModel::dictName),
+    waveModel_()
+{}
+
+
+Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+(
+    const waveInletAlphaFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF, dict),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
+    waveModel_()
+{}
+
+
+Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+(
+    const waveInletAlphaFvPatchScalarField& ptf
+)
+:
+    fixedValueFvPatchField<scalar>(ptf),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+(
+    const waveInletAlphaFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, iF),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::waveInletAlphaFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    tmp<waveModel> tmodel
+    (
+        waveModel::lookupOrCreate
+        (
+            patch().patch(),
+            internalField().mesh(),
+            waveDictName_
+        )
+    );
+
+    waveModel& model = const_cast<waveModel&>(tmodel());
+
+    model.correct(db().time().value());
+
+    operator == (model.alpha());
+
+    fixedValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void Foam::waveInletAlphaFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_
+        << token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchScalarField,
+       waveInletAlphaFvPatchScalarField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
new file mode 100644
index 0000000000..b654bd60c8
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveInletAlphaFvPatchScalarField
+
+Description
+
+    Example of the boundary condition specification:
+    \verbatim
+    inlet
+    {
+        type            waveInletAlpha;
+        value           uniform (0 0 0);
+	    leftORright	      1.0;
+    }
+    \endverbatim
+
+Usage
+    \table
+        Property    | Description          | Required    | Default value
+        type        | type: waveInletAlpha | yes         |
+        waveDict    | Dictionary specifying wave variables | no | waveProperties
+	    leftORright | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
+    \endtable
+
+Note
+    - The value is positive inwards
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
+
+SourceFiles
+    waveInletAlphaFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveInletAlphaFvPatchScalarField_H
+#define waveInletAlphaFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "waveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+              class waveInletAlphaFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveInletAlphaFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Dictionary name
+        word waveDictName_;
+
+        //- Pointer to the wave model
+        tmp<waveModel> waveModel_;
+
+        //- Help function to retrieve the wave model
+        waveModel& getWaveModel();
+
+
+public:
+
+   //- Runtime type information
+   TypeName("waveInletAlpha");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        waveInletAlphaFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        waveInletAlphaFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  waveInletAlphaFvPatchScalarField
+        //  onto a new patch
+        waveInletAlphaFvPatchScalarField
+        (
+            const waveInletAlphaFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        waveInletAlphaFvPatchScalarField
+        (
+            const waveInletAlphaFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new waveInletAlphaFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        waveInletAlphaFvPatchScalarField
+        (
+            const waveInletAlphaFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new waveInletAlphaFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..78df5763ed
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveInletVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::waveModel& Foam::waveInletVelocityFvPatchVectorField::getWaveModel()
+{
+    // Return waveModel from database if present, or create
+
+    if (!waveModel_.valid())
+    {
+        waveModel_ =
+            waveModel::lookupOrCreate
+            (
+                patch().patch(),
+                internalField().mesh(),
+                waveDictName_
+            );
+    }
+
+    return waveModel_.ref();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    waveDictName_(waveModel::dictName),
+    waveModel_()
+{}
+
+
+Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+(
+    const waveInletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
+    waveModel_()
+{}
+
+
+Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+(
+    const waveInletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+(
+    const waveInletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    waveDictName_(ptf.waveDictName_),
+    waveModel_()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::waveInletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    tmp<waveModel> tmodel
+    (
+        waveModel::lookupOrCreate
+        (
+            patch().patch(),
+            internalField().mesh(),
+            waveDictName_
+        )
+    );
+
+    waveModel& model = const_cast<waveModel&>(tmodel());
+
+    model.correct(db().time().value());
+
+    operator == (model.U());
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::waveInletVelocityFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("waveDictName") << waveDictName_
+        << token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       waveInletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..faa42bee7b
--- /dev/null
+++ b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveInletVelocityFvPatchVectorField
+
+Description
+    Example of the boundary condition specification:
+    \verbatim
+    inlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+	    leftORright	      1.0;
+    }
+    \endverbatim
+
+Usage
+    \table
+        Property    | Description             | Required   | Default value
+        type        | type: waveInletVelocity | yes        |
+        waveDict    | Dictionary specifying wave variables | no | waveProperties
+	    leftORright | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
+    \endtable
+
+Note
+    - The value is positive inwards
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
+
+SourceFiles
+    waveInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveInletVelocityFvPatchVectorField_H
+#define waveInletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "waveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+             Class waveInletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveInletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Dictionary name
+        word waveDictName_;
+
+        //- Pointer to the wave model
+        tmp<waveModel> waveModel_;
+
+        //- Help function to retrieve the wave model
+        waveModel& getWaveModel();
+
+
+public:
+
+   //- Runtime type information
+   TypeName("waveInletVelocity");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        waveInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        waveInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  waveInletVelocityFvPatchVectorField
+        //  onto a new patch
+        waveInletVelocityFvPatchVectorField
+        (
+            const waveInletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        waveInletVelocityFvPatchVectorField
+        (
+            const waveInletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new waveInletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        waveInletVelocityFvPatchVectorField
+        (
+            const waveInletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new waveInletVelocityFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/Make/files b/integration/OpenCFD/code/waveModel/Make/files
new file mode 100644
index 0000000000..36161a0045
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/Make/files
@@ -0,0 +1,18 @@
+waveModel/waveModel.C
+waveModel/waveModelNew.C
+
+waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
+waveGenerationModels/base/regularWaveModel/regularWaveModel.C
+waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
+waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
+waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
+waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
+waveGenerationModels/derived/StokesI/StokesIWaveModel.C
+waveGenerationModels/derived/StokesV/StokesVWaveModel.C
+
+
+waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
+waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
+
+
+LIB = $(FOAM_USER_LIBBIN)/libwaveModels
diff --git a/integration/OpenCFD/code/waveModel/Make/options b/integration/OpenCFD/code/waveModel/Make/options
new file mode 100644
index 0000000000..856294218d
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/Make/options
@@ -0,0 +1,6 @@
+EXE_INC = \
+    -DFULLDEBUG -g -O0 \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
new file mode 100644
index 0000000000..6bb712abd6
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveAbsorptionModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(waveAbsorptionModel, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::waveAbsorptionModel::waveAbsorptionModel
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    waveModel(dict, mesh, patch, false)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::waveAbsorptionModel::~waveAbsorptionModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::waveAbsorptionModel::read()
+{
+    if (waveModel::read())
+    {
+        // Note: always set to true
+        activeAbsorption_ = true;
+
+        return true;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
new file mode 100644
index 0000000000..0f60c8c778
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveAbsorptionModel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_waveAbsorptionModel_H
+#define waveModels_waveAbsorptionModel_H
+
+#include "waveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class waveAbsorptionModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveAbsorptionModel
+:
+    public waveModel
+{
+protected:
+
+    // Protected Member Functions
+
+        //- Wave direction
+        virtual scalar direction() const
+        {
+            return -1;
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("waveAbsorptionModel");
+
+    //- Constructor
+    waveAbsorptionModel
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~waveAbsorptionModel();
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
new file mode 100644
index 0000000000..9fb497d04e
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "shallowWaterAbsorption.H"
+#include "volFields.H"
+#include "fvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(shallowWaterAbsorption, 0);
+    addToRunTimeSelectionTable(waveModel, shallowWaterAbsorption, patch);
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::waveModels::shallowWaterAbsorption::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    level = waterDepthRef_;
+}
+
+
+void Foam::waveModels::shallowWaterAbsorption::setVelocity
+(
+    const scalar t,
+    const scalar tCoeff,
+    const scalarField& level
+)
+{
+    U_ = vector::zero;
+}
+
+
+void Foam::waveModels::shallowWaterAbsorption::setAlpha
+(
+    const scalarField& level
+)
+{
+    // Set alpha as zero-gradient
+    const volScalarField& alpha =
+        mesh_.lookupObject<volScalarField>(alphaName_);
+
+    alpha_ = alpha.boundaryField()[patch_.index()].patchInternalField();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::shallowWaterAbsorption::shallowWaterAbsorption
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    waveAbsorptionModel(dict, mesh, patch, false)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::shallowWaterAbsorption::~shallowWaterAbsorption()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::shallowWaterAbsorption::read()
+{
+    return waveAbsorptionModel::read();
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
new file mode 100644
index 0000000000..8db9d45cc3
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::shallowWaterAbsorption
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_shallowWaterAbsorption_H
+#define waveModels_shallowWaterAbsorption_H
+
+#include "waveAbsorptionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class shallowWaterAbsorption Declaration
+\*---------------------------------------------------------------------------*/
+
+class shallowWaterAbsorption
+:
+    public waveAbsorptionModel
+{
+protected:
+
+    // Protected Member Functions
+
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        );
+
+        //- Set the alpha field based on the water level
+        virtual void setAlpha(const scalarField& level);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("shallowWaterAbsorption");
+
+    //- Constructor
+    shallowWaterAbsorption
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~shallowWaterAbsorption();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
new file mode 100644
index 0000000000..1d877175ea
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regularWaveModel.H"
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(regularWaveModel, 0);
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::word Foam::waveModels::regularWaveModel::waveType() const
+{
+    scalar waveK = 2.0*mathematical::pi/waveLength_;
+
+    word generation = "Intermediate";
+    if (waveK*waterDepthRef_ > mathematical::pi)
+    {
+        generation = "Deep";
+    }
+    else if (waveK*waterDepthRef_ < 0.1*mathematical::pi)
+    {
+        generation = "Shallow";
+    }
+
+    return generation;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::regularWaveModel::regularWaveModel
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    waveGenerationModel(dict, mesh, patch, false),
+    wavePeriod_(0),
+    waveLength_(0),
+    wavePhase_(1.5*mathematical::pi)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::regularWaveModel::~regularWaveModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::regularWaveModel::read()
+{
+    if (waveGenerationModel::read())
+    {
+        lookup("wavePeriod") >> wavePeriod_;
+        if (wavePeriod_ < 0)
+        {
+            FatalIOErrorInFunction(*this)
+                << "Wave period must be greater than zero.  Supplied"
+                << " value wavePeriod = " << wavePeriod_
+                << exit(FatalIOError);
+        }
+
+        readIfPresent("wavePhase", wavePhase_);
+
+        // Note: waveLength to be set in derived classes
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::regularWaveModel::info(Ostream& os) const
+{
+    waveGenerationModel::info(os);
+
+    os  << "    Wave period : " << wavePeriod_ << nl
+        << "    Wave length : " << waveLength_ << nl
+        << "    Wave phase : " << wavePhase_ << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
new file mode 100644
index 0000000000..64404b9f46
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::regularWaveModel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_reguarWaveModel_H
+#define waveModels_reguarWaveModel_H
+
+#include "waveGenerationModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class regularWaveModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class regularWaveModel
+:
+    public waveGenerationModel
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regularWaveModel(const regularWaveModel&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regularWaveModel&);
+
+
+protected:
+
+    // Protected data
+
+        //- Wave period
+        scalar wavePeriod_;
+
+        //- Wavelength
+        scalar waveLength_;
+
+        //- Wave phase
+        scalar wavePhase_;
+
+    // Protected Member Functions
+
+        //- Return word description of wave type
+        word waveType() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regularWaveModel");
+
+
+    //- Constructor
+    regularWaveModel
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~regularWaveModel();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
new file mode 100644
index 0000000000..4ea1bf7212
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "solitaryWaveModel.H"
+#include "polyPatch.H"
+#include "SubField.H"
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(solitaryWaveModel, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::solitaryWaveModel::solitaryWaveModel
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    waveGenerationModel(dict, mesh, patch, false),
+    x_
+    (
+        patch.faceCentres().component(0)*cos(waveAngle_)
+      + patch.faceCentres().component(1)*sin(waveAngle_)
+    ),
+    x0_(gMin(x_))
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::solitaryWaveModel::~solitaryWaveModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::solitaryWaveModel::read()
+{
+    if (waveGenerationModel::read())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::solitaryWaveModel::info(Ostream& os) const
+{
+    waveGenerationModel::info(os);
+
+    os << "    x0: " << x0_ << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
new file mode 100644
index 0000000000..4ac086f5f4
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::solitaryWaveModel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_solitaryWaveModel_H
+#define waveModels_solitaryWaveModel_H
+
+#include "waveGenerationModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class solitaryWaveModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class solitaryWaveModel
+:
+    public waveGenerationModel
+{
+
+protected:
+
+    // Protected data
+
+        //-
+        const scalarField& x_;
+
+        const scalar x0_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("solitaryWaveModel");
+
+
+    //- Constructor
+    solitaryWaveModel
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~solitaryWaveModel();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
new file mode 100644
index 0000000000..daed9a9138
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveGenerationModel.H"
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(waveGenerationModel, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::waveGenerationModel::waveGenerationModel
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    waveModel(dict, mesh, patch, false),
+    waveHeight_(0),
+    waveAngle_(0)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::waveGenerationModel::~waveGenerationModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::waveGenerationModel::read()
+{
+    if (waveModel::read())
+    {
+        lookup("rampTime") >> rampTime_;
+        lookup("activeAbsorption") >> activeAbsorption_;
+
+        lookup("waveHeight") >> waveHeight_;
+        if (waveHeight_ < 0)
+        {
+            FatalIOErrorInFunction(*this)
+                << "Wave height must be greater than zero.  Supplied"
+                << " value waveHeight = " << waveHeight_
+                << exit(FatalIOError);
+        }
+
+        lookup("waveAngle") >> waveAngle_;
+        waveAngle_ *= mathematical::pi/180;
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::waveGenerationModel::info(Ostream& os) const
+{
+    waveModel::info(os);
+
+    os  << "    Ramp time : " << rampTime_ << nl
+        << "    Wave height : " << waveHeight_ << nl
+        << "    Wave angle  : " << 180/mathematical::pi*waveAngle_ << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
new file mode 100644
index 0000000000..267aa1e83c
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveGenerationModel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_waveGenerationModel_H
+#define waveModels_waveGenerationModel_H
+
+#include "waveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class waveGenerationModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveGenerationModel
+:
+    public waveModel
+{
+protected:
+
+    // Protected data
+
+        //- Wave height / [m]
+        scalar waveHeight_;
+
+        //- Wave angle / [rad]  (read in degrees)
+        scalar waveAngle_;
+
+
+    // Protected Member Functions
+
+        //- Wave direction
+        virtual scalar direction() const
+        {
+            return 1;
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("waveGenerationModel");
+
+    //- Constructor
+    waveGenerationModel
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~waveGenerationModel();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
new file mode 100644
index 0000000000..d4e13db390
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "BoussinesqWaveModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(Boussinesq, 0);
+    addToRunTimeSelectionTable
+    (
+        waveModel,
+        Boussinesq,
+        patch
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::Boussinesq::eta
+(
+    const scalar H,
+    const scalar h,
+    const scalar x,
+    const scalar y,
+    const scalar theta,
+    const scalar t,
+    const scalar X0
+) const
+{
+    scalar C = sqrt(mag(g_)*(H + h));
+    scalar ts = 3.5*h/sqrt(H/h);
+    scalar aux = sqrt(3.0*H/(4.0*h))/h;
+    scalar Xa = -C*t + ts - X0 + x*cos(theta) + y*sin(theta);
+
+    return H*1.0/sqr(cosh(aux*Xa));
+}
+
+
+Foam::vector Foam::waveModels::Boussinesq::Deta
+(
+    const scalar H,
+    const scalar h,
+    const scalar x,
+    const scalar y,
+    const scalar theta,
+    const scalar t,
+    const scalar X0
+) const
+{
+    vector deta(vector::zero);
+
+    scalar C = sqrt(mag(g_)*(H + h));
+    scalar ts = 3*h/sqrt(H/h);
+    scalar a = sqrt(3*H/(4*h))/h;
+    scalar Xa = -C*t + ts - X0 + x*cos(theta) + y*sin(theta);
+    scalar expTerm = exp(2*a*Xa);
+    scalar b = 8*a*h*expTerm;
+
+    deta[0] =
+        b*(1 - expTerm)
+       /pow3(1 + expTerm);
+
+    deta[1] =
+        2*a*b*(exp(4*a*Xa) - 4*expTerm + 1)
+       /pow4(1 + expTerm);
+
+    deta[2] =
+       -4*sqr(a)*b*(exp(6*a*Xa) - 11*exp(4*a*Xa) + 11*expTerm - 1)
+       /pow5(1 + expTerm);
+
+    return deta;
+}
+
+
+Foam::vector Foam::waveModels::Boussinesq::U
+(
+    const scalar H,
+    const scalar h,
+    const scalar x,
+    const scalar y,
+    const scalar theta,
+    const scalar t,
+    const scalar X0,
+    const scalar z
+) const
+{
+    scalar C = sqrt(mag(g_)*(H + h));
+    scalar eta = this->eta(H, h, x, y, theta, t, X0);
+    vector Deta = this->Deta(H, h, x, y, theta, t, X0);
+
+    scalar u =
+        C*eta/h
+       *(
+            1.0
+          - eta/(4.0*h)
+          + sqr(h)/(3.0*eta)*(1.0 - 3.0/2.0*sqr(z/h))*Deta[1]
+        );
+
+    scalar w =
+       -C*z/h
+       *(
+            (1.0 - eta/(2.0*h))*Deta[0]
+          + sqr(h)/3.0*(1.0 - 1.0/2.0*sqr(z/h))*Deta[2]
+        );
+
+    scalar v = u*sin(waveAngle_);
+    u *= cos(waveAngle_);
+
+    return vector(u, v, w);
+}
+
+
+void Foam::waveModels::Boussinesq::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    forAll(level, paddlei)
+    {
+        const scalar eta =
+            this->eta
+            (
+                waveHeight_,
+                waterDepthRef_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                waveAngle_,
+                t,
+                x0_
+            );
+
+        level[paddlei] = waterDepthRef_ + tCoeff*eta;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::Boussinesq::Boussinesq
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    solitaryWaveModel(dict, mesh, patch, false)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::Boussinesq::~Boussinesq()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::Boussinesq::read()
+{
+    if (solitaryWaveModel::read())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::Boussinesq::setVelocity
+(
+    const scalar t,
+    const scalar tCoeff,
+    const scalarField& level
+)
+{
+    forAll(U_, facei)
+    {
+        // Fraction of geometry represented by paddle - to be set
+        scalar fraction = 1;
+
+        // Height - to be set
+        scalar z = 0;
+
+        setPaddlePropeties(level, facei, fraction, z);
+
+        if (fraction > 0)
+        {
+            const label paddlei = faceToPaddle_[facei];
+
+            const vector Uf = U
+	        (
+                waveHeight_,
+                waterDepthRef_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                waveAngle_,
+                t,
+                x0_,
+                z
+            );
+
+            U_[facei] = fraction*Uf*tCoeff;
+        }
+    }
+}
+
+
+void Foam::waveModels::Boussinesq::info(Ostream& os) const
+{
+    solitaryWaveModel::info(os);
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
new file mode 100644
index 0000000000..10ff402446
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::Boussinesq
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_Boussinesq_H
+#define waveModels_Boussinesq_H
+
+#include "solitaryWaveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class Boussinesq Declaration
+\*---------------------------------------------------------------------------*/
+
+class Boussinesq
+:
+    public solitaryWaveModel
+{
+protected:
+
+    // Protected Member Functions
+
+        //- Wave height
+        virtual scalar eta
+        (
+            const scalar H,
+            const scalar h,
+            const scalar x,
+            const scalar y,
+            const scalar theta,
+            const scalar t,
+            const scalar X0
+        ) const;
+
+        //- wave
+        virtual vector Deta
+        (
+            const scalar H,
+            const scalar h,
+            const scalar x,
+            const scalar y,
+            const scalar theta,
+            const scalar t,
+            const scalar X0
+        ) const;
+
+        //- Wave velocity
+        virtual vector U
+        (
+            const scalar H,
+            const scalar h,
+            const scalar x,
+            const scalar y,
+            const scalar theta,
+            const scalar t,
+            const scalar X0,
+            const scalar z
+        ) const;
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("Boussinesq");
+
+    //- Constructor
+    Boussinesq
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~Boussinesq();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
new file mode 100644
index 0000000000..79342d182b
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "StokesIWaveModel.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(StokesI, 0);
+    addToRunTimeSelectionTable
+    (
+        waveModel,
+        StokesI,
+        patch
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::StokesI::waveLength
+(
+    const scalar h,
+    const scalar T
+) const
+{
+    scalar L0 = mag(g_)*T*T/(2.0*mathematical::pi);
+    scalar L = L0;
+
+    for (int i=1; i<=100; i++)
+    {
+        L = L0*tanh(2.0*mathematical::pi*h/L);
+    }
+
+    return L;
+}
+
+
+Foam::scalar Foam::waveModels::StokesI::eta
+(
+    const scalar H,
+    const scalar Kx,
+    const scalar x,
+    const scalar Ky,
+    const scalar y,
+    const scalar omega,
+    const scalar t,
+    const scalar phase
+) const
+{
+    scalar phaseTot = Kx*x + Ky*y - omega*t + phase;
+
+    return H*0.5*cos(phaseTot);
+}
+
+Foam::vector Foam::waveModels::StokesI::U
+(
+    const scalar H,
+    const scalar h,
+    const scalar Kx,
+    const scalar x,
+    const scalar Ky,
+    const scalar y,
+    const scalar omega,
+    const scalar t,
+    const scalar phase,
+    const scalar z
+) const
+{
+    scalar k = sqrt(Kx*Kx + Ky*Ky);
+    scalar phaseTot = Kx*x + Ky*y - omega*t + phase;
+
+    scalar u = H*0.5*omega*cos(phaseTot)*cosh(k*z)/sinh(k*h);
+    scalar w = H*0.5*omega*sin(phaseTot)*sinh(k*z)/sinh(k*h);
+    scalar v = u*sin(waveAngle_);
+    u *= cos(waveAngle_);
+
+    return vector(u, v, w);
+}
+
+
+void Foam::waveModels::StokesI::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    const scalar waveOmega = mathematical::twoPi/wavePeriod_;
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(level, paddlei)
+    {
+        const scalar eta =
+            this->eta
+	        (
+                waveHeight_,
+                waveKx,
+                xPaddle_[paddlei],
+                waveKy,
+                yPaddle_[paddlei],
+                waveOmega,
+                t,
+                wavePhase_
+            );
+
+        level[paddlei] = waterDepthRef_ + tCoeff*eta;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesI::StokesI
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    regularWaveModel(dict, mesh, patch, false)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesI::~StokesI()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::StokesI::read()
+{
+    if (regularWaveModel::read())
+    {
+		waveLength_ = waveLength(waterDepthRef_, wavePeriod_);
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::StokesI::setVelocity
+(
+    const scalar t,
+    const scalar tCoeff,
+    const scalarField& level
+)
+{
+    const scalar waveOmega = mathematical::twoPi/wavePeriod_;
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(U_, facei)
+    {
+        // Fraction of geometry represented by paddle - to be set
+        scalar fraction = 1;
+
+        // Height - to be set
+        scalar z = 0;
+
+        setPaddlePropeties(level, facei, fraction, z);
+
+        if (fraction > 0)
+        {
+            const label paddlei = faceToPaddle_[facei];
+
+            const vector Uf = U
+	        (
+                waveHeight_,
+                waterDepthRef_,
+                waveKx,
+                xPaddle_[paddlei],
+                waveKy,
+                yPaddle_[paddlei],
+                waveOmega,
+                t,
+                wavePhase_,
+                z
+            );
+
+            U_[facei] = fraction*Uf*tCoeff;
+        }
+    }
+}
+
+
+void Foam::waveModels::StokesI::info(Ostream& os) const
+{
+    regularWaveModel::info(os);
+
+    os  << "    Wave type: " << waveType() << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
new file mode 100644
index 0000000000..6e991c09f4
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::StokesI
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_StokesI_H
+#define waveModels_StokesI_H
+
+#include "regularWaveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class StokesI Declaration
+\*---------------------------------------------------------------------------*/
+
+class StokesI
+:
+    public regularWaveModel
+{
+protected:
+
+    // Protected Member Functions
+
+        //- Return the wavelength
+        virtual scalar waveLength(const scalar h, const scalar T) const;
+
+        virtual scalar eta
+        (
+            const scalar H,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase
+        ) const;
+
+        virtual vector U
+        (
+            const scalar H,
+            const scalar h,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase,
+            const scalar z
+        ) const;
+
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("StokesI");
+
+    //- Constructor
+    StokesI
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~StokesI();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
new file mode 100644
index 0000000000..c50e80c6da
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "StokesIIWaveModel.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(StokesII, 0);
+    addToRunTimeSelectionTable
+    (
+        waveModel,
+        StokesII,
+        patch
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::StokesII::eta
+(
+    const scalar H,
+    const scalar h,
+    const scalar Kx,
+    const scalar x,
+    const scalar Ky,
+    const scalar y,
+    const scalar omega,
+    const scalar t,
+    const scalar phase
+) const
+{
+    const scalar k = sqrt(Kx*Kx + Ky*Ky);
+    const scalar sigma = tanh(k*h);
+    const scalar phaseTot = Kx*x + Ky*y - omega*t + phase;
+
+    return
+        H*0.5*cos(phaseTot)
+      + k*H*H/4.0*(3.0 - sigma*sigma)/(4.0*pow3(sigma))*cos(2.0*phaseTot);
+}
+
+
+Foam::vector Foam::waveModels::StokesII::U
+(
+    const scalar H,
+    const scalar h,
+    const scalar Kx,
+    const scalar x,
+    const scalar Ky,
+    const scalar y,
+    const scalar omega,
+    const scalar t,
+    const scalar phase,
+    const scalar z
+) const
+{
+    const scalar k = sqrt(Kx*Kx + Ky*Ky);
+    const scalar phaseTot = Kx*x + Ky*y - omega*t + phase;
+
+    scalar u =
+        H*0.5*omega*cos(phaseTot)*cosh(k*z)/sinh(k*h)
+      + 3.0/4.0*H*H/4.0*omega*k*cosh(2.0*k*z)/pow4(sinh(k*h))*cos(2.0*phaseTot);
+    scalar w =
+        H*0.5*omega*sin(phaseTot)*sinh(k*z)/sinh(k*h)
+      + 3.0/4.0*H*H/4.0*omega*k*sinh(2.0*k*z)/pow4(sinh(k*h))*sin(2.0*phaseTot);
+    scalar v = u*sin(waveAngle_);
+    u *= cos(waveAngle_);
+
+    return vector(u, v, w);
+}
+
+
+void Foam::waveModels::StokesII::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    const scalar waveOmega = mathematical::twoPi/wavePeriod_;
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(level, paddlei)
+    {
+        const scalar eta =
+            this->eta
+	        (
+                waveHeight_,
+                waterDepthRef_,
+                waveKx,
+                xPaddle_[paddlei],
+                waveKy,
+                yPaddle_[paddlei],
+                waveOmega,
+                t,
+                wavePhase_
+            );
+
+        level[paddlei] = waterDepthRef_ + tCoeff*eta;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesII::StokesII
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    StokesI(dict, mesh, patch, false)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesII::~StokesII()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::StokesII::read()
+{
+    if (StokesI::read())
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::StokesII::info(Ostream& os) const
+{
+    StokesI::info(os);
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
new file mode 100644
index 0000000000..f1f6317270
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::StokesII
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_StokesII_H
+#define waveModels_StokesII_H
+
+#include "StokesIWaveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class StokesII Declaration
+\*---------------------------------------------------------------------------*/
+
+class StokesII
+:
+    public StokesI
+{
+protected:
+
+    // Protected Member Functions
+
+        virtual scalar eta
+        (
+            const scalar H,
+            const scalar h,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase
+        ) const;
+
+        virtual vector U
+        (
+            const scalar H,
+            const scalar h,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase,
+            const scalar z
+        ) const;
+
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("StokesII");
+
+    //- Constructor
+    StokesII
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~StokesII();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
new file mode 100644
index 0000000000..c67b9e7ab1
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
@@ -0,0 +1,895 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "StokesVWaveModel.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(StokesV, 0);
+    addToRunTimeSelectionTable
+    (
+        waveModel,
+        StokesV,
+        patch
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::StokesV::A11
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    return 1.0/s;
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A13
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+    return -sqr(c)*(5*sqr(c) + 1)/(8*pow5(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A15
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+       -(
+            1184*pow(c, 10)
+          - 1440*pow(c, 8)
+          - 1992*pow6(c)
+          + 2641*pow4(c)
+          - 249*sqr(c) + 18
+        )
+       /(1536*pow(s, 11));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A22
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    return 3/(8*pow4(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A24
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (192*pow(c, 8) - 424*pow(c, 6) - 312*pow4(c) + 480*sqr(c) - 17)
+       /(768*pow(s, 10));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A33
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return (13 - 4*sqr(c))/(64*pow(s, 7));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A35
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (
+            512*pow(c, 12)
+          + 4224*pow(c, 10)
+          - 6800*pow(c, 8)
+          - 12808*pow(c, 6)
+          + 16704.0*pow4(c)
+          - 3154*sqr(c)
+          + 107
+        )
+       /(4096*pow(s, 13)*(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A44
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (80*pow(c, 6) - 816*pow4(c) + 1338*sqr(c) - 197)
+       /(1536*pow(s, 10)*(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::A55
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+       -(
+            2880*pow(c, 10)
+          - 72480*pow(c, 8)
+          + 324000*pow(c, 6)
+          - 432000*pow4(c)
+          + 163470*sqr(c)
+          - 16245
+        )
+       /(61440*pow(s, 11)*(6*sqr(c) - 1)*(8*pow4(c) - 11*sqr(c) + 3));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B22
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return (2*sqr(c) + 1)*c/(4*pow3(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B24
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (272*pow(c, 8) - 504*pow(c, 6) - 192*pow4(c) + 322*sqr(c) + 21)*c
+       /(384*pow(s, 9));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B33
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return (8*pow6(c) + 1)*3/(64*pow6(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B33k
+(
+    const scalar h,
+    const scalar k
+) const // d B33 / d k
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    const scalar sk = h*s;
+    const scalar ck = h*c;
+
+    return 9.*pow5(c)*ck/(4*pow6(s)) - (9*(8*pow6(c) + 1))/(32*pow(s, 7))*sk;
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B35
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (
+            88128*pow(c, 14)
+          - 208224*pow(c, 12)
+          + 70848*pow(c, 10)
+          + 54000*pow(c, 8)
+          - 21816*pow6(c)
+          + 6264*pow4(c)
+          - 54*sqr(c)
+          - 81
+        )
+       /(12288*pow(s, 12)*(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B35k
+(
+    const scalar h,
+    const scalar k
+) const // d B35 / d k
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    const scalar sk = h*s;
+    const scalar ck = h*c;
+
+    return
+        (
+            14*88128*pow(c, 13)*ck
+          - 12*208224*pow(c, 11)*ck
+          + 10*70848*pow(c, 9)*ck
+          + 8*54000.0*pow(c, 7)*ck
+          - 6*21816*pow5(c)*ck
+          + 4*6264*pow3(c)*ck
+          - 2*54*c*ck
+        )
+       /(12288*pow(s, 12)*(6*sqr(c) - 1))
+      - (
+            88128*pow(c, 14)
+          - 208224*pow(c, 12)
+          + 70848*pow(c, 10)
+          + 54000*pow(c, 8)
+          - 21816*pow6(c)
+          + 6264*pow4(c)
+          - 54*sqr(c)
+          - 81
+        )*12
+       /(12288*pow(s, 13)*(6*sqr(c) - 1))*sk
+      - (
+            88128*pow(c,14)
+          - 208224*pow(c, 12)
+          + 70848*pow(c, 10)
+          + 54000*pow(c, 8)
+          - 21816*pow6(c)
+          + 6264*pow4(c)
+          - 54*sqr(c)
+          - 81
+        )*12*c*ck
+       /(12288*pow(s, 12)*sqr(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B44
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (
+            768*pow(c, 10)
+          - 448*pow(c, 8)
+          - 48*pow6(c)
+          + 48*pow4(c)
+          + 106*sqr(c)
+          - 21
+        )*c
+       /(384*pow(s, 9)*(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B55
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (
+            192000*pow(c, 16)
+          - 262720*pow(c, 14)
+          + 83680*pow(c, 12)
+          + 20160*pow(c, 10)
+          - 7280*pow(c, 8)
+          + 7160*pow(c, 6)
+          - 1800*pow(c, 4)
+          - 1050*sqr(c)
+          + 225
+        )
+       /(12288*pow(s, 10)*(6*sqr(c) - 1)*(8*pow4(c) - 11*sqr(c) + 3));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::B55k
+(
+    const scalar h,
+    const scalar k
+) const // d B55 / d k
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    const scalar sk = h*s;
+    const scalar ck = h*c;
+
+    return
+        (
+            16*192000*pow(c, 15)*ck
+          - 14*262720*pow(c, 13)*ck
+          + 12*83680*pow(c, 11)*ck
+          + 10*20160*pow(c, 9)*ck
+          - 8*7280*pow(c, 7)*ck
+          + 6*7160*pow(c, 5)*ck
+          - 4*1800*pow(c, 3)*ck
+          - 2*1050*pow(c,1)*ck
+        )
+       /(12288*pow(s, 10)*(6*sqr(c) - 1)*(8*pow(c, 4) - 11*sqr(c) + 3))
+      - (
+            192000*pow(c, 16)
+          - 262720*pow(c, 14)
+          + 83680*pow(c, 12)
+          + 20160*pow(c, 10)
+          - 7280*pow(c, 8)
+          + 7160*pow(c, 6)
+          - 1800*pow(c, 4)
+          - 1050*pow(c, 2)
+          + 225
+        )*10.0
+       /(12288*pow(s, 11)*(6*sqr(c) - 1)*(8*pow4(c) - 11*sqr(c) + 3))*sk
+      - (
+            192000*pow(c, 16)
+          - 262720*pow(c, 14)
+          + 83680*pow(c, 12)
+          + 20160*pow(c,10)
+          - 7280*pow(c, 8)
+          + 7160*pow(c, 6)
+          - 1800*pow(c,4)
+          - 1050*pow(c, 2)
+          + 225
+        )*12*c*ck
+        /(12288*pow(s, 10)*sqr(6*sqr(c) - 1)*(8*pow4(c) - 11*sqr(c) + 3))
+      - (
+            192000*pow(c, 16)
+          - 262720*pow(c, 14)
+          + 83680*pow(c, 12)
+          + 20160*pow(c, 10)
+          - 7280*pow(c, 8)
+          + 7160*pow(c, 6)
+          - 1800*pow(c, 4)
+          - 1050*pow(c, 2)
+          + 225
+        )*(32*pow3(c) - 22*c)*ck
+        /(12288*pow(s, 10)*(6*sqr(c) - 1)*sqr(8*pow4(c) - 11*sqr(c) + 3));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C1
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return (8*pow4(c) - 8*sqr(c) + 9)/(8*pow4(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C1k
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    const scalar sk = h*s;
+    const scalar ck = h*c;
+
+    return
+        (4*8*pow3(c)*ck - 2*8*c*ck)/(8*pow4(s))
+      - (8*pow4(c) - 8*sqr(c) + 9)*4*sk/(8*pow5(s));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C2
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (
+            3840*pow(c, 12)
+          - 4096*pow(c, 10)
+          + 2592*pow(c, 8)
+          - 1008*pow(c, 6)
+          + 5944*pow(c, 4)
+          - 1830*pow(c, 2)
+          + 147
+        ) // - 2592
+       /(512*pow(s, 10)*(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C2k
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    const scalar sk = h*s;
+    const scalar ck = h*c;
+
+    return
+        (
+            12*3840*pow(c, 11)*ck
+          - 10*4096*pow(c,9)*ck
+          + 8*2592*pow(c, 7)*ck
+          - 6*1008*pow(c, 5)*ck
+          + 4*5944*pow(c, 3)*ck
+          - 2*1830*c*ck
+        )
+       /(512*pow(s, 10)*(6*sqr(c) - 1))
+      - (
+            3840*pow(c, 12)
+          - 4096*pow(c, 10)
+          + 2592*pow(c, 8)
+          - 1008*pow(c, 6)
+          + 5944*pow(c, 4)
+          - 1830*pow(c, 2)
+          + 147
+        )*10*sk
+       /(512*pow(s, 11)*(6*sqr(c) - 1))
+      - (
+            3840*pow(c, 12)
+          - 4096*pow(c, 10)
+          + 2592*pow(c, 8)
+          - 1008*pow(c, 6)
+          + 5944*pow(c, 4)
+          - 1830*pow(c, 2)
+          + 147
+        )*12*c*ck
+       /(512*pow(s, 10)*sqr(6*sqr(c) - 1));
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C3
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return -1/(4*s*c);
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::C4
+(
+    const scalar h,
+    const scalar k
+) const
+{
+    const scalar s = sinh(k*h);
+    const scalar c = cosh(k*h);
+
+    return
+        (12*pow(c, 8) + 36*pow(c, 6) - 162*pow(c, 4) + 141*sqr(c) -27)
+       /(192*c*pow(s, 9));
+}
+
+
+void Foam::waveModels::StokesV::initialise
+(
+    const scalar H,
+    const scalar d,
+    const scalar T,
+    scalar& kOut,
+    scalar& LambdaOut,
+    scalar& f1Out,
+    scalar& f2Out
+) const
+{
+    scalar f1 = 1;
+    scalar f2 = 1;
+
+    const scalar pi = mathematical::pi;
+    scalar k = 2.0*pi/(sqrt(mag(g_)*d)*T);
+    scalar lambda = H/2.0*k;
+
+    label n = 0;
+
+    const scalar tolerance = 1e-12;
+    const label iterMax = 10000;
+
+    while ((mag(f1) > tolerance || mag(f2) > tolerance) && (n < iterMax))
+    {
+        const scalar b33 = B33(d, k);
+        const scalar b35 = B35(d, k);
+        const scalar b55 = B55(d, k);
+        const scalar c1 = C1(d, k);
+        const scalar c2 = C2(d, k);
+
+        const scalar b33k = B33k(d, k);
+        const scalar b35k = B35k(d, k);
+        const scalar b55k = B55k(d, k);
+        const scalar c1k = C1k(d, k);
+        const scalar c2k = C2k(d, k);
+
+        const scalar l2 = sqr(lambda);
+        const scalar l3 = l2*lambda;
+        const scalar l4 = l3*lambda;
+        const scalar l5 = l4*lambda;
+
+        const scalar Bmat11 =
+            2*pi/(sqr(k)*d)*(lambda + l3*b33 + l5*(b35 + b55))
+          - 2*pi/(k*d)*(l3*b33k + l5*(b35k + b55k));
+
+        const scalar Bmat12 =
+          - 2*pi/(k*d)*(1 + 3*l2*b33 + 5*l4*(b35 + b55));
+
+        const scalar Bmat21 =
+          - d/(2*pi)*tanh(k*d)*(1 + l2*c1 + l4*c2)
+          - k*d/(2*pi)*(1 - sqr(tanh(k*d)))*d*(1 + l2*c1 + l4*c2)
+          - k*d/(2*pi)*tanh(k*d)*(l2*c1k + l4*c2k);
+
+        const scalar Bmat22 = - k*d/(2.0*pi)*tanh(k*d)*(2*lambda*c1 + 4*l3*c2);
+
+        f1 = pi*H/d - 2*pi/(k*d)*(lambda + l3*b33 + l5*(b35 + b55));
+
+        f2 = (2*pi*d)/(mag(g_)*sqr(T)) - k*d/(2*pi)*tanh(k*d)*(1 + l2*c1 + l4*c2);
+
+        const scalar lambdaPr =
+            (f1*Bmat21 - f2*Bmat11)/(Bmat11*Bmat22 - Bmat12*Bmat21);
+        const scalar kPr =
+            (f2*Bmat12 - f1*Bmat22)/(Bmat11*Bmat22 - Bmat12*Bmat21);
+
+        lambda += lambdaPr;
+        k += kPr;
+
+        n++;
+    }
+
+    kOut = k;
+    LambdaOut = lambda;
+
+    f1Out = mag(f1);
+    f2Out = mag(f2);
+}
+
+
+Foam::scalar Foam::waveModels::StokesV::eta
+(
+    const scalar h,
+    const scalar kx,
+    const scalar ky,
+    const scalar lambda,
+    const scalar T,
+    const scalar x,
+    const scalar y,
+    const scalar t,
+    const scalar phase
+) const
+{
+    const scalar k = sqrt(kx*kx + ky*ky);
+
+    const scalar b22 = B22(h, k);
+    const scalar b24 = B24(h, k);
+    const scalar b33 = B33(h, k);
+    const scalar b35 = B35(h, k);
+    const scalar b44 = B44(h, k);
+    const scalar b55 = B55(h, k);
+
+    const scalar l2 = sqr(lambda);
+    const scalar l3 = l2*lambda;
+    const scalar l4 = l3*lambda;
+    const scalar l5 = l4*lambda;
+
+    const scalar amp1 = lambda/k;
+    const scalar amp2 = (b22*l2 + b24*l4)/k;
+    const scalar amp3 = (b33*l3 + b35*l5)/k;
+    const scalar amp4 = b44*l4/k;
+    const scalar amp5 = b55*l5/k;
+
+    const scalar theta = kx*x + ky*y - 2.0*mathematical::pi/T*t + phase;
+
+    return
+        amp1*cos(theta)
+      + amp2*cos(2*theta)
+      + amp3*cos(3*theta)
+	  + amp4*cos(4*theta)
+      + amp5*cos(5*theta);
+}
+
+
+Foam::vector Foam::waveModels::StokesV::U
+(
+    const scalar d,
+    const scalar kx,
+    const scalar ky,
+    const scalar lambda,
+    const scalar T,
+    const scalar x,
+    const scalar y,
+    const scalar t,
+    const scalar phase,
+    const scalar z
+) const
+{
+    const scalar k = sqrt(kx*kx + ky*ky);
+
+    const scalar a11 = A11(d, k);
+    const scalar a13 = A13(d, k);
+    const scalar a15 = A15(d, k);
+    const scalar a22 = A22(d, k);
+    const scalar a24 = A24(d, k);
+    const scalar a33 = A33(d, k);
+    const scalar a35 = A35(d, k);
+    const scalar a44 = A44(d, k);
+    const scalar a55 = A55(d, k);
+
+    const scalar pi = mathematical::pi;
+    const scalar l2 = sqr(lambda);
+    const scalar l3 = l2*lambda;
+    const scalar l4 = l3*lambda;
+    const scalar l5 = l4*lambda;
+
+    const scalar a1u = 2*pi/T/k*(lambda*a11 + l3*a13 + l5*a15);
+    const scalar a2u = 2*2*pi/T/k*(l2*a22 + l4*a24);
+    const scalar a3u = 3*2*pi/T/k*(l3*a33 + l5*a35);
+    const scalar a4u = 4*2*pi/T/k*(l4*a44);
+    const scalar a5u = 5*2*pi/T/k*(l5*a55);
+
+    const scalar theta = kx*x + ky*y - 2*pi/T*t + phase;
+
+    scalar u =
+        a1u*cosh(k*z)*cos(theta)
+      + a2u*cosh(2.0*k*z)*cos(2.0*(theta))
+      + a3u*cosh(3.0*k*z)*cos(3.0*(theta))
+      + a4u*cosh(4.0*k*z)*cos(4.0*(theta))
+      + a5u*cosh(5.0*k*z)*cos(5.0*(theta));
+
+    scalar w =
+        a1u*sinh(k*z)*sin(theta)
+      + a2u*sinh(2.0*k*z)*sin(2.0*(theta))
+      + a3u*sinh(3.0*k*z)*sin(3.0*(theta))
+      + a4u*sinh(4.0*k*z)*sin(4.0*(theta))
+      + a5u*sinh(5.0*k*z)*sin(5.0*(theta));
+
+    scalar v = u*sin(waveAngle_);
+    u *= cos(waveAngle_);
+
+    return vector(u, v, w);
+}
+
+
+void Foam::waveModels::StokesV::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(level, paddlei)
+    {
+        const scalar eta =
+            this->eta
+	        (
+                waterDepthRef_,
+		        waveKx,
+                waveKy,
+                lambda_,
+                wavePeriod_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                t,
+                wavePhase_
+            );
+
+        level[paddlei] = waterDepthRef_ + tCoeff*eta;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesV::StokesV
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    regularWaveModel(dict, mesh, patch, false),
+    lambda_(0)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::StokesV::~StokesV()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::StokesV::read()
+{
+    if (regularWaveModel::read())
+    {
+        scalar f1;
+        scalar f2;
+        scalar waveK;
+
+        initialise
+        (
+            waveHeight_,
+            waterDepthRef_,
+            wavePeriod_,
+            waveK,
+            lambda_,
+            f1,
+            f2
+        );
+
+        if (f1 > 0.001 || f2 > 0.001)
+        {
+	        FatalErrorInFunction
+                << "No convergence for Stokes V wave theory" << nl
+                << "    f1: " << f1 << nl
+                << "    f2: " << f2 << nl
+	            << exit(FatalError);
+        }
+
+        waveLength_ = 2.0*mathematical::pi/waveK;
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::StokesV::setVelocity
+(
+    const scalar t,
+    const scalar tCoeff,
+    const scalarField& level
+)
+{
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(U_, facei)
+    {
+        // Fraction of geometry represented by paddle - to be set
+        scalar fraction = 1;
+
+        // Height - to be set
+        scalar z = 0;
+
+        setPaddlePropeties(level, facei, fraction, z);
+
+        if (fraction > 0)
+        {
+            const label paddlei = faceToPaddle_[facei];
+
+            const vector Uf = U
+	        (
+                waterDepthRef_,
+                waveKx,
+                waveKy,
+                lambda_,
+                wavePeriod_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                t,
+                wavePhase_,
+                z
+            );
+
+            U_[facei] = fraction*Uf*tCoeff;
+        }
+    }
+}
+
+
+void Foam::waveModels::StokesV::info(Ostream& os) const
+{
+    regularWaveModel::info(os);
+
+    os  << "    Lambda : " << lambda_ << nl
+        << "    Wave type : " << waveType() << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
new file mode 100644
index 0000000000..7b9291b463
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::StokesV
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_StokesV_H
+#define waveModels_StokesV_H
+
+#include "regularWaveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class StokesV Declaration
+\*---------------------------------------------------------------------------*/
+
+class StokesV
+:
+    public regularWaveModel
+{
+protected:
+
+    // Proteced Data
+
+        //-
+        scalar lambda_;
+
+
+    // Protected Member Functions
+
+        //-
+        virtual scalar A11(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A13(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A15(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A22(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A24(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A33(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A35(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A44(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar A55(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B22(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B24(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B33(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B33k(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B35(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B35k(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B44(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B55(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar B55k(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C1(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C1k(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C2(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C2k(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C3(const scalar h, const scalar k) const;
+
+        //-
+        virtual scalar C4(const scalar h, const scalar k) const;
+
+        //-
+        virtual void initialise
+        (
+            const scalar H,
+            const scalar d,
+            const scalar T,
+            scalar& kOut,
+            scalar& LambdaOut,
+            scalar& f1Out,
+            scalar& f2Out
+        ) const;
+
+        //-
+        virtual scalar eta
+        (
+            const scalar h,
+            const scalar kx,
+            const scalar ky,
+            const scalar lambda,
+            const scalar T,
+            const scalar x,
+            const scalar y,
+            const scalar t,
+            const scalar phase
+        ) const;
+
+        //-
+        virtual vector U
+        (
+            const scalar d,
+            const scalar kx,
+            const scalar ky,
+            const scalar lambda,
+            const scalar T,
+            const scalar x,
+            const scalar y,
+            const scalar t,
+            const scalar phase,
+            const scalar z
+        ) const;
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("StokesV");
+
+    //- Constructor
+    StokesV
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~StokesV();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H
new file mode 100644
index 0000000000..83effacac9
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    Foam::Elliptic
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace Elliptic
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void ellipticIntegralsKE(const scalar m, scalar& K, scalar& E)
+{
+    if (m == 0)
+    {
+        K = 0.5*mathematical::pi;
+        E = 0.5*mathematical::pi;
+        return;
+    }
+
+    scalar a = 1;
+    scalar g = Foam::sqrt(1 - m);
+    scalar ga = g*a;
+    scalar aux = 1;
+    scalar sum = 2 - m;
+
+    while (true)
+    {
+        scalar aOld = a;
+        scalar gOld = g;
+        ga = gOld*aOld;
+        a = 0.5*(gOld + aOld);
+        aux += aux;
+        sum -= aux*(a*a - ga);
+
+        if (mag(aOld - gOld) < SMALL)
+        {
+            break;
+        }
+
+        g = sqrt(ga);
+    }
+
+    K = 0.5*mathematical::pi/a;
+    E = 0.25*mathematical::pi/a*sum;
+}
+
+
+Foam::scalar JacobiAmp(const scalar u, const scalar mIn)
+{
+    static const label ITER = 25;
+    FixedList<scalar, ITER + 1> a, g, c;
+    scalar aux, amp;
+    label n;
+
+    const scalar m = mag(mIn);
+
+    if (m == 0)
+    {
+        return u;
+    }
+
+    if (m == 1)
+    {
+        return 2*atan(exp(u)) - mathematical::pi/2;
+    }
+
+    a[0] = 1.0;
+    g[0] = Foam::sqrt(1.0 - m);
+    c[0] = Foam::sqrt(m);
+
+    aux = 1.0;
+
+    for (n = 0; n < ITER; n++)
+    {
+        if (mag(a[n] - g[n]) < SMALL)
+        {
+            break;
+        }
+
+        aux += aux;
+        a[n+1] = 0.5*(a[n] + g[n]);
+        g[n+1] = Foam::sqrt(a[n]*g[n]);
+        c[n+1] = 0.5*(a[n] - g[n]);
+    }
+
+    amp = aux*a[n]*u;
+
+    for (; n > 0; n--)
+    {
+        amp = 0.5*(amp + asin(c[n]*sin(amp)/a[n]));
+    }
+
+    return scalar(amp);
+}
+
+
+void JacobiSnCnDn
+(
+    const scalar u,
+    const scalar m,
+    scalar& Sn,
+    scalar& Cn,
+    scalar& Dn
+)
+{
+    const scalar amp = Elliptic::JacobiAmp(u, m);
+
+    Sn = sin(amp);
+    Cn = cos(amp);
+    Dn = sqrt(1.0 - m*sin(amp)*sin(amp));
+    return;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Elliptic
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
new file mode 100644
index 0000000000..972ef9c94a
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
@@ -0,0 +1,367 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cnoidalWaveModel.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Elliptic.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+    defineTypeNameAndDebug(cnoidal, 0);
+    addToRunTimeSelectionTable
+    (
+        waveModel,
+        cnoidal,
+        patch
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+void Foam::waveModels::cnoidal::initialise
+(
+    const scalar H,
+    const scalar d,
+    const scalar T,
+    scalar& mOut,
+    scalar& LOut
+) const
+{
+    const scalar mTolerance = 0.0001;
+    scalar mElliptic = 0.5;
+    scalar LElliptic = 0;
+    scalar phaseSpeed = 0;
+
+    scalar mError = 0.0;
+    scalar mMinError = GREAT;
+
+    while (mElliptic < 1.0)
+    {
+        scalar KElliptic, EElliptic;
+        Elliptic::ellipticIntegralsKE(mElliptic, KElliptic, EElliptic);
+
+        LElliptic = KElliptic*sqrt(16.0*pow3(d)*mElliptic/(3.0*H));
+
+        phaseSpeed =
+            sqrt(mag(g_)*d)
+           *(1.0 - H/d/2.0 + H/d/mElliptic*(1.0 - 3.0/2.0*EElliptic/KElliptic));
+
+        mError = mag(T - LElliptic/phaseSpeed);
+
+        if (mError <= mMinError)
+        {
+            mOut = mElliptic;
+            LOut = LElliptic;
+            mMinError = mError;
+        }
+
+        mElliptic += mTolerance;
+    }
+}
+
+
+Foam::scalar Foam::waveModels::cnoidal::eta
+(
+    const scalar H,
+    const scalar m,
+    const scalar kx,
+    const scalar ky,
+    const scalar T,
+    const scalar x,
+    const scalar y,
+    const scalar t
+) const
+{
+    scalar K, E;
+    Elliptic::ellipticIntegralsKE(m, K, E);
+
+    const scalar uCnoidal =
+        K/mathematical::pi*(kx*x + ky*y - 2.0*mathematical::pi*t/T);
+
+    scalar sn, cn, dn;
+    Elliptic::JacobiSnCnDn(uCnoidal, m, sn, cn, dn);
+
+    return H*((1.0 - E/K)/m - 1.0 + sqr(cn));
+}
+
+
+Foam::scalar Foam::waveModels::cnoidal::eta1D
+(
+    const scalar H,
+    const scalar m,
+    const scalar t,
+    const scalar T
+) const
+{
+    scalar K, E;
+    Elliptic::ellipticIntegralsKE(m, K, E);
+
+    const scalar uCnoidal = -2.0*K*(t/T);
+
+    scalar sn, cn, dn;
+    Elliptic::JacobiSnCnDn(uCnoidal, m, sn, cn, dn);
+
+    return H*((1.0 - E/K)/m - 1.0 + sqr(cn));
+}
+
+
+Foam::scalar Foam::waveModels::cnoidal::etaMeanSq
+(
+    const scalar H,
+    const scalar m,
+    const scalar T
+) const
+{
+    scalar eta = 0;
+    scalar etaSumSq = 0;
+
+    for (int i=0; i<1000; i++)
+    {
+        eta = eta1D(H, m, i*T/(1000.0), T);
+        etaSumSq += eta*eta;
+    }
+
+    etaSumSq /= 1000.0;
+    return etaSumSq;
+}
+
+
+Foam::vector Foam::waveModels::cnoidal::dEtaDx
+(
+    const scalar H,
+    const scalar m,
+    const scalar uCnoidal,
+    const scalar L,
+    const scalar K,
+    const scalar E
+) const
+{
+    const scalar dudx = 2.0*K/L;
+    const scalar dudxx = 2.0*K/L*dudx;
+    const scalar dudxxx = 2.0*K/L*dudxx;
+
+    scalar sn, cn, dn;
+    Elliptic::JacobiSnCnDn(uCnoidal, m, sn, cn, dn);
+
+    scalar d1 = -2.0*H*cn*dn*sn*dudx;
+    scalar d2 = 2.0*H*(dn*dn*sn*sn - cn*cn*dn*dn + m*cn*cn*sn*sn)*dudxx;
+    scalar d3 =
+        8.0*H
+       *(
+            cn*sn*dn*dn*dn*(-4.0 - 2.0*m)
+          + 4.0*m*cn*sn*sn*sn*dn
+          - 2.0*m*cn*cn*cn*sn*dn
+        )
+       *dudxxx;
+
+    return vector(d1, d2, d3);
+}
+
+
+Foam::vector Foam::waveModels::cnoidal::U
+(
+    const scalar H,
+    const scalar h,
+    const scalar m,
+    const scalar kx,
+    const scalar ky,
+    const scalar T,
+    const scalar x,
+    const scalar y,
+    const scalar t,
+    const scalar z
+) const
+{
+    scalar K, E;
+    Elliptic::ellipticIntegralsKE(m, K, E);
+
+    const scalar uCnoidal =
+        K/mathematical::pi*(kx*x + ky*y - 2.0*mathematical::pi*t/T);
+    const scalar k = sqrt(kx*kx + ky*ky);
+    const scalar L = 2.0*mathematical::pi/k;
+    const scalar c = L/T;
+
+    const scalar etaCN = eta(H, m, kx, ky, T, x, y, t);
+    const vector etaX = this->dEtaDx(H, m, uCnoidal, L, K, E);
+    const scalar etaMS = etaMeanSq(H, m, T);
+
+    scalar u =
+        c*etaCN/h
+      - c*(etaCN*etaCN/h/h + etaMS*etaMS/h/h)
+     + 1.0/2.0*c*h*(1.0/3.0 - z*z/h/h)*etaX[1];
+
+    scalar w =
+       -c*z*(etaX[0]/h*(1.0 - 2.0*etaCN/h) + 1.0/6.0*h*(1.0 - z*z/h/h)*etaX[2]);
+
+    scalar v = u*sin(waveAngle_);
+    u *= cos(waveAngle_);
+
+    return vector(u, v, w);
+}
+
+
+void Foam::waveModels::cnoidal::setLevel
+(
+    const scalar t,
+    const scalar tCoeff,
+    scalarField& level
+) const
+{
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(level, paddlei)
+    {
+        const scalar eta =
+            this->eta
+	        (
+                waveHeight_,
+                m_,
+                waveKx,
+                waveKy,
+                wavePeriod_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                t
+            );
+
+        level[paddlei] = waterDepthRef_ + tCoeff*eta;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModels::cnoidal::cnoidal
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    regularWaveModel(dict, mesh, patch, false),
+    m_(0)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModels::cnoidal::~cnoidal()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModels::cnoidal::read()
+{
+    if (regularWaveModel::read())
+    {
+        // Initialise m parameter and wavelength
+        initialise
+        (
+            waveHeight_,
+            waterDepthRef_,
+            wavePeriod_,
+            m_,
+            waveLength_
+        );
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::waveModels::cnoidal::setVelocity
+(
+    const scalar t,
+    const scalar tCoeff,
+    const scalarField& level
+)
+{
+    const scalar waveK = mathematical::twoPi/waveLength_;
+    const scalar waveKx = waveK*cos(waveAngle_);
+    const scalar waveKy = waveK*sin(waveAngle_);
+
+    forAll(U_, facei)
+    {
+        // Fraction of geometry represented by paddle - to be set
+        scalar fraction = 1;
+
+        // Height - to be set
+        scalar z = 0;
+
+        setPaddlePropeties(level, facei, fraction, z);
+
+        if (fraction > 0)
+        {
+            const label paddlei = faceToPaddle_[facei];
+
+            const vector Uf = U
+	        (
+                waveHeight_,
+                waterDepthRef_,
+                m_,
+                waveKx,
+                waveKy,
+                wavePeriod_,
+                xPaddle_[paddlei],
+                yPaddle_[paddlei],
+                t,
+                z
+            );
+
+            U_[facei] = fraction*Uf*tCoeff;
+        }
+    }
+}
+
+
+void Foam::waveModels::cnoidal::info(Ostream& os) const
+{
+    regularWaveModel::info(os);
+
+    os  << "    Cnoidal m parameter : " << m_ << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
new file mode 100644
index 0000000000..be15105454
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModels::cnoidal
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModels_cnoidal_H
+#define waveModels_cnoidal_H
+
+#include "regularWaveModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace waveModels
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class cnoidal Declaration
+\*---------------------------------------------------------------------------*/
+
+class cnoidal
+:
+    public regularWaveModel
+{
+protected:
+
+    // Protected data
+
+        //- `m' coefficient
+        scalar m_;
+
+
+    // Protected Member Functions
+
+        void initialise
+        (
+            const scalar H,
+            const scalar d,
+            const scalar T,
+            scalar& mOut,
+            scalar& LOut
+        ) const;
+
+        virtual scalar eta
+        (
+            const scalar H,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase
+        ) const;
+
+        scalar eta1D
+        (
+            const scalar H,
+            const scalar m,
+            const scalar t,
+            const scalar T
+        ) const;
+
+        scalar etaMeanSq
+        (
+            const scalar H,
+            const scalar m,
+            const scalar T
+        ) const;
+
+        vector dEtaDx
+        (
+            const scalar H,
+            const scalar m,
+            const scalar uCnoidal,
+            const scalar L,
+            const scalar K,
+            const scalar E
+        ) const;
+
+        virtual vector U
+        (
+            const scalar H,
+            const scalar h,
+            const scalar Kx,
+            const scalar x,
+            const scalar Ky,
+            const scalar y,
+            const scalar omega,
+            const scalar t,
+            const scalar phase,
+            const scalar z
+        ) const;
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cnoidal");
+
+    //- Constructor
+    cnoidal
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+    //- Destructor
+    virtual ~cnoidal();
+
+
+    // Public Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace waveModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
new file mode 100644
index 0000000000..96d234f49f
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -0,0 +1,427 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveModel.H"
+#include "fvMesh.H"
+#include "polyPatch.H"
+#include "uniformDimensionedFields.H"
+#include "volFields.H"
+#include "fvPatchFields.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(waveModel, 0);
+    defineRunTimeSelectionTable(waveModel, patch);
+}
+
+const Foam::word Foam::waveModel::dictName("waveProperties");
+
+
+Foam::word Foam::waveModel::modelName(const word& patchName)
+{
+    word name = dictName + '.' + patchName;
+
+    if (Pstream::parRun())
+    {
+        name += ".proc" + Foam::name(Pstream::myProcNo());
+    }
+
+    return name;
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::waveModel::initialiseGeometry()
+{
+    // Determine local patch co-ordinate system given by:
+    // - X: streamwise: patch normal
+    // - Y: spanwise: Z^X
+    // - Z: up: (negative) gravity direction
+    vector x(-gAverage(patch_.faceAreas()));
+    x /= mag(x) + ROOTVSMALL;
+    vector z = -g_/mag(g_);
+    vector y = z^x;
+
+    // Rotation from global<->local about global origin
+    Rlg_ = tensor(x, y, z);
+    Rgl_ = Rlg_.T();
+
+    // Global patch extents
+    const vectorField& Cp = patch_.localPoints();
+    const vectorField CpLocal(Rgl_ & Cp);
+    boundBox bb(CpLocal, true);
+    const scalar xMin = bb.min().x();
+    const scalar xMax = bb.max().x();
+    const scalar yMin = bb.min().y();
+    const scalar yMax = bb.max().y();
+    zSpan_ = bb.max().z() - bb.min().z();
+
+    // Global x, y positions of the paddle centres
+    xPaddle_.setSize(nPaddle_, 0);
+    yPaddle_.setSize(nPaddle_, 0);
+    const scalar xMid = xMin + 0.5*(xMax - xMin);
+    const scalar paddleDy = (yMax - yMin)/scalar(nPaddle_);
+    for (label paddlei = 0; paddlei < nPaddle_; ++paddlei)
+    {
+        xPaddle_[paddlei] = xMid;
+        yPaddle_[paddlei] = paddlei*paddleDy + yMin + 0.5*paddleDy;;
+    }
+
+    // Local face centres
+    const vectorField& Cf = patch_.faceCentres();
+    const vectorField CfLocal(Rgl_ & Cf);
+    z_ = CfLocal.component(2);
+
+    // Local face extents in z-direction
+    zMin_.setSize(patch_.size());
+    zMax_.setSize(patch_.size());
+    const faceList& faces = patch_.localFaces();
+    forAll(faces, facei)
+    {
+        const face& f = faces[facei];
+        const label nPoint = f.size();
+        zMin_[facei] = CpLocal[f[0]].z();
+        zMax_[facei] = CpLocal[f[0]].z();
+
+        for (label fpi = 1; fpi < nPoint; ++fpi)
+        {
+            const label pointi = f[fpi];
+            zMin_[facei] = min(zMin_[facei], CpLocal[pointi].z());
+            zMax_[facei] = max(zMax_[facei], CpLocal[pointi].z());
+        }
+    }
+
+    // Local paddle-to-face addressing
+    faceToPaddle_.setSize(patch_.size(), -1);
+    forAll(faceToPaddle_, facei)
+    {
+        faceToPaddle_[facei] = floor((CfLocal[facei].y() - yMin)/paddleDy);
+    }
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::waveModel::waterLevel() const
+{
+    // Note: initialising as initial depth
+    tmp<scalarField> tlevel(new scalarField(nPaddle_, initialDepth_));
+    scalarField& level = tlevel.ref();
+
+    const volScalarField& alpha =
+        mesh_.lookupObject<volScalarField>(alphaName_);
+    const fvPatchScalarField& alphap = alpha.boundaryField()[patch_.index()];
+    const scalarField alphac(alphap.patchInternalField());
+
+    const scalarField& magSf = alphap.patch().magSf();
+    scalarList paddleMagSf(nPaddle_, 0.0);
+    scalarList paddleWettedMagSf(nPaddle_, 0.0);
+
+    forAll(alphac, facei)
+    {
+        label paddlei = faceToPaddle_[facei];
+        paddleMagSf[paddlei] += magSf[facei];
+        paddleWettedMagSf[paddlei] += magSf[facei]*alphac[facei];
+    }
+
+    forAll(paddleMagSf, paddlei)
+    {
+        reduce(paddleMagSf[paddlei], sumOp<scalar>());
+        reduce(paddleWettedMagSf[paddlei], sumOp<scalar>());
+        level[paddlei] +=
+            paddleWettedMagSf[paddlei]/paddleMagSf[paddlei]*zSpan_;
+    }
+
+    return tlevel;
+}
+
+
+void Foam::waveModel::setAlpha(const scalarField& level)
+{
+    forAll(alpha_, facei)
+    {
+        const label paddlei = faceToPaddle_[facei];
+        const scalar paddleCalc = level[paddlei];
+
+    	if (zMax_[facei] < paddleCalc)
+    	{
+    	    alpha_[facei] = 1.0;
+    	}
+    	else if (zMin_[facei] > paddleCalc)
+    	{
+    	    alpha_[facei] = 0.0;
+    	}
+    	else
+    	{
+    	    scalar dz = paddleCalc - zMin_[facei];
+    	    alpha_[facei] = dz/zSpan_;
+    	}
+    }
+}
+
+
+void Foam::waveModel::setPaddlePropeties
+(
+    const scalarField& level,
+    const label facei,
+    scalar& fraction,
+    scalar& z
+) const
+{
+    const label paddlei = faceToPaddle_[facei];
+    const scalar paddleCalc = level[paddlei];
+    const scalar paddleHeight = min(paddleCalc, waterDepthRef_);
+    const scalar zMin = zMin_[facei];
+    const scalar zMax = zMax_[facei];
+
+    fraction = 1;
+    z = 0;
+
+    if (zMax < paddleHeight)
+    {
+        z = z_[facei];
+    }
+    else if (zMin > paddleCalc)
+    {
+        fraction = -1;
+    }
+    else
+    {
+        if (paddleCalc < waterDepthRef_)
+        {
+            if ((zMax > paddleCalc) && (zMin < paddleCalc))
+            {
+                scalar dz = paddleCalc - zMin;
+	            fraction = dz/zSpan_;
+                z = z_[facei];
+            }
+        }
+	    else
+        {
+            if (zMax < paddleCalc)
+            {
+                z = waterDepthRef_;
+            }
+            else if ((zMax > paddleCalc) && (zMin < paddleCalc))
+            {
+                scalar dz = paddleCalc - zMin;
+	            fraction = dz/zSpan_;
+                z = waterDepthRef_;
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::waveModel::waveModel
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const polyPatch& patch,
+    const bool readFields
+)
+:
+    IOdictionary
+    (
+        IOobject
+        (
+            modelName(patch.name()),
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ
+        ),
+        dict
+    ),
+    mesh_(mesh),
+    patch_(patch),
+    g_(mesh.lookupObject<uniformDimensionedVectorField>("g").value()),
+    UName_("U"),
+    alphaName_("alpha"),
+    Rgl_(tensor::I),
+    Rlg_(tensor::I),
+    nPaddle_(1),
+    xPaddle_(),
+    yPaddle_(),
+    z_(),
+    zSpan_(0),
+    zMin_(),
+    zMax_(),
+    waterDepthRef_(0),
+    initialDepth_(0),
+    rampTime_(VSMALL),
+    activeAbsorption_(false),
+    U_(patch.size(), vector::zero),
+    alpha_(patch.size(), 0)
+{
+    if (readFields)
+    {
+        read();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::waveModel::~waveModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::waveModel::read()
+{
+    readIfPresent("U", UName_);
+    readIfPresent("alpha", alphaName_);
+
+    lookup("nPaddle") >> nPaddle_;
+    if (nPaddle_ < 1)
+    {
+        FatalIOErrorInFunction(*this)
+            << "Number of paddles must be greater than zero.  Supplied"
+            << " value nPaddles = " << nPaddle_
+            << exit(FatalIOError);
+    }
+
+    readIfPresent("initialDepth", initialDepth_);
+
+    // Need to intialise the geometry before calling waterLevel()
+    initialiseGeometry();
+
+    // Set the reference water depth
+    if (!readIfPresent("waterDepthRef", waterDepthRef_))
+    {
+        scalar waterDepth = 0;
+        if (readIfPresent("waterDepth", waterDepth))
+        {
+            waterDepthRef_ = waterDepth;
+        }
+        else
+        {
+            const scalarField level(waterLevel());
+            if (level.size())
+            {
+                waterDepthRef_ = level.first();
+            }
+        }
+    }
+
+    return true;
+}
+
+
+void Foam::waveModel::correct(const scalar t)
+{
+    static label timeIndex = -1;
+
+    if (mesh_.time().timeIndex() != timeIndex)
+    {
+        Info<< "Updating " << type() << " wave model for patch "
+            << patch_.name() << endl;
+
+        // Time ramp weight
+        const scalar tCoeff = max(0, min(t/rampTime_, 1));
+
+        // Reset the velocity and phase fraction fields
+        U_ = vector::zero;
+        alpha_ = 0;
+
+        // Update the calculated water level field
+        scalarField calculatedLevel(nPaddle_, 0);
+
+        if (patch_.size())
+        {
+            // Set wave level
+            setLevel(t, tCoeff, calculatedLevel);
+
+            // Update the velocity field
+            setVelocity(t, tCoeff, calculatedLevel);
+
+            // Update the phase fraction field
+            setAlpha(calculatedLevel);
+        }
+
+        if (activeAbsorption_)
+        {
+            const scalarField activeLevel(this->waterLevel());
+
+            if (patch_.size())
+            {
+                const scalar d = direction();
+
+                forAll(activeLevel, facei)
+                {
+                    const label paddlei = faceToPaddle_[facei];
+
+                    if (zMin_[facei] < activeLevel[paddlei])
+                    {
+                        scalar UCorr =
+                            (calculatedLevel[paddlei] - activeLevel[paddlei])
+                           *sqrt(mag(g_)/activeLevel[paddlei]);
+
+                        U_[facei].x() += d*UCorr;
+                    }
+                }
+            }
+        }
+
+        // Transform velocity into global co-ordinate system
+        U_ = Rlg_ & U_;
+
+        timeIndex = mesh_.time().timeIndex();
+    }
+}
+
+
+const Foam::vectorField& Foam::waveModel::U() const
+{
+    return U_;
+}
+
+
+const Foam::scalarField& Foam::waveModel::alpha() const
+{
+    return alpha_;
+}
+
+
+void Foam::waveModel::info(Ostream& os) const
+{
+    os  << "Wave model: patch " << patch_.name() << nl
+        << "    Type : " << type() << nl
+        << "    Velocity field name : " << UName_ << nl
+        << "    Phase fraction field name : " << alphaName_ << nl
+        << "    Transformation from local to global system : " << Rlg_ << nl
+        << "    Number of paddles: " << nPaddle_ << nl
+        << "    Reference water depth : " << waterDepthRef_ << nl
+        << "    Active absorption: " << activeAbsorption_ << nl;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
new file mode 100644
index 0000000000..077633ae37
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -0,0 +1,256 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::waveModel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef waveModel_H
+#define waveModel_H
+
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+#include "IOdictionary.H"
+#include "dictionary.H"
+#include "scalarField.H"
+#include "vectorField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class fvMesh;
+class polyPatch;
+
+/*---------------------------------------------------------------------------*\
+                          Class waveModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class waveModel
+:
+    public refCount,
+    public IOdictionary
+{
+protected:
+
+    // Protected data
+
+        //- Reference to the mesh database
+        const fvMesh& mesh_;
+
+        //- Reference to the polyPatch
+        const polyPatch& patch_;
+
+        //- Gravity
+        const vector& g_;
+
+        //- Name of velocity field, default = "U"
+        word UName_;
+
+        //- Name of phase fraction field, default = "alpha"
+        word alphaName_;
+
+        //- Rotation tensor from global to local system
+        tensor Rgl_;
+
+        //- Rotation tensor from local to global system
+        tensor Rlg_;
+
+        //- Number of paddles
+        label nPaddle_;
+
+        //- Paddle x co-ordinates / [m]
+        scalarField xPaddle_;
+
+        //- Paddle y co-ordinates / [m]
+        scalarField yPaddle_;
+
+        //- Addressing from patch face index to paddle index
+        labelList faceToPaddle_;
+
+        //- Patch face centre z co-ordinates / [m]
+        scalarField z_;
+
+        //- Overall (point) span in z-direction / [m]
+        scalar zSpan_;
+
+        //- Minimum z (point) height per patch face / [m]
+        scalarField zMin_;
+
+        //- Maximum z (point) height per patch face / [m]
+        scalarField zMax_;
+
+        //- Reference water depth / [m]
+        scalar waterDepthRef_;
+
+        //- Initial depth / [m]
+        scalar initialDepth_;
+
+        //- Ramp time
+        scalar rampTime_;
+
+        //- Active wave absorption switch
+        bool activeAbsorption_;
+
+        // Current values
+
+            //- Velocity field
+            vectorField U_;
+
+            //- Wave indicator field
+            scalarField alpha_;
+
+
+    // Protected Member Functions
+
+        //- Initialise
+        virtual void initialiseGeometry();
+
+        //- Water level
+        virtual tmp<scalarField> waterLevel() const;
+
+        //- Set the water level
+        virtual void setLevel
+        (
+            const scalar t,
+            const scalar tCoeff,
+            scalarField& level
+        ) const = 0;
+
+        //- Calculate the wave model velocity
+        virtual void setVelocity
+        (
+            const scalar t,
+            const scalar tCoeff,
+            const scalarField& level
+        ) = 0;
+
+        //- Wave direction
+        virtual scalar direction() const = 0;
+
+        //- Set the alpha field based on the water level
+        virtual void setAlpha(const scalarField& level);
+
+        //- Set the paddle coverage fraction and reference height
+        virtual void setPaddlePropeties
+        (
+            const scalarField& level,
+            const label facei,
+            scalar& fraction,
+            scalar& z
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("waveModel");
+
+    // Declare runtime constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            waveModel,
+            patch,
+            (
+                const dictionary& dict,
+                const fvMesh& mesh,
+                const polyPatch& patch
+            ),
+            (dict, mesh, patch)
+        );
+
+
+    //- Constructor
+    waveModel
+    (
+        const dictionary& dict,
+        const fvMesh& mesh,
+        const polyPatch& patch,
+        const bool readFields = true
+    );
+
+
+    // Selectors
+
+        //- Return a reference to the selected wave model
+        static autoPtr<waveModel> New
+        (
+            const word& dictName,
+            const fvMesh& mesh,
+            const polyPatch& patch
+        );
+
+        //- Lookup waveModel from database, or create new
+        static tmp<waveModel> lookupOrCreate
+        (
+            const polyPatch& patch,
+            const fvMesh& mesh,
+            const word& waveDictName
+        );
+
+
+    //- Destructor
+    virtual ~waveModel();
+
+    //- Dictionary name
+    static const word dictName;
+
+
+    // Public Member Functions
+
+        //- Utility function to construct the model name
+        static word modelName(const word& patchName);
+
+        //- Read from dictionary
+        virtual bool read();
+
+        //- Return the latest wave velocity prediction
+        virtual const vectorField& U() const;
+
+        //- Return the latest wave indicator field prediction
+        virtual const scalarField& alpha() const;
+
+        //- Correct the model for time, t[s]
+        virtual void correct(const scalar t);
+
+        //- Info
+        virtual void info(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C b/integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C
new file mode 100644
index 0000000000..60446418e5
--- /dev/null
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "waveModel.H"
+#include "fvMesh.H"
+
+Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
+(
+    const word& dictName,
+    const fvMesh& mesh,
+    const polyPatch& patch
+)
+{
+    IOdictionary waveDict
+    (
+        IOobject
+        (
+            dictName,
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false                   // Not registering
+        )
+    );
+
+    word modelType = "none";
+    dictionary patchDict;
+    if (waveDict.found(patch.name()))
+    {
+        patchDict = waveDict.subDict(patch.name());
+        patchDict.lookup("waveModel") >> modelType;
+    }
+    else
+    {
+        FatalIOErrorInFunction(waveDict)
+            << "Dictionary entry for patch " << patch.name() << " not found"
+            << exit(FatalIOError);
+    }
+
+    Info<< "Selecting waveModel " << modelType << endl;
+
+    patchConstructorTable::iterator cstrIter =
+        patchConstructorTablePtr_->find(modelType);
+
+    if (cstrIter == patchConstructorTablePtr_->end())
+    {
+        FatalIOErrorInFunction(waveDict)
+            << "Unknown waveModel type "
+            << modelType << nl << nl
+            << "Valid waveModel types are:" << nl
+            << patchConstructorTablePtr_->sortedToc()
+            << exit(FatalIOError);
+    }
+
+    return autoPtr<waveModel>(cstrIter()(patchDict, mesh, patch));
+}
+
+
+Foam::tmp<Foam::waveModel> Foam::waveModel::lookupOrCreate
+(
+    const polyPatch& patch,
+    const fvMesh& mesh,
+    const word& waveDictName
+)
+{
+    const word modelName = waveModel::modelName(patch.name());
+
+    if (!mesh.foundObject<waveModel>(modelName))
+    {
+        autoPtr<waveModel> model(waveModel::New(waveDictName, mesh, patch));
+        waveModel* waveModelPtr = model.ptr();
+        waveModelPtr->store();
+        waveModelPtr->info(Info);
+    }
+
+    return mesh.lookupObject<waveModel>(modelName);
+}
+
+
+// ************************************************************************* //

From 95c34ea8ffc943794aadd50177f14229821656a0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 16 Nov 2016 14:14:48 +0000
Subject: [PATCH 03/18] INT: Initial commit for IHCantabria test cases

---
 .../0.org/U                                   |  60 +++++++
 .../0.org/alpha.water                         |  53 ++++++
 .../0.org/p_rgh                               |  60 +++++++
 .../casoIH.foam                               |   0
 .../constant/IHWavesDict                      |  34 ++++
 .../constant/g                                |  22 +++
 .../constant/polyMesh/blockMeshDict           |  90 ++++++++++
 .../constant/transportProperties              |  37 +++++
 .../constant/turbulenceProperties             |  20 +++
 .../system/controlDict                        | 157 ++++++++++++++++++
 .../system/decomposeParDict                   |  29 ++++
 .../system/fvSchemes                          |  69 ++++++++
 .../system/fvSolution                         | 105 ++++++++++++
 .../system/setFieldsDict                      |  36 ++++
 .../0.org/U                                   |  60 +++++++
 .../0.org/alpha.water                         |  53 ++++++
 .../0.org/p_rgh                               |  60 +++++++
 .../casoIH.foam                               |   0
 .../constant/IHWavesDict                      |  34 ++++
 .../constant/g                                |  22 +++
 .../constant/polyMesh/blockMeshDict           |  90 ++++++++++
 .../constant/transportProperties              |  37 +++++
 .../constant/turbulenceProperties             |  20 +++
 .../system/controlDict                        | 157 ++++++++++++++++++
 .../system/decomposeParDict                   |  29 ++++
 .../system/fvSchemes                          |  69 ++++++++
 .../system/fvSolution                         | 105 ++++++++++++
 .../system/setFieldsDict                      |  36 ++++
 28 files changed, 1544 insertions(+)
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
 create mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
 create mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict

diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
new file mode 100644
index 0000000000..8d0d8b6a8e
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            IH_Waves_InletVelocityV2;
+        waveDict        IHWavesDict;
+        value           uniform (0 0 0);
+
+	leftORright	1.0;
+    }
+
+    outlet
+    {
+        type            IH_3D_3DAbsorption_InletVelocityV2;
+        nPaddles        1;
+        value           uniform (0 0 0);
+
+	leftORright	-1.0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    ground
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
new file mode 100644
index 0000000000..cfddad3770
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5-dev                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            IH_Waves_InletAlphaV2;
+        waveDict        IHWavesDict;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    ground
+    {
+        type            zeroGradient;
+    }
+    
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
new file mode 100644
index 0000000000..fc5724d32b
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5-dev                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet 
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    outlet 
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    ground
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
new file mode 100644
index 0000000000..b516fa1b24
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      IHWavesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+waveType        regular;
+
+waveTheory      Cnoidal;
+
+genAbs          1;
+
+nPaddles        1;
+
+waveHeight      0.1;
+
+wavePeriod      4.0;
+
+waveDir         0.0;
+
+tSmooth		6.0;
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
new file mode 100644
index 0000000000..317bdd50de
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..bf8e28910c
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
@@ -0,0 +1,90 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0.0 0.0 0.0)
+    ( 30.0 0.0 0.0)
+    ( 30.0 0.04 0.0)
+    ( 0.0 0.04 0.0)
+    ( 0.0 0.0 0.7)
+    ( 30.0 0.0 0.7)
+    ( 30.0 0.04 0.7)
+    ( 0.0 0.04 0.7)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (750 1 70) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }    
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    sides
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (3 2 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
+
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
new file mode 100644
index 0000000000..3633e43efb
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+water
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
+}
+
+air
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
+}
+
+sigma           [1 0 -2 0 0 0 0] 0.07;
+
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
new file mode 100644
index 0000000000..22f11ecab7
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
new file mode 100644
index 0000000000..6800850f96
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
@@ -0,0 +1,157 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     interFoam
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         50.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  on;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05; 
+
+libs 
+(
+    "libIHwaveGenerationV2esi.so"
+    "libIHwaveAbsorptionV2esi.so"
+);
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        functionObjectLibs ("libsampling.so");
+        enabled         true;
+        outputControl     outputTime;
+        outputInterval  1;
+
+	interpolationScheme cellPoint;
+	setFormat       raw;
+	sets
+	(
+	    line1
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 1.0 0.005 0.0 );
+              end     ( 1.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line2
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 2.0 0.005 0.0 );
+              end     ( 2.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line3
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 3.0 0.005 0.0 );
+              end     ( 3.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line4
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 5.0 0.005 0.0 );
+              end     ( 5.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line5
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 7.5 0.005 0.0 );
+              end     ( 7.5 0.005 0.8 );
+	      nPoints 1001;
+	    }
+
+	    line6
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 10.0 0.005 0.0 );
+              end     ( 10.0 0.005 0.8 );
+	      nPoints 1001;
+	    }	    
+	    line7
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 12.0 0.005 0.0 );
+              end     ( 12.0 0.005 0.8 );
+	      nPoints 1001;
+	    }	  
+	    line8
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 14.0 0.005 0.0 );
+              end     ( 14.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	);
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
new file mode 100644
index 0000000000..a4e660116c
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
new file mode 100644
index 0000000000..391aa981db
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
@@ -0,0 +1,69 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    //div(rho*phi,U) Gauss limitedLinearV 1;
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,omega) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(phi,nuTilda) Gauss upwind;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+    pcorr;
+    alpha;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
new file mode 100644
index 0000000000..7f86a739ee
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
@@ -0,0 +1,105 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.water.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        alphaOuterCorrectors yes;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    3;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|epsilon|omega)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|epsilon|omega)Final"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    nuTilda
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaCorr      1;
+    nAlphaSubCycles 4;
+    cAlpha          2;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
new file mode 100644
index 0000000000..248ecb39e9
--- /dev/null
+++ b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (30.0 1.0 0.4);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
new file mode 100644
index 0000000000..8d0d8b6a8e
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            IH_Waves_InletVelocityV2;
+        waveDict        IHWavesDict;
+        value           uniform (0 0 0);
+
+	leftORright	1.0;
+    }
+
+    outlet
+    {
+        type            IH_3D_3DAbsorption_InletVelocityV2;
+        nPaddles        1;
+        value           uniform (0 0 0);
+
+	leftORright	-1.0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    ground
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
new file mode 100644
index 0000000000..cfddad3770
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5-dev                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            IH_Waves_InletAlphaV2;
+        waveDict        IHWavesDict;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    ground
+    {
+        type            zeroGradient;
+    }
+    
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
new file mode 100644
index 0000000000..fc5724d32b
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5-dev                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet 
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    outlet 
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    ground
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
new file mode 100644
index 0000000000..7e72269bda
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      IHWavesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+waveType        regular;
+
+waveTheory      StokesV;
+
+genAbs          1;
+
+nPaddles        1;
+
+waveHeight      0.1;
+
+wavePeriod      2.0;
+
+waveDir         0.0;
+
+tSmooth		4.0;
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
new file mode 100644
index 0000000000..317bdd50de
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..bf8e28910c
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
@@ -0,0 +1,90 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0.0 0.0 0.0)
+    ( 30.0 0.0 0.0)
+    ( 30.0 0.04 0.0)
+    ( 0.0 0.04 0.0)
+    ( 0.0 0.0 0.7)
+    ( 30.0 0.0 0.7)
+    ( 30.0 0.04 0.7)
+    ( 0.0 0.04 0.7)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (750 1 70) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }    
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    sides
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (3 2 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
+
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
new file mode 100644
index 0000000000..3633e43efb
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+water
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
+}
+
+air
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
+}
+
+sigma           [1 0 -2 0 0 0 0] 0.07;
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
new file mode 100644
index 0000000000..22f11ecab7
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
new file mode 100644
index 0000000000..2b262a9a3c
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
@@ -0,0 +1,157 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     interFoam
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         30.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  on;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05; 
+
+libs 
+(
+    "libIHwaveGenerationV2esi.so"
+    "libIHwaveAbsorptionV2esi.so"
+);
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        functionObjectLibs ("libsampling.so");
+        enabled         true;
+        outputControl     outputTime;
+        outputInterval  1;
+
+	interpolationScheme cellPoint;
+	setFormat       raw;
+	sets
+	(
+	    line1
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 1.0 0.005 0.0 );
+              end     ( 1.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line2
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 2.0 0.005 0.0 );
+              end     ( 2.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line3
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 3.0 0.005 0.0 );
+              end     ( 3.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line4
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 4.0 0.005 0.0 );
+              end     ( 4.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	    line5
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 5 0.005 0.0 );
+              end     ( 5 0.005 0.8 );
+	      nPoints 1001;
+	    }
+
+	    line6
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 7.0 0.005 0.0 );
+              end     ( 7.0 0.005 0.8 );
+	      nPoints 1001;
+	    }	    
+	    line7
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 8.0 0.005 0.0 );
+              end     ( 8.0 0.005 0.8 );
+	      nPoints 1001;
+	    }	  
+	    line8
+            {
+
+	      type uniform;
+	      axis distance;
+              start   ( 9.0 0.005 0.0 );
+              end     ( 9.0 0.005 0.8 );
+	      nPoints 1001;
+	    }
+	);
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
new file mode 100644
index 0000000000..12fa0de349
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 8;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 2 2);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
new file mode 100644
index 0000000000..391aa981db
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
@@ -0,0 +1,69 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    //div(rho*phi,U) Gauss limitedLinearV 1;
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,omega) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(phi,nuTilda) Gauss upwind;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+    pcorr;
+    alpha;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
new file mode 100644
index 0000000000..7f86a739ee
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
@@ -0,0 +1,105 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.water.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        alphaOuterCorrectors yes;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    3;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|epsilon|omega)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|epsilon|omega)Final"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    nuTilda
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaCorr      1;
+    nAlphaSubCycles 4;
+    cAlpha          2;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
new file mode 100644
index 0000000000..248ecb39e9
--- /dev/null
+++ b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (30.0 1.0 0.4);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+        );
+    }
+);
+
+
+// ************************************************************************* //

From 95dc43e5cb5e77106d4357c842acbcaeb4d1efe0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 16 Nov 2016 14:17:03 +0000
Subject: [PATCH 04/18] ENH: Updated IHCatabria test cases to use new
 functionality

---
 .../casoIH.foam                               |   0
 .../system/controlDict                        | 157 ------------------
 .../casoIH.foam                               |   0
 .../system/controlDict                        | 157 ------------------
 .../testCases/waveExampleCnoidal/0.orig}/U    |  12 +-
 .../waveExampleCnoidal/0.orig}/alpha.water    |  11 +-
 .../waveExampleCnoidal/0.orig}/p_rgh          |   8 +-
 .../testCases/waveExampleCnoidal/Allclean     |  10 ++
 .../testCases/waveExampleCnoidal/Allrun       |  15 ++
 .../testCases/waveExampleCnoidal}/constant/g  |   4 +-
 .../constant/transportProperties              |   4 +-
 .../constant/turbulenceProperties             |   4 +-
 .../constant/waveProperties}                  |  35 ++--
 .../waveExampleCnoidal/system}/blockMeshDict  |   6 +-
 .../waveExampleCnoidal/system/controlDict     | 152 +++++++++++++++++
 .../system/decomposeParDict                   |   8 +-
 .../waveExampleCnoidal}/system/fvSchemes      |   7 +-
 .../waveExampleCnoidal}/system/fvSolution     |   7 +-
 .../waveExampleCnoidal}/system/setFieldsDict  |   4 +-
 .../testCases/waveExampleStokesV/0.orig}/U    |  12 +-
 .../waveExampleStokesV/0.orig}/alpha.water    |   9 +-
 .../waveExampleStokesV/0.orig}/p_rgh          |   8 +-
 .../testCases/waveExampleStokesV/Allclean     |  10 ++
 .../testCases/waveExampleStokesV/Allrun       |  15 ++
 .../testCases/waveExampleStokesV}/constant/g  |   4 +-
 .../constant/transportProperties              |   4 +-
 .../constant/turbulenceProperties             |   4 +-
 .../constant/waveProperties}                  |  35 ++--
 .../waveExampleStokesV/system}/blockMeshDict  |   6 +-
 .../waveExampleStokesV/system/controlDict     | 150 +++++++++++++++++
 .../system/decomposeParDict                   |   4 +-
 .../waveExampleStokesV}/system/fvSchemes      |   7 +-
 .../waveExampleStokesV}/system/fvSolution     |   7 +-
 .../waveExampleStokesV}/system/setFieldsDict  |   4 +-
 34 files changed, 461 insertions(+), 419 deletions(-)
 delete mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam
 delete mode 100644 integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
 delete mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam
 delete mode 100644 integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleCnoidal/0.orig}/U (82%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleCnoidal/0.orig}/alpha.water (82%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleCnoidal/0.orig}/p_rgh (90%)
 create mode 100755 integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
 create mode 100755 integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/constant/g (84%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/constant/transportProperties (89%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/constant/turbulenceProperties (83%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict => OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties} (58%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh => OpenCFD/testCases/waveExampleCnoidal/system}/blockMeshDict (91%)
 create mode 100644 integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/system/decomposeParDict (82%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/system/fvSchemes (86%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/system/fvSolution (91%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleCnoidal}/system/setFieldsDict (88%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleStokesV/0.orig}/U (80%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleStokesV/0.orig}/alpha.water (84%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org => OpenCFD/testCases/waveExampleStokesV/0.orig}/p_rgh (90%)
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesV/Allclean
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesV/Allrun
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/constant/g (86%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/constant/transportProperties (89%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/constant/turbulenceProperties (85%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict => OpenCFD/testCases/waveExampleStokesV/constant/waveProperties} (58%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh => OpenCFD/testCases/waveExampleStokesV/system}/blockMeshDict (90%)
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/system/decomposeParDict (85%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/system/fvSchemes (86%)
 rename integration/{04-waveFlume_stokesV_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/system/fvSolution (91%)
 rename integration/{02-waveFlume_cnoidal_h0.1m_4cmX1cm => OpenCFD/testCases/waveExampleStokesV}/system/setFieldsDict (86%)

diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
deleted file mode 100644
index 6800850f96..0000000000
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
+++ /dev/null
@@ -1,157 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     interFoam
-
-startFrom       latestTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         50.0;
-
-deltaT          0.01;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.033;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression uncompressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-adjustTimeStep  on;
-
-maxCo           0.65;
-maxAlphaCo      0.65;
-
-maxDeltaT       0.05; 
-
-libs 
-(
-    "libIHwaveGenerationV2esi.so"
-    "libIHwaveAbsorptionV2esi.so"
-);
-
-
-functions
-{
-    line
-    {
-        type            sets;
-        functionObjectLibs ("libsampling.so");
-        enabled         true;
-        outputControl     outputTime;
-        outputInterval  1;
-
-	interpolationScheme cellPoint;
-	setFormat       raw;
-	sets
-	(
-	    line1
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 1.0 0.005 0.0 );
-              end     ( 1.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line2
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 2.0 0.005 0.0 );
-              end     ( 2.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line3
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 3.0 0.005 0.0 );
-              end     ( 3.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line4
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 5.0 0.005 0.0 );
-              end     ( 5.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line5
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 7.5 0.005 0.0 );
-              end     ( 7.5 0.005 0.8 );
-	      nPoints 1001;
-	    }
-
-	    line6
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 10.0 0.005 0.0 );
-              end     ( 10.0 0.005 0.8 );
-	      nPoints 1001;
-	    }	    
-	    line7
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 12.0 0.005 0.0 );
-              end     ( 12.0 0.005 0.8 );
-	      nPoints 1001;
-	    }	  
-	    line8
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 14.0 0.005 0.0 );
-              end     ( 14.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	);
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
-    }
-
-// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
deleted file mode 100644
index 2b262a9a3c..0000000000
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
+++ /dev/null
@@ -1,157 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     interFoam
-
-startFrom       latestTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         30.0;
-
-deltaT          0.01;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.033;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression uncompressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-adjustTimeStep  on;
-
-maxCo           0.65;
-maxAlphaCo      0.65;
-
-maxDeltaT       0.05; 
-
-libs 
-(
-    "libIHwaveGenerationV2esi.so"
-    "libIHwaveAbsorptionV2esi.so"
-);
-
-
-functions
-{
-    line
-    {
-        type            sets;
-        functionObjectLibs ("libsampling.so");
-        enabled         true;
-        outputControl     outputTime;
-        outputInterval  1;
-
-	interpolationScheme cellPoint;
-	setFormat       raw;
-	sets
-	(
-	    line1
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 1.0 0.005 0.0 );
-              end     ( 1.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line2
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 2.0 0.005 0.0 );
-              end     ( 2.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line3
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 3.0 0.005 0.0 );
-              end     ( 3.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line4
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 4.0 0.005 0.0 );
-              end     ( 4.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	    line5
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 5 0.005 0.0 );
-              end     ( 5 0.005 0.8 );
-	      nPoints 1001;
-	    }
-
-	    line6
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 7.0 0.005 0.0 );
-              end     ( 7.0 0.005 0.8 );
-	      nPoints 1001;
-	    }	    
-	    line7
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 8.0 0.005 0.0 );
-              end     ( 8.0 0.005 0.8 );
-	      nPoints 1001;
-	    }	  
-	    line8
-            {
-
-	      type uniform;
-	      axis distance;
-              start   ( 9.0 0.005 0.0 );
-              end     ( 9.0 0.005 0.8 );
-	      nPoints 1001;
-	    }
-	);
-        fixedLocations  false;
-        fields
-        (
-            U alpha.water
-        );
-    }
-
-// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
index 8d0d8b6a8e..b215c9cd48 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.x                                 |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,20 +23,14 @@ boundaryField
 {
     inlet
     {
-        type            IH_Waves_InletVelocityV2;
-        waveDict        IHWavesDict;
+        type            waveInletVelocity;
         value           uniform (0 0 0);
-
-	leftORright	1.0;
     }
 
     outlet
     {
-        type            IH_3D_3DAbsorption_InletVelocityV2;
-        nPaddles        1;
+        type            waveInletVelocity;
         value           uniform (0 0 0);
-
-	leftORright	-1.0;
     }
 
     sides
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
index cfddad3770..a99cef99e9 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5-dev                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -22,8 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            IH_Waves_InletAlphaV2;
-        waveDict        IHWavesDict;
+        type            waveInletAlpha;
         value           uniform 0;
     }
 
@@ -36,10 +35,10 @@ boundaryField
     {
         type            zeroGradient;
     }
-    
+
     sides
     {
-	type            empty;
+	    type            empty;
     }
 
     top
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
similarity index 90%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
index fc5724d32b..7ad5729cbf 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5-dev                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -20,13 +20,13 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet 
+    inlet
     {
         type            fixedFluxPressure;
         value           uniform 0;
     }
 
-    outlet 
+    outlet
     {
         type            fixedFluxPressure;
         value           uniform 0;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean b/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
new file mode 100755
index 0000000000..705f91474c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun b/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
new file mode 100755
index 0000000000..9f0c668029
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
similarity index 84%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
index 317bdd50de..3ec2141e5c 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
similarity index 89%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
index 3633e43efb..019225dd4f 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
similarity index 83%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
index 22f11ecab7..115a9830c1 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
similarity index 58%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
index 7e72269bda..34a5dbc9da 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.openfoam.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -11,24 +11,37 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      IHWavesDict;
+    object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-waveType        regular;
+inlet
+{
+    alpha           alpha.water;
 
-waveTheory      StokesV;
+    waveModel       cnoidal;
 
-genAbs          1;
+    nPaddle         1;
 
-nPaddles        1;
+    waveHeight      0.1;
 
-waveHeight      0.1;
+    waveAngle       0.0;
 
-wavePeriod      2.0;
+    rampTime        6.0;
 
-waveDir         0.0;
+    activeAbsorption yes;
+
+    wavePeriod      4.0;
+}
+
+outlet
+{
+    alpha           alpha.water;
+
+    waveModel       shallowWaterAbsorption;
+
+    nPaddle         1;
+}
 
-tSmooth		4.0;
 
 // ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
similarity index 91%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
index bf8e28910c..3b84f93af7 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -46,7 +46,7 @@ boundary
         (
             (0 4 7 3)
         );
-    }    
+    }
     outlet
     {
         type patch;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
new file mode 100644
index 0000000000..f65efdb456
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
@@ -0,0 +1,152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+    "libwaveBCs.so"
+    "libwaveModels.so"
+);
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         50.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05;
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        libs            ("libsampling.so");
+        enabled         true;
+        writeControl    writeTime;
+        writeInterval   1;
+
+        interpolationScheme cellPoint;
+        setFormat       raw;
+        sets
+        (
+            line1
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 1.0 0.005 0.0 );
+                end     ( 1.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line2
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 2.0 0.005 0.0 );
+                end     ( 2.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line3
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 3.0 0.005 0.0 );
+                end     ( 3.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line4
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 5.0 0.005 0.0 );
+                end     ( 5.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line5
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 7.5 0.005 0.0 );
+                end     ( 7.5 0.005 0.8 );
+                nPoints 1001;
+            }
+
+            line6
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 10.0 0.005 0.0 );
+                end     ( 10.0 0.005 0.8 );
+                nPoints 1001;
+            }	
+            line7
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 12.0 0.005 0.0 );
+                end     ( 12.0 0.005 0.8 );
+                nPoints 1001;
+            }	
+            line8
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 14.0 0.005 0.0 );
+                end     ( 14.0 0.005 0.8 );
+                nPoints 1001;
+            }
+        );
+
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
index a4e660116c..28bcf3ad28 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -15,13 +15,13 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 2;
+numberOfSubdomains 8;
 
 method          hierarchical;
 
 hierarchicalCoeffs
 {
-    n           (2 1 1);
+    n           (4 2 1);
     delta       0.001;
     order       xyz;
 }
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
index 391aa981db..c0cddb6d0e 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
@@ -2,8 +2,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -28,10 +28,9 @@ gradSchemes
 
 divSchemes
 {
-    //div(rho*phi,U) Gauss limitedLinearV 1;
     div(rhoPhi,U)   Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
-    div(phirb,alpha) Gauss interfaceCompression;
+    div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
similarity index 91%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
index 7f86a739ee..bb74b12427 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
@@ -2,8 +2,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -95,9 +95,6 @@ PIMPLE
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      1;
-    nAlphaSubCycles 4;
-    cAlpha          2;
 }
 
 
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
similarity index 88%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
index 248ecb39e9..9d2a8bcb80 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
similarity index 80%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
index 8d0d8b6a8e..523da1ac2d 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.x                                 |
+|  \\    /   O peration     | Version:  plus                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,20 +23,14 @@ boundaryField
 {
     inlet
     {
-        type            IH_Waves_InletVelocityV2;
-        waveDict        IHWavesDict;
+        type            waveInletVelocity;
         value           uniform (0 0 0);
-
-	leftORright	1.0;
     }
 
     outlet
     {
-        type            IH_3D_3DAbsorption_InletVelocityV2;
-        nPaddles        1;
+        type            waveInletVelocity;
         value           uniform (0 0 0);
-
-	leftORright	-1.0;
     }
 
     sides
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
similarity index 84%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
index cfddad3770..b309a9dfb8 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5-dev                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -22,8 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            IH_Waves_InletAlphaV2;
-        waveDict        IHWavesDict;
+        type            waveInletAlpha;
         value           uniform 0;
     }
 
@@ -36,7 +35,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    
+
     sides
     {
 	type            empty;
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
similarity index 90%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
index fc5724d32b..7ad5729cbf 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5-dev                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -20,13 +20,13 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet 
+    inlet
     {
         type            fixedFluxPressure;
         value           uniform 0;
     }
 
-    outlet 
+    outlet
     {
         type            fixedFluxPressure;
         value           uniform 0;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allclean b/integration/OpenCFD/testCases/waveExampleStokesV/Allclean
new file mode 100755
index 0000000000..705f91474c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allrun b/integration/OpenCFD/testCases/waveExampleStokesV/Allrun
new file mode 100755
index 0000000000..9f0c668029
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g b/integration/OpenCFD/testCases/waveExampleStokesV/constant/g
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/g
index 317bdd50de..195dbea3f3 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
similarity index 89%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
index 3633e43efb..019225dd4f 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
similarity index 85%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
index 22f11ecab7..e4ad75d18c 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
similarity index 58%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
index b516fa1b24..9192fe1161 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
@@ -1,8 +1,8 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.3                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.openfoam.com               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -11,24 +11,37 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      IHWavesDict;
+    object      wavesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-waveType        regular;
+inlet
+{
+    alpha           alpha.water;
 
-waveTheory      Cnoidal;
+    waveModel       StokesV;
 
-genAbs          1;
+    nPaddle         1;
 
-nPaddles        1;
+    waveHeight      0.1;
 
-waveHeight      0.1;
+    waveAngle       0.0;
 
-wavePeriod      4.0;
+    rampTime        4.0;
 
-waveDir         0.0;
+    activeAbsorption yes;
+
+    wavePeriod      2.0;
+}
+
+outlet
+{
+    alpha           alpha.water;
+
+    waveModel       shallowWaterAbsorption;
+
+    nPaddle         1;
+}
 
-tSmooth		6.0;
 
 // ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
similarity index 90%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
index bf8e28910c..6f5bedb3be 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                    |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -46,7 +46,7 @@ boundary
         (
             (0 4 7 3)
         );
-    }    
+    }
     outlet
     {
         type patch;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
new file mode 100644
index 0000000000..c45cdd924d
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
@@ -0,0 +1,150 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                    |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+    "libwaveBCs.so"
+    "libwaveModels.so"
+);
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         30.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  on;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05;
+
+functions
+{
+    line
+    {
+        type            sets;
+        libs            ("libsampling.so");
+        enabled         true;
+        writeControl    writeTime;
+        writeInterval   1;
+
+	    interpolationScheme cellPoint;
+	    setFormat       raw;
+	    sets
+	    (
+            line1
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 1.0 0.005 0.0 );
+                end     ( 1.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line2
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 2.0 0.005 0.0 );
+                end     ( 2.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line3
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 3.0 0.005 0.0 );
+                end     ( 3.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line4
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 4.0 0.005 0.0 );
+                end     ( 4.0 0.005 0.8 );
+                nPoints 1001;
+            }
+            line5
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 5 0.005 0.0 );
+                end     ( 5 0.005 0.8 );
+                nPoints 1001;
+            }
+
+            line6
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 7.0 0.005 0.0 );
+                end     ( 7.0 0.005 0.8 );
+                nPoints 1001;
+            }	
+            line7
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 8.0 0.005 0.0 );
+                end     ( 8.0 0.005 0.8 );
+                nPoints 1001;
+            }	
+            line8
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 9.0 0.005 0.0 );
+                end     ( 9.0 0.005 0.8 );
+                nPoints 1001;
+            }
+        );
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
similarity index 85%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
index 12fa0de349..e0b4d2df3e 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                    |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
similarity index 86%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
index 391aa981db..c0cddb6d0e 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
@@ -2,8 +2,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -28,10 +28,9 @@ gradSchemes
 
 divSchemes
 {
-    //div(rho*phi,U) Gauss limitedLinearV 1;
     div(rhoPhi,U)   Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
-    div(phirb,alpha) Gauss interfaceCompression;
+    div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
similarity index 91%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
index 7f86a739ee..bb74b12427 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
@@ -2,8 +2,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -95,9 +95,6 @@ PIMPLE
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      1;
-    nAlphaSubCycles 4;
-    cAlpha          2;
 }
 
 
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
index 248ecb39e9..ea8c0c2ee3 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                    |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

From ce7cc3a7449414ccae992feef948f739bb1c0324 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 17 Nov 2016 08:52:15 +0000
Subject: [PATCH 05/18] ENH: Wave code tidying

---
 integration/OpenCFD/code/waveBCs/Make/options |  1 -
 ...sorptionOutletVelocityFvPatchVectorField.C | 36 +++---------------
 ...sorptionOutletVelocityFvPatchVectorField.H | 11 +-----
 .../waveInletAlphaFvPatchScalarField.C        | 37 +++----------------
 .../waveInletAlphaFvPatchScalarField.H        |  9 -----
 .../waveInletVelocityFvPatchVectorField.C     | 37 +++----------------
 .../waveInletVelocityFvPatchVectorField.H     |  9 -----
 .../OpenCFD/code/waveModel/Make/options       |  1 -
 .../waveAbsorptionModel/waveAbsorptionModel.H |  1 +
 .../base/regularWaveModel/regularWaveModel.H  |  1 +
 10 files changed, 21 insertions(+), 122 deletions(-)

diff --git a/integration/OpenCFD/code/waveBCs/Make/options b/integration/OpenCFD/code/waveBCs/Make/options
index 0490e0a2c6..dac0999deb 100644
--- a/integration/OpenCFD/code/waveBCs/Make/options
+++ b/integration/OpenCFD/code/waveBCs/Make/options
@@ -1,7 +1,6 @@
 DEV_PATH = ..
 
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(DEV_PATH)/waveModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
index e9c8107ff4..e4a462c001 100644
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
+++ b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
@@ -26,26 +26,7 @@ License
 #include "waveAbsorptionOutletVelocityFvPatchVectorField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
-
-Foam::waveModel&
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::getWaveModel()
-{
-    // Return waveModel from database if present, or create
-
-    if (!waveModel_.valid())
-    {
-        waveModel_ =
-            waveModel::lookupOrCreate
-            (
-                patch().patch(),
-                internalField().mesh(),
-                waveDictName_
-            );
-    }
-
-    return waveModel_.ref();
-}
-
+#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -57,8 +38,7 @@ waveAbsorptionOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    waveDictName_(waveModel::dictName),
-    waveModelPtr_()
+    waveDictName_(waveModel::dictName)
 {}
 
 
@@ -72,8 +52,7 @@ waveAbsorptionOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    waveDictName_(ptf.waveDictName_),
-    waveModelPtr_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -86,8 +65,7 @@ waveAbsorptionOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
-    waveModelPtr_()
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName))
 {}
 
 
@@ -98,8 +76,7 @@ waveAbsorptionOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    waveDictName_(ptf.waveDictName_),
-    waveModelPtr_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -111,8 +88,7 @@ waveAbsorptionOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    waveDictName_(ptf.waveDictName_),
-    waveModelPtr_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
index 1f050ce6f8..d797e8017c 100644
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
+++ b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
@@ -32,7 +32,6 @@ Description
         type            waveAbsorptionOutletVelocity;
         waveDict        wavesDict;
         value           uniform (0 0 0);
-	    leftORright	      1.0;
     }
     \endverbatim
 
@@ -40,8 +39,7 @@ Usage
     \table
         Property     | Description             | Required    | Default value
         type         | type: waveAbsorptionOutletVelocity | yes         |
-        waveDict     | Dictionary where variables for generation/absorption are defined | yes | waveDict
-	    leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
+        waveDict    | Dictionary specifying wave variables | no | waveProperties
     \endtable
 
 Note
@@ -58,7 +56,6 @@ SourceFiles
 #define waveAbsorptionOutletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,12 +74,6 @@ class waveAbsorptionOutletVelocityFvPatchVectorField
         //- Dictionary name
         word waveDictName_;
 
-        //- Pointer to the wave model
-        tmp<waveModel> waveModel_;
-
-        //- Help function to retrieve the wave model
-        waveModel& getWaveModel();
-
 
 public:
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
index b9d27cf73f..3dd4e5bcd8 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
+++ b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
@@ -26,27 +26,7 @@ License
 #include "waveInletAlphaFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::waveModel& Foam::waveInletAlphaFvPatchScalarField::getWaveModel()
-{
-    // Return waveModel from database if present, or create
-
-    if (!waveModel_.valid())
-    {
-        waveModel_ =
-            waveModel::lookupOrCreate
-            (
-                patch().patch(),
-                internalField().mesh(),
-                waveDictName_
-            );
-    }
-
-    return waveModel_.ref();
-}
-
+#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -57,8 +37,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(p, iF),
-    waveDictName_(waveModel::dictName),
-    waveModel_()
+    waveDictName_(waveModel::dictName)
 {}
 
 
@@ -71,8 +50,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -84,8 +62,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
-    waveModel_()
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName))
 {}
 
 
@@ -95,8 +72,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(ptf),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -107,8 +83,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 )
 :
     fixedValueFvPatchField<scalar>(ptf, iF),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
index b654bd60c8..eb84795be1 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
+++ b/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
@@ -32,7 +32,6 @@ Description
     {
         type            waveInletAlpha;
         value           uniform (0 0 0);
-	    leftORright	      1.0;
     }
     \endverbatim
 
@@ -41,7 +40,6 @@ Usage
         Property    | Description          | Required    | Default value
         type        | type: waveInletAlpha | yes         |
         waveDict    | Dictionary specifying wave variables | no | waveProperties
-	    leftORright | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
     \endtable
 
 Note
@@ -58,7 +56,6 @@ SourceFiles
 #define waveInletAlphaFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,12 +74,6 @@ class waveInletAlphaFvPatchScalarField
         //- Dictionary name
         word waveDictName_;
 
-        //- Pointer to the wave model
-        tmp<waveModel> waveModel_;
-
-        //- Help function to retrieve the wave model
-        waveModel& getWaveModel();
-
 
 public:
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
index 78df5763ed..5c36dc49d9 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
+++ b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
@@ -26,27 +26,7 @@ License
 #include "waveInletVelocityFvPatchVectorField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::waveModel& Foam::waveInletVelocityFvPatchVectorField::getWaveModel()
-{
-    // Return waveModel from database if present, or create
-
-    if (!waveModel_.valid())
-    {
-        waveModel_ =
-            waveModel::lookupOrCreate
-            (
-                patch().patch(),
-                internalField().mesh(),
-                waveDictName_
-            );
-    }
-
-    return waveModel_.ref();
-}
-
+#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -57,8 +37,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    waveDictName_(waveModel::dictName),
-    waveModel_()
+    waveDictName_(waveModel::dictName)
 {}
 
 
@@ -71,8 +50,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -84,8 +62,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName)),
-    waveModel_()
+    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName))
 {}
 
 
@@ -95,8 +72,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
@@ -107,8 +83,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    waveDictName_(ptf.waveDictName_),
-    waveModel_()
+    waveDictName_(ptf.waveDictName_)
 {}
 
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
index faa42bee7b..1356702d9d 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
+++ b/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
@@ -31,7 +31,6 @@ Description
     {
         type            waveInletVelocity;
         value           uniform (0 0 0);
-	    leftORright	      1.0;
     }
     \endverbatim
 
@@ -40,7 +39,6 @@ Usage
         Property    | Description             | Required   | Default value
         type        | type: waveInletVelocity | yes        |
         waveDict    | Dictionary specifying wave variables | no | waveProperties
-	    leftORright | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
     \endtable
 
 Note
@@ -57,7 +55,6 @@ SourceFiles
 #define waveInletVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -76,12 +73,6 @@ class waveInletVelocityFvPatchVectorField
         //- Dictionary name
         word waveDictName_;
 
-        //- Pointer to the wave model
-        tmp<waveModel> waveModel_;
-
-        //- Help function to retrieve the wave model
-        waveModel& getWaveModel();
-
 
 public:
 
diff --git a/integration/OpenCFD/code/waveModel/Make/options b/integration/OpenCFD/code/waveModel/Make/options
index 856294218d..71b7873964 100644
--- a/integration/OpenCFD/code/waveModel/Make/options
+++ b/integration/OpenCFD/code/waveModel/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
index 0f60c8c778..ec49892696 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
@@ -76,6 +76,7 @@ public:
     //- Destructor
     virtual ~waveAbsorptionModel();
 
+
     // Public Member Functions
 
         //- Read from dictionary
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
index 64404b9f46..fe7f192287 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
@@ -70,6 +70,7 @@ protected:
         //- Wave phase
         scalar wavePhase_;
 
+
     // Protected Member Functions
 
         //- Return word description of wave type

From 9a10efc6fab06f2d0e85193980de9737cfe60ba9 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 17 Nov 2016 10:30:00 +0000
Subject: [PATCH 06/18] ENH: waveModel - using class varaiable instead of a
 static to update the model

---
 integration/OpenCFD/code/waveModel/waveModel/waveModel.C | 7 +++----
 integration/OpenCFD/code/waveModel/waveModel/waveModel.H | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index 96d234f49f..3d56459e36 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -276,6 +276,7 @@ Foam::waveModel::waveModel
     waterDepthRef_(0),
     initialDepth_(0),
     rampTime_(VSMALL),
+    currTimeIndex_(-1),
     activeAbsorption_(false),
     U_(patch.size(), vector::zero),
     alpha_(patch.size(), 0)
@@ -338,9 +339,7 @@ bool Foam::waveModel::read()
 
 void Foam::waveModel::correct(const scalar t)
 {
-    static label timeIndex = -1;
-
-    if (mesh_.time().timeIndex() != timeIndex)
+    if (mesh_.time().timeIndex() != currTimeIndex_)
     {
         Info<< "Updating " << type() << " wave model for patch "
             << patch_.name() << endl;
@@ -394,7 +393,7 @@ void Foam::waveModel::correct(const scalar t)
         // Transform velocity into global co-ordinate system
         U_ = Rlg_ & U_;
 
-        timeIndex = mesh_.time().timeIndex();
+        currTimeIndex_ = mesh_.time().timeIndex();
     }
 }
 
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
index 077633ae37..dea8125e06 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -114,9 +114,13 @@ protected:
         //- Ramp time
         scalar rampTime_;
 
+        //- Time index used for updating
+        label currTimeIndex_;
+
         //- Active wave absorption switch
         bool activeAbsorption_;
 
+
         // Current values
 
             //- Velocity field

From 1248851fa4ba52f7b6b32050027e8c83680314e1 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 22 Nov 2016 15:04:05 +0000
Subject: [PATCH 07/18] BUG: waveModel - removed direction() function -
 co-ordinate system takes care of direction

---
 .../base/waveAbsorptionModel/waveAbsorptionModel.H     | 10 ----------
 .../base/waveGenerationModel/waveGenerationModel.H     |  9 ---------
 .../OpenCFD/code/waveModel/waveModel/waveModel.C       |  4 +---
 .../OpenCFD/code/waveModel/waveModel/waveModel.H       |  3 ---
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
index ec49892696..e77a4f9fce 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
@@ -48,16 +48,6 @@ class waveAbsorptionModel
 :
     public waveModel
 {
-protected:
-
-    // Protected Member Functions
-
-        //- Wave direction
-        virtual scalar direction() const
-        {
-            return -1;
-        }
-
 
 public:
 
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
index 267aa1e83c..e0e2048334 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
@@ -59,15 +59,6 @@ protected:
         scalar waveAngle_;
 
 
-    // Protected Member Functions
-
-        //- Wave direction
-        virtual scalar direction() const
-        {
-            return 1;
-        }
-
-
 public:
 
     //- Runtime type information
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index 3d56459e36..b82ddb92d6 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -372,8 +372,6 @@ void Foam::waveModel::correct(const scalar t)
 
             if (patch_.size())
             {
-                const scalar d = direction();
-
                 forAll(activeLevel, facei)
                 {
                     const label paddlei = faceToPaddle_[facei];
@@ -384,7 +382,7 @@ void Foam::waveModel::correct(const scalar t)
                             (calculatedLevel[paddlei] - activeLevel[paddlei])
                            *sqrt(mag(g_)/activeLevel[paddlei]);
 
-                        U_[facei].x() += d*UCorr;
+                        U_[facei].x() += UCorr;
                     }
                 }
             }
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
index dea8125e06..5087682411 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -154,9 +154,6 @@ protected:
             const scalarField& level
         ) = 0;
 
-        //- Wave direction
-        virtual scalar direction() const = 0;
-
         //- Set the alpha field based on the water level
         virtual void setAlpha(const scalarField& level);
 

From a895f207591bcd578e1addb6d4d5c0c31c5d2c89 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 22 Nov 2016 15:42:12 +0000
Subject: [PATCH 08/18] BUG: waveModel - set U to zero in else branch

---
 integration/OpenCFD/code/waveModel/waveModel/waveModel.C | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index b82ddb92d6..876d7c2097 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -384,6 +384,10 @@ void Foam::waveModel::correct(const scalar t)
 
                         U_[facei].x() += UCorr;
                     }
+                    else
+                    {
+                        U_[facei] = vector::zero;
+                    }
                 }
             }
         }

From 0b83cebd1254cf7ba0ab19c01d66ab8de221be9e Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 23 Nov 2016 10:41:37 +0000
Subject: [PATCH 09/18] BUG: wave model active absorption loop should be over
 all patch faces

---
 .../code/waveModel/waveModel/waveModel.C      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index 876d7c2097..820b5ca30f 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -370,24 +370,21 @@ void Foam::waveModel::correct(const scalar t)
         {
             const scalarField activeLevel(this->waterLevel());
 
-            if (patch_.size())
+            forAll(U_, facei)
             {
-                forAll(activeLevel, facei)
+                const label paddlei = faceToPaddle_[facei];
+
+                if (zMin_[facei] < activeLevel[paddlei])
                 {
-                    const label paddlei = faceToPaddle_[facei];
+                    scalar UCorr =
+                        (calculatedLevel[paddlei] - activeLevel[paddlei])
+                       *sqrt(mag(g_)/activeLevel[paddlei]);
 
-                    if (zMin_[facei] < activeLevel[paddlei])
-                    {
-                        scalar UCorr =
-                            (calculatedLevel[paddlei] - activeLevel[paddlei])
-                           *sqrt(mag(g_)/activeLevel[paddlei]);
-
-                        U_[facei].x() += UCorr;
-                    }
-                    else
-                    {
-                        U_[facei] = vector::zero;
-                    }
+                    U_[facei].x() += UCorr;
+                }
+                else
+                {
+                    U_[facei].x() = 0;
                 }
             }
         }

From c7b51f98e70604320b145a3b1647b960c2d7239a Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 23 Nov 2016 14:57:45 +0000
Subject: [PATCH 10/18] ENH: waveModel - enable restart

---
 .../code/waveModel/waveModel/waveModel.C      | 59 +++++++++++++------
 .../code/waveModel/waveModel/waveModel.H      |  7 +++
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index 820b5ca30f..e314476d66 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -45,19 +45,45 @@ const Foam::word Foam::waveModel::dictName("waveProperties");
 
 Foam::word Foam::waveModel::modelName(const word& patchName)
 {
-    word name = dictName + '.' + patchName;
-
-    if (Pstream::parRun())
-    {
-        name += ".proc" + Foam::name(Pstream::myProcNo());
-    }
-
-    return name;
+    return dictName + '.' + patchName;
 }
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
+Foam::IOdictionary Foam::waveModel::initialiseDict
+(
+    const fvMesh& mesh,
+    const word& patchName
+)
+{
+    IOobject io
+    (
+        modelName(patchName),
+        Time::timeName(mesh.time().startTime().value()),
+        "uniform",
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    );
+
+    const word oldTypeName = IOdictionary::typeName;
+
+    const_cast<word&>(IOdictionary::typeName) = word::null;
+
+    if (!io.typeHeaderOk<IOdictionary>(false))
+    {
+        io.readOpt() = IOobject::NO_READ;
+    }
+
+    IOdictionary dict(io);
+
+    const_cast<word&>(IOdictionary::typeName) = oldTypeName;
+
+    return dict;
+}
+
+
 void Foam::waveModel::initialiseGeometry()
 {
     // Determine local patch co-ordinate system given by:
@@ -248,17 +274,7 @@ Foam::waveModel::waveModel
     const bool readFields
 )
 :
-    IOdictionary
-    (
-        IOobject
-        (
-            modelName(patch.name()),
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ
-        ),
-        dict
-    ),
+    IOdictionary(initialiseDict(mesh, patch.name())),
     mesh_(mesh),
     patch_(patch),
     g_(mesh.lookupObject<uniformDimensionedVectorField>("g").value()),
@@ -281,6 +297,8 @@ Foam::waveModel::waveModel
     U_(patch.size(), vector::zero),
     alpha_(patch.size(), 0)
 {
+    merge(dict);
+
     if (readFields)
     {
         read();
@@ -331,6 +349,9 @@ bool Foam::waveModel::read()
                 waterDepthRef_ = level.first();
             }
         }
+
+        // Insert the reference water depth into [this] to enable restart
+        add("waterDepthRef", waterDepthRef_);
     }
 
     return true;
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
index 5087682411..484d96685a 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -132,6 +132,13 @@ protected:
 
     // Protected Member Functions
 
+        //- Initialise dictionary
+        virtual IOdictionary initialiseDict
+        (
+            const fvMesh& mesh,
+            const word& patchName
+        );
+
         //- Initialise
         virtual void initialiseGeometry();
 

From bc05a40b5677fd607a7fbc5015f4cf56a5833953 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 23 Nov 2016 15:48:56 +0000
Subject: [PATCH 11/18] ENH: waveModel - updated restart method

---
 .../waveAbsorptionModel/waveAbsorptionModel.C |  6 +-
 .../waveAbsorptionModel/waveAbsorptionModel.H |  2 +-
 .../shallowWaterAbsorption.C                  |  9 ++-
 .../shallowWaterAbsorption.H                  |  2 +-
 .../base/regularWaveModel/regularWaveModel.C  |  6 +-
 .../base/regularWaveModel/regularWaveModel.H  |  2 +-
 .../solitaryWaveModel/solitaryWaveModel.C     |  6 +-
 .../solitaryWaveModel/solitaryWaveModel.H     |  2 +-
 .../waveGenerationModel/waveGenerationModel.C |  6 +-
 .../waveGenerationModel/waveGenerationModel.H |  2 +-
 .../derived/Boussinesq/BoussinesqWaveModel.C  |  6 +-
 .../derived/Boussinesq/BoussinesqWaveModel.H  |  2 +-
 .../derived/StokesI/StokesIWaveModel.C        |  6 +-
 .../derived/StokesI/StokesIWaveModel.H        |  2 +-
 .../derived/StokesII/StokesIIWaveModel.C      |  6 +-
 .../derived/StokesII/StokesIIWaveModel.H      |  2 +-
 .../derived/StokesV/StokesVWaveModel.C        |  6 +-
 .../derived/StokesV/StokesVWaveModel.H        |  2 +-
 .../derived/cnoidal/cnoidalWaveModel.C        |  6 +-
 .../derived/cnoidal/cnoidalWaveModel.H        |  2 +-
 .../code/waveModel/waveModel/waveModel.C      | 60 +++++++------------
 .../code/waveModel/waveModel/waveModel.H      |  9 +--
 22 files changed, 66 insertions(+), 86 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
index 6bb712abd6..b0b21c1d2f 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
@@ -50,7 +50,7 @@ Foam::waveModels::waveAbsorptionModel::waveAbsorptionModel
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -63,9 +63,9 @@ Foam::waveModels::waveAbsorptionModel::~waveAbsorptionModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::waveAbsorptionModel::read()
+bool Foam::waveModels::waveAbsorptionModel::read(const dictionary& overrideDict)
 {
-    if (waveModel::read())
+    if (waveModel::read(overrideDict))
     {
         // Note: always set to true
         activeAbsorption_ = true;
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
index e77a4f9fce..9e66d9e87f 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
@@ -70,7 +70,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 };
 
 
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
index 9fb497d04e..471ac164bc 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
@@ -92,7 +92,7 @@ Foam::waveModels::shallowWaterAbsorption::shallowWaterAbsorption
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -105,9 +105,12 @@ Foam::waveModels::shallowWaterAbsorption::~shallowWaterAbsorption()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::shallowWaterAbsorption::read()
+bool Foam::waveModels::shallowWaterAbsorption::read
+(
+    const dictionary& overrideDict
+)
 {
-    return waveAbsorptionModel::read();
+    return waveAbsorptionModel::read(overrideDict);
 }
 
 
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
index 8db9d45cc3..bbc31f7878 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
@@ -94,7 +94,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 };
 
 
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
index 1d877175ea..44e87c3dc5 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
@@ -76,7 +76,7 @@ Foam::waveModels::regularWaveModel::regularWaveModel
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -89,9 +89,9 @@ Foam::waveModels::regularWaveModel::~regularWaveModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::regularWaveModel::read()
+bool Foam::waveModels::regularWaveModel::read(const dictionary& overrideDict)
 {
-    if (waveGenerationModel::read())
+    if (waveGenerationModel::read(overrideDict))
     {
         lookup("wavePeriod") >> wavePeriod_;
         if (wavePeriod_ < 0)
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
index fe7f192287..3eed94b0c6 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
@@ -99,7 +99,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
index 4ea1bf7212..5c0f1e3e96 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
@@ -56,7 +56,7 @@ Foam::waveModels::solitaryWaveModel::solitaryWaveModel
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -69,9 +69,9 @@ Foam::waveModels::solitaryWaveModel::~solitaryWaveModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::solitaryWaveModel::read()
+bool Foam::waveModels::solitaryWaveModel::read(const dictionary& overrideDict)
 {
-    if (waveGenerationModel::read())
+    if (waveGenerationModel::read(overrideDict))
     {
         return true;
     }
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
index 4ac086f5f4..e880e2fc33 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
@@ -81,7 +81,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
index daed9a9138..3dba0c3b4c 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
@@ -55,7 +55,7 @@ Foam::waveModels::waveGenerationModel::waveGenerationModel
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -68,9 +68,9 @@ Foam::waveModels::waveGenerationModel::~waveGenerationModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::waveGenerationModel::read()
+bool Foam::waveModels::waveGenerationModel::read(const dictionary& overrideDict)
 {
-    if (waveModel::read())
+    if (waveModel::read(overrideDict))
     {
         lookup("rampTime") >> rampTime_;
         lookup("activeAbsorption") >> activeAbsorption_;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
index e0e2048334..c0ed643e7b 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
@@ -80,7 +80,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
index d4e13db390..0956ccbd44 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
@@ -179,7 +179,7 @@ Foam::waveModels::Boussinesq::Boussinesq
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -192,9 +192,9 @@ Foam::waveModels::Boussinesq::~Boussinesq()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::Boussinesq::read()
+bool Foam::waveModels::Boussinesq::read(const dictionary& overrideDict)
 {
-    if (solitaryWaveModel::read())
+    if (solitaryWaveModel::read(overrideDict))
     {
         return true;
     }
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
index 10ff402446..e0ece2d750 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
@@ -127,7 +127,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
index 79342d182b..8a67ea2a2d 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
@@ -155,7 +155,7 @@ Foam::waveModels::StokesI::StokesI
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -168,9 +168,9 @@ Foam::waveModels::StokesI::~StokesI()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::StokesI::read()
+bool Foam::waveModels::StokesI::read(const dictionary& overrideDict)
 {
-    if (regularWaveModel::read())
+    if (regularWaveModel::read(overrideDict))
     {
 		waveLength_ = waveLength(waterDepthRef_, wavePeriod_);
 
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
index 6e991c09f4..10d06b9727 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
@@ -120,7 +120,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
index c50e80c6da..b867959f8c 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
@@ -148,7 +148,7 @@ Foam::waveModels::StokesII::StokesII
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -161,9 +161,9 @@ Foam::waveModels::StokesII::~StokesII()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::StokesII::read()
+bool Foam::waveModels::StokesII::read(const dictionary& overrideDict)
 {
-    if (StokesI::read())
+    if (StokesI::read(overrideDict))
     {
         return true;
     }
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
index f1f6317270..a16f29ace7 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
@@ -110,7 +110,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
index c67b9e7ab1..e7273e91c3 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
@@ -788,7 +788,7 @@ Foam::waveModels::StokesV::StokesV
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -801,9 +801,9 @@ Foam::waveModels::StokesV::~StokesV()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::StokesV::read()
+bool Foam::waveModels::StokesV::read(const dictionary& overrideDict)
 {
-    if (regularWaveModel::read())
+    if (regularWaveModel::read(overrideDict))
     {
         scalar f1;
         scalar f2;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
index 7b9291b463..1c127d703e 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
@@ -209,7 +209,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
index 972ef9c94a..98c3873451 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
@@ -277,7 +277,7 @@ Foam::waveModels::cnoidal::cnoidal
 {
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -290,9 +290,9 @@ Foam::waveModels::cnoidal::~cnoidal()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModels::cnoidal::read()
+bool Foam::waveModels::cnoidal::read(const dictionary& overrideDict)
 {
-    if (regularWaveModel::read())
+    if (regularWaveModel::read(overrideDict))
     {
         // Initialise m parameter and wavelength
         initialise
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
index be15105454..dd4e1a169c 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
@@ -156,7 +156,7 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Info
         virtual void info(Ostream& os) const;
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index e314476d66..2ad9700931 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -51,39 +51,6 @@ Foam::word Foam::waveModel::modelName(const word& patchName)
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::IOdictionary Foam::waveModel::initialiseDict
-(
-    const fvMesh& mesh,
-    const word& patchName
-)
-{
-    IOobject io
-    (
-        modelName(patchName),
-        Time::timeName(mesh.time().startTime().value()),
-        "uniform",
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    );
-
-    const word oldTypeName = IOdictionary::typeName;
-
-    const_cast<word&>(IOdictionary::typeName) = word::null;
-
-    if (!io.typeHeaderOk<IOdictionary>(false))
-    {
-        io.readOpt() = IOobject::NO_READ;
-    }
-
-    IOdictionary dict(io);
-
-    const_cast<word&>(IOdictionary::typeName) = oldTypeName;
-
-    return dict;
-}
-
-
 void Foam::waveModel::initialiseGeometry()
 {
     // Determine local patch co-ordinate system given by:
@@ -274,7 +241,18 @@ Foam::waveModel::waveModel
     const bool readFields
 )
 :
-    IOdictionary(initialiseDict(mesh, patch.name())),
+    IOdictionary
+    (
+        IOobject
+        (
+            modelName(patch.name()),
+            Time::timeName(mesh.time().startTime().value()),
+            "uniform",
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        )
+    ),
     mesh_(mesh),
     patch_(patch),
     g_(mesh.lookupObject<uniformDimensionedVectorField>("g").value()),
@@ -297,11 +275,9 @@ Foam::waveModel::waveModel
     U_(patch.size(), vector::zero),
     alpha_(patch.size(), 0)
 {
-    merge(dict);
-
     if (readFields)
     {
-        read();
+        read(dict);
     }
 }
 
@@ -314,8 +290,16 @@ Foam::waveModel::~waveModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::waveModel::read()
+bool Foam::waveModel::read(const dictionary& overrideDict)
 {
+    readOpt() = IOobject::READ_IF_PRESENT;
+    if (headerOk())
+    {
+        IOdictionary::regIOobject::read();
+    }
+
+    merge(overrideDict);
+
     readIfPresent("U", UName_);
     readIfPresent("alpha", alphaName_);
 
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
index 484d96685a..a7330ce703 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -132,13 +132,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Initialise dictionary
-        virtual IOdictionary initialiseDict
-        (
-            const fvMesh& mesh,
-            const word& patchName
-        );
-
         //- Initialise
         virtual void initialiseGeometry();
 
@@ -237,7 +230,7 @@ public:
         static word modelName(const word& patchName);
 
         //- Read from dictionary
-        virtual bool read();
+        virtual bool read(const dictionary& overrideDict);
 
         //- Return the latest wave velocity prediction
         virtual const vectorField& U() const;

From 02e9433d73c4c5113fa4455432498dbf0c7b5a53 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 25 Nov 2016 10:49:23 +0000
Subject: [PATCH 12/18] BUG: Boussinesq wave model - corrected coefficient
 reported by Gabi

---
 .../derived/Boussinesq/BoussinesqWaveModel.C                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
index 0956ccbd44..d7e4dca2fc 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
@@ -79,7 +79,7 @@ Foam::vector Foam::waveModels::Boussinesq::Deta
     vector deta(vector::zero);
 
     scalar C = sqrt(mag(g_)*(H + h));
-    scalar ts = 3*h/sqrt(H/h);
+    scalar ts = 3.5*h/sqrt(H/h);
     scalar a = sqrt(3*H/(4*h))/h;
     scalar Xa = -C*t + ts - X0 + x*cos(theta) + y*sin(theta);
     scalar expTerm = exp(2*a*Xa);

From 21b3f88a72bbfca106e7de7886e25d410bc1217b Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 25 Nov 2016 10:49:53 +0000
Subject: [PATCH 13/18] ENH: waveModels - refactored time scaling coefficient

---
 .../waveAbsorptionModel/waveAbsorptionModel.C     | 12 ++++++++++++
 .../waveAbsorptionModel/waveAbsorptionModel.H     |  9 ++++++++-
 .../base/regularWaveModel/regularWaveModel.C      | 15 ++++++++++++++-
 .../base/regularWaveModel/regularWaveModel.H      |  8 +++++++-
 .../base/solitaryWaveModel/solitaryWaveModel.C    | 14 ++++++++++++++
 .../base/solitaryWaveModel/solitaryWaveModel.H    |  6 ++++++
 .../waveGenerationModel/waveGenerationModel.C     |  4 +---
 .../OpenCFD/code/waveModel/waveModel/waveModel.C  |  3 +--
 .../OpenCFD/code/waveModel/waveModel/waveModel.H  |  6 +++---
 9 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
index b0b21c1d2f..a0f47ef919 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
@@ -36,6 +36,18 @@ namespace waveModels
 }
 
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::waveAbsorptionModel::timeCoeff
+(
+    const scalar t
+) const
+{
+    // No time ramping applied applied for absorption
+    return 1;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::waveModels::waveAbsorptionModel::waveAbsorptionModel
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
index 9e66d9e87f..0201aaaab7 100644
--- a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
+++ b/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
@@ -41,13 +41,20 @@ namespace waveModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class waveAbsorptionModel Declaration
+                     Class waveAbsorptionModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class waveAbsorptionModel
 :
     public waveModel
 {
+protected:
+
+    // Protected Member Functions
+
+        //- Return the time scaling coefficient
+        virtual scalar timeCoeff(const scalar t) const;
+
 
 public:
 
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
index 44e87c3dc5..efaa83b552 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
@@ -41,6 +41,15 @@ namespace waveModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
+Foam::scalar Foam::waveModels::regularWaveModel::timeCoeff
+(
+    const scalar t
+) const
+{
+    return max(0, min(t/rampTime_, 1));
+}
+
+
 Foam::word Foam::waveModels::regularWaveModel::waveType() const
 {
     scalar waveK = 2.0*mathematical::pi/waveLength_;
@@ -70,6 +79,7 @@ Foam::waveModels::regularWaveModel::regularWaveModel
 )
 :
     waveGenerationModel(dict, mesh, patch, false),
+    rampTime_(VSMALL),
     wavePeriod_(0),
     waveLength_(0),
     wavePhase_(1.5*mathematical::pi)
@@ -93,6 +103,8 @@ bool Foam::waveModels::regularWaveModel::read(const dictionary& overrideDict)
 {
     if (waveGenerationModel::read(overrideDict))
     {
+        lookup("rampTime") >> rampTime_;
+
         lookup("wavePeriod") >> wavePeriod_;
         if (wavePeriod_ < 0)
         {
@@ -117,7 +129,8 @@ void Foam::waveModels::regularWaveModel::info(Ostream& os) const
 {
     waveGenerationModel::info(os);
 
-    os  << "    Wave period : " << wavePeriod_ << nl
+    os  << "    Ramp time : " << rampTime_ << nl
+        << "    Wave period : " << wavePeriod_ << nl
         << "    Wave length : " << waveLength_ << nl
         << "    Wave phase : " << wavePhase_ << nl;
 }
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
index 3eed94b0c6..13b6bfda73 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
@@ -61,6 +61,9 @@ protected:
 
     // Protected data
 
+        //- Ramp time
+        scalar rampTime_;
+
         //- Wave period
         scalar wavePeriod_;
 
@@ -73,8 +76,11 @@ protected:
 
     // Protected Member Functions
 
+        //- Return the time scaling coefficient
+        virtual scalar timeCoeff(const scalar t) const;
+
         //- Return word description of wave type
-        word waveType() const;
+        virtual word waveType() const;
 
 
 public:
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
index 5c0f1e3e96..332d7e0304 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
@@ -27,6 +27,8 @@ License
 #include "polyPatch.H"
 #include "SubField.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace waveModels
@@ -36,6 +38,18 @@ namespace waveModels
 }
 
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::scalar Foam::waveModels::solitaryWaveModel::timeCoeff
+(
+    const scalar t
+) const
+{
+    // Ramping not applicable to solitary waves
+    return 1;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::waveModels::solitaryWaveModel::solitaryWaveModel
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
index e880e2fc33..f01dff404c 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
@@ -59,6 +59,12 @@ protected:
         const scalar x0_;
 
 
+    // Protected Member Functions
+
+        //- Return the time scaling coefficient
+        virtual scalar timeCoeff(const scalar t) const;
+
+
 public:
 
     //- Runtime type information
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
index 3dba0c3b4c..44cf01006b 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
+++ b/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
@@ -72,7 +72,6 @@ bool Foam::waveModels::waveGenerationModel::read(const dictionary& overrideDict)
 {
     if (waveModel::read(overrideDict))
     {
-        lookup("rampTime") >> rampTime_;
         lookup("activeAbsorption") >> activeAbsorption_;
 
         lookup("waveHeight") >> waveHeight_;
@@ -98,8 +97,7 @@ void Foam::waveModels::waveGenerationModel::info(Ostream& os) const
 {
     waveModel::info(os);
 
-    os  << "    Ramp time : " << rampTime_ << nl
-        << "    Wave height : " << waveHeight_ << nl
+    os  << "    Wave height : " << waveHeight_ << nl
         << "    Wave angle  : " << 180/mathematical::pi*waveAngle_ << nl;
 }
 
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
index 2ad9700931..3fee2d90a6 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
@@ -269,7 +269,6 @@ Foam::waveModel::waveModel
     zMax_(),
     waterDepthRef_(0),
     initialDepth_(0),
-    rampTime_(VSMALL),
     currTimeIndex_(-1),
     activeAbsorption_(false),
     U_(patch.size(), vector::zero),
@@ -350,7 +349,7 @@ void Foam::waveModel::correct(const scalar t)
             << patch_.name() << endl;
 
         // Time ramp weight
-        const scalar tCoeff = max(0, min(t/rampTime_, 1));
+        const scalar tCoeff = timeCoeff(t);
 
         // Reset the velocity and phase fraction fields
         U_ = vector::zero;
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
index a7330ce703..399cf40676 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
@@ -111,9 +111,6 @@ protected:
         //- Initial depth / [m]
         scalar initialDepth_;
 
-        //- Ramp time
-        scalar rampTime_;
-
         //- Time index used for updating
         label currTimeIndex_;
 
@@ -138,6 +135,9 @@ protected:
         //- Water level
         virtual tmp<scalarField> waterLevel() const;
 
+        //- Return the time scaling coefficient
+        virtual scalar timeCoeff(const scalar t) const = 0;
+
         //- Set the water level
         virtual void setLevel
         (

From 2790d64c4f40471dba2252da402b1a0f62e24437 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 25 Nov 2016 11:16:20 +0000
Subject: [PATCH 14/18] ENH: waveModels - new and updated tutorials

---
 .../system/decomposeParDict                   |   4 +-
 .../waveExampleCnoidal/system/fvSchemes       |  18 +--
 .../waveExampleCnoidal/system/fvSolution      |  39 ++---
 .../testCases/waveExampleSolitary/0.orig/U    |  54 +++++++
 .../waveExampleSolitary/0.orig/alpha.water    |  52 ++++++
 .../waveExampleSolitary/0.orig/p_rgh          |  60 +++++++
 .../testCases/waveExampleSolitary/Allclean    |  10 ++
 .../testCases/waveExampleSolitary/Allrun      |  15 ++
 .../testCases/waveExampleSolitary/constant/g  |  22 +++
 .../constant/transportProperties              |  37 +++++
 .../constant/turbulenceProperties             |  20 +++
 .../constant/waveProperties                   |  45 ++++++
 .../waveExampleSolitary/system/blockMeshDict  |  90 +++++++++++
 .../waveExampleSolitary/system/controlDict    | 136 ++++++++++++++++
 .../system/decomposeParDict                   |  29 ++++
 .../waveExampleSolitary/system/fvSchemes      |  54 +++++++
 .../waveExampleSolitary/system/fvSolution     |  93 +++++++++++
 .../waveExampleSolitary/system/setFieldsDict  |  36 +++++
 .../testCases/waveExampleStokesI/0.orig/U     |  54 +++++++
 .../waveExampleStokesI/0.orig/alpha.water     |  52 ++++++
 .../testCases/waveExampleStokesI/0.orig/p_rgh |  60 +++++++
 .../testCases/waveExampleStokesI/Allclean     |  10 ++
 .../testCases/waveExampleStokesI/Allrun       |  15 ++
 .../testCases/waveExampleStokesI/constant/g   |  22 +++
 .../constant/transportProperties              |  37 +++++
 .../constant/turbulenceProperties             |  20 +++
 .../constant/waveProperties                   |  47 ++++++
 .../waveExampleStokesI/system/blockMeshDict   |  90 +++++++++++
 .../waveExampleStokesI/system/controlDict     | 152 ++++++++++++++++++
 .../system/decomposeParDict                   |  29 ++++
 .../waveExampleStokesI/system/fvSchemes       |  54 +++++++
 .../waveExampleStokesI/system/fvSolution      |  93 +++++++++++
 .../waveExampleStokesI/system/setFieldsDict   |  36 +++++
 .../testCases/waveExampleStokesII/0.orig/U    |  54 +++++++
 .../waveExampleStokesII/0.orig/alpha.water    |  52 ++++++
 .../waveExampleStokesII/0.orig/p_rgh          |  60 +++++++
 .../testCases/waveExampleStokesII/Allclean    |  10 ++
 .../testCases/waveExampleStokesII/Allrun      |  15 ++
 .../testCases/waveExampleStokesII/constant/g  |  22 +++
 .../constant/transportProperties              |  37 +++++
 .../constant/turbulenceProperties             |  20 +++
 .../constant/waveProperties                   |  47 ++++++
 .../waveExampleStokesII/system/blockMeshDict  |  90 +++++++++++
 .../waveExampleStokesII/system/controlDict    | 152 ++++++++++++++++++
 .../system/decomposeParDict                   |  29 ++++
 .../waveExampleStokesII/system/fvSchemes      |  54 +++++++
 .../waveExampleStokesII/system/fvSolution     |  93 +++++++++++
 .../waveExampleStokesII/system/setFieldsDict  |  36 +++++
 .../system/decomposeParDict                   |   4 +-
 .../waveExampleStokesV/system/fvSchemes       |  18 +--
 .../waveExampleStokesV/system/fvSolution      |  39 ++---
 51 files changed, 2333 insertions(+), 84 deletions(-)
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh
 create mode 100755 integration/OpenCFD/testCases/waveExampleSolitary/Allclean
 create mode 100755 integration/OpenCFD/testCases/waveExampleSolitary/Allrun
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/constant/g
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution
 create mode 100644 integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesI/Allclean
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesI/Allrun
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/constant/g
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesII/Allclean
 create mode 100755 integration/OpenCFD/testCases/waveExampleStokesII/Allrun
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/constant/g
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution
 create mode 100644 integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict

diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
index 28bcf3ad28..301d97027b 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
@@ -15,13 +15,13 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 8;
+numberOfSubdomains 2;
 
 method          hierarchical;
 
 hierarchicalCoeffs
 {
-    n           (4 2 1);
+    n           (2 1 1);
     delta       0.001;
     order       xyz;
 }
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
index c0cddb6d0e..eeff89271f 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
@@ -31,18 +31,12 @@ divSchemes
     div(rhoPhi,U)   Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div(phi,k)      Gauss upwind;
-    div(phi,epsilon) Gauss upwind;
-    div(phi,omega) Gauss upwind;
-    div(phi,R)      Gauss upwind;
-    div(R)          Gauss linear;
-    div(phi,nuTilda) Gauss upwind;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
 {
-    default         Gauss linear corrected;
+    default         Gauss linear orthogonal;
 }
 
 interpolationSchemes
@@ -52,15 +46,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p_rgh;
-    pcorr;
-    alpha;
+    default         orthogonal;
 }
 
 
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
index bb74b12427..a6d6b31154 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
@@ -21,7 +21,7 @@ solvers
     "alpha.water.*"
     {
         nAlphaCorr      1;
-        nAlphaSubCycles 2;
+        nAlphaSubCycles 3;
         alphaOuterCorrectors yes;
         cAlpha          1;
 
@@ -47,41 +47,32 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-6;
-        relTol          0;
+        relTol          0.1;
     }
 
     p_rghFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-6;
+        solver          GAMG;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-7;
         relTol          0;
     }
 
-    "(U|k|epsilon|omega)"
+    U
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-6;
-        relTol          0;
+        relTol          0.1;
     }
 
-    "(U|k|epsilon|omega)Final"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-6;
-        relTol          0;
-    }
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-6;
-        relTol          0;
-    }
-
-    nuTilda
+    UFinal
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -93,7 +84,7 @@ solvers
 PIMPLE
 {
     momentumPredictor no;
-    nCorrectors     3;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
 }
 
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
new file mode 100644
index 0000000000..b215c9cd48
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    outlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    ground
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
new file mode 100644
index 0000000000..a99cef99e9
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletAlpha;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    ground
+    {
+        type            zeroGradient;
+    }
+
+    sides
+    {
+	    type            empty;
+    }
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh
new file mode 100644
index 0000000000..7ad5729cbf
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    ground
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allclean b/integration/OpenCFD/testCases/waveExampleSolitary/Allclean
new file mode 100755
index 0000000000..705f91474c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allrun b/integration/OpenCFD/testCases/waveExampleSolitary/Allrun
new file mode 100755
index 0000000000..9f0c668029
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/g b/integration/OpenCFD/testCases/waveExampleSolitary/constant/g
new file mode 100644
index 0000000000..3ec2141e5c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties
new file mode 100644
index 0000000000..019225dd4f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+water
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
+}
+
+air
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
+}
+
+sigma           [1 0 -2 0 0 0 0] 0.07;
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties
new file mode 100644
index 0000000000..115a9830c1
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties b/integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties
new file mode 100644
index 0000000000..b2568d8bda
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.openfoam.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      wavesProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+inlet
+{
+    alpha           alpha.water;
+
+    waveModel       Boussinesq;
+
+    nPaddle         1;
+
+    waveHeight      0.3;
+
+    waveAngle       0.0;
+
+    activeAbsorption yes;
+
+    wavePeriod      0.0;
+}
+
+outlet
+{
+    alpha           alpha.water;
+
+    waveModel       shallowWaterAbsorption;
+
+    nPaddle         1;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict b/integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict
new file mode 100644
index 0000000000..175bb83f20
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict
@@ -0,0 +1,90 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0.0 0.0 0.0)
+    ( 10.0 0.0 0.0)
+    ( 10.0 0.02 0.0)
+    ( 0.0 0.02 0.0)
+    ( 0.0 0.0 1.5)
+    ( 10.0 0.0 1.5)
+    ( 10.0 0.02 1.5)
+    ( 0.0 0.02 1.5)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (500 1 150) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    sides
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (3 2 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict b/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
new file mode 100644
index 0000000000..7894dff756
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
@@ -0,0 +1,136 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+    "libwaveBCs.so"
+    "libwaveModels.so"
+);
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         7.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05;
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        libs            ("libsampling.so");
+        enabled         true;
+        writeControl    writeTime;
+        writeInterval   1;
+
+        interpolationScheme cellPoint;
+        setFormat       raw;
+        sets
+        (
+            line1
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 1.0 0.01 0.0 );
+                end     ( 1.0 0.01 1.5 );
+                nPoints 1001;
+            }
+            line2
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 2.0 0.01 0.0 );
+                end     ( 2.0 0.01 1.5 );
+                nPoints 1001;
+            }
+            line3
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 3.0 0.01 0.0 );
+                end     ( 3.0 0.01 1.5 );
+                nPoints 1001;
+            }
+            line4
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 5.0 0.01 0.0 );
+                end     ( 5.0 0.01 1.5 );
+                nPoints 1001;
+            }
+            line5
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 7.5 0.01 0.0 );
+                end     ( 7.5 0.01 1.5 );
+                nPoints 1001;
+            }
+
+            line6
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 9.0 0.01 0.0 );
+                end     ( 9.0 0.01 1.5 );
+                nPoints 1001;
+            }	
+        );
+
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict
new file mode 100644
index 0000000000..301d97027b
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes
new file mode 100644
index 0000000000..eeff89271f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes
@@ -0,0 +1,54 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution b/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution
new file mode 100644
index 0000000000..a6d6b31154
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution
@@ -0,0 +1,93 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.water.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 3;
+        alphaOuterCorrectors yes;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    3;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    p_rghFinal
+    {
+        solver          GAMG;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict
new file mode 100644
index 0000000000..755936dbe4
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (30.0 1.0 0.7);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
new file mode 100644
index 0000000000..b215c9cd48
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    outlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    ground
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
new file mode 100644
index 0000000000..a99cef99e9
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletAlpha;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    ground
+    {
+        type            zeroGradient;
+    }
+
+    sides
+    {
+	    type            empty;
+    }
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh
new file mode 100644
index 0000000000..7ad5729cbf
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    ground
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allclean b/integration/OpenCFD/testCases/waveExampleStokesI/Allclean
new file mode 100755
index 0000000000..705f91474c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allrun b/integration/OpenCFD/testCases/waveExampleStokesI/Allrun
new file mode 100755
index 0000000000..9f0c668029
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/g b/integration/OpenCFD/testCases/waveExampleStokesI/constant/g
new file mode 100644
index 0000000000..3ec2141e5c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties
new file mode 100644
index 0000000000..019225dd4f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+water
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
+}
+
+air
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
+}
+
+sigma           [1 0 -2 0 0 0 0] 0.07;
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties
new file mode 100644
index 0000000000..115a9830c1
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties b/integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties
new file mode 100644
index 0000000000..7597533efd
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.openfoam.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      wavesProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+inlet
+{
+    alpha           alpha.water;
+
+    waveModel       StokesI;
+
+    nPaddle         1;
+
+    waveHeight      0.05;
+
+    waveAngle       0.0;
+
+    rampTime        3.0;
+
+    activeAbsorption yes;
+
+    wavePeriod      3.0;
+}
+
+outlet
+{
+    alpha           alpha.water;
+
+    waveModel       shallowWaterAbsorption;
+
+    nPaddle         1;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict b/integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict
new file mode 100644
index 0000000000..2a16096fd6
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict
@@ -0,0 +1,90 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0.0 0.0 0.0)
+    ( 20.0 0.0 0.0)
+    ( 20.0 0.04 0.0)
+    ( 0.0 0.04 0.0)
+    ( 0.0 0.0 0.75)
+    ( 20.0 0.0 0.75)
+    ( 20.0 0.04 0.75)
+    ( 0.0 0.04 0.75)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (500 1 75) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    sides
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (3 2 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict b/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
new file mode 100644
index 0000000000..c0d020cf65
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
@@ -0,0 +1,152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+    "libwaveBCs.so"
+    "libwaveModels.so"
+);
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         20.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05;
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        libs            ("libsampling.so");
+        enabled         true;
+        writeControl    writeTime;
+        writeInterval   1;
+
+        interpolationScheme cellPoint;
+        setFormat       raw;
+        sets
+        (
+            line1
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 1.0 0.02 0.0 );
+                end     ( 1.0 0.02 0.75 );
+                nPoints 1001;
+            }
+            line2
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 2.0 0.02 0.0 );
+                end     ( 2.0 0.02 0.75 );
+                nPoints 1001;
+            }
+            line3
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 3.0 0.02 0.0 );
+                end     ( 3.0 0.02 0.75 );
+                nPoints 1001;
+            }
+            line4
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 5.0 0.02 0.0 );
+                end     ( 5.0 0.02 0.75 );
+                nPoints 1001;
+            }
+            line5
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 7.5 0.02 0.0 );
+                end     ( 7.5 0.02 0.75 );
+                nPoints 1001;
+            }
+
+            line6
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 10.0 0.02 0.0 );
+                end     ( 10.0 0.02 0.75 );
+                nPoints 1001;
+            }	
+            line7
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 12.0 0.005 0.0 );
+                end     ( 12.0 0.005 0.75 );
+                nPoints 1001;
+            }	
+            line8
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 14.0 0.005 0.0 );
+                end     ( 14.0 0.005 0.75 );
+                nPoints 1001;
+            }
+        );
+
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict
new file mode 100644
index 0000000000..301d97027b
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes
new file mode 100644
index 0000000000..eeff89271f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes
@@ -0,0 +1,54 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution b/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution
new file mode 100644
index 0000000000..a6d6b31154
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution
@@ -0,0 +1,93 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.water.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 3;
+        alphaOuterCorrectors yes;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    3;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    p_rghFinal
+    {
+        solver          GAMG;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict
new file mode 100644
index 0000000000..7ef9bb06a1
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (20.0 1.0 0.6);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
new file mode 100644
index 0000000000..b215c9cd48
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    outlet
+    {
+        type            waveInletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    ground
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    top
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
new file mode 100644
index 0000000000..a99cef99e9
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            waveInletAlpha;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    ground
+    {
+        type            zeroGradient;
+    }
+
+    sides
+    {
+	    type            empty;
+    }
+
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh
new file mode 100644
index 0000000000..7ad5729cbf
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    ground
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    sides
+    {
+	type            empty;
+    }
+
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allclean b/integration/OpenCFD/testCases/waveExampleStokesII/Allclean
new file mode 100755
index 0000000000..705f91474c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allrun b/integration/OpenCFD/testCases/waveExampleStokesII/Allrun
new file mode 100755
index 0000000000..9f0c668029
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/g b/integration/OpenCFD/testCases/waveExampleStokesII/constant/g
new file mode 100644
index 0000000000..3ec2141e5c
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties
new file mode 100644
index 0000000000..019225dd4f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+water
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
+}
+
+air
+{
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
+}
+
+sigma           [1 0 -2 0 0 0 0] 0.07;
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties
new file mode 100644
index 0000000000..115a9830c1
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties b/integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties
new file mode 100644
index 0000000000..2099df6ed5
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      http://www.openfoam.com               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      wavesProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+inlet
+{
+    alpha           alpha.water;
+
+    waveModel       StokesII;
+
+    nPaddle         1;
+
+    waveHeight      0.05;
+
+    waveAngle       0.0;
+
+    rampTime        3.0;
+
+    activeAbsorption yes;
+
+    wavePeriod      3.0;
+}
+
+outlet
+{
+    alpha           alpha.water;
+
+    waveModel       shallowWaterAbsorption;
+
+    nPaddle         1;
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict b/integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict
new file mode 100644
index 0000000000..afdb56d1bb
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict
@@ -0,0 +1,90 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0.0 0.0 0.0)
+    ( 20.0 0.0 0.0)
+    ( 20.0 0.04 0.0)
+    ( 0.0 0.04 0.0)
+    ( 0.0 0.0 0.55)
+    ( 20.0 0.0 0.55)
+    ( 20.0 0.04 0.55)
+    ( 0.0 0.04 0.55)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (500 1 55) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+    sides
+    {
+        type empty;
+        faces
+        (
+            (0 1 5 4)
+            (3 2 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict b/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
new file mode 100644
index 0000000000..f779aa6fe6
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
@@ -0,0 +1,152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+    "libwaveBCs.so"
+    "libwaveModels.so"
+);
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         20.0;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.033;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.65;
+maxAlphaCo      0.65;
+
+maxDeltaT       0.05;
+
+
+functions
+{
+    line
+    {
+        type            sets;
+        libs            ("libsampling.so");
+        enabled         true;
+        writeControl    writeTime;
+        writeInterval   1;
+
+        interpolationScheme cellPoint;
+        setFormat       raw;
+        sets
+        (
+            line1
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 1.0 0.02 0.0 );
+                end     ( 1.0 0.02 0.55 );
+                nPoints 1001;
+            }
+            line2
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 2.0 0.02 0.0 );
+                end     ( 2.0 0.02 0.55 );
+                nPoints 1001;
+            }
+            line3
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 3.0 0.02 0.0 );
+                end     ( 3.0 0.02 0.55 );
+                nPoints 1001;
+            }
+            line4
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 5.0 0.02 0.0 );
+                end     ( 5.0 0.02 0.55 );
+                nPoints 1001;
+            }
+            line5
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 7.5 0.02 0.0 );
+                end     ( 7.5 0.02 0.55 );
+                nPoints 1001;
+            }
+
+            line6
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 10.0 0.02 0.0 );
+                end     ( 10.0 0.02 0.55 );
+                nPoints 1001;
+            }	
+            line7
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 12.0 0.005 0.0 );
+                end     ( 12.0 0.005 0.55 );
+                nPoints 1001;
+            }	
+            line8
+            {
+                type    uniform;
+                axis    distance;
+                start   ( 14.0 0.005 0.0 );
+                end     ( 14.0 0.005 0.55 );
+                nPoints 1001;
+            }
+        );
+
+        fixedLocations  false;
+        fields
+        (
+            U alpha.water
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict
new file mode 100644
index 0000000000..301d97027b
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes
new file mode 100644
index 0000000000..eeff89271f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes
@@ -0,0 +1,54 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rhoPhi,U)   Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution b/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution
new file mode 100644
index 0000000000..a6d6b31154
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution
@@ -0,0 +1,93 @@
+
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.water.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 3;
+        alphaOuterCorrectors yes;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    3;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    p_rghFinal
+    {
+        solver          GAMG;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict
new file mode 100644
index 0000000000..9d2a8bcb80
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (30.0 1.0 0.4);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
index e0b4d2df3e..57c7bea5e3 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
@@ -15,13 +15,13 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 8;
+numberOfSubdomains 2;
 
 method          hierarchical;
 
 hierarchicalCoeffs
 {
-    n           (2 2 2);
+    n           (2 1 1);
     delta       0.001;
     order       xyz;
 }
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
index c0cddb6d0e..eeff89271f 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
@@ -31,18 +31,12 @@ divSchemes
     div(rhoPhi,U)   Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div(phi,k)      Gauss upwind;
-    div(phi,epsilon) Gauss upwind;
-    div(phi,omega) Gauss upwind;
-    div(phi,R)      Gauss upwind;
-    div(R)          Gauss linear;
-    div(phi,nuTilda) Gauss upwind;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
 {
-    default         Gauss linear corrected;
+    default         Gauss linear orthogonal;
 }
 
 interpolationSchemes
@@ -52,15 +46,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p_rgh;
-    pcorr;
-    alpha;
+    default         orthogonal;
 }
 
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
index bb74b12427..a6d6b31154 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
@@ -21,7 +21,7 @@ solvers
     "alpha.water.*"
     {
         nAlphaCorr      1;
-        nAlphaSubCycles 2;
+        nAlphaSubCycles 3;
         alphaOuterCorrectors yes;
         cAlpha          1;
 
@@ -47,41 +47,32 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-6;
-        relTol          0;
+        relTol          0.1;
     }
 
     p_rghFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-6;
+        solver          GAMG;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-7;
         relTol          0;
     }
 
-    "(U|k|epsilon|omega)"
+    U
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-6;
-        relTol          0;
+        relTol          0.1;
     }
 
-    "(U|k|epsilon|omega)Final"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-6;
-        relTol          0;
-    }
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-6;
-        relTol          0;
-    }
-
-    nuTilda
+    UFinal
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -93,7 +84,7 @@ solvers
 PIMPLE
 {
     momentumPredictor no;
-    nCorrectors     3;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
 }
 

From 95f3adb1fb799df96d04c7d5f7b2208cc01c8c52 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 15 Dec 2016 12:45:14 +0000
Subject: [PATCH 15/18] ENH: waveModels - moved to main source tree and
 simplified

---
 integration/OpenCFD/code/waveBCs/Make/files   |   4 -
 integration/OpenCFD/code/waveBCs/Make/options |  10 --
 ...sorptionOutletVelocityFvPatchVectorField.C | 150 ----------------
 ...sorptionOutletVelocityFvPatchVectorField.H | 165 ------------------
 src/Allwmake                                  |   1 +
 .../waveModel => src/waveModels}/Make/files   |   4 +-
 .../waveModel => src/waveModels}/Make/options |   0
 .../waveAlpha/waveAlphaFvPatchScalarField.C   |  24 +--
 .../waveAlpha/waveAlphaFvPatchScalarField.H   |  40 ++---
 .../waveVelocityFvPatchVectorField.C          |  24 +--
 .../waveVelocityFvPatchVectorField.H          |  43 ++---
 .../waveAbsorptionModel/waveAbsorptionModel.C |   0
 .../waveAbsorptionModel/waveAbsorptionModel.H |   0
 .../shallowWaterAbsorption.C                  |   0
 .../shallowWaterAbsorption.H                  |   0
 .../base/regularWaveModel/regularWaveModel.C  |   0
 .../base/regularWaveModel/regularWaveModel.H  |   0
 .../solitaryWaveModel/solitaryWaveModel.C     |   0
 .../solitaryWaveModel/solitaryWaveModel.H     |   0
 .../waveGenerationModel/waveGenerationModel.C |   0
 .../waveGenerationModel/waveGenerationModel.H |   0
 .../derived/Boussinesq/BoussinesqWaveModel.C  |   0
 .../derived/Boussinesq/BoussinesqWaveModel.H  |   0
 .../derived/StokesI/StokesIWaveModel.C        |   0
 .../derived/StokesI/StokesIWaveModel.H        |   0
 .../derived/StokesII/StokesIIWaveModel.C      |   0
 .../derived/StokesII/StokesIIWaveModel.H      |   0
 .../derived/StokesV/StokesVWaveModel.C        |   8 +-
 .../derived/StokesV/StokesVWaveModel.H        |   0
 .../derived/cnoidal/Elliptic.H                |   0
 .../derived/cnoidal/cnoidalWaveModel.C        |   0
 .../derived/cnoidal/cnoidalWaveModel.H        |   0
 .../waveModels}/waveModel/waveModel.C         |   6 +-
 .../waveModels}/waveModel/waveModel.H         |   1 +
 .../waveModels}/waveModel/waveModelNew.C      |   0
 .../laminar/waveExampleCnoidal}/0.orig/U      |   6 +-
 .../waveExampleCnoidal}/0.orig/alpha.water    |   2 +-
 .../laminar}/waveExampleCnoidal/0.orig/p_rgh  |   0
 .../laminar}/waveExampleCnoidal/Allclean      |   0
 .../laminar}/waveExampleCnoidal/Allrun        |   0
 .../laminar}/waveExampleCnoidal/constant/g    |   0
 .../constant/transportProperties              |   0
 .../constant/turbulenceProperties             |   0
 .../constant/waveProperties                   |   0
 .../waveExampleCnoidal/system/blockMeshDict   |   0
 .../waveExampleCnoidal/system/controlDict     |   6 -
 .../system/decomposeParDict                   |   0
 .../waveExampleCnoidal/system/fvSchemes       |   0
 .../waveExampleCnoidal/system/fvSolution      |   0
 .../waveExampleCnoidal/system/setFieldsDict   |   0
 .../laminar/waveExampleSolitary}/0.orig/U     |   4 +-
 .../waveExampleSolitary}/0.orig/alpha.water   |   2 +-
 .../laminar}/waveExampleSolitary/0.orig/p_rgh |   0
 .../laminar}/waveExampleSolitary/Allclean     |   0
 .../laminar}/waveExampleSolitary/Allrun       |   0
 .../laminar}/waveExampleSolitary/constant/g   |   0
 .../constant/transportProperties              |   0
 .../constant/turbulenceProperties             |   0
 .../constant/waveProperties                   |   0
 .../waveExampleSolitary/system/blockMeshDict  |   0
 .../waveExampleSolitary/system/controlDict    |   6 -
 .../system/decomposeParDict                   |   0
 .../waveExampleSolitary/system/fvSchemes      |   0
 .../waveExampleSolitary/system/fvSolution     |   0
 .../waveExampleSolitary/system/setFieldsDict  |   0
 .../laminar/waveExampleStokesI}/0.orig/U      |   4 +-
 .../waveExampleStokesI}/0.orig/alpha.water    |   2 +-
 .../laminar}/waveExampleStokesI/0.orig/p_rgh  |   0
 .../laminar}/waveExampleStokesI/Allclean      |   0
 .../laminar}/waveExampleStokesI/Allrun        |   0
 .../laminar}/waveExampleStokesI/constant/g    |   0
 .../constant/transportProperties              |   0
 .../constant/turbulenceProperties             |   0
 .../constant/waveProperties                   |   0
 .../waveExampleStokesI/system/blockMeshDict   |   0
 .../waveExampleStokesI/system/controlDict     |   6 -
 .../system/decomposeParDict                   |   0
 .../waveExampleStokesI/system/fvSchemes       |   0
 .../waveExampleStokesI/system/fvSolution      |   0
 .../waveExampleStokesI/system/setFieldsDict   |   0
 .../laminar}/waveExampleStokesII/0.orig/U     |   4 +-
 .../waveExampleStokesII/0.orig/alpha.water    |   2 +-
 .../laminar}/waveExampleStokesII/0.orig/p_rgh |   0
 .../laminar}/waveExampleStokesII/Allclean     |   0
 .../laminar}/waveExampleStokesII/Allrun       |   0
 .../laminar}/waveExampleStokesII/constant/g   |   0
 .../constant/transportProperties              |   0
 .../constant/turbulenceProperties             |   0
 .../constant/waveProperties                   |   0
 .../waveExampleStokesII/system/blockMeshDict  |   0
 .../waveExampleStokesII/system/controlDict    |   6 -
 .../system/decomposeParDict                   |   0
 .../waveExampleStokesII/system/fvSchemes      |   0
 .../waveExampleStokesII/system/fvSolution     |   0
 .../waveExampleStokesII/system/setFieldsDict  |   0
 .../laminar}/waveExampleStokesV/0.orig/U      |   4 +-
 .../waveExampleStokesV/0.orig/alpha.water     |   4 +-
 .../laminar}/waveExampleStokesV/0.orig/p_rgh  |   0
 .../laminar}/waveExampleStokesV/Allclean      |   0
 .../laminar}/waveExampleStokesV/Allrun        |   0
 .../laminar}/waveExampleStokesV/constant/g    |   0
 .../constant/transportProperties              |   0
 .../constant/turbulenceProperties             |   0
 .../constant/waveProperties                   |   0
 .../waveExampleStokesV/system/blockMeshDict   |   0
 .../waveExampleStokesV/system/controlDict     |   6 -
 .../system/decomposeParDict                   |   0
 .../waveExampleStokesV/system/fvSchemes       |   0
 .../waveExampleStokesV/system/fvSolution      |   0
 .../waveExampleStokesV/system/setFieldsDict   |   0
 110 files changed, 97 insertions(+), 447 deletions(-)
 delete mode 100644 integration/OpenCFD/code/waveBCs/Make/files
 delete mode 100644 integration/OpenCFD/code/waveBCs/Make/options
 delete mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
 delete mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/Make/files (80%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/Make/options (100%)
 rename integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C => src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C (81%)
 rename integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H => src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H (80%)
 rename integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C => src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C (79%)
 rename integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H => src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H (78%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/regularWaveModel/regularWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/regularWaveModel/regularWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesI/StokesIWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesI/StokesIWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesV/StokesVWaveModel.C (99%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesV/StokesVWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/Elliptic.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H (100%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModel.C (98%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModel.H (99%)
 rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModelNew.C (100%)
 rename {integration/OpenCFD/testCases/waveExampleSolitary => tutorials/multiphase/interFoam/laminar/waveExampleCnoidal}/0.orig/U (92%)
 rename {integration/OpenCFD/testCases/waveExampleSolitary => tutorials/multiphase/interFoam/laminar/waveExampleCnoidal}/0.orig/alpha.water (96%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/0.orig/p_rgh (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/Allclean (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/Allrun (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/g (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/transportProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/turbulenceProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/waveProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/blockMeshDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/controlDict (98%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/decomposeParDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/fvSchemes (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/fvSolution (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/setFieldsDict (100%)
 rename {integration/OpenCFD/testCases/waveExampleStokesI => tutorials/multiphase/interFoam/laminar/waveExampleSolitary}/0.orig/U (93%)
 rename {integration/OpenCFD/testCases/waveExampleStokesI => tutorials/multiphase/interFoam/laminar/waveExampleSolitary}/0.orig/alpha.water (96%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/0.orig/p_rgh (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/Allclean (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/Allrun (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/g (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/transportProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/turbulenceProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/waveProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/blockMeshDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/controlDict (98%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/decomposeParDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/fvSchemes (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/fvSolution (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/setFieldsDict (100%)
 rename {integration/OpenCFD/testCases/waveExampleCnoidal => tutorials/multiphase/interFoam/laminar/waveExampleStokesI}/0.orig/U (93%)
 rename {integration/OpenCFD/testCases/waveExampleCnoidal => tutorials/multiphase/interFoam/laminar/waveExampleStokesI}/0.orig/alpha.water (96%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/0.orig/p_rgh (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/Allclean (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/Allrun (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/g (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/transportProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/turbulenceProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/waveProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/blockMeshDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/controlDict (98%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/decomposeParDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/fvSchemes (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/fvSolution (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/setFieldsDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/U (93%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/alpha.water (96%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/p_rgh (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/Allclean (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/Allrun (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/g (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/transportProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/turbulenceProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/waveProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/blockMeshDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/controlDict (98%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/decomposeParDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/fvSchemes (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/fvSolution (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/setFieldsDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/U (93%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/alpha.water (94%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/p_rgh (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/Allclean (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/Allrun (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/g (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/transportProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/turbulenceProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/waveProperties (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/blockMeshDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/controlDict (98%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/decomposeParDict (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/fvSchemes (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/fvSolution (100%)
 rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/setFieldsDict (100%)

diff --git a/integration/OpenCFD/code/waveBCs/Make/files b/integration/OpenCFD/code/waveBCs/Make/files
deleted file mode 100644
index 734e8d76a9..0000000000
--- a/integration/OpenCFD/code/waveBCs/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-waveInletVelocity/waveInletVelocityFvPatchVectorField.C
-waveInletAlpha/waveInletAlphaFvPatchScalarField.C
-
-LIB = $(FOAM_USER_LIBBIN)/libwaveBCs
diff --git a/integration/OpenCFD/code/waveBCs/Make/options b/integration/OpenCFD/code/waveBCs/Make/options
deleted file mode 100644
index dac0999deb..0000000000
--- a/integration/OpenCFD/code/waveBCs/Make/options
+++ /dev/null
@@ -1,10 +0,0 @@
-DEV_PATH = ..
-
-EXE_INC = \
-    -I$(DEV_PATH)/waveModel/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
-        -lwaveModels \
-    -lfiniteVolume
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
deleted file mode 100644
index e4a462c001..0000000000
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
-     \\/     M anipulation  | Copyright (C) 2015 IH-Cantabria
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "waveAbsorptionOutletVelocityFvPatchVectorField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "waveModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(p, iF),
-    waveDictName_(waveModel::dictName)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
-    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName))
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
-    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf
-)
-:
-    fixedValueFvPatchField<vector>(ptf),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
-    const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(ptf, iF),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    tmp<waveModel> tmodel
-    (
-        waveModel::lookupOrCreate
-        (
-            patch().patch(),
-            internalField().mesh(),
-            waveDictName_
-        )
-    );
-
-    waveModel& model = const_cast<waveModel&>(tmodel());
-
-    model.correct(db().time().value());
-
-    operator == (model.U());
-
-    fixedValueFvPatchField<vector>::updateCoeffs();
-}
-
-
-void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::write
-(
-    Ostream& os
-) const
-{
-    fvPatchField<vector>::write(os);
-
-    os.writeKeyword("waveDictName") << waveDictName_
-        << token::END_STATEMENT << nl;
-
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-   makePatchTypeField
-   (
-       fvPatchVectorField,
-       waveAbsorptionOutletVelocityFvPatchVectorField
-   );
-}
-
-
-// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
deleted file mode 100644
index d797e8017c..0000000000
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
+++ /dev/null
@@ -1,165 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::waveAbsorptionOutletVelocityFvPatchVectorField
-
-Description
-    Example of the boundary condition specification:
-    \verbatim
-    inlet
-    {
-        type            waveAbsorptionOutletVelocity;
-        waveDict        wavesDict;
-        value           uniform (0 0 0);
-    }
-    \endverbatim
-
-Usage
-    \table
-        Property     | Description             | Required    | Default value
-        type         | type: waveAbsorptionOutletVelocity | yes         |
-        waveDict    | Dictionary specifying wave variables | no | waveProperties
-    \endtable
-
-Note
-    - The value is positive inwards
-    - May not work correctly for transonic inlets
-    - Strange behaviour with potentialFoam since the U equation is not solved
-
-SourceFiles
-    waveAbsorptionOutletVelocityFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef waveAbsorptionOutletVelocityFvPatchVectorField_H
-#define waveAbsorptionOutletVelocityFvPatchVectorField_H
-
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-/*---------------------------------------------------------------------------*\
-       Class waveAbsorptionOutletVelocityFvPatchVectorField Declaration
-\*---------------------------------------------------------------------------*/
-
-class waveAbsorptionOutletVelocityFvPatchVectorField
-:
-    public fixedValueFvPatchVectorField
-{
-    // Private data
-
-        //- Dictionary name
-        word waveDictName_;
-
-
-public:
-
-   //- Runtime type information
-   TypeName("waveAbsorptionOutletVelocity");
-
-
-   // Constructors
-
-        //- Construct from patch and internal field
-        waveAbsorptionOutletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        waveAbsorptionOutletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  waveAbsorptionOutletVelocityFvPatchVectorField
-        //  onto a new patch
-        waveAbsorptionOutletVelocityFvPatchVectorField
-        (
-            const waveAbsorptionOutletVelocityFvPatchVectorField&,
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        waveAbsorptionOutletVelocityFvPatchVectorField
-        (
-            const waveAbsorptionOutletVelocityFvPatchVectorField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new waveAbsorptionOutletVelocityFvPatchVectorField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        waveAbsorptionOutletVelocityFvPatchVectorField
-        (
-            const waveAbsorptionOutletVelocityFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchVectorField> clone
-        (
-            const DimensionedField<vector, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new waveAbsorptionOutletVelocityFvPatchVectorField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/Allwmake b/src/Allwmake
index 511c735a7e..bb74a0e6db 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -72,6 +72,7 @@ lagrangian/Allwmake $targetType $*
 mesh/Allwmake $targetType $*
 renumber/Allwmake $targetType $*
 fvAgglomerationMethods/Allwmake $targetType $*
+wmake $targetType waveModels
 
 wmake $targetType engine
 wmake $targetType fvOptions
diff --git a/integration/OpenCFD/code/waveModel/Make/files b/src/waveModels/Make/files
similarity index 80%
rename from integration/OpenCFD/code/waveModel/Make/files
rename to src/waveModels/Make/files
index 36161a0045..67333fa821 100644
--- a/integration/OpenCFD/code/waveModel/Make/files
+++ b/src/waveModels/Make/files
@@ -14,5 +14,7 @@ waveGenerationModels/derived/StokesV/StokesVWaveModel.C
 waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
 waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
 
+derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
 
-LIB = $(FOAM_USER_LIBBIN)/libwaveModels
+LIB = $(FOAM_LIBBIN)/libwaveModels
diff --git a/integration/OpenCFD/code/waveModel/Make/options b/src/waveModels/Make/options
similarity index 100%
rename from integration/OpenCFD/code/waveModel/Make/options
rename to src/waveModels/Make/options
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
similarity index 81%
rename from integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
rename to src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 3dd4e5bcd8..6117513bc9 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "waveInletAlphaFvPatchScalarField.H"
+#include "waveAlphaFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -41,9 +41,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 {}
 
 
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
 (
-    const waveInletAlphaFvPatchScalarField& ptf,
+    const waveAlphaFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -54,7 +54,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 {}
 
 
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -66,9 +66,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 {}
 
 
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
 (
-    const waveInletAlphaFvPatchScalarField& ptf
+    const waveAlphaFvPatchScalarField& ptf
 )
 :
     fixedValueFvPatchField<scalar>(ptf),
@@ -76,9 +76,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 {}
 
 
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
 (
-    const waveInletAlphaFvPatchScalarField& ptf,
+    const waveAlphaFvPatchScalarField& ptf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -89,7 +89,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::waveInletAlphaFvPatchScalarField::updateCoeffs()
+void Foam::waveAlphaFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -116,7 +116,7 @@ void Foam::waveInletAlphaFvPatchScalarField::updateCoeffs()
 }
 
 
-void Foam::waveInletAlphaFvPatchScalarField::write(Ostream& os) const
+void Foam::waveAlphaFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
 
@@ -134,7 +134,7 @@ namespace Foam
    makePatchTypeField
    (
        fvPatchScalarField,
-       waveInletAlphaFvPatchScalarField
+       waveAlphaFvPatchScalarField
    );
 }
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
similarity index 80%
rename from integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
rename to src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
index eb84795be1..4286d15a7a 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::waveInletAlphaFvPatchScalarField
+    Foam::waveAlphaFvPatchScalarField
 
 Description
 
@@ -30,7 +30,7 @@ Description
     \verbatim
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform (0 0 0);
     }
     \endverbatim
@@ -38,7 +38,7 @@ Description
 Usage
     \table
         Property    | Description          | Required    | Default value
-        type        | type: waveInletAlpha | yes         |
+        type        | type: waveAlpha      | yes         |
         waveDict    | Dictionary specifying wave variables | no | waveProperties
     \endtable
 
@@ -48,12 +48,12 @@ Note
     - Strange behaviour with potentialFoam since the U equation is not solved
 
 SourceFiles
-    waveInletAlphaFvPatchScalarField.C
+    waveAlphaFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef waveInletAlphaFvPatchScalarField_H
-#define waveInletAlphaFvPatchScalarField_H
+#ifndef waveAlphaFvPatchScalarField_H
+#define waveAlphaFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -62,10 +62,10 @@ SourceFiles
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-              class waveInletAlphaFvPatchScalarField Declaration
+                class waveAlphaFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class waveInletAlphaFvPatchScalarField
+class waveAlphaFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -78,20 +78,20 @@ class waveInletAlphaFvPatchScalarField
 public:
 
    //- Runtime type information
-   TypeName("waveInletAlpha");
+   TypeName("waveAlpha");
 
 
    // Constructors
 
         //- Construct from patch and internal field
-        waveInletAlphaFvPatchScalarField
+        waveAlphaFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        waveInletAlphaFvPatchScalarField
+        waveAlphaFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -99,20 +99,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  waveInletAlphaFvPatchScalarField
+        //  waveAlphaFvPatchScalarField
         //  onto a new patch
-        waveInletAlphaFvPatchScalarField
+        waveAlphaFvPatchScalarField
         (
-            const waveInletAlphaFvPatchScalarField&,
+            const waveAlphaFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        waveInletAlphaFvPatchScalarField
+        waveAlphaFvPatchScalarField
         (
-            const waveInletAlphaFvPatchScalarField&
+            const waveAlphaFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -120,14 +120,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new waveInletAlphaFvPatchScalarField(*this)
+                new waveAlphaFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        waveInletAlphaFvPatchScalarField
+        waveAlphaFvPatchScalarField
         (
-            const waveInletAlphaFvPatchScalarField&,
+            const waveAlphaFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -139,7 +139,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new waveInletAlphaFvPatchScalarField(*this, iF)
+                new waveAlphaFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
similarity index 79%
rename from integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
rename to src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index 5c36dc49d9..a237aabbc1 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "waveInletVelocityFvPatchVectorField.H"
+#include "waveVelocityFvPatchVectorField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "waveModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
 (
     const fvPatch& p,
     const DimensionedField<vector, volMesh>& iF
@@ -41,9 +41,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 {}
 
 
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
 (
-    const waveInletVelocityFvPatchVectorField& ptf,
+    const waveVelocityFvPatchVectorField& ptf,
     const fvPatch& p,
     const DimensionedField<vector, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -54,7 +54,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 {}
 
 
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
 (
     const fvPatch& p,
     const DimensionedField<vector, volMesh>& iF,
@@ -66,9 +66,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 {}
 
 
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
 (
-    const waveInletVelocityFvPatchVectorField& ptf
+    const waveVelocityFvPatchVectorField& ptf
 )
 :
     fixedValueFvPatchField<vector>(ptf),
@@ -76,9 +76,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 {}
 
 
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
 (
-    const waveInletVelocityFvPatchVectorField& ptf,
+    const waveVelocityFvPatchVectorField& ptf,
     const DimensionedField<vector, volMesh>& iF
 )
 :
@@ -89,7 +89,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::waveInletVelocityFvPatchVectorField::updateCoeffs()
+void Foam::waveVelocityFvPatchVectorField::updateCoeffs()
 {
     if (updated())
     {
@@ -116,7 +116,7 @@ void Foam::waveInletVelocityFvPatchVectorField::updateCoeffs()
 }
 
 
-void Foam::waveInletVelocityFvPatchVectorField::write(Ostream& os) const
+void Foam::waveVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchField<vector>::write(os);
 
@@ -134,7 +134,7 @@ namespace Foam
    makePatchTypeField
    (
        fvPatchVectorField,
-       waveInletVelocityFvPatchVectorField
+       waveVelocityFvPatchVectorField
    );
 }
 
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
similarity index 78%
rename from integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
rename to src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
index 1356702d9d..5098102dd1 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
@@ -22,22 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::waveInletVelocityFvPatchVectorField
+    Foam::waveVelocityFvPatchVectorField
 
 Description
     Example of the boundary condition specification:
     \verbatim
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
     \endverbatim
 
 Usage
     \table
-        Property    | Description             | Required   | Default value
-        type        | type: waveInletVelocity | yes        |
+        Property    | Description           | Required   | Default value
+        type        | type: waveVelocity    | yes        |
         waveDict    | Dictionary specifying wave variables | no | waveProperties
     \endtable
 
@@ -47,12 +47,12 @@ Note
     - Strange behaviour with potentialFoam since the U equation is not solved
 
 SourceFiles
-    waveInletVelocityFvPatchVectorField.C
+    waveVelocityFvPatchVectorField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef waveInletVelocityFvPatchVectorField_H
-#define waveInletVelocityFvPatchVectorField_H
+#ifndef waveVelocityFvPatchVectorField_H
+#define waveVelocityFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -60,11 +60,12 @@ SourceFiles
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
-             Class waveInletVelocityFvPatchVectorField Declaration
+               Class waveVelocityFvPatchVectorField Declaration
 \*---------------------------------------------------------------------------*/
 
-class waveInletVelocityFvPatchVectorField
+class waveVelocityFvPatchVectorField
 :
     public fixedValueFvPatchVectorField
 {
@@ -77,20 +78,20 @@ class waveInletVelocityFvPatchVectorField
 public:
 
    //- Runtime type information
-   TypeName("waveInletVelocity");
+   TypeName("waveVelocity");
 
 
    // Constructors
 
         //- Construct from patch and internal field
-        waveInletVelocityFvPatchVectorField
+        waveVelocityFvPatchVectorField
         (
             const fvPatch&,
             const DimensionedField<vector, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        waveInletVelocityFvPatchVectorField
+        waveVelocityFvPatchVectorField
         (
             const fvPatch&,
             const DimensionedField<vector, volMesh>&,
@@ -98,20 +99,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  waveInletVelocityFvPatchVectorField
+        //  waveVelocityFvPatchVectorField
         //  onto a new patch
-        waveInletVelocityFvPatchVectorField
+        waveVelocityFvPatchVectorField
         (
-            const waveInletVelocityFvPatchVectorField&,
+            const waveVelocityFvPatchVectorField&,
             const fvPatch&,
             const DimensionedField<vector, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        waveInletVelocityFvPatchVectorField
+        waveVelocityFvPatchVectorField
         (
-            const waveInletVelocityFvPatchVectorField&
+            const waveVelocityFvPatchVectorField&
         );
 
         //- Construct and return a clone
@@ -119,14 +120,14 @@ public:
         {
             return tmp<fvPatchVectorField>
             (
-                new waveInletVelocityFvPatchVectorField(*this)
+                new waveVelocityFvPatchVectorField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        waveInletVelocityFvPatchVectorField
+        waveVelocityFvPatchVectorField
         (
-            const waveInletVelocityFvPatchVectorField&,
+            const waveVelocityFvPatchVectorField&,
             const DimensionedField<vector, volMesh>&
         );
 
@@ -138,7 +139,7 @@ public:
         {
             return tmp<fvPatchVectorField>
             (
-                new waveInletVelocityFvPatchVectorField(*this, iF)
+                new waveVelocityFvPatchVectorField(*this, iF)
             );
         }
 
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
rename to src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
rename to src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
rename to src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
rename to src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
rename to src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
rename to src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
rename to src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
rename to src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
rename to src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
rename to src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
similarity index 99%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
index e7273e91c3..643acedeb2 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
@@ -388,7 +388,7 @@ Foam::scalar Foam::waveModels::StokesV::B55k
           - 8*7280*pow(c, 7)*ck
           + 6*7160*pow(c, 5)*ck
           - 4*1800*pow(c, 3)*ck
-          - 2*1050*pow(c,1)*ck
+          - 2*1050*pow(c, 1)*ck
         )
        /(12288*pow(s, 10)*(6*sqr(c) - 1)*(8*pow(c, 4) - 11*sqr(c) + 3))
       - (
@@ -552,7 +552,7 @@ Foam::scalar Foam::waveModels::StokesV::C4
     const scalar c = cosh(k*h);
 
     return
-        (12*pow(c, 8) + 36*pow(c, 6) - 162*pow(c, 4) + 141*sqr(c) -27)
+        (12*pow(c, 8) + 36*pow(c, 6) - 162*pow(c, 4) + 141*sqr(c) - 27)
        /(192*c*pow(s, 9));
 }
 
@@ -577,8 +577,8 @@ void Foam::waveModels::StokesV::initialise
 
     label n = 0;
 
-    const scalar tolerance = 1e-12;
-    const label iterMax = 10000;
+    static const scalar tolerance = 1e-12;
+    static const label iterMax = 10000;
 
     while ((mag(f1) > tolerance || mag(f2) > tolerance) && (n < iterMax))
     {
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H b/src/waveModels/waveGenerationModels/derived/cnoidal/Elliptic.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H
rename to src/waveModels/waveGenerationModels/derived/cnoidal/Elliptic.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C
similarity index 98%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModel.C
rename to src/waveModels/waveModel/waveModel.C
index 3fee2d90a6..01f5749b9b 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/src/waveModels/waveModel/waveModel.C
@@ -147,7 +147,8 @@ Foam::tmp<Foam::scalarField> Foam::waveModel::waterLevel() const
         reduce(paddleMagSf[paddlei], sumOp<scalar>());
         reduce(paddleWettedMagSf[paddlei], sumOp<scalar>());
         level[paddlei] +=
-            paddleWettedMagSf[paddlei]/paddleMagSf[paddlei]*zSpan_;
+            paddleWettedMagSf[paddlei]
+           /(paddleMagSf[paddlei]*zSpan_ + ROOTVSMALL);
     }
 
     return tlevel;
@@ -333,6 +334,9 @@ bool Foam::waveModel::read(const dictionary& overrideDict)
             }
         }
 
+        // Avoid potential zero...
+        waterDepthRef_ += SMALL;
+
         // Insert the reference water depth into [this] to enable restart
         add("waterDepthRef", waterDepthRef_);
     }
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/src/waveModels/waveModel/waveModel.H
similarity index 99%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModel.H
rename to src/waveModels/waveModel/waveModel.H
index 399cf40676..7a0efd4570 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/src/waveModels/waveModel/waveModel.H
@@ -25,6 +25,7 @@ Class
     Foam::waveModel
 
 Description
+    Base class for waveModels
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C
rename to src/waveModels/waveModel/waveModelNew.C
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
similarity index 92%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
index b215c9cd48..097dae5bea 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
@@ -23,19 +23,19 @@ boundaryField
 {
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     outlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     ground
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
index a99cef99e9..424d475902 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform 0;
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
index f65efdb456..92a1a646e9 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libwaveBCs.so"
-    "libwaveModels.so"
-);
-
 application     interFoam;
 
 startFrom       latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
index b215c9cd48..95453554e5 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
 {
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     outlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
index a99cef99e9..424d475902 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform 0;
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
index 7894dff756..87022a24ce 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libwaveBCs.so"
-    "libwaveModels.so"
-);
-
 application     interFoam;
 
 startFrom       latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
index b215c9cd48..95453554e5 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
 {
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     outlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
index a99cef99e9..424d475902 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform 0;
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
index c0d020cf65..91f0a8a144 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libwaveBCs.so"
-    "libwaveModels.so"
-);
-
 application     interFoam;
 
 startFrom       latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
index b215c9cd48..95453554e5 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
 {
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     outlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
index a99cef99e9..424d475902 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform 0;
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
index f779aa6fe6..8c005190cc 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libwaveBCs.so"
-    "libwaveModels.so"
-);
-
 application     interFoam;
 
 startFrom       latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
index 523da1ac2d..02f000b04a 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
 {
     inlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
     outlet
     {
-        type            waveInletVelocity;
+        type            waveVelocity;
         value           uniform (0 0 0);
     }
 
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
similarity index 94%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
index b309a9dfb8..9069a26b66 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            waveInletAlpha;
+        type            waveAlpha;
         value           uniform 0;
     }
 
@@ -38,7 +38,7 @@ boundaryField
 
     sides
     {
-	type            empty;
+        type            empty;
     }
 
     top
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
index c45cdd924d..76911c1e87 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libwaveBCs.so"
-    "libwaveModels.so"
-);
-
 application     interFoam;
 
 startFrom       latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict

From bf9fcba6451c690f9af721d8c0b2971ecacdf9f8 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 15 Dec 2016 13:07:00 +0000
Subject: [PATCH 16/18] ENH: Added waveModels library to interFoam family of
 solvers

---
 applications/solvers/multiphase/interFoam/Make/options         | 3 ++-
 .../solvers/multiphase/interFoam/interDyMFoam/Make/options     | 3 ++-
 .../solvers/multiphase/interFoam/interMixingFoam/Make/options  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index cfe4a92072..21e9667b83 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -17,4 +17,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lsampling
+    -lsampling \
+    -lwaveModels
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index bceea20c81..9792cb9b85 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -24,4 +24,5 @@ EXE_LIBS = \
     -ltopoChangerFvMesh \
     -lmeshTools \
     -lfvOptions \
-    -lsampling
+    -lsampling \
+    -lwaveModels
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index ce7222ff1b..3d2ce063a5 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -23,4 +23,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
-    -lsampling
+    -lsampling \
+    -lwaveModels

From 06900449ab6c93de026df33b9a782157ab447e16 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 15 Dec 2016 13:08:15 +0000
Subject: [PATCH 17/18] ENH: Removed old wave model integration files

---
 integration/OpenCFD/code/Allwclean            |   5 -
 integration/OpenCFD/code/Allwmake             |   5 -
 integration/genAbs/allMake                    |  33 -
 .../calculatedLevelRegular.H                  |  88 --
 .../calculatedLevelRegularNormal.H            |  76 --
 .../calculatedLevelSolitary.H                 |  30 -
 .../common/checks/checkInputErrorsRegular.H   | 159 ---
 .../common/checks/checkInputErrorsSolitary.H  |  41 -
 integration/genAbs/common/memberFun.H         | 355 -------
 integration/genAbs/common/waveFun.C           | 980 ------------------
 integration/genAbs/common/waveFun.H           |  95 --
 ...sorption_InletVelocityFvPatchVectorField.C | 339 ------
 ...sorption_InletVelocityFvPatchVectorField.H | 199 ----
 integration/genAbs/waveAbsorption/Make/files  |   3 -
 .../genAbs/waveAbsorption/Make/options        |   7 -
 integration/genAbs/waveAbsorption/localMake   |  25 -
 .../IH_Waves_InletAlphaFvPatchScalarField.C   | 460 --------
 .../IH_Waves_InletAlphaFvPatchScalarField.H   | 226 ----
 ...IH_Waves_InletVelocityFvPatchVectorField.C | 495 ---------
 ...IH_Waves_InletVelocityFvPatchVectorField.H | 238 -----
 .../velProfiles/profileBoussinesq.H           | 170 ---
 .../velProfiles/profileCnoidal.H              | 184 ----
 .../velProfiles/profileGENAB.H                |  20 -
 .../velProfiles/profileStokesI.H              | 187 ----
 .../velProfiles/profileStokesII.H             | 186 ----
 .../velProfiles/profileStokesV.H              | 186 ----
 .../velProfiles/velocityProfile.H             |  36 -
 integration/genAbs/waveGeneration/Make/files  |   5 -
 .../genAbs/waveGeneration/Make/options        |  16 -
 integration/genAbs/waveGeneration/localMake   |  25 -
 30 files changed, 4874 deletions(-)
 delete mode 100755 integration/OpenCFD/code/Allwclean
 delete mode 100755 integration/OpenCFD/code/Allwmake
 delete mode 100755 integration/genAbs/allMake
 delete mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
 delete mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
 delete mode 100644 integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
 delete mode 100644 integration/genAbs/common/checks/checkInputErrorsRegular.H
 delete mode 100644 integration/genAbs/common/checks/checkInputErrorsSolitary.H
 delete mode 100644 integration/genAbs/common/memberFun.H
 delete mode 100644 integration/genAbs/common/waveFun.C
 delete mode 100644 integration/genAbs/common/waveFun.H
 delete mode 100644 integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
 delete mode 100644 integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
 delete mode 100644 integration/genAbs/waveAbsorption/Make/files
 delete mode 100644 integration/genAbs/waveAbsorption/Make/options
 delete mode 100755 integration/genAbs/waveAbsorption/localMake
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
 delete mode 100644 integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
 delete mode 100644 integration/genAbs/waveGeneration/Make/files
 delete mode 100644 integration/genAbs/waveGeneration/Make/options
 delete mode 100755 integration/genAbs/waveGeneration/localMake

diff --git a/integration/OpenCFD/code/Allwclean b/integration/OpenCFD/code/Allwclean
deleted file mode 100755
index 6ec5fd120d..0000000000
--- a/integration/OpenCFD/code/Allwclean
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-wclean libso waveModel
-wclean libso waveBCs
diff --git a/integration/OpenCFD/code/Allwmake b/integration/OpenCFD/code/Allwmake
deleted file mode 100755
index 19e81851d1..0000000000
--- a/integration/OpenCFD/code/Allwmake
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-wmake libso waveModel
-wmake libso waveBCs
diff --git a/integration/genAbs/allMake b/integration/genAbs/allMake
deleted file mode 100755
index defec71d8c..0000000000
--- a/integration/genAbs/allMake
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [ $WM_PROJECT == "foam" ]; then
-    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
-else
-    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
-fi
-
-#IHC_dbg
-echo $ofversion
-#----
-
-export OF_VERSION=$ofversion
-
-wclean all > /dev/null
-
-wmake libso waveGeneration
-
-if (( $? )) ; then 
-    echo "\n\nWave generation boundary conditions (V2.0-ESI) compilation failed"
-    exit; else
-    echo -e "\n\nIH Wave generationV2.0 boundary conditions (V2.0-ESI) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
-fi
-
-wmake libso waveAbsorption
-
-if (( $? )) ; then 
-    echo "\n\nWave absorption boundary conditions (V2.0-ESI) compilation failed"
-    exit; else
-    echo -e "\n\nIH Wave absorption boundary conditions (V2.0-ESI) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
-fi
-
-wclean all > /dev/null
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
deleted file mode 100644
index 3c4f92b7b9..0000000000
--- a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegular.H
+++ /dev/null
@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if ( waveTheory_ == "StokesI" )
-    {
-        forAll(calculatedLevel, itS1)
-        {
-            calculatedLevel[itS1] = RealwaterDepth_ 
-		+ timeMult * StokesIFun :: eta 
-		(
-    		    waveHeight_, 
-	            waveKx, 
-	            xGroup[itS1], 
-                    waveKy, 
-                    yGroup[itS1], 
-                    waveOmega, 
-                    currTime, 
-                    wavePhase_
-                );
-        }
-    }
-    else if ( waveTheory_ == "StokesII" )
-    {
-        forAll(calculatedLevel, itS2)
-        {
-            calculatedLevel[itS2] = RealwaterDepth_ 
-	        + timeMult * StokesIIFun :: eta 
-		(
-                    waveHeight_, 
-                    RealwaterDepth_,  
-                    waveKx, 
-                    xGroup[itS2], 
-                    waveKy, 
-                    yGroup[itS2], 
-                    waveOmega, 
-                    currTime, 
-                    wavePhase_
-                );
-        }
-    }
-    else  if ( waveTheory_ == "StokesV" )
-    {
-        forAll(calculatedLevel, it1)
-        {
-            calculatedLevel[it1] = RealwaterDepth_ 
-	        + timeMult * stokesVFun :: eta 
-		(
-                    RealwaterDepth_,  
-		    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-                    xGroup[it1], 
-                    yGroup[it1], 
-                    currTime, 
-                    wavePhase_
-                );
-        }
-    }
-    else if ( waveTheory_ == "Cnoidal" )
-    {
-        forAll(calculatedLevel, it3)
-        {
-            calculatedLevel[it3] = RealwaterDepth_ 
-	        + timeMult * cnoidalFun :: eta 
-	        (
-		    waveHeight_, 
-                    mCnoidal_, 
-                    waveKx, 
-                    waveKy, 
-                    wavePeriod_, 
-                    xGroup[it3], 
-                    yGroup[it3], 
-                    currTime
-                );
-        }
-    }
-    else 
-    {
-        FatalError << "Wave theory not supported, use:\n" 
-	    << "StokesI, StokesII, StokesV, Cnoidal, SolitaryBoussinesq" 
-	    << exit(FatalError);
-    }
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
deleted file mode 100644
index 09fa19c5ed..0000000000
--- a/integration/genAbs/common/calculateWaterLevel/calculatedLevelRegularNormal.H
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if ( waveTheory_ == "StokesI" )
-    {
-            calculatedLevel = RealwaterDepth_ 
-	        + timeMult * StokesIFun :: eta 
-		(
-		    waveHeight_, 
-                    waveKx, 
-                    xGroup[1],  
-                    waveKy, 
-                    yGroup[1],  
-                    waveOmega, 
-                    currTime, 
-                    wavePhase_
-                );
-    }
-    else if ( waveTheory_ == "StokesII" )
-    {
-            calculatedLevel = RealwaterDepth_ 
-	        + timeMult * StokesIIFun :: eta 
-	        (
-                    waveHeight_, 
-                    RealwaterDepth_,  
-                    waveKx, 
-                    xGroup[1],  
-                    waveKy, 
-                    yGroup[1],  
-                    waveOmega, 
-                    currTime, 
-                    wavePhase_
-                );
-    }
-    else  if ( waveTheory_ == "StokesV" )
-    {
-            calculatedLevel = RealwaterDepth_ 
-	        + timeMult * stokesVFun :: eta 
-		(
-                    RealwaterDepth_,  
-		    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-                    xGroup[1], 
-                    yGroup[1], 
-                    currTime, 
-                    wavePhase_
-                );
-    }
-    else if ( waveTheory_ == "Cnoidal" )
-    {
-            calculatedLevel = RealwaterDepth_ 
-	        + timeMult * cnoidalFun :: eta 
-	        (
-		    waveHeight_, 
-                    mCnoidal_, 
-                    waveKx, 
-                    waveKy, 
-                    wavePeriod_, 
-                    xGroup[1], 
-                    yGroup[1], 
-                    currTime
-                );
-    }
-    else 
-    {
-        FatalError << "Wave theory not supported, use:\n" 
-	    << "StokesI, StokesII, StokesV, Cnoidal, SolitaryBoussinesq." 
-	    << exit(FatalError);
-    }
diff --git a/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H b/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
deleted file mode 100644
index 10ee599eb0..0000000000
--- a/integration/genAbs/common/calculateWaterLevel/calculatedLevelSolitary.H
+++ /dev/null
@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/ 
-
-   if ( waveTheory_ == "Boussinesq" )
-   {
-       forAll(calculatedLevel, it2)
-       {
-           calculatedLevel[it2] = RealwaterDepth_
-               + BoussinesqFun :: eta
-               (
-                   waveHeight_, 
-                   RealwaterDepth_,  
-                   xGroup[it2], 
-                   yGroup[it2], 
-                   waveAngle, 
-                   currTime, 
-                   X0
-               );
-        }
-   }
-   else 
-   {
-        FatalError << "Wave theory not supported, use:\n" 
-	    << "Boussinesq" << exit(FatalError);
-   }
diff --git a/integration/genAbs/common/checks/checkInputErrorsRegular.H b/integration/genAbs/common/checks/checkInputErrorsRegular.H
deleted file mode 100644
index 293ad83116..0000000000
--- a/integration/genAbs/common/checks/checkInputErrorsRegular.H
+++ /dev/null
@@ -1,159 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-if (nPaddles_ < 1)
-{
-    FatalError << "Check nPaddles value." << exit(FatalError);
-}
-
-if ( nPaddles_ > 1 )
-{
-    nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
-    reduce(nPaddles_, minOp<label>());
-}
-
-if ( waveHeight_ < 0.0 )
-{
-    FatalError << "Check wave height value." << exit(FatalError);
-}
-
-if ( waveTheory_ == "aaa" ) 
-{
-    FatalError << "Wave theory not specified." << exit(FatalError);
-}
-else if ( waveTheory_ == "StokesI" || waveTheory_ == "StokesII" )
-{
-    if ( wavePeriod_ <= 0.0 )
-    {
-        FatalError << "Check wave period value." << exit(FatalError);
-    }
-
-    if ( waveLength_ <= 0.0 )
-    {
-        word generation = "a";
-
-        waveLength_ = StokesIFun::waveLength (RealwaterDepth_, wavePeriod_);
-
-        waveK = 2.0*PI()/waveLength_;
-
-        if ( waveK*RealwaterDepth_ > PI() )
-        {
-            generation = "Deep";
-        }
-        else if ( waveK*RealwaterDepth_ < PI()/10.0 )
-        {
-            generation = "Shallow";
-        }
-        else
-        {
-            generation = "Intermediate";
-        }
-
-        Info << "\nIH Wave Generation BC" << endl;
-        Info << "	Wave theory: " << waveTheory_ << endl;
-        Info << "	H: " << waveHeight_ << endl;
-        Info << "	T: " << wavePeriod_ << endl;
-        Info << "	h: " << RealwaterDepth_ << endl;
-        Info << "	waveLength: " << waveLength_ << endl;
-        Info << "	Direction: " << waveDir_ << "º" << endl;
-        Info << "	Generation in: " << generation << " waters." << endl;
-        Info << "	Relative depth (kh): " << waveK*RealwaterDepth_ 
-	     << "\n\n" << endl;
-    }
-}
-else if ( waveTheory_ == "StokesV" )
-{
-    if ( wavePeriod_ <= 0.0 )
-    {
-        FatalError << "Check wave period value." << exit(FatalError);
-    }
-
-    if ( lambdaStokesV_ <= 0.0 )
-    {
-        word generation = "a";
-
-        scalar f1;
-        scalar f2;
-
-        stokesVFun :: StokesVNR ( waveHeight_, 
-            RealwaterDepth_,  
-            wavePeriod_, 
-            &waveK, 
-            &lambdaStokesV_, 
-            &f1, 
-            &f2 
-            );
-
-        Info << "f1 residual " << f1 << endl;
-        Info << "f2 residual " << f2 << endl;
-
-        if ( f1 > 0.001 || f2 > 0.001 )
-        {
-	    FatalError << "No convergence for Stokes V wave theory.\n" 
-	        << exit(FatalError);
-        }
-
-        waveLength_ = 2.0*PI()/waveK;
-
-        if ( waveK*RealwaterDepth_ > PI() )
-        {
-            generation = "Deep";
-        }
-        else if ( waveK*RealwaterDepth_ < PI()/10.0 )
-        {
-            generation = "Shallow";
-        }
-        else
-        {
-            generation = "Intermediate";
-        }
-
-        Info << "\nIH Wave Generation BC" << endl;
-        Info << "	Wave theory: " << waveTheory_ << endl;
-        Info << "	H: " << waveHeight_ << endl;
-        Info << "	T: " << wavePeriod_ << endl;
-        Info << "	h: " << RealwaterDepth_ << endl;
-        Info << "	L: " << waveLength_ << endl;
-        Info << "	Lambda: " << lambdaStokesV_ << endl;
-        Info << "	Direction: " << waveDir_ << "º"  << endl;
-        Info << "	Generation in: " << generation << " waters." << endl;
-        Info << "	Relative depth (kh): " << waveK*RealwaterDepth_ 
-	     << "\n\n" << endl;
-    }
-}
-else if ( waveTheory_ == "Cnoidal" )
-{
-    if ( wavePeriod_ <= 0.0 )
-    {
-        FatalError << "Check wave period value." << exit(FatalError);
-    }
-
-    if ( mCnoidal_ <= 0.0 )
-    {
-        cnoidalFun :: calculations ( waveHeight_, 
-            RealwaterDepth_,  
-            wavePeriod_, 
-            &mCnoidal_, 
-            &waveLength_);
-
-        Info << "\nIH Wave Generation BC" << endl;
-        Info << "	Wave theory: " << waveTheory_ << endl;
-        Info << "	H: " << waveHeight_ << endl;
-        Info << "	T: " << wavePeriod_ << endl;
-        Info << "	h: " << RealwaterDepth_ << endl;
-        Info << "	L: " << waveLength_ << endl;
-        Info << "	m parameter: " << mCnoidal_ << endl;
-        Info << "	Direction: " << waveDir_ << "º" <<  "\n\n" << endl;
-    }
-}
-else
-{
-    FatalError << "Wave theory not supported, use:\n" 
-        << "StokesI, StokesII, StokesV, Cnoidal." << exit(FatalError);
-}
-
diff --git a/integration/genAbs/common/checks/checkInputErrorsSolitary.H b/integration/genAbs/common/checks/checkInputErrorsSolitary.H
deleted file mode 100644
index 62061b6beb..0000000000
--- a/integration/genAbs/common/checks/checkInputErrorsSolitary.H
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (nPaddles_ < 1)
-    {
-        FatalError << "Check nPaddles value." << exit(FatalError);
-    }
-
-    if ( nPaddles_ > 1 )
-    {
-        nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
-        reduce(nPaddles_, minOp<label>());
-    }
-
-    if ( waveHeight_ < 0.0 )
-    {
-        FatalError << "Check wave height value." << exit(FatalError);
-    }
-
-    if ( waveTheory_ == "aaa" )
-    {
-        FatalError << "Wave theory not specified." << exit(FatalError);
-    }
-    else if ( waveTheory_ == "Boussinesq" )
-    {
-        Info << "\nIH Wave Generation BC" << endl;
-        Info << "Wave theory: " << waveTheory_ << endl;
-        Info << "H: " << waveHeight_ << endl;
-        Info << "h: " << RealwaterDepth_ << endl;
-        Info << "Direction: " << waveDir_ << "º" <<  "\n\n" << endl;
-    }
-    else
-    {
-        FatalError << "Wave theory not supported, use:\n" 
-	    << "Boussinesq" << exit(FatalError);
-    }
diff --git a/integration/genAbs/common/memberFun.H b/integration/genAbs/common/memberFun.H
deleted file mode 100644
index 34486ba692..0000000000
--- a/integration/genAbs/common/memberFun.H
+++ /dev/null
@@ -1,355 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    //- Return Pi
-    scalar PI()
-    {
-        #if OFVERSION >= 200
-            const scalar PI = constant::mathematical::pi;
-        #else
-            const scalar PI = mathematicalConstant::pi;
-        #endif
-        return PI;
-    }
-
-    //- Return alphaName
-    word alphaName()
-    {
-        #if OFVERSION >= 230
-            const word an = "alpha.water";
-        #else
-            const word an = "alpha1";
-        #endif
-        return an;
-    }
-
-    //- Return prevalent direction - X or Y to sort groups of columns
-    scalarField patchDirection ( vector span, scalar* dMin, scalar* dSpan )
-    {
-        const pointField& points = patch().patch().localPoints();
-        if (span[0] >= span[1]) 
-        {
-            *dMin = gMin(points.component(0));
-            *dSpan = gMax(points.component(0)) - *dMin;
-            return patch().Cf().component(0); 
-        }
-        else
-        {
-            *dMin = gMin(points.component(1));
-            *dSpan = gMax(points.component(1)) - *dMin;
-            return patch().Cf().component(1);
-        }
-    }
-
-    //- Return Zmax and Zmin of the patch faces
-    void faceBoundsZ(scalarField* zSup, scalarField* zInf)
-    {
-        const label nF = patch().faceCells().size();
-        scalarField zMax = Foam::scalarField(nF, -9999.0);
-        scalarField zMin = Foam::scalarField(nF, 9999.0);
-            
-        const faceList& faces = this->patch().patch().localFaces();
-        const List<vector>& points = this->patch().patch().localPoints();
-
-        forAll( faces, faceI )
-        {
-            const face& f = faces[faceI];
-            forAll(f, point)
-            {
-                scalar auxiliar = points[f[point]].component(2);
-
-                zMax[faceI] = max(zMax[faceI], auxiliar);
-                zMin[faceI] = min(zMin[faceI], auxiliar);
-            }
-        }
-
-        *zSup = zMax;
-        *zInf = zMin;
-    }
-
-    //- Calculate water levels on each paddle (same zSpan)
-    scalarList calcWL 
-        ( 
-	    scalarField alphaCell, 
-	    labelList cellGroup, 
-	    scalar zSpan 
-	)
-    {
-        scalarList groupTotalArea (nPaddles_,0.0); 
-        scalarList groupWaterArea (nPaddles_,0.0); 
-        scalarList heights (nPaddles_,0.0);
-
-        const scalarField faceSurface = patch().magSf();
-
-        forAll( patch().faceCells(), index ) 
-        {
-            groupTotalArea[cellGroup[index]-1] 
-	        += faceSurface[index];
-            groupWaterArea[cellGroup[index]-1] 
-	        += faceSurface[index]*alphaCell[index];
-        } 
-
-        for (label i=0; i<=gMax(cellGroup)-1; i++)
-        {
-            reduce(groupTotalArea[i], sumOp<scalar>());
-            reduce(groupWaterArea[i], sumOp<scalar>());
-            heights[i] = groupWaterArea[i]/groupTotalArea[i]*zSpan;
-        }
-
-        return heights;
-    }
-
-    //- Calculate mean velocities on each paddle
-    void calcUV 
-        ( 
-	    scalarField alphaCell, 
-	    labelList cellGroup, 
-	    scalarField UxCell, 
-            scalarList* Ux, 
-	    scalarField UyCell, 
-	    scalarList* Uy 
-	)
-    {
-       scalarList groupWaterArea (nPaddles_,0.0);
-       scalarList groupUx (nPaddles_,0.0);
-       scalarList groupUy (nPaddles_,0.0);
-
-       const scalarField faceSurface = patch().magSf();
-
-       forAll( patch().faceCells(), index ) 
-       {
-           groupWaterArea[cellGroup[index]-1] += 
-               faceSurface[index]*alphaCell[index];
-
-           groupUx[cellGroup[index]-1] += 
-               UxCell[index]*alphaCell[index]*faceSurface[index];
-           groupUy[cellGroup[index]-1] += 
-               UyCell[index]*alphaCell[index]*faceSurface[index];
-       } 
-
-       for (label i=0; i<=nPaddles_-1; i++)
-       {
-           reduce(groupWaterArea[i], sumOp<scalar>());
-            reduce(groupUx[i], sumOp<scalar>());
-            reduce(groupUy[i], sumOp<scalar>());
-
-            groupUx[i] = groupUx[i]/groupWaterArea[i];
-            groupUy[i] = groupUy[i]/groupWaterArea[i];
-        }
-
-        *Ux = groupUx;
-        *Uy = groupUy;
-    }
-
-    //- Mean of a scalarList
-    scalar meanSL ( scalarList lst )
-    {
-        scalar aux = 0.0;
-            
-        forAll(lst,i)
-        {
-            aux += lst[i];
-        }
-            
-        return aux/scalar(lst.size());
-    }
-
-    //- Reduce number of paddles if too high (paddles without cells)
-    label decreaseNPaddles 
-        ( 
-	    label np, 
-	    scalarField patchD, 
-	    scalar dMin, 
-	    scalar dSpan 
-	)
-    {
-        scalarList dBreakPoints(np+1, 0.0); 
-
-        while(1)
-        {
-            scalarList usedGroup (np,0.0); 
-
-            for (label i=0; i<=np; i++)
-            {
-                dBreakPoints[i] = dMin + dSpan/(np)*i; 
-            }
-
-            forAll(patch().faceCells(), patchCells) 
-            {
-                for (label j=0; j<=np; j++) 
-                {
-                    if ( (patchD[patchCells]>=dBreakPoints[j]) && 
-                        (patchD[patchCells]<dBreakPoints[j+1]) )
-                    {
-                        usedGroup[j] = 1.0;
-                        continue;
-                    }
-                }      
-            }
-
-            reduce(usedGroup, maxOp<scalarList>());
-
-            if ( gMin(usedGroup) < 0.5 )
-            {
-                Info
-                    << "Reduced nPaddles from " << np
-                    << " to " << np-1 << endl;
-                np -= 1;
-            }
-            else
-            {
-                break;
-            }
-        }
-        return np;
-    }
-
-    //- Own convenient definition of atan
-    scalar arcTan ( scalar x, scalar y )
-    {
-        scalar A = 0.0;
-
-        if( x > 0.0 )
-        {
-            A = atan(y/x);
-        }
-        else if ( y >= 0.0 && x < 0.0 )
-        {
-            A = PI() + atan(y/x);
-        }
-        else if ( y < 0.0 && x < 0.0 )
-        {
-            A = -PI() + atan(y/x);
-        }
-        else if ( y > 0.0 && x == 0.0 )
-        {
-            A = PI()/2.0;
-        }        
-        else if ( y < 0.0 && x == 0.0 )
-        {
-            A = -PI()/2.0;
-        }
-        else if ( y == 0.0 && x == 0.0 )
-        {
-            A = 0;
-        }
-
-        return A;
-    }
-
-    //- Calculate mean horizontal angle for each paddle
-    scalarList meanPatchDirs ( labelList cellGroup )
-    {
-        const vectorField nVecCell = patch().nf();
-
-        scalarList numAngles (nPaddles_, 0.0);
-        scalarList meanAngle (nPaddles_, 0.0);
-
-        forAll(patch().faceCells(), patchCells) 
-        {
-            meanAngle[cellGroup[patchCells]-1]
-                += arcTan( nVecCell[patchCells].component(0), 
-                nVecCell[patchCells].component(1));
-            numAngles[cellGroup[patchCells]-1] += 1.0;
-        }
-
-        for (label i=0; i<=nPaddles_-1; i++)
-        {
-            reduce(meanAngle[i], sumOp<scalar>());
-            reduce(numAngles[i], sumOp<scalar>());
-            meanAngle[i] = meanAngle[i]/numAngles[i] + PI();
-        }
-        return meanAngle;
-    }
-
-    //- Calculate z-bounds for each paddle
-    scalarList zSpanList 
-        ( 
-	    labelList cellGroup, 
-	    scalarField zInf, 
-	    scalarField zSup 
-	)
-    {
-        scalarList zMaxL (nPaddles_, -9999.0);
-        scalarList zMinL (nPaddles_,  9999.0);
-
-        forAll(patch().faceCells(), patchCells) 
-        {
-            zMaxL[cellGroup[patchCells]-1] = 
-	        max(zMaxL[cellGroup[patchCells]-1], zSup[patchCells] );
-            zMinL[cellGroup[patchCells]-1] = 
-                min(zMinL[cellGroup[patchCells]-1], zInf[patchCells] );
-        }
-
-        for (label i=0; i<=nPaddles_-1; i++)
-        {
-            reduce(zMaxL[i], maxOp<scalar>());
-            reduce(zMinL[i], minOp<scalar>());
-        }
-        return zMaxL-zMinL;
-    }
-
-    //- In-line print for scalarLists
-    label inlinePrint ( std::string name, scalarList SL )
-    {
-        Info << name << " " << SL.size() << "( ";
-        forAll(SL, i)
-        {
-            Info << SL[i] << " ";
-        }
-        Info << ")\n" << endl;
-        return 0;
-    }
-
-    //- Simple linear interpolation
-    scalar interpolation 
-        (
-	    scalar x1, 
-	    scalar x2, 
-            scalar y1, 
-            scalar y2, 
-            scalar xInt 
-        )
-    {
-        scalar yInt = y1 + (y2-y1)/(x2-x1)*(xInt-x1);
-        return yInt;
-    }
-
-    //- Limit angle between -pi/2 and pi/2
-    scalar limAngle (scalar ang)
-    {
-        ang = abs(ang);
-
-        while (ang >= 2.0*PI())
-        {
-            ang -= 2.0*PI();
-        }
-
-        if ( ang >= PI()/2.0 && ang <= 3.0*PI()/2.0 )
-        {
-            return PI()/2.0;
-        }
-        else
-        {
-            return ang;
-        }
-    }
-
-    //- Interpolation BO style
-    scalar interpolatte 
-        ( 
-            scalar x1, 
-            scalar x2, 
-            scalar y1, 
-            scalar y2, 
-            scalar xInt 
-        )
-    {
-        scalar yInt = (y1 + y2)*0.5;
-        return yInt;
-    }
diff --git a/integration/genAbs/common/waveFun.C b/integration/genAbs/common/waveFun.C
deleted file mode 100644
index 23be07e0a7..0000000000
--- a/integration/genAbs/common/waveFun.C
+++ /dev/null
@@ -1,980 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#include "waveFun.H"
-#include <math.h>
-#include <stdlib.h> 
-#include <stdio.h>
-
-namespace otherFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define grav 9.81
-
-    double interpolation (double x1, double x2, double y1, double y2, double xInt)
-    {
-
-        double yInt = y1 + (y2-y1)/(x2-x1)*(xInt-x1);
-
-        return yInt;
-    }
-}
-
-namespace StokesIFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define G 9.81
-
-    double waveLength (double h, double T)
-    {
-        double L0 = G*T*T/(2.0*PII);
-        double L = L0;
-
-        for(int i=1; i<=100; i++)
-        {
-            L = L0*tanh(2.0*PII*h/L);
-        }
-
-        return L;
-    }
-    
-    double eta (double H, double Kx, double x, double Ky, double y, double omega, double t, double phase)
-    {
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-        
-        double sup = H*0.5*cos(faseTot);
-        
-        return sup;
-    }
-
-    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
-    {
-        double k = sqrt(Kx*Kx + Ky*Ky);
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-
-        double velocity = H*0.5*omega*cos(faseTot)*cosh(k*z)/sinh(k*h);
-
-        return velocity;
-    }
-    
-    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
-    {
-        double k = sqrt(Kx*Kx + Ky*Ky);
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-
-        double velocity = H*0.5*omega*sin(faseTot)*sinh(k*z)/sinh(k*h);
-
-        return velocity;
-    }   
-}
-
-namespace StokesIIFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define G 9.81 
-    
-    double eta (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase)
-    {
-        double k = sqrt(Kx*Kx + Ky*Ky);
-        double sigma = tanh(k*h);
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-        
-        double sup = H*0.5*cos(faseTot) + k*H*H/4.0*(3.0-sigma*sigma)/(4.0*pow(sigma,3))*cos(2.0*faseTot);
-        
-        return sup;
-    }
-    
-    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
-    {
-        double k = sqrt(Kx*Kx + Ky*Ky);
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-
-        double velocity = H*0.5*omega*cos(faseTot)*cosh(k*z)/sinh(k*h) + 3.0/4.0*H*H/4.0*omega*k*cosh(2.0*k*z)/pow(sinh(k*h),4)*cos(2.0*faseTot);
-
-        return velocity;
-    }
-    
-    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z)
-    {
-        double k = sqrt(Kx*Kx + Ky*Ky);
-        double faseTot = Kx*x + Ky*y - omega*t + phase;
-
-        double velocity = H*0.5*omega*sin(faseTot)*sinh(k*z)/sinh(k*h) + 3.0/4.0*H*H/4.0*omega*k*sinh(2.0*k*z)/pow(sinh(k*h),4)*sin(2.0*faseTot);
-
-        return velocity;
-    }      
-}
-
-namespace Elliptic
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define ITER 25
-
-    void ellipticIntegralsKE (double m, double* K, double* E)
-    {
-        long double a,aOld,g,gOld,aux,sum;
-
-        if ( m == 0.0 ) 
-        {
-            *K = PII/2.;
-            *E = PII/2.;
-            return;
-        }
-
-        a = 1.0L;
-        g = sqrt(1.0L - m);
-        aux = 1.0L;
-        sum = 2.0L - m;
-
-        while (1) 
-        {
-            gOld = g;
-            aOld = a;
-            a = 0.5L * (gOld + aOld);
-            g = gOld * aOld;
-            aux += aux;
-            sum -= aux * (a * a - g);
-
-            if ( fabs(aOld - gOld) <= (aOld * 1.e-22) )
-            { 
-                break;
-            }
-
-            g = sqrt(g);
-        }
-
-        *K = (double) (PII/2. / a);
-        *E = (double) (PII/4. / a * sum);
-        return;
-    }
-
-    double JacobiAmp (double u, double m)
-    {
-        long double a[ITER+1], g[ITER+1], c[ITER+1];
-        long double aux, amp;
-        int n;
-
-        m = fabsl(m);
-
-        if ( m == 0.0 ) 
-        {
-            return u;
-        }
-        
-        if ( m == 1. ) 
-        {
-            return 2. * atan( exp(u) ) - PII/2.;
-        }
-
-        a[0] = 1.0L;
-        g[0] = sqrtl(1.0L - m);
-        c[0] = sqrtl(m);
-
-        aux = 1.0L;
-
-        for (n = 0; n < ITER; n++) 
-        {
-            if ( fabsl(a[n] - g[n]) < (a[n] * 1.e-22) ) 
-            {
-                break;
-            }
-
-            aux += aux;
-            a[n+1] = 0.5L * (a[n] + g[n]);
-            g[n+1] = sqrtl(a[n] * g[n]);
-            c[n+1] = 0.5L * (a[n] - g[n]);
-        }
-
-        amp = aux * a[n] * u;
-
-        for (; n > 0; n--) 
-        {
-            amp = 0.5L * ( amp + asinl( c[n] * sinl(amp) / a[n]) );
-        }
-
-        return (double) amp; 
-    }
-
-    void JacobiSnCnDn (double u, double m, double* Sn, double* Cn, double* Dn)
-    {
-        double amp = Elliptic::JacobiAmp( u, m );
-
-        *Sn = sin( amp );
-        *Cn = cos( amp );
-        *Dn = sqrt(1.0 - m * sin( amp ) * sin( amp ));
-        return;
-    }
-
-}
-
-namespace cnoidalFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define G 9.81
-
-    double eta (double H, double m, double kx, double ky, double T, double x, double y, double t)
-    {
-        double K, E;
-        Elliptic::ellipticIntegralsKE(m, &K, &E);
-
-        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
-
-        double sn, cn, dn;
-        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
-
-        double etaCnoidal = H*((1.0-E/K)/m - 1.0 + pow(cn,2));
-
-        return etaCnoidal;
-    }
-
-    double etaCnoidal1D (double H, double m, double t, double T)
-    {
-        double K, E;
-        Elliptic::ellipticIntegralsKE(m, &K, &E);
-
-        double uCnoidal = -2.0*K*(t/T);
-
-        double sn, cn, dn;
-        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
-
-        double etaCnoidal = H*((1.0-E/K)/m - 1.0 + pow(cn,2));
-
-        return etaCnoidal;
-    }
-
-    double etaMeanSq (double H, double m, double T)
-    {
-        double eta = 0;
-        double etaSumSq = 0;
-
-        for(int i=0; i<1000; i++)
-        {
-            eta = etaCnoidal1D(H, m, i*T/(1000.0), T);
-            etaSumSq += eta*eta;
-        }
-
-        etaSumSq /= 1000.0;
-        return etaSumSq;
-    }
-
-    double d1EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
-    {
-        double dudx = 0;
-        dudx = 2.0*K/L;
-
-        double sn, cn, dn;
-        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
-
-	double deriv = -2.0*H*cn*dn*sn*dudx;
-
-        return deriv;
-    }
-
-    double d2EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
-    {
-        double dudxx = 0;
-        dudxx = 4.0*K*K/L/L;
-
-        double sn, cn, dn;
-        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
-
-        double deriv = 2.0*H*(dn*dn*sn*sn - cn*cn*dn*dn + m*cn*cn*sn*sn)*dudxx;
-
-        return deriv;
-    }
-
-    double d3EtaDx (double H, double m, double uCnoidal, double L, double K, double E)
-    {
-        double dudxxx = 0;
-        dudxxx = 8.0*K*K*K/L/L/L;
-
-        double sn, cn, dn;
-        Elliptic::JacobiSnCnDn(uCnoidal, m, &sn, &cn, &dn);
-
-        double deriv = 8.0*H*( cn*sn*dn*dn*dn*(-4.0 -2.0*m) + 4.0*m*cn*sn*sn*sn*dn -2.0*m*cn*cn*cn*sn*dn )*dudxxx;
-
-        return deriv;
-    }
-
-    int calculations (double H, double d, double T, double* mOut, double* LOut)
-    {
-        double mTolerance = 0.0001;
-        double mElliptic = 0.5;
-        double LElliptic = 0;
-        double phaseSpeed = 0;
-
-        double mError = 0.0;
-        double mMinError = 999;
-
-        while (mElliptic < 1.0)
-        {
-            double KElliptic, EElliptic;
-            Elliptic::ellipticIntegralsKE(mElliptic, &KElliptic, &EElliptic);
-
-            LElliptic = KElliptic*sqrt(16.0*pow(d,3)*mElliptic/(3.0*H));        
-
-            phaseSpeed = sqrt(G*d)*(1.0 - H/d/2.0 + H/d/mElliptic*(1.0-3.0/2.0*EElliptic/KElliptic));
-
-            mError = fabs(T-LElliptic/phaseSpeed);
-
-            if (mError <= mMinError)
-            {
-                *mOut = mElliptic;
-                *LOut = LElliptic;
-                mMinError = mError;
-            }
-
-            mElliptic += mTolerance;
-        }
-
-        return 0;
-    }
-
-    double U (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z)
-    {
-        double K, E;
-        Elliptic::ellipticIntegralsKE(m, &K, &E);
-
-        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
-        double k = sqrt(kx*kx + ky*ky);
-        double L = 2.0*PII/k;
-        double c = L/T;
-
-        double etaCN = eta(H, m, kx, ky, T, x, y, t);
-        double etaXX = d2EtaDx(H, m, uCnoidal, L, K, E);
-        double etaMS = etaMeanSq(H, m, T);
-
-        double velocity = c*etaCN/h - c*(etaCN*etaCN/h/h + etaMS*etaMS/h/h) + 1.0/2.0*c*h*(1.0/3.0 - z*z/h/h)*etaXX;
-
-        return velocity;
-    }
-
-    double W (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z)
-    {
-        double K, E;
-        Elliptic::ellipticIntegralsKE(m, &K, &E);
-
-        double uCnoidal = K/PII*(kx*x + ky*y - 2.0*PII*t/T);
-        double k = sqrt(kx*kx + ky*ky);
-        double L = 2.0*PII/k;
-        double c = L/T;
-
-        double etaCN = eta(H, m, kx, ky, T, x, y, t);
-        double etaX = d1EtaDx(H, m, uCnoidal, L, K, E);
-        double etaXXX = d3EtaDx(H, m, uCnoidal, L, K, E);
-
-
-        double velocity = -c*z*( etaX/h*(1.0-2.0*etaCN/h) + 1.0/6.0*h*(1.0-z*z/h/h)*etaXXX ) ;
-
-        return velocity;
-    }
-}
-
-namespace stokesVFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define G 9.81
-
-    double A11 (double h, double k)
-    {
-        double s = sinh(k*h);
-
-        double A = 1.0/s;
-
-        return A;
-    }
-
-    double A13 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            -pow(c,2)*(5.0*pow(c,2)+1.0)
-                /
-            (8.0*pow(s,5));
-
-        return A;
-    }
- 
-    double A15 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            -(1184.0*pow(c,10)-1440.0*pow(c,8)-1992.0*pow(c,6)+2641.0*pow(c,4)-249.0*pow(c,2)+18)
-                /
-            (1536.0*pow(s,11));
-
-        return A;
-    }   
-
-    double A22 (double h, double k)
-    {
-        double s = sinh(k*h);
-
-        double A = 
-            3.0
-                /
-            (8.0*pow(s,4));
-
-        return A;
-    }
-
-    double A24 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            (192.0*pow(c,8)-424.0*pow(c,6)-312.0*pow(c,4)+480.0*pow(c,2)-17)
-                /
-            (768.0*pow(s,10));
-
-        return A;
-    }
-
-    double A33 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            (13.0-4.0*pow(c,2))
-                /
-            (64.0*pow(s,7));
-
-        return A;
-    }
-
-    double A35 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            (512.0*pow(c,12)+4224.0*pow(c,10)-6800.0*pow(c,8)-12808.0*pow(c,6)+16704.0*pow(c,4)-3154.0*pow(c,2)+107.0)
-                /
-            (4096.0*pow(s,13)*(6.0*pow(c,2)-1.0));
-
-        return A;
-    }
-
-    double A44 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            (80.0*pow(c,6)-816.0*pow(c,4)+1338.0*pow(c,2)-197.0)
-                /
-            (1536.0*pow(s,10)*(6.0*pow(c,2)-1.0));
-
-        return A;
-    }
-
-    double A55 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double A = 
-            -(2880.0*pow(c,10)-72480.0*pow(c,8)+324000.0*pow(c,6)-432000.0*pow(c,4)+163470.0*pow(c,2)-16245.0)
-                /
-            (61440.0*pow(s,11)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0));
-
-        return A;
-    }
-
-    double B22 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (2.0*pow(c,2)+1)*c
-                /
-            (4.0*pow(s,3));
-
-        return B;
-    }
-
-    double B24 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (272.0*pow(c,8)-504.0*pow(c,6)-192.0*pow(c,4)+322.0*pow(c,2)+21.0)*c
-                /
-            (384.0*pow(s,9));
-
-        return B;
-    }
-
-    double B33 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (8.0*pow(c,6)+1.0)*3.0
-                /
-            (64.0*pow(s,6));
-
-        return B;
-    }
-
-    double B33k (double h, double k) // d B33 / d k
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double sk = h*s;
-        double ck = h*c;
-
-        double B = 
-            9.0*pow(c,5)*ck/(4.0*pow(s,6))- 
-            (9.0*(8.0*pow(c,6)+1.0))/(32.0*pow(s,7))*sk;
-
-        return B;
-    }
-
-    double B35 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8)-21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81)
-                /
-            (12288.0*pow(s,12)*(6.0*pow(c,2)-1.0));
-
-        return B;
-    }
-
-    double B35k (double h, double k) // d B35 / d k
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double sk = h*s;
-        double ck = h*c;
-
-        double B = 
-            (14.0*88128.0*pow(c,13)*ck-12.0*208224.0*pow(c,11)*ck
-            +10.0*70848.0*pow(c,9)*ck+8.0*54000.0*pow(c,7)*ck
-            -6.0*21816.0*pow(c,5)*ck+4.0*6264.0*pow(c,3)*ck
-            -2.0*54.0*c*ck)
-            /(12288.0*pow(s,12)*(6.0*pow(c,2)-1.0))
-            -(88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8) 
-            -21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81.0)*12.0 
-            /(12288.0*pow(s,13)*(6.0*pow(c,2)-1.0))*sk 
-            -(88128.0*pow(c,14)-208224.0*pow(c,12)+70848.0*pow(c,10)+54000.0*pow(c,8) 
-            -21816.0*pow(c,6)+6264.0*pow(c,4)-54.0*pow(c,2)-81.0)*12.0*c*ck 
-            /(12288.0*pow(s,12)*pow((6.0*pow(c,2)-1.0),2));
-
-        return B;
-    }
-
-    double B44 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (768.0*pow(c,10)-448.0*pow(c,8)-48.0*pow(c,6)+48.0*pow(c,4)+106.0*pow(c,2)-21.0)*c
-                /
-            (384.0*pow(s,9)*(6.0*pow(c,2)-1.0));
-
-        return B;
-    }
-
-    double B55 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double B = 
-            (192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10)-7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
-                /
-            (12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0));
-
-        return B;
-    }
-
-    double B55k (double h, double k) // d B55 / d k
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double sk = h*s;
-        double ck = h*c;
-
-        double B = 
-            (16.0*192000.0*pow(c,15)*ck-14.0*262720.0*pow(c,13)*ck
-            +12.0*83680.0*pow(c,11)*ck+10.0*20160.0*pow(c,9)*ck
-            -8.0*7280.0*pow(c,7)*ck+6.0*7160.0*pow(c,5)*ck
-            -4.0*1800.0*pow(c,3)*ck-2.0*1050.0*pow(c,1)*ck)
-            /(12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))
-            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
-            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)*10.0
-            /(12288.0*pow(s,11)*(6.0*pow(c,2)-1.0)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))*sk
-            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
-            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
-            *12.0*c*ck 
-            /(12288.0*pow(s,10)*pow((6.0*pow(c,2)-1.0),2)*(8.0*pow(c,4)-11.0*pow(c,2)+3.0))
-            -(192000.0*pow(c,16)-262720.0*pow(c,14)+83680.0*pow(c,12)+20160.0*pow(c,10) 
-            -7280.0*pow(c,8)+7160.0*pow(c,6)-1800.0*pow(c,4)-1050.0*pow(c,2)+225.0)
-            *(32.0*pow(c,3)-22.0*c)*ck
-            /(12288.0*pow(s,10)*(6.0*pow(c,2)-1.0)*pow((8.0*pow(c,4)-11.0*pow(c,2)+3.0),2));
-
-        return B;
-    }
-
-    double C1 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double C = 
-            (8.0*pow(c,4)-8.0*pow(c,2)+9.0)
-                /
-            (8.0*pow(s,4));
-
-        return C;
-    }
-
-    double C1k (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double sk = h*s;
-        double ck = h*c;
-
-        double C = 
-            (4.0*8.0*pow(c,3)*ck-2.0*8.0*c*ck)/(8.0*pow(s,4))
-            -(8.0*pow(c,4)-8.0*pow(c,2)+9.0)*4.0*sk/(8.0*pow(s,5));
-
-        return C;
-    }
-
-    double C2 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double C = 
-            (3840.0*pow(c,12)-4096.0*pow(c,10) + 2592.0*pow(c,8)-1008.0*pow(c,6)+5944.0*pow(c,4)-1830.0*pow(c,2)+147.0) // - 2592
-                /
-            (512.0*pow(s,10)*(6.0*pow(c,2)-1.0));
-
-        return C;
-    }
-
-    double C2k (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double sk = h*s;
-        double ck = h*c;
-
-        double C = 
-            (12.0*3840.0*pow(c,11)*ck-10.0*4096.0*pow(c,9)*ck
-            +8.0*2592.0*pow(c,7)*ck-6.0*1008.0*pow(c,5)*ck+
-            4.0*5944.0*pow(c,3)*ck-2.0*1830.0*c*ck)
-            /(512.0*pow(s,10)*(6.0*pow(c,2)-1.0))
-            -(3840.0*pow(c,12)-4096.0*pow(c,10)+2592.0*pow(c,8)-1008.0*pow(c,6)+
-            5944.0*pow(c,4)-1830.0*pow(c,2)+147.0)*10.0*sk/
-            (512.0*pow(s,11)*(6.0*pow(c,2)-1.0))
-            -(3840.0*pow(c,12)-4096.0*pow(c,10)+2592.0*pow(c,8)-1008.0*pow(c,6)+
-            5944.0*pow(c,4)-1830.0*pow(c,2)+147.0)*12.0*c*ck
-            /(512.0*pow(s,10)*pow((6.0*pow(c,2)-1.0),2));
-
-        return C;
-    }
-
-    double C3 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double C = 
-            (-1.0)
-                /
-            (4.0*s*c);
-
-        return C;
-    }
-
-    double C4 (double h, double k)
-    {
-        double s = sinh(k*h);
-        double c = cosh(k*h);
-
-        double C = 
-            (12.0*pow(c,8)+36.0*pow(c,6)-162.0*pow(c,4)+141.0*pow(c,2)-27.0)
-                /
-            (192.0*c*pow(s,9));
-
-        return C;
-    }
-
-    int StokesVNR (double H, double d, double T, double* kOut, double* LambdaOut, double* f1Out, double* f2Out )
-    {
-        double f1 = 1;
-        double f2 = 1;
-
-        double k = 2.0*PII/(sqrt(G*d)*T);
-        double Lambda = H/2.0*k;
-
-        double Bmat11, Bmat12, Bmat21, Bmat22;
-        double b33, b35, b55, b33k, b35k, b55k;
-        double c1, c2, c1k, c2k;
-        double kPr, LambdaPr;
-
-        int n = 0;
-
-        while ( (fabs(f1)>1.0e-12 || fabs(f2)>1.0e-12) && n<10000 )
-        {
-            b33 = B33(d, k);
-            b35 = B35(d, k);
-            b55 = B55(d, k);
-            c1 = C1(d, k);
-            c2 = C2(d, k);
-
-            b33k = B33k(d, k);
-            b35k = B35k(d, k);
-            b55k = B55k(d, k);
-            c1k = C1k(d, k);
-            c2k = C2k(d, k);
-
-            Bmat11 = 2.0*PII/(pow(k,2)*d)*(Lambda+pow(Lambda,3)*b33+pow(Lambda,5)*(b35+b55))
-                    -2.0*PII/(k*d)*(pow(Lambda,3)*b33k+pow(Lambda,5)*(b35k+b55k));
-
-            Bmat12 = -2.0*PII/(k*d)*
-                     (1.0+3.0*pow(Lambda,2)*b33+5.0*pow(Lambda,4)*(b35+b55));
-
-            Bmat21 = -d/(2.0*PII)*tanh(k*d)*(1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2)
-                    -k*d/(2.0*PII)*(1.0-pow((tanh(k*d)),2))*d*
-                    (1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2)
-                    -k*d/(2.0*PII)*tanh(k*d)
-                    *(pow(Lambda,2)*c1k+pow(Lambda,4)*c2k);
-
-            Bmat22 = -k*d/(2.0*PII)*tanh(k*d)
-                     *(2.0*Lambda*c1+4.0*pow(Lambda,3)*c2);
-
-            f1 = PII*H/d-2.0*PII/(k*d)*(Lambda+pow(Lambda,3)*b33+pow(Lambda,5)*(b35+b55));
-
-            f2 = (2.0*PII*d)/(G*pow(T,2))-k*d/(2.0*PII)*tanh(k*d)
-                *(1.0+pow(Lambda,2)*c1+pow(Lambda,4)*c2);
-
-            LambdaPr = (f1*Bmat21-f2*Bmat11)/(Bmat11*Bmat22-Bmat12*Bmat21);
-            kPr = (f2*Bmat12-f1*Bmat22)/(Bmat11*Bmat22-Bmat12*Bmat21);
-
-            Lambda += LambdaPr;
-            k += kPr;
-
-            n++;
-        }
-
-        *kOut = k;
-        *LambdaOut = Lambda;
-
-        *f1Out = fabs(f1);
-        *f2Out = fabs(f2);
-
-        return 1;
-    }
-
-    double eta (double h, double kx, double ky, double lambda, double T, double x, double y, double t, double phase)
-    {
-        double k = sqrt(kx*kx + ky*ky);
-
-        double b22 = B22(h, k);
-        double b24 = B24(h, k);
-        double b33 = B33(h, k);
-        double b35 = B35(h, k);
-        double b44 = B44(h, k);
-        double b55 = B55(h, k);
-
-        double amp1 = lambda/k;
-        double amp2 = (b22*pow(lambda,2)+b24*pow(lambda,4))/k;
-        double amp3 = (b33*pow(lambda,3)+b35*pow(lambda,5))/k;
-        double amp4 = b44*pow(lambda,4)/k;
-        double amp5 = b55*pow(lambda,5)/k;
-
-        double theta = kx*x + ky*y - 2.0*PII/T*t + phase;
-
-        double C = amp1*cos(theta) 
-		 + amp2*cos(2*theta)
-                 + amp3*cos(3*theta) 
-		 + amp4*cos(4*theta)
-            	 + amp5*cos(5*theta);
-
-        return C;
-    }   
-
-    double U (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z)
-    {
-        double k = sqrt(kx*kx + ky*ky);
-
-        double a11 = A11(d, k);
-        double a13 = A13(d, k);
-        double a15 = A15(d, k);
-        double a22 = A22(d, k);
-        double a24 = A24(d, k);
-        double a33 = A33(d, k);
-        double a35 = A35(d, k);
-        double a44 = A44(d, k);
-        double a55 = A55(d, k);
-
-        double a1u=2.0*PII/T/k*(lambda*a11+pow(lambda,3)*a13+pow(lambda,5)*a15);
-        double a2u=2.0*2.0*PII/T/k*(pow(lambda,2)*a22+pow(lambda,4)*a24);
-        double a3u=3.0*2.0*PII/T/k*(pow(lambda,3)*a33+pow(lambda,5)*a35);
-        double a4u=4.0*2.0*PII/T/k*(pow(lambda,4)*a44);
-        double a5u=5.0*2.0*PII/T/k*(pow(lambda,5)*a55);
-
-        double velU = 0;
-
-        double theta = kx*x + ky*y - 2.0*PII/T*t + phase;
-
-        velU = a1u*cosh(k*z)*cos(theta)
-                 + a2u*cosh(2.0*k*z)*cos(2.0*(theta))
-                 + a3u*cosh(3.0*k*z)*cos(3.0*(theta))
-                 + a4u*cosh(4.0*k*z)*cos(4.0*(theta))
-                 + a5u*cosh(5.0*k*z)*cos(5.0*(theta));
-
-        return velU;
-    }
-
-    double W (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z)
-    {
-        double k = sqrt(kx*kx + ky*ky);
-
-        double a11 = A11(d, k);
-        double a13 = A13(d, k);
-        double a15 = A15(d, k);
-        double a22 = A22(d, k);
-        double a24 = A24(d, k);
-        double a33 = A33(d, k);
-        double a35 = A35(d, k);
-        double a44 = A44(d, k);
-        double a55 = A55(d, k);
-
-        double a1u=2.0*PII/T/k*(lambda*a11+pow(lambda,3)*a13+pow(lambda,5)*a15);
-        double a2u=2.0*2.0*PII/T/k*(pow(lambda,2)*a22+pow(lambda,4)*a24);
-        double a3u=3.0*2.0*PII/T/k*(pow(lambda,3)*a33+pow(lambda,5)*a35);
-        double a4u=4.0*2.0*PII/T/k*(pow(lambda,4)*a44);
-        double a5u=5.0*2.0*PII/T/k*(pow(lambda,5)*a55);
-
-        double velV = 0;
-
-        double theta = kx*x+ky*y-2.0*PII/T*t+phase;
-
-        velV = a1u*sinh(k*z)*sin(theta)
-                + a2u*sinh(2.0*k*z)*sin(2.0*(theta))
-                + a3u*sinh(3.0*k*z)*sin(3.0*(theta))
-                + a4u*sinh(4.0*k*z)*sin(4.0*(theta))
-                + a5u*sinh(5.0*k*z)*sin(5.0*(theta));
-
-        return velV;
-    }
-}
-
-namespace BoussinesqFun
-{
-    #define PII 3.1415926535897932384626433832795028
-    #define G 9.81 
-    
-    double eta (double H, double h, double x, double y, double theta, double t, double X0)
-    {
-        double C = sqrt(G*(H+h));
-        double ts = 3.5*h/sqrt(H/h);
-        double aux = sqrt(3.0*H/(4.0*h))/h;
-        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
-
-        double sup = H * 1.0/pow(cosh( aux * Xa ),2);
-
-        return sup;
-    }
-
-    double Deta1 (double H, double h, double x, double y, double theta, double t, double X0)
-    {
-        double C = sqrt(G*(H+h));
-        double ts = 3.5*h/sqrt(H/h);
-        double aux = sqrt(3.0*H/(4.0*h))/h;
-        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
-
-        double deta = 8.0*aux*h * exp(2.0*aux*Xa) * (1.0-exp(2.0*aux*Xa)) 
-                        / pow(1.0+exp(2.0*aux*Xa),3);
-
-        return deta;
-    }
-
-    double Deta2 (double H, double h, double x, double y, double theta, double t, double X0)
-    {
-        double C = sqrt(G*(H+h));
-        double ts = 3.5*h/sqrt(H/h);
-        double aux = sqrt(3.0*H/(4.0*h))/h;
-        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
-
-        double deta = 16.0*pow(aux,2)*h * exp(2.0*aux*Xa) * (exp(4.0*aux*Xa)
-                        - 4.0*exp(2.0*aux*Xa)+1.0) / pow(1.0+exp(2.0*aux*Xa),4);
-
-        return deta;
-    }
-
-    double Deta3 (double H, double h, double x, double y, double theta, double t, double X0)
-    {
-        double C = sqrt(G*(H+h));
-        double ts = 3.5*h/sqrt(H/h);
-        double aux = sqrt(3.0*H/(4.0*h))/h;
-        double Xa = -C * t + ts - X0 + x * cos(theta) + y * sin(theta);
-
-        double deta = -32.0*pow(aux,3)*h * exp(2.0*aux*Xa) * (exp(6.0*aux*Xa)
-                        - 11.0*exp(4.0*aux*Xa) + 11.0*exp(2.0*aux*Xa)-1.0) / pow(1.0+exp(2.0*aux*Xa),5);
-
-        return deta;
-    }
-
-    double U (double H, double h, double x, double y, double theta, double t, double X0, double z)
-    {
-        double C = sqrt(G*(H+h));
-        double etaSolit = eta( H, h, x, y, theta, t, X0);
-        double Detas2 = Deta2( H, h, x, y, theta, t, X0);
-
-        double vel = C*etaSolit/h
-                *(1.0 - etaSolit/(4.0*h) +
-                pow(h,2)/(3.0*etaSolit)
-                *(1.0 - 3.0/2.0*pow(z/h,2))
-                *Detas2);
-
-        return vel;
-    }
-
-    double W (double H, double h, double x, double y, double theta, double t, double X0, double z)
-    {
-        double C = sqrt(G*(H+h));
-        double etaSolit = eta( H, h, x, y, theta, t, X0);
-        double Detas1 = Deta1( H, h, x, y, theta, t, X0);
-        double Detas3 = Deta3( H, h, x, y, theta, t, X0);
-
-        double vel = -C*z/h
-                *((1.0 - etaSolit/(2.0*h))*Detas1 +
-                pow(h,2)/3.0
-                *(1.0 - 1.0/2.0*pow(z/h,2))
-                *Detas3);
-
-        return vel;
-    }
-}
-
diff --git a/integration/genAbs/common/waveFun.H b/integration/genAbs/common/waveFun.H
deleted file mode 100644
index 53406b64c5..0000000000
--- a/integration/genAbs/common/waveFun.H
+++ /dev/null
@@ -1,95 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#ifndef waveFun_H
-#define waveFun_H
-
-namespace otherFun
-{
-    double interpolation (double x1, double x2, double y1, double y2, double xInt);
-}
-
-namespace StokesIFun
-{
-    double waveLength (double h, double T);
-    double eta (double H, double Kx, double x, double Ky, double y, double omega, double t, double phase);
-    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
-    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
-}
-
-namespace StokesIIFun
-{
-    double eta (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase);
-    double U (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
-    double W (double H, double h, double Kx, double x, double Ky, double y, double omega, double t, double phase, double z);
-    double timeLag (double H, double h, double Kx, double x, double Ky, double y, double T, double phase);
-}
-
-namespace Elliptic
-{
-    void ellipticIntegralsKE (double m, double* K, double* E);
-    void JacobiSnCnDn (double u, double m, double* Sn, double* Cn, double* Dn);
-}
-
-namespace cnoidalFun
-{
-    double eta (double H, double m, double kx, double ky, double T, double x, double y, double t);
-    double etaCnoidal1D (double H, double m, double t, double T, double K, double E);
-    double etaMeanSq (double H, double m, double T);
-    double d1EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
-    double d2EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
-    double d3EtaDx (double H, double m, double uCnoidal, double L, double K, double E);
-    int calculations (double H, double d, double T, double* mOut, double* LOut);
-    double U (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z);
-    double W (double H, double h, double m, double kx, double ky, double T, double x, double y, double t, double z);
-}
-
-namespace stokesVFun
-{
-    double A11 (double h, double k);
-    double A13 (double h, double k);
-    double A15 (double h, double k);
-    double A22 (double h, double k);
-    double A24 (double h, double k);
-    double A33 (double h, double k);
-    double A35 (double h, double k);
-    double A44 (double h, double k);
-    double A55 (double h, double k);
-    double B22 (double h, double k);
-    double B24 (double h, double k);
-    double B33 (double h, double k);
-    double B33k (double h, double k);
-    double B35 (double h, double k);
-    double B35k (double h, double k);
-    double B44 (double h, double k);
-    double B55 (double h, double k);
-    double B55k (double h, double k);
-    double C1 (double h, double k);
-    double C1k (double h, double k);
-    double C2 (double h, double k);
-    double C2k (double h, double k);
-    double C3 (double h, double k);
-    double C4 (double h, double k);
-    int StokesVNR (double H, double d, double T, double* kOut, double* LambdaOut, double* f1Out, double* f2Out );
-    int StokesExtendedSolver (double H, double d, double T, double* kOut, double* LambdaOut, double* LambdaErrOut );
-    double eta (double h, double kx, double ky, double lambda, double T, double x, double y, double t, double phase);
-    double U (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z);
-    double W (double d, double kx, double ky, double lambda, double T, double x, double y, double t, double phase, double z);
-}
-
-namespace BoussinesqFun
-{
-    double eta (double H, double h, double x, double y, double theta, double t, double X0);
-    double Deta1 (double H, double h, double x, double y, double theta, double t, double X0);
-    double Deta2 (double H, double h, double x, double y, double theta, double t, double X0);
-    double Deta3 (double H, double h, double x, double y, double theta, double t, double X0);
-    double U (double H, double h, double x, double y, double theta, double t, double X0, double z);
-    double W (double H, double h, double x, double y, double theta, double t, double X0, double z);
-}
-
-#endif
diff --git a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
deleted file mode 100644
index ee86b05170..0000000000
--- a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
+++ /dev/null
@@ -1,339 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#include "IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(p, iF),
-    nPaddles_(1),
-    leftORright_(-1),
-    waterDepth_(-1),
-    initialDepthABS_(-1),
-    RealwaterDepth_(-1),
-    allCheck_(true),
-    waveDictName_("IHWavesDict")
-{}
-
-
-Foam::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-(
-    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    nPaddles_(ptf.nPaddles_),
-    leftORright_(ptf.leftORright_),    
-    waterDepth_(ptf.waterDepth_),
-    initialDepthABS_(ptf.initialDepthABS_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    allCheck_(ptf.allCheck_),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    nPaddles_(dict.lookupOrDefault<label>("nPaddles", 1)),
-    leftORright_(dict.lookupOrDefault<scalar>("leftORright",-1)),
-    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1 )),
-    initialDepthABS_(dict.lookupOrDefault<scalar>("initialDepthABS",-1)),
-    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1)),
-    allCheck_(dict.lookupOrDefault<bool>("allCheck", true )),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict"))
-{}
-
-
-Foam::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-(
-    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf
-)
-:
-    fixedValueFvPatchField<vector>(ptf),
-    nPaddles_(ptf.nPaddles_),
-    leftORright_(ptf.leftORright_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepthABS_(ptf.initialDepthABS_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    allCheck_(ptf.allCheck_),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-(
-    const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField& ptf,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(ptf, iF),
-    nPaddles_(ptf.nPaddles_),
-    leftORright_(ptf.leftORright_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepthABS_(ptf.initialDepthABS_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    allCheck_(ptf.allCheck_),
-    waveDictName_(ptf.waveDictName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Variables & constants
-    const vector cMin = gMin(patch().patch().localPoints());
-    const vector cMax = gMax(patch().patch().localPoints());
-    const vector cSpan = cMax - cMin;
-    const scalar zSpan = cSpan[2];
-    scalar dMin = 0.0;
-    scalar dSpan = 0.0;
-    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
-    const volScalarField& alpha = 
-        db().lookupObject<volScalarField>(alphaName());
-    const volVectorField& U = db().lookupObject<volVectorField>("U");
-    const fvMesh& mesh = alpha.mesh();
-    const word& patchName = this->patch().name();
-    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
-    const label nF = patch().faceCells().size();
-    const scalarField alphaCell = 
-        alpha.boundaryField()[patchID].patchInternalField();
-    const vectorField UCell = U.boundaryField()[patchID].patchInternalField();
-    scalarField patchUc = Foam::scalarField(nF, 0.0);
-    scalarField patchVc = Foam::scalarField(nF, 0.0);
-    scalarField patchWc = Foam::scalarField(nF, 0.0);
-    const scalarField patchHeight = patch().Cf().component(2);
-    const scalar g = 9.81;
-
-    // Calculate Z bounds of the faces
-    scalarField zSup, zInf;
-    faceBoundsZ( &zSup, &zInf );
-
-    // Define dictionary
-    IOdictionary IHWavesDict
-    (
-        IOobject
-        (
-            waveDictName_,
-            this->db().time().constant(),
-            this->db(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        )
-    );
-
-    scalar currTime = this->db().time().value();
-
-    // Check for errors - Just the first time
-    if (allCheck_)
-    {
-        waterDepth_ = (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1.0));
-
-	initialDepthABS_ = 
-	    (IHWavesDict.lookupOrDefault<scalar>("initialDepthABS",-1.0));
-
-        // Check if the value of nPaddles is correct for the number of columns
-        if (nPaddles_ < 1)
-        {
-            FatalError << "Check nPaddles value." << exit(FatalError);
-        }
-
-        if ( nPaddles_ > 1 )
-        {
-            nPaddles_ = decreaseNPaddles( nPaddles_, patchD, dMin, dSpan );
-            reduce(nPaddles_, minOp<label>());
-        }
-    }
-
-    // Grouping part
-    labelList faceGroup = Foam::labelList(nF, 0);
-    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
-    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
-    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
-
-    for (label i=0; i<nPaddles_; i++)
-    {
-        // Breakpoints, X & Y centre of the paddles
-        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
-        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
-	    + cSpan[0]/(nPaddles_)*i;
-        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_) 
-	    + cSpan[1]/(nPaddles_)*i;
-    }
-
-    forAll(patchD, patchCells) 
-    {
-        for (label i=0; i<nPaddles_; i++)
-        {
-            if ( (patchD[patchCells]>=dBreakPoints[i])
-                && (patchD[patchCells]<dBreakPoints[i+1]) )
-            {
-                faceGroup[patchCells] = i+1;
-                continue;
-            }
-        }      
-    }
-
-    if (allCheck_)
-    {
-	if (RealwaterDepth_ == -1.0)
-	{
-	    if (waterDepth_ == -1.0)
-	    {
-	        RealwaterDepth_ = 
-		calcWL( alphaCell, faceGroup, zSpan )[0];
-
-		if (initialDepthABS_ !=-1.0)
-		{
-		    RealwaterDepth_ = RealwaterDepth_
-		        + initialDepthABS_;
-		}
-	    }
-	    else if ( waterDepth_ != -1.0 )
-	    {
-	        RealwaterDepth_ = waterDepth_;
-	    }
-	}
-
-        allCheck_ = false;
-    }
-
-    // Calculate water measured levels
-    scalarList measuredLevelsABS = calcWL( alphaCell, faceGroup, zSpan );
-
-    if (initialDepthABS_ !=-1.0)
-    {
-    	forAll(measuredLevelsABS, iterMin)
-    	{
-            measuredLevelsABS[iterMin] = measuredLevelsABS[iterMin] 
-	        + initialDepthABS_;
-    	}
-    }
-
-    forAll(patchHeight, cellIndex)    
-    {
-    	if ( zInf[cellIndex] >= measuredLevelsABS[faceGroup[cellIndex]-1] )
-	{
-	    patchUc[cellIndex] = 0.0;
-	    patchVc[cellIndex] = 0.0;
-             patchWc[cellIndex] = 0.0;
-	}
-	else 
-	{
-	    patchUc[cellIndex] = 
-	        ( -measuredLevelsABS[faceGroup[cellIndex]-1]
-		+ RealwaterDepth_ )
-		* sqrt(g/measuredLevelsABS[faceGroup[cellIndex]-1]);
-
-	    patchUc[cellIndex] = leftORright_ * patchUc[cellIndex];
-            patchVc[cellIndex] = 0.0;
-            patchWc[cellIndex] = 0.0;
-	}
-    }
-
-    const vectorField n1 = Foam::vectorField(nF, vector(1.0, 0.0, 0.0));
-    const vectorField n2 = Foam::vectorField(nF, vector(0.0, 1.0, 0.0));
-    const vectorField n3 = Foam::vectorField(nF, vector(0.0, 0.0, 1.0));
-
-    operator == (n1*patchUc + n2*patchVc + n3*patchWc);
-
-    fixedValueFvPatchField<vector>::updateCoeffs();
-}
-
-
-void Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField::
-write(Ostream& os) const
-{
-    fvPatchField<vector>::write(os);
-
-    os.writeKeyword("waveDictName") << waveDictName_ << 
-        token::END_STATEMENT << nl;
-
-    os.writeKeyword("leftORright") << leftORright_ << 
-        token::END_STATEMENT << nl;
-
-    os.writeKeyword("nPaddles") << nPaddles_ << token::END_STATEMENT << nl;
-
-    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ << 
-        token::END_STATEMENT << nl;
-
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-   makePatchTypeField
-   (
-       fvPatchVectorField,
-       IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-   );
-}
-
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H b/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
deleted file mode 100644
index 6fea88efe7..0000000000
--- a/integration/genAbs/waveAbsorption/IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.H
+++ /dev/null
@@ -1,199 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-
-Description
-    Wave absorption boundary condition based on shallow water theory and on a
-    3D approach. Works both in 2D and 3D and for waves out of the shallow water
-    regime.
-
-    Example of the boundary condition specification:
-    @verbatim
-    outlet
-    {
-        type            IH_3D_3DAbsorption_InletVelocityV2;
-        nPaddles        1;  
-        value           uniform (0 0 0);
-	leftORright	-1.0;
-    }
-    @endverbatim
-
-    \heading Function object usage
-    \table
-        Property     | Description             | Required    | Default value
-        type         | type:    IH_3D_3DAbsorption_InletVelocityV2 | yes
-        nPaddles     | number of wavepaddles for absorption | yes | 1  
-	leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1
-    \endtable
-
-Note
-    -
-
-SourceFiles
-    IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#ifndef IH_3D_3DAbsorption_InletVelocityFvPatchVectorField_H
-#define IH_3D_3DAbsorption_InletVelocityFvPatchVectorField_H
-
-#include "fixedValueFvPatchFields.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-/*---------------------------------------------------------------------------*\
-               Class IH_3D_3DAbsorption_InletVelocityFvPatch Declaration
-\*---------------------------------------------------------------------------*/
-
-class IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-:
-    public fixedValueFvPatchVectorField
-{
-    // Private data
-
-        //- Number of paddles
-        label nPaddles_;
- 
-        //Aborption: Left(1) or Right(-1)
-	scalar leftORright_;
-
-        //- Theoretical Water depth (meters)
-        scalar waterDepth_;        
-
-        //- Numerical Water depth (meters)
-        scalar RealwaterDepth_;
-
-        //- BC check and read values just the first time
-        bool allCheck_;
-
-        //- Initial Depth on BC for absorption (meters)
-        scalar initialDepthABS_;
-
-        //- Dictionary name
-        word waveDictName_;
-
-public:
-
-   //- Runtime type information
-   TypeName("IH_3D_3DAbsorption_InletVelocityV2");
-
-
-   // Constructors
-
-        //- Construct from patch and internal field
-        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        //  onto a new patch
-        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        (
-            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&,
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        (
-            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new IH_3D_3DAbsorption_InletVelocityFvPatchVectorField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-        (
-            const IH_3D_3DAbsorption_InletVelocityFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchVectorField> clone
-        (
-            const DimensionedField<vector, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new IH_3D_3DAbsorption_InletVelocityFvPatchVectorField
-                    (*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-
-    // Other common member functions
-        #include "memberFun.H"
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveAbsorption/Make/files b/integration/genAbs/waveAbsorption/Make/files
deleted file mode 100644
index 7f9bff3dfb..0000000000
--- a/integration/genAbs/waveAbsorption/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-IH_3D_3DAbsorption_InletVelocity/IH_3D_3DAbsorption_InletVelocityFvPatchVectorField.C
-
-LIB = $(FOAM_USER_LIBBIN)/libIHwaveAbsorptionV2esi
diff --git a/integration/genAbs/waveAbsorption/Make/options b/integration/genAbs/waveAbsorption/Make/options
deleted file mode 100644
index be8b934220..0000000000
--- a/integration/genAbs/waveAbsorption/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -DOFVERSION=$(OF_VERSION) \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I../common
-
-LIB_LIBS = \
-    -lfiniteVolume
diff --git a/integration/genAbs/waveAbsorption/localMake b/integration/genAbs/waveAbsorption/localMake
deleted file mode 100755
index aedb1c100c..0000000000
--- a/integration/genAbs/waveAbsorption/localMake
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-if [ $WM_PROJECT == "foam" ]; then
-    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
-else
-    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
-fi
-
-#IHC_dbg
-echo $ofversion
-#----
-
-export OF_VERSION=$ofversion
-
-wclean
-
-wmake libso
-
-if (( $? )) ; then 
-    echo "\n\nIH Wave absorption boundary conditions (V2.0) compilation failed"
-    exit; else
-    echo -e "\n\nIH Wave absorption boundary conditions (V2.0) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
-fi
-
-wclean
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
deleted file mode 100644
index 51052f0b79..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
+++ /dev/null
@@ -1,460 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#include "IH_Waves_InletAlphaFvPatchScalarField.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "Random.H"
-
-#include "waveFun.H"
-
-//C++
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include "SquareMatrix.H"
-#include "vector.H"
-#include "Matrix.H"
-
-#include "mpi.h"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::
-IH_Waves_InletAlphaFvPatchScalarField::
-IH_Waves_InletAlphaFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    wavePeriod_(-1),
-    waveHeight_(-1),
-    waveLength_(-1),
-    waterDepth_(-1),
-    initialDepth_(-1),
-    wavePhase_(3.0*PI()/2.0),
-    lambdaStokesV_(-1),
-    mCnoidal_(-1),
-    nPaddles_(1),
-    tSmooth_(-1),
-    waveDictName_("IHWavesDict"),
-    waveType_("aaa"),
-    waveTheory_("aaa"),
-    allCheck_(true),
-    waveDir_(0),
-    RealwaterDepth_(-1)
-{}
-
-
-Foam::
-IH_Waves_InletAlphaFvPatchScalarField::
-IH_Waves_InletAlphaFvPatchScalarField
-(
-    const IH_Waves_InletAlphaFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_),
-    RealwaterDepth_(ptf.RealwaterDepth_)
-{}
-
-
-Foam::
-IH_Waves_InletAlphaFvPatchScalarField::
-IH_Waves_InletAlphaFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p,iF,dict),
-    wavePeriod_(dict.lookupOrDefault<scalar>("wavePeriod",-1)),
-    waveHeight_(dict.lookupOrDefault<scalar>("waveHeight",-1)),
-    waveLength_(dict.lookupOrDefault<scalar>("waveLength",-1)),
-    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1)),
-    initialDepth_(dict.lookupOrDefault<scalar>("initialDepth",-1)),
-    wavePhase_(dict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0)),
-    lambdaStokesV_(dict.lookupOrDefault<scalar>("lambdaStokesV",-1)),
-    mCnoidal_(dict.lookupOrDefault<scalar>("mCnoidal",-1)),
-    nPaddles_(dict.lookupOrDefault<label>("nPaddles",1)),
-    tSmooth_(dict.lookupOrDefault<scalar>("tSmooth",-1)),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict")),
-    waveType_(dict.lookupOrDefault<word>("waveType","aaa")),
-    waveTheory_(dict.lookupOrDefault<word>("waveTheory","aaa")),
-    allCheck_(dict.lookupOrDefault<bool>("allCheck",true)),
-    waveDir_(dict.lookupOrDefault<scalar>("waveDir",0)),
-    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1))
-{}
-
-
-Foam::
-IH_Waves_InletAlphaFvPatchScalarField::
-IH_Waves_InletAlphaFvPatchScalarField
-(
-    const IH_Waves_InletAlphaFvPatchScalarField& ptf
-)
-:
-    fixedValueFvPatchField<scalar>(ptf),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_),
-    RealwaterDepth_(ptf.RealwaterDepth_)
-{}
-
-
-Foam::
-IH_Waves_InletAlphaFvPatchScalarField::
-IH_Waves_InletAlphaFvPatchScalarField
-(
-    const IH_Waves_InletAlphaFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, iF),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_),
-    RealwaterDepth_(ptf.RealwaterDepth_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::IH_Waves_InletAlphaFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Aux. values
-    scalar auxiliar = 0;
-    scalar auxiliarTotal = 0;
-    scalar X0 = 0;
-    scalarField patchXsolit;
-
-    const vector cMin = gMin(patch().patch().localPoints());
-    const vector cMax = gMax(patch().patch().localPoints());
-    const vector cSpan = cMax - cMin;
-    const scalar zSpan = cSpan[2];
-
-    scalar dMin = 0.0;
-    scalar dSpan = 0.0;
-    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
-
-    // Variables & constants
-    const volScalarField& alpha = 
-        db().lookupObject<volScalarField>(alphaName());
-    const volVectorField& U = db().lookupObject<volVectorField>("U");
-    const fvMesh& mesh = alpha.mesh();
-    const word& patchName = this->patch().name();
-    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
-    const label nF = patch().faceCells().size();
-    labelList cellGroup = Foam::labelList(nF, 1);
-    const scalarField alphaCell = 
-        alpha.boundaryField()[patchID].patchInternalField();
-    const vectorField UCell = U.boundaryField()[patchID].patchInternalField();
-    scalarField patchVOF = alphaCell; 
-    const labelList celdas = patch().faceCells();
-    const scalarField patchHeight = patch().Cf().component(2);
-
-    // Calculate Z bounds of the faces
-    scalarField zSup, zInf;
-    faceBoundsZ( &zSup, &zInf );
-
-    // Wave variables
-    scalar waveOmega;
-    scalarList waveOmegas;
-    scalar waveK;
-    scalarList waveKs;
-    scalar waveAngle;
-    scalar waveKx;
-    scalarList waveKxs;
-    scalar waveKy;
-
-    // Define dictionary
-    IOdictionary IHWavesDict
-    (
-        IOobject
-        (
-            waveDictName_,
-            this->db().time().constant(),
-            this->db(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        )
-    );
-
-    scalar currTime = this->db().time().value();
-
-    // Check for errors - Just the first time
-    if (allCheck_)
-    {
-        waveType_ = (IHWavesDict.lookupOrDefault<word>("waveType","aaa")); 
-        tSmooth_ = (IHWavesDict.lookupOrDefault<scalar>("tSmooth",-1.0));
-	waterDepth_ = 
-	    (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1.0));
-	initialDepth_ = 
-            (IHWavesDict.lookupOrDefault<scalar>("initialDepth",-1.0));
-    	nPaddles_ = (IHWavesDict.lookupOrDefault<label>("nPaddles",1));
-    } 
-
-    // Grouping part
-    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
-    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
-    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
-
-    for (label i=0; i<nPaddles_; i++)
-    {
-        // Breakpoints, X & Y centre of the paddles
-        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
-        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
-	    + cSpan[0]/(nPaddles_)*i;
-        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_)
-	    + cSpan[1]/(nPaddles_)*i;
-    }
-
-    forAll(patchD, patchCells) 
-    {
-        for (label i=0; i<nPaddles_; i++)
-        {
-            if ( (patchD[patchCells]>=dBreakPoints[i])
-	        && (patchD[patchCells]<dBreakPoints[i+1]) )
-            {
-                cellGroup[patchCells] = i+1;
-                continue;
-            }
-        }      
-    }
-
-    // Check for errors - Just the first time
-    if (allCheck_)
-    {
-	if (RealwaterDepth_ == -1.0)
-	{
-	    if (waterDepth_ == -1.0)
-	    {
-	        RealwaterDepth_ = 
-		    calcWL( alphaCell, cellGroup, zSpan )[0];
-		if (initialDepth_ !=-1.0)
-		{
-			RealwaterDepth_ = RealwaterDepth_
-			    + initialDepth_;
-		}
-	    }
-	    else if ( waterDepth_ != -1.0 )
-	    {
-		RealwaterDepth_ = waterDepth_;
-	    }
-	}
-    }
-
-    if (allCheck_)
-    {
-	waveTheory_ = (IHWavesDict.lookupOrDefault<word>("waveTheory","aaa"));
-    	waveHeight_ = (IHWavesDict.lookupOrDefault<scalar>("waveHeight",-1));
-    	wavePeriod_ = (IHWavesDict.lookupOrDefault<scalar>("wavePeriod",-1));
-    	waveDir_ = (IHWavesDict.lookupOrDefault<scalar>("waveDir",0));
-    	wavePhase_ = 
-	    (IHWavesDict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0));
-	
-	if ( waveType_ == "regular" )
-	{
-	   waveLength_ = StokesIFun::waveLength (RealwaterDepth_, wavePeriod_);
-	}
-    }
-
-    if ( waveType_ == "regular" )
-    {
-        waveOmega = (2.0*PI())/wavePeriod_;
-        waveK = 2.0*PI()/waveLength_;
-
-        waveAngle = waveDir_*PI()/180.0;
-        waveKx = waveK*cos(waveAngle);
-        waveKy = waveK*sin(waveAngle);
-    }
-    else if ( waveType_ == "solitary" )
-    {
-        waveAngle = waveDir_*PI()/180.0;
-        patchXsolit = patch().Cf().component(0)*cos(waveAngle) 
-	    + patch().Cf().component(1)*sin(waveAngle);
-        X0 = gMin(patchXsolit);
-    }
-
-    scalar timeMult = 1.0;
-
-    if ( tSmooth_ > 0 && currTime < tSmooth_ )
-    {
-	timeMult = currTime/tSmooth_;
-    }
-
-    if (allCheck_)
-    {
-        if ( waveType_ == "regular" )
-        {
-            #include "checkInputErrorsRegular.H"
-        }
-        else if ( waveType_ == "solitary" )
-        {
-            #include "checkInputErrorsSolitary.H"
-        }
-        else
-        {
-            FatalError << "Wave type not supported, use:\n" 
-	        << "regular, solitary" << exit(FatalError);
-        }
-	allCheck_ = false; 
-    }
-
-    scalarList calculatedLevel (nPaddles_,0.0);
-
-    if ( waveType_ == "regular" )
-    {
-	if (waveDir_ == 0)
-	{
-           #include "calculatedLevelRegularNormal.H"
-	}
-	else
-	{
-	   #include "calculatedLevelRegular.H"
-	}
-    }
-    else if ( waveType_ == "solitary" )
-    {
-        #include "calculatedLevelSolitary.H"
-    }
-
-    forAll(patchHeight, cellIndex)    
-    {
-	auxiliarTotal = 0;
-	auxiliar = 0;
-	
-	if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-	{
-	    patchVOF[cellIndex] = 1.0;
-	}
-	else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-	{
-	    patchVOF[cellIndex] = 0.0;
-	}
-	else 
-	{
-	    auxiliar = calculatedLevel[cellGroup[cellIndex]-1]
-	        - zInf[cellIndex];
-	    auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-	    auxiliarTotal = auxiliar/auxiliarTotal;
-	    patchVOF[cellIndex] = auxiliarTotal;
-	}
-    }
-
-    operator == (patchVOF);
-
-    fixedValueFvPatchField<scalar>::updateCoeffs();
-}
-
-
-void Foam::IH_Waves_InletAlphaFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-
-    os.writeKeyword("waveDictName") << waveDictName_ << 
-        token::END_STATEMENT << nl;
-
-    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ << 
-        token::END_STATEMENT << nl;
-
-    os.writeKeyword("initialDepth") << initialDepth_ << 
-        token::END_STATEMENT << nl;
-
-    writeEntry("value", os);
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-   makePatchTypeField
-   (
-       fvPatchScalarField,
-       IH_Waves_InletAlphaFvPatchScalarField
-   );
-
-}
-
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H b/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
deleted file mode 100644
index 0e181a0fff..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.H
+++ /dev/null
@@ -1,226 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::IH_Waves_InletAlphaFvPatchScalarField
-
-Description
-    Describes a volumetric/mass flow normal Scalar boundary condition by its
-    magnitude as an integral over its area.
-
-    The basis of the patch (volumetric or mass) is determined by the
-    dimensions of the flux, phi.
-    The current density is used to correct the Alpha when applying the
-    mass basis.
-
-    Example of the boundary condition specification:
-    @verbatim
-    inlet
-    {
-        type            IH_Waves_InletAlphaV2;
-        waveDict        IHWavesDict;
-    }
-    @endverbatim
-
-    \heading Function object usage
-    \table
-        Property     | Description             | Required    | Default value
-        type         | type:    IH_Waves_InletAlphaV2 | yes
-        waveDict     | Dictionary where variables for generation/absorption are defined | yes | IHWavesDict  
-    \endtable
-
-Note
-    - 
-
-SourceFiles
-    IH_Waves_InletAlphaFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#ifndef IH_Waves_InletAlphaFvPatchScalarField_H
-#define IH_Waves_InletAlphaFvPatchScalarField_H
-
-#include "fixedValueFvPatchFields.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-/*---------------------------------------------------------------------------*\
-               Class IH_Waves_InletAlphaFvPatch Declaration
-\*---------------------------------------------------------------------------*/
-
-class IH_Waves_InletAlphaFvPatchScalarField
-:
-    public fixedValueFvPatchScalarField
-{
-    // Private data
-
-        //- Wave period (seconds)
-        scalar wavePeriod_;
-
-        //- Wave height (meters)
-        scalar waveHeight_;
-
-        //- Wave length (meters)
-        scalar waveLength_;
-
-        //- Water depth (meters)
-        scalar waterDepth_;
-
-        //- Wave phase (radians)
-        scalar wavePhase_;
-
-        //- Lambda StokesV parameter
-        scalar lambdaStokesV_;
-
-        //- m Cnoidal parameter
-        scalar mCnoidal_;
-
-        //- Number of different paddles (for absorption)
-        label nPaddles_;
-
-        //- Smoothing factor for the wave(s) (seconds)
-        scalar tSmooth_;
-
-        //- Dictionary name
-        word waveDictName_;
-
-        //- Regular or Irregular wave(s)
-        word waveType_;
-
-        //- Name of the theory
-        word waveTheory_;
-
-        //- BC check and read values just the first time
-        bool allCheck_;
-
-        //- Direction of propagation (degrees, from X axis)
-        scalar waveDir_;
-
-        //- Numerical Water depth (meters)
-	scalar RealwaterDepth_;
-
-        //- Initial Depth on BC for wave generation (meters)
-        scalar initialDepth_;
-
-public:
-
-   //- Runtime type information
-   TypeName("IH_Waves_InletAlphaV2");
-
-
-   // Constructors
-
-        //- Construct from patch and internal field
-        IH_Waves_InletAlphaFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        IH_Waves_InletAlphaFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  IH_Waves_InletAlphaFvPatchScalarField
-        //  onto a new patch
-        IH_Waves_InletAlphaFvPatchScalarField
-        (
-            const IH_Waves_InletAlphaFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        IH_Waves_InletAlphaFvPatchScalarField
-        (
-            const IH_Waves_InletAlphaFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new IH_Waves_InletAlphaFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        IH_Waves_InletAlphaFvPatchScalarField
-        (
-            const IH_Waves_InletAlphaFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new IH_Waves_InletAlphaFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-
-    // Other common member functions
-        #include "memberFun.H"
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
deleted file mode 100644
index a25bf8c254..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
+++ /dev/null
@@ -1,495 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#include "IH_Waves_InletVelocityFvPatchVectorField.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-
-#include "waveFun.H"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include "SquareMatrix.H"
-#include "vector.H"
-#include "Matrix.H"
-
-#include "mpi.h"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::
-IH_Waves_InletVelocityFvPatchVectorField::
-IH_Waves_InletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(p, iF),
-    wavePeriod_(-1),
-    waveHeight_(-1),
-    waveLength_(-1),
-    waterDepth_(-1),
-    initialDepth_(-1),
-    RealwaterDepth_(-1),
-    wavePhase_(3.0*PI()/2.0),
-    lambdaStokesV_(-1),
-    mCnoidal_(-1),
-    genAbs_(false),
-    nPaddles_(1),
-    tSmooth_(-1),
-    leftORright_(-1),
-    waveDictName_("IHWavesDict"),
-    waveType_("aaa"),
-    waveTheory_("aaa"),
-    allCheck_(true),
-    waveDir_(0)
-{}
-
-
-Foam::
-IH_Waves_InletVelocityFvPatchVectorField::
-IH_Waves_InletVelocityFvPatchVectorField
-(
-    const IH_Waves_InletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    genAbs_(ptf.genAbs_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    leftORright_(ptf.leftORright_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_)
-{}
-
-
-Foam::
-IH_Waves_InletVelocityFvPatchVectorField::
-IH_Waves_InletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    wavePeriod_(dict.lookupOrDefault<scalar>("wavePeriod",-1)),
-    waveHeight_(dict.lookupOrDefault<scalar>("waveHeight",-1)),
-    waveLength_(dict.lookupOrDefault<scalar>("waveLength",-1)),
-    waterDepth_(dict.lookupOrDefault<scalar>("waterDepth",-1)),
-    initialDepth_(dict.lookupOrDefault<scalar>("initialDepth",-1)),
-    RealwaterDepth_(dict.lookupOrDefault<scalar>("RealwaterDepth",-1)),
-    wavePhase_(dict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0)),
-    lambdaStokesV_(dict.lookupOrDefault<scalar>("lambdaStokesV",-1)),
-    mCnoidal_(dict.lookupOrDefault<scalar>("mCnoidal",-1)),
-    genAbs_(dict.lookupOrDefault<bool>("genAbs",false)),
-    nPaddles_(dict.lookupOrDefault<label>("nPaddles",1)),
-    tSmooth_(dict.lookupOrDefault<scalar>("tSmooth",-1)),
-    leftORright_(dict.lookupOrDefault<scalar>("leftORright",-1)),
-    waveDictName_(dict.lookupOrDefault<word>("waveDict","IHWavesDict")),
-    waveType_(dict.lookupOrDefault<word>("waveType","aaa")),
-    waveTheory_(dict.lookupOrDefault<word>("waveTheory","aaa")),
-    allCheck_(dict.lookupOrDefault<bool>("allCheck",true)),
-    waveDir_(dict.lookupOrDefault<scalar>("waveDir",0))
-{}
-
-
-Foam::
-IH_Waves_InletVelocityFvPatchVectorField::
-IH_Waves_InletVelocityFvPatchVectorField
-(
-    const IH_Waves_InletVelocityFvPatchVectorField& ptf
-)
-:
-    fixedValueFvPatchField<vector>(ptf),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    genAbs_(ptf.genAbs_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    leftORright_(ptf.leftORright_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_)
-{}
-
-
-Foam::
-IH_Waves_InletVelocityFvPatchVectorField::
-IH_Waves_InletVelocityFvPatchVectorField
-(
-    const IH_Waves_InletVelocityFvPatchVectorField& ptf,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<vector>(ptf, iF),
-    wavePeriod_(ptf.wavePeriod_),
-    waveHeight_(ptf.waveHeight_),
-    waveLength_(ptf.waveLength_),
-    waterDepth_(ptf.waterDepth_),
-    initialDepth_(ptf.initialDepth_),
-    RealwaterDepth_(ptf.RealwaterDepth_),
-    wavePhase_(ptf.wavePhase_),
-    lambdaStokesV_(ptf.lambdaStokesV_),
-    mCnoidal_(ptf.mCnoidal_),
-    genAbs_(ptf.genAbs_),
-    nPaddles_(ptf.nPaddles_),
-    tSmooth_(ptf.tSmooth_),
-    leftORright_(ptf.leftORright_),
-    waveDictName_(ptf.waveDictName_),
-    waveType_(ptf.waveType_),
-    waveTheory_(ptf.waveTheory_),
-    allCheck_(ptf.allCheck_),
-    waveDir_(ptf.waveDir_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::IH_Waves_InletVelocityFvPatchVectorField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    } 
-
-    // Auxiliar variables
-    scalar auxiliar = 0; 
-    scalar auxiliarTotal = 0;
-    scalar X0 = 0;
-    scalarField patchXsolit;
-
-    // Variables stream function
-    scalar celerity = 0;
-
-    // 3D Variables
-    const vector cMin = gMin(patch().patch().localPoints());
-    const vector cMax = gMax(patch().patch().localPoints());
-    const vector cSpan = cMax - cMin;
-    const scalar zSpan = cSpan[2];
-
-    scalar dMin = 0.0;
-    scalar dSpan = 0.0;
-    const scalarField patchD = patchDirection( cSpan, &dMin, &dSpan );
-
-    // Variables & constants
-    const volScalarField& alpha = 
-        db().lookupObject<volScalarField>(alphaName());
-    const fvMesh& mesh = alpha.mesh();
-    const word& patchName = this->patch().name();
-    const label patchID = mesh.boundaryMesh().findPatchID(patchName);
-    const label nF = patch().faceCells().size();
-    labelList cellGroup = Foam::labelList(nF, 1);
-    const scalarField alphaCell = 
-        alpha.boundaryField()[patchID].patchInternalField();
-    scalarField patchU = Foam::scalarField(nF, 0.0);
-    scalarField patchUABS = Foam::scalarField(nF, 0.0);
-    scalarField patchV = Foam::scalarField(nF, 0.0);
-    scalarField patchVABS = Foam::scalarField(nF, 0.0);
-    scalarField patchW = Foam::scalarField(nF, 0.0);
-    const labelList celdas = patch().faceCells();
-    const scalarField patchHeight = patch().Cf().component(2);
-    const scalar g = 9.81;
-
-    // Calculate Z bounds of the faces
-    scalarField zSup, zInf;
-    faceBoundsZ( &zSup, &zInf );
-
-    // Waves variables
-    scalar waveOmega;
-    scalar waveK;
-    scalar waveAngle;
-    scalar waveKx;
-    scalar waveKy;
-
-    // Define dictionary
-    IOdictionary IHWavesDict
-    (
-        IOobject
-        (
-            waveDictName_,
-            this->db().time().constant(),
-            this->db(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        )
-    );
-
-    scalar currTime = this->db().time().value();
-
-    // Check for errors - Just the first time
-    if (allCheck_)
-    {
-        waveType_ = (IHWavesDict.lookupOrDefault<word>("waveType","aaa")); 
-        tSmooth_ = (IHWavesDict.lookupOrDefault<scalar>("tSmooth",-1.0));
-	genAbs_ = (IHWavesDict.lookupOrDefault<bool>("genAbs",false));
-	waterDepth_ = (IHWavesDict.lookupOrDefault<scalar>("waterDepth",-1));
-	initialDepth_ = 
-	    (IHWavesDict.lookupOrDefault<scalar>("initialDepth",-1));
-    	nPaddles_ = (IHWavesDict.lookupOrDefault<label>("nPaddles",1));
-    }
-
-    // Grouping part
-    scalarList dBreakPoints = Foam::scalarList(nPaddles_+1, dMin); 
-    scalarList xGroup = Foam::scalarList(nPaddles_, 0.0);
-    scalarList yGroup = Foam::scalarList(nPaddles_, 0.0);
-
-    for (label i=0; i<nPaddles_; i++)
-    {
-        // Breakpoints, X & Y centre of the paddles
-        dBreakPoints[i+1] = dMin + dSpan/(nPaddles_)*(i+1);
-        xGroup[i] = cMin[0] + cSpan[0]/(2.0*nPaddles_) 
-	    + cSpan[0]/(nPaddles_)*i;
-        yGroup[i] = cMin[1] + cSpan[1]/(2.0*nPaddles_) 
-	    + cSpan[1]/(nPaddles_)*i;
-    }
-
-    forAll(patchD, patchCells) 
-    {
-        for (label i=0; i<nPaddles_; i++)
-        {
-            if ( (patchD[patchCells]>=dBreakPoints[i]) 
-                && (patchD[patchCells]<dBreakPoints[i+1]) )
-            {
-                cellGroup[patchCells] = i+1; // Group of each face
-                continue;
-            }
-        }      
-    }
-
-    // Check for errors - Just the first time
-    if (allCheck_)
-    {
-	if (RealwaterDepth_ == -1.0)
-	{
-	    if (waterDepth_ == -1.0)
-	    {
-	        RealwaterDepth_ = 
-		    calcWL( alphaCell, cellGroup, zSpan )[0];
-		if (initialDepth_ !=-1.0)
-		    {
-		        RealwaterDepth_ = RealwaterDepth_ 
-			    + initialDepth_;
-		    }
-	    }
-	    else if ( waterDepth_ != -1.0 )
-	    {
-		RealwaterDepth_ = waterDepth_;	
-	    }
-	}
-    }
-
-    if (allCheck_)
-    {
-	waveTheory_ = (IHWavesDict.lookupOrDefault<word>("waveTheory","aaa"));
-    	waveHeight_ = (IHWavesDict.lookupOrDefault<scalar>("waveHeight",-1));
-    	wavePeriod_ = (IHWavesDict.lookupOrDefault<scalar>("wavePeriod",-1));
-    	waveDir_ = (IHWavesDict.lookupOrDefault<scalar>("waveDir",0));
-    	genAbs_ = (IHWavesDict.lookupOrDefault<bool>("genAbs",false));
-    	wavePhase_ = 
-	    (IHWavesDict.lookupOrDefault<scalar>("wavePhase",3.0*PI()/2.0));
-	
-	if ( waveType_ == "regular" )
-	{
-		waveLength_ = StokesIFun::waveLength (
-		    RealwaterDepth_, wavePeriod_ );
-	}
-    }
-
-    if ( waveType_ == "regular" )
-    {
-        waveOmega = (2.0*PI())/wavePeriod_;
-        waveK = 2.0*PI()/waveLength_;
-
-        celerity = waveLength_/wavePeriod_;
-
-        waveAngle = waveDir_*PI()/180.0;
-        waveKx = waveK*cos(waveAngle);
-        waveKy = waveK*sin(waveAngle);
-    }
-    else if ( waveType_ == "solitary" )
-    {
-        waveAngle = waveDir_*PI()/180.0;
-        patchXsolit = patch().Cf().component(0)*cos(waveAngle) 
-            	      + patch().Cf().component(1)*sin(waveAngle);
-        X0 = gMin(patchXsolit);
-    }
-
-    scalar timeMult = 1.0;
-
-    if ( tSmooth_ > 0 && currTime < tSmooth_ )
-    {
-	timeMult = currTime/tSmooth_;
-    }
-
-    if (allCheck_)
-    {
-        if ( waveType_ == "regular" )
-        {
-            #include "checkInputErrorsRegular.H"
-        }
-        else if ( waveType_ == "solitary" )
-        {
-            #include "checkInputErrorsSolitary.H"
-        }
-        else
-        {
-            FatalError << "Wave type not supported, use:\n" 
-	        << "regular, solitary."<< exit(FatalError);
-        }
-
-	allCheck_ = false; 
-    }
-
-    scalarList calculatedLevel (nPaddles_,0.0);  
-
-    if ( waveType_ == "regular" )
-    {
-	if (waveDir_ == 0)
-	{
-           #include "calculatedLevelRegularNormal.H"
-	}
-	else
-	{
-	   #include "calculatedLevelRegular.H"
-	}
-    }
-    else if ( waveType_ == "solitary" )
-    {
-        #include "calculatedLevelSolitary.H"
-    }
-
-    scalarList measuredLevels (nPaddles_,0.0);
-    forAll(measuredLevels, iterMin)
-    {
-        measuredLevels[iterMin] = RealwaterDepth_;
-    }
-
-    scalarList measuredLevelsGENAB = calcWL( alphaCell, cellGroup, zSpan );
-
-    if (initialDepth_ !=-1.0)
-    {
-    	forAll(measuredLevelsGENAB, iterMin)
-    	{
-            measuredLevelsGENAB[iterMin] = measuredLevelsGENAB[iterMin] 
-	        + initialDepth_;
-    	}
-    }
-
-    // Define heights as minimum of calculatedLevel and measuredLevels
-    scalarList heights (nPaddles_,0.0);
-    forAll(heights, iterMin)
-    {
-        heights[iterMin] = 
-	    min(calculatedLevel[iterMin],measuredLevels[iterMin]);
-    }
-    
-    forAll(patchHeight, cellIndex)    
-    {
-    	#include "velocityProfile.H"
-    
-    	patchU[cellIndex] = patchU[cellIndex]*alphaCell[cellIndex];
-    	patchV[cellIndex] = patchV[cellIndex]*alphaCell[cellIndex];
-    	patchW[cellIndex] = patchW[cellIndex]*alphaCell[cellIndex];
-    }
-
-    const vectorField n1 = Foam::vectorField(nF, vector(1.0, 0.0, 0.0));
-    const vectorField n2 = Foam::vectorField(nF, vector(0.0, 1.0, 0.0));
-    const vectorField n3 = Foam::vectorField(nF, vector(0.0, 0.0, 1.0));
-
-    operator == (n1*patchU + n2*patchV + n3*patchW);
-
-    fixedValueFvPatchField<vector>::updateCoeffs();
-}
-
-
-void Foam::IH_Waves_InletVelocityFvPatchVectorField::write(Ostream& os) const
-{
-    fvPatchField<vector>::write(os);
-
-    os.writeKeyword("waveDictName") << waveDictName_ 
-        << token::END_STATEMENT << nl;
-
-    os.writeKeyword("leftORright") << leftORright_ 
-        << token::END_STATEMENT << nl;
-
-    os.writeKeyword("RealwaterDepth") << RealwaterDepth_ 
-        << token::END_STATEMENT << nl;
-
-    os.writeKeyword("initialDepth") << initialDepth_ 
-        << token::END_STATEMENT << nl;
-
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-   makePatchTypeField
-   (
-       fvPatchVectorField,
-       IH_Waves_InletVelocityFvPatchVectorField
-   );
-}
-
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
deleted file mode 100644
index d52984d738..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.H
+++ /dev/null
@@ -1,238 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2006-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::IH_Waves_InletVelocityFvPatchVectorField
-
-Description
-    Describes a volumetric/mass flow normal vector boundary condition by its
-    magnitude as an integral over its area.
-
-    The basis of the patch (volumetric or mass) is determined by the
-    dimensions of the flux, phi.
-    The current density is used to correct the velocity when applying the
-    mass basis.
-
-    Example of the boundary condition specification:
-    @verbatim
-    inlet
-    {
-        type            IH_Waves_InletVelocityV2;
-        waveDict        IHWavesDict;
-        value           uniform (0 0 0);
-	leftORright	1.0;
-
-    }
-    @endverbatim
-
-    \heading Function object usage
-    \table
-        Property     | Description             | Required    | Default value
-        type         | type:    IH_Waves_InletVelocityV2 | yes
-        waveDict     | Dictionary where variables for generation/absorption are defined | yes | IHWavesDict 
-	leftORright  | Define location of Boundary condition: Left(1) or Right (-1) | yes | -1 
-    \endtable
-
-Note
-    - The value is positive inwards
-    - May not work correctly for transonic inlets
-    - Strange behaviour with potentialFoam since the U equation is not solved
-
-SourceFiles
-    IH_Waves_InletVelocityFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-#ifndef IH_Waves_InletVelocityFvPatchVectorField_H
-#define IH_Waves_InletVelocityFvPatchVectorField_H
-
-#include "fixedValueFvPatchFields.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-/*---------------------------------------------------------------------------*\
-               Class IH_Waves_InletVelocityFvPatch Declaration
-\*---------------------------------------------------------------------------*/
-
-class IH_Waves_InletVelocityFvPatchVectorField
-:
-    public fixedValueFvPatchVectorField
-{
-    // Private data
-
-        //- Wave period (seconds)
-        scalar wavePeriod_;
-
-        //- Wave height (meters)
-        scalar waveHeight_;
-
-        //- Wave length (meters)
-        scalar waveLength_;
-
-        //- Water depth (meters)
-        scalar waterDepth_;
-
-        //- Wave phase (radians)
-        scalar wavePhase_;
-
-        //- Lambda StokesV parameter
-        scalar lambdaStokesV_;
-
-        //- m Cnoidal parameter
-        scalar mCnoidal_;
-
-        //- Generation + Absorption at the same time in the boundary (on=1, off=0)
-        bool genAbs_;
-
-        //- Number of different paddles (for absorption)
-        label nPaddles_;
-
-        //- Smoothing factor for the wave(s) (seconds)
-        scalar tSmooth_;
-
-        //Aborption Left(1) or Right(-1)
-	scalar leftORright_;
-
-        //- Dictionary name
-        word waveDictName_;
-
-        //- Regular or Irregular
-        word waveType_;
-
-        //- Name of the theory
-        word waveTheory_;
-
-        //- BC check and read values just the first time
-        bool allCheck_;
-
-        //- Direction of propagation (degrees, from X axis)
-        scalar waveDir_;
-
-        //- Initial water depth (referece)
-	scalar RealwaterDepth_;
-
-        //- Water depth (meters)
-        scalar initialDepth_;
-
-public:
-
-   //- Runtime type information
-   TypeName("IH_Waves_InletVelocityV2");
-
-
-   // Constructors
-
-        //- Construct from patch and internal field
-        IH_Waves_InletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        IH_Waves_InletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  IH_Waves_InletVelocityFvPatchVectorField
-        //  onto a new patch
-        IH_Waves_InletVelocityFvPatchVectorField
-        (
-            const IH_Waves_InletVelocityFvPatchVectorField&,
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        IH_Waves_InletVelocityFvPatchVectorField
-        (
-            const IH_Waves_InletVelocityFvPatchVectorField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new IH_Waves_InletVelocityFvPatchVectorField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        IH_Waves_InletVelocityFvPatchVectorField
-        (
-            const IH_Waves_InletVelocityFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchVectorField> clone
-        (
-            const DimensionedField<vector, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new IH_Waves_InletVelocityFvPatchVectorField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-
-    // Other common member functions
-        #include "memberFun.H"
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
deleted file mode 100644
index fbbd38b91d..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileBoussinesq.H
+++ /dev/null
@@ -1,170 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = BoussinesqFun :: U 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                xGroup[cellGroup[cellIndex]-1], 
-                yGroup[cellGroup[cellIndex]-1], 
-                waveAngle, 
-                currTime, 
-                X0, 
-                patchHeight[cellIndex]
-             );
-
-        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
-        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
-
-        patchW[cellIndex] = BoussinesqFun :: W 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                xGroup[cellGroup[cellIndex]-1], 
-                yGroup[cellGroup[cellIndex]-1], 
-                waveAngle, 
-                currTime, 
-                X0, 
-                patchHeight[cellIndex]
-            );
-
-	patchW[cellIndex] = patchW[cellIndex] * timeMult;
-
-    }
-    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = 0.0;
-        patchV[cellIndex] = 0.0;
-        patchW[cellIndex] = 0.0;
-    } 
-    else 
-    {	
-        if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    < measuredLevels[cellGroup[cellIndex]-1] )
-        {
-	    if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
-	    {
-                auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		    - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = BoussinesqFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveAngle, 
-                    	currTime, 
-                    	X0, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle) * timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle) * timeMult;
-
-		patchW[cellIndex] = BoussinesqFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveAngle, 
-                    	currTime, 
-                    	X0, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
-		    * timeMult;	
-	    }
-	}	
-	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    > measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-	    {
-	        patchU[cellIndex] = BoussinesqFun :: U 
-		    (
-                        waveHeight_, 
-                        RealwaterDepth_, 
-                        xGroup[cellGroup[cellIndex]-1], 
-                        yGroup[cellGroup[cellIndex]-1], 
-                        waveAngle, 
-                        currTime, 
-                        X0, 
-                        measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
-		    * timeMult;
-		patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
-		    * timeMult;
-
-		patchW[cellIndex] = BoussinesqFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveAngle, 
-                    	currTime, 
-                    	X0, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
-	    }
-	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		     - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = BoussinesqFun :: U 
-		    (
-		        waveHeight_, 
-			RealwaterDepth_, 
-			xGroup[cellGroup[cellIndex]-1], 
-			yGroup[cellGroup[cellIndex]-1], 
-			waveAngle, 
-			currTime, 
-			X0, 
-			measuredLevels[cellGroup[cellIndex]-1]
-		    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle) * timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle) * timeMult;
-
-		patchW[cellIndex] = BoussinesqFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveAngle, 
-                    	currTime, 
-                    	X0, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                   );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-            }
-        }	
-    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
deleted file mode 100644
index 132f388d42..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileCnoidal.H
+++ /dev/null
@@ -1,184 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = cnoidalFun :: U 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                mCnoidal_, 
-                waveKx, 
-                waveKy, 
-                wavePeriod_, 
-                xGroup[cellGroup[cellIndex]-1], 
-                yGroup[cellGroup[cellIndex]-1], 
-                currTime, 
-                patchHeight[cellIndex]
-            );
-
-        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
-        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
-
-        patchW[cellIndex] = cnoidalFun :: W 
-	    (
-	        waveHeight_, 
-                RealwaterDepth_, 
-                mCnoidal_, 
-                waveKx, 
-                waveKy, 
-                wavePeriod_, 
-                xGroup[cellGroup[cellIndex]-1], 
-                yGroup[cellGroup[cellIndex]-1], 
-                currTime, 
-                patchHeight[cellIndex]
-            );
-
-	patchW[cellIndex] = patchW[cellIndex]*timeMult;
-
-    }
-    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = 0.0;
-        patchV[cellIndex] = 0.0;
-        patchW[cellIndex] = 0.0;
-    } 
-    else 
-    {	
-        if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    < measuredLevels[cellGroup[cellIndex]-1] )
-        {
-	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = cnoidalFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-                    	waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle)*timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle)*timeMult;
-
-		patchW[cellIndex] = cnoidalFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-			waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-	    }
-	}	
-	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    > measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-	    {
-	        patchU[cellIndex] = cnoidalFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-                    	waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
-		    * timeMult;
-		patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
-		    * timeMult;
-
-		patchW[cellIndex] = cnoidalFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-			waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
-	    }
-	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = cnoidalFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-                    	waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle) * timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle) * timeMult;
-
-		patchW[cellIndex] = cnoidalFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	mCnoidal_, 
-			waveKx, 
-                    	waveKy, 
-                    	wavePeriod_, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	currTime, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-	    }
-        }	
-    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
deleted file mode 100644
index 56ba8c1ce5..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileGENAB.H
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if ( genAbs_ )
-    {  
-	if ( zInf[cellIndex] >= measuredLevelsGENAB[cellGroup[cellIndex]-1] )
-	{
-	    patchUABS[cellIndex] = 0.0;
-	}
-	else 
-	{
-	    patchUABS[cellIndex] = ( calculatedLevel[cellGroup[cellIndex]-1] - measuredLevelsGENAB[cellGroup[cellIndex]-1] ) * sqrt(g/measuredLevelsGENAB[cellGroup[cellIndex]-1]);
-        }
-    }
-    patchU[cellIndex] = patchU[cellIndex] + leftORright_ * patchUABS[cellIndex];
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
deleted file mode 100644
index b578c69c86..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesI.H
+++ /dev/null
@@ -1,187 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = StokesIFun :: U 
-	    (
-                 waveHeight_, 
-                 RealwaterDepth_, 
-                 waveKx, 
-                 xGroup[cellGroup[cellIndex]-1], 
-                 waveKy, 
-                 yGroup[cellGroup[cellIndex]-1], 
-                 waveOmega, 
-                 currTime, 
-                 wavePhase_, 
-                 patchHeight[cellIndex]
-            );
-
-        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
-        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
-
-        patchW[cellIndex] = StokesIFun :: W 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                waveKx, 
-                xGroup[cellGroup[cellIndex]-1], 
-                waveKy, 
-                yGroup[cellGroup[cellIndex]-1], 
-                waveOmega, 
-                currTime, 
-                wavePhase_, 
-                patchHeight[cellIndex]
-            );
-
-	patchW[cellIndex] = patchW[cellIndex]*timeMult;
-    }
-    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = 0.0;
-        patchV[cellIndex] = 0.0;
-        patchW[cellIndex] = 0.0;
-    } 
-    else 
-    {	
-        if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    < measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		     - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = StokesIFun :: U 
-		    (
-		        waveHeight_, 
-		        RealwaterDepth_, 
-		        waveKx, 
-		        xGroup[cellGroup[cellIndex]-1], 
-		        waveKy, 
-		        yGroup[cellGroup[cellIndex]-1], 
-		        waveOmega, 
-		        currTime, 
-		        wavePhase_, 
-		        patchHeight[cellIndex]
-		    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle)*timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle)*timeMult;
-
-		patchW[cellIndex] = StokesIFun :: W 
-		    (
-		        waveHeight_, 
-		        RealwaterDepth_, 
-		        waveKx, 
-		        xGroup[cellGroup[cellIndex]-1], 
-		        waveKy, 
-		        yGroup[cellGroup[cellIndex]-1], 
-		        waveOmega, 
-		        currTime, 
-		        wavePhase_, 
-		        patchHeight[cellIndex]
-		    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
-		    * timeMult;	
-		
-	    }
-	}
-	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    > measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-	    {
-	        patchU[cellIndex] = StokesIFun :: U 
-		    (
-		        waveHeight_, 
-			RealwaterDepth_, 
-			waveKx, 
-			xGroup[cellGroup[cellIndex]-1], 
-			waveKy, 
-			yGroup[cellGroup[cellIndex]-1], 
-			waveOmega, 
-			currTime, 
-			wavePhase_, 
-			measuredLevels[cellGroup[cellIndex]-1]
-		    );
-
-		patchV[cellIndex] = patchU[cellIndex] 
-		    * sin(waveAngle)*timeMult;
-		patchU[cellIndex] = patchU[cellIndex] 
-		    * cos(waveAngle)*timeMult;
-
-		patchW[cellIndex] = StokesIFun :: W 
-		    (
-		        waveHeight_, 
-			RealwaterDepth_, 
-			waveKx, 
-			xGroup[cellGroup[cellIndex]-1], 
-			waveKy, 
-			yGroup[cellGroup[cellIndex]-1], 
-			waveOmega, 
-			currTime, 
-			wavePhase_, 
-			measuredLevels[cellGroup[cellIndex]-1]
-		    );
-
-		patchW[cellIndex] = patchW[cellIndex]*timeMult;	
-		
-	    }
-	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		    - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = StokesIFun :: U 
-		    (
-		        waveHeight_, 
-		        RealwaterDepth_, 
-		        waveKx, 
-		        xGroup[cellGroup[cellIndex]-1], 
-		        waveKy, 
-		        yGroup[cellGroup[cellIndex]-1], 
-		        waveOmega, 
-		        currTime, 
-		        wavePhase_, 
-		        measuredLevels[cellGroup[cellIndex]-1]
-		    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle) * timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle) * timeMult;
-
-		patchW[cellIndex] = StokesIFun :: W 
-		    (
-		        waveHeight_, 
-			RealwaterDepth_, 
-			waveKx, 
-			xGroup[cellGroup[cellIndex]-1], 
-			waveKy, 
-			yGroup[cellGroup[cellIndex]-1], 
-			waveOmega, 
-			currTime, 
-			wavePhase_, 
-			measuredLevels[cellGroup[cellIndex]-1]
-		);
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex]
-		    * timeMult;	
-	    }
-        }	
-    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
deleted file mode 100644
index 3313587706..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesII.H
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = StokesIIFun :: U 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                waveKx, 
-                xGroup[cellGroup[cellIndex]-1], 
-                waveKy, 
-                yGroup[cellGroup[cellIndex]-1], 
-                waveOmega, 
-                currTime, 
-                wavePhase_, 
-                patchHeight[cellIndex]
-            );
-
-        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
-        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
-
-        patchW[cellIndex] = StokesIIFun :: W 
-	    (
-                waveHeight_, 
-                RealwaterDepth_, 
-                waveKx, 
-                xGroup[cellGroup[cellIndex]-1], 
-                waveKy, 
-                yGroup[cellGroup[cellIndex]-1], 
-                waveOmega, 
-                currTime, 
-                wavePhase_, 
-                patchHeight[cellIndex]
-            );
-
-        patchW[cellIndex] = patchW[cellIndex]*timeMult;
-
-    }
-    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = 0.0;
-        patchV[cellIndex] = 0.0;
-        patchW[cellIndex] = 0.0;
-    } 
-    else 
-    {	
-	if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    < measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		    - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = StokesIIFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle)*timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle)*timeMult;
-
-		patchW[cellIndex] = StokesIIFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	patchHeight[cellIndex]
-                    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-	    }
-	}
-	else if ( calculatedLevel[cellGroup[cellIndex]-1] 
-	    > measuredLevels[cellGroup[cellIndex]-1] )
-	{
-	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-	    {
-	        patchU[cellIndex] = StokesIIFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchV[cellIndex] = patchU[cellIndex] 
-		    * sin(waveAngle)*timeMult;
-		patchU[cellIndex] = patchU[cellIndex] 
-		    * cos(waveAngle)*timeMult;
-
-		patchW[cellIndex] = StokesIIFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                   );
-
-		patchW[cellIndex] = patchW[cellIndex]*timeMult;			
-	    }
-	    else if ((zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]))
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-		    - zInf[cellIndex];
-		auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-		auxiliarTotal = auxiliar/auxiliarTotal;
-
-		patchU[cellIndex] = StokesIIFun :: U 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * sin(waveAngle) * timeMult;
-		patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-		    * cos(waveAngle) * timeMult;
-
-		patchW[cellIndex] = StokesIIFun :: W 
-		    (
-                        waveHeight_, 
-                    	RealwaterDepth_, 
-                    	waveKx, 
-                    	xGroup[cellGroup[cellIndex]-1], 
-                    	waveKy, 
-                    	yGroup[cellGroup[cellIndex]-1], 
-                    	waveOmega, 
-                    	currTime, 
-                    	wavePhase_, 
-                    	measuredLevels[cellGroup[cellIndex]-1]
-                    );
-
-		patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-	    }
-        }		
-    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
deleted file mode 100644
index 00e593aa12..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/profileStokesV.H
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-    if (zSup[cellIndex] < heights[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = stokesVFun :: U 
-	(
-            RealwaterDepth_, 
-            waveKx, 
-            waveKy, 
-            lambdaStokesV_, 
-            wavePeriod_, 
-            xGroup[cellGroup[cellIndex]-1], 
-            yGroup[cellGroup[cellIndex]-1], 
-            currTime, 
-            wavePhase_, 
-            patchHeight[cellIndex]
-        );
-
-        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) * timeMult;
-        patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) * timeMult;
-
-        patchW[cellIndex] = stokesVFun :: W 
-	(
-            RealwaterDepth_, 
-            waveKx, 
-            waveKy, 
-            lambdaStokesV_, 
-            wavePeriod_, 
-            xGroup[cellGroup[cellIndex]-1], 
-            yGroup[cellGroup[cellIndex]-1], 
-            currTime, 
-            wavePhase_, 
-            patchHeight[cellIndex]
-        );
-
-        patchW[cellIndex] = patchW[cellIndex]*timeMult;
-
-    }
-    else if ( zInf[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1])
-    {
-        patchU[cellIndex] = 0.0;
-        patchV[cellIndex] = 0.0;
-        patchW[cellIndex] = 0.0;
-    } 
-    else 
-    {	
-        if ( calculatedLevel[cellGroup[cellIndex]-1] < 
-            measuredLevels[cellGroup[cellIndex]-1] )
-        {
-            if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-	            - zInf[cellIndex];
-	        auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-	        auxiliarTotal = auxiliar/auxiliarTotal;
-    
-	        patchU[cellIndex] = stokesVFun :: U 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-	            xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    patchHeight[cellIndex]
-                );
-
-	        patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-	            * sin(waveAngle)*timeMult;
-	        patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-	            * cos(waveAngle)*timeMult;
-
-	        patchW[cellIndex] = stokesVFun :: W 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-	    	    xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    patchHeight[cellIndex]
-                );
-
-		    patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		        * timeMult;	
-            }
-        }
-        else if ( calculatedLevel[cellGroup[cellIndex]-1] 
-            > measuredLevels[cellGroup[cellIndex]-1] )
-        {
-	    if (zSup[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1])
-            {
-	        patchU[cellIndex] = stokesVFun :: U 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_,    
-                    wavePeriod_, 
-	            xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    measuredLevels[cellGroup[cellIndex]-1]
-                );
-
-       	        patchV[cellIndex] = patchU[cellIndex] * sin(waveAngle) 
-		    * timeMult;
-                patchU[cellIndex] = patchU[cellIndex] * cos(waveAngle) 
-		    * timeMult;
-
-	        patchW[cellIndex] = stokesVFun :: W 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy,    
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-                    xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    measuredLevels[cellGroup[cellIndex]-1]
-                );
-
-	        patchW[cellIndex] = patchW[cellIndex]*timeMult;			
-	    }
-	    else if ( (zSup[cellIndex] > calculatedLevel[cellGroup[cellIndex]-1]) 
-	        & (zInf[cellIndex] < calculatedLevel[cellGroup[cellIndex]-1]) )
-	    {
-	        auxiliar = calculatedLevel[cellGroup[cellIndex]-1] 
-	            - zInf[cellIndex];
-	        auxiliarTotal = zSup[cellIndex]-zInf[cellIndex];
-	        auxiliarTotal = auxiliar/auxiliarTotal;
-
-	        patchU[cellIndex] = stokesVFun :: U 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-                    xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    measuredLevels[cellGroup[cellIndex]-1]
-                );
-    
-	        patchV[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-	            * sin(waveAngle) * timeMult;
-	        patchU[cellIndex] = auxiliarTotal * patchU[cellIndex] 
-	            * cos(waveAngle) * timeMult;
-
-	        patchW[cellIndex] = stokesVFun :: W 
-		(
-                    RealwaterDepth_, 
-                    waveKx, 
-                    waveKy, 
-                    lambdaStokesV_, 
-                    wavePeriod_, 
-                    xGroup[cellGroup[cellIndex]-1], 
-                    yGroup[cellGroup[cellIndex]-1], 
-                    currTime, 
-                    wavePhase_, 
-                    measuredLevels[cellGroup[cellIndex]-1]
-                );
-
-	        patchW[cellIndex] = auxiliarTotal * patchW[cellIndex] 
-		    * timeMult;	
-	    }
-        }		
-    }
diff --git a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H b/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
deleted file mode 100644
index 1473aa8eb1..0000000000
--- a/integration/genAbs/waveGeneration/IH_Waves_InletVelocity/velProfiles/velocityProfile.H
+++ /dev/null
@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------*\
-   IH-Cantabria 2015 (http://www.ihcantabria.com/en/)
-   IHFOAM 2015 (http://ihfoam.ihcantabria.com/) 
-
-   Author(s):  Javier Lopez Lara (jav.lopez@unican.es)
-               Gabriel Barajas   (barajasg@unican.es)
-\*---------------------------------------------------------------------------*/
-
-if ( waveType_ == "regular" )
-{
-    if ( waveTheory_ == "StokesI" )
-    {
-        #include "profileStokesI.H"
-        #include "profileGENAB.H"
-    }
-    else if ( waveTheory_ == "StokesII" )
-    {
-        #include "profileStokesII.H"
-        #include "profileGENAB.H"
-    }
-    else if ( waveTheory_ == "StokesV" )
-    {
-        #include "profileStokesV.H"
-        #include "profileGENAB.H"
-    }
-    else if ( waveTheory_ == "Cnoidal" )
-    {
-        #include "profileCnoidal.H"
-        #include "profileGENAB.H"
-    }
-}
-else if ( waveType_ == "solitary" )
-{
-    #include "profileBoussinesq.H"
-    #include "profileGENAB.H"
-}
diff --git a/integration/genAbs/waveGeneration/Make/files b/integration/genAbs/waveGeneration/Make/files
deleted file mode 100644
index 0d13760da9..0000000000
--- a/integration/genAbs/waveGeneration/Make/files
+++ /dev/null
@@ -1,5 +0,0 @@
-IH_Waves_InletAlpha/IH_Waves_InletAlphaFvPatchScalarField.C
-IH_Waves_InletVelocity/IH_Waves_InletVelocityFvPatchVectorField.C
-../common/waveFun.C
-
-LIB = $(FOAM_USER_LIBBIN)/libIHwaveGenerationV2esi
diff --git a/integration/genAbs/waveGeneration/Make/options b/integration/genAbs/waveGeneration/Make/options
deleted file mode 100644
index d09270c43b..0000000000
--- a/integration/genAbs/waveGeneration/Make/options
+++ /dev/null
@@ -1,16 +0,0 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
-
-EXE_INC = \
-    -DOFVERSION=$(OF_VERSION) \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I./IH_Waves_InletVelocity/velProfiles \
-    -I./IH_Waves_InletVelocityWind/velProfilesWind \
-    -I../common \
-    -I../common/checks \
-    -I../common/calculateWaterLevel \
-     $(PFLAGS) $(PINC)
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    $(PLIBS)
diff --git a/integration/genAbs/waveGeneration/localMake b/integration/genAbs/waveGeneration/localMake
deleted file mode 100755
index 1b24c72f88..0000000000
--- a/integration/genAbs/waveGeneration/localMake
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-if [ $WM_PROJECT == "foam" ]; then
-    ofversion=`echo $WM_PROJECT_VERSION | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' | grep "[0-9]" | head -2 | tr -d '\n'`
-else
-    ofversion=`echo $WM_PROJECT_VERSION"-0" | sed -e 's/\.x/-9/' -e 's/\./\'$'\n/g' -e 's/-/\'$'\n/g' -e 's/+/\'$'\n/g' -e 's/v/\'$'\n/g' | grep "[0-9]" | head -3 | tr -d '\n'`
-fi
-
-#IHC_dbg
-echo $ofversion
-#----
-
-export OF_VERSION=$ofversion
-
-wclean
-
-wmake libso
-
-if (( $? )) ; then 
-    echo "\n\nIH Wave generation boundary conditions (V2.0) compilation failed"
-    exit; else
-    echo -e "\n\nIH Wave generation boundary conditions (V2.0) compiled successfully for $WM_PROJECT $WM_PROJECT_VERSION\n\n\n";  
-fi
-
-wclean

From 10753b77e733a7af1c3569689447976019ae3689 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 15 Dec 2016 13:22:37 +0000
Subject: [PATCH 18/18] ENH: Code/doc tidying

---
 .../derived/Boussinesq/BoussinesqWaveModel.H  |  5 +-
 .../derived/StokesI/StokesIWaveModel.H        |  3 +
 .../derived/StokesII/StokesIIWaveModel.H      |  4 +-
 .../derived/StokesV/StokesVWaveModel.H        | 89 ++++++++-----------
 .../derived/cnoidal/cnoidalWaveModel.H        |  5 +-
 5 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
index e0ece2d750..ff76841a81 100644
--- a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
+++ b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
@@ -25,6 +25,7 @@ Class
     Foam::waveModels::Boussinesq
 
 Description
+    Boussinesq wave model
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,7 +42,7 @@ namespace waveModels
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class Boussinesq Declaration
+                         Class Boussinesq Declaration
 \*---------------------------------------------------------------------------*/
 
 class Boussinesq
@@ -64,7 +65,7 @@ protected:
             const scalar X0
         ) const;
 
-        //- wave
+        //- Wave
         virtual vector Deta
         (
             const scalar H,
diff --git a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
index 10d06b9727..82213261bf 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
+++ b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
@@ -25,6 +25,7 @@ Class
     Foam::waveModels::StokesI
 
 Description
+    Stokes I wave model
 
 \*---------------------------------------------------------------------------*/
 
@@ -55,6 +56,7 @@ protected:
         //- Return the wavelength
         virtual scalar waveLength(const scalar h, const scalar T) const;
 
+        //- Wave height
         virtual scalar eta
         (
             const scalar H,
@@ -67,6 +69,7 @@ protected:
             const scalar phase
         ) const;
 
+        //- Wave velocity
         virtual vector U
         (
             const scalar H,
diff --git a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
index a16f29ace7..044eba4bc5 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
+++ b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
@@ -25,6 +25,7 @@ Class
     Foam::waveModels::StokesII
 
 Description
+    Stokes II wave model
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,6 +53,7 @@ protected:
 
     // Protected Member Functions
 
+        //- Wave height
         virtual scalar eta
         (
             const scalar H,
@@ -65,6 +67,7 @@ protected:
             const scalar phase
         ) const;
 
+        //- Wave velocity
         virtual vector U
         (
             const scalar H,
@@ -79,7 +82,6 @@ protected:
             const scalar z
         ) const;
 
-
         //- Set the water level
         virtual void setLevel
         (
diff --git a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
index 1c127d703e..225bb9bf1f 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
+++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
@@ -25,6 +25,14 @@ Class
     Foam::waveModels::StokesV
 
 Description
+    Stokes V wave model
+
+    Reference
+    \verbatim
+        Skjelbreia, L., Hendrickson, J. (1960).
+        Fifth order gravity wave theory.
+        Proc. Coastal Engineering Conf., pp. 184-196.
+    \endverbatim
 
 \*---------------------------------------------------------------------------*/
 
@@ -58,79 +66,58 @@ protected:
 
     // Protected Member Functions
 
-        //-
-        virtual scalar A11(const scalar h, const scalar k) const;
+        // Model coefficients
 
-        //-
-        virtual scalar A13(const scalar h, const scalar k) const;
+            virtual scalar A11(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A15(const scalar h, const scalar k) const;
+            virtual scalar A13(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A22(const scalar h, const scalar k) const;
+            virtual scalar A15(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A24(const scalar h, const scalar k) const;
+            virtual scalar A22(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A33(const scalar h, const scalar k) const;
+            virtual scalar A24(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A35(const scalar h, const scalar k) const;
+            virtual scalar A33(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A44(const scalar h, const scalar k) const;
+            virtual scalar A35(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar A55(const scalar h, const scalar k) const;
+            virtual scalar A44(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B22(const scalar h, const scalar k) const;
+            virtual scalar A55(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B24(const scalar h, const scalar k) const;
+            virtual scalar B22(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B33(const scalar h, const scalar k) const;
+            virtual scalar B24(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B33k(const scalar h, const scalar k) const;
+            virtual scalar B33(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B35(const scalar h, const scalar k) const;
+            virtual scalar B33k(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B35k(const scalar h, const scalar k) const;
+            virtual scalar B35(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B44(const scalar h, const scalar k) const;
+            virtual scalar B35k(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B55(const scalar h, const scalar k) const;
+            virtual scalar B44(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar B55k(const scalar h, const scalar k) const;
+            virtual scalar B55(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C1(const scalar h, const scalar k) const;
+            virtual scalar B55k(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C1k(const scalar h, const scalar k) const;
+            virtual scalar C1(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C2(const scalar h, const scalar k) const;
+            virtual scalar C1k(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C2k(const scalar h, const scalar k) const;
+            virtual scalar C2(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C3(const scalar h, const scalar k) const;
+            virtual scalar C2k(const scalar h, const scalar k) const;
 
-        //-
-        virtual scalar C4(const scalar h, const scalar k) const;
+            virtual scalar C3(const scalar h, const scalar k) const;
 
-        //-
+            virtual scalar C4(const scalar h, const scalar k) const;
+
+
+        //- Model intialisation
         virtual void initialise
         (
             const scalar H,
@@ -142,7 +129,7 @@ protected:
             scalar& f2Out
         ) const;
 
-        //-
+        //- Wave height
         virtual scalar eta
         (
             const scalar h,
@@ -156,7 +143,7 @@ protected:
             const scalar phase
         ) const;
 
-        //-
+        //- Wave velocity
         virtual vector U
         (
             const scalar d,
diff --git a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
index dd4e1a169c..3c78658154 100644
--- a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
+++ b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
@@ -25,6 +25,7 @@ Class
     Foam::waveModels::cnoidal
 
 Description
+    Cnoidal wave model
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,7 +42,7 @@ namespace waveModels
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class cnoidal Declaration
+                           Class cnoidal Declaration
 \*---------------------------------------------------------------------------*/
 
 class cnoidal
@@ -67,6 +68,7 @@ protected:
             scalar& LOut
         ) const;
 
+        //- Wave height
         virtual scalar eta
         (
             const scalar H,
@@ -104,6 +106,7 @@ protected:
             const scalar E
         ) const;
 
+        //- Wave velocity
         virtual vector U
         (
             const scalar H,