Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C

@@ -2,10 +2,10 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-                            | Copyright (C) 2018 IH-Cantabria
+                            | Copyright (C) 2018-2019 IH-Cantabria
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,8 @@ const Foam::Enum<Foam::waveMakerPointPatchVectorField::motionTypes>
 Foam::waveMakerPointPatchVectorField::motionTypeNames
 ({
     { motionTypes::piston, "piston" },
-    { motionTypes::flap, "flap" }
+    { motionTypes::flap, "flap" },
+    { motionTypes::solitary, "solitary" }
 });
 
 
@@ -104,7 +105,7 @@ Foam::waveMakerPointPatchVectorField::waveMakerPointPatchVectorField
     waveHeight_(0),
     wavePhase_(0),
     waveLength_(0),
-    rampTime_(0),
+    rampTime_(1),
     secondOrder_(false)
 {}
 
@@ -250,6 +251,41 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
 
             break;
         }
+        case motionTypes::solitary:
+        {
+            const scalar kappa = sqrt(0.75*waveHeight_/(pow3(initialDepth_)));
+            const scalar waveCelerity =
+                sqrt(mag(g())*(initialDepth_ + waveHeight_));
+            const scalar stroke = sqrt(16.0*waveHeight_*initialDepth_/3.0);
+            const scalar hr = waveHeight_/initialDepth_;
+            wavePeriod_ = (2.0/(kappa*waveCelerity))*(3.8 + hr);
+
+            const scalar tSolitary =
+                -0.5*wavePeriod_ + t - db().time().startTime().value();
+
+            // Newton-Rapshon
+            scalar theta1 = 0;
+            scalar theta2 = 0;
+            scalar er = 10000;
+            const scalar error = 0.001;
+            while (er > error)
+            {
+                theta2 =
+                    theta1
+                  - (theta1 - kappa*waveCelerity*tSolitary + hr*tanh(theta1))
+                   /(1.0 + hr*(1.0/cosh(theta1))*(1.0/cosh(theta1)));
+
+                    er = mag(theta1 - theta2);
+                    theta1 = theta2;
+            }
+
+            scalar motionX =
+                waveHeight_/(kappa*initialDepth_)*tanh(theta1) + 0.5*stroke;
+
+            Field<vector>::operator=(n_*motionX);
+
+            break;
+        }
         default:
         {
             FatalErrorInFunction

src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-                            | Copyright (C) 2018 IH-Cantabria
+                            | Copyright (C) 2018-2019 IH-Cantabria
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,6 +70,7 @@ Usage
     Available motion types include:
     - piston
     - flap
+    - solitary
 
 SourceFiles
     waveMakerPointPatchVectorField.C
@@ -100,7 +101,8 @@ class waveMakerPointPatchVectorField
         enum motionTypes
         {
             piston,
-            flap
+            flap,
+            solitary
         };
 
         //- Names for motion types

tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSchemes

@@ -1,54 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes

@@ -1,54 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution

@@ -1,78 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-        cAlpha          1;
-    }
-
-    "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        DIC;
-        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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes

@@ -1,54 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution

@@ -1,78 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-        cAlpha          1;
-    }
-
-    "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        DIC;
-        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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes

@@ -1,54 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution

@@ -1,78 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-        cAlpha          1;
-    }
-
-    "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        DIC;
-        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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSchemes

@@ -1,54 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSolution

@@ -1,78 +0,0 @@
-
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    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;
-        cAlpha          1;
-    }
-
-    "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        DIC;
-        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;
-}
-
-
-// ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict

@@ -87,4 +87,3 @@ mergePatchPairs
 );
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes

@@ -51,4 +51,3 @@ snGradSchemes
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution

@@ -75,4 +75,3 @@ PIMPLE
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict

@@ -94,4 +94,3 @@ mergePatchPairs
 );
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes

@@ -51,4 +51,3 @@ snGradSchemes
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution

@@ -75,4 +75,3 @@ PIMPLE
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/triSurface/seaweed.stl

@@ -1,4 +1,3 @@
-solid C
 facet normal 0.0 1.0 0.0
    outer loop
       vertex 4.065 0.5475 0.25

tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties

@@ -40,4 +40,3 @@ right
 }
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes

@@ -53,4 +53,3 @@ snGradSchemes
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution

@@ -75,4 +75,3 @@ PIMPLE
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict

@@ -87,4 +87,3 @@ mergePatchPairs
 );
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes

@@ -51,4 +51,3 @@ snGradSchemes
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution

@@ -75,4 +75,3 @@ PIMPLE
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties

@@ -40,4 +40,3 @@ right
 }
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes

@@ -51,4 +51,3 @@ snGradSchemes
 
 
 // ************************************************************************* //
-

tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution

@@ -75,4 +75,3 @@ PIMPLE
 
 
 // ************************************************************************* //
-