Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
1db1815b
Commit
1db1815b
authored
Jun 11, 2019
by
sergio
Committed by
Andrew Heather
Jun 11, 2019
Browse files
Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop
parents
58312bf8
dd437aa6
Changes
218
Hide whitespace changes
Inline
Side-by-side
src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
View file @
1db1815b
...
...
@@ -2,10 +2,10 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018
-2019
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 IH-Cantabria
| Copyright (C) 2018
-2019
IH-Cantabria
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -38,7 +38,8 @@ const Foam::Enum<Foam::waveMakerPointPatchVectorField::motionTypes>
Foam
::
waveMakerPointPatchVectorField
::
motionTypeNames
({
{
motionTypes
::
piston
,
"piston"
},
{
motionTypes
::
flap
,
"flap"
}
{
motionTypes
::
flap
,
"flap"
},
{
motionTypes
::
solitary
,
"solitary"
}
});
...
...
@@ -60,9 +61,9 @@ const Foam::vector& Foam::waveMakerPointPatchVectorField::g()
}
Foam
::
scalar
Foam
::
waveMakerPointPatchVectorField
::
waveLength
Foam
::
scalar
Foam
::
waveMakerPointPatchVectorField
::
waveLength
(
const
scalar
h
,
const
scalar
h
,
const
scalar
T
)
{
...
...
@@ -104,7 +105,7 @@ Foam::waveMakerPointPatchVectorField::waveMakerPointPatchVectorField
waveHeight_
(
0
),
wavePhase_
(
0
),
waveLength_
(
0
),
rampTime_
(
0
),
rampTime_
(
1
),
secondOrder_
(
false
)
{}
...
...
@@ -216,7 +217,7 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
if
(
secondOrder_
)
{
motionX
+=
motionX
+=
sqr
(
waveHeight_
)
/
(
16
*
initialDepth_
)
*
(
3
*
cosh
(
kh
)
/
pow3
(
sinh
(
kh
))
-
2
/
m1
)
*
sin
(
2
*
sigma
*
t
);
...
...
@@ -240,7 +241,7 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
if
(
secondOrder_
)
{
motionX
+=
motionX
+=
sqr
(
waveHeight_
)
/
(
32
*
initialDepth_
)
*
(
3
*
cosh
(
kh
)
/
pow3
(
sinh
(
kh
))
-
2
/
m1
);
...
...
@@ -250,6 +251,41 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
break
;
}
case
motionTypes
:
:
solitary
:
{
const
scalar
kappa
=
sqrt
(
0
.
75
*
waveHeight_
/
(
pow3
(
initialDepth_
)));
const
scalar
waveCelerity
=
sqrt
(
mag
(
g
())
*
(
initialDepth_
+
waveHeight_
));
const
scalar
stroke
=
sqrt
(
16
.
0
*
waveHeight_
*
initialDepth_
/
3
.
0
);
const
scalar
hr
=
waveHeight_
/
initialDepth_
;
wavePeriod_
=
(
2
.
0
/
(
kappa
*
waveCelerity
))
*
(
3
.
8
+
hr
);
const
scalar
tSolitary
=
-
0
.
5
*
wavePeriod_
+
t
-
db
().
time
().
startTime
().
value
();
// Newton-Rapshon
scalar
theta1
=
0
;
scalar
theta2
=
0
;
scalar
er
=
10000
;
const
scalar
error
=
0
.
001
;
while
(
er
>
error
)
{
theta2
=
theta1
-
(
theta1
-
kappa
*
waveCelerity
*
tSolitary
+
hr
*
tanh
(
theta1
))
/
(
1
.
0
+
hr
*
(
1
.
0
/
cosh
(
theta1
))
*
(
1
.
0
/
cosh
(
theta1
)));
er
=
mag
(
theta1
-
theta2
);
theta1
=
theta2
;
}
scalar
motionX
=
waveHeight_
/
(
kappa
*
initialDepth_
)
*
tanh
(
theta1
)
+
0
.
5
*
stroke
;
Field
<
vector
>::
operator
=
(
n_
*
motionX
);
break
;
}
default:
{
FatalErrorInFunction
...
...
@@ -257,7 +293,7 @@ void Foam::waveMakerPointPatchVectorField::updateCoeffs()
<<
abort
(
FatalError
);
}
}
fixedValuePointPatchField
<
vector
>::
updateCoeffs
();
}
...
...
src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
View file @
1db1815b
...
...
@@ -5,7 +5,7 @@
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 IH-Cantabria
| Copyright (C) 2018
-2019
IH-Cantabria
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -42,7 +42,7 @@ Usage
\verbatim
leftwall
{
type waveMaker;
type waveMaker;
motionType flap;
n (1 0 0);
initialDepth 0.25;
...
...
@@ -70,6 +70,7 @@ Usage
Available motion types include:
- piston
- flap
- solitary
SourceFiles
waveMakerPointPatchVectorField.C
...
...
@@ -100,7 +101,8 @@ class waveMakerPointPatchVectorField
enum
motionTypes
{
piston
,
flap
flap
,
solitary
};
//- Names for motion types
...
...
tutorials/multiphase/interFoam/laminar/waveExampleSolitaryMcCowan/system/fvSchemes
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
}
gradSchemes
{
default Gauss linear;
}
divSchemes
{
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default Gauss linear orthogonal;
}
interpolationSchemes
{
default linear;
}
snGradSchemes
{
default orthogonal;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
}
gradSchemes
{
default Gauss linear;
}
divSchemes
{
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default Gauss linear orthogonal;
}
interpolationSchemes
{
default linear;
}
snGradSchemes
{
default orthogonal;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
"pcorr.*"
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0;
}
p_rgh
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0.1;
}
p_rghFinal
{
solver GAMG;
smoother DIC;
tolerance 1e-7;
relTol 0;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0.1;
}
UFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}
PIMPLE
{
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
}
gradSchemes
{
default Gauss linear;
}
divSchemes
{
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default Gauss linear orthogonal;
}
interpolationSchemes
{
default linear;
}
snGradSchemes
{
default orthogonal;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
"pcorr.*"
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0;
}
p_rgh
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0.1;
}
p_rghFinal
{
solver GAMG;
smoother DIC;
tolerance 1e-7;
relTol 0;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0.1;
}
UFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}
PIMPLE
{
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
}
gradSchemes
{
default Gauss linear;
}
divSchemes
{
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default Gauss linear orthogonal;
}
interpolationSchemes
{
default linear;
}
snGradSchemes
{
default orthogonal;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
"pcorr.*"
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0;
}
p_rgh
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0.1;
}
p_rghFinal
{
solver GAMG;
smoother DIC;
tolerance 1e-7;
relTol 0;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0.1;
}
UFinal
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-6;
relTol 0;
}
}
PIMPLE
{
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
// ************************************************************************* //
tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/system/fvSchemes
deleted
100644 → 0
View file @
58312bf8
/*--------------------------------*- C++ -*----------------------------------*\