diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
index 6b03790013a56e01395f388978c1e1086c671ba6..8b31b52533df44f971402ec4255e88906d2fc492 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
@@ -41,12 +41,6 @@ boundaryField
value uniform (0 0 0);
}
-//
-// right1
-// {
-// type zeroGradient; //calculated;
-// value $internalField;
-// }
"overset.*"
{
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
index 4142814ded25640b610ad0eba1adbb3263e815dc..1eb61449926ae41e97de09e1ff4566597fa53cb0 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
@@ -21,7 +21,7 @@ dynamicFvMesh dynamicOversetFvMesh;
motionSolver rigidBodyMotion;
-// rigidBodyMotionCoeffs
+// rigidBodyMotionCoeffs - not needed any more
// {
report on;
@@ -45,11 +45,16 @@ motionSolver rigidBodyMotion;
type rigidBody;
parent root;
- // Cuboid mass
+ // Cuboid mass -- very simple setup. For more complicated shapes
+ // see utility surfaceInertia
mass 9;
rho 1;
inertia (0.05 0 0 0.05 0 0.05);
- centreOfMass (0.21 -0.07 0);
+ centreOfMass (0.21 -0.07 0); // relative to the centreOfMass
+ // of parent body
+ // (here root = global coord system)
+
+ // Transformation tensor and centre of rotation
transform (1 0 0 0 1 0 0 0 1) (0.21 0 0);
joint
@@ -58,16 +63,18 @@ motionSolver rigidBodyMotion;
joints
(
{
- type Pxyz;
+ type Pxyz; // Allow movement in any direction
}
{
- type Rxyz;
+ type Rxyz; // Allow rotation along any axis
+ // (local - body CS)
}
);
}
patches (hullWall);
- innerDistance 100;
+ innerDistance 100; // With overset we want to avoid the mesh
+ // deformation so have large innerDistance
outerDistance 200;
} // end hull
@@ -117,8 +124,15 @@ motionSolver rigidBodyMotion;
type prescribedRotation;
body rudder;
referenceOrientation (1 0 0 0 1 0 0 0 1);
- axis (0 1 0);
- omega (0 26 0);
+ axis (0 1 0); // Axis of rotation
+ omega sine; // Function1 entry
+ omegaCoeffs
+ {
+ frequency 4;
+ amplitude 0.2;
+ scale (0 1 0);
+ level (0 1 0);
+ }
}
propellerRotation
{
@@ -128,7 +142,8 @@ motionSolver rigidBodyMotion;
axis (1 0 0);
omega table
(
- (0 (16 0 0))
+ (0 (0 0 0))
+ (1 (16 0 0))
);
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
index eca84fbcc590afaabc67571c7a4e22b1902b7c3f..548fc28ad0d0236df00fdc70479f29879d227d1c 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
@@ -56,6 +56,7 @@ oversetInterpolation
{
method inverseDistance;
}
+
oversetInterpolationRequired
{
alpha.water;
@@ -63,10 +64,6 @@ oversetInterpolationRequired
fluxRequired
{
-// default no;
- // p_rgh;
- // pcorr;
- // alpha.water;
}
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes_VOF b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes_VOF
deleted file mode 100644
index ebf1e23fe5605e29d4c6153fe94cbe60490c1204..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes_VOF
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-divSchemes
-{
- div(rhoPhi,U) Gauss limitedLinearV 1;
- div(U) Gauss linear;
- div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss linear;
- div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
-
- div(phi,k) Gauss upwind;
- div(phi,epsilon) Gauss upwind;
- div(phi,omega) Gauss upwind;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-oversetInterpolation
-{
- method inverseDistance;
-}
-
-fluxRequired
-{
- default no;
- p;
- // p_rgh;
- // pcorr;
- // alpha.water;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
index 62ccc0aba4b7b6d0c35501df2380dc028ef4ade9..8de9000679517a241b57765558ccc6cbc4189d09 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
@@ -59,6 +59,12 @@ solvers
tolerance 1e-9;
relTol 0.01;
}
+
+ Phi
+ {
+ $p_rgh;
+ }
+
p_rghFinal
{
$p_rgh;
@@ -82,9 +88,9 @@ PIMPLE
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- ddtCorr yes;
- correctPhi no;
- massFluxInterpolation no;
+ ddtCorr yes;
+ correctPhi no;
+ massFluxInterpolation no;
moveMeshOuterCorrectors no;
turbOnFinalIterOnly no;
@@ -92,6 +98,12 @@ PIMPLE
oversetAdjustPhi no;
}
+potentialFlow
+{
+ nNonOrthogonalCorrectors 2;
+ PhiRefCell 0;
+ PhiRefValue 0;
+}
relaxationFactors
{
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
index ad4d6be563a6ea02c7ee2e09fe18cffe7c9db759..143f66f1b498f9cb6d8ce909ca72b45fb4fa4c73 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
@@ -24,12 +24,6 @@ globalCoeffs
tan1 (1 0 0);
tan2 (0 1 0);
}
-/*
-patchLocalCoeffs
-{
- patch outside;
- tan1 (1 0 0);
-}*/
directions ( tan1 tan2 );
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
index 356b4a37b5a1e9dc360a4481bbcc843876b26ecd..1821edd138f9b811bf1caecbbf64d492e132a577 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
@@ -18,7 +18,6 @@ actions
(
{
name bgr0; // all around bgr
- // set hullBox0set;
type cellSet;
action new;
source zoneToCell;
@@ -80,9 +79,6 @@ actions
boxes
(
(0.05 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
- // (0 -1 -1)(5 1 1) //hullBox
- // (-0.02 -0.05 -0.03)( -0.01 0.05 0.03) //propeller
- // (-0.08 -0.08 -0.03)(-0.06 0.08 0.03) //rudder
);
}
}
@@ -132,7 +128,6 @@ actions
set bgr0;
}
}
-
);
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull_pokus b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull_pokus
deleted file mode 100644
index 185f61ad9cdd43ffa360bbcd81f9c76632305973..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull_pokus
+++ /dev/null
@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: plus-overset |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
- {
- name hullBox0; // all around bgr
- type cellSet;
- action new;
- source regionToCell;
- sourceInfo
- {
- insidePoints ((0.3 0.001 0.001));
- }
- }
-
-
-
- // Select box to remove from region 1 and 2
-
- // {
- // name box; //all but hullBox0 region
- // type cellSet;
- // action new;
- // source cellToCell;
- // sourceInfo
- // {
- // set c0;
- // }
- // }
-
- {
- name box; // all cells including hullBox0
- type cellSet;
- action new; // was: add;
- source cellToCell;
- sourceInfo
- {
- set hullBox0;
- }
- }
-
-
- {
- name box;
- type cellSet;
- action subset;
- source boxToCell;
- sourceInfo
- {
- boxes
- (
- (0.0501 -0.1 -0.1)(0.5 0.1 0.1) //hullBox
- // (0 -1 -1)(5 1 1) //hullBox
- // (-0.02 -0.05 -0.03)( -0.01 0.05 0.03) //propeller
- // (-0.08 -0.08 -0.03)(-0.06 0.08 0.03) //rudder
- );
- }
- }
-
- {
- name box;
- type cellSet;
- action invert;
- }
-
- {
- name c0; //copy
- type cellSet;
- action new;
- source cellToCell;
- sourceInfo
- {
- set hullBox0;
- }
- }
-
- {
- name c0; //all cells but hullBox0 region
- type cellSet;
- action invert;
- }
- {
- name box; // all cells including hullBox0
- type cellSet;
- action add;
- source cellToCell;
- sourceInfo
- {
- set c0;
- }
- }
-
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
index e16c649d14a980f9c03c73622133700a075ed453..bd2980e1ff514d3a9b5615bbb4341140f91cba96 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
@@ -18,7 +18,6 @@ actions
(
{
name bgr0; // all around bgr
- // set hullBox0set;
type cellSet;
action new;
source zoneToCell;
@@ -79,9 +78,7 @@ actions
{
boxes
(
- // (0.15 -0.1 -0.1)(0.5 0.1 0.1) //hullBox
(-0.0199 -0.0499 -0.0499)( -0.00998 0.0499 0.0499) //propeller
- // (-0.10 -0.0749 -0.00499)(-0.050 0.0749 0.00499) //rudder
);
}
}
@@ -131,131 +128,6 @@ actions
set bgr0;
}
}
-
);
-
-// /*--------------------------------*- C++ -*----------------------------------*\
-// | ========= | |
-// | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-// | \\ / O peration | Version: plus-overset |
-// | \\ / A nd | Web: www.OpenFOAM.com |
-// | \\/ M anipulation | |
-// \*---------------------------------------------------------------------------*/
-// FoamFile
-// {
-// version 2.0;
-// format ascii;
-// class dictionary;
-// object topoSetDict;
-// }
-// // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//
-// actions
-// (
-// {
-// name propeller0; // all around bgr
-// type cellSet;
-// action new;
-// source zoneToCell;
-// sourceInfo
-// {
-// name propeller;
-// // insidePoints ((-0.02 0.0001 0.0001));
-// }
-// }
-// {
-// name c0; //copy
-// type cellSet;
-// action new;
-// source cellToCell;
-// sourceInfo
-// {
-// set propeller0;
-// }
-// }
-//
-// {
-// name c0; //all around hullBox0
-// type cellSet;
-// action invert;
-// }
-//
-// /*
-//
-// {
-// name c1;
-// type cellSet;
-// action new;
-// source regionsToCell;
-// sourceInfo
-// {
-// insidePoints ((-0.01 0.0 0.0));
-// set c0;
-// }
-// }
-//
-//
-//
-//
-//
-// {
-// name c1;
-// type cellSet;
-// action delete;
-// source cellToCell;
-// sourceInfo
-// {
-// set c2;
-// }
-// }
-// */
-// // Select box to remove from region 1 and 2
-//
-// {
-// name box;
-// type cellSet;
-// action new;
-// source cellToCell;
-// sourceInfo
-// {
-// set c0;
-// }
-// }
-//
-//
-// {
-// name box;
-// type cellSet;
-// action add;
-// source cellToCell;
-// sourceInfo
-// {
-// set propeller0;
-// }
-// }
-//
-// {
-// name box;
-// type cellSet;
-// action subset;
-// source boxToCell;
-// sourceInfo
-// {
-// boxes
-// (
-// // (0 -0.1 -0.1)(0.5 0.1 0.1) //hullBox
-// (-0.0199 -0.0499 -0.0499)( -0.00998 0.0499 0.0499) //propeller
-// // (-0.08 -0.08 -0.03)(-0.06 0.08 0.03) //rudder
-// );
-// }
-// }
-//
-// {
-// name box;
-// type cellSet;
-// action invert;
-// }
-// );
-//
-// // ************************************************************************* //
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
index 17762d7c77fcb56a048778012884b9c5c8578f4a..dfa821e7c82680d64e894b4f68b6f9f1a6ff54e5 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
@@ -16,7 +16,6 @@ FoamFile
actions
(
-
{
name refineSet;
type cellSet;
@@ -27,13 +26,9 @@ actions
boxes
(
(-0.2 -0.2 -0.2)(0.0 0.2 0.2) //hullBox
- // (0 -1 -1)(5 1 1) //hullBox
- // (-0.02 -0.05 -0.03)( -0.01 0.05 0.03) //propeller
- // (-0.08 -0.08 -0.03)(-0.06 0.08 0.03) //rudder
);
}
}
-
);
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
index 460a11d274fcd906aaf6f2da60fad95ca13bc8c7..e1e23b38e17e79ce759c889adf79894827d768d8 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
@@ -18,7 +18,6 @@ actions
(
{
name bgr0; // all around bgr
- // set hullBox0set;
type cellSet;
action new;
source zoneToCell;
@@ -79,8 +78,6 @@ actions
{
boxes
(
- // (0.15 -0.1 -0.1)(0.5 0.1 0.1) //hullBox
- // (-0.02 -0.05 -0.03)( -0.01 0.05 0.03) //propeller
(-0.10 -0.0749 -0.00499)(-0.050 0.0749 0.00499) //rudder
);
}
@@ -131,134 +128,6 @@ actions
set bgr0;
}
}
-
);
// ************************************************************************* //
-
-
-
-// /*--------------------------------*- C++ -*----------------------------------*\
-// | ========= | |
-// | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-// | \\ / O peration | Version: plus-overset |
-// | \\ / A nd | Web: www.OpenFOAM.com |
-// | \\/ M anipulation | |
-// \*---------------------------------------------------------------------------*/
-// FoamFile
-// {
-// version 2.0;
-// format ascii;
-// class dictionary;
-// object topoSetDict;
-// }
-// // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//
-// actions
-// (
-// {
-// name rudder0; // all around bgr
-// type cellSet;
-// action new;
-// source zoneToCell;
-// sourceInfo
-// {
-// name rudder;
-// //insidePoints ((-0.11 0.0 0.0));
-// }
-// }
-// {
-// name c0; //copy
-// type cellSet;
-// action new;
-// source cellToCell;
-// sourceInfo
-// {
-// set rudder0;
-// }
-// }
-//
-// {
-// name c0; //all around hullBox0
-// type cellSet;
-// action invert;
-// }
-//
-// /*
-//
-// {
-// name c1;
-// type cellSet;
-// action new;
-// source regionsToCell;
-// sourceInfo
-// {
-// insidePoints ((-0.01 0.0 0.0));
-// set c0;
-// }
-// }
-//
-//
-//
-//
-//
-// {
-// name c1;
-// type cellSet;
-// action delete;
-// source cellToCell;
-// sourceInfo
-// {
-// set c2;
-// }
-// }
-// */
-// // Select box to remove from region 1 and 2
-//
-// {
-// name box;
-// type cellSet;
-// action new;
-// source cellToCell;
-// sourceInfo
-// {
-// set c0;
-// }
-// }
-//
-// {
-// name box;
-// type cellSet;
-// action add;
-// source cellToCell;
-// sourceInfo
-// {
-// set rudder0;
-// }
-// }
-//
-//
-// {
-// name box;
-// type cellSet;
-// action subset;
-// source boxToCell;
-// sourceInfo
-// {
-// boxes
-// (
-// // (0 -0.1 -0.1)(0.5 0.1 0.1) //hullBox
-// // (-0.02 -0.05 -0.03)( -0.01 0.05 0.03) //propeller
-// (-0.10 -0.0749 -0.00499)(-0.050 0.0749 0.00499) //rudder
-// );
-// }
-// }
-//
-// {
-// name box;
-// type cellSet;
-// action invert;
-// }
-// );
-//
-// // ************************************************************************* //