diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index 6eac1e2b93cbe4f73c3b6acecb038247e3dacc5a..4e2754221a745345682a31ab6e95b5fe934e2436 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -2,8 +2,10 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
- \\/ M anipulation | Copyright (C) 2018 IH-Cantabria
+ \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+ | Copyright (C) 2018-2019 IH-Cantabria
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -116,7 +118,7 @@ Foam::waveMakerPointPatchVectorField::waveMakerPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF, dict, false),
- motionType_(motionTypeNames.lookup("motionType", dict)),
+ motionType_(motionTypeNames.get("motionType", dict)),
n_(dict.get<vector>("n")),
gHat_(Zero),
initialDepth_(dict.get<scalar>("initialDepth")),
@@ -251,47 +253,34 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
}
case motionTypes::solitary:
{
- const scalar kappa_ = sqrt(3.0/4.0*waveHeight_/(pow(initialDepth_,3)));
- const scalar waveCelerity_ = sqrt(mag(g())*(initialDepth_+waveHeight_));
- const scalar stroke_ = sqrt(16.0*waveHeight_*initialDepth_/3.0);
- wavePeriod_ = (2.0 / ( kappa_*waveCelerity_ ))*(3.8 + waveHeight_/
- initialDepth_);
-
- scalar motionX = 0;
- const scalar error=0.001;
-
- if (onlyFirst==0)
- {
- tAux = -wavePeriod_/2.0 + (t-tOld);
- }
- else
- {
- tAux = tAuxOld + (t-tOld);
- }
-
- //Newton-Rapshon
- scalar theta1OF=0;
- scalar theta2OF=0;
- scalar er=10000;
- while (er>error)
- {
- theta2OF = theta1OF - (theta1OF - kappa_*waveCelerity_*tAux
- + (waveHeight_/initialDepth_)*tanh(theta1OF) )
- / ( 1.0 + (waveHeight_/initialDepth_)*(1.0/cosh(theta1OF))*(1.0/cosh(theta1OF)));
-
- er=fabs(theta1OF-theta2OF);
- theta1OF=theta2OF;
- }
-
- motionX = waveHeight_ / (kappa_*initialDepth_)*tanh(theta1OF) + stroke_/2.0;
-
- if (tAux != 0)
+ 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)
{
- onlyFirst = 1;
+ 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;
}
- tOld = t;
- tAuxOld = tAux;
+ scalar motionX =
+ waveHeight_/(kappa*initialDepth_)*tanh(theta1) + 0.5*stroke;
Field<vector>::operator=(n_*motionX);
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
index 845c4f2bbb6ce195f3bfb244b881254de19a47fd..ee2d82593e05952c3b8cf6db4abd14287d080577 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
@@ -3,7 +3,9 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
- \\/ M anipulation | Copyright (C) 2018 IH-Cantabria
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+ | Copyright (C) 2018-2019 IH-Cantabria
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -68,6 +70,7 @@ Usage
Available motion types include:
- piston
- flap
+ - solitary
SourceFiles
waveMakerPointPatchVectorField.C
@@ -99,7 +102,7 @@ class waveMakerPointPatchVectorField
{
piston,
flap,
- solitary
+ solitary
};
//- Names for motion types
@@ -140,13 +143,6 @@ class waveMakerPointPatchVectorField
//- On/off second order calculation switch
scalar secondOrder_;
- //- Solitary time [-T/2, T/2]
- scalar tOld = 0;
- scalar tAux = 0;
- scalar tAuxOld = 0;
-
- scalar onlyFirst = 0;
-
// Protected Member Functions
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSchemes
deleted file mode 100644
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSchemes
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
deleted file mode 100644
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
deleted file mode 100644
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
deleted file mode 100644
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
deleted file mode 100644
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
deleted file mode 100644
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
deleted file mode 100644
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSchemes
deleted file mode 100644
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSchemes
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSolution
deleted file mode 100644
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSolution
+++ /dev/null
@@ -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;
-}
-
-
-// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
index 5039ddb2161a16d46cba621eee418584861101d2..d3b095f6c2b90776f4ef352a4320c94a5a2da997 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
@@ -87,4 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..754a0a27c61fda6cbfc9a56e092028ca75dfd162 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
@@ -51,4 +51,3 @@ snGradSchemes
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..160fa6b34098e67296a92005def0941792e0d7ca 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/Allclean b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/Allrun b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/g b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
index 4512ebcf1161134dc80e0c5006647d4ec5230084..aa589875bf0c73110b85efba67bf8202bfdf2ef1 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
@@ -94,4 +94,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..754a0a27c61fda6cbfc9a56e092028ca75dfd162 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
@@ -51,4 +51,3 @@ snGradSchemes
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
index e686ea9214697d735b85ce09cc34b71126ff7c25..60fc61dad73ed0067c9bf045e33be54c7dba4d17 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
index 3c12d70782a858d283333bc9146639da196f6ee8..f8f3604c528688d85ec172e3c3fbf898d3e05475 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
@@ -35,7 +35,7 @@ boundaryField
{
type zeroGradient;
}
-
+
sides
{
type zeroGradient;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/epsilon
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/k b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/k
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/nut b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/nut
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
index b7fb765e0361bae367f8e6107a7a9d1f06200088..5e0eb6fcb2749d8f7f30996917b1a39d77cab743 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
@@ -20,7 +20,7 @@ internalField uniform 0;
boundaryField
{
- left
+ left
{
type fixedFluxPressure;
value uniform 0;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allrun b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/g b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/triSurface/seaweed.stl b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/triSurface/seaweed.stl
similarity index 95%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/triSurface/seaweed.stl
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/triSurface/seaweed.stl
index 07c5b84cd3921562d33d3539e644edc75fde7fd5..4032531aaae30960001ccc4b0aba6eab767700c1 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/triSurface/seaweed.stl
+++ b/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
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
index abfc968a5aeeb474d5996a54adea8309c412270b..2abf2e0b87d80ed6c0872a4c0107fd678bc9ad1c 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
@@ -40,4 +40,3 @@ right
}
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvOptions b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvOptions
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
index 692e6f355b4cc33e0b940908bf0d593a2a556180..25bb129d9a85c4ceefee94c3f0d35beab99885d9 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
@@ -53,4 +53,3 @@ snGradSchemes
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
index 9fbd8d39fe312e264e75a3aebfcb123cc4025a4b..a7d4df9186ef0860375ed0396c22cb6513c92ce5 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict
rename to tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
index 1154bdcbc02c4539c7b63d4bc791d47a1e24ef32..58da9e74832ebed2ac75d120a9126a84f0463551 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
@@ -87,4 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..754a0a27c61fda6cbfc9a56e092028ca75dfd162 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
@@ -51,4 +51,3 @@ snGradSchemes
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..160fa6b34098e67296a92005def0941792e0d7ca 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
index 3c12d70782a858d283333bc9146639da196f6ee8..f8f3604c528688d85ec172e3c3fbf898d3e05475 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
@@ -35,7 +35,7 @@ boundaryField
{
type zeroGradient;
}
-
+
sides
{
type zeroGradient;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
index b7fb765e0361bae367f8e6107a7a9d1f06200088..5e0eb6fcb2749d8f7f30996917b1a39d77cab743 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
@@ -20,7 +20,7 @@ internalField uniform 0;
boundaryField
{
- left
+ left
{
type fixedFluxPressure;
value uniform 0;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
index 92aa159df76ad5c061cdefa361d8c0cfeffac909..d6a6a331ccb3448ba6f0ebcd5e8ede02efb98f5f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
@@ -40,4 +40,3 @@ right
}
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
index eeb18372e73645e97f72a13080048c77f1717957..d27ee4c1df74c42f36bbf34c3b5f6d827e25f266 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
@@ -46,7 +46,7 @@ boundary
(
(0 4 7 3)
);
- }
+ }
right
{
type patch;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
index 1a7004dc28658422fdd368d274f9a6232f42b2a1..754a0a27c61fda6cbfc9a56e092028ca75dfd162 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleIrregularMultiDirection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
@@ -51,4 +51,3 @@ snGradSchemes
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..160fa6b34098e67296a92005def0941792e0d7ca 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
index 3c12d70782a858d283333bc9146639da196f6ee8..f8f3604c528688d85ec172e3c3fbf898d3e05475 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
@@ -35,7 +35,7 @@ boundaryField
{
type zeroGradient;
}
-
+
sides
{
type zeroGradient;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
index b7fb765e0361bae367f8e6107a7a9d1f06200088..5e0eb6fcb2749d8f7f30996917b1a39d77cab743 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
@@ -20,7 +20,7 @@ internalField uniform 0;
boundaryField
{
- left
+ left
{
type fixedFluxPressure;
value uniform 0;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/Allrun b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
index a3d93a11b5903cef09d266544e68a5fe563db5fc..65925e55bec8d09f0fc2df53b90247b835443ead 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
@@ -40,4 +40,3 @@ right
}
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
index eeb18372e73645e97f72a13080048c77f1717957..d27ee4c1df74c42f36bbf34c3b5f6d827e25f266 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
@@ -46,7 +46,7 @@ boundary
(
(0 4 7 3)
);
- }
+ }
right
{
type patch;
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..754a0a27c61fda6cbfc9a56e092028ca75dfd162
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
@@ -0,0 +1,53 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
index 3ef770f5521dbd4526ad1006ccbc3f2b1bdff259..160fa6b34098e67296a92005def0941792e0d7ca 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryGrimshaw/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
@@ -75,4 +75,3 @@ PIMPLE
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
index ddae5d863e472da055d088894eab6bf867648229..16ca790ad3da9f2ee6e5b5b39b1fa04c891da3d1 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
@@ -87,4 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..754a0a27c61fda6cbfc9a56e092028ca75dfd162
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
@@ -0,0 +1,53 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..160fa6b34098e67296a92005def0941792e0d7ca
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
@@ -0,0 +1,77 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
index 0e385985f040558fd8c6560eb01e3e81761fd14d..9ecca781d5998dd0a8a533c5b44fef027936d6cd 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
@@ -87,4 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..754a0a27c61fda6cbfc9a56e092028ca75dfd162
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
@@ -0,0 +1,53 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..160fa6b34098e67296a92005def0941792e0d7ca
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
@@ -0,0 +1,77 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allclean b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun b/tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
index f3aa218e191ace7ae9f6a4d83bfe7e5ec12e3ccd..b944703cda80946588c9526bf2902ddfcc597d2f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
@@ -87,4 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..754a0a27c61fda6cbfc9a56e092028ca75dfd162
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
@@ -0,0 +1,53 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..160fa6b34098e67296a92005def0941792e0d7ca
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
@@ -0,0 +1,77 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/Allclean b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allrun b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
similarity index 99%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
index 7b3759ce724d88c61ac61bdf051344847a582060..3d3b442e1470383b58129b50d03d1dfeaf5a7f27 100644
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
@@ -87,5 +87,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..754a0a27c61fda6cbfc9a56e092028ca75dfd162
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
@@ -0,0 +1,53 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..160fa6b34098e67296a92005def0941792e0d7ca
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
@@ -0,0 +1,77 @@
+
+/*--------------------------------*- 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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
similarity index 97%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/pointDisplacement
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
index c2d162ec160d93ef377c7f40255455f2695b94fa..f06d3cdd893515fdf60d462e66c9b40d29b8d408 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
@@ -31,7 +31,7 @@ boundaryField
}
leftwall
{
- type waveMaker;
+ type waveMaker;
value uniform (0 0 0);
motionType flap;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/dynamicMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
similarity index 96%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
index b1e8788ccb0c3ccdce4e5fd9d01d89d47430d038..bfd14e8061d15d1a1f1ee375ef369d1dd0deb47f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-vertices
+vertices
(
(0 0 0)
(2 0 0)
@@ -31,17 +31,17 @@ vertices
(4 0.01 0)
);
-blocks
+blocks
(
hex (0 1 5 4 3 2 6 7) (200 1 140) simpleGrading (1 1 1)
hex (1 8 11 5 2 9 10 6) (200 1 140) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-boundary
+boundary
(
bottom1
{
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerFlap/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
similarity index 97%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/pointDisplacement
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
index 9da1aa78b1279cbefd36fcee9e03065bd31a0cee..89018e59e2c52e0296644cd65e88d5116ce2f5ba 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
@@ -31,7 +31,7 @@ boundaryField
}
leftwall
{
- type waveMaker;
+ type waveMaker;
value uniform (0 0 0);
motionType piston;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/dynamicMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
similarity index 96%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
index b81dd68949020e561b870f5b6f3917145d63e180..3308c66a5ff319eba05a214335288e96280e1bbb 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-vertices
+vertices
(
(0 0 0)
(2 0 0)
@@ -31,17 +31,17 @@ vertices
(4 0.01 0)
);
-blocks
+blocks
(
hex (0 1 5 4 3 2 6 7) (100 1 140) simpleGrading (1 1 1)
hex (1 8 11 5 2 9 10 6) (300 1 140) simpleGrading (1 1 1)
);
-edges
+edges
(
);
-boundary
+boundary
(
bottom1
{
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
similarity index 96%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
index 9e2a353e1e896c9045446d5a5929f1ad2cade6f5..baacb64d17dafea976920ec9d99fd071fd8ef32f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
similarity index 91%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
index 39de6b80f633b14c43957dbd59db57d744ceeeb5..880e8b61c54a548c1d911bb00c862a5da7f94c54 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -38,7 +38,7 @@ boundaryField
{
type zeroGradient;
}
-
+
front1
{
type empty;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh
similarity index 92%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh
index 217641cabc35a65d9f63af424b8754ddb65af55c..f77e89c774653cae18aea956d97ea943bfe0b239 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
+| \\ / A nd | Web: 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/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
similarity index 91%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/pointDisplacement
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
index 27a6d6275e597aa27a0a436a730d5a4f44d00169..0000061f224ea1b79a010596035916891ee4cea6 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.3.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -31,7 +31,7 @@ boundaryField
}
inlet
{
- type waveMaker;
+ type waveMaker;
value uniform (0 0 0);
motionType solitary;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allclean
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allclean
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/Allrun
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/Allrun
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
similarity index 70%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/dynamicMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
index 2179e85d38f755472b010929045979617dfb25bb..72e07cc8aac2a8732eb374c87739b62f3c27cf89 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -14,14 +14,14 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dynamicFvMesh dynamicMotionSolverFvMesh;
-motionSolverLibs ("libfvMotionSolvers.so");
+dynamicFvMesh dynamicMotionSolverFvMesh;
+motionSolverLibs ("libfvMotionSolvers.so");
-solver displacementLaplacian;
+solver displacementLaplacian;
displacementLaplacianCoeffs
{
- diffusivity inverseDistance (inlet);
+ diffusivity inverseDistance (inlet);
}
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
similarity index 93%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/g
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
index 310f9caa4dde3409cc476a32682c08f10c42856a..e3ebad8a7f400f00238752cb1f830e4992a55ed5 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
@@ -1,7 +1,7 @@
/*--------------------------------*- C++-*----------------------------------*\\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.1 |
+| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -19,4 +19,3 @@ dimensions [0 1 -2 0 0 0 0];
value ( 0.0 0.0 -9.81 );
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
similarity index 89%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
index 3633e43efb93a3465f8dd8f82d7406b15a32b058..eb099ad3271bae6eb6a41d73f18330700adfedd4 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
similarity index 92%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
index 4450e7463bd4a68b624c2fb5a0c5539bed972369..8eddb285bc32456a47e057acb23738182481693f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++-*----------------------------------*\\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.1 |
+| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -18,4 +18,3 @@ FoamFile
simulationType laminar;
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
similarity index 93%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
index e46e7700b237c1c65229e2e5f83e26248080c0b9..99f6cf9811582b5a222a1406e33986b38a1ebec6 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
@@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
+| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
similarity index 93%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
index 5d815358f90735d3ffab6b1e0c514b7cb21078e0..66bbc3f0b95afb05107ef116e62723499d5bac25 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-convertToMeters 1;
+scale 1;
vertices
(
@@ -52,7 +52,7 @@ boundary
(
(0 4 7 3)
);
- }
+ }
outlet
{
type patch;
@@ -132,4 +132,3 @@ mergePatchPairs
);
// ************************************************************************* //
-
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
similarity index 60%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
index 9320dce969193b85569275bc02ae630a242c5746..d00ba0a7354b52eb6e0af889c452fa05324b25b0 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.1 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -47,28 +47,29 @@ functions
writeControl writeTime;
outputInterval 1;
- interpolationScheme cellPoint;
- setFormat raw;
- sets
- (
- line1
+ interpolationScheme cellPoint;
+ setFormat raw;
+ sets
+ (
+ line1
{
- type uniform;
- axis distance;
- start ( 1.33 0.004 0.0 );
- end ( 1.33 0.004 0.6 );
- nPoints 101;
- }
- line2
+ type uniform;
+ axis distance;
+ start ( 1.33 0.004 0.0 );
+ end ( 1.33 0.004 0.6 );
+ nPoints 101;
+ }
+ line2
{
- type uniform;
- axis distance;
- start ( 3.33 0.004 0.0 );
- end ( 3.33 0.004 0.6 );
- nPoints 101;
- }
-
- );
+ type uniform;
+ axis distance;
+ start ( 3.33 0.004 0.0 );
+ end ( 3.33 0.004 0.6 );
+ nPoints 101;
+ }
+
+ );
+
fixedLocations false;
fields
(
@@ -84,35 +85,35 @@ functions
writeControl writeTime;
outputInterval 1;
- interpolationScheme cellPoint;
- setFormat raw;
- sets
- (
- line3
+ interpolationScheme cellPoint;
+ setFormat raw;
+ sets
+ (
+ line3
{
- type uniform;
- axis distance;
- start ( 5.33 0.004 0.0 );
- end ( 5.33 0.004 0.6 );
- nPoints 101;
- }
- line4
+ type uniform;
+ axis distance;
+ start ( 5.33 0.004 0.0 );
+ end ( 5.33 0.004 0.6 );
+ nPoints 101;
+ }
+ line4
{
- type uniform;
- axis distance;
- start ( 5.66 0.004 0.0 );
- end ( 5.66 0.004 0.6 );
- nPoints 101;
- }
-
- );
+ type uniform;
+ axis distance;
+ start ( 5.66 0.004 0.0 );
+ end ( 5.66 0.004 0.6 );
+ nPoints 101;
+ }
+ );
+
fixedLocations true;
fields
(
p p_rgh U alpha.water
);
}
-
}
+
// ************************************************************************* /
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
similarity index 87%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
index a4e660116ce72ed1d26c87d67922ca9cbd9cd6dd..8f361f41c16dcf1c893559635fca84eb7bbd7b76 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
similarity index 86%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
index 2393b1a94cb8e2c9f0868a0bc597eb260d4957ad..488ad5174352fbaeb84a96628cda5303e929b798 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
@@ -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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -57,13 +57,4 @@ wallDist
}
-fluxRequired
-{
- default no;
- p_rgh;
- pcorr;
- alpha;
-}
-
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
similarity index 95%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
index a5fa734772ec3c82cf1ae735cd568a2d6d052526..13fbb9902bb1bab6f1164a699b8183f28575e849 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
@@ -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: v1812 |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -17,7 +17,6 @@ FoamFile
solvers
{
-
"(cellDisplacement|cellDisplacementFinal)"
{
solver GAMG;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
similarity index 93%
rename from tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
index f506419405ce5d137ac9b8fe1ec5a6da3f26e504..10ebc3eb771d1f52057a2c6094a14a9abbe0bff7 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMakerSolitary/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++-*----------------------------------*\\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.1 |
+| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -29,4 +29,3 @@ regions
fieldValues ( volScalarFieldValue alpha.water 1 );
}
);
-